Fixed an ore dictionary recipes of Iron workbench which using wrong set of items. Fixed wire recipe input. All recipes of Iron workbench now use fluid container input and will drop an empty container.

5 files changed, 195 insertions, 223 deletions

diff --git a/ihl/nei_integration/CryogenicDistillerRecipeHandler.java b/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
index 5b1a637..fe7caea 100644
--- a/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
+++ b/ihl/nei_integration/CryogenicDistillerRecipeHandler.java
@@ -34,7 +34,7 @@ public class CryogenicDistillerRecipeHandler extends MachineRecipeHandler
     @Override

     public void loadTransferRects()

     {

-        this.transferRects.add(new RecipeTransferRect(new Rectangle(102-5, 32-10, 18, 18), this.getRecipeId(), new Object[0]));

+        this.transferRects.add(new RecipeTransferRect(new Rectangle(57-5, 32-10, 63, 18), this.getRecipeId(), new Object[0]));

     }

 

     @Override

diff --git a/ihl/nei_integration/ExtruderRecipeHandler.java b/ihl/nei_integration/ExtruderRecipeHandler.java
index 3dae277..a823ce6 100644
--- a/ihl/nei_integration/ExtruderRecipeHandler.java
+++ b/ihl/nei_integration/ExtruderRecipeHandler.java
@@ -1,73 +1,69 @@
 package ihl.nei_integration;

 

+import java.awt.Rectangle;

 import java.util.Map;

 

+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;

 import ihl.processing.metallurgy.ExtruderGui;

 import ihl.processing.metallurgy.ExtruderTileEntity;

 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

 import net.minecraft.client.gui.inventory.GuiContainer;

 

+public class ExtruderRecipeHandler extends MachineRecipeHandler {

+	@Override

+	public Class<? extends GuiContainer> getGuiClass() {

+		return ExtruderGui.class;

+	}

 

-public class ExtruderRecipeHandler extends MachineRecipeHandler

-{

-    @Override

-	public Class <? extends GuiContainer > getGuiClass()

-    {

-        return ExtruderGui.class;

-    }

-    

-    @Override

-    protected int[] getInputPosX()

-    {

-        return new int[]{39-5,57-5};

-    }

+	@Override

+	protected int[] getInputPosX() {

+		return new int[] { 39 - 5, 57 - 5 };

+	}

 

-    @Override

-    protected int[] getInputPosY()

-    {

-        return new int[]{32-11};

-    }

+	@Override

+	protected int[] getInputPosY() {

+		return new int[] { 32 - 11 };

+	}

 

-    @Override

-    protected int[] getOutputPosX()

-    {

-        return new int[]{92-5};

-    }

+	@Override

+	protected int[] getOutputPosX() {

+		return new int[] { 92 - 5 };

+	}

 

-    @Override

-    protected int[] getOutputPosY()

-    {

-        return new int[]{32-11};

-    }

+	@Override

+	protected int[] getOutputPosY() {

+		return new int[] { 32 - 11 };

+	}

 

-    @Override

-	public String getRecipeName()

-    {

-        return "Extruder";

-    }

+	@Override

+	public String getRecipeName() {

+		return "Extruder";

+	}

 

-    @Override

-	public String getRecipeId()

-    {

-        return "ihl.extruder";

-    }

+	@Override

+	public String getRecipeId() {

+		return "ihl.extruder";

+	}

 

-    @Override

-	public String getGuiTexture()

-    {

-        return "ihl:textures/gui/GUIExtruder.png";

-    }

+	@Override

+	public String getGuiTexture() {

+		return "ihl:textures/gui/GUIExtruder.png";

+	}

 

-    @Override

-	public String getOverlayIdentifier()

-    {

-        return "extruder";

-    }

+	@Override

+	public String getOverlayIdentifier() {

+		return "extruder";

+	}

 

-    @Override

-	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList()

-    {

-        return ExtruderTileEntity.getRecipes();

-    }

+	@Override

+	public void loadTransferRects() {

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(74 - 5, 31 - 10, 18, 18), this.getRecipeId(), new Object[0]));

+	}

+

+	@Override

+	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList() {

+		return ExtruderTileEntity.getRecipes();

+	}

 }

diff --git a/ihl/nei_integration/InjectionMoldRecipeHandler.java b/ihl/nei_integration/InjectionMoldRecipeHandler.java
index 106b41b..06bf3c1 100644
--- a/ihl/nei_integration/InjectionMoldRecipeHandler.java
+++ b/ihl/nei_integration/InjectionMoldRecipeHandler.java
@@ -1,5 +1,6 @@
 package ihl.nei_integration;

 

+import java.awt.Rectangle;

 import java.util.Map;

 

 import ihl.processing.metallurgy.InjectionMoldTileEntity;

@@ -7,67 +8,62 @@ import ihl.recipes.UniversalRecipeInput;
 import ihl.recipes.UniversalRecipeOutput;

 import net.minecraft.client.gui.inventory.GuiContainer;

 

+public class InjectionMoldRecipeHandler extends MachineRecipeHandler {

+	@Override

+	public Class<? extends GuiContainer> getGuiClass() {

+		return null;

+	}

 

-public class InjectionMoldRecipeHandler extends MachineRecipeHandler

-{

-    @Override

-	public Class <? extends GuiContainer > getGuiClass()

-    {

-        return null;

-    }

-    

-    @Override

-    protected int[] getInputPosX()

-    {

-        return new int[]{65-5};

-    }

+	@Override

+	protected int[] getInputPosX() {

+		return new int[] { 65 - 5 };

+	}

 

-    @Override

-    protected int[] getInputPosY()

-    {

-        return new int[]{15-11,51-11};

-    }

+	@Override

+	protected int[] getInputPosY() {

+		return new int[] { 15 - 11, 51 - 11 };

+	}

 

-    @Override

-    protected int[] getOutputPosX()

-    {

-        return new int[]{101-5};

-    }

-    

-    @Override

-    protected int[] getOutputPosY()

-    {

-        return new int[]{51-11};

-    }

+	@Override

+	protected int[] getOutputPosX() {

+		return new int[] { 101 - 5 };

+	}

 

+	@Override

+	protected int[] getOutputPosY() {

+		return new int[] { 51 - 11 };

+	}

 

-    @Override

-	public String getRecipeName()

-    {

-        return "Injection mold";

-    }

+	@Override

+	public String getRecipeName() {

+		return "Injection mold";

+	}

 

-    @Override

-	public String getRecipeId()

-    {

-        return "ihl.casting";

-    }

+	@Override

+	public String getRecipeId() {

+		return "ihl.casting";

+	}

 

-    @Override

-	public String getGuiTexture()

-    {

-        return "ihl:textures/gui/GUICastingNEI.png";

-    }

+	@Override

+	public String getGuiTexture() {

+		return "ihl:textures/gui/GUICastingNEI.png";

+	}

 

-    @Override

-	public String getOverlayIdentifier()

-    {

-        return "casting";

-    }

+	@Override

+	public String getOverlayIdentifier() {

+		return "casting";

+	}

 

-    @Override

-	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList()

-    {

-        return InjectionMoldTileEntity.getRecipes();

-    }

+	@Override

+	public void loadTransferRects() {

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(64 - 5, 32 - 10, 18, 18), this.getRecipeId(), new Object[0]));

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(82 - 5, 50 - 10, 18, 18), this.getRecipeId(), new Object[0]));

+	}

+

+	@Override

+	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList() {

+		return InjectionMoldTileEntity.getRecipes();

+	}

 }

diff --git a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
index 6948a31..ad40647 100644
--- a/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
+++ b/ihl/nei_integration/LabElectrolyzerRecipeHandler.java
@@ -3,82 +3,68 @@ package ihl.nei_integration;
 import java.awt.Rectangle;

 import java.util.Map;

 

-import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;

 import ihl.processing.chemistry.LabElectrolyzerGui;

 import ihl.processing.chemistry.LabElectrolyzerTileEntity;

 import ihl.recipes.UniversalRecipeInput;

 import ihl.recipes.UniversalRecipeOutput;

 import net.minecraft.client.gui.inventory.GuiContainer;

 

+public class LabElectrolyzerRecipeHandler extends MachineRecipeHandler {

+	@Override

+	public Class<? extends GuiContainer> getGuiClass() {

+		return LabElectrolyzerGui.class;

+	}

 

-public class LabElectrolyzerRecipeHandler extends MachineRecipeHandler

-{

-    @Override

-	public Class <? extends GuiContainer > getGuiClass()

-    {

-        return LabElectrolyzerGui.class;

-    }

-    

-    @Override

-    protected int[] getInputPosX()

-    {

-        return new int[]{42-5,60-5,78-5};

-    }

+	@Override

+	protected int[] getInputPosX() {

+		return new int[] { 42 - 5, 60 - 5, 78 - 5 };

+	}

 

-    @Override

-    protected int[] getInputPosY()

-    {

-        return new int[]{15-11};

-    }

+	@Override

+	protected int[] getInputPosY() {

+		return new int[] { 15 - 11 };

+	}

 

-    @Override

-    protected int[] getOutputPosX()

-    {

-        return new int[]{8-5,87-5,106-5};

-    }

+	@Override

+	protected int[] getOutputPosX() {

+		return new int[] { 8 - 5, 87 - 5, 106 - 5 };

+	}

 

-    @Override

-    protected int[] getOutputPosY()

-    {

-        return new int[]{15-11,51-11,15-11};

-    }

+	@Override

+	protected int[] getOutputPosY() {

+		return new int[] { 15 - 11, 51 - 11, 15 - 11 };

+	}

 

+	@Override

+	public String getRecipeName() {

+		return "Lab electrolyzer";

+	}

 

-    @Override

-	public String getRecipeName()

-    {

-        return "Lab electrolyzer";

-    }

+	@Override

+	public String getRecipeId() {

+		return "ihl.labElectrolyzer";

+	}

 

-    @Override

-	public String getRecipeId()

-    {

-        return "ihl.labElectrolyzer";

-    }

+	@Override

+	public String getGuiTexture() {

+		return "ihl:textures/gui/GUILabElectrolyzer.png";

+	}

 

-    @Override

-	public String getGuiTexture()

-    {

-        return "ihl:textures/gui/GUILabElectrolyzer.png";

-    }

-    

-    @Override

-    public void loadTransferRects()

-    {

-        this.transferRects.add(new RecipeTransferRect(new Rectangle(7-5,32-10, 18, 18), this.getRecipeId(), new Object[0]));

-        this.transferRects.add(new RecipeTransferRect(new Rectangle(86-5,32-10, 37, 18), this.getRecipeId(), new Object[0]));

-    }

+	@Override

+	public void loadTransferRects() {

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(7 - 5, 32 - 10, 18, 18), this.getRecipeId(), new Object[0]));

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(86 - 5, 32 - 10, 37, 18), this.getRecipeId(), new Object[0]));

+	}

 

+	@Override

+	public String getOverlayIdentifier() {

+		return "labElectrolyzer";

+	}

 

-    @Override

-	public String getOverlayIdentifier()

-    {

-        return "labElectrolyzer";

-    }

-

-    @Override

-	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList()

-    {

-        return LabElectrolyzerTileEntity.getRecipes();

-    }

+	@Override

+	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList() {

+		return LabElectrolyzerTileEntity.getRecipes();

+	}

 }

diff --git a/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java b/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java
index 530ebaf..1b771fc 100644
--- a/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java
+++ b/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java
@@ -1,5 +1,6 @@
 package ihl.nei_integration;

 

+import java.awt.Rectangle;

 import java.util.Map;

 

 import ihl.processing.chemistry.PrecipitatorCondenserTileEntity;

@@ -7,67 +8,60 @@ import ihl.recipes.UniversalRecipeInput;
 import ihl.recipes.UniversalRecipeOutput;

 import net.minecraft.client.gui.inventory.GuiContainer;

 

+public class PrecipitatorCondenserRecipeHandler extends MachineRecipeHandler {

+	@Override

+	public Class<? extends GuiContainer> getGuiClass() {

+		return null;

+	}

 

-public class PrecipitatorCondenserRecipeHandler extends MachineRecipeHandler

-{

-    @Override

-	public Class <? extends GuiContainer > getGuiClass()

-    {

-        return null;

-    }

-    

-    @Override

-    protected int[] getInputPosX()

-    {

-        return new int[]{6-5,6-5,106-5};

-    }

+	@Override

+	protected int[] getInputPosX() {

+		return new int[] { 6 - 5, 6 - 5, 106 - 5 };

+	}

 

-    @Override

-    protected int[] getInputPosY()

-    {

-        return new int[]{33-11,53-11};

-    }

+	@Override

+	protected int[] getInputPosY() {

+		return new int[] { 33 - 11, 53 - 11 };

+	}

 

-    @Override

-    protected int[] getOutputPosX()

-    {

-        return new int[]{75-5};

-    }

+	@Override

+	protected int[] getOutputPosX() {

+		return new int[] { 75 - 5 };

+	}

 

-    @Override

-    protected int[] getOutputPosY()

-    {

-        return new int[]{53-11,31-11};

-    }

+	@Override

+	protected int[] getOutputPosY() {

+		return new int[] { 53 - 11, 31 - 11 };

+	}

 

+	@Override

+	public String getRecipeName() {

+		return "Precipitator/Condenser";

+	}

 

-    @Override

-	public String getRecipeName()

-    {

-        return "Precipitator/Condenser";

-    }

+	@Override

+	public String getRecipeId() {

+		return "ihl.precipitatorCondenser";

+	}

 

-    @Override

-	public String getRecipeId()

-    {

-        return "ihl.precipitatorCondenser";

-    }

+	@Override

+	public String getGuiTexture() {

+		return "ihl:textures/gui/GUICondenserNEI.png";

+	}

 

-    @Override

-	public String getGuiTexture()

-    {

-        return "ihl:textures/gui/GUICondenserNEI.png";

-    }

+	@Override

+	public String getOverlayIdentifier() {

+		return "condenser";

+	}

 

-    @Override

-	public String getOverlayIdentifier()

-    {

-        return "condenser";

-    }

+	@Override

+	public void loadTransferRects() {

+		this.transferRects

+				.add(new RecipeTransferRect(new Rectangle(23 - 5, 10 - 10, 50, 58), this.getRecipeId(), new Object[0]));

+	}

 

-    @Override

-	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList()

-    {

-        return PrecipitatorCondenserTileEntity.getRecipes();

-    }

+	@Override

+	public Map<UniversalRecipeInput, UniversalRecipeOutput> getRecipeList() {

+		return PrecipitatorCondenserTileEntity.getRecipes();

+	}

 }