Merged in MultiFixes (pull request #11)

MultiFixes

3 files changed, 329 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java
new file mode 100644
index 0000000000..49d9890d3a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java
@@ -0,0 +1,60 @@
+package gtPlusPlus.core.gui.machine;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import gtPlusPlus.core.container.Container_EggBox;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
+
+@SideOnly(Side.CLIENT)
+public class GUI_EggBox extends GuiContainer {
+
+	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/FishTrap.png");
+
+	public GUI_EggBox(final InventoryPlayer player_inventory, final TileEntityEggBox te){
+		super(new Container_EggBox(player_inventory, te));
+	}
+
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int i, final int j){
+		//this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
+	this.fontRendererObj.drawString(I18n.format("container.EggBox", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
+
+	}
+
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){
+		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+		this.mc.renderEngine.bindTexture(craftingTableGuiTextures);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+
+
+	//This method is called when the Gui is first called!
+	@Override
+	public void initGui()
+	{
+		//You have to add this line for the Gui to function properly!
+		super.initGui();
+
+		//The parameters of GuiButton are(id, x, y, width, height, text);
+		//this.buttonList.add(new GuiButton( 1, 367, 132, 18, 18, "X"));
+		//this.buttonList.add(new GuiButton( 2, 385, 132, 18, 18, "Y"));
+		//NOTE: the id always has to be different or else it might get called twice or never!
+
+		//Add any other buttons here too!
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
new file mode 100644
index 0000000000..0257e51d0c
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
@@ -0,0 +1,183 @@
+package gtPlusPlus.core.gui.machine;
+
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
+import gtPlusPlus.core.gui.widget.GuiValueField;
+import gtPlusPlus.core.handler.PacketHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
+import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class GUI_VolumetricFlaskSetter extends GuiContainer {
+
+	private GuiTextField mText;
+	private boolean mIsOpen = false;
+	private TileEntityVolumetricFlaskSetter mTile;
+	private Container_VolumetricFlaskSetter mContainer;
+	private static final ResourceLocation mGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/VolumetricFlaskSetter.png");
+
+	public GUI_VolumetricFlaskSetter(Container_VolumetricFlaskSetter aContainer){
+		super(aContainer);
+		mContainer = aContainer;
+		mTile = mContainer.mTileEntity;
+	}
+
+	public void initGui(){
+		super.initGui();
+		Keyboard.enableRepeatEvents(true);
+		mIsOpen = true;
+		this.mText = new GuiValueField(this.fontRendererObj, 26, 31, this.width / 2 - 62, this.height/2-52, 106, 14);
+		mText.setMaxStringLength(5);
+		mText.setEnableBackgroundDrawing(true);
+		mText.setText("0");
+		mText.setFocused(true);
+	}
+
+	protected void keyTyped(char par1, int par2){
+		if (mIsOpen) {
+			if (mText.isFocused()) {
+				if (par2 == Keyboard.KEY_RETURN) {
+					if (mText.isFocused()) {
+						mText.setFocused(false);
+					}
+				}
+				else if (par2 == Keyboard.KEY_BACK) {
+					String aCurrentText = getText();
+					if (aCurrentText.length() > 0) {
+						this.mText.setText(aCurrentText.substring(0, aCurrentText.length() - 1));	
+						if (getText().length() <= 0) {
+							this.mText.setText("0");
+						}
+						sendUpdateToServer();
+					}
+				}
+				else {
+					if (isNumber(par1)) {
+						if (this.mText.getText().equals("0")) {
+							this.mText.setText(""+par1);
+							sendUpdateToServer();
+						}
+						else {
+							this.mText.textboxKeyTyped(par1, par2);		
+							sendUpdateToServer();			
+						}
+					}
+					else {
+						super.keyTyped(par1, par2);	
+					}
+				}	
+			}
+			else {
+				super.keyTyped(par1, par2);				
+			}
+		}
+	}
+
+	@Override
+	public void onGuiClosed() {
+		mIsOpen = false;
+		mText.setEnabled(false);
+		mText.setVisible(false);
+		super.onGuiClosed();
+		Keyboard.enableRepeatEvents(false);
+	}
+
+	public void updateScreen(){
+		super.updateScreen();
+		// Update Textbox to 0 if Empty
+		if (getText().length() <= 0) {
+			this.mText.setText("0");
+			sendUpdateToServer();
+		}
+		this.mText.updateCursorCounter();
+
+		// Check TextBox Value is correct
+		short aCustomValue = 0;		
+		if (getText().length() > 0) {
+			try {
+				aCustomValue = Short.parseShort(getText());
+				short aTileValue = ((Container_VolumetricFlaskSetter) mContainer).mCustomValue;
+				if (mContainer != null) {
+					if (aTileValue != aCustomValue){
+						this.mText.setText(""+aTileValue);
+					}
+				}
+			} catch (NumberFormatException ex) {
+
+			}
+		}	
+	}
+
+	public void drawScreen(int par1, int par2, float par3){
+		this.drawDefaultBackground();
+		super.drawScreen(par1, par2, par3);
+
+
+	}
+
+	protected void mouseClicked(int x, int y, int btn) {
+		if (mIsOpen) {
+			super.mouseClicked(x, y, btn);
+			this.mText.mouseClicked(x, y, btn);
+		}
+	}
+
+
+
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int i, final int j){
+		super.drawGuiContainerForegroundLayer(i, j);
+		this.mText.drawTextBox();
+		this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter", new Object[0]), 4, 3, 4210752);
+		int aYVal = 49;
+		this.fontRendererObj.drawString(I18n.format("0 = 16l", new Object[0]), 8, aYVal, 4210752);
+		this.fontRendererObj.drawString(I18n.format("4 = 576l", new Object[0]), 64, aYVal, 4210752);
+		this.fontRendererObj.drawString(I18n.format("1 = 36l", new Object[0]), 8, aYVal+=8, 4210752);
+		this.fontRendererObj.drawString(I18n.format("5 = 720l", new Object[0]), 64, aYVal, 4210752);
+		this.fontRendererObj.drawString(I18n.format("2 = 144l", new Object[0]), 8, aYVal+=8, 4210752);
+		this.fontRendererObj.drawString(I18n.format("6 = 864l", new Object[0]), 64, aYVal, 4210752);
+		this.fontRendererObj.drawString(I18n.format("3 = 432l", new Object[0]), 8, aYVal+=8, 4210752);
+		this.fontRendererObj.drawString(I18n.format("-> = Custom", new Object[0]), 59, aYVal, 4210752);
+
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){
+		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+		this.mc.renderEngine.bindTexture(mGuiTextures);
+		final int x = (this.width - this.xSize) / 2;
+		final int y = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
+	}
+
+	public boolean isNumber(char c) {
+		return ((c >= 48 && c <= 57) || c == 45);
+	}
+
+	protected String getText() {
+		return this.mText.getText();
+	}
+
+	protected void sendUpdateToServer() {
+		short aCustomValue = 0;
+		if (getText().length() > 0) {
+			try {
+				aCustomValue = Short.parseShort(getText());
+				PacketHandler.sendToServer(new Packet_VolumetricFlaskGui(mTile, aCustomValue));
+			} catch (NumberFormatException ex) {
+
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java
new file mode 100644
index 0000000000..ac4c1a8aee
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -0,0 +1,86 @@
+package gtPlusPlus.core.gui.widget;
+
+import java.lang.reflect.Field;
+
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiTextField;
+
+public class GuiValueField extends GuiTextField {
+
+	private final FontRenderer mFontRenderer;
+	private final int mScreenLocationX;
+	private final int mScreenLocationY;
+	
+	public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY, int aWidth, int aHeight) {
+		super(aFontRenderer, aX, aY, aWidth, aHeight);
+		mFontRenderer = aFontRenderer;
+		mScreenLocationX = aScreenLocationX;
+		mScreenLocationY = aScreenLocationY;
+	}
+	
+	public boolean canLoseFocus() {		
+		Field canLoseFocus = ReflectionUtils.getField(GuiTextField.class, "canLoseFocus");
+		if (canLoseFocus != null) {
+			return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this);
+		}		
+		return true;
+	}
+	
+	public boolean isFocused() {		
+		Field isFocused = ReflectionUtils.getField(GuiTextField.class, "isFocused");
+		if (isFocused != null) {
+			return (boolean) ReflectionUtils.getFieldValue(isFocused, this);
+		}		
+		return false;
+	}
+	
+	public boolean isBackgroundDrawingEnabled() {		
+		Field enableBackgroundDrawing = ReflectionUtils.getField(GuiTextField.class, "enableBackgroundDrawing");
+		if (enableBackgroundDrawing != null) {
+			return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
+		}		
+		return true;
+	}
+	public int getLineScrollOffset() {		
+		Field lineScrollOffset = ReflectionUtils.getField(GuiTextField.class, "lineScrollOffset");
+		if (lineScrollOffset != null) {
+			return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this);
+		}		
+		return 0;
+	}
+	
+    /**
+     * Args: x, y, buttonClicked
+     */
+    public void mouseClicked(int aX, int aY, int aButton){
+    	
+        boolean flag = aX >= this.mScreenLocationX && aX < this.mScreenLocationX + this.width && aY >= this.mScreenLocationY && aY < this.mScreenLocationY + this.height;
+
+        //Logger.INFO("Clicked X:"+aX);
+        //Logger.INFO("Clicked Y:"+aY);
+        //Logger.INFO("ScreenPos X:"+mScreenLocationX);
+        //Logger.INFO("ScreenPos Y:"+mScreenLocationY);
+        //Logger.INFO("Render X:"+xPosition);
+        //Logger.INFO("Render Y:"+yPosition);
+        
+        if (canLoseFocus())
+        {
+            this.setFocused(flag);
+        }
+
+        if (isFocused() && aButton == 0)
+        {
+            int l = aX - this.mScreenLocationX;
+
+            if (isBackgroundDrawingEnabled())
+            {
+                l -= 4;
+            }
+
+            String s = this.mFontRenderer.trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth());
+            this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset());
+        }
+    }
+
+}