From 7305ba719930ea3fbf8aa987aeec48b33cdbd82e Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Tue, 21 Mar 2017 17:34:07 +0300 Subject: Oregen --- .../AchesonFurnaceRecipeHandler.java | 30 +--- ihl/nei_integration/ChimneyKneeRecipeHandler.java | 73 ---------- ihl/nei_integration/LeadOvenRecipeHandler.java | 162 ++++++++++----------- .../MuffleFurnaceRecipeHandler.java | 14 +- ihl/nei_integration/NEIIHLConfig.java | 4 - .../PrecipitatorCondenserRecipeHandler.java | 67 --------- 6 files changed, 88 insertions(+), 262 deletions(-) delete mode 100644 ihl/nei_integration/ChimneyKneeRecipeHandler.java delete mode 100644 ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java (limited to 'ihl/nei_integration') diff --git a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java index 8571f3a..f359c1c 100644 --- a/ihl/nei_integration/AchesonFurnaceRecipeHandler.java +++ b/ihl/nei_integration/AchesonFurnaceRecipeHandler.java @@ -1,17 +1,12 @@ package ihl.nei_integration; import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import codechicken.nei.PositionedStack; import ihl.processing.metallurgy.AchesonFurnaceGui; import ihl.processing.metallurgy.AchesonFurnanceTileEntity; -import ihl.recipes.RecipeInputOreDictionaryList; import ihl.recipes.UniversalRecipeInput; import ihl.recipes.UniversalRecipeOutput; -import ihl.utils.IHLUtils; import net.minecraft.client.gui.inventory.GuiContainer; @@ -26,25 +21,25 @@ public class AchesonFurnaceRecipeHandler extends MachineRecipeHandler @Override protected int[] getInputPosX() { - return new int[]{34-5,34-5}; + return new int[]{40-5,40-5}; } @Override protected int[] getInputPosY() { - return new int[]{41-11,23-11}; + return new int[]{40-11,22-11}; } @Override protected int[] getOutputPosX() { - return new int[]{107-5,107-5}; + return new int[]{98-5}; } @Override protected int[] getOutputPosY() { - return new int[]{41-11,23-11}; + return new int[]{32-11}; } @Override @@ -62,13 +57,13 @@ public class AchesonFurnaceRecipeHandler extends MachineRecipeHandler @Override public String getGuiTexture() { - return "ihl:textures/gui/GUIAchesonFurnaceNEI.png"; + return "ihl:textures/gui/GUIAchesonFurnace.png"; } @Override public void loadTransferRects() { - this.transferRects.add(new RecipeTransferRect(new Rectangle(40-5, 55-11, 90, 30), this.getRecipeId(), new Object[0])); + this.transferRects.add(new RecipeTransferRect(new Rectangle(57-5, 29-11, 40, 30), this.getRecipeId(), new Object[0])); } @Override @@ -82,17 +77,4 @@ public class AchesonFurnaceRecipeHandler extends MachineRecipeHandler { return AchesonFurnanceTileEntity.getRecipes(); } - - @Override - public List getAdditionalIngredients() - { - List ps = new ArrayList(); - RecipeInputOreDictionaryList ari = new RecipeInputOreDictionaryList(new String[] {"stickCoal","stickGraphite"}); - ps.add(new PositionedStack(ari.getInputs(),16-5,41-11)); - ps.add(new PositionedStack(ari.getInputs(),52-5,41-11)); - ps.add(new PositionedStack(IHLUtils.getOreDictItemStack("stickGraphite"),89-5,41-11)); - ps.add(new PositionedStack(IHLUtils.getOreDictItemStack("stickGraphite"),125-5,41-11)); - return ps; - } - } diff --git a/ihl/nei_integration/ChimneyKneeRecipeHandler.java b/ihl/nei_integration/ChimneyKneeRecipeHandler.java deleted file mode 100644 index d60c251..0000000 --- a/ihl/nei_integration/ChimneyKneeRecipeHandler.java +++ /dev/null @@ -1,73 +0,0 @@ -package ihl.nei_integration; - -import java.util.Map; - -import ihl.processing.chemistry.GoldChimneyKneeTileEntity; -import ihl.recipes.UniversalRecipeInput; -import ihl.recipes.UniversalRecipeOutput; -import net.minecraft.client.gui.inventory.GuiContainer; - - -public class ChimneyKneeRecipeHandler extends MachineRecipeHandler -{ - @Override - public Class getGuiClass() - { - return null; - } - - @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[] getOutputPosX() - { - return new int[]{96-5}; - } - - @Override - protected int[] getOutputPosY() - { - return new int[]{35-11,31-11}; - } - - - @Override - public String getRecipeName() - { - return "Chimney knee"; - } - - @Override - public String getRecipeId() - { - return "ihl.chimneyKnee"; - } - - @Override - public String getGuiTexture() - { - return "ihl:textures/gui/GUIChimneyKneeNEI.png"; - } - - @Override - public String getOverlayIdentifier() - { - return "chimneyKnee"; - } - - @Override - public Map getRecipeList() - { - return GoldChimneyKneeTileEntity.getRecipes(); - } -} diff --git a/ihl/nei_integration/LeadOvenRecipeHandler.java b/ihl/nei_integration/LeadOvenRecipeHandler.java index 5c43f9e..5c376fd 100644 --- a/ihl/nei_integration/LeadOvenRecipeHandler.java +++ b/ihl/nei_integration/LeadOvenRecipeHandler.java @@ -3,98 +3,86 @@ package ihl.nei_integration; import java.awt.Rectangle; import java.util.Map; -import codechicken.lib.gui.GuiDraw; import ihl.processing.chemistry.LeadOvenGui; import ihl.processing.chemistry.LeadOvenTileEntity; import ihl.recipes.UniversalRecipeInput; import ihl.recipes.UniversalRecipeOutput; import net.minecraft.client.gui.inventory.GuiContainer; +public class LeadOvenRecipeHandler extends MachineRecipeHandler { + @Override + public Class getGuiClass() { + return LeadOvenGui.class; + } -public class LeadOvenRecipeHandler extends MachineRecipeHandler -{ - @Override - public Class getGuiClass() - { - return LeadOvenGui.class; - } - - @Override - protected int[] getInputPosX() - { - return new int[]{47-5,65-5}; - } - - @Override - protected int[] getInputPosY() - { - return new int[]{17-11}; - } - - @Override - protected int[] getOutputPosX() - { - return new int[]{112-5}; - } - - @Override - protected int[] getOutputPosY() - { - return new int[]{35-11}; - } - - @Override - protected int[] getFluidOutputPosX() - { - return new int[]{112-5}; - } - - @Override - protected int[] getFluidOutputPosY() - { - return new int[]{17-11}; - } - - @Override - public String getRecipeName() - { - return "Chemically resistant oven"; - } - - @Override - public String getRecipeId() - { - return "ihl.leadOven"; - } - - @Override - public String getGuiTexture() - { - return "ihl:textures/gui/GUILeadOven.png"; - } - - @Override - public String getOverlayIdentifier() - { - return "leadOven"; - } - - @Override - public void drawBackground(int i) - { - super.drawBackground(i); - GuiDraw.drawTexturedModalRect(107-5, 16-11, 199, 0, 26, 18); - } - - @Override - public void loadTransferRects() - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(80-10, 35-10, 22, 15), this.getRecipeId(), new Object[0])); - } - - @Override - public Map getRecipeList() - { - return LeadOvenTileEntity.getRecipes(); - } + @Override + protected int[] getInputPosX() { + return new int[] { 47 - 5, 65 - 5 }; + } + + @Override + protected int[] getInputPosY() { + return new int[] { 17 - 11 }; + } + + @Override + protected int[] getOutputPosX() { + return new int[] { 112 - 5 }; + } + + @Override + protected int[] getOutputPosY() { + return new int[] { 35 - 11 }; + } + + @Override + protected int[] getFluidOutputPosX() { + return new int[] { 9 - 5 }; + } + + @Override + protected int[] getFluidOutputPosY() { + return new int[] { 53 - 11 }; + } + + @Override + protected int[] getFluidInputPosX() { + return new int[] { 9 - 5 }; + } + + @Override + protected int[] getFluidInputPosY() { + return new int[] { 17 - 11 }; + } + + @Override + public String getRecipeName() { + return "Chemical oven"; + } + + @Override + public String getRecipeId() { + return "ihl.leadOven"; + } + + @Override + public String getGuiTexture() { + return "ihl:textures/gui/GUILeadOven.png"; + } + + @Override + public String getOverlayIdentifier() { + return "leadOven"; + } + + @Override + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(80 - 10, 35 - 10, 22, 15), this.getRecipeId(), new Object[0])); + } + + @Override + public Map getRecipeList() { + return LeadOvenTileEntity.getRecipes(); + } } diff --git a/ihl/nei_integration/MuffleFurnaceRecipeHandler.java b/ihl/nei_integration/MuffleFurnaceRecipeHandler.java index 46ba9a7..bd57d64 100644 --- a/ihl/nei_integration/MuffleFurnaceRecipeHandler.java +++ b/ihl/nei_integration/MuffleFurnaceRecipeHandler.java @@ -22,25 +22,25 @@ public class MuffleFurnaceRecipeHandler extends MachineRecipeHandler @Override protected int[] getInputPosX() { - return new int[]{51-5,69-5}; + return new int[]{40-5,40-5}; } @Override protected int[] getInputPosY() { - return new int[]{34-11}; + return new int[]{40-11,22-11}; } @Override protected int[] getOutputPosX() { - return new int[]{105-5,123-5}; + return new int[]{98-5}; } - + @Override protected int[] getOutputPosY() { - return new int[]{34-11}; + return new int[]{32-11}; } @Override @@ -58,7 +58,7 @@ public class MuffleFurnaceRecipeHandler extends MachineRecipeHandler @Override public String getGuiTexture() { - return "ihl:textures/gui/GUIMuffleFurnace.png"; + return "ihl:textures/gui/GUIAchesonFurnace.png"; } @Override @@ -70,7 +70,7 @@ public class MuffleFurnaceRecipeHandler extends MachineRecipeHandler @Override public void loadTransferRects() { - this.transferRects.add(new RecipeTransferRect(new Rectangle(40-5, 55-11, 55, 15), this.getRecipeId(), new Object[0])); + this.transferRects.add(new RecipeTransferRect(new Rectangle(57-5, 29-11, 40, 30), this.getRecipeId(), new Object[0])); } diff --git a/ihl/nei_integration/NEIIHLConfig.java b/ihl/nei_integration/NEIIHLConfig.java index 288ab24..8047b27 100644 --- a/ihl/nei_integration/NEIIHLConfig.java +++ b/ihl/nei_integration/NEIIHLConfig.java @@ -95,10 +95,6 @@ public class NEIIHLConfig implements IConfigureNEI API.registerUsageHandler(new CrucibleRecipeHandler()); API.registerRecipeHandler(new FractionationColumnRecipeHandler()); API.registerUsageHandler(new FractionationColumnRecipeHandler()); - API.registerRecipeHandler(new ChimneyKneeRecipeHandler()); - API.registerUsageHandler(new ChimneyKneeRecipeHandler()); - API.registerRecipeHandler(new PrecipitatorCondenserRecipeHandler()); - API.registerUsageHandler(new PrecipitatorCondenserRecipeHandler()); API.registerRecipeHandler(new IronWorkbenchRecipeHandler()); API.registerUsageHandler(new IronWorkbenchRecipeHandler()); this.addSubsets(); diff --git a/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java b/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java deleted file mode 100644 index 1b771fc..0000000 --- a/ihl/nei_integration/PrecipitatorCondenserRecipeHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package ihl.nei_integration; - -import java.awt.Rectangle; -import java.util.Map; - -import ihl.processing.chemistry.PrecipitatorCondenserTileEntity; -import ihl.recipes.UniversalRecipeInput; -import ihl.recipes.UniversalRecipeOutput; -import net.minecraft.client.gui.inventory.GuiContainer; - -public class PrecipitatorCondenserRecipeHandler extends MachineRecipeHandler { - @Override - public Class getGuiClass() { - return null; - } - - @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[] getOutputPosX() { - return new int[] { 75 - 5 }; - } - - @Override - protected int[] getOutputPosY() { - return new int[] { 53 - 11, 31 - 11 }; - } - - @Override - public String getRecipeName() { - return "Precipitator/Condenser"; - } - - @Override - public String getRecipeId() { - return "ihl.precipitatorCondenser"; - } - - @Override - public String getGuiTexture() { - return "ihl:textures/gui/GUICondenserNEI.png"; - } - - @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 getRecipeList() { - return PrecipitatorCondenserTileEntity.getRecipes(); - } -} -- cgit v1.2.3