fixing bugs with Iron workbench and fractionator

19 files changed, 51 insertions, 59 deletions

diff --git a/ihl/flexible_cable/AnchorBlock.java b/ihl/flexible_cable/AnchorBlock.java
index 90fcf80..207173e 100644
--- a/ihl/flexible_cable/AnchorBlock.java
+++ b/ihl/flexible_cable/AnchorBlock.java
@@ -1,9 +1,9 @@
 package ihl.flexible_cable;

 

-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.ITileEntityProvider;

 import net.minecraft.block.material.Material;

diff --git a/ihl/flexible_cable/AnchorTileEntity.java b/ihl/flexible_cable/AnchorTileEntity.java
index b03a3d9..1262a01 100644
--- a/ihl/flexible_cable/AnchorTileEntity.java
+++ b/ihl/flexible_cable/AnchorTileEntity.java
@@ -1,5 +1,10 @@
 package ihl.flexible_cable;

 

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

 import ic2.api.energy.EnergyNet;

 import ic2.api.energy.event.EnergyTileLoadEvent;

 import ic2.api.energy.event.EnergyTileUnloadEvent;

@@ -11,12 +16,6 @@ import ic2.core.block.TileEntityBlock;
 import ihl.interfaces.IEnergyNetNode;

 import ihl.interfaces.IMultiPowerCableHolder;

 import ihl.utils.IHLUtils;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

diff --git a/ihl/flexible_cable/BatterySwitchUnitModel.java b/ihl/flexible_cable/BatterySwitchUnitModel.java
index 7919950..2d16ed4 100644
--- a/ihl/flexible_cable/BatterySwitchUnitModel.java
+++ b/ihl/flexible_cable/BatterySwitchUnitModel.java
@@ -1,8 +1,8 @@
 package ihl.flexible_cable;
 
+import ihl.model.IHLModelRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraftforge.common.util.ForgeDirection;
-import ihl.model.IHLModelRenderer;
 
 // Date: 07.04.2015 18:24:15
 // Template version 1.1
diff --git a/ihl/flexible_cable/FlexibleCableHolderBaseTileEntity.java b/ihl/flexible_cable/FlexibleCableHolderBaseTileEntity.java
index 34455ac..f922e9b 100644
--- a/ihl/flexible_cable/FlexibleCableHolderBaseTileEntity.java
+++ b/ihl/flexible_cable/FlexibleCableHolderBaseTileEntity.java
@@ -7,8 +7,6 @@ import java.util.Set;
 

 import ic2.core.block.TileEntityInventory;

 import ihl.IHLMod;

-import ihl.flexible_cable.IHLGrid;

-import ihl.flexible_cable.NodeEntity;

 import ihl.interfaces.IEnergyNetNode;

 import ihl.utils.IHLUtils;

 import net.minecraft.entity.EntityLivingBase;

diff --git a/ihl/flexible_cable/IHLENet.java b/ihl/flexible_cable/IHLENet.java
index 32b5ebf..f188937 100644
--- a/ihl/flexible_cable/IHLENet.java
+++ b/ihl/flexible_cable/IHLENet.java
@@ -1,13 +1,12 @@
 package ihl.flexible_cable;

 

-import ihl.IHLMod;

-import ihl.interfaces.IEnergyNetNode;

-

 import java.util.HashMap;

 import java.util.Iterator;

 import java.util.Map;

 import java.util.Set;

 

+import ihl.IHLMod;

+import ihl.interfaces.IEnergyNetNode;

 import net.minecraft.nbt.NBTTagCompound;

 

 public class IHLENet {

diff --git a/ihl/flexible_cable/IHLGrid.java b/ihl/flexible_cable/IHLGrid.java
index a47c229..52c50b0 100644
--- a/ihl/flexible_cable/IHLGrid.java
+++ b/ihl/flexible_cable/IHLGrid.java
@@ -1,9 +1,5 @@
 package ihl.flexible_cable;

 

-import ihl.IHLMod;

-import ihl.interfaces.IEnergyNetNode;

-import ihl.utils.IHLUtils;

-

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.HashSet;

@@ -12,6 +8,9 @@ import java.util.List;
 import java.util.Map;

 import java.util.Set;

 

+import ihl.IHLMod;

+import ihl.interfaces.IEnergyNetNode;

+import ihl.utils.IHLUtils;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.server.MinecraftServer;

 

diff --git a/ihl/flexible_cable/InvSlotOutputInProgress.java b/ihl/flexible_cable/InvSlotOutputInProgress.java
index 3694aee..da17e0f 100644
--- a/ihl/flexible_cable/InvSlotOutputInProgress.java
+++ b/ihl/flexible_cable/InvSlotOutputInProgress.java
@@ -82,7 +82,7 @@ public class InvSlotOutputInProgress extends IronWorkbenchInvSlot{
 		List<ItemStack> list = new ArrayList<ItemStack>();

 		for(int i=0;i<this.size;i++)

 		{

-			if(this.slotRecipe[i]==slotRecipeIndex)

+			if(this.slotRecipe[i]==slotRecipeIndex && get(i)!=null)

 			{

 				list.add(get(i));

 			}

diff --git a/ihl/flexible_cable/InvSlotProcessableIronWorkbench.java b/ihl/flexible_cable/InvSlotProcessableIronWorkbench.java
index adb51f5..fa2cc73 100644
--- a/ihl/flexible_cable/InvSlotProcessableIronWorkbench.java
+++ b/ihl/flexible_cable/InvSlotProcessableIronWorkbench.java
@@ -5,14 +5,14 @@ import java.util.Iterator;
 import java.util.List;

 import java.util.Set;

 

-import net.minecraft.item.ItemStack;

-import net.minecraftforge.fluids.FluidContainerRegistry;

 import ic2.api.recipe.IRecipeInput;

 import ic2.api.recipe.RecipeInputFluidContainer;

 import ic2.core.IC2;

 import ic2.core.item.ItemUpgradeModule;

 import ihl.interfaces.IWire;

 import ihl.utils.IHLUtils;

+import net.minecraft.item.ItemStack;

+import net.minecraftforge.fluids.FluidContainerRegistry;

 

 public class InvSlotProcessableIronWorkbench extends IronWorkbenchInvSlot {

 	

diff --git a/ihl/flexible_cable/InvSlotTool.java b/ihl/flexible_cable/InvSlotTool.java
index 0ffbcd9..0d5119e 100644
--- a/ihl/flexible_cable/InvSlotTool.java
+++ b/ihl/flexible_cable/InvSlotTool.java
@@ -3,14 +3,11 @@ package ihl.flexible_cable;
 import java.util.Iterator;

 import java.util.List;

 

-import net.minecraft.item.ItemStack;

 import ic2.api.recipe.IRecipeInput;

 import ic2.core.IC2;

-import ic2.core.Ic2Items;

-import ic2.core.item.ItemUpgradeModule;

-import ihl.interfaces.IWire;

 import ihl.recipes.IronWorkbenchRecipe;

 import ihl.utils.IHLUtils;

+import net.minecraft.item.ItemStack;

 

 public class InvSlotTool extends IronWorkbenchInvSlot {

 

diff --git a/ihl/flexible_cable/InvSlotWorkspaceElement.java b/ihl/flexible_cable/InvSlotWorkspaceElement.java
index 0ae0d26..b9e65b2 100644
--- a/ihl/flexible_cable/InvSlotWorkspaceElement.java
+++ b/ihl/flexible_cable/InvSlotWorkspaceElement.java
@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.Iterator;

 import java.util.List;

 

+import ihl.interfaces.IWorkspaceElement;

+import ihl.utils.IHLUtils;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.tileentity.TileEntity;

-import ihl.interfaces.IWorkspaceElement;

-import ihl.utils.IHLUtils;

 

 public class InvSlotWorkspaceElement extends IronWorkbenchInvSlot {

 

diff --git a/ihl/flexible_cable/IronWorkbenchContainer.java b/ihl/flexible_cable/IronWorkbenchContainer.java
index b25c790..ede2194 100644
--- a/ihl/flexible_cable/IronWorkbenchContainer.java
+++ b/ihl/flexible_cable/IronWorkbenchContainer.java
@@ -1,8 +1,8 @@
 package ihl.flexible_cable;

 

 import ic2.core.ContainerBase;

-import ihl.processing.invslots.SlotInvSlotOutputInProgress;

 import ihl.processing.invslots.SlotInvSlotIronWorkbench;

+import ihl.processing.invslots.SlotInvSlotOutputInProgress;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.inventory.ICrafting;

 import net.minecraft.inventory.Slot;

diff --git a/ihl/flexible_cable/IronWorkbenchGui.java b/ihl/flexible_cable/IronWorkbenchGui.java
index dedb9d8..c395484 100644
--- a/ihl/flexible_cable/IronWorkbenchGui.java
+++ b/ihl/flexible_cable/IronWorkbenchGui.java
@@ -1,17 +1,16 @@
 package ihl.flexible_cable;

 

+import org.lwjgl.opengl.GL11;

+

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

 import ic2.core.IC2;

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

-import net.minecraft.inventory.Slot;

-import net.minecraft.util.ResourceLocation;

-

-import org.lwjgl.opengl.GL11;

-

 import ihl.interfaces.IItemHasMiniGUI;

 import ihl.interfaces.ItemMiniGUI;

 import ihl.utils.IHLRenderUtils;

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

+import net.minecraft.inventory.Slot;

+import net.minecraft.util.ResourceLocation;

 

 @SideOnly(Side.CLIENT)

 public class IronWorkbenchGui extends GuiContainer {

diff --git a/ihl/flexible_cable/IronWorkbenchInvSlot.java b/ihl/flexible_cable/IronWorkbenchInvSlot.java
index 380b6d3..33821da 100644
--- a/ihl/flexible_cable/IronWorkbenchInvSlot.java
+++ b/ihl/flexible_cable/IronWorkbenchInvSlot.java
@@ -3,8 +3,8 @@ package ihl.flexible_cable;
 import java.util.ArrayList;

 import java.util.List;

 

-import net.minecraft.item.ItemStack;

 import ic2.core.block.invslot.InvSlot;

+import net.minecraft.item.ItemStack;

 

 public class IronWorkbenchInvSlot extends InvSlot {

 

diff --git a/ihl/flexible_cable/IronWorkbenchRender.java b/ihl/flexible_cable/IronWorkbenchRender.java
index 7afdf17..27b3835 100644
--- a/ihl/flexible_cable/IronWorkbenchRender.java
+++ b/ihl/flexible_cable/IronWorkbenchRender.java
@@ -1,10 +1,10 @@
 package ihl.flexible_cable;

-import net.minecraft.client.renderer.entity.RenderManager;

-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

-import net.minecraft.tileentity.TileEntity;

 import org.lwjgl.opengl.GL11;

 

 import ihl.utils.IHLItemRenderer;

+import net.minecraft.client.renderer.entity.RenderManager;

+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

+import net.minecraft.tileentity.TileEntity;

 

 public class IronWorkbenchRender extends TileEntitySpecialRenderer{

 private IHLItemRenderer itemRenderer=new IHLItemRenderer(true);

diff --git a/ihl/flexible_cable/IronWorkbenchTileEntity.java b/ihl/flexible_cable/IronWorkbenchTileEntity.java
index d21b4c9..30f6fda 100644
--- a/ihl/flexible_cable/IronWorkbenchTileEntity.java
+++ b/ihl/flexible_cable/IronWorkbenchTileEntity.java
@@ -11,13 +11,6 @@ import java.util.Set;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

-import net.minecraft.client.gui.GuiScreen;

-import net.minecraft.entity.item.EntityItem;

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

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.network.NetworkManager;

-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;

 import ic2.api.network.INetworkClientTileEntityEventListener;

 import ic2.api.network.INetworkTileEntityEventListener;

 import ic2.api.recipe.IRecipeInput;

@@ -32,6 +25,13 @@ import ihl.recipes.RecipeInputDetonator;
 import ihl.recipes.RecipeInputDie;

 import ihl.recipes.RecipeInputObjectInstance;

 import ihl.utils.IHLUtils;

+import net.minecraft.client.gui.GuiScreen;

+import net.minecraft.entity.item.EntityItem;

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

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.network.NetworkManager;

+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;

 

 public class IronWorkbenchTileEntity extends TileEntityInventory

 		implements IHasGui, INetworkClientTileEntityEventListener, INetworkTileEntityEventListener {

diff --git a/ihl/flexible_cable/NodeRender.java b/ihl/flexible_cable/NodeRender.java
index 157be67..c27f11a 100644
--- a/ihl/flexible_cable/NodeRender.java
+++ b/ihl/flexible_cable/NodeRender.java
@@ -1,5 +1,7 @@
 package ihl.flexible_cable;

 

+import org.lwjgl.opengl.GL11;

+

 import ihl.IHLModInfo;

 import ihl.model.ModelTube;

 import net.minecraft.client.renderer.Tessellator;

@@ -9,8 +11,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;

 import net.minecraftforge.common.util.ForgeDirection;

 

-import org.lwjgl.opengl.GL11;

-

 public class NodeRender extends Render

 {

 	

diff --git a/ihl/flexible_cable/SetOfDiesMiniGUI.java b/ihl/flexible_cable/SetOfDiesMiniGUI.java
index 6a94abb..c708da7 100644
--- a/ihl/flexible_cable/SetOfDiesMiniGUI.java
+++ b/ihl/flexible_cable/SetOfDiesMiniGUI.java
@@ -1,16 +1,17 @@
 package ihl.flexible_cable;
 
 import java.awt.event.KeyEvent;
+
 import org.lwjgl.opengl.GL11;
 
+import ihl.IHLMod;
+import ihl.interfaces.ItemMiniGUI;
+import ihl.utils.IHLUtils;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
-import ihl.IHLMod;
-import ihl.interfaces.ItemMiniGUI;
-import ihl.utils.IHLUtils;
 
 public class SetOfDiesMiniGUI extends ItemMiniGUI {
 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIIronWorkbench.png");
diff --git a/ihl/flexible_cable/SubAnchorEnergyNetNode.java b/ihl/flexible_cable/SubAnchorEnergyNetNode.java
index 33f9fb3..3fb9f76 100644
--- a/ihl/flexible_cable/SubAnchorEnergyNetNode.java
+++ b/ihl/flexible_cable/SubAnchorEnergyNetNode.java
@@ -3,12 +3,6 @@ package ihl.flexible_cable;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
 import ic2.api.energy.EnergyNet;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
@@ -17,6 +11,12 @@ import ic2.core.IC2;
 import ihl.IHLMod;
 import ihl.interfaces.IEnergyNetNode;
 import ihl.utils.IHLUtils;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class SubAnchorEnergyNetNode implements IEnergyNetNode{
 
diff --git a/ihl/flexible_cable/SubRTUEnergyNetNode.java b/ihl/flexible_cable/SubRTUEnergyNetNode.java
index c068ba0..ccb46b8 100644
--- a/ihl/flexible_cable/SubRTUEnergyNetNode.java
+++ b/ihl/flexible_cable/SubRTUEnergyNetNode.java
@@ -3,16 +3,16 @@ package ihl.flexible_cable;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.common.MinecraftForge;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.core.IC2;
 import ihl.IHLMod;
 import ihl.interfaces.IEnergyNetNode;
 import ihl.utils.IHLUtils;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.common.MinecraftForge;
 
 public class SubRTUEnergyNetNode implements IEnergyNetNode{