From 61a51b52a7ba8367876661e521044650d466708b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 11 Sep 2015 13:34:20 +0100 Subject: [PATCH] Fixes #83 --- .../nei/recipes/AlloySmelterRecipeHandler.java | 6 +++--- .../nei/recipes/AssemblingMachineRecipeHandler.java | 6 +++--- .../nei/recipes/BlastFurnaceRecipeHandler.java | 8 ++++---- .../compat/nei/recipes/CentrifugeRecipeHandler.java | 12 ++++++------ .../nei/recipes/ChemicalReactorRecipeHandler.java | 6 +++--- .../compat/nei/recipes/GrinderRecipeHandler.java | 12 ++++++------ .../recipes/ImplosionCompressorRecipeHandler.java | 8 ++++---- .../recipes/IndustrialElectrolyzerRecipeHandler.java | 12 ++++++------ .../nei/recipes/IndustrialSawmillRecipeHandler.java | 10 +++++----- .../compat/nei/recipes/LatheRecipeHandler.java | 4 ++-- .../recipes/PlateCuttingMachineRecipeHandler.java | 4 ++-- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java index ce04f71d8..8bd9ea541 100644 --- a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java @@ -15,13 +15,13 @@ public class AlloySmelterRecipeHandler extends GenericRecipeHander implements IN @Override public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 47 - offset, 17 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 47 - offset, 17 - offset, false); input.add(pStack); - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 65 - offset, 17 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 65 - offset, 17 - offset, false); input.add(pStack2); - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); outputs.add(pStack3); } diff --git a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java index aa83bec8b..52bd030a3 100644 --- a/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/AssemblingMachineRecipeHandler.java @@ -16,16 +16,16 @@ public class AssemblingMachineRecipeHandler extends GenericRecipeHander implemen public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 47 - offset, 17 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 47 - offset, 17 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 65 - offset, 17 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 65 - offset, 17 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); outputs.add(pStack3); } diff --git a/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java index 9f7bce247..8e0627df7 100644 --- a/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/BlastFurnaceRecipeHandler.java @@ -18,22 +18,22 @@ public class BlastFurnaceRecipeHandler extends GenericRecipeHander implements IN public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 40 - offset, 25 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 40 - offset, 25 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 40 - offset, 43 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 40 - offset, 43 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 100 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 100 - offset, 35 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 118 - offset, 35 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 118 - offset, 35 - offset, false); outputs.add(pStack4); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java index 571d687b7..8cc8796a3 100644 --- a/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/CentrifugeRecipeHandler.java @@ -16,31 +16,31 @@ public class CentrifugeRecipeHandler extends GenericRecipeHander implements INei public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 80 - offset, 35 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 80 - offset, 35 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 50 - offset, 5 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 50 - offset, 5 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 80 - offset, 5 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 80 - offset, 5 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 110 - offset, 35 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 110 - offset, 35 - offset, false); outputs.add(pStack4); } if (recipeType.getOutputsSize() > 2) { - PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 80 - offset, 65 - offset); + PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 80 - offset, 65 - offset, false); outputs.add(pStack5); } if (recipeType.getOutputsSize() > 3) { - PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 50 - offset, 35 - offset); + PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 50 - offset, 35 - offset, false); outputs.add(pStack6); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java index a58dac795..d5576e086 100644 --- a/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/ChemicalReactorRecipeHandler.java @@ -16,17 +16,17 @@ public class ChemicalReactorRecipeHandler extends GenericRecipeHander implements public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 70 - offset, 21 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 70 - offset, 21 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 90 - offset, 21 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 90 - offset, 21 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 80 - offset, 51 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 80 - offset, 51 - offset, false); outputs.add(pStack3); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java index 2352b8e68..b15f2fbca 100644 --- a/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/GrinderRecipeHandler.java @@ -22,32 +22,32 @@ public class GrinderRecipeHandler extends GenericRecipeHander implements INeiBas public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 32 - offset, 26 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 32 - offset, 26 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 32 - offset, 44 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 32 - offset, 44 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 77 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 77 - offset, 35 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 95 - offset, 35 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 95 - offset, 35 - offset, false); outputs.add(pStack4); } if (recipeType.getOutputsSize() > 2) { - PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 113 - offset, 35 - offset); + PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 113 - offset, 35 - offset, false); outputs.add(pStack5); } if (recipeType.getOutputsSize() > 3) { - PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 131 - offset, 35 - offset); + PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 131 - offset, 35 - offset, false); outputs.add(pStack6); } diff --git a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java index 1e6609c6c..3adde44ef 100644 --- a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java @@ -16,22 +16,22 @@ public class ImplosionCompressorRecipeHandler extends GenericRecipeHander implem public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 37 - offset, 26 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 37 - offset, 26 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 37 - offset, 44 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 37 - offset, 44 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 93 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 93 - offset, 35 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 111 - offset, 35 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 111 - offset, 35 - offset, false); outputs.add(pStack4); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java index dd1dd6e14..e89a1ce56 100644 --- a/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/IndustrialElectrolyzerRecipeHandler.java @@ -16,30 +16,30 @@ public class IndustrialElectrolyzerRecipeHandler extends GenericRecipeHander imp public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 80 - offset, 51 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 80 - offset, 51 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 50 - offset, 51 - offset); + PositionedStack pStack2 = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(1)), 50 - offset, 51 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 50 - offset, 19 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 50 - offset, 19 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 70 - offset, 19 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 70 - offset, 19 - offset, false); outputs.add(pStack4); } if (recipeType.getOutputsSize() > 2) { - PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 90 - offset, 19 - offset); + PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 90 - offset, 19 - offset, false); outputs.add(pStack5); } if (recipeType.getOutputsSize() > 3) { - PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 110 - offset, 19 - offset); + PositionedStack pStack6 = new PositionedStack(recipeType.getOutput(3), 110 - offset, 19 - offset, false); outputs.add(pStack6); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java index ed18cff88..1aab80c20 100644 --- a/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/IndustrialSawmillRecipeHandler.java @@ -21,27 +21,27 @@ public class IndustrialSawmillRecipeHandler extends GenericRecipeHander implemen public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(recipeType.getInputs().get(0), 32 - offset, 26 - offset); + PositionedStack pStack = new PositionedStack(recipeType.getInputs().get(0), 32 - offset, 26 - offset, false); input.add(pStack); } if (recipeType.getInputs().size() > 1) { - PositionedStack pStack2 = new PositionedStack(recipeType.getInputs().get(1), 32 - offset, 44 - offset); + PositionedStack pStack2 = new PositionedStack(recipeType.getInputs().get(1), 32 - offset, 44 - offset, false); input.add(pStack2); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 84 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 84 - offset, 35 - offset, false); outputs.add(pStack3); } if (recipeType.getOutputsSize() > 1) { - PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 102 - offset, 35 - offset); + PositionedStack pStack4 = new PositionedStack(recipeType.getOutput(1), 102 - offset, 35 - offset, false); outputs.add(pStack4); } if (recipeType.getOutputsSize() > 2) { - PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 120 - offset, 35 - offset); + PositionedStack pStack5 = new PositionedStack(recipeType.getOutput(2), 120 - offset, 35 - offset, false); outputs.add(pStack5); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java index a7a6b8477..f451a2438 100644 --- a/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/LatheRecipeHandler.java @@ -16,12 +16,12 @@ public class LatheRecipeHandler extends GenericRecipeHander implements INeiBaseR public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset, false); input.add(pStack); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); outputs.add(pStack3); } } diff --git a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java index 8ce94e554..33e779efa 100644 --- a/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/PlateCuttingMachineRecipeHandler.java @@ -16,11 +16,11 @@ public class PlateCuttingMachineRecipeHandler extends GenericRecipeHander implem public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; if (recipeType.getInputs().size() > 0) { - PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset); + PositionedStack pStack = new PositionedStack(ItemUtils.getStackWithAllOre(recipeType.getInputs().get(0)), 56 - offset, 17 - offset, false); input.add(pStack); } if (recipeType.getOutputsSize() > 0) { - PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset); + PositionedStack pStack3 = new PositionedStack(recipeType.getOutput(0), 116 - offset, 35 - offset, false); outputs.add(pStack3); } }