$ Hopefully Fixed #301.

2 files changed, 17 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 28a209118e..1375c53608 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -3,13 +3,6 @@ package gtPlusPlus.core.block.base;
 import java.lang.reflect.Field;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
@@ -17,7 +10,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
-
 import gtPlusPlus.api.interfaces.ITexturedBlock;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -27,6 +19,11 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 
 public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
@@ -62,7 +59,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
 	@Override
 	public int getRenderType() {
-		return CustomOreBlockRenderer.INSTANCE.mRenderID;
+		if (CustomOreBlockRenderer.INSTANCE != null){
+			return CustomOreBlockRenderer.INSTANCE.mRenderID;
+		}		
+		return super.getRenderType();		
 	}
 
 	@Override
@@ -157,7 +157,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
 		@Override
 		public int getRenderType() {
-			return CustomOreBlockRenderer.INSTANCE.mRenderID;
+			if (CustomOreBlockRenderer.INSTANCE != null){
+				return CustomOreBlockRenderer.INSTANCE.mRenderID;
+			}		
+			return super.getRenderType();		
 		}
 
 		@Override
diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
index 4adfefaec9..a0b34d3b0b 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
@@ -4,7 +4,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-
+import gregtech.api.interfaces.ITexture;
+import gtPlusPlus.api.interfaces.ITexturedBlock;
+import gtPlusPlus.api.objects.Logger;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -13,19 +15,14 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import gregtech.api.interfaces.ITexture;
-
-import gtPlusPlus.api.interfaces.ITexturedBlock;
-import gtPlusPlus.api.objects.Logger;
-
 public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
 
 	public static CustomOreBlockRenderer INSTANCE;
 	public final int mRenderID;
 
 	public CustomOreBlockRenderer() {
-		this.mRenderID = RenderingRegistry.getNextAvailableRenderId();
 		INSTANCE = this;
+		this.mRenderID = RenderingRegistry.getNextAvailableRenderId();
 		RenderingRegistry.registerBlockHandler(this);
 		Logger.INFO("Registered Custom Ore Block Renderer.");
 	}