Removed explosion radius limitations. Explosion calculation optimized (reduced memory usage). One more detonator and explosive pack recipe. GT6 recipes for both chemical reactors and cryogenic distiller. Max stack size of muffle furnace is limited to 32. A lot of old features are removed.

1 files changed, 37 insertions, 39 deletions

diff --git a/ihl/explosion/DetonatorMiniGUI.java b/ihl/explosion/DetonatorMiniGUI.java
index c969983..6a6c421 100644
--- a/ihl/explosion/DetonatorMiniGUI.java
+++ b/ihl/explosion/DetonatorMiniGUI.java
@@ -12,72 +12,70 @@ import ihl.IHLMod;
 import ihl.interfaces.ItemMiniGUI;
 import ihl.utils.IHLUtils;
 
-public class DetonatorMiniGUI extends ItemMiniGUI
-{
+public class DetonatorMiniGUI extends ItemMiniGUI {
 	private static final ResourceLocation background = new ResourceLocation("ihl", "textures/gui/GUIIronWorkbench.png");
 	private int detonator_delay;
 	private GuiTextField detonatorDelayTextField;
 	private int xPos;
 	private int yPos;
-	
-	public DetonatorMiniGUI(GuiContainer gui, Slot slot) 
-	{
+
+	public DetonatorMiniGUI(GuiContainer gui, Slot slot) {
 		super(gui, slot);
-		detonator_delay=slot.getStack().stackTagCompound.getInteger("detonator_delay");
-		xPos = this.slotBase.xDisplayPosition-18;
-		yPos = this.slotBase.yDisplayPosition+18;
-		detonatorDelayTextField=new GuiTextField(this.guiBase.mc.fontRenderer,  xPos+78, yPos+3, 28, 11);
+		detonator_delay = slot.getStack().stackTagCompound.getInteger("detonator_delay");
+		xPos = this.slotBase.xDisplayPosition - 18;
+		yPos = this.slotBase.yDisplayPosition + 18;
+		detonatorDelayTextField = new GuiTextField(this.guiBase.mc.fontRenderer, xPos + TEXT_BOX_POSX,
+				yPos + TEXT_BOX_POSY, TEXT_BOX_WIDTH, 11);
 		detonatorDelayTextField.setText(Integer.toString(detonator_delay));
 		detonatorDelayTextField.setFocused(true);
 	}
 
 	@Override
-	public void displayGUI() 
-	{
-	    GL11.glEnable(GL11.GL_BLEND);
-	    GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        this.guiBase.mc.renderEngine.bindTexture(background);
-		this.guiBase.drawTexturedModalRect(xPos, yPos, 0, 202, 126, 25);
-		int runnerXPos=xPos+5+114*detonator_delay/1350;
-		this.guiBase.drawTexturedModalRect(runnerXPos, yPos+18, 126, 202, 3, 5);
-		this.guiBase.mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("ihl.detonator_delay"), xPos+3, yPos+4, 0xFFCC00);
+	public void displayGUI() {
+		GL11.glEnable(GL11.GL_BLEND);
+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+		this.guiBase.mc.renderEngine.bindTexture(background);
+		this.guiBase.drawTexturedModalRect(xPos, yPos, 0, 202, 126, HEIGHT);
+		int runnerXPos = xPos + 5 + 114 * detonator_delay / 1350;
+		this.guiBase.drawTexturedModalRect(runnerXPos, yPos + 34, 126, 202, 3, 5);
+		this.guiBase.mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("ihl.detonator_delay"),
+				xPos + 3, yPos + 4, 0xFFCC00);
 		this.detonatorDelayTextField.drawTextBox();
-		this.guiBase.mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("s"), xPos+110, yPos+4, 0xFFCC00);
+		this.guiBase.mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("s"), xPos + UNITS_LABEL_POSX, yPos + 18,
+				0xFFCC00);
 	}
 
 	@Override
-	public boolean handleMouseClick(int mouseX, int mouseY, int mouseButton) 
-	{
-		if(mouseX>=xPos+5 && mouseX<=xPos+119 && mouseY>=yPos+17 && mouseY<=yPos+24)
-		{
-			this.detonator_delay=Math.max(1, Math.min(1350,(mouseX-xPos-5)*1350/114));
+	public boolean handleMouseClick(int mouseX, int mouseY, int mouseButton) {
+		if (mouseX >= xPos + 5 && mouseX <= xPos + 119 && mouseY >= yPos + RUNNER_POSY - 1 && mouseY <= yPos + HEIGHT) {
+			this.detonator_delay = Math.max(1, Math.min(1350, (mouseX - xPos - 5) * 1350 / 114));
 			this.detonatorDelayTextField.setText(Integer.toString(detonator_delay));
 		}
-		if(mouseX>=xPos+78 && mouseX<=xPos+78+28 && mouseY>=yPos+3 && mouseY<=yPos+3+11)
-		{
+		if (mouseX >= xPos + TEXT_BOX_POSX && mouseX <= xPos + TEXT_BOX_POSX + TEXT_BOX_WIDTH && mouseY >= yPos + 3
+				&& mouseY <= yPos + 3 + 11) {
 			this.detonatorDelayTextField.setFocused(true);
 		}
-		return mouseX>=xPos && mouseX<=xPos+202 && mouseY>=yPos && mouseY<=yPos+25;
+		return mouseX >= xPos && mouseX <= xPos + 202 && mouseY >= yPos && mouseY <= yPos + HEIGHT;
 	}
-	
+
 	@Override
-    public boolean handleKeyTyped(char characterTyped, int keyIndex)
-    {
-        this.detonatorDelayTextField.textboxKeyTyped(characterTyped, keyIndex);
-        if(keyIndex==KeyEvent.VK_ACCEPT || keyIndex==KeyEvent.VK_ENTER || keyIndex==28 || keyIndex==156)//28  - enter;156 - numpad enter
-        {
-			this.detonator_delay=Math.max(1, Math.min(1350,(int)(IHLUtils.parseIntSafe(this.detonatorDelayTextField.getText(),this.detonator_delay))));
+	public boolean handleKeyTyped(char characterTyped, int keyIndex) {
+		this.detonatorDelayTextField.textboxKeyTyped(characterTyped, keyIndex);
+		// 28 - enter; 156 - numpad enter
+		if (keyIndex == KeyEvent.VK_ACCEPT || keyIndex == KeyEvent.VK_ENTER || keyIndex == 28 || keyIndex == 156) {
+			this.detonator_delay = Math.max(1, Math.min(1350,
+					(int) (IHLUtils.parseIntSafe(this.detonatorDelayTextField.getText(), this.detonator_delay))));
 			this.detonatorDelayTextField.setText(Integer.toString(detonator_delay));
 			this.detonatorDelayTextField.setFocused(false);
 			return true;
-        }
+		}
 		return false;
-    }
+	}
 
 	@Override
-	public void onGUIClosed() 
-	{
-		IHLMod.proxy.sendItemStackNBTTagFromClientToServerPlayer(this.guiBase.mc.thePlayer, this.slotBase.slotNumber, "detonator_delay", this.detonator_delay);
+	public void onGUIClosed() {
+		IHLMod.proxy.sendItemStackNBTTagFromClientToServerPlayer(this.guiBase.mc.thePlayer, this.slotBase.slotNumber,
+				"detonator_delay", this.detonator_delay);
 	}
 
 }