From bf7b13f96c29033865d18618977b95433e7e0118 Mon Sep 17 00:00:00 2001
From: Timo Ley <timo.ley@tilera.dev>
Date: Sun, 18 Dec 2022 19:31:00 +0100
Subject: [PATCH] fix: crash on server

---
 build.gradle                                 |  2 +-
 src/main/java/icbm/gangshao/ClientProxy.java | 15 +++++++++++++++
 src/main/java/icbm/gangshao/ICBMSentry.java  | 18 ++++--------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index d0757a7..7c1b5ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ sourceSets {
     api {}
 }
 
-version = "1.0.2"
+version = "1.0.3"
 group = "universalelectricity"
 archivesBaseName = "icbm"
 
diff --git a/src/main/java/icbm/gangshao/ClientProxy.java b/src/main/java/icbm/gangshao/ClientProxy.java
index 0e69c27..10df284 100644
--- a/src/main/java/icbm/gangshao/ClientProxy.java
+++ b/src/main/java/icbm/gangshao/ClientProxy.java
@@ -4,6 +4,9 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.relauncher.Side;
+import icbm.gangshao.packet.PacketHandlerTurret;
+import icbm.gangshao.packet.PacketTurret;
 import icbm.gangshao.platform.TTurretPlatform;
 import icbm.gangshao.render.BlockRenderingHandler;
 import icbm.gangshao.render.FXBeam;
@@ -15,6 +18,8 @@ import icbm.gangshao.render.RRailgun;
 import icbm.gangshao.shimian.GuiPlatformAccess;
 import icbm.gangshao.shimian.GuiPlatformSlots;
 import icbm.gangshao.shimian.GuiPlatformTerminal;
+import icbm.gangshao.terminal.TerminalOutputPacket;
+import icbm.gangshao.terminal.TerminalOutputPacketHandler;
 import icbm.gangshao.turret.mount.ESeat;
 import icbm.gangshao.turret.mount.TRailgunTurret;
 import icbm.gangshao.turret.sentries.TAATurret;
@@ -31,6 +36,16 @@ import universalelectricity.core.vector.Vector3;
 public class ClientProxy extends CommonProxy {
     @Override
     public void preInit() {
+        int pktId = 1;
+        ICBMSentry.channel.registerMessage(
+            PacketHandlerTurret.class, PacketTurret.class, pktId++, Side.CLIENT
+        );
+        ICBMSentry.channel.registerMessage(
+            TerminalOutputPacketHandler.class,
+            TerminalOutputPacket.class,
+            pktId++,
+            Side.CLIENT
+        );
         super.preInit();
     }
 
diff --git a/src/main/java/icbm/gangshao/ICBMSentry.java b/src/main/java/icbm/gangshao/ICBMSentry.java
index e6ff1c7..ffb94c2 100644
--- a/src/main/java/icbm/gangshao/ICBMSentry.java
+++ b/src/main/java/icbm/gangshao/ICBMSentry.java
@@ -124,26 +124,16 @@ public class ICBMSentry extends MainBase {
         GameRegistry.registerItem(itemAmmo, "icbm:itemAmmo");
         GameRegistry.registerItem(itemUpgrade, "icbm:itemUpgrade");
 
-        ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret);
-
-        ICBMSentry.proxy.preInit();
+        ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret);        
 
         channel = NetworkRegistry.INSTANCE.newSimpleChannel("icbm_sentry");
-        int pktId = 0;
 
-        channel.registerMessage(
-            PacketHandlerTurret.class, PacketTurret.class, pktId++, Side.CLIENT
-        );
-        channel.registerMessage(
-            TerminalOutputPacketHandler.class,
-            TerminalOutputPacket.class,
-            pktId++,
-            Side.CLIENT
-        );
+        ICBMSentry.proxy.preInit();
+        
         channel.registerMessage(
             TerminalCommandPacketHandler.class,
             TerminalCommandPacket.class,
-            pktId++,
+            0,
             Side.SERVER
         );
     }