diff options
| author | Draknyte1 <3060479+draknyte1@users.noreply.github.com> | 2018-06-17 15:17:05 +1000 |
|---|---|---|
| committer | Draknyte1 <3060479+draknyte1@users.noreply.github.com> | 2018-06-17 15:17:05 +1000 |
| commit | 1d90f5a24464552dc40d370da43f9da72294187f (patch) | |
| tree | e5f5d353dbadeda3168c5676b5b2c5f2107a4bd6 /src/Java/gtPlusPlus/core/block/base | |
| parent | 2e41ca62618aebf5f110c55f44a4f61029b6ebea (diff) | |
| download | GT5-Unofficial-1d90f5a24464552dc40d370da43f9da72294187f.tar.gz GT5-Unofficial-1d90f5a24464552dc40d370da43f9da72294187f.tar.bz2 GT5-Unofficial-1d90f5a24464552dc40d370da43f9da72294187f.zip | |
$ Hopefully Fixed #301.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java | 23 |
1 files changed, 13 insertions, 10 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 |