From bc993a564356dc259955b88d1b32483f14532f42 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Sun, 4 Aug 2013 15:55:14 +1000 Subject: [PATCH] Handle blocks with null icons with missingno texture. Support for mods that replace block instances. --- codechicken/microblock/BlockMicroMaterial.scala | 13 +++++++++++-- codechicken/microblock/handler/Proxies.scala | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/codechicken/microblock/BlockMicroMaterial.scala b/codechicken/microblock/BlockMicroMaterial.scala index 896ad6a..73ed2a2 100644 --- a/codechicken/microblock/BlockMicroMaterial.scala +++ b/codechicken/microblock/BlockMicroMaterial.scala @@ -22,6 +22,8 @@ import codechicken.lib.render.CCRenderState import codechicken.lib.vec.Rotation import net.minecraft.tileentity.TileEntity import net.minecraftforge.common.MinecraftForge +import net.minecraft.client.renderer.RenderBlocks +import codechicken.microblock.handler.MicroblockProxy class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMaterial { @@ -31,9 +33,16 @@ class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMateri @SideOnly(Side.CLIENT) override def loadIcons() { + var iblock = Block.blocksList(block.blockID)//Reacquire the block instance incase a mod replaced it. val icons = new Array[Icon](6) - for(i <- 0 until 6) - icons(i) = block.getIcon(i, meta) + + if(iblock == null) + for(i <- 0 until 6) + icons(i) = MicroblockProxy.renderBlocks.getBlockIcon(null) + else + for(i <- 0 until 6) + icons(i) = MicroblockProxy.renderBlocks.getIconSafe(iblock.getIcon(i, meta)) + icont = new MultiIconTransformation(icons) } diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index e11371d..f845959 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -30,6 +30,7 @@ import codechicken.lib.lang.LangUtil import net.minecraft.util.ResourceLocation import codechicken.lib.packet.PacketCustom import cpw.mods.fml.common.network.NetworkRegistry +import net.minecraft.client.renderer.RenderBlocks class MicroblockProxy_serverImpl { @@ -89,6 +90,8 @@ class MicroblockProxy_serverImpl class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl { + val renderBlocks = new RenderBlocks + @SideOnly(Side.CLIENT) override def preInit() {