diff --git a/build.gradle b/build.gradle index 0807773..3e0e4fb 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ sourceSets { api {} } -version = "1.0.3" +version = "1.0.4" group = "universalelectricity" archivesBaseName = "mffs" diff --git a/src/main/java/mffs/ClientProxy.java b/src/main/java/mffs/ClientProxy.java index 7443d6c..f927f4e 100644 --- a/src/main/java/mffs/ClientProxy.java +++ b/src/main/java/mffs/ClientProxy.java @@ -4,9 +4,6 @@ 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 mffs.base.PacketFxs; -import mffs.base.PacketFxsHandler; import mffs.gui.GuiBiometricIdentifier; import mffs.gui.GuiCoercionDeriver; import mffs.gui.GuiForceFieldProjector; @@ -41,13 +38,6 @@ import universalelectricity.core.vector.Vector3; public class ClientProxy extends CommonProxy { - @Override - public void preInit() { - ModularForceFieldSystem.channel.registerMessage(PacketFxsHandler.class, PacketFxs.class, - 1, Side.CLIENT); - super.preInit(); - } - @Override public void init() { super.init(); diff --git a/src/main/java/mffs/ModularForceFieldSystem.java b/src/main/java/mffs/ModularForceFieldSystem.java index ed51ecd..6797700 100644 --- a/src/main/java/mffs/ModularForceFieldSystem.java +++ b/src/main/java/mffs/ModularForceFieldSystem.java @@ -259,6 +259,8 @@ public class ModularForceFieldSystem { GameRegistry.registerTileEntity(TileEntityForceManipulator.class, "tileForceManipulator"); + ModularForceFieldSystem.proxy.preInit(); + FluidRegistry.registerFluid(FortronHelper.FLUID_FORTRON); GameRegistry.registerItem(itemRemoteController, "itemRemoteController"); @@ -302,10 +304,13 @@ public class ModularForceFieldSystem { GameRegistry.registerItem(itemModuleAntiSpawn, "itemModuleAntiSpawn"); channel = - NetworkRegistry.INSTANCE.newSimpleChannel("ModularForceFieldSystem"); - ModularForceFieldSystem.proxy.preInit(); + NetworkRegistry.INSTANCE.newSimpleChannel("mffs"); + + int pkgDiscriminator = 0; channel.registerMessage(PacketTileHandler.class, PacketTile.class, - 0, Side.SERVER); + pkgDiscriminator++, Side.SERVER); + channel.registerMessage(PacketFxsHandler.class, PacketFxs.class, + pkgDiscriminator++, Side.CLIENT); } @EventHandler diff --git a/src/main/java/mffs/base/PacketFxsHandler.java b/src/main/java/mffs/base/PacketFxsHandler.java index 5d1ecd7..21ca21c 100644 --- a/src/main/java/mffs/base/PacketFxsHandler.java +++ b/src/main/java/mffs/base/PacketFxsHandler.java @@ -4,13 +4,15 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import mffs.base.TileEntityBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class PacketFxsHandler implements IMessageHandler { @Override + @SideOnly(Side.CLIENT) public IMessage onMessage(PacketFxs message, MessageContext ctx) { World world = FMLClientHandler.instance().getWorldClient();