diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-08-18 20:42:47 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-08-18 20:42:47 +1000 |
| commit | fcb9e4a94b95a3113a05dead4eb99889e6113337 (patch) | |
| tree | b6d36f99a5d4c64b801a662acb64db06b9599c7f | |
| parent | ef47e1018708945eebe6896104423245d73746d0 (diff) | |
| download | GT5-Unofficial-fcb9e4a94b95a3113a05dead4eb99889e6113337.tar.gz GT5-Unofficial-fcb9e4a94b95a3113a05dead4eb99889e6113337.tar.bz2 GT5-Unofficial-fcb9e4a94b95a3113a05dead4eb99889e6113337.zip | |
$ Fixed weird crash with GT++ Ore Renderer, no idea what caused it. Closes #329.
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index 0e7f5b4707..ab1fd5e08a 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -12,7 +12,6 @@ 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; import gtPlusPlus.core.item.base.itemblock.ItemBlockOre; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; @@ -20,6 +19,7 @@ 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.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; @@ -36,7 +36,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { this.setResistance(6.0F); this.setLightLevel(0.0F); this.setHarvestLevel("pickaxe", 3); - this.setCreativeTab(AddToCreativeTab.tabBlock); this.setStepSound(soundTypeStone); this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName()))); this.setBlockTextureName("stone"); @@ -60,10 +59,15 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @Override public int getRenderType() { + try { if (CustomOreBlockRenderer.INSTANCE != null){ return CustomOreBlockRenderer.INSTANCE.mRenderID; } - return super.getRenderType(); + return super.getRenderType(); + } + catch (NullPointerException n) { + return 0; + } } @Override @@ -116,6 +120,11 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})}; } + @Override + public void registerBlockIcons(IIconRegister p_149651_1_) { + + } + public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock{ public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { |