From 54c2d82b0db9447458377dda47ea3a323174b0b3 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sat, 30 Aug 2014 16:41:31 -0400 Subject: [PATCH] Fix server crash when accessing block render ID --- StorageDrawers.iml | 16 ++++++++-------- StorageDrawers.ipr | 2 +- build.gradle | 4 ++-- resources/mcmod.info | 2 +- .../minecraft/storagedrawers/StorageDrawers.java | 2 +- .../storagedrawers/block/BlockDrawers.java | 2 +- .../client/renderer/DrawersRenderer.java | 3 ++- .../renderer/TileEntityDrawersRenderer.java | 3 +++ .../storagedrawers/core/ClientProxy.java | 2 -- .../storagedrawers/core/CommonProxy.java | 2 ++ 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/StorageDrawers.iml b/StorageDrawers.iml index 268901e..c4b8b5c 100644 --- a/StorageDrawers.iml +++ b/StorageDrawers.iml @@ -13,18 +13,18 @@ - + - + - + @@ -33,13 +33,13 @@ - + - + - + @@ -199,7 +199,7 @@ - + @@ -648,7 +648,7 @@ - + diff --git a/StorageDrawers.ipr b/StorageDrawers.ipr index e5f9e05..35eb233 100644 --- a/StorageDrawers.ipr +++ b/StorageDrawers.ipr @@ -174,7 +174,7 @@ - + diff --git a/build.gradle b/build.gradle index d683dd8..3316df7 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,12 @@ buildscript { apply plugin: 'forge' -version = "1.0.0" +version = "1.0.1" group= "com.jaquadro.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" minecraft { - version = "1.7.10-10.13.0.1207" + version = "1.7.10-10.13.1.1210-new" assetDir = "runtime/assets" } diff --git a/resources/mcmod.info b/resources/mcmod.info index f84fddf..19cec52 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "StorageDrawers", "name": "Storage Drawers", "description": "Multi-drawer storage blocks for quick storage and retrieval.", - "version": "1.0.0", + "version": "1.0.1", "credits": "By jaquadro", "logoFile": "", "url": "http://www.jaquadro.com/", diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 675c9df..34ceceb 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -17,7 +17,7 @@ public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; - public static final String MOD_VERSION = "1.0.0"; + public static final String MOD_VERSION = "1.0.1"; static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 3c9d559..af3ea3e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -83,7 +83,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @Override public int getRenderType () { - return ClientProxy.drawersRenderID; + return StorageDrawers.proxy.drawersRenderID; } @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index 5b5ac76..7a33e91 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -1,5 +1,6 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; @@ -198,6 +199,6 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler @Override public int getRenderId () { - return ClientProxy.drawersRenderID; + return StorageDrawers.proxy.drawersRenderID; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java index f562d82..b72bb0e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java @@ -2,6 +2,8 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -14,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +@SideOnly(Side.CLIENT) public class TileEntityDrawersRenderer extends TileEntitySpecialRenderer { private RenderItem itemRenderer = new RenderItem() { diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java b/src/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java index f2be371..2de6010 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ClientProxy.java @@ -8,8 +8,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; public class ClientProxy extends CommonProxy { - public static int drawersRenderID; - @Override public void registerRenderers () { drawersRenderID = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java b/src/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java index 0414304..e807d08 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java +++ b/src/com/jaquadro/minecraft/storagedrawers/core/CommonProxy.java @@ -2,6 +2,8 @@ package com.jaquadro.minecraft.storagedrawers.core; public class CommonProxy { + public int drawersRenderID = -1; + public void registerRenderers () { } }