diff options
author | Trumeet <yuuta@yuuta.moe> | 2022-07-13 12:25:36 -0700 |
---|---|---|
committer | Trumeet <yuuta@yuuta.moe> | 2022-07-13 12:25:36 -0700 |
commit | d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0 (patch) | |
tree | 6ac06ce2c95ab43eaac3c44f7ac66bca347ff50a /src/main | |
parent | 83e5d05251f918c6a4775c92e9c95096aaef8292 (diff) | |
download | acron-d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0.tar acron-d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0.tar.gz acron-d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0.tar.bz2 acron-d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0.zip |
Move responses and events to separate packages
Signed-off-by: Trumeet <yuuta@yuuta.moe>
Diffstat (limited to 'src/main')
19 files changed, 39 insertions, 23 deletions
diff --git a/src/main/java/moe/ymc/acron/cmd/CmdOut.java b/src/main/java/moe/ymc/acron/cmd/CmdOut.java index 717bd0c..55eadf1 100644 --- a/src/main/java/moe/ymc/acron/cmd/CmdOut.java +++ b/src/main/java/moe/ymc/acron/cmd/CmdOut.java @@ -1,7 +1,7 @@ package moe.ymc.acron.cmd; import io.netty.channel.Channel; -import moe.ymc.acron.s2c.EventCmdOut; +import moe.ymc.acron.s2c.response.EventCmdOut; import moe.ymc.acron.serialization.Serializer; import net.minecraft.server.command.CommandOutput; import net.minecraft.text.Text; diff --git a/src/main/java/moe/ymc/acron/cmd/CmdResConsumer.java b/src/main/java/moe/ymc/acron/cmd/CmdResConsumer.java index 13a65f8..d22b77e 100644 --- a/src/main/java/moe/ymc/acron/cmd/CmdResConsumer.java +++ b/src/main/java/moe/ymc/acron/cmd/CmdResConsumer.java @@ -3,7 +3,7 @@ package moe.ymc.acron.cmd; import com.mojang.brigadier.ResultConsumer; import com.mojang.brigadier.context.CommandContext; import io.netty.channel.Channel; -import moe.ymc.acron.s2c.EventCmdRes; +import moe.ymc.acron.s2c.response.EventCmdRes; import moe.ymc.acron.serialization.Serializer; import net.minecraft.server.command.ServerCommandSource; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java b/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java index a4cb744..41807f2 100644 --- a/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java +++ b/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java @@ -1,8 +1,8 @@ package moe.ymc.acron.mixin; import moe.ymc.acron.s2c.Entity; -import moe.ymc.acron.s2c.EventEntityDeath; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.event.EventEntityDeath; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; diff --git a/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java b/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java index fc2a88c..297c3c1 100644 --- a/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java +++ b/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java @@ -1,7 +1,7 @@ package moe.ymc.acron.mixin; -import moe.ymc.acron.s2c.EventLagging; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.event.EventLagging; import net.minecraft.server.MinecraftServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java index 7e4115e..7a24493 100644 --- a/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java +++ b/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java @@ -2,9 +2,9 @@ package moe.ymc.acron.mixin; import com.mojang.authlib.GameProfile; import moe.ymc.acron.s2c.Entity; -import moe.ymc.acron.s2c.EventDisconnected; -import moe.ymc.acron.s2c.EventPlayerJoined; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.event.EventDisconnected; +import moe.ymc.acron.s2c.event.EventPlayerJoined; import net.minecraft.network.ClientConnection; import net.minecraft.server.network.ServerLoginNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java index 0bcfb0a..54d5ead 100644 --- a/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java +++ b/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java @@ -1,9 +1,9 @@ package moe.ymc.acron.mixin; import moe.ymc.acron.s2c.Entity; -import moe.ymc.acron.s2c.EventDisconnected; -import moe.ymc.acron.s2c.EventPlayerMessage; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.event.EventDisconnected; +import moe.ymc.acron.s2c.event.EventPlayerMessage; import net.minecraft.network.ClientConnection; import net.minecraft.server.filter.TextStream; import net.minecraft.server.network.ServerPlayNetworkHandler; diff --git a/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java index 17c8517..fe1c764 100644 --- a/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java +++ b/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java @@ -1,7 +1,7 @@ package moe.ymc.acron.mixin; -import moe.ymc.acron.s2c.EventEntityDeath; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.event.EventEntityDeath; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; diff --git a/src/main/java/moe/ymc/acron/net/WSFrameHandler.java b/src/main/java/moe/ymc/acron/net/WSFrameHandler.java index 8eba1f8..c578f2e 100644 --- a/src/main/java/moe/ymc/acron/net/WSFrameHandler.java +++ b/src/main/java/moe/ymc/acron/net/WSFrameHandler.java @@ -11,10 +11,10 @@ import moe.ymc.acron.c2s.ReqSetConfig; import moe.ymc.acron.c2s.Request; import moe.ymc.acron.cmd.CmdQueue; import moe.ymc.acron.jvav.Pair; -import moe.ymc.acron.s2c.EventCmdDenied; -import moe.ymc.acron.s2c.EventError; -import moe.ymc.acron.s2c.EventOk; import moe.ymc.acron.s2c.EventQueue; +import moe.ymc.acron.s2c.response.EventCmdDenied; +import moe.ymc.acron.s2c.response.EventError; +import moe.ymc.acron.s2c.response.EventOk; import moe.ymc.acron.serialization.Serializer; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.Vec2f; diff --git a/src/main/java/moe/ymc/acron/s2c/EventDisconnected.java b/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java index bf0e279..610fc58 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventDisconnected.java +++ b/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java @@ -1,6 +1,8 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.event; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Entity; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java b/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java index 201cdf3..4735241 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java +++ b/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java @@ -1,6 +1,8 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.event; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Entity; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.NotNull; // TODO: More detailed death report. diff --git a/src/main/java/moe/ymc/acron/s2c/EventLagging.java b/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java index d0a3f61..30974df 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventLagging.java +++ b/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.event; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; public record EventLagging(@SerializedName("ms") long ms, @SerializedName("ticks") long ticks) diff --git a/src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java index eaadee1..408680b 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java +++ b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java @@ -1,6 +1,8 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.event; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Entity; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.NotNull; public record EventPlayerJoined(@SerializedName("player") @NotNull Entity player) diff --git a/src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java index f5273ac..2769493 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java +++ b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java @@ -1,6 +1,8 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.event; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Entity; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.NotNull; public record EventPlayerMessage(@SerializedName("player") @NotNull Entity player, diff --git a/src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java index 912b430..85fcf8d 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.response; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; public record EventCmdDenied(@SerializedName("id") int id) implements Event { diff --git a/src/main/java/moe/ymc/acron/s2c/EventCmdOut.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java index 3b8d06e..e5bd609 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdOut.java +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.response; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/src/main/java/moe/ymc/acron/s2c/EventCmdRes.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java index dae858a..8c1b6a9 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdRes.java +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.response; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; public record EventCmdRes(@SerializedName("id") int id, @SerializedName("success") boolean success, diff --git a/src/main/java/moe/ymc/acron/s2c/EventError.java b/src/main/java/moe/ymc/acron/s2c/response/EventError.java index 7f48fa8..48d2683 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventError.java +++ b/src/main/java/moe/ymc/acron/s2c/response/EventError.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.response; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; import org.jetbrains.annotations.Nullable; public record EventError(@SerializedName("id") int id, diff --git a/src/main/java/moe/ymc/acron/s2c/EventOk.java b/src/main/java/moe/ymc/acron/s2c/response/EventOk.java index 5be5c65..eb8c82d 100644 --- a/src/main/java/moe/ymc/acron/s2c/EventOk.java +++ b/src/main/java/moe/ymc/acron/s2c/response/EventOk.java @@ -1,6 +1,7 @@ -package moe.ymc.acron.s2c; +package moe.ymc.acron.s2c.response; import com.google.gson.annotations.SerializedName; +import moe.ymc.acron.s2c.Event; public record EventOk(@SerializedName("id") int id) implements Event { diff --git a/src/main/java/moe/ymc/acron/serialization/Serializer.java b/src/main/java/moe/ymc/acron/serialization/Serializer.java index 28c7e18..900d6fc 100644 --- a/src/main/java/moe/ymc/acron/serialization/Serializer.java +++ b/src/main/java/moe/ymc/acron/serialization/Serializer.java @@ -7,7 +7,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import moe.ymc.acron.c2s.ReqCmd; import moe.ymc.acron.c2s.ReqSetConfig; import moe.ymc.acron.c2s.Request; -import moe.ymc.acron.s2c.*; +import moe.ymc.acron.s2c.Event; +import moe.ymc.acron.s2c.event.*; +import moe.ymc.acron.s2c.response.*; import org.jetbrains.annotations.NotNull; public class Serializer { |