From bca0c17e8cf415472ec20d8a957729c6b676fc40 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Wed, 3 Jul 2013 06:46:23 +1000 Subject: [PATCH] Fixed client class reference on server Fixed micro recipe for cutting full blocks (ignores stack size in comparison) --- codechicken/microblock/MicroRecipe.scala | 5 ++++- codechicken/microblock/handler/Proxies.scala | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/codechicken/microblock/MicroRecipe.scala b/codechicken/microblock/MicroRecipe.scala index 81a0563..61fe939 100644 --- a/codechicken/microblock/MicroRecipe.scala +++ b/codechicken/microblock/MicroRecipe.scala @@ -150,7 +150,10 @@ object MicroRecipe extends IRecipe } else { - MicroMaterialRegistry.getIdMap.find(m => ItemStack.areItemStacksEqual(m._2.getItem, item)) match { + MicroMaterialRegistry.getIdMap.find{m => val mitem = m._2.getItem; + item.itemID == mitem.itemID && + item.getItemDamage == mitem.getItemDamage && + ItemStack.areItemStacksEqual(item, mitem)} match { case None => return null case Some((name, m)) => { material = MicroMaterialRegistry.materialID(name) diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index 26c66ae..0f0f2e3 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -92,6 +92,7 @@ class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl MinecraftForgeClient.registerItemRenderer(itemMicro.itemID, ItemMicroPartRenderer) } + @SideOnly(Side.CLIENT) override def createSaw(config:ConfigFile, name:String, strength:Int, localized:String) = { val saw = super.createSaw(config, name, strength, localized)