diff --git a/build.gradle b/build.gradle index c3e6784..e7447b8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply from: './gradle/scripts/mixins.gradle' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -version = "1.3.0" +version = "1.3.1" group= "dev.tilera" archivesBaseName = "auracore" diff --git a/src/main/java/dev/tilera/auracore/AuraCore.java b/src/main/java/dev/tilera/auracore/AuraCore.java index e8f2c0e..cfaae70 100644 --- a/src/main/java/dev/tilera/auracore/AuraCore.java +++ b/src/main/java/dev/tilera/auracore/AuraCore.java @@ -11,7 +11,6 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; import dev.tilera.auracore.api.Aspects; import dev.tilera.auracore.aura.AuraCalculationThread; import dev.tilera.auracore.aura.AuraDeleteThread; @@ -20,14 +19,6 @@ import dev.tilera.auracore.aura.AuraUpdateThread; import dev.tilera.auracore.aura.AuraWorldTicker; import dev.tilera.auracore.client.GUITicker; import dev.tilera.auracore.client.RenderEventHandler; -import dev.tilera.auracore.network.AuraDeletePacket; -import dev.tilera.auracore.network.AuraDeletePacketHandler; -import dev.tilera.auracore.network.AuraPacket; -import dev.tilera.auracore.network.AuraPacketHandler; -import dev.tilera.auracore.network.AuraTransferFXPacket; -import dev.tilera.auracore.network.AuraTransferFXPacketHandler; -import dev.tilera.auracore.network.NodeZapPacket; -import dev.tilera.auracore.network.NodeZapPacketHandler; import dev.tilera.auracore.proxy.CommonProxy; import dev.tilera.auracore.world.WorldGenerator; import net.minecraft.item.ItemStack; @@ -52,11 +43,7 @@ public class AuraCore { Config.load(); Aspects.load(); CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel("auracore"); - int pktID = 0; - CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT); - CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT); - CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT); - CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT); + proxy.preInit(); MinecraftForge.EVENT_BUS.register(new EventHandler()); MinecraftForge.EVENT_BUS.register(new RenderEventHandler()); FMLCommonHandler.instance().bus().register(new AuraWorldTicker()); diff --git a/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java b/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java index ea1531a..f59d2f9 100644 --- a/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java +++ b/src/main/java/dev/tilera/auracore/proxy/ClientProxy.java @@ -1,11 +1,31 @@ package dev.tilera.auracore.proxy; +import cpw.mods.fml.relauncher.Side; +import dev.tilera.auracore.AuraCore; import dev.tilera.auracore.client.gui.GuiArcaneWorkbench; +import dev.tilera.auracore.network.AuraDeletePacket; +import dev.tilera.auracore.network.AuraDeletePacketHandler; +import dev.tilera.auracore.network.AuraPacket; +import dev.tilera.auracore.network.AuraPacketHandler; +import dev.tilera.auracore.network.AuraTransferFXPacket; +import dev.tilera.auracore.network.AuraTransferFXPacketHandler; +import dev.tilera.auracore.network.NodeZapPacket; +import dev.tilera.auracore.network.NodeZapPacketHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import thaumcraft.common.tiles.TileArcaneWorkbench; public class ClientProxy extends CommonProxy { + + @Override + public void preInit() { + int pktID = 0; + AuraCore.CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT); + AuraCore.CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT); + super.preInit(); + } @Override public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/dev/tilera/auracore/proxy/CommonProxy.java b/src/main/java/dev/tilera/auracore/proxy/CommonProxy.java index 95a819e..d6dfb5c 100644 --- a/src/main/java/dev/tilera/auracore/proxy/CommonProxy.java +++ b/src/main/java/dev/tilera/auracore/proxy/CommonProxy.java @@ -8,6 +8,8 @@ import thaumcraft.common.tiles.TileArcaneWorkbench; public class CommonProxy implements IGuiHandler { + public void preInit() {} + @Override public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id == 0) {