From 5fdfc4d40607137d63202236fd66f2277bedf698 Mon Sep 17 00:00:00 2001
From: tahmid-23 <60953955+tahmid-23@users.noreply.github.com>
Date: Tue, 11 Jul 2023 05:26:29 -0400
Subject: [PATCH 1/4] added zombies timer mod + phantazm integration

---
 .github/workflows/deploy.yml                  |   4 +-
 .run/Run Velocity.run.xml                     |  25 +--
 .run/Run server.run.xml                       |   2 +-
 gradle/libs.versions.toml                     |  15 +-
 .../messaging/packet/PacketHandler.java       |   2 +-
 .../packet/c2s/RoundStartPacket.java          |  28 +++
 .../serialization/PacketSerializers.java      |   7 +-
 .../org/phantazm/server/MessagingFeature.java |  29 +--
 .../org/phantazm/server/PhantazmServer.java   |   2 +-
 .../org/phantazm/server/ZombiesFeature.java   |  18 +-
 settings.gradle.kts                           |   1 +
 zombies-mapeditor/build.gradle.kts            |   8 +-
 .../mapeditor/client/MapeditorClient.java     |  11 +-
 .../client/packet/PhantazmPacket.java         |  31 +++
 zombies-timer/build.gradle.kts                |  69 +++++++
 .../ZombiesAutoSplitsClient.java              | 188 ++++++++++++++++++
 .../config/ZombiesAutoSplitsConfig.java       |  66 ++++++
 .../ZombiesAutoSplitsConfigProcessor.java     |  27 +++
 .../event/ClientSoundCallback.java            |  18 ++
 .../messaging/PhantazmMessagingHandler.java   |  40 ++++
 .../mixin/SoundSystemMixin.java               |  22 ++
 .../ZombiesAutoSplitsModMenuApiImpl.java      |  60 ++++++
 .../packet/PacketByteBufDataReader.java       |  34 ++++
 .../packet/PacketByteBufDataWriter.java       |  39 ++++
 .../packet/PhantazmPacket.java                |  31 +++
 .../render/RenderTimeHandler.java             |  50 +++++
 .../sound/AutoSplitSoundInterceptor.java      |  45 +++++
 .../splitter/CompositeSplitter.java           |  52 +++++
 .../splitter/LiveSplitSplitter.java           |  13 ++
 .../splitter/internal/InternalSplitter.java   |  70 +++++++
 .../socket/LiveSplitSocketSplitter.java       |  53 +++++
 .../tick/KeyInputHandler.java                 |  52 +++++
 .../src/main/resources/fabric.mod.json        |  33 +++
 .../resources/zombiesautosplits.mixin.json    |  14 ++
 zombies/build.gradle.kts                      |   1 +
 .../zombies/command/RoundCommand.java         |   8 +-
 .../java/org/phantazm/zombies/map/Round.java  |  11 +-
 .../map/handler/BasicRoundHandler.java        |   5 +-
 .../map/objects/BasicMapObjectsSource.java    |   9 +-
 .../zombies/scene/ZombiesSceneProvider.java   |  10 +-
 40 files changed, 1139 insertions(+), 64 deletions(-)
 create mode 100644 messaging/src/main/java/org/phantazm/messaging/packet/c2s/RoundStartPacket.java
 create mode 100644 zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/packet/PhantazmPacket.java
 create mode 100644 zombies-timer/build.gradle.kts
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java
 create mode 100644 zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java
 create mode 100644 zombies-timer/src/main/resources/fabric.mod.json
 create mode 100644 zombies-timer/src/main/resources/zombiesautosplits.mixin.json

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bafc3aa60..1160f02c1 100644
--- a/.github/workflows/deploy.yml
+++ b/.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
diff --git a/.run/Run Velocity.run.xml b/.run/Run Velocity.run.xml
index cbb04a6e3..f3c46f1ae 100644
--- a/.run/Run Velocity.run.xml	
+++ b/.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>
\ No newline at end of file
diff --git a/.run/Run server.run.xml b/.run/Run server.run.xml
index 1589e2f32..694ab74e5 100644
--- a/.run/Run server.run.xml	
+++ b/.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>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aab30ec55..5b3c374b8 100644
--- a/gradle/libs.versions.toml
+++ b/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,7 +63,9 @@ 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" }
 
@@ -68,6 +73,8 @@ minestom-testing = { module = "org.phantazm.Minestom:testing", version.ref = "mi
 
 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.2" }
 
 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" }
diff --git a/messaging/src/main/java/org/phantazm/messaging/packet/PacketHandler.java b/messaging/src/main/java/org/phantazm/messaging/packet/PacketHandler.java
index a1481c92d..48250f55b 100644
--- a/messaging/src/main/java/org/phantazm/messaging/packet/PacketHandler.java
+++ b/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));
     }
 
diff --git a/messaging/src/main/java/org/phantazm/messaging/packet/c2s/RoundStartPacket.java b/messaging/src/main/java/org/phantazm/messaging/packet/c2s/RoundStartPacket.java
new file mode 100644
index 000000000..9ed2553c8
--- /dev/null
+++ b/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) {
+
+    }
+}
diff --git a/messaging/src/main/java/org/phantazm/messaging/serialization/PacketSerializers.java b/messaging/src/main/java/org/phantazm/messaging/serialization/PacketSerializers.java
index bfd064984..e1a24a449 100644
--- a/messaging/src/main/java/org/phantazm/messaging/serialization/PacketSerializers.java
+++ b/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,
diff --git a/server/src/main/java/org/phantazm/server/MessagingFeature.java b/server/src/main/java/org/phantazm/server/MessagingFeature.java
index c060a0313..d42ff26bc 100644
--- a/server/src/main/java/org/phantazm/server/MessagingFeature.java
+++ b/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);
+    }
 }
diff --git a/server/src/main/java/org/phantazm/server/PhantazmServer.java b/server/src/main/java/org/phantazm/server/PhantazmServer.java
index c46cef317..aa19faf9f 100644
--- a/server/src/main/java/org/phantazm/server/PhantazmServer.java
+++ b/server/src/main/java/org/phantazm/server/PhantazmServer.java
@@ -242,7 +242,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());
 
diff --git a/server/src/main/java/org/phantazm/server/ZombiesFeature.java b/server/src/main/java/org/phantazm/server/ZombiesFeature.java
index 0921cbeec..ba76f2bf0 100644
--- a/server/src/main/java/org/phantazm/server/ZombiesFeature.java
+++ b/server/src/main/java/org/phantazm/server/ZombiesFeature.java
@@ -58,7 +58,10 @@
 import org.phantazm.zombies.map.action.door.DoorSendMessageAction;
 import org.phantazm.zombies.map.action.door.DoorSendOpenedRoomsAction;
 import org.phantazm.zombies.map.action.room.SpawnMobsAction;
-import org.phantazm.zombies.map.action.round.*;
+import org.phantazm.zombies.map.action.round.AnnounceRoundAction;
+import org.phantazm.zombies.map.action.round.RevivePlayersAction;
+import org.phantazm.zombies.map.action.round.SelectBombedRoom;
+import org.phantazm.zombies.map.action.round.SpawnPowerupAction;
 import org.phantazm.zombies.map.action.wave.SelectPowerupZombieAction;
 import org.phantazm.zombies.map.shop.display.*;
 import org.phantazm.zombies.map.shop.display.creator.*;
@@ -68,7 +71,6 @@
 import org.phantazm.zombies.map.shop.predicate.logic.AndPredicate;
 import org.phantazm.zombies.map.shop.predicate.logic.NotPredicate;
 import org.phantazm.zombies.map.shop.predicate.logic.OrPredicate;
-import org.phantazm.zombies.map.shop.predicate.logic.XorPredicate;
 import org.phantazm.zombies.mob.BasicMobSpawnerSource;
 import org.phantazm.zombies.mob.MobSpawnerSource;
 import org.phantazm.zombies.player.BasicZombiesPlayerSource;
@@ -77,7 +79,6 @@
 import org.phantazm.zombies.powerup.FileSystemPowerupLoader;
 import org.phantazm.zombies.powerup.PowerupInfo;
 import org.phantazm.zombies.powerup.action.*;
-import org.phantazm.zombies.powerup.action.PlaySoundAction;
 import org.phantazm.zombies.powerup.predicate.ImmediateDeactivationPredicate;
 import org.phantazm.zombies.powerup.predicate.TimedDeactivationPredicate;
 import org.phantazm.zombies.powerup.visual.HologramVisual;
@@ -184,10 +185,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);
         }
 
@@ -228,7 +231,6 @@ private static void registerElementClasses(ContextManager contextManager) {
         contextManager.registerElementClass(AndPredicate.class);
         contextManager.registerElementClass(OrPredicate.class);
         contextManager.registerElementClass(NotPredicate.class);
-        contextManager.registerElementClass(XorPredicate.class);
 
         contextManager.registerElementClass(EquipmentCostPredicate.class);
         contextManager.registerElementClass(EquipmentSpacePredicate.class);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ac02d801..a11c2cd7d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,6 +33,7 @@ sequenceOf(
     "proxima-minestom",
     "server",
     "stats",
+    "zombies-timer",
     "velocity",
     "zombies",
     "zombies-mapdata",
diff --git a/zombies-mapeditor/build.gradle.kts b/zombies-mapeditor/build.gradle.kts
index 57f78bc2d..d796dc8eb 100644
--- a/zombies-mapeditor/build.gradle.kts
+++ b/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,8 +33,8 @@ repositories {
 }
 
 dependencies {
-    minecraft(libs.minecraft)
-    mappings(libs.yarn.mappings) {
+    minecraft(libs.minecraft.oneNineteen)
+    mappings(libs.yarn.mappings.oneNineteen) {
         artifact {
             classifier = "v2"
         }
@@ -42,7 +42,7 @@ dependencies {
 
     modImplementation(libs.fabric.loader)
     modImplementation(libs.libgui)
-    modImplementation(libs.fabric.api)
+    modImplementation(libs.fabric.api.oneNineteen)
     modImplementation(libs.renderer)
 
     implementation(projects.phantazmCommons)
diff --git a/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java b/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java
index 19a88d6a8..fd8f3f230 100644
--- a/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java
+++ b/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;
@@ -44,6 +45,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,7 +91,7 @@ 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) {
@@ -125,10 +127,9 @@ 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());
-                    });
+            ClientPlayNetworking.registerGlobalReceiver(PhantazmPacket.TYPE, ((packet, player, responseSender) -> {
+                clientToProxyHandler.handleData(responseSender, packet.data());
+            }));
         }
 
         ClientTickEvents.END_CLIENT_TICK.register(new ClientTickEvents.EndTick() {
diff --git a/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/packet/PhantazmPacket.java b/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/packet/PhantazmPacket.java
new file mode 100644
index 000000000..1e6b64cd0
--- /dev/null
+++ b/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;
+    }
+
+}
diff --git a/zombies-timer/build.gradle.kts b/zombies-timer/build.gradle.kts
new file mode 100644
index 000000000..b90888dd4
--- /dev/null
+++ b/zombies-timer/build.gradle.kts
@@ -0,0 +1,69 @@
+// 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-conventions")
+
+    alias(libs.plugins.fabric.loom)
+}
+
+version = "0.1.0+1.20.1"
+
+base {
+    archivesName.set("ZombiesAutoSplits")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+repositories {
+    mavenCentral()
+    maven("https://dl.cloudsmith.io/public/steanky/ethylene/maven/")
+    maven("https://dl.cloudsmith.io/public/steanky/toolkit/maven/")
+    maven("https://maven.shedaniel.me/")
+    maven("https://maven.terraformersmc.com/releases/")
+}
+
+dependencies {
+    minecraft(libs.minecraft.oneTwenty)
+    mappings(libs.yarn.mappings.oneTwenty) {
+        artifact {
+            classifier = "v2"
+        }
+    }
+
+    modImplementation(libs.fabric.loader)
+    modImplementation(libs.fabric.api.oneTwenty)
+    modImplementation(libs.modmenu)
+    modImplementation(libs.cloth.config)
+
+    implementation(projects.phantazmCommons)
+    implementation(projects.phantazmMessaging)
+    implementation(libs.ethylene.yaml)
+
+    include(projects.phantazmCommons)
+    include(projects.phantazmMessaging)
+    include(libs.ethylene.core)
+    include(libs.ethylene.yaml)
+    include(libs.toolkit.collection)
+    include(libs.toolkit.function)
+    include(libs.snakeyaml)
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+}
+
+tasks.processResources {
+    inputs.property("version", project.version)
+
+    filesMatching("fabric.mod.json") {
+        expand("version" to project.version)
+    }
+}
+
+tasks.jar {
+    from("LICENSE") {
+        rename { "${it}_${archiveBaseName.get()}"}
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java
new file mode 100644
index 000000000..ecc284ccd
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java
@@ -0,0 +1,188 @@
+package org.phantazm.zombiesautosplits;
+
+import com.github.steanky.ethylene.codec.yaml.YamlCodec;
+import com.github.steanky.ethylene.core.BasicConfigHandler;
+import com.github.steanky.ethylene.core.ConfigCodec;
+import com.github.steanky.ethylene.core.ConfigHandler;
+import com.github.steanky.ethylene.core.loader.SyncFileConfigLoader;
+import io.netty.buffer.Unpooled;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.network.PacketByteBuf;
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
+import org.phantazm.messaging.packet.PacketHandler;
+import org.phantazm.messaging.serialization.PacketSerializer;
+import org.phantazm.messaging.serialization.PacketSerializers;
+import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfig;
+import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfigProcessor;
+import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
+import org.phantazm.zombiesautosplits.messaging.PhantazmMessagingHandler;
+import org.phantazm.zombiesautosplits.packet.PacketByteBufDataReader;
+import org.phantazm.zombiesautosplits.packet.PacketByteBufDataWriter;
+import org.phantazm.zombiesautosplits.packet.PhantazmPacket;
+import org.phantazm.zombiesautosplits.render.RenderTimeHandler;
+import org.phantazm.zombiesautosplits.sound.AutoSplitSoundInterceptor;
+import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombiesautosplits.splitter.internal.InternalSplitter;
+import org.phantazm.zombiesautosplits.splitter.socket.LiveSplitSocketSplitter;
+import org.phantazm.zombiesautosplits.tick.KeyInputHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+public class ZombiesAutoSplitsClient implements ClientModInitializer {
+
+    public static final String MODID = "zombiesautosplits";
+
+    private static ZombiesAutoSplitsClient instance = null;
+
+    private final KeyBinding autoSplitsKeybind =
+            new KeyBinding("Toggle AutoSplits", GLFW.GLFW_KEY_SEMICOLON, "Phantazm");
+
+    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+
+    private final Logger logger = LoggerFactory.getLogger(MODID);
+
+    private final ConfigHandler configHandler = new BasicConfigHandler();
+
+    private final ConfigHandler.ConfigKey<ZombiesAutoSplitsConfig> configKey =
+            new ConfigHandler.ConfigKey<>(ZombiesAutoSplitsConfig.class, "zombiesautosplits_config");
+
+    private final Collection<LiveSplitSplitter> splitters = new ArrayList<>(2);
+
+    private RenderTimeHandler renderTimeHandler;
+
+    private ZombiesAutoSplitsConfig config;
+
+    public static @NotNull ZombiesAutoSplitsClient getInstance() {
+        return instance;
+    }
+
+    private CompletableFuture<ZombiesAutoSplitsConfig> loadConfigFromFile() {
+        return configHandler.writeDefaults().thenCompose((unused) -> configHandler.loadData(configKey));
+    }
+
+    public @NotNull ZombiesAutoSplitsConfig getConfig() {
+        return config;
+    }
+
+    public void setConfig(@NotNull ZombiesAutoSplitsConfig config) {
+        for (LiveSplitSplitter splitter : splitters) {
+            splitter.cancel();
+        }
+        splitters.clear();
+
+        this.config = config;
+
+        if (config.useLiveSplits()) {
+            splitters.add(new LiveSplitSocketSplitter(executor, config.host(), config.port()));
+        }
+        if (config.useInternal()) {
+            InternalSplitter internalSplitter = new InternalSplitter(executor);
+            splitters.add(internalSplitter);
+            renderTimeHandler.setSplitter(internalSplitter);
+        }
+        else {
+            renderTimeHandler.setSplitter(null);
+        }
+    }
+
+    public void saveConfig() {
+        configHandler.writeData(configKey, config).whenComplete((ignored, throwable) -> {
+            if (throwable != null) {
+                logger.error("Failed to save config", throwable);
+            }
+        });
+    }
+
+    @Override
+    public void onInitializeClient() {
+        renderTimeHandler = new RenderTimeHandler(MinecraftClient.getInstance(), 0xFFFFFF);
+
+        initConfig();
+        initEvents();
+        initKeyBindings();
+
+        instance = this;
+    }
+
+    private void initConfig() {
+        ConfigCodec codec = new YamlCodec();
+        Path configPath = FabricLoader.getInstance().getConfigDir().resolve("zombiesautosplits");
+        String configFileName;
+        if (codec.getPreferredExtensions().isEmpty()) {
+            configFileName = "config";
+        }
+        else {
+            configFileName = "config." + codec.getPreferredExtension();
+        }
+
+        try {
+            Files.createDirectories(configPath);
+        }
+        catch (IOException e) {
+            logger.error("Failed to create config directory", e);
+            return;
+        }
+        configPath = configPath.resolve(configFileName);
+
+        ZombiesAutoSplitsConfig defaultConfig =
+                new ZombiesAutoSplitsConfig(ZombiesAutoSplitsConfig.DEFAULT_HOST, ZombiesAutoSplitsConfig.DEFAULT_PORT,
+                        ZombiesAutoSplitsConfig.DEFAULT_USE_LIVE_SPLITS, ZombiesAutoSplitsConfig.DEFAULT_USE_INTERNAL);
+        configHandler.registerLoader(configKey,
+                new SyncFileConfigLoader<>(new ZombiesAutoSplitsConfigProcessor(), defaultConfig, configPath, codec));
+
+        ZombiesAutoSplitsConfig loadedConfig;
+        try {
+            loadedConfig = loadConfigFromFile().get();
+        }
+        catch (InterruptedException | ExecutionException e) {
+            logger.error("Failed to load config", e);
+            return;
+        }
+        setConfig(loadedConfig);
+    }
+
+    private void initEvents() {
+        CompositeSplitter compositeSplitter = new CompositeSplitter(MinecraftClient.getInstance(), logger, splitters);
+
+        AutoSplitSoundInterceptor soundInterceptor =
+                new AutoSplitSoundInterceptor(MinecraftClient.getInstance(), compositeSplitter);
+        ClientTickEvents.END_CLIENT_TICK.register(new KeyInputHandler(autoSplitsKeybind, compositeSplitter));
+        HudRenderCallback.EVENT.register(renderTimeHandler);
+        ClientSoundCallback.EVENT.register(soundInterceptor);
+
+        PacketSerializer packetSerializer =
+                PacketSerializers.clientToServerSerializer(() -> new PacketByteBufDataWriter(PacketByteBufs.create()),
+                        data -> new PacketByteBufDataReader(new PacketByteBuf(Unpooled.wrappedBuffer(data))));
+        PacketHandler<PacketSender> clientToServerHandler =
+                new PhantazmMessagingHandler(packetSerializer, PhantazmPacket.TYPE.getId(), compositeSplitter);
+        ClientPlayNetworking.registerGlobalReceiver(PhantazmPacket.TYPE, (packet, player, responseSender) -> {
+            clientToServerHandler.handleData(responseSender, packet.data());
+        });
+    }
+
+    private void initKeyBindings() {
+        KeyBindingHelper.registerKeyBinding(autoSplitsKeybind);
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java
new file mode 100644
index 000000000..141dfa828
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java
@@ -0,0 +1,66 @@
+package org.phantazm.zombiesautosplits.config;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public record ZombiesAutoSplitsConfig(@NotNull String host, int port, boolean useLiveSplits, boolean useInternal) {
+
+    public static final String DEFAULT_HOST = "localhost";
+
+    public static final int DEFAULT_PORT = 16834;
+
+    public static final boolean DEFAULT_USE_LIVE_SPLITS = false;
+
+    public static final boolean DEFAULT_USE_INTERNAL = true;
+
+    public ZombiesAutoSplitsConfig {
+        Objects.requireNonNull(host, "host");
+    }
+
+    public @NotNull Builder toBuilder() {
+        return new Builder()
+                .setHost(host)
+                .setPort(port)
+                .setUseLiveSplits(useLiveSplits)
+                .setUseInternal(useInternal);
+    }
+
+    public static class Builder {
+
+        private String host = DEFAULT_HOST;
+
+        private int port = DEFAULT_PORT;
+
+        private boolean useLiveSplits = DEFAULT_USE_LIVE_SPLITS;
+
+        private boolean useInternal = DEFAULT_USE_INTERNAL;
+
+        public @NotNull Builder setHost(String host) {
+            Objects.requireNonNull(host, "host");
+            this.host = host;
+            return this;
+        }
+
+        public @NotNull Builder setPort(int port) {
+            this.port = port;
+            return this;
+        }
+
+        public @NotNull Builder setUseLiveSplits(boolean useLiveSplits) {
+            this.useLiveSplits = useLiveSplits;
+            return this;
+        }
+
+        public @NotNull Builder setUseInternal(boolean useInternal) {
+            this.useInternal = useInternal;
+            return this;
+        }
+
+        public @NotNull ZombiesAutoSplitsConfig build() {
+            return new ZombiesAutoSplitsConfig(host, port, useLiveSplits, useInternal);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java
new file mode 100644
index 000000000..8d94196d4
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java
@@ -0,0 +1,27 @@
+package org.phantazm.zombiesautosplits.config;
+
+import com.github.steanky.ethylene.core.ConfigElement;
+import com.github.steanky.ethylene.core.collection.ConfigNode;
+import com.github.steanky.ethylene.core.processor.ConfigProcessException;
+import com.github.steanky.ethylene.core.processor.ConfigProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public class ZombiesAutoSplitsConfigProcessor implements ConfigProcessor<ZombiesAutoSplitsConfig> {
+    @Override
+    public @NotNull ZombiesAutoSplitsConfig dataFromElement(@NotNull ConfigElement element) throws ConfigProcessException {
+        String host = element.getStringOrThrow("host");
+        int port = element.getNumberOrThrow("port").intValue();
+        if (port < 1 || port > 65535) {
+            throw new ConfigProcessException("Invalid port");
+        }
+        boolean useLiveSplits = element.getBooleanOrThrow("useLiveSplits");
+        boolean useInternal = element.getBooleanOrThrow("useInternal");
+
+        return new ZombiesAutoSplitsConfig(host, port, useLiveSplits, useInternal);
+    }
+
+    @Override
+    public @NotNull ConfigElement elementFromData(@NotNull ZombiesAutoSplitsConfig config) {
+        return ConfigNode.of("host", config.host(), "port", config.port(), "useLiveSplits", config.useLiveSplits(), "useInternal", config.useInternal());
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java
new file mode 100644
index 000000000..d892cd2e8
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java
@@ -0,0 +1,18 @@
+package org.phantazm.zombiesautosplits.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.client.sound.SoundInstance;
+import org.jetbrains.annotations.NotNull;
+
+public interface ClientSoundCallback {
+
+    Event<ClientSoundCallback> EVENT = EventFactory.createArrayBacked(ClientSoundCallback.class, callbacks -> (sound) -> {
+        for (ClientSoundCallback callback : callbacks) {
+            callback.onPlaySound(sound);
+        }
+    });
+
+    void onPlaySound(@NotNull SoundInstance sound);
+
+}
\ No newline at end of file
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java
new file mode 100644
index 000000000..b5f5df63b
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java
@@ -0,0 +1,40 @@
+package org.phantazm.zombiesautosplits.messaging;
+
+import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.messaging.packet.Packet;
+import org.phantazm.messaging.packet.PacketHandler;
+import org.phantazm.messaging.packet.c2s.RoundStartPacket;
+import org.phantazm.messaging.serialization.PacketSerializer;
+import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+
+import java.util.Objects;
+
+public class PhantazmMessagingHandler extends PacketHandler<PacketSender> {
+
+    private final CompositeSplitter compositeSplitter;
+
+    private final Identifier identifier;
+
+    public PhantazmMessagingHandler(@NotNull PacketSerializer packetSerializer, @NotNull Identifier identifier,
+            @NotNull CompositeSplitter compositeSplitter) {
+        super(packetSerializer);
+        this.identifier = Objects.requireNonNull(identifier, "identifier");
+        this.compositeSplitter = Objects.requireNonNull(compositeSplitter, "compositeSplitter");
+    }
+
+    @Override
+    protected void handlePacket(@NotNull PacketSender packetSender, @NotNull Packet packet) {
+        if (packet instanceof RoundStartPacket) {
+            compositeSplitter.split();
+        }
+    }
+
+    @Override
+    protected void sendToReceiver(@NotNull PacketSender packetSender, byte @NotNull [] data) {
+        packetSender.sendPacket(identifier, new PacketByteBuf(Unpooled.wrappedBuffer(data)));
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java
new file mode 100644
index 000000000..1265ed3d2
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java
@@ -0,0 +1,22 @@
+package org.phantazm.zombiesautosplits.mixin;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.client.sound.SoundSystem;
+import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Environment(EnvType.CLIENT)
+@Mixin(SoundSystem.class)
+abstract class SoundSystemMixin {
+
+    @Inject(at = @At("HEAD"), method = "play(Lnet/minecraft/client/sound/SoundInstance;)V")
+    private void play(SoundInstance sound, CallbackInfo callbackInfo) {
+        ClientSoundCallback.EVENT.invoker().onPlaySound(sound);
+    }
+
+}
\ No newline at end of file
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
new file mode 100644
index 000000000..339a17a2a
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
@@ -0,0 +1,60 @@
+package org.phantazm.zombiesautosplits.modmenu;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import me.shedaniel.clothconfig2.api.ConfigBuilder;
+import me.shedaniel.clothconfig2.api.ConfigCategory;
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import net.minecraft.text.Text;
+import org.phantazm.zombiesautosplits.ZombiesAutoSplitsClient;
+import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfig;
+
+public class ZombiesAutoSplitsModMenuApiImpl implements ModMenuApi {
+
+    private final ConfigScreenFactory<?> screenFactory = screen -> {
+        ZombiesAutoSplitsClient autoSplits = ZombiesAutoSplitsClient.getInstance();
+        ZombiesAutoSplitsConfig autoSplitsConfig = autoSplits.getConfig();
+        ZombiesAutoSplitsConfig.Builder autoSplitsConfigBuilder = autoSplitsConfig.toBuilder();
+
+        ConfigBuilder configBuilder = ConfigBuilder.create()
+                .setParentScreen(screen)
+                .setTitle(Text.of("Zombies AutoSplits Config"));
+
+        ConfigEntryBuilder entryBuilder = configBuilder.entryBuilder();
+        ConfigCategory main = configBuilder.getOrCreateCategory(Text.of("Config"));
+        main.addEntry(entryBuilder.startStrField(Text.of("Host"), autoSplitsConfig.host())
+                .setDefaultValue(ZombiesAutoSplitsConfig.DEFAULT_HOST)
+                .setTooltip(Text.of("The host of the LiveSplits server. Most likely localhost."))
+                .setSaveConsumer(autoSplitsConfigBuilder::setHost)
+                .build());
+        main.addEntry(entryBuilder.startIntField(Text.of("Port"), autoSplitsConfig.port())
+                .setDefaultValue(ZombiesAutoSplitsConfig.DEFAULT_PORT)
+                .setMin(1)
+                .setMax(65535)
+                .setTooltip(Text.of("The port of the LiveSplits server. Use -1 for the internal splitter."))
+                .setSaveConsumer(autoSplitsConfigBuilder::setPort)
+                .build());
+        main.addEntry(entryBuilder.startBooleanToggle(Text.of("Use LiveSplits"), autoSplitsConfig.useLiveSplits())
+                .setDefaultValue(ZombiesAutoSplitsConfig.DEFAULT_USE_LIVE_SPLITS)
+                .setTooltip(Text.of("Whether to use the LiveSplits splitter."))
+                .setSaveConsumer(autoSplitsConfigBuilder::setUseLiveSplits)
+                .build());
+        main.addEntry(entryBuilder.startBooleanToggle(Text.of("Use Internal"), autoSplitsConfig.useInternal())
+                .setDefaultValue(ZombiesAutoSplitsConfig.DEFAULT_USE_INTERNAL)
+                .setTooltip(Text.of("Whether to use the internal splitter."))
+                .setSaveConsumer(autoSplitsConfigBuilder::setUseInternal)
+                .build());
+
+        configBuilder.setSavingRunnable(() -> {
+            autoSplits.setConfig(autoSplitsConfigBuilder.build());
+            autoSplits.saveConfig();
+        });
+
+        return configBuilder.build();
+    };
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return screenFactory;
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java
new file mode 100644
index 000000000..8fdaeeae8
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java
@@ -0,0 +1,34 @@
+package org.phantazm.zombiesautosplits.packet;
+
+import net.minecraft.network.PacketByteBuf;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.messaging.serialization.DataReader;
+
+import java.util.Objects;
+
+/**
+ * A {@link DataReader} that reads from a {@link PacketByteBuf}.
+ */
+public class PacketByteBufDataReader implements DataReader {
+
+    private final PacketByteBuf packetByteBuf;
+
+    /**
+     * Creates a {@link PacketByteBufDataReader}.
+     *
+     * @param packetByteBuf The {@link PacketByteBuf} to read from
+     */
+    public PacketByteBufDataReader(@NotNull PacketByteBuf packetByteBuf) {
+        this.packetByteBuf = Objects.requireNonNull(packetByteBuf, "packetByteBuf");
+    }
+
+    @Override
+    public byte readByte() {
+        return packetByteBuf.readByte();
+    }
+
+    @Override
+    public int readInt() {
+        return packetByteBuf.readInt();
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java
new file mode 100644
index 000000000..1a90cf6c3
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java
@@ -0,0 +1,39 @@
+package org.phantazm.zombiesautosplits.packet;
+
+import net.minecraft.network.PacketByteBuf;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.messaging.serialization.DataWriter;
+
+import java.util.Objects;
+
+/**
+ * A {@link DataWriter} that writes to a {@link PacketByteBuf}.
+ */
+public class PacketByteBufDataWriter implements DataWriter {
+
+    private final PacketByteBuf packetByteBuf;
+
+    /**
+     * Creates a {@link PacketByteBufDataWriter}.
+     *
+     * @param packetByteBuf The {@link PacketByteBuf} to write to
+     */
+    public PacketByteBufDataWriter(@NotNull PacketByteBuf packetByteBuf) {
+        this.packetByteBuf = Objects.requireNonNull(packetByteBuf, "packetByteBuf");
+    }
+
+    @Override
+    public void writeByte(byte data) {
+        packetByteBuf.writeByte(data);
+    }
+
+    @Override
+    public void writeInt(int data) {
+        packetByteBuf.writeInt(data);
+    }
+
+    @Override
+    public byte @NotNull [] toByteArray() {
+        return packetByteBuf.array();
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java
new file mode 100644
index 000000000..4dcadb859
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java
@@ -0,0 +1,31 @@
+package org.phantazm.zombiesautosplits.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;
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java
new file mode 100644
index 000000000..9251fa8ae
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java
@@ -0,0 +1,50 @@
+package org.phantazm.zombiesautosplits.render;
+
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.util.Window;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.phantazm.zombiesautosplits.splitter.internal.InternalSplitter;
+
+import java.util.Objects;
+
+public class RenderTimeHandler implements HudRenderCallback {
+
+    private final MinecraftClient client;
+
+    private InternalSplitter internalSplitter;
+
+    private final int color;
+
+    public RenderTimeHandler(@NotNull MinecraftClient client, int color) {
+        this.client = Objects.requireNonNull(client, "client");
+        this.color = color;
+    }
+
+    @Override
+    public void onHudRender(DrawContext drawContext, float tickDelta) {
+        if (internalSplitter == null) {
+            return;
+        }
+
+        long millis = internalSplitter.getMillis();
+        long minutesPart = millis / 60000;
+        long secondsPart = (millis % 60000) / 1000;
+        long tenthSecondsPart = (millis % 1000) / 100;
+        String time = String.format("%d:%02d:%d", minutesPart, secondsPart, tenthSecondsPart);
+        int width = client.textRenderer.getWidth(time);
+        Window window = client.getWindow();
+        int screenWidth = window.getScaledWidth();
+        int screenHeight = window.getScaledHeight();
+        drawContext.getMatrices().push();
+        drawContext.drawTextWithShadow(client.textRenderer, time, screenWidth - width, screenHeight - client.textRenderer.fontHeight, color);
+        drawContext.getMatrices().pop();
+    }
+
+    public void setSplitter(@Nullable InternalSplitter internalSplitter) {
+        this.internalSplitter = internalSplitter;
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java
new file mode 100644
index 000000000..153779ab1
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java
@@ -0,0 +1,45 @@
+package org.phantazm.zombiesautosplits.sound;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
+import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+
+import java.util.Objects;
+
+public class AutoSplitSoundInterceptor implements ClientSoundCallback {
+
+    private final MinecraftClient client;
+
+    private final CompositeSplitter compositeSplitter;
+
+    public AutoSplitSoundInterceptor(@NotNull MinecraftClient client, @NotNull CompositeSplitter compositeSplitter) {
+        this.client = Objects.requireNonNull(client, "client");
+        this.compositeSplitter = Objects.requireNonNull(compositeSplitter, "compositeSplitter");
+    }
+
+    @Override
+    public void onPlaySound(@NotNull SoundInstance sound) {
+        if (isOnHypixel() && isRoundSound(sound)) {
+            compositeSplitter.split();
+        }
+    }
+
+    private boolean isOnHypixel() {
+        if (client.player == null) {
+            return false;
+        }
+
+        String brand = client.player.getServerBrand();
+        return brand != null && brand.contains("Hypixel");
+    }
+
+    private boolean isRoundSound(SoundInstance sound) {
+        Identifier identifier = sound.getId();
+        return identifier.equals(SoundEvents.ENTITY_WITHER_SPAWN.getId()) || identifier.equals(SoundEvents.ENTITY_ENDER_DRAGON_DEATH.getId());
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java
new file mode 100644
index 000000000..6d93fc75a
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java
@@ -0,0 +1,52 @@
+package org.phantazm.zombiesautosplits.splitter;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+
+import java.util.Collection;
+import java.util.Objects;
+
+public class CompositeSplitter {
+
+    private final MinecraftClient client;
+
+    private final Logger logger;
+
+    private final Collection<LiveSplitSplitter> splitters;
+
+    private boolean enabled = true;
+
+    public CompositeSplitter(@NotNull MinecraftClient client, @NotNull Logger logger, @NotNull Collection<LiveSplitSplitter> splitters) {
+        this.client = Objects.requireNonNull(client, "client");
+        this.logger = Objects.requireNonNull(logger, "logger");
+        this.splitters = Objects.requireNonNull(splitters, "splitters");
+    }
+
+    public void split() {
+        for (LiveSplitSplitter splitter : splitters) {
+            splitter.startOrSplit().whenComplete((ignored, throwable) -> {
+                if (throwable == null) {
+                    return;
+                }
+
+                logger.warn("Failed to split", throwable);
+                client.execute(() -> {
+                    if (client.player != null) {
+                        MutableText message = Text.literal("Failed to split!");
+                        message.formatted(Formatting.RED);
+                        client.player.sendMessage(message, false);
+                    }
+                });
+            });
+        }
+    }
+
+    public boolean toggle() {
+        return enabled = !enabled;
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java
new file mode 100644
index 000000000..6bfff081c
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java
@@ -0,0 +1,13 @@
+package org.phantazm.zombiesautosplits.splitter;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface LiveSplitSplitter {
+
+    @NotNull CompletableFuture<Void> startOrSplit();
+
+    void cancel();
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java
new file mode 100644
index 000000000..889a585f7
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java
@@ -0,0 +1,70 @@
+package org.phantazm.zombiesautosplits.splitter.internal;
+
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class InternalSplitter implements LiveSplitSplitter {
+
+    private final ReentrantLock lock = new ReentrantLock();
+
+    private final ScheduledExecutorService executor;
+
+    private Future<?> future = null;
+
+    private long millis = 0L;
+
+    public InternalSplitter(@NotNull ScheduledExecutorService executor) {
+        this.executor = Objects.requireNonNull(executor, "executor");
+    }
+
+    @Override
+    public @NotNull CompletableFuture<Void> startOrSplit() {
+        lock.lock();
+        try {
+            if (future == null) {
+                future = executor.scheduleAtFixedRate(() -> {
+                    lock.lock();
+                    try {
+                        millis += 10L;
+                    }
+                    finally {
+                        lock.unlock();
+                    }
+                }, 0L, 10L, TimeUnit.MILLISECONDS);
+            }
+            else {
+                millis = 0L;
+            }
+
+            return CompletableFuture.completedFuture(null);
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public void cancel() {
+        lock.lock();
+        try {
+            if (future != null) {
+                future.cancel(false);
+                future = null;
+            }
+            millis = 0L;
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+
+    public long getMillis() {
+        return millis;
+    }
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java
new file mode 100644
index 000000000..e0c3d51c6
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java
@@ -0,0 +1,53 @@
+package org.phantazm.zombiesautosplits.splitter.socket;
+
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.Socket;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+public class LiveSplitSocketSplitter implements LiveSplitSplitter {
+
+    private final Executor executor;
+
+    private final String host;
+
+    private final int port;
+
+    public LiveSplitSocketSplitter(@NotNull Executor executor, @NotNull String host, int port) {
+        this.executor = Objects.requireNonNull(executor, "executor");
+        this.host = Objects.requireNonNull(host, "host");
+        this.port = port;
+    }
+
+    @Override
+    public @NotNull CompletableFuture<Void> startOrSplit() {
+        return sendCommand("startorsplit");
+    }
+
+    @Override
+    public void cancel() {
+
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private CompletableFuture<Void> sendCommand(String command) {
+        return CompletableFuture.runAsync(() -> {
+            try (Socket socket = new Socket(host, port);
+                 OutputStream outputStream = socket.getOutputStream();
+                 Writer writer = new OutputStreamWriter(outputStream)) {
+                writer.write(command + "\r\n");
+                writer.flush();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }, executor);
+    }
+
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java
new file mode 100644
index 000000000..bf8ed176f
--- /dev/null
+++ b/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java
@@ -0,0 +1,52 @@
+package org.phantazm.zombiesautosplits.tick;
+
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
+import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+
+import java.util.Objects;
+
+public class KeyInputHandler implements ClientTickEvents.EndTick {
+
+    private final KeyBinding keyBinding;
+
+    private final CompositeSplitter compositeSplitter;
+
+    public KeyInputHandler(@NotNull KeyBinding keyBinding, @NotNull CompositeSplitter compositeSplitter) {
+        this.keyBinding = Objects.requireNonNull(keyBinding, "keyBinding");
+        this.compositeSplitter = Objects.requireNonNull(compositeSplitter, "compositeSplitter");
+    }
+
+    @Override
+    public void onEndTick(MinecraftClient client) {
+        if (keyBinding.wasPressed()) {
+            Text toggledComponent;
+            boolean toggled = compositeSplitter.toggle();
+
+            PlayerEntity player = client.player;
+            if (player == null) {
+                return;
+            }
+
+            if (toggled) {
+                toggledComponent = Text.literal("ON").formatted(Formatting.GREEN);
+            }
+            else {
+                toggledComponent = Text.literal("OFF").formatted(Formatting.RED);
+            }
+
+            Text message = Text.empty()
+                    .formatted(Formatting.YELLOW)
+                    .append("Toggled AutoSplits ")
+                    .append(toggledComponent)
+                    .append("!");
+            client.player.sendMessage(message, false);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/zombies-timer/src/main/resources/fabric.mod.json b/zombies-timer/src/main/resources/fabric.mod.json
new file mode 100644
index 000000000..235419816
--- /dev/null
+++ b/zombies-timer/src/main/resources/fabric.mod.json
@@ -0,0 +1,33 @@
+{
+  "schemaVersion": 1,
+  "id": "zombiesautosplits",
+  "version": "${version}",
+  "name": "Phantazm Timer Mod",
+  "description": "A timer mod for Phantazm.",
+  "authors": [
+    "thamid"
+  ],
+  "contact": {
+    "issues": "https://github.com/tahmid-23/ZombiesAutoSplits/issues",
+    "sources": "https://github.com/tahmid-23/ZombiesAutoSplits.git"
+  },
+  "license": "AGPL-3.0-or-later",
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "org.phantazm.zombiesautosplits.ZombiesAutoSplitsClient"
+    ],
+    "modmenu": [
+      "org.phantazm.zombiesautosplits.modmenu.ZombiesAutoSplitsModMenuApiImpl"
+    ]
+  },
+  "mixins": ["zombiesautosplits.mixin.json"],
+  "depends": {
+    "fabricloader": ">=0.14.21",
+    "fabric-api": "*",
+    "minecraft": "1.20.1",
+    "java": ">=17",
+    "cloth-config": "^11.1.106",
+    "modmenu": "^7.1.0"
+  }
+}
diff --git a/zombies-timer/src/main/resources/zombiesautosplits.mixin.json b/zombies-timer/src/main/resources/zombiesautosplits.mixin.json
new file mode 100644
index 000000000..b2314515e
--- /dev/null
+++ b/zombies-timer/src/main/resources/zombiesautosplits.mixin.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "org.phantazm.zombiesautosplits.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [],
+  "client": [
+    "SoundSystemMixin"
+  ],
+  "server": [],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
\ No newline at end of file
diff --git a/zombies/build.gradle.kts b/zombies/build.gradle.kts
index 6973d4926..38180f812 100644
--- a/zombies/build.gradle.kts
+++ b/zombies/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     api(projects.phantazmCore)
+    api(projects.phantazmMessaging)
     api(projects.phantazmMob)
     api(projects.phantazmStats)
     api(projects.phantazmZombiesMapdata)
diff --git a/zombies/src/main/java/org/phantazm/zombies/command/RoundCommand.java b/zombies/src/main/java/org/phantazm/zombies/command/RoundCommand.java
index ae6b94b14..7ccb271b4 100644
--- a/zombies/src/main/java/org/phantazm/zombies/command/RoundCommand.java
+++ b/zombies/src/main/java/org/phantazm/zombies/command/RoundCommand.java
@@ -9,7 +9,6 @@
 import net.minestom.server.entity.Player;
 import net.minestom.server.permission.Permission;
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.mob.PhantazmMob;
 import org.phantazm.zombies.map.handler.RoundHandler;
 import org.phantazm.zombies.scene.ZombiesScene;
 import org.phantazm.zombies.stage.Stage;
@@ -59,9 +58,12 @@ public RoundCommand(@NotNull Function<? super UUID, Optional<ZombiesScene>> scen
                 Stage current = transition.getCurrentStage();
                 if (current == null || !current.key().equals(StageKeys.IN_GAME)) {
                     transition.setCurrentStage(StageKeys.IN_GAME);
+                    if (roundIndex != 0) {
+                        handler.setCurrentRound(roundIndex);
+                    }
+                } else {
+                    handler.setCurrentRound(roundIndex);
                 }
-
-                handler.setCurrentRound(roundIndex);
             });
         }, roundArgument);
     }
diff --git a/zombies/src/main/java/org/phantazm/zombies/map/Round.java b/zombies/src/main/java/org/phantazm/zombies/map/Round.java
index 2bfe3bf47..2265f5347 100644
--- a/zombies/src/main/java/org/phantazm/zombies/map/Round.java
+++ b/zombies/src/main/java/org/phantazm/zombies/map/Round.java
@@ -1,9 +1,12 @@
 package org.phantazm.zombies.map;
 
 import net.minestom.server.MinecraftServer;
+import net.minestom.server.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 import org.phantazm.commons.Tickable;
+import org.phantazm.messaging.packet.PacketHandler;
+import org.phantazm.messaging.packet.c2s.RoundStartPacket;
 import org.phantazm.mob.PhantazmMob;
 import org.phantazm.zombies.map.action.Action;
 import org.phantazm.zombies.player.ZombiesPlayer;
@@ -24,6 +27,7 @@ public class Round implements Tickable {
     private final List<Spawnpoint> spawnpoints;
     private final Map<UUID, PhantazmMob> spawnedMobs;
     private final Collection<? extends ZombiesPlayer> zombiesPlayers;
+    private final PacketHandler<Player> packetHandler;
 
     private boolean isActive;
     private long waveStartTime;
@@ -38,7 +42,8 @@ public class Round implements Tickable {
      */
     public Round(@NotNull RoundInfo roundInfo, @NotNull List<Wave> waves, @NotNull List<Action<Round>> startActions,
             @NotNull List<Action<Round>> endActions, @NotNull SpawnDistributor spawnDistributor,
-            @NotNull List<Spawnpoint> spawnpoints, @NotNull Collection<? extends ZombiesPlayer> zombiesPlayers) {
+            @NotNull List<Spawnpoint> spawnpoints, @NotNull Collection<? extends ZombiesPlayer> zombiesPlayers,
+            @NotNull PacketHandler<Player> packetHandler) {
         List<WaveInfo> waveInfo = roundInfo.waves();
         if (waveInfo.isEmpty()) {
             LOGGER.warn("Round {} has no waves", roundInfo);
@@ -53,6 +58,7 @@ public Round(@NotNull RoundInfo roundInfo, @NotNull List<Wave> waves, @NotNull L
         this.spawnedMobs = new HashMap<>();
         this.spawnpoints = Objects.requireNonNull(spawnpoints, "spawnpoints");
         this.zombiesPlayers = Objects.requireNonNull(zombiesPlayers, "zombiesPlayers");
+        this.packetHandler = Objects.requireNonNull(packetHandler, "packetHandler");
     }
 
     public @NotNull RoundInfo getRoundInfo() {
@@ -101,6 +107,9 @@ public void startRound(long time) {
 
             int prevBestRound = zombiesPlayer.module().getStats().getBestRound();
             zombiesPlayer.module().getStats().setBestRound(Math.max(prevBestRound, roundInfo.round()));
+            zombiesPlayer.getPlayer().ifPresent(player -> {
+                packetHandler.output(player, new RoundStartPacket());
+            });
         }
 
         for (Action<Round> action : startActions) {
diff --git a/zombies/src/main/java/org/phantazm/zombies/map/handler/BasicRoundHandler.java b/zombies/src/main/java/org/phantazm/zombies/map/handler/BasicRoundHandler.java
index f4aeb6807..51f95aecb 100644
--- a/zombies/src/main/java/org/phantazm/zombies/map/handler/BasicRoundHandler.java
+++ b/zombies/src/main/java/org/phantazm/zombies/map/handler/BasicRoundHandler.java
@@ -4,7 +4,10 @@
 import org.phantazm.zombies.map.Round;
 import org.phantazm.zombies.player.ZombiesPlayer;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 public class BasicRoundHandler implements RoundHandler {
     private final Collection<? extends ZombiesPlayer> zombiesPlayers;
diff --git a/zombies/src/main/java/org/phantazm/zombies/map/objects/BasicMapObjectsSource.java b/zombies/src/main/java/org/phantazm/zombies/map/objects/BasicMapObjectsSource.java
index e0544dd94..05512a601 100644
--- a/zombies/src/main/java/org/phantazm/zombies/map/objects/BasicMapObjectsSource.java
+++ b/zombies/src/main/java/org/phantazm/zombies/map/objects/BasicMapObjectsSource.java
@@ -14,6 +14,7 @@
 import net.kyori.adventure.key.Key;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.Player;
 import net.minestom.server.event.Event;
 import net.minestom.server.event.EventNode;
 import net.minestom.server.instance.Instance;
@@ -31,6 +32,7 @@
 import org.phantazm.core.sound.SongLoader;
 import org.phantazm.core.sound.SongPlayer;
 import org.phantazm.core.tracker.BoundedTracker;
+import org.phantazm.messaging.packet.PacketHandler;
 import org.phantazm.mob.MobModel;
 import org.phantazm.mob.MobStore;
 import org.phantazm.mob.PhantazmMob;
@@ -70,16 +72,19 @@ public class BasicMapObjectsSource implements MapObjects.Source {
     private final Map<Key, MobModel> mobModels;
     private final ClientBlockHandlerSource clientBlockHandlerSource;
     private final KeyParser keyParser;
+    private final PacketHandler<Player> packetHandler;
 
     public BasicMapObjectsSource(@NotNull MapInfo mapInfo, @NotNull ContextManager contextManager,
             @NotNull MobSpawnerSource mobSpawnerSource, @NotNull Map<Key, MobModel> mobModels,
-            @NotNull ClientBlockHandlerSource clientBlockHandlerSource, @NotNull KeyParser keyParser) {
+            @NotNull ClientBlockHandlerSource clientBlockHandlerSource, @NotNull KeyParser keyParser,
+            @NotNull PacketHandler<Player> packetHandler) {
         this.mapInfo = Objects.requireNonNull(mapInfo, "mapInfo");
         this.contextManager = Objects.requireNonNull(contextManager, "contextManager");
         this.mobSpawnerSource = Objects.requireNonNull(mobSpawnerSource, "mobSpawnerSource");
         this.mobModels = Objects.requireNonNull(mobModels, "mobModels");
         this.clientBlockHandlerSource = Objects.requireNonNull(clientBlockHandlerSource, "clientBlockHandlerSource");
         this.keyParser = Objects.requireNonNull(keyParser, "keyParser");
+        this.packetHandler = Objects.requireNonNull(packetHandler, "packetHandler");
     }
 
     @Override
@@ -264,7 +269,7 @@ private List<Round> buildRounds(List<RoundInfo> roundInfoList, List<Spawnpoint>
             }
 
             rounds.add(new Round(roundInfo, waves, startActions, endActions, spawnDistributor, spawnpoints,
-                    zombiesPlayers.values()));
+                    zombiesPlayers.values(), packetHandler));
         }
 
         return rounds;
diff --git a/zombies/src/main/java/org/phantazm/zombies/scene/ZombiesSceneProvider.java b/zombies/src/main/java/org/phantazm/zombies/scene/ZombiesSceneProvider.java
index 1b8868c7b..caa257483 100644
--- a/zombies/src/main/java/org/phantazm/zombies/scene/ZombiesSceneProvider.java
+++ b/zombies/src/main/java/org/phantazm/zombies/scene/ZombiesSceneProvider.java
@@ -11,6 +11,7 @@
 import it.unimi.dsi.fastutil.longs.LongList;
 import net.kyori.adventure.key.Key;
 import net.minestom.server.coordinate.Pos;
+import net.minestom.server.entity.Player;
 import net.minestom.server.event.Event;
 import net.minestom.server.event.EventNode;
 import net.minestom.server.event.entity.EntityDamageEvent;
@@ -35,6 +36,7 @@
 import org.phantazm.core.time.AnalogTickFormatter;
 import org.phantazm.core.time.PrecisionSecondTickFormatter;
 import org.phantazm.core.tracker.BoundedTracker;
+import org.phantazm.messaging.packet.PacketHandler;
 import org.phantazm.mob.MobModel;
 import org.phantazm.mob.MobStore;
 import org.phantazm.mob.trigger.EventTrigger;
@@ -94,9 +96,9 @@ public ZombiesSceneProvider(@NotNull Executor executor, int maximumScenes,
             @NotNull EventNode<Event> rootNode, @NotNull MobSpawnerSource mobSpawnerSource,
             @NotNull Map<Key, MobModel> mobModels, @NotNull ClientBlockHandlerSource clientBlockHandlerSource,
             @NotNull ContextManager contextManager, @NotNull KeyParser keyParser, @NotNull Team mobNoPushTeam,
-            @NotNull Team corpseTeam, @NotNull ZombiesDatabase database, @NotNull Map<Key, PowerupInfo> powerups,
-            @NotNull ZombiesPlayer.Source zombiesPlayerSource, @NotNull CorpseCreator.Source corpseCreatorSource,
-            @NotNull SongLoader songLoader) {
+            @NotNull Team corpseTeam, @NotNull ZombiesDatabase database, @NotNull PacketHandler<Player> packetHandler,
+            @NotNull Map<Key, PowerupInfo> powerups, @NotNull ZombiesPlayer.Source zombiesPlayerSource,
+            @NotNull CorpseCreator.Source corpseCreatorSource, @NotNull SongLoader songLoader) {
         super(executor, maximumScenes);
         this.instanceSpaceFunction = Objects.requireNonNull(instanceSpaceFunction, "instanceSpaceFunction");
         this.mapInfo = Objects.requireNonNull(mapInfo, "mapInfo");
@@ -113,7 +115,7 @@ public ZombiesSceneProvider(@NotNull Executor executor, int maximumScenes,
         this.corpseTeam = Objects.requireNonNull(corpseTeam, "corpseTeam");
 
         this.mapObjectSource = new BasicMapObjectsSource(mapInfo, contextManager, mobSpawnerSource, mobModels,
-                clientBlockHandlerSource, keyParser);
+                clientBlockHandlerSource, keyParser, packetHandler);
         this.zombiesPlayerSource = Objects.requireNonNull(zombiesPlayerSource, "zombiesPlayerSource");
         this.powerupHandlerSource =
                 new BasicPowerupHandlerSource(powerups, contextManager, settingsInfo.powerupPickupRadius());

From fec835d449645b559cccbe92ad6bda391796661d Mon Sep 17 00:00:00 2001
From: tahmid-23 <60953955+tahmid-23@users.noreply.github.com>
Date: Tue, 11 Jul 2023 15:27:45 -0400
Subject: [PATCH 2/4] repackage again

---
 zombies-timer/build.gradle.kts                | 10 ---
 .../autosplits}/ZombiesAutoSplitsClient.java  | 44 +++++++------
 .../config/ZombiesAutoSplitsConfig.java       |  4 +-
 .../ZombiesAutoSplitsConfigProcessor.java     |  2 +-
 .../event/ClientSoundCallback.java            |  5 +-
 .../messaging/PhantazmMessagingHandler.java   |  4 +-
 .../autosplits}/mixin/SoundSystemMixin.java   |  6 +-
 .../ZombiesAutoSplitsModMenuApiImpl.java      |  6 +-
 .../packet/PacketByteBufDataReader.java       |  2 +-
 .../packet/PacketByteBufDataWriter.java       |  2 +-
 .../autosplits}/packet/PhantazmPacket.java    |  2 +-
 .../autosplits}/render/RenderTimeHandler.java |  4 +-
 .../sound/AutoSplitSoundInterceptor.java      |  6 +-
 .../splitter/CompositeSplitter.java           |  6 +-
 .../splitter/LiveSplitSplitter.java           |  2 +-
 .../splitter/internal/InternalSplitter.java   |  4 +-
 .../socket/LiveSplitSocketSplitter.java       |  4 +-
 .../autosplits}/tick/KeyInputHandler.java     | 52 ++++++++--------
 .../src/main/resources/fabric.mod.json        | 62 ++++++++++---------
 ...xin.json => zombies-autosplits.mixin.json} |  4 +-
 20 files changed, 119 insertions(+), 112 deletions(-)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/ZombiesAutoSplitsClient.java (83%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/config/ZombiesAutoSplitsConfig.java (97%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/config/ZombiesAutoSplitsConfigProcessor.java (96%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/event/ClientSoundCallback.java (88%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/messaging/PhantazmMessagingHandler.java (92%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/mixin/SoundSystemMixin.java (85%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/modmenu/ZombiesAutoSplitsModMenuApiImpl.java (93%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/packet/PacketByteBufDataReader.java (94%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/packet/PacketByteBufDataWriter.java (95%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/packet/PhantazmPacket.java (94%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/render/RenderTimeHandler.java (93%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/sound/AutoSplitSoundInterceptor.java (88%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/splitter/CompositeSplitter.java (93%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/splitter/LiveSplitSplitter.java (80%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/splitter/internal/InternalSplitter.java (93%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/splitter/socket/LiveSplitSocketSplitter.java (92%)
 rename zombies-timer/src/main/java/org/phantazm/{zombiesautosplits => zombies/autosplits}/tick/KeyInputHandler.java (50%)
 rename zombies-timer/src/main/resources/{zombiesautosplits.mixin.json => zombies-autosplits.mixin.json} (78%)

diff --git a/zombies-timer/build.gradle.kts b/zombies-timer/build.gradle.kts
index b90888dd4..47a4e8a95 100644
--- a/zombies-timer/build.gradle.kts
+++ b/zombies-timer/build.gradle.kts
@@ -12,14 +12,8 @@ base {
     archivesName.set("ZombiesAutoSplits")
 }
 
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-}
-
 repositories {
     mavenCentral()
-    maven("https://dl.cloudsmith.io/public/steanky/ethylene/maven/")
-    maven("https://dl.cloudsmith.io/public/steanky/toolkit/maven/")
     maven("https://maven.shedaniel.me/")
     maven("https://maven.terraformersmc.com/releases/")
 }
@@ -50,10 +44,6 @@ dependencies {
     include(libs.snakeyaml)
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 tasks.processResources {
     inputs.property("version", project.version)
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
similarity index 83%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
index ecc284ccd..304f10425 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/ZombiesAutoSplitsClient.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits;
+package org.phantazm.zombies.autosplits;
 
 import com.github.steanky.ethylene.codec.yaml.YamlCodec;
 import com.github.steanky.ethylene.core.BasicConfigHandler;
@@ -22,20 +22,20 @@
 import org.phantazm.messaging.packet.PacketHandler;
 import org.phantazm.messaging.serialization.PacketSerializer;
 import org.phantazm.messaging.serialization.PacketSerializers;
-import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfig;
-import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfigProcessor;
-import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
-import org.phantazm.zombiesautosplits.messaging.PhantazmMessagingHandler;
-import org.phantazm.zombiesautosplits.packet.PacketByteBufDataReader;
-import org.phantazm.zombiesautosplits.packet.PacketByteBufDataWriter;
-import org.phantazm.zombiesautosplits.packet.PhantazmPacket;
-import org.phantazm.zombiesautosplits.render.RenderTimeHandler;
-import org.phantazm.zombiesautosplits.sound.AutoSplitSoundInterceptor;
-import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
-import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
-import org.phantazm.zombiesautosplits.splitter.internal.InternalSplitter;
-import org.phantazm.zombiesautosplits.splitter.socket.LiveSplitSocketSplitter;
-import org.phantazm.zombiesautosplits.tick.KeyInputHandler;
+import org.phantazm.zombies.autosplits.config.ZombiesAutoSplitsConfig;
+import org.phantazm.zombies.autosplits.config.ZombiesAutoSplitsConfigProcessor;
+import org.phantazm.zombies.autosplits.messaging.PhantazmMessagingHandler;
+import org.phantazm.zombies.autosplits.packet.PacketByteBufDataReader;
+import org.phantazm.zombies.autosplits.packet.PacketByteBufDataWriter;
+import org.phantazm.zombies.autosplits.render.RenderTimeHandler;
+import org.phantazm.zombies.autosplits.event.ClientSoundCallback;
+import org.phantazm.zombies.autosplits.packet.PhantazmPacket;
+import org.phantazm.zombies.autosplits.sound.AutoSplitSoundInterceptor;
+import org.phantazm.zombies.autosplits.splitter.CompositeSplitter;
+import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.internal.InternalSplitter;
+import org.phantazm.zombies.autosplits.splitter.socket.LiveSplitSocketSplitter;
+import org.phantazm.zombies.autosplits.tick.KeyInputHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +51,7 @@
 
 public class ZombiesAutoSplitsClient implements ClientModInitializer {
 
-    public static final String MODID = "zombiesautosplits";
+    public static final String MODID = "zombies-autosplits";
 
     private static ZombiesAutoSplitsClient instance = null;
 
@@ -73,6 +73,8 @@ public class ZombiesAutoSplitsClient implements ClientModInitializer {
 
     private ZombiesAutoSplitsConfig config;
 
+    private CompositeSplitter compositeSplitter;
+
     public static @NotNull ZombiesAutoSplitsClient getInstance() {
         return instance;
     }
@@ -119,8 +121,12 @@ public void onInitializeClient() {
         renderTimeHandler = new RenderTimeHandler(MinecraftClient.getInstance(), 0xFFFFFF);
 
         initConfig();
+
+        compositeSplitter = new CompositeSplitter(MinecraftClient.getInstance(), logger, splitters);
+
         initEvents();
         initKeyBindings();
+        initPackets();
 
         instance = this;
     }
@@ -163,14 +169,16 @@ private void initConfig() {
     }
 
     private void initEvents() {
-        CompositeSplitter compositeSplitter = new CompositeSplitter(MinecraftClient.getInstance(), logger, splitters);
-
         AutoSplitSoundInterceptor soundInterceptor =
                 new AutoSplitSoundInterceptor(MinecraftClient.getInstance(), compositeSplitter);
         ClientTickEvents.END_CLIENT_TICK.register(new KeyInputHandler(autoSplitsKeybind, compositeSplitter));
         HudRenderCallback.EVENT.register(renderTimeHandler);
         ClientSoundCallback.EVENT.register(soundInterceptor);
 
+
+    }
+
+    private void initPackets() {
         PacketSerializer packetSerializer =
                 PacketSerializers.clientToServerSerializer(() -> new PacketByteBufDataWriter(PacketByteBufs.create()),
                         data -> new PacketByteBufDataReader(new PacketByteBuf(Unpooled.wrappedBuffer(data))));
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
similarity index 97%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
index 141dfa828..f86dfb970 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfig.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.config;
+package org.phantazm.zombies.autosplits.config;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -63,4 +63,4 @@ public static class Builder {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfigProcessor.java
similarity index 96%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfigProcessor.java
index 8d94196d4..f73ba624e 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/config/ZombiesAutoSplitsConfigProcessor.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfigProcessor.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.config;
+package org.phantazm.zombies.autosplits.config;
 
 import com.github.steanky.ethylene.core.ConfigElement;
 import com.github.steanky.ethylene.core.collection.ConfigNode;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/event/ClientSoundCallback.java
similarity index 88%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/event/ClientSoundCallback.java
index d892cd2e8..c233c997f 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/event/ClientSoundCallback.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/event/ClientSoundCallback.java
@@ -1,10 +1,11 @@
-package org.phantazm.zombiesautosplits.event;
+package org.phantazm.zombies.autosplits.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.client.sound.SoundInstance;
 import org.jetbrains.annotations.NotNull;
 
+@FunctionalInterface
 public interface ClientSoundCallback {
 
     Event<ClientSoundCallback> EVENT = EventFactory.createArrayBacked(ClientSoundCallback.class, callbacks -> (sound) -> {
@@ -15,4 +16,4 @@ public interface ClientSoundCallback {
 
     void onPlaySound(@NotNull SoundInstance sound);
 
-}
\ No newline at end of file
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/messaging/PhantazmMessagingHandler.java
similarity index 92%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/messaging/PhantazmMessagingHandler.java
index b5f5df63b..8ebbd75a9 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/messaging/PhantazmMessagingHandler.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/messaging/PhantazmMessagingHandler.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.messaging;
+package org.phantazm.zombies.autosplits.messaging;
 
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
@@ -9,7 +9,7 @@
 import org.phantazm.messaging.packet.PacketHandler;
 import org.phantazm.messaging.packet.c2s.RoundStartPacket;
 import org.phantazm.messaging.serialization.PacketSerializer;
-import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+import org.phantazm.zombies.autosplits.splitter.CompositeSplitter;
 
 import java.util.Objects;
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/mixin/SoundSystemMixin.java
similarity index 85%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/mixin/SoundSystemMixin.java
index 1265ed3d2..24f473fe9 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/mixin/SoundSystemMixin.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/mixin/SoundSystemMixin.java
@@ -1,10 +1,10 @@
-package org.phantazm.zombiesautosplits.mixin;
+package org.phantazm.zombies.autosplits.mixin;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.client.sound.SoundSystem;
-import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
+import org.phantazm.zombies.autosplits.event.ClientSoundCallback;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,4 +19,4 @@ private void play(SoundInstance sound, CallbackInfo callbackInfo) {
         ClientSoundCallback.EVENT.invoker().onPlaySound(sound);
     }
 
-}
\ No newline at end of file
+}
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
similarity index 93%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
index 339a17a2a..b3a7e614f 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/modmenu/ZombiesAutoSplitsModMenuApiImpl.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.modmenu;
+package org.phantazm.zombies.autosplits.modmenu;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
@@ -6,8 +6,8 @@
 import me.shedaniel.clothconfig2.api.ConfigCategory;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.minecraft.text.Text;
-import org.phantazm.zombiesautosplits.ZombiesAutoSplitsClient;
-import org.phantazm.zombiesautosplits.config.ZombiesAutoSplitsConfig;
+import org.phantazm.zombies.autosplits.ZombiesAutoSplitsClient;
+import org.phantazm.zombies.autosplits.config.ZombiesAutoSplitsConfig;
 
 public class ZombiesAutoSplitsModMenuApiImpl implements ModMenuApi {
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataReader.java
similarity index 94%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataReader.java
index 8fdaeeae8..7d0cdf69b 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataReader.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataReader.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.packet;
+package org.phantazm.zombies.autosplits.packet;
 
 import net.minecraft.network.PacketByteBuf;
 import org.jetbrains.annotations.NotNull;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataWriter.java
similarity index 95%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataWriter.java
index 1a90cf6c3..e20bc8094 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PacketByteBufDataWriter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PacketByteBufDataWriter.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.packet;
+package org.phantazm.zombies.autosplits.packet;
 
 import net.minecraft.network.PacketByteBuf;
 import org.jetbrains.annotations.NotNull;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PhantazmPacket.java
similarity index 94%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PhantazmPacket.java
index 4dcadb859..4eaf12491 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/packet/PhantazmPacket.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/packet/PhantazmPacket.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.packet;
+package org.phantazm.zombies.autosplits.packet;
 
 import net.fabricmc.fabric.api.networking.v1.FabricPacket;
 import net.fabricmc.fabric.api.networking.v1.PacketType;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
similarity index 93%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
index 9251fa8ae..d9515e876 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/render/RenderTimeHandler.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.render;
+package org.phantazm.zombies.autosplits.render;
 
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
@@ -6,7 +6,7 @@
 import net.minecraft.client.util.Window;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.phantazm.zombiesautosplits.splitter.internal.InternalSplitter;
+import org.phantazm.zombies.autosplits.splitter.internal.InternalSplitter;
 
 import java.util.Objects;
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/sound/AutoSplitSoundInterceptor.java
similarity index 88%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/sound/AutoSplitSoundInterceptor.java
index 153779ab1..560a35d88 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/sound/AutoSplitSoundInterceptor.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/sound/AutoSplitSoundInterceptor.java
@@ -1,12 +1,12 @@
-package org.phantazm.zombiesautosplits.sound;
+package org.phantazm.zombies.autosplits.sound;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombiesautosplits.event.ClientSoundCallback;
-import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+import org.phantazm.zombies.autosplits.event.ClientSoundCallback;
+import org.phantazm.zombies.autosplits.splitter.CompositeSplitter;
 
 import java.util.Objects;
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
similarity index 93%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
index 6d93fc75a..c0d744181 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/CompositeSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.splitter;
+package org.phantazm.zombies.autosplits.splitter;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.MutableText;
@@ -27,6 +27,10 @@ public CompositeSplitter(@NotNull MinecraftClient client, @NotNull Logger logger
     }
 
     public void split() {
+        if (!enabled) {
+            return;
+        }
+
         for (LiveSplitSplitter splitter : splitters) {
             splitter.startOrSplit().whenComplete((ignored, throwable) -> {
                 if (throwable == null) {
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java
similarity index 80%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java
index 6bfff081c..820c2c84f 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/LiveSplitSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.splitter;
+package org.phantazm.zombies.autosplits.splitter;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
similarity index 93%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
index 889a585f7..67948172e 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/internal/InternalSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
@@ -1,7 +1,7 @@
-package org.phantazm.zombiesautosplits.splitter.internal;
+package org.phantazm.zombies.autosplits.splitter.internal;
 
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
 
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
similarity index 92%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
index e0c3d51c6..4585d5678 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/splitter/socket/LiveSplitSocketSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
@@ -1,7 +1,7 @@
-package org.phantazm.zombiesautosplits.splitter.socket;
+package org.phantazm.zombies.autosplits.splitter.socket;
 
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombiesautosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/tick/KeyInputHandler.java
similarity index 50%
rename from zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/tick/KeyInputHandler.java
index bf8ed176f..49f3579ac 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombiesautosplits/tick/KeyInputHandler.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/tick/KeyInputHandler.java
@@ -1,4 +1,4 @@
-package org.phantazm.zombiesautosplits.tick;
+package org.phantazm.zombies.autosplits.tick;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
@@ -7,7 +7,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombiesautosplits.splitter.CompositeSplitter;
+import org.phantazm.zombies.autosplits.splitter.CompositeSplitter;
 
 import java.util.Objects;
 
@@ -24,29 +24,31 @@ public KeyInputHandler(@NotNull KeyBinding keyBinding, @NotNull CompositeSplitte
 
     @Override
     public void onEndTick(MinecraftClient client) {
-        if (keyBinding.wasPressed()) {
-            Text toggledComponent;
-            boolean toggled = compositeSplitter.toggle();
-
-            PlayerEntity player = client.player;
-            if (player == null) {
-                return;
-            }
-
-            if (toggled) {
-                toggledComponent = Text.literal("ON").formatted(Formatting.GREEN);
-            }
-            else {
-                toggledComponent = Text.literal("OFF").formatted(Formatting.RED);
-            }
-
-            Text message = Text.empty()
-                    .formatted(Formatting.YELLOW)
-                    .append("Toggled AutoSplits ")
-                    .append(toggledComponent)
-                    .append("!");
-            client.player.sendMessage(message, false);
+        if (!keyBinding.wasPressed()) {
+            return;
         }
+
+        Text toggledComponent;
+        boolean toggled = compositeSplitter.toggle();
+
+        PlayerEntity player = client.player;
+        if (player == null) {
+            return;
+        }
+
+        if (toggled) {
+            toggledComponent = Text.literal("ON").formatted(Formatting.GREEN);
+        }
+        else {
+            toggledComponent = Text.literal("OFF").formatted(Formatting.RED);
+        }
+
+        Text message = Text.empty()
+                .formatted(Formatting.YELLOW)
+                .append("Toggled AutoSplits ")
+                .append(toggledComponent)
+                .append("!");
+        client.player.sendMessage(message, false);
     }
 
-}
\ No newline at end of file
+}
diff --git a/zombies-timer/src/main/resources/fabric.mod.json b/zombies-timer/src/main/resources/fabric.mod.json
index 235419816..db8b9b37e 100644
--- a/zombies-timer/src/main/resources/fabric.mod.json
+++ b/zombies-timer/src/main/resources/fabric.mod.json
@@ -1,33 +1,35 @@
 {
-  "schemaVersion": 1,
-  "id": "zombiesautosplits",
-  "version": "${version}",
-  "name": "Phantazm Timer Mod",
-  "description": "A timer mod for Phantazm.",
-  "authors": [
-    "thamid"
-  ],
-  "contact": {
-    "issues": "https://github.com/tahmid-23/ZombiesAutoSplits/issues",
-    "sources": "https://github.com/tahmid-23/ZombiesAutoSplits.git"
-  },
-  "license": "AGPL-3.0-or-later",
-  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "org.phantazm.zombiesautosplits.ZombiesAutoSplitsClient"
+    "schemaVersion": 1,
+    "id": "zombies-autosplits",
+    "version": "${version}",
+    "name": "Phantazm Timer Mod",
+    "description": "A timer mod for Phantazm.",
+    "authors": [
+        "thamid"
     ],
-    "modmenu": [
-      "org.phantazm.zombiesautosplits.modmenu.ZombiesAutoSplitsModMenuApiImpl"
-    ]
-  },
-  "mixins": ["zombiesautosplits.mixin.json"],
-  "depends": {
-    "fabricloader": ">=0.14.21",
-    "fabric-api": "*",
-    "minecraft": "1.20.1",
-    "java": ">=17",
-    "cloth-config": "^11.1.106",
-    "modmenu": "^7.1.0"
-  }
+    "contact": {
+        "issues": "https://github.com/PhantazmNetwork/PhantazmServer/issues",
+        "sources": "https://github.com/PhantazmNetwork/PhantazmServer.git"
+    },
+    "license": "AGPL-3.0-or-later",
+    "environment": "client",
+    "entrypoints": {
+        "client": [
+            "org.phantazm.zombies.autosplits.ZombiesAutoSplitsClient"
+        ],
+        "modmenu": [
+            "org.phantazm.zombies.autosplits.modmenu.ZombiesAutoSplitsModMenuApiImpl"
+        ]
+    },
+    "mixins": [
+        "zombies-autosplits.mixin.json"
+    ],
+    "depends": {
+        "fabricloader": ">=0.14.21",
+        "fabric-api": "*",
+        "minecraft": "1.20.1",
+        "java": ">=17",
+        "cloth-config": "^11.1.106",
+        "modmenu": "^7.1.0"
+    }
 }
diff --git a/zombies-timer/src/main/resources/zombiesautosplits.mixin.json b/zombies-timer/src/main/resources/zombies-autosplits.mixin.json
similarity index 78%
rename from zombies-timer/src/main/resources/zombiesautosplits.mixin.json
rename to zombies-timer/src/main/resources/zombies-autosplits.mixin.json
index b2314515e..8eba4405f 100644
--- a/zombies-timer/src/main/resources/zombiesautosplits.mixin.json
+++ b/zombies-timer/src/main/resources/zombies-autosplits.mixin.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "org.phantazm.zombiesautosplits.mixin",
+  "package": "org.phantazm.zombies.autosplits.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [],
   "client": [
@@ -11,4 +11,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
\ No newline at end of file
+}

From 6c22912221d2cbd7af25c4f9ce4520ae304565bf Mon Sep 17 00:00:00 2001
From: tahmid-23 <60953955+tahmid-23@users.noreply.github.com>
Date: Tue, 11 Jul 2023 16:58:24 -0400
Subject: [PATCH 3/4] more housekeeping

---
 zombies-mapeditor/build.gradle.kts            |  4 +-
 zombies-timer/build.gradle.kts                |  6 +-
 .../autosplits/ZombiesAutoSplitsClient.java   | 87 +++++++++++--------
 .../config/ZombiesAutoSplitsConfig.java       |  9 +-
 .../autosplits/render/RenderTimeHandler.java  | 17 ++--
 ...itSplitter.java => AutoSplitSplitter.java} |  2 +-
 .../splitter/CompositeSplitter.java           | 28 +++---
 .../splitter/internal/InternalSplitter.java   | 63 +++-----------
 .../socket/LiveSplitSocketSplitter.java       |  4 +-
 9 files changed, 99 insertions(+), 121 deletions(-)
 rename zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/{LiveSplitSplitter.java => AutoSplitSplitter.java} (85%)

diff --git a/zombies-mapeditor/build.gradle.kts b/zombies-mapeditor/build.gradle.kts
index d796dc8eb..ce15174bc 100644
--- a/zombies-mapeditor/build.gradle.kts
+++ b/zombies-mapeditor/build.gradle.kts
@@ -83,8 +83,6 @@ tasks.compileJava {
 
 tasks.jar {
     from("../LICENSE") {
-        rename {
-            "${it}_${base.archivesName.get()}"
-        }
+        rename { "${it}_${archiveBaseName.get()}" }
     }
 }
diff --git a/zombies-timer/build.gradle.kts b/zombies-timer/build.gradle.kts
index 47a4e8a95..dfb9eac8a 100644
--- a/zombies-timer/build.gradle.kts
+++ b/zombies-timer/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 version = "0.1.0+1.20.1"
 
 base {
-    archivesName.set("ZombiesAutoSplits")
+    archivesName.set("zombies-autosplits")
 }
 
 repositories {
@@ -53,7 +53,7 @@ tasks.processResources {
 }
 
 tasks.jar {
-    from("LICENSE") {
-        rename { "${it}_${archiveBaseName.get()}"}
+    from("../LICENSE") {
+        rename { "${it}_${archiveBaseName.get()}" }
     }
 }
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
index 304f10425..ed83354ac 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/ZombiesAutoSplitsClient.java
@@ -4,9 +4,12 @@
 import com.github.steanky.ethylene.core.BasicConfigHandler;
 import com.github.steanky.ethylene.core.ConfigCodec;
 import com.github.steanky.ethylene.core.ConfigHandler;
+import com.github.steanky.ethylene.core.loader.ConfigLoader;
 import com.github.steanky.ethylene.core.loader.SyncFileConfigLoader;
+import com.github.steanky.ethylene.core.processor.ConfigProcessor;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
@@ -20,19 +23,21 @@
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 import org.phantazm.messaging.packet.PacketHandler;
+import org.phantazm.messaging.serialization.DataReader;
+import org.phantazm.messaging.serialization.DataWriter;
 import org.phantazm.messaging.serialization.PacketSerializer;
 import org.phantazm.messaging.serialization.PacketSerializers;
 import org.phantazm.zombies.autosplits.config.ZombiesAutoSplitsConfig;
 import org.phantazm.zombies.autosplits.config.ZombiesAutoSplitsConfigProcessor;
+import org.phantazm.zombies.autosplits.event.ClientSoundCallback;
 import org.phantazm.zombies.autosplits.messaging.PhantazmMessagingHandler;
 import org.phantazm.zombies.autosplits.packet.PacketByteBufDataReader;
 import org.phantazm.zombies.autosplits.packet.PacketByteBufDataWriter;
-import org.phantazm.zombies.autosplits.render.RenderTimeHandler;
-import org.phantazm.zombies.autosplits.event.ClientSoundCallback;
 import org.phantazm.zombies.autosplits.packet.PhantazmPacket;
+import org.phantazm.zombies.autosplits.render.RenderTimeHandler;
 import org.phantazm.zombies.autosplits.sound.AutoSplitSoundInterceptor;
 import org.phantazm.zombies.autosplits.splitter.CompositeSplitter;
-import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.AutoSplitSplitter;
 import org.phantazm.zombies.autosplits.splitter.internal.InternalSplitter;
 import org.phantazm.zombies.autosplits.splitter.socket.LiveSplitSocketSplitter;
 import org.phantazm.zombies.autosplits.tick.KeyInputHandler;
@@ -42,12 +47,10 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.*;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ZombiesAutoSplitsClient implements ClientModInitializer {
 
@@ -58,16 +61,16 @@ public class ZombiesAutoSplitsClient implements ClientModInitializer {
     private final KeyBinding autoSplitsKeybind =
             new KeyBinding("Toggle AutoSplits", GLFW.GLFW_KEY_SEMICOLON, "Phantazm");
 
-    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     private final Logger logger = LoggerFactory.getLogger(MODID);
 
     private final ConfigHandler configHandler = new BasicConfigHandler();
 
     private final ConfigHandler.ConfigKey<ZombiesAutoSplitsConfig> configKey =
-            new ConfigHandler.ConfigKey<>(ZombiesAutoSplitsConfig.class, "zombiesautosplits_config");
+            new ConfigHandler.ConfigKey<>(ZombiesAutoSplitsConfig.class, MODID + "_config");
 
-    private final Collection<LiveSplitSplitter> splitters = new ArrayList<>(2);
+    private final Collection<AutoSplitSplitter> splitters = new CopyOnWriteArrayList<>();
 
     private RenderTimeHandler renderTimeHandler;
 
@@ -88,7 +91,7 @@ private CompletableFuture<ZombiesAutoSplitsConfig> loadConfigFromFile() {
     }
 
     public void setConfig(@NotNull ZombiesAutoSplitsConfig config) {
-        for (LiveSplitSplitter splitter : splitters) {
+        for (AutoSplitSplitter splitter : splitters) {
             splitter.cancel();
         }
         splitters.clear();
@@ -99,7 +102,7 @@ public void setConfig(@NotNull ZombiesAutoSplitsConfig config) {
             splitters.add(new LiveSplitSocketSplitter(executor, config.host(), config.port()));
         }
         if (config.useInternal()) {
-            InternalSplitter internalSplitter = new InternalSplitter(executor);
+            InternalSplitter internalSplitter = new InternalSplitter();
             splitters.add(internalSplitter);
             renderTimeHandler.setSplitter(internalSplitter);
         }
@@ -133,7 +136,7 @@ public void onInitializeClient() {
 
     private void initConfig() {
         ConfigCodec codec = new YamlCodec();
-        Path configPath = FabricLoader.getInstance().getConfigDir().resolve("zombiesautosplits");
+        Path configPath = FabricLoader.getInstance().getConfigDir().resolve("zombies-autosplits");
         String configFileName;
         if (codec.getPreferredExtensions().isEmpty()) {
             configFileName = "config";
@@ -149,22 +152,15 @@ private void initConfig() {
             logger.error("Failed to create config directory", e);
             return;
         }
-        configPath = configPath.resolve(configFileName);
 
-        ZombiesAutoSplitsConfig defaultConfig =
-                new ZombiesAutoSplitsConfig(ZombiesAutoSplitsConfig.DEFAULT_HOST, ZombiesAutoSplitsConfig.DEFAULT_PORT,
-                        ZombiesAutoSplitsConfig.DEFAULT_USE_LIVE_SPLITS, ZombiesAutoSplitsConfig.DEFAULT_USE_INTERNAL);
-        configHandler.registerLoader(configKey,
-                new SyncFileConfigLoader<>(new ZombiesAutoSplitsConfigProcessor(), defaultConfig, configPath, codec));
+        Path configFile = configPath.resolve(configFileName);
+        ZombiesAutoSplitsConfig defaultConfig = ZombiesAutoSplitsConfig.DEFAULT;
+        ConfigProcessor<ZombiesAutoSplitsConfig> configProcessor = new ZombiesAutoSplitsConfigProcessor();
+        ConfigLoader<ZombiesAutoSplitsConfig> configLoader =
+                new SyncFileConfigLoader<>(configProcessor, defaultConfig, configFile, codec);
+        configHandler.registerLoader(configKey, configLoader);
 
-        ZombiesAutoSplitsConfig loadedConfig;
-        try {
-            loadedConfig = loadConfigFromFile().get();
-        }
-        catch (InterruptedException | ExecutionException e) {
-            logger.error("Failed to load config", e);
-            return;
-        }
+        ZombiesAutoSplitsConfig loadedConfig = loadConfigFromFile().join();
         setConfig(loadedConfig);
     }
 
@@ -174,14 +170,39 @@ private void initEvents() {
         ClientTickEvents.END_CLIENT_TICK.register(new KeyInputHandler(autoSplitsKeybind, compositeSplitter));
         HudRenderCallback.EVENT.register(renderTimeHandler);
         ClientSoundCallback.EVENT.register(soundInterceptor);
+        ClientLifecycleEvents.CLIENT_STOPPING.register(unused -> shutdownExecutor());
+    }
+
+    private void shutdownExecutor() {
+        logger.info("Shutting down executor");
+        executor.shutdown();
+        try {
+            if (executor.awaitTermination(5L, TimeUnit.SECONDS)) {
+                return;
+            }
 
+            logger.warn("Executor did not shut down in 5 seconds. Force shutting down");
+            executor.shutdownNow();
 
+            if (!executor.awaitTermination(5L, TimeUnit.SECONDS)) {
+                logger.warn("Executor did not terminate");
+            }
+        }
+        catch (InterruptedException e) {
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    private void initKeyBindings() {
+        KeyBindingHelper.registerKeyBinding(autoSplitsKeybind);
     }
 
     private void initPackets() {
-        PacketSerializer packetSerializer =
-                PacketSerializers.clientToServerSerializer(() -> new PacketByteBufDataWriter(PacketByteBufs.create()),
-                        data -> new PacketByteBufDataReader(new PacketByteBuf(Unpooled.wrappedBuffer(data))));
+        Supplier<DataWriter> writerCreator = () -> new PacketByteBufDataWriter(PacketByteBufs.create());
+        Function<byte[], DataReader> readerCreator =
+                data -> new PacketByteBufDataReader(new PacketByteBuf(Unpooled.wrappedBuffer(data)));
+        PacketSerializer packetSerializer = PacketSerializers.clientToServerSerializer(writerCreator, readerCreator);
         PacketHandler<PacketSender> clientToServerHandler =
                 new PhantazmMessagingHandler(packetSerializer, PhantazmPacket.TYPE.getId(), compositeSplitter);
         ClientPlayNetworking.registerGlobalReceiver(PhantazmPacket.TYPE, (packet, player, responseSender) -> {
@@ -189,8 +210,4 @@ private void initPackets() {
         });
     }
 
-    private void initKeyBindings() {
-        KeyBindingHelper.registerKeyBinding(autoSplitsKeybind);
-    }
-
 }
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
index f86dfb970..9c12679b9 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/config/ZombiesAutoSplitsConfig.java
@@ -14,16 +14,15 @@ public record ZombiesAutoSplitsConfig(@NotNull String host, int port, boolean us
 
     public static final boolean DEFAULT_USE_INTERNAL = true;
 
+    public static final ZombiesAutoSplitsConfig DEFAULT =
+            new ZombiesAutoSplitsConfig(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_USE_LIVE_SPLITS, DEFAULT_USE_INTERNAL);
+
     public ZombiesAutoSplitsConfig {
         Objects.requireNonNull(host, "host");
     }
 
     public @NotNull Builder toBuilder() {
-        return new Builder()
-                .setHost(host)
-                .setPort(port)
-                .setUseLiveSplits(useLiveSplits)
-                .setUseInternal(useInternal);
+        return new Builder().setHost(host).setPort(port).setUseLiveSplits(useLiveSplits).setUseInternal(useInternal);
     }
 
     public static class Builder {
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
index d9515e876..f85bbb386 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/render/RenderTimeHandler.java
@@ -29,20 +29,25 @@ public void onHudRender(DrawContext drawContext, float tickDelta) {
             return;
         }
 
-        long millis = internalSplitter.getMillis();
-        long minutesPart = millis / 60000;
-        long secondsPart = (millis % 60000) / 1000;
-        long tenthSecondsPart = (millis % 1000) / 100;
-        String time = String.format("%d:%02d:%d", minutesPart, secondsPart, tenthSecondsPart);
+        String time = getTimeString();
         int width = client.textRenderer.getWidth(time);
         Window window = client.getWindow();
         int screenWidth = window.getScaledWidth();
         int screenHeight = window.getScaledHeight();
         drawContext.getMatrices().push();
-        drawContext.drawTextWithShadow(client.textRenderer, time, screenWidth - width, screenHeight - client.textRenderer.fontHeight, color);
+        drawContext.drawTextWithShadow(client.textRenderer, time, screenWidth - width,
+                screenHeight - client.textRenderer.fontHeight, color);
         drawContext.getMatrices().pop();
     }
 
+    private String getTimeString() {
+        long millis = internalSplitter.getMillis();
+        long minutesPart = millis / 60000;
+        long secondsPart = (millis % 60000) / 1000;
+        long tenthSecondsPart = (millis % 1000) / 100;
+        return String.format("%d:%02d:%d", minutesPart, secondsPart, tenthSecondsPart);
+    }
+
     public void setSplitter(@Nullable InternalSplitter internalSplitter) {
         this.internalSplitter = internalSplitter;
     }
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/AutoSplitSplitter.java
similarity index 85%
rename from zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java
rename to zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/AutoSplitSplitter.java
index 820c2c84f..4caa74195 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/LiveSplitSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/AutoSplitSplitter.java
@@ -4,7 +4,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-public interface LiveSplitSplitter {
+public interface AutoSplitSplitter {
 
     @NotNull CompletableFuture<Void> startOrSplit();
 
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
index c0d744181..894885e5d 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/CompositeSplitter.java
@@ -16,11 +16,12 @@ public class CompositeSplitter {
 
     private final Logger logger;
 
-    private final Collection<LiveSplitSplitter> splitters;
+    private final Collection<AutoSplitSplitter> splitters;
 
     private boolean enabled = true;
 
-    public CompositeSplitter(@NotNull MinecraftClient client, @NotNull Logger logger, @NotNull Collection<LiveSplitSplitter> splitters) {
+    public CompositeSplitter(@NotNull MinecraftClient client, @NotNull Logger logger,
+            @NotNull Collection<AutoSplitSplitter> splitters) {
         this.client = Objects.requireNonNull(client, "client");
         this.logger = Objects.requireNonNull(logger, "logger");
         this.splitters = Objects.requireNonNull(splitters, "splitters");
@@ -31,24 +32,23 @@ public void split() {
             return;
         }
 
-        for (LiveSplitSplitter splitter : splitters) {
+        for (AutoSplitSplitter splitter : splitters) {
             splitter.startOrSplit().whenComplete((ignored, throwable) -> {
-                if (throwable == null) {
-                    return;
+                if (throwable != null) {
+                    logger.warn("Failed to split", throwable);
+                    client.execute(this::warnFail);
                 }
-
-                logger.warn("Failed to split", throwable);
-                client.execute(() -> {
-                    if (client.player != null) {
-                        MutableText message = Text.literal("Failed to split!");
-                        message.formatted(Formatting.RED);
-                        client.player.sendMessage(message, false);
-                    }
-                });
             });
         }
     }
 
+    private void warnFail() {
+        if (client.player != null) {
+            MutableText message = Text.literal("Failed to split!").formatted(Formatting.RED);
+            client.player.sendMessage(message, false);
+        }
+    }
+
     public boolean toggle() {
         return enabled = !enabled;
     }
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
index 67948172e..a03dc9d83 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/internal/InternalSplitter.java
@@ -1,70 +1,29 @@
 package org.phantazm.zombies.autosplits.splitter.internal;
 
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.AutoSplitSplitter;
 
-import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
 
-public class InternalSplitter implements LiveSplitSplitter {
+public class InternalSplitter implements AutoSplitSplitter {
 
-    private final ReentrantLock lock = new ReentrantLock();
-
-    private final ScheduledExecutorService executor;
-
-    private Future<?> future = null;
-
-    private long millis = 0L;
-
-    public InternalSplitter(@NotNull ScheduledExecutorService executor) {
-        this.executor = Objects.requireNonNull(executor, "executor");
-    }
+    private long splitTime = 0L;
 
     @Override
     public @NotNull CompletableFuture<Void> startOrSplit() {
-        lock.lock();
-        try {
-            if (future == null) {
-                future = executor.scheduleAtFixedRate(() -> {
-                    lock.lock();
-                    try {
-                        millis += 10L;
-                    }
-                    finally {
-                        lock.unlock();
-                    }
-                }, 0L, 10L, TimeUnit.MILLISECONDS);
-            }
-            else {
-                millis = 0L;
-            }
-
-            return CompletableFuture.completedFuture(null);
-        }
-        finally {
-            lock.unlock();
-        }
+        splitTime = System.currentTimeMillis();
+        return CompletableFuture.completedFuture(null);
     }
 
     public void cancel() {
-        lock.lock();
-        try {
-            if (future != null) {
-                future.cancel(false);
-                future = null;
-            }
-            millis = 0L;
-        }
-        finally {
-            lock.unlock();
-        }
+        splitTime = 0L;
     }
 
     public long getMillis() {
-        return millis;
+        if (splitTime == 0L) {
+            return 0L;
+        }
+
+        return System.currentTimeMillis() - splitTime;
     }
 }
diff --git a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
index 4585d5678..2577faa4d 100644
--- a/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
+++ b/zombies-timer/src/main/java/org/phantazm/zombies/autosplits/splitter/socket/LiveSplitSocketSplitter.java
@@ -1,7 +1,7 @@
 package org.phantazm.zombies.autosplits.splitter.socket;
 
 import org.jetbrains.annotations.NotNull;
-import org.phantazm.zombies.autosplits.splitter.LiveSplitSplitter;
+import org.phantazm.zombies.autosplits.splitter.AutoSplitSplitter;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -12,7 +12,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
-public class LiveSplitSocketSplitter implements LiveSplitSplitter {
+public class LiveSplitSocketSplitter implements AutoSplitSplitter {
 
     private final Executor executor;
 

From 0fab7f258caf332408df5655bbb147018b405f54 Mon Sep 17 00:00:00 2001
From: tahmid-23 <60953955+tahmid-23@users.noreply.github.com>
Date: Fri, 14 Jul 2023 22:25:49 -0400
Subject: [PATCH 4/4] use packet handler to serialize in the mapeditor

---
 .../zombies/mapeditor/client/MapeditorClient.java      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java b/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java
index fd8f3f230..c95e87462 100644
--- a/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java
+++ b/zombies-mapeditor/src/main/java/org/phantazm/zombies/mapeditor/client/MapeditorClient.java
@@ -25,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;
@@ -95,12 +94,6 @@ public void onInitializeClient() {
                 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) {
@@ -127,6 +120,9 @@ protected void sendToReceiver(@NotNull PacketSender packetSender, byte @NotNull
                     packetSender.sendPacket(clientToProxyIdentifier, new PacketByteBuf(Unpooled.wrappedBuffer(data)));
                 }
             };
+            ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
+                clientToProxyHandler.output(sender, new MapDataVersionQueryPacket());
+            }));
             ClientPlayNetworking.registerGlobalReceiver(PhantazmPacket.TYPE, ((packet, player, responseSender) -> {
                 clientToProxyHandler.handleData(responseSender, packet.data());
             }));