From d1fdb146c7ea78dbe99c38e48bf27dbe9fc5e3d0 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Wed, 13 Jul 2022 12:25:36 -0700 Subject: Move responses and events to separate packages Signed-off-by: Trumeet --- src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java | 7 ------- src/main/java/moe/ymc/acron/s2c/EventCmdOut.java | 12 ------------ src/main/java/moe/ymc/acron/s2c/EventCmdRes.java | 9 --------- src/main/java/moe/ymc/acron/s2c/EventDisconnected.java | 10 ---------- src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java | 10 ---------- src/main/java/moe/ymc/acron/s2c/EventError.java | 9 --------- src/main/java/moe/ymc/acron/s2c/EventLagging.java | 8 -------- src/main/java/moe/ymc/acron/s2c/EventOk.java | 7 ------- src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java | 8 -------- src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java | 10 ---------- .../java/moe/ymc/acron/s2c/event/EventDisconnected.java | 12 ++++++++++++ src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java | 12 ++++++++++++ src/main/java/moe/ymc/acron/s2c/event/EventLagging.java | 9 +++++++++ .../java/moe/ymc/acron/s2c/event/EventPlayerJoined.java | 10 ++++++++++ .../java/moe/ymc/acron/s2c/event/EventPlayerMessage.java | 12 ++++++++++++ .../java/moe/ymc/acron/s2c/response/EventCmdDenied.java | 8 ++++++++ src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java | 13 +++++++++++++ src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java | 10 ++++++++++ src/main/java/moe/ymc/acron/s2c/response/EventError.java | 10 ++++++++++ src/main/java/moe/ymc/acron/s2c/response/EventOk.java | 8 ++++++++ 20 files changed, 104 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventCmdOut.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventCmdRes.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventDisconnected.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventError.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventLagging.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventOk.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java create mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java create mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java create mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventLagging.java create mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java create mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java create mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java create mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java create mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java create mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventError.java create mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventOk.java (limited to 'src/main/java/moe/ymc/acron/s2c') diff --git a/src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java b/src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java deleted file mode 100644 index 912b430..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdDenied.java +++ /dev/null @@ -1,7 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; - -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/EventCmdOut.java deleted file mode 100644 index 3b8d06e..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdOut.java +++ /dev/null @@ -1,12 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; - -import java.util.UUID; - -public record EventCmdOut(@SerializedName("id") int id, - @SerializedName("sender") @NotNull UUID sender, - @SerializedName("text") @NotNull String text) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventCmdRes.java b/src/main/java/moe/ymc/acron/s2c/EventCmdRes.java deleted file mode 100644 index dae858a..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventCmdRes.java +++ /dev/null @@ -1,9 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; - -public record EventCmdRes(@SerializedName("id") int id, - @SerializedName("success") boolean success, - @SerializedName("result") int result) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventDisconnected.java b/src/main/java/moe/ymc/acron/s2c/EventDisconnected.java deleted file mode 100644 index bf0e279..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventDisconnected.java +++ /dev/null @@ -1,10 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public record EventDisconnected(@SerializedName("player") @Nullable Entity player, - @SerializedName("reason") @NotNull String reason) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java b/src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java deleted file mode 100644 index 201cdf3..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventEntityDeath.java +++ /dev/null @@ -1,10 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; - -// TODO: More detailed death report. -public record EventEntityDeath(@SerializedName("entity") @NotNull Entity entity, - @SerializedName("message") @NotNull String message) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventError.java b/src/main/java/moe/ymc/acron/s2c/EventError.java deleted file mode 100644 index 7f48fa8..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventError.java +++ /dev/null @@ -1,9 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.Nullable; - -public record EventError(@SerializedName("id") int id, - @SerializedName("message") @Nullable String message) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventLagging.java b/src/main/java/moe/ymc/acron/s2c/EventLagging.java deleted file mode 100644 index d0a3f61..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventLagging.java +++ /dev/null @@ -1,8 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; - -public record EventLagging(@SerializedName("ms") long ms, - @SerializedName("ticks") long ticks) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventOk.java b/src/main/java/moe/ymc/acron/s2c/EventOk.java deleted file mode 100644 index 5be5c65..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventOk.java +++ /dev/null @@ -1,7 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; - -public record EventOk(@SerializedName("id") int id) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java b/src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java deleted file mode 100644 index eaadee1..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventPlayerJoined.java +++ /dev/null @@ -1,8 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; - -public record EventPlayerJoined(@SerializedName("player") @NotNull Entity player) - implements Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java b/src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java deleted file mode 100644 index f5273ac..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventPlayerMessage.java +++ /dev/null @@ -1,10 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; - -public record EventPlayerMessage(@SerializedName("player") @NotNull Entity player, - @SerializedName("text") @NotNull String text) - implements Event { - -} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java b/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java new file mode 100644 index 0000000..610fc58 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java @@ -0,0 +1,12 @@ +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; + +public record EventDisconnected(@SerializedName("player") @Nullable Entity player, + @SerializedName("reason") @NotNull String reason) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java b/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java new file mode 100644 index 0000000..4735241 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java @@ -0,0 +1,12 @@ +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. +public record EventEntityDeath(@SerializedName("entity") @NotNull Entity entity, + @SerializedName("message") @NotNull String message) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java b/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java new file mode 100644 index 0000000..30974df --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java @@ -0,0 +1,9 @@ +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) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java new file mode 100644 index 0000000..408680b --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java @@ -0,0 +1,10 @@ +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) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java new file mode 100644 index 0000000..2769493 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java @@ -0,0 +1,12 @@ +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, + @SerializedName("text") @NotNull String text) + implements Event { + +} diff --git a/src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java new file mode 100644 index 0000000..85fcf8d --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdDenied.java @@ -0,0 +1,8 @@ +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/response/EventCmdOut.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java new file mode 100644 index 0000000..e5bd609 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java @@ -0,0 +1,13 @@ +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; + +public record EventCmdOut(@SerializedName("id") int id, + @SerializedName("sender") @NotNull UUID sender, + @SerializedName("text") @NotNull String text) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java new file mode 100644 index 0000000..8c1b6a9 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java @@ -0,0 +1,10 @@ +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, + @SerializedName("result") int result) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/response/EventError.java b/src/main/java/moe/ymc/acron/s2c/response/EventError.java new file mode 100644 index 0000000..48d2683 --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/response/EventError.java @@ -0,0 +1,10 @@ +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, + @SerializedName("message") @Nullable String message) + implements Event { +} diff --git a/src/main/java/moe/ymc/acron/s2c/response/EventOk.java b/src/main/java/moe/ymc/acron/s2c/response/EventOk.java new file mode 100644 index 0000000..eb8c82d --- /dev/null +++ b/src/main/java/moe/ymc/acron/s2c/response/EventOk.java @@ -0,0 +1,8 @@ +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 { +} -- cgit v1.2.3