+Further work on Helium Generator

+Going to create a new one though.

2 files changed, 83 insertions, 54 deletions

diff --git a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java b/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java
index 8acf0313fd..b024e4c5b0 100644
--- a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java
+++ b/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java
@@ -6,67 +6,71 @@ import ic2.core.slot.SlotInvSlot;
 import java.util.List;
 
 import miscutil.core.tileentities.TileEntityHeliumGenerator;
+import miscutil.core.util.Utils;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotFurnace;
 
 public class ContainerHeliumGenerator
-  extends ContainerBase<TileEntityHeliumGenerator>
+extends ContainerBase<TileEntityHeliumGenerator>
 {
-  public short size;
-  
-  public ContainerHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine)
-  {
-    super(machine);
-    this.addSlotToContainer(new SlotFurnace(player.player, machine, 2, 80, 35));
-    this.size = machine.getReactorSize();
-    int startX = 16;
-    int startY = 16;
-    int i = 0;
-    for (i = 0; i < 9; i++)
-    {
-      int x = i % this.size;
-      int y = i / this.size;
-      
-      addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
-    }
-    startX = 108;
-    startY = 16;
-    for (i = 9; i < 18; i++)
-    {
-      int x = i % this.size;
-      int y = (i-9) / this.size;
-      
-      addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
-    }
-    for (i = 0; i < 3; ++i)
-    {
-        for (int j = 0; j < 9; ++j)
-        {
-            this.addSlotToContainer(new Slot(player, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-        }
-    }
+	public short size;
 
-    for (i = 0; i < 9; ++i)
-    {
-        this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 142));
-    }
-   // addSlotToContainer(new SlotInvSlot(machine.coolantinputSlot, 0, 8, 25));
-    //addSlotToContainer(new SlotInvSlot(machine.hotcoolinputSlot, 0, 188, 25));
-    //addSlotToContainer(new SlotInvSlot(machine.coolantoutputSlot, 0, 8, 115));
-    //addSlotToContainer(new SlotInvSlot(machine.hotcoolantoutputSlot, 0, 188, 115));
-  }
-  
-  public List<String> getNetworkedFields()
-  {
-    List<String> ret = super.getNetworkedFields();
-    
-    ret.add("heat");
-    ret.add("maxHeat");
-    ret.add("EmitHeat");
-    /*ret.add("inputTank");
+	public ContainerHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine)
+	{
+		super(machine);
+		Utils.LOG_INFO("containerHeliumGenerator");
+		short sr = machine.getReactorSize();
+		this.addSlotToContainer(new SlotFurnace(player.player, machine, 2, 80, 35));
+		this.size = sr;
+		int startX = 16;
+		int startY = 16;
+		int i = 0;
+		for (i = 0; i < 9; i++)
+		{
+			int x = i % this.size;
+			int y = i / this.size;
+
+			addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
+		}
+		startX = 108;
+		startY = 16;
+		for (i = 9; i < 18; i++)
+		{
+			int x = i % this.size;
+			int y = (i-9) / this.size;
+
+			addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
+		}
+		for (i = 0; i < 3; ++i)
+		{
+			for (int j = 0; j < 9; ++j)
+			{
+				this.addSlotToContainer(new Slot(player, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+
+		for (i = 0; i < 9; ++i)
+		{
+			this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 142));
+		}
+		// addSlotToContainer(new SlotInvSlot(machine.coolantinputSlot, 0, 8, 25));
+		//addSlotToContainer(new SlotInvSlot(machine.hotcoolinputSlot, 0, 188, 25));
+		//addSlotToContainer(new SlotInvSlot(machine.coolantoutputSlot, 0, 8, 115));
+		//addSlotToContainer(new SlotInvSlot(machine.hotcoolantoutputSlot, 0, 188, 115));
+	}
+
+	@Override
+	public List<String> getNetworkedFields()
+	{
+		List<String> ret = super.getNetworkedFields();
+
+		ret.add("heat");
+		ret.add("maxHeat");
+		ret.add("EmitHeat");
+		/*ret.add("inputTank");
     ret.add("outputTank");
     ret.add("fluidcoolreactor");*/
-    return ret;
-  }   
+		return ret;
+	}   
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java b/src/Java/miscutil/core/gui/GUIHeliumGenerator.java
index 8188176c83..dd9c29543b 100644
--- a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java
+++ b/src/Java/miscutil/core/gui/GUIHeliumGenerator.java
@@ -31,6 +31,31 @@ public class GUIHeliumGenerator extends GuiContainer
         String s = StatCollector.translateToLocal("container.radiation_collector");
         this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
         this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+        
+        this.fontRendererObj.drawString(StatCollector.translateToLocal("|"+-1), 80, 35, 2);
+        
+        short sr = 3;
+        int size = sr;
+        int startX = 16;
+        int startY = 16;
+        int i = 0;
+        for (i = 0; i < 9; i++)
+        {
+          int x = i % size;
+          int y = i / size;
+          this.fontRendererObj.drawString(StatCollector.translateToLocal("|"+i), startX + 18 * x, startY + 18 * y, 4210752);
+          //addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
+        }
+        startX = 108;
+        startY = 16;
+        for (i = 9; i < 18; i++)
+        {
+          int x = i % size;
+          int y = (i-9) / size;
+          this.fontRendererObj.drawString(StatCollector.translateToLocal("|"+i), startX + 18 * x, startY + 18 * y, 4210752);
+         // addSlotToContainer(new SlotInvSlot(machine.reactorSlot, i, startX + 18 * x, startY + 18 * y));
+        }
+        
     }
 
     @Override