Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix improper references to client specific classes with new 1.4 methods

Browse source
This commit is contained in:
Christian 2012-11-11 00:21:45 -05:00
parent 63180af9fd
commit f6e784422c
9 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftCore.java
View file

@ -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 {

2
common/buildcraft/silicon/BlockLaser.java
View file

@ -32,7 +32,7 @@ public class BlockLaser extends BlockContainer {
@Override
public int getRenderType() {
return SiliconProxyClient.laserBlockModel;
return SiliconProxy.laserBlockModel;
}
@Override

1
common/buildcraft/silicon/SiliconProxy.java
View file

@ -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() {
}

4
common/buildcraft/silicon/SiliconProxyClient.java
View file

@ -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());
}
}

3
common/buildcraft/silicon/SiliconRenderBlock.java
View file

@ -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() {

2
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -51,7 +51,7 @@ public class BlockGenericPipe extends BlockContainer {
@Override
public int getRenderType() {
return TransportProxyClient.pipeModel;
return TransportProxy.pipeModel;
}
@Override

1
common/buildcraft/transport/TransportProxy.java
View file

@ -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");

4
common/buildcraft/transport/TransportProxyClient.java
View file

@ -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);
}

4
common/buildcraft/transport/render/PipeWorldRenderer.java
View file

@ -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;
}
}