Anvilcraft/icbm
2
1
Fork 0
generated from tilera/1710mod
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: crash on server
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Timo Ley 2022-12-18 19:31:00 +01:00
parent abcc79739b
commit bf7b13f96c
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -27,7 +27,7 @@ sourceSets {
api {} api {}
} }
version = "1.0.2" version = "1.0.3"
group = "universalelectricity" group = "universalelectricity"
archivesBaseName = "icbm" archivesBaseName = "icbm"

15
src/main/java/icbm/gangshao/ClientProxy.java
View file

@ -4,6 +4,9 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry; 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.platform.TTurretPlatform;
import icbm.gangshao.render.BlockRenderingHandler; import icbm.gangshao.render.BlockRenderingHandler;
import icbm.gangshao.render.FXBeam; import icbm.gangshao.render.FXBeam;
@ -15,6 +18,8 @@ import icbm.gangshao.render.RRailgun;
import icbm.gangshao.shimian.GuiPlatformAccess; import icbm.gangshao.shimian.GuiPlatformAccess;
import icbm.gangshao.shimian.GuiPlatformSlots; import icbm.gangshao.shimian.GuiPlatformSlots;
import icbm.gangshao.shimian.GuiPlatformTerminal; 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.ESeat;
import icbm.gangshao.turret.mount.TRailgunTurret; import icbm.gangshao.turret.mount.TRailgunTurret;
import icbm.gangshao.turret.sentries.TAATurret; import icbm.gangshao.turret.sentries.TAATurret;
@ -31,6 +36,16 @@ import universalelectricity.core.vector.Vector3;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
@Override @Override
public void preInit() { 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(); super.preInit();
} }

18
src/main/java/icbm/gangshao/ICBMSentry.java
View file

@ -124,26 +124,16 @@ public class ICBMSentry extends MainBase {
GameRegistry.registerItem(itemAmmo, "icbm:itemAmmo"); GameRegistry.registerItem(itemAmmo, "icbm:itemAmmo");
GameRegistry.registerItem(itemUpgrade, "icbm:itemUpgrade"); GameRegistry.registerItem(itemUpgrade, "icbm:itemUpgrade");
ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret); ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret);
ICBMSentry.proxy.preInit();
channel = NetworkRegistry.INSTANCE.newSimpleChannel("icbm_sentry"); channel = NetworkRegistry.INSTANCE.newSimpleChannel("icbm_sentry");
int pktId = 0;
channel.registerMessage( ICBMSentry.proxy.preInit();
PacketHandlerTurret.class, PacketTurret.class, pktId++, Side.CLIENT
);
channel.registerMessage(
TerminalOutputPacketHandler.class,
TerminalOutputPacket.class,
pktId++,
Side.CLIENT
);
channel.registerMessage( channel.registerMessage(
TerminalCommandPacketHandler.class, TerminalCommandPacketHandler.class,
TerminalCommandPacket.class, TerminalCommandPacket.class,
pktId++, 0,
Side.SERVER Side.SERVER
); );
} }