From d8fe269327a1a51f2588a3573a4764613da16388 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Tue, 26 Jul 2022 19:06:11 -0700 Subject: Move the mod to mod/ --- src/main/java/moe/ymc/acron/s2c/Entity.java | 26 -------------------- src/main/java/moe/ymc/acron/s2c/Event.java | 4 ---- src/main/java/moe/ymc/acron/s2c/EventQueue.java | 28 ---------------------- .../moe/ymc/acron/s2c/event/EventDisconnected.java | 12 ---------- .../moe/ymc/acron/s2c/event/EventEntityDeath.java | 12 ---------- .../java/moe/ymc/acron/s2c/event/EventLagging.java | 9 ------- .../moe/ymc/acron/s2c/event/EventPlayerJoined.java | 10 -------- .../ymc/acron/s2c/event/EventPlayerMessage.java | 12 ---------- .../moe/ymc/acron/s2c/response/EventCmdOut.java | 13 ---------- .../moe/ymc/acron/s2c/response/EventCmdRes.java | 10 -------- .../moe/ymc/acron/s2c/response/EventError.java | 22 ----------------- .../java/moe/ymc/acron/s2c/response/EventOk.java | 8 ------- 12 files changed, 166 deletions(-) delete mode 100644 src/main/java/moe/ymc/acron/s2c/Entity.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/Event.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/EventQueue.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventLagging.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java delete mode 100644 src/main/java/moe/ymc/acron/s2c/response/EventError.java delete 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/Entity.java b/src/main/java/moe/ymc/acron/s2c/Entity.java deleted file mode 100644 index 3e0add1..0000000 --- a/src/main/java/moe/ymc/acron/s2c/Entity.java +++ /dev/null @@ -1,26 +0,0 @@ -package moe.ymc.acron.s2c; - -import com.google.gson.annotations.SerializedName; -import com.mojang.authlib.GameProfile; -import moe.ymc.acron.common.Vec3d; -import moe.ymc.acron.common.WorldKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.UUID; - -public record Entity(@SerializedName("name") @NotNull String name, - @SerializedName("uuid") @NotNull UUID uuid, - @SerializedName("pos") @Nullable Vec3d pos, - @SerializedName("world") @Nullable WorldKey world) { - public Entity(@NotNull net.minecraft.entity.Entity entity) { - this(entity.getName().getString(), - entity.getUuid(), - new Vec3d(entity.getPos()), - WorldKey.create(entity.world.getRegistryKey().getValue())); - } - - public Entity(@NotNull GameProfile profile) { - this(profile.getName(), profile.getId(), null, null); - } -} diff --git a/src/main/java/moe/ymc/acron/s2c/Event.java b/src/main/java/moe/ymc/acron/s2c/Event.java deleted file mode 100644 index 1abc35c..0000000 --- a/src/main/java/moe/ymc/acron/s2c/Event.java +++ /dev/null @@ -1,4 +0,0 @@ -package moe.ymc.acron.s2c; - -public interface Event { -} diff --git a/src/main/java/moe/ymc/acron/s2c/EventQueue.java b/src/main/java/moe/ymc/acron/s2c/EventQueue.java deleted file mode 100644 index 8c470a1..0000000 --- a/src/main/java/moe/ymc/acron/s2c/EventQueue.java +++ /dev/null @@ -1,28 +0,0 @@ -package moe.ymc.acron.s2c; - -import io.netty.channel.Channel; -import io.netty.channel.group.ChannelGroup; -import io.netty.channel.group.DefaultChannelGroup; -import io.netty.util.concurrent.GlobalEventExecutor; -import moe.ymc.acron.serialization.Serializer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.NotNull; - -public class EventQueue { - private static final Logger LOGGER = LogManager.getLogger(); - - private static final ChannelGroup sMessageRecipients = - new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); - - public static void registerMessageRecipient(@NotNull Channel channel) { - sMessageRecipients.add(channel); - } - - public static void enqueue(@NotNull Event message) { - LOGGER.debug("Enqueue: {} ({} channels)", - message, - sMessageRecipients.size()); - sMessageRecipients.writeAndFlush(Serializer.serialize(message)); - } -} diff --git a/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java b/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java deleted file mode 100644 index 610fc58..0000000 --- a/src/main/java/moe/ymc/acron/s2c/event/EventDisconnected.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 4735241..0000000 --- a/src/main/java/moe/ymc/acron/s2c/event/EventEntityDeath.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 30974df..0000000 --- a/src/main/java/moe/ymc/acron/s2c/event/EventLagging.java +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 408680b..0000000 --- a/src/main/java/moe/ymc/acron/s2c/event/EventPlayerJoined.java +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 2769493..0000000 --- a/src/main/java/moe/ymc/acron/s2c/event/EventPlayerMessage.java +++ /dev/null @@ -1,12 +0,0 @@ -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/EventCmdOut.java b/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java deleted file mode 100644 index a4cb798..0000000 --- a/src/main/java/moe/ymc/acron/s2c/response/EventCmdOut.java +++ /dev/null @@ -1,13 +0,0 @@ -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("out") @NotNull String out) - 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 deleted file mode 100644 index 8c1b6a9..0000000 --- a/src/main/java/moe/ymc/acron/s2c/response/EventCmdRes.java +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 370e8f3..0000000 --- a/src/main/java/moe/ymc/acron/s2c/response/EventError.java +++ /dev/null @@ -1,22 +0,0 @@ -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("code") int code, - @SerializedName("message") @Nullable String message) - implements Event { - public enum Code { - SERVER_ERROR(500), - BAD_REQUEST(400), - FORBIDDEN(403) - ; - - public final int value; - Code(int value) { - this.value = value; - } - } -} diff --git a/src/main/java/moe/ymc/acron/s2c/response/EventOk.java b/src/main/java/moe/ymc/acron/s2c/response/EventOk.java deleted file mode 100644 index eb8c82d..0000000 --- a/src/main/java/moe/ymc/acron/s2c/response/EventOk.java +++ /dev/null @@ -1,8 +0,0 @@ -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