Actually fixed forge networking

Author: Gollorum

common/src/main/java/gollorum/signpost/networking/PacketHandler.java

@@ -17,8 +17,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Supplier;
 
 public abstract class PacketHandler {
@@ -43,7 +42,8 @@ public HolderLookup.Provider getHolderLookupProvider(){
         }
     }
 
-    protected final Map<Class<?>, Tuple<Event<?>, ResourceLocation>> events = new HashMap<>();
+    protected final List<Tuple<Event<?>, ResourceLocation>> events = new ArrayList<>();
+    protected final Map<Class<?>, Tuple<Event<?>, ResourceLocation>> eventMap = new HashMap<>();
 
     protected void init() {
         register(new PostTile.PartAddedEvent(), ResourceLocation.fromNamespaceAndPath(Signpost.MOD_ID, "part_added"));
@@ -69,7 +69,8 @@ protected void init() {
     }
 
     public final <T> void register(Event<T> event, ResourceLocation id) {
-        events.put(event.getMessageClass(), new Tuple<>(event, id));
+        events.add(new Tuple<>(event, id));
+        eventMap.put(event.getMessageClass(), new Tuple<>(event, id));
     }
 
     public abstract <T> void sendToServer(T message);

fabric/src/main/java/gollorum/signpost/networking/FabricPacketHandler.java

@@ -27,7 +27,7 @@ public static void initialize(boolean isClient) {
             instance.register(entry.getValue(), entry.getKey());
         }
 
-        for (var tuple : instance.events.values()) {
+        for (var tuple : instance.events) {
             ((FabricPacketHandler) instance).actuallyRegister(tuple._1(), tuple._2());
         }
     }
@@ -66,7 +66,7 @@ private static <T> void handleOnServer(Payload<T> payload, ServerPlayNetworking.
     }
 
     private <T> Payload<T> toPayload(T message) {
-        var tuple = events.get(message.getClass());
+        var tuple = eventMap.get(message.getClass());
         return new Payload<>(new CustomPacketPayload.Type<>(tuple._2()), (Event<T>) tuple._1(), message);
     }
 

forge/src/main/java/gollorum/signpost/networking/ForgePacketHandler.java

@@ -36,7 +36,7 @@ public static void initialize() {
         }
 
         var flow = channel.protocol(NetworkProtocol.PLAY).bidirectional();
-        for (var entry : instance.events.values()) {
+        for (var entry : instance.events) {
             ((ForgePacketHandler) instance).register(entry._1(), flow);
         }
         channel.build();

neoforge/src/main/java/gollorum/signpost/networking/NeoForgePacketHandler.java

@@ -38,7 +38,7 @@ public static void initialize(IEventBus bus) {
     public static void register(final RegisterPayloadHandlersEvent event) {
         PayloadRegistrar registrar = event.registrar(Signpost.MOD_ID);
 
-        for (var tuple : instance.events.values()) {
+        for (var tuple : instance.events) {
             ((NeoForgePacketHandler) instance).registerCommon(tuple._1(), tuple._2(), registrar);
         }
 
@@ -60,7 +60,7 @@ private <T> void registerCommon(Event<T> event, ResourceLocation id, PayloadRegi
 //    @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     public static void register(net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent event) {
-        for (var tuple : instance.events.values()) {
+        for (var tuple : instance.events) {
             ((NeoForgePacketHandler) instance).registerClient(tuple._2(), event);
         }
     }
@@ -75,7 +75,7 @@ private <T> void registerClient(ResourceLocation id, net.neoforged.neoforge.clie
     }
 
     private <T> Payload<T> toPayload(T message) {
-        var tuple = events.get(message.getClass());
+        var tuple = eventMap.get(message.getClass());
         return new Payload<>(new CustomPacketPayload.Type<>(tuple._2()), (Event<T>) tuple._1(), message);
     }