diff --git a/codechicken/microblock/BlockMicroMaterial.scala b/codechicken/microblock/BlockMicroMaterial.scala index 67a8918..0b7ec4c 100644 --- a/codechicken/microblock/BlockMicroMaterial.scala +++ b/codechicken/microblock/BlockMicroMaterial.scala @@ -118,6 +118,8 @@ class BlockMicroMaterial(val block:Block, val meta:Int = 0) extends IMicroMateri */ object BlockMicroMaterial { + def materialKey(block:Block, meta:Int) = block.getUnlocalizedName+(if(meta > 0) "_"+meta else "") + def createAndRegister(block:Block) { createAndRegister(block, 0) @@ -125,8 +127,7 @@ object BlockMicroMaterial def createAndRegister(block:Block, meta:Int) { - MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), - block.getUnlocalizedName+(if(meta > 0) "_"+meta else "")) + MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), materialKey(block, meta)) } def createAndRegister(block:Block, meta:Seq[Int]) diff --git a/codechicken/microblock/ConfigContent.scala b/codechicken/microblock/ConfigContent.scala index 6411dee..311852f 100644 --- a/codechicken/microblock/ConfigContent.scala +++ b/codechicken/microblock/ConfigContent.scala @@ -11,6 +11,7 @@ import java.lang.Exception import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage import net.minecraft.item.ItemStack import BlockMicroMaterial.createAndRegister +import BlockMicroMaterial.materialKey object ConfigContent { @@ -132,8 +133,20 @@ object ConfigContent val value = nameMap.get(name) if(value.isDefined) { - createAndRegister(block, value.get) - nameMap.remove(name) + nameMap.remove(name) + value.get.foreach{m => + try { + createAndRegister(block, m) + } + catch { + case e:IllegalStateException => System.err.println("Unable to register micro material: "+ + materialKey(block, m)+"\n\t"+e.getMessage) + case e:Exception => { + System.err.println("Unable to register micro material: "+materialKey(block, m)) + e.printStackTrace() + } + } + } } } } @@ -156,8 +169,15 @@ object ConfigContent System.err.println("Invalid blockID: "+stack.itemID) else if(stack.getItemDamage < 0 || stack.getItemDamage >= 16) System.err.println("Invalid metadata: "+stack.getItemDamage) - else - createAndRegister(Block.blocksList(stack.itemID), stack.getItemDamage) + else { + try { + createAndRegister(Block.blocksList(stack.itemID), stack.getItemDamage) + } + catch { + case e:IllegalStateException => System.err.println("Unable to register micro material: "+ + materialKey(Block.blocksList(stack.itemID), stack.getItemDamage)+"\n\t"+e.getMessage) + } + } } } } diff --git a/codechicken/microblock/ItemMicroPart.scala b/codechicken/microblock/ItemMicroPart.scala index 0dcf579..9592ee3 100644 --- a/codechicken/microblock/ItemMicroPart.scala +++ b/codechicken/microblock/ItemMicroPart.scala @@ -120,7 +120,7 @@ object ItemMicroPart { checkTagCompound(stack) if(!stack.getTagCompound().hasKey("mat")) - return -1; + return 0; return MicroMaterialRegistry.materialID(stack.getTagCompound().getString("mat")) }