3 files changed, 54 insertions, 4 deletions
diff --git a/src/Java/miscutil/core/gui/ModGUI.java b/src/Java/miscutil/core/gui/ModGUI.java
index 259270d224..82f6ebf3bf 100644
--- a/src/Java/miscutil/core/gui/ModGUI.java
+++ b/src/Java/miscutil/core/gui/ModGUI.java
@@ -1,9 +1,9 @@
 package miscutil.core.gui;
 
 import miscutil.MiscUtils;
-import miscutil.core.block.heliumgen.container.ContainerHeliumGenerator;
-import miscutil.core.block.heliumgen.gui.GUIHeliumGenerator;
-import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator;
+import miscutil.core.block.machine.heliumgen.container.ContainerHeliumGenerator;
+import miscutil.core.block.machine.heliumgen.gui.GUIHeliumGenerator;
+import miscutil.core.block.machine.heliumgen.tileentity.TileEntityHeliumGenerator;
 import miscutil.core.handler.GuiHandler;
 import miscutil.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/core/gui/machine/GUI_Charger.java b/src/Java/miscutil/core/gui/machine/GUI_Charger.java
new file mode 100644
index 0000000000..deca8d4f09
--- /dev/null
+++ b/src/Java/miscutil/core/gui/machine/GUI_Charger.java
@@ -0,0 +1,50 @@
+package miscutil.core.gui.machine;
+
+import miscutil.core.container.Container_Charger;
+import miscutil.core.lib.CORE;
+import miscutil.core.tileentities.machines.TileEntityCharger;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+public class GUI_Charger extends GuiContainer
+{
+    private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png");
+ 
+    private InventoryPlayer inventory;
+    private TileEntityCharger te;
+ 
+    public GUI_Charger(TileEntityCharger te, EntityPlayer player)
+    {
+        super(new Container_Charger(te, player));
+        inventory = player.inventory;
+        this.te = te;
+    }
+ 
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
+    {
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+ 
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+ 
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+ 
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+ 
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2)
+    {
+        fontRendererObj.drawString(I18n.format(te.getInventoryName()), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), 6, 4210752, false);
+        //fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752);
+    }
+}
+\ No newline at end of file
diff --git a/src/Java/miscutil/core/gui/machine/GUI_NHG.java b/src/Java/miscutil/core/gui/machine/GUI_NHG.java
index b536157a49..e2239d6d40 100644
--- a/src/Java/miscutil/core/gui/machine/GUI_NHG.java
+++ b/src/Java/miscutil/core/gui/machine/GUI_NHG.java
@@ -2,7 +2,7 @@ package miscutil.core.gui.machine;
 
 import miscutil.core.container.Container_NHG;
 import miscutil.core.lib.CORE;
-import miscutil.core.tileentities.TileEntityNHG;
+import miscutil.core.tileentities.machines.TileEntityNHG;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;