Fix crash from ExtraUtilities calling getRenderType() on server

This commit is contained in:
mezz committed 2015-11-08 19:40:16 -08:00
1 parent 56a9e84800
commit b7382f074a
6 files changed
+30 -20

No files matched your search

@@ -44,7 +44,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import forestry.apiculture.tiles.TileCandle;
import forestry.core.proxy.ProxyRenderClient;
import forestry.core.proxy.Proxies;
import forestry.core.render.TextureManager;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.StringUtil;
@@ -110,7 +110,7 @@ public class BlockCandle extends BlockTorch {
@Override
public int getRenderType() {
return ProxyRenderClient.getCandleRenderId();
return Proxies.render.getCandleRenderId();
}
@SideOnly(Side.CLIENT)
@@ -21,7 +21,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import forestry.apiculture.blocks.BlockCandle;
import forestry.apiculture.tiles.TileCandle;
import forestry.core.proxy.ProxyRenderClient;
import forestry.core.proxy.Proxies;
public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
@@ -32,7 +32,7 @@ public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
if (block.getRenderType() == ProxyRenderClient.getCandleRenderId()) {
if (block.getRenderType() == Proxies.render.getCandleRenderId()) {
renderBlockCandle(world, x, y, z, (BlockCandle) block);
}
return true;
@@ -45,7 +45,7 @@ public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
@Override
public int getRenderId() {
return ProxyRenderClient.getCandleRenderId();
return Proxies.render.getCandleRenderId();
}
private static boolean renderBlockCandle(IBlockAccess world, int x, int y, int z, BlockCandle block) {
@@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.core.access.IAccessHandler;
import forestry.core.circuits.ISocketable;
import forestry.core.fluids.FluidHelper;
import forestry.core.proxy.ProxyRenderClient;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.MachineDefinition;
import forestry.core.tiles.TileBase;
import forestry.core.tiles.TileForestry;
@@ -90,7 +90,7 @@ public class BlockBase extends BlockForestry {
@Override
public int getRenderType() {
if (hasTESR) {
return ProxyRenderClient.getByBlockModelRenderId();
return Proxies.render.getByBlockModelRenderId();
} else {
return 0;
}
@@ -25,6 +25,14 @@ public class ProxyRender {
public void init() {
}
public int getCandleRenderId() {
return 0;
}
public int getByBlockModelRenderId() {
return 0;
}
public boolean fancyGraphicsEnabled() {
return false;
}
@@ -48,16 +48,8 @@ import forestry.core.tiles.MachineDefinition;
public class ProxyRenderClient extends ProxyRender {
private static int byBlockModelId;
private static int candleRenderId;
public static int getCandleRenderId() {
return candleRenderId;
}
public static int getByBlockModelRenderId() {
return byBlockModelId;
}
private int byBlockModelId;
private int candleRenderId;
@Override
public void init() {
@@ -69,6 +61,16 @@ public class ProxyRenderClient extends ProxyRender {
RenderingRegistry.registerBlockHandler(candleRenderId, new RenderCandleBlock());
}
@Override
public int getCandleRenderId() {
return candleRenderId;
}
@Override
public int getByBlockModelRenderId() {
return byBlockModelId;
}
@Override
public boolean fancyGraphicsEnabled() {
return Proxies.common.getClientInstance().gameSettings.fancyGraphics;
@@ -18,7 +18,7 @@ import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import forestry.core.proxy.ProxyRenderClient;
import forestry.core.proxy.Proxies;
public class RenderBlock implements ISimpleBlockRenderingHandler {
@@ -27,7 +27,7 @@ public class RenderBlock implements ISimpleBlockRenderingHandler {
@Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
if (block.getRenderType() == ProxyRenderClient.getByBlockModelRenderId()) {
if (block.getRenderType() == Proxies.render.getByBlockModelRenderId()) {
TileRendererIndex index = new TileRendererIndex(block, metadata);
if (byBlockRenderer.containsKey(index)) {
byBlockRenderer.get(index).inventoryRender(-0.5, -0.5, -0.5);
@@ -48,7 +48,7 @@ public class RenderBlock implements ISimpleBlockRenderingHandler {
@Override
public int getRenderId() {
return ProxyRenderClient.getByBlockModelRenderId();
return Proxies.render.getByBlockModelRenderId();
}
}