Merge pull request #51 from PhantazmNetwork/timer

added zombies timer mod + phantazm integration

.github/workflows/deploy.yml

@@ -17,9 +17,9 @@ jobs:
                     cache: 'gradle'
                     distribution: 'adopt'
             -   name: Set up server
-                run: ./gradlew -PskipBuild=zombies-mapeditor :phantazm-server:setupServer
+                run: ./gradlew -PskipBuild=zombies-mapeditor,zombies-timer :phantazm-server:setupServer
             -   name: Build & copy jar
-                run: ./gradlew -PskipBuild=zombies-mapeditor :phantazm-server:copyJar
+                run: ./gradlew -PskipBuild=zombies-mapeditor,zombies-timer :phantazm-server:copyJar
             -   name: Zip server files
                 run: |
                     cd ./run/server-1

.run/Run Velocity.run.xml

@@ -1,15 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Run Velocity" type="JarApplication">
-        <option name="JAR_PATH" value="$PROJECT_DIR$/run/velocity/velocity.jar"/>
-        <option name="VM_PARAMETERS"
-                value="-Xms512M -Xmx512M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -Dfile.encoding=UTF-8"/>
-        <option name="WORKING_DIRECTORY" value="$ProjectFileDir$\run\velocity"/>
-        <option name="ALTERNATIVE_JRE_PATH"/>
-        <method v="2">
-            <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer"
-                    externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters=""/>
-            <option name="Gradle.BeforeRunTask" enabled="true" tasks="copyJar"
-                    externalProjectPath="$PROJECT_DIR$/velocity" vmOptions="" scriptParameters=""/>
-        </method>
-    </configuration>
-</component>
+  <configuration default="false" name="Run Velocity" type="JarApplication">
+    <option name="JAR_PATH" value="$PROJECT_DIR$/run/velocity/velocity.jar" />
+    <option name="VM_PARAMETERS" value="-Xms512M -Xmx512M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -Dfile.encoding=UTF-8" />
+    <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run/velocity" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <method v="2">
+      <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer" externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters="" />
+      <option name="Gradle.BeforeRunTask" enabled="true" tasks="copyJar" externalProjectPath="$PROJECT_DIR$/velocity" vmOptions="" scriptParameters="" />
+    </method>
+  </configuration>
+</component>

.run/Run server.run.xml

@@ -6,7 +6,7 @@
     <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run/server-1" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer copyJar" externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters="-PskipBuild=zombies-mapeditor" />
+      <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer copyJar" externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters="-PskipBuild=zombies-mapeditor,zombies-timer" />
     </method>
   </configuration>
 </component>

gradle/libs.versions.toml

@@ -28,6 +28,8 @@ examination-string = { module = "net.kyori:examination-string", version.ref = "e
 
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.1.1" }
 
+cloth-config = { module = "me.shedaniel.cloth:cloth-config-fabric", version  = "11.1.106" }
+
 commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.12.0" }
 
 element-core = { module = "com.github.steanky:element-core", version = "0.14.3" }
@@ -40,7 +42,8 @@ ethylene-yaml = { module = "com.github.steanky:ethylene-yaml", version.ref = "et
 ethylene-mapper = { module = "com.github.steanky:ethylene-mapper", version.ref = "ethylene" }
 
 fabric-loader = { module = "net.fabricmc:fabric-loader", version = "0.14.21" }
-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version = "0.83.0+1.19.4" }
+fabric-api-oneNineteen = { module = "net.fabricmc.fabric-api:fabric-api", version = "0.83.0+1.19.4" }
+fabric-api-oneTwenty = { module = "net.fabricmc.fabric-api:fabric-api", version = "0.85.0+1.20.1" }
 
 fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.8" }
 
@@ -60,14 +63,18 @@ libgui = { module = "io.github.cottonmc:LibGui", version = "7.1.0+1.19.4" }
 
 mariadb = { module = "org.mariadb.jdbc:mariadb-java-client", version = "3.0.10" }
 
-minecraft = { module = "com.mojang:minecraft", version = "1.19.4" }
+minecraft-oneNineteen = { module = "com.mojang:minecraft", version = "1.19.4" }
+
+minecraft-oneTwenty = { module = "com.mojang:minecraft", version = "1.20.1" }
 
 minestom = { module = "org.phantazm.Minestom:Minestom", version.ref = "minestom" }
 
 minestom-testing = { module = "org.phantazm.Minestom:testing", version.ref = "minestom" }
 
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "4.7.0" }
 
+modmenu = { module = "com.terraformersmc:modmenu", version = "7.1.0" }
+
 proxima-core = { module = "com.github.steanky:proxima-core", version = "0.6.4" }
 
 renderer = { module = "com.github.0x3C50:Renderer", version = "e1bb03f45e" }
@@ -83,7 +90,9 @@ vector-core = { module = "com.github.steanky:vector-core", version = "0.9.2" }
 
 velocity-api = { module = "com.velocitypowered:velocity-api", version = "3.1.2-SNAPSHOT" }
 
-yarn-mappings = { module = "net.fabricmc:yarn", version = "1.19.4+build.2" }
+yarn-mappings-oneNineteen = { module = "net.fabricmc:yarn", version = "1.19.4+build.2" }
+
+yarn-mappings-oneTwenty = { module = "net.fabricmc:yarn", version = "1.20.1+build.9" }
 
 [plugins]
 fabric-loom = { id = "fabric-loom", version = "1.1.9" }

messaging/src/main/java/org/phantazm/messaging/packet/PacketHandler.java

@@ -50,7 +50,7 @@ public void handleData(@NotNull TOutputReceiver outputReceiver, byte @NotNull []
      * @param outputReceiver The output receiver
      * @param packet         The packet to send
      */
-    protected void output(@NotNull TOutputReceiver outputReceiver, @NotNull Packet packet) {
+    public void output(@NotNull TOutputReceiver outputReceiver, @NotNull Packet packet) {
         sendToReceiver(outputReceiver, packetSerializer.serializePacket(packet));
     }
 

messaging/src/main/java/org/phantazm/messaging/packet/c2s/RoundStartPacket.java

@@ -0,0 +1,28 @@
+package org.phantazm.messaging.packet.c2s;
+
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.messaging.packet.Packet;
+import org.phantazm.messaging.serialization.DataReader;
+import org.phantazm.messaging.serialization.DataWriter;
+
+import java.util.Objects;
+
+public record RoundStartPacket() implements Packet {
+
+    public static final byte ID = 0;
+
+    public static @NotNull RoundStartPacket read(@NotNull DataReader reader) {
+        Objects.requireNonNull(reader, "reader");
+        return new RoundStartPacket();
+    }
+
+    @Override
+    public byte getId() {
+        return ID;
+    }
+
+    @Override
+    public void write(@NotNull DataWriter dataWriter) {
+
+    }
+}

messaging/src/main/java/org/phantazm/messaging/serialization/PacketSerializers.java

@@ -4,8 +4,8 @@
 import org.phantazm.messaging.packet.Packet;
 import org.phantazm.messaging.packet.c2p.MapDataVersionQueryPacket;
 import org.phantazm.messaging.packet.c2p.MapDataVersionResponsePacket;
+import org.phantazm.messaging.packet.c2s.RoundStartPacket;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -15,9 +15,12 @@
  */
 public final class PacketSerializers {
 
+    private static final Map<Byte, Function<DataReader, Packet>> clientToServerDeserializers;
+
     private static final Map<Byte, Function<DataReader, Packet>> clientToProxyDeserializers;
 
     static {
+        clientToServerDeserializers = Map.of(RoundStartPacket.ID, RoundStartPacket::read);
         clientToProxyDeserializers =
                 Map.of(MapDataVersionQueryPacket.ID, MapDataVersionQueryPacket::read, MapDataVersionResponsePacket.ID,
                         MapDataVersionResponsePacket::read);
@@ -29,7 +32,7 @@ private PacketSerializers() {
 
     public static @NotNull PacketSerializer clientToServerSerializer(@NotNull Supplier<DataWriter> writerCreator,
             @NotNull Function<byte[], DataReader> readerCreator) {
-        return new PacketSerializer(Collections.emptyMap(), writerCreator, readerCreator);
+        return new PacketSerializer(clientToServerDeserializers, writerCreator, readerCreator);
     }
 
     public static @NotNull PacketSerializer clientToProxySerializer(@NotNull Supplier<DataWriter> writerCreator,

server/src/main/java/org/phantazm/server/MessagingFeature.java

@@ -14,7 +14,6 @@
 import org.phantazm.messaging.packet.PacketHandler;
 import org.phantazm.messaging.serialization.PacketSerializer;
 import org.phantazm.messaging.serialization.PacketSerializers;
-import org.phantazm.server.config.server.AuthType;
 import org.phantazm.server.packet.BinaryDataReader;
 import org.phantazm.server.packet.BinaryDataWriter;
 
@@ -25,27 +24,30 @@
  */
 public final class MessagingFeature {
 
+    private static PacketHandler<Player> clientToServerHandler;
+
     private MessagingFeature() {
         throw new UnsupportedOperationException();
     }
 
-    static void initialize(@NotNull EventNode<Event> global, @NotNull AuthType authType) {
+    static void initialize(@NotNull EventNode<Event> global) {
         PacketSerializer clientToServer =
                 PacketSerializers.clientToServerSerializer(() -> new BinaryDataWriter(new BinaryWriter()),
                         data -> new BinaryDataReader(new BinaryReader(data)));
         Key clientToServerIdentifier = Key.key(Namespaces.PHANTAZM, MessageChannels.CLIENT_TO_SERVER);
-        Map<String, PacketHandler<Player>> packetHandlers =
-                Map.of(MessageChannels.CLIENT_TO_SERVER, new PacketHandler<>(clientToServer) {
-                    @Override
-                    protected void handlePacket(@NotNull Player player, @NotNull Packet packet) {
+        clientToServerHandler = new PacketHandler<>(clientToServer) {
+            @Override
+            protected void handlePacket(@NotNull Player player, @NotNull Packet packet) {
 
-                    }
+            }
 
-                    @Override
-                    protected void sendToReceiver(@NotNull Player player, byte @NotNull [] data) {
-                        player.sendPluginMessage(clientToServerIdentifier.toString(), data);
-                    }
-                });
+            @Override
+            protected void sendToReceiver(@NotNull Player player, byte @NotNull [] data) {
+                player.sendPluginMessage(clientToServerIdentifier.toString(), data);
+            }
+        };
+        Map<String, PacketHandler<Player>> packetHandlers =
+                Map.of(MessageChannels.CLIENT_TO_SERVER, clientToServerHandler);
 
         global.addListener(PlayerPluginMessageEvent.class, event -> {
             String identifier = event.getIdentifier();
@@ -67,4 +69,7 @@ protected void sendToReceiver(@NotNull Player player, byte @NotNull [] data) {
         });
     }
 
+    public static @NotNull PacketHandler<Player> getClientToServerHandler() {
+        return FeatureUtils.check(clientToServerHandler);
+    }
 }

server/src/main/java/org/phantazm/server/PhantazmServer.java

@@ -244,7 +244,7 @@ private static void initializeFeatures(KeyParser keyParser, EventNode<Event> glo
         LobbyFeature.initialize(global, viewProvider, lobbiesConfig, contextManager);
         ChatFeature.initialize(global, viewProvider, chatConfig, PartyFeature.getPartyHolder().uuidToGuild(),
                 MinecraftServer.getCommandManager());
-        MessagingFeature.initialize(global, serverConfig.serverInfoConfig().authType());
+        MessagingFeature.initialize(global);
         CommandFeature.initialize(MinecraftServer.getCommandManager(), routerStore, viewProvider,
                 LobbyFeature.getFallback());
 

server/src/main/java/org/phantazm/server/ZombiesFeature.java

@@ -180,10 +180,12 @@ static void initialize(@NotNull EventNode<Event> globalEventNode, @NotNull Conte
                                 return new InstanceClientBlockHandler(instance, dimensionType.getMinY(),
                                         dimensionType.getHeight());
                             }, globalEventNode), contextManager, keyParser, mobNoPushTeam, corpseTeam, database,
-                            ZombiesFeature.powerups(), new BasicZombiesPlayerSource(database, viewProvider,
-                            EquipmentFeature::createEquipmentCreator, MobFeature.getModels(), contextManager,
-                            keyParser), mapDependencyProvider -> contextManager.makeContext(entry.getValue().corpse())
-                            .provide(mapDependencyProvider), songLoader);
+                            MessagingFeature.getClientToServerHandler(), ZombiesFeature.powerups(),
+                            new BasicZombiesPlayerSource(database, viewProvider,
+                                    EquipmentFeature::createEquipmentCreator, MobFeature.getModels(), contextManager,
+                                    keyParser),
+                            mapDependencyProvider -> contextManager.makeContext(entry.getValue().corpse())
+                                    .provide(mapDependencyProvider), songLoader);
             providers.put(entry.getKey(), provider);
         }
 

settings.gradle.kts

@@ -33,6 +33,7 @@ sequenceOf(
     "proxima-minestom",
     "server",
     "stats",
+    "zombies-timer",
     "velocity",
     "zombies",
     "zombies-mapdata",

zombies-mapeditor/build.gradle.kts

@@ -1,7 +1,7 @@
 // https://youtrack.jetbrains.com/issue/KTIJ-19369/False-positive-can-t-be-called-in-this-context-by-implicit-recei
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id("phantazm.java-library-conventions")
+    id("phantazm.java-conventions")
 
     alias(libs.plugins.fabric.loom)
 }
@@ -33,16 +33,16 @@ repositories {
 }
 
 dependencies {
-    minecraft(libs.minecraft)
-    mappings(libs.yarn.mappings) {
+    minecraft(libs.minecraft.oneNineteen)
+    mappings(libs.yarn.mappings.oneNineteen) {
         artifact {
             classifier = "v2"
         }
     }
 
     modImplementation(libs.fabric.loader)
     modImplementation(libs.libgui)
-    modImplementation(libs.fabric.api)
+    modImplementation(libs.fabric.api.oneNineteen)
     modImplementation(libs.renderer)
 
     implementation(projects.phantazmCommons)
@@ -83,8 +83,6 @@ tasks.compileJava {
 
 tasks.jar {
     from("../LICENSE") {
-        rename {
-            "${it}_${base.archivesName.get()}"
-        }
+        rename { "${it}_${archiveBaseName.get()}" }
     }
 }

zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java

@@ -13,6 +13,7 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.fabricmc.loader.api.FabricLoader;
 import net.kyori.adventure.key.Key;
@@ -24,7 +25,6 @@
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -44,6 +44,7 @@
 import org.phantazm.zombies.map.MapSettingsInfo;
 import org.phantazm.zombies.mapeditor.client.packet.PacketByteBufDataReader;
 import org.phantazm.zombies.mapeditor.client.packet.PacketByteBufDataWriter;
+import org.phantazm.zombies.mapeditor.client.packet.PhantazmPacket;
 import org.phantazm.zombies.mapeditor.client.render.ObjectRenderer;
 import org.phantazm.zombies.mapeditor.client.ui.MainGui;
 import org.phantazm.zombies.mapeditor.client.ui.NewObjectGui;
@@ -89,16 +90,10 @@ public void onInitializeClient() {
                         TranslationKeys.CATEGORY_MAPEDITOR_ALL));
 
         PacketSerializer clientToProxy = PacketSerializers.clientToProxySerializer(
-                () -> new PacketByteBufDataWriter(new PacketByteBuf(Unpooled.buffer())),
+                () -> new PacketByteBufDataWriter(PacketByteBufs.create()),
                 data -> new PacketByteBufDataReader(new PacketByteBuf(Unpooled.wrappedBuffer(data))));
         Identifier clientToProxyIdentifier = Identifier.of(Namespaces.PHANTAZM, MessageChannels.CLIENT_TO_PROXY);
         if (clientToProxyIdentifier != null) {
-            ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
-                byte[] data = clientToProxy.serializePacket(new MapDataVersionQueryPacket());
-                sender.sendPacket(new CustomPayloadC2SPacket(clientToProxyIdentifier,
-                        new PacketByteBuf(Unpooled.wrappedBuffer(data))));
-            }));
-
             PacketHandler<PacketSender> clientToProxyHandler = new PacketHandler<>(clientToProxy) {
                 @Override
                 protected void handlePacket(@NotNull PacketSender packetSender, @NotNull Packet packet) {
@@ -125,10 +120,12 @@ protected void sendToReceiver(@NotNull PacketSender packetSender, byte @NotNull
                     packetSender.sendPacket(clientToProxyIdentifier, new PacketByteBuf(Unpooled.wrappedBuffer(data)));
                 }
             };
-            ClientPlayNetworking.registerGlobalReceiver(clientToProxyIdentifier,
-                    (client, handler, buf, responseSender) -> {
-                        clientToProxyHandler.handleData(responseSender, buf.getWrittenBytes());
-                    });
+            ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
+                clientToProxyHandler.output(sender, new MapDataVersionQueryPacket());
+            }));
+            ClientPlayNetworking.registerGlobalReceiver(PhantazmPacket.TYPE, ((packet, player, responseSender) -> {
+                clientToProxyHandler.handleData(responseSender, packet.data());
+            }));
         }
 
         ClientTickEvents.END_CLIENT_TICK.register(new ClientTickEvents.EndTick() {

zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/packet/PhantazmPacket.java

@@ -0,0 +1,31 @@
+package org.phantazm.zombies.mapeditor.client.packet;
+
+import net.fabricmc.fabric.api.networking.v1.FabricPacket;
+import net.fabricmc.fabric.api.networking.v1.PacketType;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.commons.Namespaces;
+import org.phantazm.messaging.MessageChannels;
+
+public record PhantazmPacket(byte @NotNull [] data) implements FabricPacket {
+
+    public static final PacketType<PhantazmPacket> TYPE =
+            PacketType.create(new Identifier(Namespaces.PHANTAZM, MessageChannels.CLIENT_TO_SERVER),
+                    PhantazmPacket::new);
+
+    public PhantazmPacket(PacketByteBuf buf) {
+        this(buf.getWrittenBytes());
+    }
+
+    @Override
+    public void write(PacketByteBuf buf) {
+        buf.writeBytes(data);
+    }
+
+    @Override
+    public PacketType<?> getType() {
+        return TYPE;
+    }
+
+}