% Refactored the entire project to stop using MiscUtils everywhere possible, now it's gtPlusPlus.

6 files changed, 318 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
new file mode 100644
index 0000000000..b3531ceb3e
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -0,0 +1,56 @@
+package gtPlusPlus.core.gui.beta;
+
+import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Gui_ID_Registry
+{
+	private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap();
+	private static final Map<Integer, MU_GuiId> idMap = new HashMap();
+	private static int nextId = 0;
+
+	static
+	{
+		//registerGuiHandlers(Gui_Types.Tile, Arrays.asList(new Class[] {TileAlveary.class}));
+		//registerGuiHandlers(MU_GuiType.Item, Arrays.asList(new Class[] { ItemBackpack.class, ItemBackpackNaturalist.class, ItemBeealyzer.class, ItemCatalogue.class, ItemFlutterlyzer.class, ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class, ItemLetter.class, ItemSolderingIron.class, ItemTreealyzer.class }));
+		//registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] { EntityMinecartApiary.class, EntityMinecartBeehouse.class }));
+	}
+
+	private static void registerGuiHandlers(Gui_Types MU_GuiType, List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses)
+	{
+		for (Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses)
+		{
+			MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass);
+			classMap.put(tileGuiHandlerClass, guiId);
+			idMap.put(Integer.valueOf(guiId.getId()), guiId);
+		}
+	}
+
+	public static MU_GuiId getGuiIdForGuiHandler(IGuiManagerMiscUtils guiHandler)
+	{
+		Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass();
+		MU_GuiId guiId = (MU_GuiId)classMap.get(guiHandlerClass);
+		if (guiId == null) {
+			for (Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap.entrySet()) {
+				if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass))
+				{
+					guiId = (MU_GuiId)classGuiIdEntry.getValue();
+					break;
+				}
+			}
+		}
+		if (guiId == null) {
+			throw new IllegalStateException("No gui ID for gui handler: " + guiHandler);
+		}
+		return guiId;
+	}
+
+	public static MU_GuiId getGuiId(int id)
+	{
+		return (MU_GuiId)idMap.get(Integer.valueOf(id));
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
new file mode 100644
index 0000000000..428cae93d5
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java
@@ -0,0 +1,8 @@
+package gtPlusPlus.core.gui.beta;
+
+public enum Gui_Types
+  {
+    Item,  Tile,  Entity;
+    
+    private Gui_Types() {}
+  }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
new file mode 100644
index 0000000000..7d17870743
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.core.gui.beta;
+import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
+
+public class MU_GuiId
+  {
+    private final int id;
+    private final Gui_Types MU_GuiType;
+    private final Class<? extends IGuiManagerMiscUtils> guiHandlerClass;
+    
+    MU_GuiId(int id, Gui_Types MU_GuiType, Class<? extends IGuiManagerMiscUtils> guiHandlerClass)
+    {
+      this.id = id;
+      this.MU_GuiType = MU_GuiType;
+      this.guiHandlerClass = guiHandlerClass;
+    }
+    
+    public Gui_Types getGuiType()
+    {
+      return this.MU_GuiType;
+    }
+    
+    public Class<? extends IGuiManagerMiscUtils> getGuiHandlerClass()
+    {
+      return this.guiHandlerClass;
+    }
+    
+    public int getId()
+    {
+      return this.id;
+    }
+  }
+
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
new file mode 100644
index 0000000000..9f1b775fb0
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
@@ -0,0 +1,122 @@
+package gtPlusPlus.core.gui.item;
+
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import com.sun.org.apache.xml.internal.security.utils.I18n;
+
+public class GuiBaseBackpack extends GuiContainer
+{
+	/** x and y size of the inventory window in pixels. Defined as float, passed as int
+	 * These are used for drawing the player model. */
+	private float xSize_lo;
+	private float ySize_lo;
+	
+	 /** The FontRenderer used by GuiScreen */
+    protected FontRenderer fontRenderer;
+
+	/** ResourceLocation takes 2 parameters: ModId, path to texture at the location:
+	 * "src/minecraft/assets/modid/"
+	 * 
+	 * I have provided a sample texture file that works with this tutorial. Download it
+	 * from Forge_Tutorials/textures/gui/
+	 */
+	private static final ResourceLocation iconLocation = new ResourceLocation(CORE.MODID, "textures/gui/itemBackpack.png");
+
+	/** The inventory to render on screen */
+	private final BaseInventoryBackpack inventory;
+
+	public GuiBaseBackpack(Container_BackpackBase containerItem)
+	{
+		super(containerItem);
+		this.inventory = containerItem.inventory;
+	}
+
+	/**
+	 * Draws the screen and all the components in it.
+	 */
+	@Override
+	public void drawScreen(int par1, int par2, float par3)
+	{
+		super.drawScreen(par1, par2, par3);
+		this.xSize_lo = (float)par1;
+		this.ySize_lo = (float)par2;
+	}
+
+	/**
+	 * Draw the foreground layer for the GuiContainer (everything in front of the items)
+	 */
+	@Override
+	protected void drawGuiContainerForegroundLayer(int par1, int par2)
+	{
+		String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName() : I18n.translate(this.inventory.getInventoryName());
+		//this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 0, 4210752);
+		//this.fontRenderer.drawString(I18n.translate("container.inventory"), 26, this.ySize - 96 + 4, 4210752);
+	}
+
+	/**
+	 * Draw the background layer for the GuiContainer (everything behind the items)
+	 */
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
+	{
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(iconLocation);
+		int k = (this.width - this.xSize) / 2;
+		int l = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
+		int i1;
+		drawPlayerModel(k + 51, l + 75, 30, (float)(k + 51) - this.xSize_lo, (float)(l + 75 - 50) - this.ySize_lo, this.mc.thePlayer);
+	}
+
+	/**
+	 * This renders the player model in standard inventory position (in later versions of Minecraft / Forge, you can
+	 * simply call GuiInventory.drawEntityOnScreen directly instead of copying this code)
+	 */
+	public static void drawPlayerModel(int x, int y, int scale, float yaw, float pitch, EntityLivingBase entity) {
+		GL11.glEnable(GL11.GL_COLOR_MATERIAL);
+		GL11.glPushMatrix();
+		GL11.glTranslatef(x, y, 50.0F);
+		GL11.glScalef(-scale, scale, scale);
+		GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
+		float f2 = entity.renderYawOffset;
+		float f3 = entity.rotationYaw;
+		float f4 = entity.rotationPitch;
+		float f5 = entity.prevRotationYawHead;
+		float f6 = entity.rotationYawHead;
+		GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F);
+		RenderHelper.enableStandardItemLighting();
+		GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F);
+		GL11.glRotatef(-((float) Math.atan(pitch / 40.0F)) * 20.0F, 1.0F, 0.0F, 0.0F);
+		entity.renderYawOffset = (float) Math.atan(yaw / 40.0F) * 20.0F;
+		entity.rotationYaw = (float) Math.atan(yaw / 40.0F) * 40.0F;
+		entity.rotationPitch = -((float) Math.atan(pitch / 40.0F)) * 20.0F;
+		entity.rotationYawHead = entity.rotationYaw;
+		entity.prevRotationYawHead = entity.rotationYaw;
+		GL11.glTranslatef(0.0F, entity.yOffset, 0.0F);
+		RenderManager.instance.playerViewY = 180.0F;
+		RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
+		entity.renderYawOffset = f2;
+		entity.rotationYaw = f3;
+		entity.rotationPitch = f4;
+		entity.prevRotationYawHead = f5;
+		entity.rotationYawHead = f6;
+		GL11.glPopMatrix();
+		RenderHelper.disableStandardItemLighting();
+		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+		OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
+		GL11.glDisable(GL11.GL_TEXTURE_2D);
+		OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
new file mode 100644
index 0000000000..c1f687c554
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
@@ -0,0 +1,50 @@
+package gtPlusPlus.core.gui.machine;
+
+import gtPlusPlus.core.container.Container_Charger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.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/gtPlusPlus/core/gui/machine/GUI_NHG.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java
new file mode 100644
index 0000000000..09b2ee93d8
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java
@@ -0,0 +1,50 @@
+package gtPlusPlus.core.gui.machine;
+
+import gtPlusPlus.core.container.Container_NHG;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
+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_NHG extends GuiContainer
+{
+    private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/helium_collector_gui_12.png");
+ 
+    private InventoryPlayer inventory;
+    private TileEntityNHG te;
+ 
+    public GUI_NHG(TileEntityNHG te, EntityPlayer player)
+    {
+        super(new Container_NHG(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("CoreTemp:"+te.getCoreTemp()+"K"), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752);
+    }
+}
\ No newline at end of file