Fix server crash when accessing block render ID

This commit is contained in:
Justin Aquadro committed 2014-08-30 16:41:31 -04:00
1 parent 55f9f5f2c1
commit 54c2d82b0d
10 files changed
+21 -17

No files matched your search

+8 -8
View File
@@ -13,18 +13,18 @@
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1207/forgeSrc-1.7.10-10.13.0.1207.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.1.1210-new/forgeSrc-1.7.10-10.13.1.1210-new.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1207/forgeSrc-1.7.10-10.13.0.1207-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.1.1210-new/forgeSrc-1.7.10-10.13.1.1210-new-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.9/116f2aad5b0c68353ebed66cd463517db6522f7e/launchwrapper-1.9.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/9c0592c6e1e9ea296a70948081bd4cc84dda1289/launchwrapper-1.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,13 +33,13 @@
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/dd6ba5c392d4102458494e29f54f70ac534ec2a2/asm-debug-all-4.1.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f9e364ae2a66ce2a543012a4668856e84e5dab74/asm-debug-all-5.0.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/7fb1108a191ea7b62b03225ced300ca8832dbe7a/asm-debug-all-4.1-javadoc.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/c87547fa477f7dc22c5e3c5ddfc6dfac726e5b15/asm-debug-all-5.0.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/4.1/1c218d5a0b8b932a1528b74069aa6973dcfcea74/asm-debug-all-4.1-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-debug-all-5.0.3-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -199,7 +199,7 @@
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.3.1/f78f5a841b1cf9d50c3382acdbeb7d3078e454d6/realms-1.3.1.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.3.5/807ae355ee63583becd7ea60e76aab1532bb42e/realms-1.3.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -648,7 +648,7 @@
<orderEntry type="module-library" exported="" scope="RUNTIME">
<library>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.0.1207/start" />
<root url="file://$USER_HOME$/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.1.1210-new/start" />
</CLASSES>
<JAVADOC />
<SOURCES />
+1 -1
View File
@@ -174,7 +174,7 @@
<module fileurl="file://$PROJECT_DIR$/StorageDrawers.iml" filepath="$PROJECT_DIR$/StorageDrawers.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 1.7 32-bit" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 1.7 64-bit" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnBranchConfigurationManager">
+2 -2
View File
@@ -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"
}
+1 -1
View File
@@ -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/",
@@ -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();
@@ -83,7 +83,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH
@Override
public int getRenderType () {
return ClientProxy.drawersRenderID;
return StorageDrawers.proxy.drawersRenderID;
}
@Override
@@ -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;
}
}
@@ -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() {
@@ -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();
@@ -2,6 +2,8 @@ package com.jaquadro.minecraft.storagedrawers.core;
public class CommonProxy
{
public int drawersRenderID = -1;
public void registerRenderers ()
{ }
}