~Refactored quite a few classes around, for cleaner code structure.

3 files changed, 3 insertions, 148 deletions

diff --git a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java b/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java
deleted file mode 100644
index b62bf2fff0..0000000000
--- a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package miscutil.core.gui;
-
-import ic2.core.ContainerBase;
-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>
-{
-	public short size;
-
-	public ContainerHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine)
-	{
-		super(machine);
-		Utils.LOG_WARNING("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;
-	}   
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java b/src/Java/miscutil/core/gui/GUIHeliumGenerator.java
deleted file mode 100644
index 2564aa33f7..0000000000
--- a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package miscutil.core.gui;
-
-import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.TileEntityHeliumGenerator;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class GUIHeliumGenerator extends GuiContainer
-{
-    private static final ResourceLocation collectorGuiTexture = new ResourceLocation(CORE.MODID, "textures/gui/helium_collector_gui.png");
-
-    public GUIHeliumGenerator(InventoryPlayer player, TileEntityHeliumGenerator machine)
-    {
-        super(new ContainerHeliumGenerator(player, machine));
-    }
-
-    /**
-     * Draw the foreground layer for the GuiContainer (everything in front of the items)
-     */
-    @Override
-	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_)
-    {
-        String s = StatCollector.translateToLocal("container.helium_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
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_)
-    {
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.getTextureManager().bindTexture(collectorGuiTexture);
-        int k = (this.width - this.xSize) / 2;
-        int l = (this.height - this.ySize) / 2;
-        this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
-
-    }
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/gui/ModGUI.java b/src/Java/miscutil/core/gui/ModGUI.java
index 1e4d172637..b9ecf00134 100644
--- a/src/Java/miscutil/core/gui/ModGUI.java
+++ b/src/Java/miscutil/core/gui/ModGUI.java
@@ -1,7 +1,9 @@
 package miscutil.core.gui;
 
 import miscutil.MiscUtils;
-import miscutil.core.tileentities.TileEntityHeliumGenerator;
+import miscutil.core.block.heliumgen.container.ContainerHeliumGenerator;
+import miscutil.core.block.heliumgen.gui.GUIHeliumGenerator;
+import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator;
 import miscutil.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;