fixing bugs with Iron workbench and fractionator

8 files changed, 83 insertions, 82 deletions

diff --git a/ihl/items_blocks/FiberItem.java b/ihl/items_blocks/FiberItem.java
index 73d62f3..79e50f9 100644
--- a/ihl/items_blocks/FiberItem.java
+++ b/ihl/items_blocks/FiberItem.java
@@ -5,15 +5,15 @@ import java.util.List;
 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.IHLCreativeTab;

+import ihl.IHLModInfo;

+import ihl.interfaces.IWire;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

-import ihl.IHLCreativeTab;

-import ihl.IHLModInfo;

-import ihl.interfaces.IWire;

 

 public class FiberItem extends Item implements IWire {

     

diff --git a/ihl/items_blocks/FlexibleCableItem.java b/ihl/items_blocks/FlexibleCableItem.java
index 590f240..68cceab 100644
--- a/ihl/items_blocks/FlexibleCableItem.java
+++ b/ihl/items_blocks/FlexibleCableItem.java
@@ -8,18 +8,6 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-import net.minecraft.client.renderer.texture.IIconRegister;

-import net.minecraft.creativetab.CreativeTabs;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.Item;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.server.MinecraftServer;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.util.StatCollector;

-import net.minecraft.world.World;

-import net.minecraftforge.common.util.ForgeDirection;

 import ic2.api.energy.tile.IEnergyTile;

 import ihl.IHLCreativeTab;

 import ihl.IHLMod;

@@ -32,6 +20,18 @@ import ihl.interfaces.IEnergyNetNode;
 import ihl.interfaces.IMultiPowerCableHolder;

 import ihl.interfaces.IWire;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.renderer.texture.IIconRegister;

+import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.Item;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.server.MinecraftServer;

+import net.minecraft.tileentity.TileEntity;

+import net.minecraft.util.StatCollector;

+import net.minecraft.world.World;

+import net.minecraftforge.common.util.ForgeDirection;

 

 public class FlexibleCableItem extends Item implements IWire {

 

@@ -368,13 +368,13 @@ public class FlexibleCableItem extends Item implements IWire {
 	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean flag) {

 		if (itemStack.stackTagCompound != null) {

 			info.add(StatCollector.translateToLocal("ihl.lenght")+": " + itemStack.stackTagCompound.getInteger("length") + " m");

-			info.add(StatCollector.translateToLocal("ihl.wire_material")+"Wire material: " + this.getMaterial(itemStack));

-			info.add(StatCollector.translateToLocal("ihl.resistivity")+"Resistivity: " + this.getResistance(itemStack) / 1000F + " V^2/(EU*m)");

-			info.add(StatCollector.translateToLocal("ihl.transverse_section")+"Transverse section: " + this.getTransverseSection(itemStack) / 10F + " sq. mm.");

+			info.add(StatCollector.translateToLocal("ihl.wire_material")+": " + this.getMaterial(itemStack));

+			info.add(StatCollector.translateToLocal("ihl.resistivity")+": " + this.getResistance(itemStack) / 1000F + " V^2/(EU*m)");

+			info.add(StatCollector.translateToLocal("ihl.transverse_section")+": " + this.getTransverseSection(itemStack) / 10F + " sq. mm.");

 			if (itemStack.stackTagCompound.hasKey("insulationMaterial")) {

-				info.add(StatCollector.translateToLocal("ihl.insulation_material")+"Insulation material: " + this.getInsulationMaterial(itemStack));

-				info.add(StatCollector.translateToLocal("ihl.insulation_thickness")+"Insulation thickness: " + this.getInsulationThickness(itemStack) / 10f + " mm");

-				info.add(StatCollector.translateToLocal("ihl.insulation_beakdown_voltage")+"Insulation breakdown voltage: " + this.getVoltageLimit(itemStack) / 1000 + " kV");

+				info.add(StatCollector.translateToLocal("ihl.insulation_material")+": " + this.getInsulationMaterial(itemStack));

+				info.add(StatCollector.translateToLocal("ihl.insulation_thickness")+": " + this.getInsulationThickness(itemStack) / 10f + " mm");

+				info.add(StatCollector.translateToLocal("ihl.insulation_beakdown_voltage")+": " + this.getVoltageLimit(itemStack) / 1000 + " kV");

 			}

 			info.add(StatCollector.translateToLocal("ihl.powerCableTooltip"));

 		}

diff --git a/ihl/items_blocks/FlexiblePipeItem.java b/ihl/items_blocks/FlexiblePipeItem.java
index 5f1522e..f5bb3fd 100644
--- a/ihl/items_blocks/FlexiblePipeItem.java
+++ b/ihl/items_blocks/FlexiblePipeItem.java
@@ -7,6 +7,9 @@ import java.util.Map;
 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.IHLCreativeTab;

+import ihl.IHLModInfo;

+import ihl.utils.IHLUtils;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

 import net.minecraft.entity.player.EntityPlayer;

@@ -14,12 +17,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.util.IIcon;

-import ihl.IHLCreativeTab;

-import ihl.IHLModInfo;

-import ihl.interfaces.IWire;

-import ihl.utils.IHLUtils;

 

-public class FlexiblePipeItem extends Item implements IWire {

+public class FlexiblePipeItem extends Item {

     

 	private static Map<Integer, IIcon> iconMap = new HashMap<Integer, IIcon>();

 	private static Map<Integer, String> nameMap = new HashMap<Integer, String>();

@@ -69,19 +68,6 @@ public class FlexiblePipeItem extends Item implements IWire {
         	info.add("Length " + itemStack.stackTagCompound.getInteger("length") +"m");

         }

     }

-

-	@Override

-	public String getTag() 

-	{

-		return "length";

-	}

-

-	@Override

-	public String getTagSecondary() 

-	{

-		return "fullLength";

-	}

-	

 	@Override

 	@SideOnly(Side.CLIENT)

 	public void registerIcons(IIconRegister register) 

@@ -118,11 +104,4 @@ public class FlexiblePipeItem extends Item implements IWire {
 		public int damage;

 		public String unLocalizedName;

 	}

-	

-

-	@Override

-	public boolean isSameWire(ItemStack stack1,ItemStack stack2) 

-	{

-		return stack1.getItem()==stack2.getItem();

-	}

 }

diff --git a/ihl/items_blocks/IHLBucketHandler.java b/ihl/items_blocks/IHLBucketHandler.java
index c0a23b6..9f3a7b8 100644
--- a/ihl/items_blocks/IHLBucketHandler.java
+++ b/ihl/items_blocks/IHLBucketHandler.java
@@ -1,8 +1,8 @@
 package ihl.items_blocks;

 

+import cpw.mods.fml.common.eventhandler.SubscribeEvent;

 import net.minecraft.block.Block;

 import net.minecraftforge.event.entity.player.FillBucketEvent;

-import cpw.mods.fml.common.eventhandler.SubscribeEvent;

 

 public class IHLBucketHandler 

 {

diff --git a/ihl/items_blocks/IHLFluidBlock.java b/ihl/items_blocks/IHLFluidBlock.java
index 29d2d99..7ad7730 100644
--- a/ihl/items_blocks/IHLFluidBlock.java
+++ b/ihl/items_blocks/IHLFluidBlock.java
@@ -1,9 +1,9 @@
 package ihl.items_blocks;

 

-import ihl.IHLModInfo;

 import cpw.mods.fml.common.registry.GameRegistry;

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import ihl.IHLModInfo;

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.client.renderer.texture.IIconRegister;

diff --git a/ihl/items_blocks/IHLTool.java b/ihl/items_blocks/IHLTool.java
index 1479072..150d0ca 100644
--- a/ihl/items_blocks/IHLTool.java
+++ b/ihl/items_blocks/IHLTool.java
@@ -4,6 +4,17 @@ import java.util.HashMap;
 import java.util.List;

 import java.util.Map;

 

+import cpw.mods.fml.common.registry.GameRegistry;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import ic2.api.reactor.IReactor;

+import ihl.IHLCreativeTab;

+import ihl.IHLModInfo;

+import ihl.flexible_cable.SetOfDiesMiniGUI;

+import ihl.interfaces.IHasTemperature;

+import ihl.interfaces.IItemHasMiniGUI;

+import ihl.interfaces.ItemMiniGUI;

+import ihl.utils.IHLUtils;

 import net.minecraft.client.gui.inventory.GuiContainer;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

@@ -29,17 +40,6 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.StatCollector;

 import net.minecraft.world.World;

 import net.minecraftforge.oredict.OreDictionary;

-import cpw.mods.fml.common.registry.GameRegistry;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

-import ic2.api.reactor.IReactor;

-import ihl.IHLCreativeTab;

-import ihl.IHLModInfo;

-import ihl.flexible_cable.SetOfDiesMiniGUI;

-import ihl.interfaces.IHasTemperature;

-import ihl.interfaces.IItemHasMiniGUI;

-import ihl.interfaces.ItemMiniGUI;

-import ihl.utils.IHLUtils;

 public class IHLTool extends Item implements IItemHasMiniGUI{

 

 	private static Map<Integer, IIcon> iconMap = new HashMap<Integer, IIcon>();

diff --git a/ihl/items_blocks/ItemSubstance.java b/ihl/items_blocks/ItemSubstance.java
index 9c55e36..507e65b 100644
--- a/ihl/items_blocks/ItemSubstance.java
+++ b/ihl/items_blocks/ItemSubstance.java
@@ -1,5 +1,12 @@
 package ihl.items_blocks;

 

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.item.IC2Items;

 import ic2.api.recipe.RecipeInputOreDict;

 import ic2.api.recipe.Recipes;

@@ -10,11 +17,6 @@ import ihl.interfaces.IItemHasMiniGUI;
 import ihl.interfaces.ItemMiniGUI;

 import ihl.utils.IHLUtils;

 import ihl.worldgen.ores.IHLFluid.IHLFluidType;

-

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

 import net.minecraft.client.gui.inventory.GuiContainer;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

@@ -27,12 +29,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;

 import net.minecraft.util.StatCollector;

 import net.minecraftforge.fluids.FluidContainerRegistry;

-import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;

+import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.oredict.OreDictionary;

-import cpw.mods.fml.common.registry.GameRegistry;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class ItemSubstance extends Item implements IItemHasMiniGUI {

 

diff --git a/ihl/items_blocks/MachineBaseBlock.java b/ihl/items_blocks/MachineBaseBlock.java
index 6276e93..aef567c 100644
--- a/ihl/items_blocks/MachineBaseBlock.java
+++ b/ihl/items_blocks/MachineBaseBlock.java
@@ -1,5 +1,11 @@
 package ihl.items_blocks;

 

+import java.util.ArrayList;

+import java.util.List;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import ic2.api.tile.IWrenchable;

 import ic2.core.IC2;

 import ic2.core.IHasGui;

@@ -26,6 +32,7 @@ import ihl.processing.chemistry.LeadOvenTileEntity;
 import ihl.processing.chemistry.LoomTileEntity;

 import ihl.processing.chemistry.PaperMachineTileEntity;

 import ihl.processing.chemistry.RefluxCondenserTileEntity;

+import ihl.processing.chemistry.SolarEvaporatorTileEntity;

 import ihl.processing.metallurgy.AchesonFurnanceTileEntity;

 import ihl.processing.metallurgy.CoilerTileEntity;

 import ihl.processing.metallurgy.DetonationSprayingMachineTileEntity;

@@ -42,10 +49,6 @@ import ihl.processing.metallurgy.WireMillTileEntity;
 import ihl.processing.metallurgy.WoodenRollingMachinePart1TileEntity;

 import ihl.processing.metallurgy.WoodenRollingMachinePart2TileEntity;

 import ihl.utils.IHLUtils;

-

-import java.util.ArrayList;

-import java.util.List;

-

 import net.minecraft.block.Block;

 import net.minecraft.block.ITileEntityProvider;

 import net.minecraft.block.material.Material;

@@ -64,13 +67,10 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;

 import net.minecraft.world.World;

 import net.minecraftforge.common.util.ForgeDirection;

-import cpw.mods.fml.common.registry.GameRegistry;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 

 public class MachineBaseBlock extends Block implements ITileEntityProvider {

 

-	MachineType type;

+	public MachineType type;

 	private static List<MachineBaseBlock> instances = new ArrayList<MachineBaseBlock>();

 

 	@SideOnly(Side.CLIENT)

@@ -80,7 +80,7 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			textureLeftMachineCasing, textureTopMachineCasing, textureRightMachineCasing, textureFrontMachineCasing,

 			textureFrontPaperMachine, textureBackMachineCasing, bronzeTubTop, bronzeTubSide, steel, redPaint,

 			greenPaint, rubberInsulatedCase, powerPort, dosingPumpBack, dosingPumpLeftSide, dosingPumpRightSide,

-			dosingPumpTop, dosingPumpFront;

+			dosingPumpTop, dosingPumpFront, solarEvaporatorSide;

 

 	public MachineBaseBlock(MachineType type1) {

 		super(Material.iron);

@@ -143,17 +143,20 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 	@Override

 	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list,

 			Entity entity) {

+		float height = 1f;

 		switch (this.type) {

+		case SolarEvaporator:

+			height = 0.5f;

 		case BronzeTub:

 			this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.1F, 1.0F);

 			super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);

-			this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.1F, 1.0F, 1.0F);

+			this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.1F, height, 1.0F);

 			super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);

-			this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.1F);

+			this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, height, 0.1F);

 			super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);

-			this.setBlockBounds(0.9F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

+			this.setBlockBounds(0.9F, 0.0F, 0.0F, 1.0F, height, 1.0F);

 			super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);

-			this.setBlockBounds(0.0F, 0.0F, 0.9F, 1.0F, 1.0F, 1.0F);

+			this.setBlockBounds(0.0F, 0.0F, 0.9F, 1.0F, height, 1.0F);

 			super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);

 			this.setBlockBoundsForItemRender();

 			break;

@@ -165,7 +168,12 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 

 	@Override

 	public void setBlockBoundsForItemRender() {

-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

+		if(this.type.equals(MachineType.SolarEvaporator)){

+			this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5f, 1.0F);

+		}

+		else {

+			this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

+		}

 	}

 

 	public static void init() {

@@ -239,6 +247,7 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 		this.dosingPumpRightSide = par1IconRegister.registerIcon(IHLModInfo.MODID + ":dosingPumpRight");

 		this.dosingPumpTop = par1IconRegister.registerIcon(IHLModInfo.MODID + ":dosingPumpTop");

 		this.dosingPumpFront = par1IconRegister.registerIcon(IHLModInfo.MODID + ":dosingPumpFront");

+		this.solarEvaporatorSide = par1IconRegister.registerIcon(IHLModInfo.MODID + ":solarEvaporatorSide");

 	}

 

 	@Override

@@ -364,6 +373,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			switch (this.type) {

 			case BronzeTub:

 				return this.bronzeTubSide;

+			case SolarEvaporator:

+				return this.solarEvaporatorSide;

 			case AchesonFurnace:

 				return this.blockIcon;

 			case MuffleFurnace:

@@ -391,6 +402,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			switch (this.type) {

 			case BronzeTub:

 				return this.bronzeTubSide;

+			case SolarEvaporator:

+				return this.solarEvaporatorSide;

 			case LeadOven:

 				return this.textureSideGoldFurnace;

 			case WireMill:

@@ -415,6 +428,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			switch (this.type) {

 			case BronzeTub:

 				return this.bronzeTubSide;

+			case SolarEvaporator:

+				return this.solarEvaporatorSide;

 			case LeadOven:

 				return this.textureSideGoldFurnace;

 			case WireMill:

@@ -437,6 +452,7 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 		case 3:

 			switch (this.type) {

 			case BronzeTub:

+			case SolarEvaporator:

 				return this.bronzeTubTop;

 			case AchesonFurnace:

 				return this.textureTopAchesonFurnance;

@@ -465,6 +481,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			switch (this.type) {

 			case BronzeTub:

 				return this.bronzeTubSide;

+			case SolarEvaporator:

+				return this.solarEvaporatorSide;

 			case LeadOven:

 				return this.textureSideGoldFurnace;

 			case WireMill:

@@ -488,6 +506,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 			switch (this.type) {

 			case BronzeTub:

 				return this.bronzeTubSide;

+			case SolarEvaporator:

+				return this.solarEvaporatorSide;

 			case LeadOven:

 				return this.textureSideGoldFurnace;

 			case CryogenicDistiller:

@@ -528,6 +548,7 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 	}

 

 	public enum MachineType {

+		SolarEvaporator("solarEvaporator", SolarEvaporatorTileEntity.class, false, true, null),

 		DosingPump("dosingPump", DosingPumpTileEntity.class, true, null),

 		IronWorkbench("ironWorkbench", IronWorkbenchTileEntity.class, false, true, null),

 		ElectrolysisBath("electrolysisBath", ElectrolysisBathTileEntity.class, false, IHLUtils

@@ -630,6 +651,8 @@ public class MachineBaseBlock extends Block implements ITileEntityProvider {
 	@SideOnly(Side.CLIENT)

 	public IIcon getAdditionalIconsForBlockRenderer(int flag) {

 		switch (this.type) {

+		case SolarEvaporator:

+			return this.solarEvaporatorSide;

 		case BronzeTub:

 			return this.bronzeTubSide;

 		default: