From db789cba2f4aef4eec3b23856bb20da22868e12e Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 7 Oct 2014 17:37:34 -0400 Subject: [PATCH] Fixed metadata on gear, waterturbine, and windturbine --- .../mechanical/mech/gear/ItemGear.scala | 24 +++++++------------ .../mech/turbine/TileWaterTurbine.scala | 2 +- .../mech/turbine/TileWindTurbine.scala | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.scala index ba794b806..74b19676e 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.scala @@ -1,23 +1,18 @@ package resonantinduction.mechanical.mech.gear import java.util.List + +import codechicken.lib.vec.{BlockCoord, Vector3} +import codechicken.microblock.FacePlacementGrid +import codechicken.multipart.{JItemMultiPart, MultiPartRegistry, PartMap, TMultiPart, TileMultipart} import net.minecraft.creativetab.CreativeTabs import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.Item -import net.minecraft.item.ItemStack +import net.minecraft.item.{Item, ItemStack} import net.minecraft.tileentity.TileEntity import net.minecraft.world.World +import resonant.lib.wrapper.WrapList._ import resonantinduction.core.prefab.part.IHighlight import resonantinduction.mechanical.mech.gearshaft.PartGearShaft -import codechicken.lib.vec.BlockCoord -import codechicken.lib.vec.Vector3 -import codechicken.microblock.FacePlacementGrid -import codechicken.multipart.JItemMultiPart -import codechicken.multipart.MultiPartRegistry -import codechicken.multipart.PartMap -import codechicken.multipart.TMultiPart -import codechicken.multipart.TileMultipart -import resonant.lib.wrapper.WrapList._ class ItemGear extends JItemMultiPart with IHighlight { @@ -50,10 +45,9 @@ class ItemGear extends JItemMultiPart with IHighlight override def getSubItems(itemID: Item, tab: CreativeTabs, listToAddTo: List[_]) { - for(i <- 0 to 3) - { - listToAddTo.add(new ItemStack(itemID, 1, i)) - + for (i <- 0 to 2) + { + listToAddTo.add(new ItemStack(itemID, 1, i)) } listToAddTo.add(new ItemStack(itemID, 1, 10)) } diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala index 654bcedfc..015db3558 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala @@ -139,7 +139,7 @@ class TileWaterTurbine extends TileTurbine override def getSubBlocks(par1: Item, par2CreativeTabs: CreativeTabs, par3List: List[_]) { - for (i <- 0 to 3) + for (i <- 0 to 2) { par3List.add(new ItemStack(par1, 1, i)) } diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala index 5aeef6350..9b9b6b4e8 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.scala @@ -122,7 +122,7 @@ class TileWindTurbine extends TileTurbine override def getSubBlocks(par1: Item, par2CreativeTabs: CreativeTabs, par3List: List[_]) { - for (i <- 0 to 3) + for (i <- 0 to 2) { par3List.add(new ItemStack(par1, 1, i)) }