diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 03582017..792cbcfd 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -73,7 +73,7 @@ import net.minecraftforge.liquids.LiquidData; import net.minecraftforge.liquids.LiquidManager; import net.minecraftforge.liquids.LiquidStack; -@Mod(name="BuildCraft", version=Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies="required-after:Forge@[6.3.0.364,)") +@Mod(name="BuildCraft", version=Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies="required-after:Forge@[6.3.0.0,)") @NetworkMod(channels = {DefaultProps.NET_CHANNEL_NAME}, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) public class BuildCraftCore { public static enum RenderMode { diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index de8aae0d..6e2dcef7 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -32,7 +32,7 @@ public class BlockLaser extends BlockContainer { @Override public int getRenderType() { - return SiliconProxyClient.laserBlockModel; + return SiliconProxy.laserBlockModel; } @Override diff --git a/common/buildcraft/silicon/SiliconProxy.java b/common/buildcraft/silicon/SiliconProxy.java index 7f81b109..c91f148f 100644 --- a/common/buildcraft/silicon/SiliconProxy.java +++ b/common/buildcraft/silicon/SiliconProxy.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.SidedProxy; public class SiliconProxy { @SidedProxy(clientSide = "buildcraft.silicon.SiliconProxyClient", serverSide = "buildcraft.silicon.SiliconProxy") public static SiliconProxy proxy; + public static int laserBlockModel = -1; public void registerRenderers() { } diff --git a/common/buildcraft/silicon/SiliconProxyClient.java b/common/buildcraft/silicon/SiliconProxyClient.java index 6c6415f4..47b1a81a 100644 --- a/common/buildcraft/silicon/SiliconProxyClient.java +++ b/common/buildcraft/silicon/SiliconProxyClient.java @@ -3,11 +3,9 @@ package buildcraft.silicon; import cpw.mods.fml.client.registry.RenderingRegistry; public class SiliconProxyClient extends SiliconProxy { - public static int laserBlockModel; - @Override public void registerRenderers() { - laserBlockModel = RenderingRegistry.getNextAvailableRenderId(); + SiliconProxy.laserBlockModel = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new SiliconRenderBlock()); } } diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java index a0409ea7..c96e04c6 100644 --- a/common/buildcraft/silicon/SiliconRenderBlock.java +++ b/common/buildcraft/silicon/SiliconRenderBlock.java @@ -21,12 +21,11 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraftforge.common.ForgeDirection; import buildcraft.core.utils.Utils; -import buildcraft.silicon.SiliconProxyClient; public class SiliconRenderBlock implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return SiliconProxyClient.laserBlockModel; + return SiliconProxy.laserBlockModel; } @Override public boolean shouldRender3DInInventory() { diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index c9a175eb..870594ee 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -51,7 +51,7 @@ public class BlockGenericPipe extends BlockContainer { @Override public int getRenderType() { - return TransportProxyClient.pipeModel; + return TransportProxy.pipeModel; } @Override diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index 9572d622..9d3804f4 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class TransportProxy { @SidedProxy(clientSide = "buildcraft.transport.TransportProxyClient", serverSide = "buildcraft.transport.TransportProxy") public static TransportProxy proxy; + public static int pipeModel = -1; public void registerTileEntities() { GameRegistry.registerTileEntity(TileDummyGenericPipe.class, "net.minecraft.src.buildcraft.GenericPipe"); diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index fa54d972..23fd995f 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -14,8 +14,6 @@ public class TransportProxyClient extends TransportProxy { public final static PipeWorldRenderer pipeWorldRenderer = new PipeWorldRenderer(); public final static FacadeItemRenderer facadeItemRenderer = new FacadeItemRenderer(); - public static int pipeModel; - @Override public void registerTileEntities() { super.registerTileEntities(); @@ -53,7 +51,7 @@ public class TransportProxyClient extends TransportProxy { MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsSandstone.shiftedIndex, pipeItemRenderer); MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.facadeItem.shiftedIndex, facadeItemRenderer); - pipeModel = RenderingRegistry.getNextAvailableRenderId(); + TransportProxy.pipeModel = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(pipeWorldRenderer); } diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 49c6e299..b13b3b96 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -10,7 +10,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; import buildcraft.transport.PipeRenderState; -import buildcraft.transport.TransportProxyClient; +import buildcraft.transport.TransportProxy; import net.minecraft.src.Block; import net.minecraft.src.IBlockAccess; @@ -539,6 +539,6 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return TransportProxyClient.pipeModel; + return TransportProxy.pipeModel; } }