diff --git a/src/main/java/gregtechmod/mistaqur/nei/AlloySmelterRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/AlloySmelterRecipeHandler.java index 15d3a73..c8535ec 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/AlloySmelterRecipeHandler.java @@ -23,14 +23,14 @@ public class AlloySmelterRecipeHandler extends GT_RecipeHandler { public CachedAlloySmelterRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 35 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 35 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/AssemblerRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/AssemblerRecipeHandler.java index 34896f3..9aa5b06 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/AssemblerRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/AssemblerRecipeHandler.java @@ -18,14 +18,14 @@ public class AssemblerRecipeHandler extends GT_RecipeHandler { public CachedAssemblerRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 35 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 35 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/BenderRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/BenderRecipeHandler.java index d52f796..8532ea1 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/BenderRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/BenderRecipeHandler.java @@ -18,12 +18,12 @@ public class BenderRecipeHandler extends GT_RecipeHandler { public CachedBenderRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/BlastRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/BlastRecipeHandler.java index ddd79d8..da008db 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/BlastRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/BlastRecipeHandler.java @@ -18,16 +18,16 @@ public class BlastRecipeHandler extends GT_RecipeHandler { public CachedBlastRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 34 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 34 - sOffsetX, 34 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 34 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 34 - sOffsetX, 34 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 86 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2,104 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 86 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1),104 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mStartEU = aRecipe.mStartEU; diff --git a/src/main/java/gregtechmod/mistaqur/nei/CannerRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/CannerRecipeHandler.java index 8d5edcd..9bc5ae4 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/CannerRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/CannerRecipeHandler.java @@ -18,16 +18,16 @@ public class CannerRecipeHandler extends GT_RecipeHandler { public CachedCannerRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 35 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 35 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2, 125 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 125 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/CentrifugeRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/CentrifugeRecipeHandler.java index 71fa8f7..8bdaa38 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/CentrifugeRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/CentrifugeRecipeHandler.java @@ -18,20 +18,20 @@ public class CentrifugeRecipeHandler extends GT_RecipeHandler { public CachedCentrifugeRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 80 - sOffsetX, 35 - sOffsetY + 7)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 50 - sOffsetX, 5 - sOffsetY + 7)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 80 - sOffsetX, 35 - sOffsetY + 7)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 50 - sOffsetX, 5 - sOffsetY + 7)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 80 - sOffsetX, 5 - sOffsetY + 7)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2, 110 - sOffsetX, 35 - sOffsetY + 7)); - if (aRecipe.mOutput3 != null) - products.add(new PositionedStack(aRecipe.mOutput3, 80 - sOffsetX, 65 - sOffsetY + 7)); - if (aRecipe.mOutput4 != null) - products.add(new PositionedStack(aRecipe.mOutput4, 50 - sOffsetX, 35 - sOffsetY + 7)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 80 - sOffsetX, 5 - sOffsetY + 7)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 110 - sOffsetX, 35 - sOffsetY + 7)); + if (aRecipe.getOutput(2) != null) + products.add(new PositionedStack(aRecipe.getOutput(2), 80 - sOffsetX, 65 - sOffsetY + 7)); + if (aRecipe.getOutput(3) != null) + products.add(new PositionedStack(aRecipe.getOutput(3), 50 - sOffsetX, 35 - sOffsetY + 7)); mDuration = aRecipe.mDuration; } diff --git a/src/main/java/gregtechmod/mistaqur/nei/ChemicalRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/ChemicalRecipeHandler.java index 38666d9..6909af6 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/ChemicalRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/ChemicalRecipeHandler.java @@ -18,14 +18,14 @@ public class ChemicalRecipeHandler extends GT_RecipeHandler { public CachedChemicalReactorRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 70 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 90 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 70 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 90 - sOffsetX, 16 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 80 - sOffsetX, 46 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 80 - sOffsetX, 46 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/CutterRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/CutterRecipeHandler.java index baa0477..664c843 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/CutterRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/CutterRecipeHandler.java @@ -18,12 +18,12 @@ public class CutterRecipeHandler extends GT_RecipeHandler { public CachedCutterRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/DistillationRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/DistillationRecipeHandler.java index 21a4524..e3997a2 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/DistillationRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/DistillationRecipeHandler.java @@ -18,20 +18,20 @@ public class DistillationRecipeHandler extends GT_RecipeHandler { public CachedDistillationRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 62 - sOffsetX, 41 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 62 - sOffsetX, 59 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 62 - sOffsetX, 41 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 62 - sOffsetX, 59 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 98 - sOffsetX, 5 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2, 98 - sOffsetX, 23 - sOffsetY)); - if (aRecipe.mOutput3 != null) - products.add(new PositionedStack(aRecipe.mOutput3, 98 - sOffsetX, 41 - sOffsetY)); - if (aRecipe.mOutput4 != null) - products.add(new PositionedStack(aRecipe.mOutput4, 98 - sOffsetX, 59 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 98 - sOffsetX, 5 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 98 - sOffsetX, 23 - sOffsetY)); + if (aRecipe.getOutput(2) != null) + products.add(new PositionedStack(aRecipe.getOutput(2), 98 - sOffsetX, 41 - sOffsetY)); + if (aRecipe.getOutput(3) != null) + products.add(new PositionedStack(aRecipe.getOutput(3), 98 - sOffsetX, 59 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/ElectrolyzerRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/ElectrolyzerRecipeHandler.java index 25a01f0..beddc71 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/ElectrolyzerRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/ElectrolyzerRecipeHandler.java @@ -18,20 +18,20 @@ public class ElectrolyzerRecipeHandler extends GT_RecipeHandler { public CachedElectrolyzerRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 80 - sOffsetX, 46 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 50 - sOffsetX, 46 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 80 - sOffsetX, 46 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 50 - sOffsetX, 46 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 50 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2, 70 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mOutput3 != null) - products.add(new PositionedStack(aRecipe.mOutput3, 90 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mOutput4 != null) - products.add(new PositionedStack(aRecipe.mOutput4,110 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 50 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 70 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getOutput(2) != null) + products.add(new PositionedStack(aRecipe.getOutput(2), 90 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getOutput(3) != null) + products.add(new PositionedStack(aRecipe.getOutput(3),110 - sOffsetX, 16 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/FusionRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/FusionRecipeHandler.java index c362981..e9cbd17 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/FusionRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/FusionRecipeHandler.java @@ -20,14 +20,14 @@ public class FusionRecipeHandler extends GT_RecipeHandler { public CachedFusionRecipe(GT_Recipe irecipe) { resources = new ArrayList(); - if (irecipe.mInput1 != null) - resources.add(new PositionedStack(irecipe.mInput1, 48 - sOffsetX, 17 - sOffsetY)); - if (irecipe.mInput2 != null) - resources.add(new PositionedStack(irecipe.mInput2, 48 - sOffsetX, 53 - sOffsetY)); + if (irecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(irecipe.getRepresentativeInput1(), 48 - sOffsetX, 17 - sOffsetY)); + if (irecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(irecipe.getRepresentativeInput2(), 48 - sOffsetX, 53 - sOffsetY)); products = new ArrayList(); - if (irecipe.mOutput1 != null) - products.add(new PositionedStack(irecipe.mOutput1, 108 - sOffsetX, 35 - sOffsetY)); + if (irecipe.getOutput(0) != null) + products.add(new PositionedStack(irecipe.getOutput(0), 108 - sOffsetX, 35 - sOffsetY)); mDuration = irecipe.mDuration; mEUt = irecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/GrinderRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/GrinderRecipeHandler.java index 860d7cc..db33f7c 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/GrinderRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/GrinderRecipeHandler.java @@ -18,20 +18,20 @@ public class GrinderRecipeHandler extends GT_RecipeHandler { public CachedGrinderRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 34 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 34 - sOffsetX, 34 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 34 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 34 - sOffsetX, 34 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 86 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2,104 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput3 != null) - products.add(new PositionedStack(aRecipe.mOutput3,122 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput4 != null) - products.add(new PositionedStack(aRecipe.mOutput4,140 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 86 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 104 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(2) != null) + products.add(new PositionedStack(aRecipe.getOutput(2), 122 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(3) != null) + products.add(new PositionedStack(aRecipe.getOutput(3), 140 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/ImplosionRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/ImplosionRecipeHandler.java index 2d120f5..c4ca3b2 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/ImplosionRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/ImplosionRecipeHandler.java @@ -18,16 +18,16 @@ public class ImplosionRecipeHandler extends GT_RecipeHandler { public CachedImplosionRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 34 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 34 - sOffsetX, 34 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 34 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 34 - sOffsetX, 34 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 86 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2,104 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 86 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1),104 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mStartEU = aRecipe.mStartEU; diff --git a/src/main/java/gregtechmod/mistaqur/nei/LatheRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/LatheRecipeHandler.java index 6bbb3a0..5852a80 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/LatheRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/LatheRecipeHandler.java @@ -18,14 +18,14 @@ public class LatheRecipeHandler extends GT_RecipeHandler { public CachedLatheRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2, 125 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1), 125 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/SawmillRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/SawmillRecipeHandler.java index 2a2ede3..1c744f3 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/SawmillRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/SawmillRecipeHandler.java @@ -18,18 +18,18 @@ public class SawmillRecipeHandler extends GT_RecipeHandler { public CachedSawmillRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 34 - sOffsetX, 16 - sOffsetY)); - if (aRecipe.mInput2 != null) - resources.add(new PositionedStack(aRecipe.mInput2, 34 - sOffsetX, 34 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 34 - sOffsetX, 16 - sOffsetY)); + if (aRecipe.getRepresentativeInput2() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput2(), 34 - sOffsetX, 34 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 86 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput2 != null) - products.add(new PositionedStack(aRecipe.mOutput2,104 - sOffsetX, 25 - sOffsetY)); - if (aRecipe.mOutput3 != null) - products.add(new PositionedStack(aRecipe.mOutput3,122 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 86 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(1) != null) + products.add(new PositionedStack(aRecipe.getOutput(1),104 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(2) != null) + products.add(new PositionedStack(aRecipe.getOutput(2),122 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/VacuumFreezerRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/VacuumFreezerRecipeHandler.java index 30aeb49..6445e9e 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/VacuumFreezerRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/VacuumFreezerRecipeHandler.java @@ -18,12 +18,12 @@ public class VacuumFreezerRecipeHandler extends GT_RecipeHandler { public CachedVacuumFreezerRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 54 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 54 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 106 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 106 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt; diff --git a/src/main/java/gregtechmod/mistaqur/nei/WiremillRecipeHandler.java b/src/main/java/gregtechmod/mistaqur/nei/WiremillRecipeHandler.java index 6c404c3..2b93cae 100644 --- a/src/main/java/gregtechmod/mistaqur/nei/WiremillRecipeHandler.java +++ b/src/main/java/gregtechmod/mistaqur/nei/WiremillRecipeHandler.java @@ -18,12 +18,12 @@ public class WiremillRecipeHandler extends GT_RecipeHandler { public CachedWiremillRecipe(GT_Recipe aRecipe) { resources = new ArrayList(); - if (aRecipe.mInput1 != null) - resources.add(new PositionedStack(aRecipe.mInput1, 53 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getRepresentativeInput1() != null) + resources.add(new PositionedStack(aRecipe.getRepresentativeInput1(), 53 - sOffsetX, 25 - sOffsetY)); products = new ArrayList(); - if (aRecipe.mOutput1 != null) - products.add(new PositionedStack(aRecipe.mOutput1, 107 - sOffsetX, 25 - sOffsetY)); + if (aRecipe.getOutput(0) != null) + products.add(new PositionedStack(aRecipe.getOutput(0), 107 - sOffsetX, 25 - sOffsetY)); mDuration = aRecipe.mDuration; mEUt = aRecipe.mEUt;