From 52a247b7c697ca597da5c0b91e0dafb576cab595 Mon Sep 17 00:00:00 2001
From: Sekwah <contact@sekwah.com>
Date: Wed, 13 Jul 2022 23:23:55 +0100
Subject: [PATCH] refactor: update packet registry code

---
 build.gradle                                  |  6 +++++
 .../narutomod/network/PacketHandler.java      | 25 +++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6a7d3b1d..a63719d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -319,3 +319,9 @@ curseforge {
         addArtifact deobfJar
     }
 }
+
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xmaxerrs" << "100000"
+    }
+}
diff --git a/src/main/java/com/sekwah/narutomod/network/PacketHandler.java b/src/main/java/com/sekwah/narutomod/network/PacketHandler.java
index 4b55949b..a1166346 100644
--- a/src/main/java/com/sekwah/narutomod/network/PacketHandler.java
+++ b/src/main/java/com/sekwah/narutomod/network/PacketHandler.java
@@ -1,6 +1,5 @@
 package com.sekwah.narutomod.network;
 
-import com.mojang.logging.LogUtils;
 import com.sekwah.narutomod.NarutoMod;
 import com.sekwah.narutomod.network.c2s.ServerAbilityActivatePacket;
 import com.sekwah.narutomod.network.c2s.ServerAbilityChannelPacket;
@@ -16,10 +15,11 @@
 import net.minecraftforge.network.PacketDistributor;
 import net.minecraftforge.network.simple.SimpleChannel;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PacketHandler {
 
-    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Logger LOGGER = LoggerFactory.getLogger("NarutoMod:PacketHandler");
 
     /**
      * Forces the mod to have the same version as the server.
@@ -49,13 +49,24 @@ public class PacketHandler {
 
     public static void init() {
         // Server to client packs
-        NARUTO_CHANNEL.registerMessage(0, ClientTestPacket.class, ClientTestPacket::encode, ClientTestPacket::decode, ClientTestPacket.Handler::handle);
+        NARUTO_CHANNEL.registerMessage(getPacketID(), ClientTestPacket.class, ClientTestPacket::encode, ClientTestPacket::decode, ClientTestPacket.Handler::handle);
 
         // Client to server packets
-        NARUTO_CHANNEL.registerMessage(100, ServerTestPacket.class, ServerTestPacket::encode, ServerTestPacket::decode, ServerTestPacket.Handler::handle);
-        NARUTO_CHANNEL.registerMessage(101, ServerJutsuCastingPacket.class, ServerJutsuCastingPacket::encode, ServerJutsuCastingPacket::decode, ServerJutsuCastingPacket.Handler::handle);
-        NARUTO_CHANNEL.registerMessage(102, ServerAbilityActivatePacket.class, ServerAbilityActivatePacket::encode, ServerAbilityActivatePacket::decode, ServerAbilityActivatePacket.Handler::handle);
-        NARUTO_CHANNEL.registerMessage(103, ServerAbilityChannelPacket.class, ServerAbilityChannelPacket::encode, ServerAbilityChannelPacket::decode, ServerAbilityChannelPacket.Handler::handle);
+        NARUTO_CHANNEL.registerMessage(getPacketID(), ServerTestPacket.class, ServerTestPacket::encode, ServerTestPacket::decode, ServerTestPacket.Handler::handle);
+        NARUTO_CHANNEL.registerMessage(getPacketID(), ServerJutsuCastingPacket.class, ServerJutsuCastingPacket::encode, ServerJutsuCastingPacket::decode, ServerJutsuCastingPacket.Handler::handle);
+        NARUTO_CHANNEL.registerMessage(getPacketID(), ServerAbilityActivatePacket.class, ServerAbilityActivatePacket::encode, ServerAbilityActivatePacket::decode, ServerAbilityActivatePacket.Handler::handle);
+        NARUTO_CHANNEL.registerMessage(getPacketID(), ServerAbilityChannelPacket.class, ServerAbilityChannelPacket::encode, ServerAbilityChannelPacket::decode, ServerAbilityChannelPacket.Handler::handle);
+    }
+
+    private static int packetId = 0;
+    /**
+     * When called grabs a new packet id and increments.
+     *
+     * Only really usable because we force the mods to have to be the same version via PROTOCOL_VERSION
+     * @return
+     */
+    private static int getPacketID() {
+        return packetId++;
     }