diff --git a/src/main/java/techreborn/api/recipe/machines/CentrifugeRecipe.java b/src/main/java/techreborn/api/recipe/machines/CentrifugeRecipe.java index e9331e30d..d6f42beed 100644 --- a/src/main/java/techreborn/api/recipe/machines/CentrifugeRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/CentrifugeRecipe.java @@ -30,8 +30,6 @@ import techreborn.api.recipe.BaseRecipe; public class CentrifugeRecipe extends BaseRecipe { - boolean useOreDic = false; - public CentrifugeRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { super(Reference.CENTRIFUGE_RECIPE, tickTime, euPerTick); @@ -47,12 +45,13 @@ public class CentrifugeRecipe extends BaseRecipe { addOutput(output3); if (output4 != null) addOutput(output4); + setOreDict(false); } public CentrifugeRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean useOreDic) { this(input1, input2, output1, output2, output3, output4, tickTime, euPerTick); - this.useOreDic = useOreDic; + setOreDict(useOreDic); } @Override @@ -60,8 +59,4 @@ public class CentrifugeRecipe extends BaseRecipe { return "Centrifuge"; } - @Override - public boolean useOreDic() { - return useOreDic; - } } diff --git a/src/main/java/techreborn/api/recipe/machines/DistillationTowerRecipe.java b/src/main/java/techreborn/api/recipe/machines/DistillationTowerRecipe.java index 5a6d942ba..717410958 100644 --- a/src/main/java/techreborn/api/recipe/machines/DistillationTowerRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/DistillationTowerRecipe.java @@ -33,8 +33,6 @@ import techreborn.api.recipe.BaseRecipe; * */ public class DistillationTowerRecipe extends BaseRecipe { - - private boolean useOreDictionary = true; /** * @param inputCells Cells with to-be-distilled ingredient @@ -66,7 +64,7 @@ public class DistillationTowerRecipe extends BaseRecipe { public DistillationTowerRecipe(Object inputCells, Object input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean oreDict) { this(inputCells, input2, output1, output2, output3, output4, tickTime, euPerTick); - this.useOreDictionary = oreDict; + setOreDict(oreDict); } /* (non-Javadoc) @@ -76,9 +74,5 @@ public class DistillationTowerRecipe extends BaseRecipe { public String getUserFreindlyName() { return "Distillation Tower"; } - - @Override - public boolean useOreDic() { - return useOreDictionary; - } + } diff --git a/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java b/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java index 95693cc0a..d68e28182 100644 --- a/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java @@ -30,8 +30,6 @@ import techreborn.api.recipe.BaseRecipe; public class ExtractorRecipe extends BaseRecipe { - boolean useOreDic = true; - public ExtractorRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick) { super(Reference.EXTRACTOR_RECIPE, tickTime, euPerTick); if (input1 != null) @@ -42,7 +40,7 @@ public class ExtractorRecipe extends BaseRecipe { public ExtractorRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick, boolean useOreDic) { this(input1, output1, tickTime, euPerTick); - this.useOreDic = useOreDic; + setOreDict(useOreDic); } @Override @@ -50,8 +48,4 @@ public class ExtractorRecipe extends BaseRecipe { return "Extractor"; } - @Override - public boolean useOreDic() { - return useOreDic; - } } diff --git a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java index 73998d626..bbb860567 100644 --- a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java @@ -30,7 +30,6 @@ import techreborn.api.recipe.BaseRecipe; public class GrinderRecipe extends BaseRecipe { - public boolean useOreDict = true; public GrinderRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick) { super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2 @@ -42,18 +41,13 @@ public class GrinderRecipe extends BaseRecipe { public GrinderRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick, boolean useOreDict) { super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2 - this.useOreDict = useOreDict; + setOreDict(useOreDict); if (input1 != null) addInput(input1); if (output1 != null) addOutput(output1); } - @Override - public boolean useOreDic() { - return useOreDict; - } - @Override public String getUserFreindlyName() { return "Grinder"; diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java index ca1e25285..6580c03e6 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialElectrolyzerRecipe.java @@ -30,8 +30,6 @@ import techreborn.api.recipe.BaseRecipe; public class IndustrialElectrolyzerRecipe extends BaseRecipe { - private boolean useOreDictionary = true; - public IndustrialElectrolyzerRecipe(Object inputCells, Object input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { super(Reference.INDUSTRIAL_ELECTROLYZER_RECIPE, tickTime, euPerTick); @@ -52,7 +50,7 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe { public IndustrialElectrolyzerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean oreDict) { this(inputCells, input2, output1, output2, output3, output4, tickTime, euPerTick); - this.useOreDictionary = oreDict; + setOreDict(oreDict); } @Override @@ -60,8 +58,4 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe { return "Industrial Electrolyzer"; } - @Override - public boolean useOreDic() { - return useOreDictionary; - } } diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java index 8c3864d59..ffffc3bb0 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java @@ -32,7 +32,6 @@ import techreborn.api.recipe.BaseRecipe; public class IndustrialGrinderRecipe extends BaseRecipe { public FluidStack fluidStack; - boolean useOreDic = true; public IndustrialGrinderRecipe(Object input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { @@ -48,12 +47,13 @@ public class IndustrialGrinderRecipe extends BaseRecipe { if (output4 != null) addOutput(output4); this.fluidStack = fluidStack; + setOreDict(true); } public IndustrialGrinderRecipe(Object input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean useOreDict) { this(input1, fluidStack, output1, output2, output3, output4, tickTime, euPerTick); - this.useOreDic = useOreDict; + setOreDict(useOreDict); } @Override @@ -61,8 +61,4 @@ public class IndustrialGrinderRecipe extends BaseRecipe { return "IndustrialGrinder"; } - @Override - public boolean useOreDic() { - return useOreDic; - } } diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java index ef65a6866..76332303e 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java @@ -32,7 +32,6 @@ import techreborn.api.recipe.BaseRecipe; public class IndustrialSawmillRecipe extends BaseRecipe { public FluidStack fluidStack; - public boolean canUseOreDict = false; public IndustrialSawmillRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, int tickTime, int euPerTick) { @@ -46,6 +45,7 @@ public class IndustrialSawmillRecipe extends BaseRecipe { if (output3 != null) addOutput(output3); this.fluidStack = fluidStack; + setOreDict(false); } public IndustrialSawmillRecipe(Object input1, FluidStack fluidStack, ItemStack output1, @@ -60,7 +60,7 @@ public class IndustrialSawmillRecipe extends BaseRecipe { if (output3 != null) addOutput(output3); this.fluidStack = fluidStack; - this.canUseOreDict = canUseOreDict; + setOreDict(canUseOreDict); } @Override @@ -68,8 +68,4 @@ public class IndustrialSawmillRecipe extends BaseRecipe { return "Industrial Sawmill"; } - @Override - public boolean useOreDic() { - return canUseOreDict; - } }