diff --git a/src/main/scala/resonantinduction/core/ResonantTab.scala b/src/main/scala/resonantinduction/core/ResonantTab.scala index b24c11eaf..1eeb7f0c2 100644 --- a/src/main/scala/resonantinduction/core/ResonantTab.scala +++ b/src/main/scala/resonantinduction/core/ResonantTab.scala @@ -4,6 +4,7 @@ package resonantinduction.core import net.minecraft.creativetab.CreativeTabs +import net.minecraft.init.Items import net.minecraft.item.{ItemStack, Item} /** @@ -14,7 +15,13 @@ object ResonantTab extends CreativeTabs(CreativeTabs.getNextID, "ResonantInducti { var itemStack: ItemStack = null - override def getTabIconItem: Item = itemStack.getItem + override def getTabIconItem: Item = + { + if(itemStack != null ) + return itemStack.getItem + else + return Items.iron_ingot + } def itemStack(item: ItemStack) { itemStack = item} diff --git a/src/main/scala/resonantinduction/electrical/wire/ItemWire.java b/src/main/scala/resonantinduction/electrical/wire/ItemWire.java index c3ffe5ec8..c052f4b5a 100644 --- a/src/main/scala/resonantinduction/electrical/wire/ItemWire.java +++ b/src/main/scala/resonantinduction/electrical/wire/ItemWire.java @@ -20,8 +20,6 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantTab; import resonantinduction.electrical.wire.flat.PartFlatWire; import resonantinduction.electrical.wire.flat.RenderFlatWire; -import resonantinduction.electrical.wire.framed.PartFramedWire; -import resonantinduction.electrical.wire.framed.RenderFramedWire; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.ControlKeyModifer; @@ -49,19 +47,6 @@ public class ItemWire extends JItemMultiPart { BlockCoord onPos = pos.copy().offset(side ^ 1); - if (player.isSneaking() && !ControlKeyModifer.isControlDown(player)) - { - PartFramedWire wire = (PartFramedWire) MultiPartRegistry.createPart("resonant_induction_wire", false); - - if (wire != null) - { - wire.preparePlacement(itemStack.getItemDamage()); - } - - return wire; - } - else - { if (!MultipartUtility.canPlaceWireOnSide(world, onPos.x, onPos.y, onPos.z, ForgeDirection.getOrientation(side), false)) { return null; @@ -75,7 +60,6 @@ public class ItemWire extends JItemMultiPart } return wire; - } } @Override @@ -119,8 +103,8 @@ public class ItemWire extends JItemMultiPart public void registerIcons(IIconRegister register) { RenderFlatWire.flatWireTexture = register.registerIcon(Reference.prefix() + "models/flatWire"); - RenderFramedWire.wireIcon = register.registerIcon(Reference.prefix() + "models/wire"); - RenderFramedWire.insulationIcon = register.registerIcon(Reference.prefix() + "models/insulation"); + //RenderFramedWire.wireIcon = register.registerIcon(Reference.prefix() + "models/wire"); + //RenderFramedWire.insulationIcon = register.registerIcon(Reference.prefix() + "models/insulation"); super.registerIcons(register); }