From 807092abb4a393a63283b7be89691840139d83c6 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Thu, 12 Aug 2021 23:42:24 -0500 Subject: [PATCH] Revert "remove RecipeMap minimums" This reverts commit 201c564b510a778c154bfec9b03e9ab88d87d1c7. --- .../RecipeMapSteamMultiblockController.java | 3 +- .../RecipeMapMultiblockController.java | 18 ++-- .../java/gregtech/api/recipes/RecipeMap.java | 77 +++++++++------ .../java/gregtech/api/recipes/RecipeMaps.java | 99 ++++++++++--------- .../machines/RecipeMapAssemblyLine.java | 4 +- .../machines/RecipeMapDistillationTower.java | 4 +- .../machines/RecipeMapFluidCanner.java | 4 +- .../machines/RecipeMapFormingPress.java | 4 +- .../recipes/machines/RecipeMapFurnace.java | 4 +- 9 files changed, 115 insertions(+), 102 deletions(-) diff --git a/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java b/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java index 4e08a468929..666685319ca 100644 --- a/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java +++ b/src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java @@ -121,6 +121,7 @@ protected boolean checkStructureComponents(List parts, Map (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum(); - return itemInputsCount > 0 && abilities.containsKey(MultiblockAbility.STEAM); + return itemInputsCount >= recipeMap.getMinInputs() && + abilities.containsKey(MultiblockAbility.STEAM); } } diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java index d14296c5954..d3e75888a7a 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java @@ -143,21 +143,15 @@ protected void addDisplayText(List textList) { @Override protected boolean checkStructureComponents(List parts, Map, List> abilities) { //basically check minimal requirements for inputs count + //noinspection SuspiciousMethodCalls int itemInputsCount = abilities.getOrDefault(MultiblockAbility.IMPORT_ITEMS, Collections.emptyList()) .stream().map(it -> (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum(); - int itemOutputsCount = abilities.getOrDefault(MultiblockAbility.EXPORT_ITEMS, Collections.emptyList()) - .stream().map(it -> (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum(); - + //noinspection SuspiciousMethodCalls int fluidInputsCount = abilities.getOrDefault(MultiblockAbility.IMPORT_FLUIDS, Collections.emptyList()).size(); - int fluidOutputsCount = abilities.getOrDefault(MultiblockAbility.EXPORT_FLUIDS, Collections.emptyList()).size(); - - return abilities.containsKey(MultiblockAbility.INPUT_ENERGY) && - (recipeMap.getMaxFluidInputs() > 0 && recipeMap.getMaxInputs() > 0 - || ((recipeMap.getMaxFluidInputs() != 0 || itemInputsCount > 0) && - (recipeMap.getMaxInputs() != 0 || fluidInputsCount > 0))) && - (recipeMap.getMaxFluidOutputs() > 0 && recipeMap.getMaxOutputs() > 0 - || ((recipeMap.getMaxFluidOutputs() != 0 || itemOutputsCount > 0) && - (recipeMap.getMaxOutputs() != 0 || fluidOutputsCount > 0))); + //noinspection SuspiciousMethodCalls + return itemInputsCount >= recipeMap.getMinInputs() && + fluidInputsCount >= recipeMap.getMinFluidInputs() && + abilities.containsKey(MultiblockAbility.INPUT_ENERGY); } @Override diff --git a/src/main/java/gregtech/api/recipes/RecipeMap.java b/src/main/java/gregtech/api/recipes/RecipeMap.java index 7d18587ee9b..8072d0b14e2 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMap.java +++ b/src/main/java/gregtech/api/recipes/RecipeMap.java @@ -53,8 +53,10 @@ public class RecipeMap> { public final String unlocalizedName; private final R recipeBuilderSample; - private final int maxInputs, maxOutputs; - private final int maxFluidInputs, maxFluidOutputs; + private final int minInputs, maxInputs; + private final int minOutputs, maxOutputs; + private final int minFluidInputs, maxFluidInputs; + private final int minFluidOutputs, maxFluidOutputs; protected final TByteObjectMap slotOverlays; protected TextureArea specialTexture; protected int[] specialTexturePosition; @@ -65,16 +67,24 @@ public class RecipeMap> { private final Map> recipeFluidMap = new HashMap<>(); private final List recipeList = new ArrayList<>(); - public RecipeMap(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, R defaultRecipe, boolean isHidden) { + public RecipeMap(String unlocalizedName, + int minInputs, int maxInputs, int minOutputs, int maxOutputs, + int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, + R defaultRecipe, boolean isHidden) { this.unlocalizedName = unlocalizedName; this.slotOverlays = new TByteObjectHashMap<>(); this.progressBarTexture = GuiTextures.PROGRESS_BAR_ARROW; this.moveType = MoveType.HORIZONTAL; - this.maxInputs = inputs; - this.maxFluidInputs = fluidInputs; - this.maxOutputs = outputs; - this.maxFluidOutputs = fluidOutputs; + this.minInputs = minInputs; + this.minFluidInputs = minFluidInputs; + this.minOutputs = minOutputs; + this.minFluidOutputs = minFluidOutputs; + + this.maxInputs = maxInputs; + this.maxFluidInputs = maxFluidInputs; + this.maxOutputs = maxOutputs; + this.maxFluidOutputs = maxFluidOutputs; this.isHidden = isHidden; defaultRecipe.setRecipeMap(this); @@ -182,36 +192,23 @@ public boolean removeRecipe(Recipe recipe) { protected ValidationResult postValidateRecipe(ValidationResult validationResult) { EnumValidationResult recipeStatus = validationResult.getType(); Recipe recipe = validationResult.getResult(); - int totalInputs = recipe.getInputs().size() + recipe.getFluidInputs().size(); - int totalOutputs = recipe.getOutputs().size() + recipe.getFluidOutputs().size() + recipe.getChancedOutputs().size(); - - if (totalInputs < 0) { - GTLog.logger.error("Invalid amount of recipe inputs. Actual: {}. Must have at least 1 input (Fluid or Item).", totalInputs); - GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); - recipeStatus = EnumValidationResult.INVALID; - } - if (totalOutputs < 0) { - GTLog.logger.error("Invalid amount of recipe outputs. Actual: {}. Must have at least 1 output (Fluid or Item).", totalOutputs); - GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); - recipeStatus = EnumValidationResult.INVALID; - } - if (!GTUtility.isBetweenInclusive(0, getMaxInputs(), recipe.getInputs().size())) { - GTLog.logger.error("Invalid amount of recipe inputs. Actual: {}. Should be less than {} inclusive.", recipe.getInputs().size(), getMaxInputs()); + if (!GTUtility.isBetweenInclusive(getMinInputs(), getMaxInputs(), recipe.getInputs().size())) { + GTLog.logger.error("Invalid amount of recipe inputs. Actual: {}. Should be between {} and {} inclusive.", recipe.getInputs().size(), getMinInputs(), getMaxInputs()); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); recipeStatus = EnumValidationResult.INVALID; } - if (!GTUtility.isBetweenInclusive(0, getMaxOutputs(), recipe.getOutputs().size() + recipe.getChancedOutputs().size())) { - GTLog.logger.error("Invalid amount of recipe outputs. Actual: {}. Should be less than {} inclusive.", recipe.getOutputs().size() + recipe.getChancedOutputs().size(), getMaxOutputs()); + if (!GTUtility.isBetweenInclusive(getMinOutputs(), getMaxOutputs(), recipe.getOutputs().size() + recipe.getChancedOutputs().size())) { + GTLog.logger.error("Invalid amount of recipe outputs. Actual: {}. Should be between {} and {} inclusive.", recipe.getOutputs().size() + recipe.getChancedOutputs().size(), getMinOutputs(), getMaxOutputs()); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); recipeStatus = EnumValidationResult.INVALID; } - if (!GTUtility.isBetweenInclusive(0, getMaxFluidInputs(), recipe.getFluidInputs().size())) { - GTLog.logger.error("Invalid amount of recipe fluid inputs. Actual: {}. Should be less than {} inclusive.", recipe.getFluidInputs().size(), getMaxFluidInputs()); + if (!GTUtility.isBetweenInclusive(getMinFluidInputs(), getMaxFluidInputs(), recipe.getFluidInputs().size())) { + GTLog.logger.error("Invalid amount of recipe fluid inputs. Actual: {}. Should be between {} and {} inclusive.", recipe.getFluidInputs().size(), getMinFluidInputs(), getMaxFluidInputs()); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); recipeStatus = EnumValidationResult.INVALID; } - if (!GTUtility.isBetweenInclusive(0, getMaxFluidOutputs(), recipe.getFluidOutputs().size())) { - GTLog.logger.error("Invalid amount of recipe fluid outputs. Actual: {}. Should be less than {} inclusive.", recipe.getFluidOutputs().size(), getMaxFluidOutputs()); + if (!GTUtility.isBetweenInclusive(getMinFluidOutputs(), getMaxFluidOutputs(), recipe.getFluidOutputs().size())) { + GTLog.logger.error("Invalid amount of recipe fluid outputs. Actual: {}. Should be between {} and {} inclusive.", recipe.getFluidOutputs().size(), getMinFluidOutputs(), getMaxFluidOutputs()); GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); recipeStatus = EnumValidationResult.INVALID; } @@ -237,10 +234,10 @@ public Recipe findRecipe(long voltage, IItemHandlerModifiable inputs, IMultipleT public Recipe findRecipe(long voltage, List inputs, List fluidInputs, int outputFluidTankCapacity, MatchingMode matchingMode) { if (recipeList.isEmpty()) return null; - if (GTUtility.amountOfNonNullElements(fluidInputs) < 1) { + if (minFluidInputs > 0 && GTUtility.amountOfNonNullElements(fluidInputs) < minFluidInputs) { return null; } - if (GTUtility.amountOfNonEmptyStacks(inputs) < 1) { + if (minInputs > 0 && GTUtility.amountOfNonEmptyStacks(inputs) < minInputs) { return null; } if (maxInputs > 0) { @@ -448,21 +445,41 @@ public CTRecipeBuilder ctRecipeBuilder() { return new CTRecipeBuilder(recipeBuilder()); } + @ZenGetter("minInputs") + public int getMinInputs() { + return minInputs; + } + @ZenGetter("maxInputs") public int getMaxInputs() { return maxInputs; } + @ZenGetter("minOutputs") + public int getMinOutputs() { + return minOutputs; + } + @ZenGetter("maxOutputs") public int getMaxOutputs() { return maxOutputs; } + @ZenGetter("minFluidInputs") + public int getMinFluidInputs() { + return minFluidInputs; + } + @ZenGetter("maxFluidInputs") public int getMaxFluidInputs() { return maxFluidInputs; } + @ZenGetter("minFluidOutputs") + public int getMinFluidOutputs() { + return minFluidOutputs; + } + @ZenGetter("maxFluidOutputs") public int getMaxFluidOutputs() { return maxFluidOutputs; diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 03c1c696d69..755153889d1 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -20,57 +20,57 @@ public class RecipeMaps { @ZenProperty - public static final RecipeMap COMPRESSOR_RECIPES = new RecipeMap<>("compressor", 1, 1, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(2), false) + public static final RecipeMap COMPRESSOR_RECIPES = new RecipeMap<>("compressor", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(2), false) .setSlotOverlay(false, false, GuiTextures.COMPRESSOR_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap EXTRACTOR_RECIPES = new RecipeMap<>("extractor", 1, 1, 0, 1, new SimpleRecipeBuilder().duration(400).EUt(2), false) + public static final RecipeMap EXTRACTOR_RECIPES = new RecipeMap<>("extractor", 0, 1, 0, 1, 0, 0, 0, 1, new SimpleRecipeBuilder().duration(400).EUt(2), false) .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap MACERATOR_RECIPES = new RecipeMap<>("macerator", 1, 3, 0, 0, new SimpleRecipeBuilder().duration(150).EUt(8), false) + public static final RecipeMap MACERATOR_RECIPES = new RecipeMap<>("macerator", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(150).EUt(8), false) .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap ORE_WASHER_RECIPES = new RecipeMap<>("ore_washer", 1, 3, 1, 0, new SimpleRecipeBuilder().duration(400).EUt(16), false) + public static final RecipeMap ORE_WASHER_RECIPES = new RecipeMap<>("ore_washer", 1, 1, 1, 3, 0, 1, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(16), false) .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_BATH, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap THERMAL_CENTRIFUGE_RECIPES = new RecipeMap<>("thermal_centrifuge", 1, 3, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(60), false) + public static final RecipeMap THERMAL_CENTRIFUGE_RECIPES = new RecipeMap<>("thermal_centrifuge", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(60), false) .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap FURNACE_RECIPES = new RecipeMapFurnace("electric_furnace", 1, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap FURNACE_RECIPES = new RecipeMapFurnace("electric_furnace", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap ASSEMBLER_RECIPES = new RecipeMap<>("assembler", 9, 1, 1, 0, new AssemblerRecipeBuilder(), false) + public static final RecipeMap ASSEMBLER_RECIPES = new RecipeMap<>("assembler", 1, 9, 1, 1, 0, 1, 0, 0, new AssemblerRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap FORMING_PRESS_RECIPES = new RecipeMapFormingPress("forming_press", 6, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap FORMING_PRESS_RECIPES = new RecipeMapFormingPress("forming_press", 2, 6, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_COMPRESS, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap ARC_FURNACE_RECIPES = new RecipeMap<>("arc_furnace", 1, 4, 1, 1, new ArcFurnaceRecipeBuilder(), false) + public static final RecipeMap ARC_FURNACE_RECIPES = new RecipeMap<>("arc_furnace", 1, 1, 1, 4, 1, 1, 0, 1, new ArcFurnaceRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, MoveType.HORIZONTAL); /** @@ -90,7 +90,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap SIFTER_RECIPES = new RecipeMap<>("sifter", 1, 6, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap SIFTER_RECIPES = new RecipeMap<>("sifter", 1, 1, 0, 6, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, MoveType.VERTICAL_INVERTED); /** @@ -98,7 +98,7 @@ public class RecipeMaps { * 
      * 		RecipeMap.LASER_ENGRAVER_RECIPES.recipeBuilder()
      * 				.inputs(ItemList.IC2_LapotronCrystal.getWildcard(1))
-     * 				.notConsumable(Items.APPL
+     * 				.notConsumable(Items.APPLE)
      * 				.outputs(ItemList.Circuit_Parts_Crystal_Chip_Master.get(3))
      * 				.duration(256)
      * 				.EUt(480)
@@ -106,7 +106,7 @@ public class RecipeMaps {
      *
*/ @ZenProperty - public static final RecipeMap LASER_ENGRAVER_RECIPES = new RecipeMap<>("laser_engraver", 2, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap LASER_ENGRAVER_RECIPES = new RecipeMap<>("laser_engraver", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, true, GuiTextures.LENS_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @@ -124,7 +124,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap MIXER_RECIPES = new RecipeMap<>("mixer", 6, 1, 2, 1, new SimpleRecipeBuilder(), false) + public static final RecipeMap MIXER_RECIPES = new RecipeMap<>("mixer", 0, 6, 0, 1, 0, 2, 0, 1, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); @@ -143,7 +143,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap AUTOCLAVE_RECIPES = new RecipeMap<>("autoclave", 1, 1, 1, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap AUTOCLAVE_RECIPES = new RecipeMap<>("autoclave", 1, 1, 1, 1, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) .setSlotOverlay(true, false, GuiTextures.CRYSTAL_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_CRYSTALLIZATION, MoveType.HORIZONTAL); @@ -162,7 +162,7 @@ public class RecipeMaps { * */ @ZenProperty - public static final RecipeMap ELECTROMAGNETIC_SEPARATOR_RECIPES = new RecipeMap<>("electromagnetic_separator", 1, 3, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap ELECTROMAGNETIC_SEPARATOR_RECIPES = new RecipeMap<>("electromagnetic_separator", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); @@ -180,7 +180,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap POLARIZER_RECIPES = new RecipeMap<>("polarizer", 1, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap POLARIZER_RECIPES = new RecipeMap<>("polarizer", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, MoveType.HORIZONTAL); /** @@ -197,7 +197,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CHEMICAL_BATH_RECIPES = new RecipeMap<>("chemical_bath", 1, 3, 1, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap CHEMICAL_BATH_RECIPES = new RecipeMap<>("chemical_bath", 1, 1, 1, 3, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, MoveType.HORIZONTAL); /** @@ -212,7 +212,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap BREWING_RECIPES = new RecipeMap<>("brewery", 1, 0, 1, 1, new SimpleRecipeBuilder().duration(128).EUt(4), false) + public static final RecipeMap BREWING_RECIPES = new RecipeMap<>("brewery", 1, 1, 0, 0, 1, 1, 1, 1, new SimpleRecipeBuilder().duration(128).EUt(4), false) .setSlotOverlay(false, false, GuiTextures.BREWER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, MoveType.HORIZONTAL); @@ -230,7 +230,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap FLUID_HEATER_RECIPES = new RecipeMap<>("fluid_heater", 1, 0, 1, 1, new IntCircuitRecipeBuilder(), false) + public static final RecipeMap FLUID_HEATER_RECIPES = new RecipeMap<>("fluid_heater", 1, 1, 0, 0, 1, 1, 1, 1, new IntCircuitRecipeBuilder(), false) .setSlotOverlay(false, true, GuiTextures.HEATING_OVERLAY_1) .setSlotOverlay(true, true, GuiTextures.HEATING_OVERLAY_2) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @@ -249,7 +249,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap DISTILLERY_RECIPES = new RecipeMap<>("distillery", 1, 1, 1, 1, new IntCircuitRecipeBuilder(), false) + public static final RecipeMap DISTILLERY_RECIPES = new RecipeMap<>("distillery", 1, 1, 0, 1, 1, 1, 1, 1, new IntCircuitRecipeBuilder(), false) .setSlotOverlay(false, true, GuiTextures.BEAKER_OVERLAY_1) .setSlotOverlay(true, true, GuiTextures.BEAKER_OVERLAY_4) .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY) @@ -267,7 +267,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap FERMENTING_RECIPES = new RecipeMap<>("fermenter", 0, 0, 1, 1, new SimpleRecipeBuilder().EUt(2), false) + public static final RecipeMap FERMENTING_RECIPES = new RecipeMap<>("fermenter", 0, 0, 0, 0, 1, 1, 1, 1, new SimpleRecipeBuilder().EUt(2), false) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); /** @@ -284,7 +284,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap FLUID_SOLIDFICATION_RECIPES = new RecipeMap<>("fluid_solidifier", 1, 1, 1, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap FLUID_SOLIDFICATION_RECIPES = new RecipeMap<>("fluid_solidifier", 1, 1, 1, 1, 1, 1, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @@ -302,7 +302,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap FUSION_RECIPES = new RecipeMap<>("fusion_reactor", 0, 0, 2, 1, new FusionRecipeBuilder(), false) + public static final RecipeMap FUSION_RECIPES = new RecipeMap<>("fusion_reactor", 0, 0, 0, 0, 2, 2, 1, 1, new FusionRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_FUSION, MoveType.HORIZONTAL); /** @@ -324,7 +324,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CENTRIFUGE_RECIPES = new RecipeMap<>("centrifuge", 2, 6, 1, 6, new SimpleRecipeBuilder().EUt(5), false) + public static final RecipeMap CENTRIFUGE_RECIPES = new RecipeMap<>("centrifuge", 0, 2, 0, 6, 0, 1, 0, 6, new SimpleRecipeBuilder().EUt(5), false) .setSlotOverlay(false, false, false, GuiTextures.EXTRACTOR_OVERLAY) .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) .setSlotOverlay(false, true, true, GuiTextures.CENTRIFUGE_OVERLAY) @@ -354,7 +354,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap ELECTROLYZER_RECIPES = new RecipeMap<>("electrolyzer", 2, 6, 1, 6, new SimpleRecipeBuilder(), false) + public static final RecipeMap ELECTROLYZER_RECIPES = new RecipeMap<>("electrolyzer", 0, 2, 0, 6, 0, 1, 0, 6, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, false, GuiTextures.LIGHTNING_OVERLAY_1) .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) .setSlotOverlay(false, true, true, GuiTextures.LIGHTNING_OVERLAY_2) @@ -375,7 +375,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap BLAST_RECIPES = new RecipeMap<>("electric_blast_furnace", 3, 2, 1, 1, new BlastRecipeBuilder(), false); + public static final RecipeMap BLAST_RECIPES = new RecipeMap<>("electric_blast_furnace", 1, 3, 1, 2, 0, 1, 0, 1, new BlastRecipeBuilder(), false); /** * Example: @@ -389,7 +389,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap IMPLOSION_RECIPES = new RecipeMap<>("implosion_compressor", 3, 2, 0, 0, new ImplosionRecipeBuilder().duration(20).EUt(30), false) + public static final RecipeMap IMPLOSION_RECIPES = new RecipeMap<>("implosion_compressor", 2, 3, 1, 2, 0, 0, 0, 0, new ImplosionRecipeBuilder().duration(20).EUt(30), false) .setSlotOverlay(false, false, true, GuiTextures.IMPLOSION_OVERLAY_1) .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY); @@ -406,7 +406,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap VACUUM_RECIPES = new RecipeMap<>("vacuum_freezer", 1, 1, 1, 1, new SimpleRecipeBuilder().EUt(120), false); + public static final RecipeMap VACUUM_RECIPES = new RecipeMap<>("vacuum_freezer", 0, 1, 0, 1, 0, 1, 0, 1, new SimpleRecipeBuilder().EUt(120), false); /** * Example: @@ -423,7 +423,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CHEMICAL_RECIPES = new RecipeMap<>("chemical_reactor", 2, 2, 3, 2, new ChemicalReactorRecipeBuilder().EUt(30), false) + public static final RecipeMap CHEMICAL_RECIPES = new RecipeMap<>("chemical_reactor", 0, 2, 0, 2, 0, 3, 0, 2, new ChemicalReactorRecipeBuilder().EUt(30), false) .setSlotOverlay(false, false, false, GuiTextures.MOLECULAR_OVERLAY_1) .setSlotOverlay(false, false, true, GuiTextures.MOLECULAR_OVERLAY_2) .setSlotOverlay(false, true, false, GuiTextures.MOLECULAR_OVERLAY_3) @@ -446,7 +446,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap LARGE_CHEMICAL_RECIPES = new RecipeMap<>("large_chemical_reactor", 3, 3, 5, 4, new SimpleRecipeBuilder().EUt(30), false) + public static final RecipeMap LARGE_CHEMICAL_RECIPES = new RecipeMap<>("large_chemical_reactor", 0, 3, 0, 3, 0, 5, 0, 4, new SimpleRecipeBuilder().EUt(30), false) .setSlotOverlay(false, false, false, GuiTextures.MOLECULAR_OVERLAY_1) .setSlotOverlay(false, false, true, GuiTextures.MOLECULAR_OVERLAY_2) .setSlotOverlay(false, true, false, GuiTextures.MOLECULAR_OVERLAY_3) @@ -470,7 +470,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap DISTILLATION_RECIPES = new RecipeMapDistillationTower("distillation_tower", 0, 1, 1, 12, new UniversalDistillationRecipeBuilder(), false); + public static final RecipeMap DISTILLATION_RECIPES = new RecipeMapDistillationTower("distillation_tower", 0, 0, 0, 1, 1, 1, 1, 12, new UniversalDistillationRecipeBuilder(), false); /** * Example: @@ -485,7 +485,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CRACKING_RECIPES = new RecipeMap<>("cracker", 0, 0, 2, 2, new SimpleRecipeBuilder(), false) + public static final RecipeMap CRACKING_RECIPES = new RecipeMap<>("cracker", 0, 0, 0, 0, 2, 2, 1, 2, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, true, GuiTextures.CRACKING_OVERLAY_1) .setSlotOverlay(true, true, GuiTextures.CRACKING_OVERLAY_2) .setProgressBar(GuiTextures.PROGRESS_BAR_CRACKING, MoveType.HORIZONTAL); @@ -506,7 +506,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap PYROLYSE_RECIPES = new RecipeMap<>("pyrolyse_oven", 2, 1, 1, 1, new IntCircuitRecipeBuilder(), false); + public static final RecipeMap PYROLYSE_RECIPES = new RecipeMap<>("pyrolyse_oven", 2, 2, 0, 1, 0, 1, 1, 1, new IntCircuitRecipeBuilder(), false); /** * Example: @@ -521,7 +521,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap WIREMILL_RECIPES = new RecipeMap<>("wiremill", 1, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap WIREMILL_RECIPES = new RecipeMap<>("wiremill", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.WIREMILL_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_WIREMILL, MoveType.HORIZONTAL); @@ -538,13 +538,13 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap BENDER_RECIPES = new RecipeMap<>("bender", 2, 1, 0, 0, new IntCircuitRecipeBuilder(), false) + public static final RecipeMap BENDER_RECIPES = new RecipeMap<>("bender", 2, 2, 1, 1, 0, 0, 0, 0, new IntCircuitRecipeBuilder(), false) .setSlotOverlay(false, false, false, GuiTextures.BENDER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap ALLOY_SMELTER_RECIPES = new RecipeMap<>("alloy_smelter", 2, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap ALLOY_SMELTER_RECIPES = new RecipeMap<>("alloy_smelter", 1, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.FURNACE_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @@ -561,7 +561,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CANNER_RECIPES = new RecipeMapFluidCanner("canner", 2, 2, 1, 1, new SimpleRecipeBuilder(), false) + public static final RecipeMap CANNER_RECIPES = new RecipeMapFluidCanner("canner", 1, 2, 1, 2, 0, 1, 0, 1, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, false, GuiTextures.CANNER_OVERLAY) .setSlotOverlay(false, false, true, GuiTextures.CANISTER_OVERLAY) .setSlotOverlay(true, false, GuiTextures.CANISTER_OVERLAY) @@ -582,7 +582,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap LATHE_RECIPES = new RecipeMap<>("lathe", 1, 2, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap LATHE_RECIPES = new RecipeMap<>("lathe", 1, 1, 1, 2, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.PIPE_OVERLAY_1) .setSlotOverlay(true, false, false, GuiTextures.PIPE_OVERLAY_2) .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) @@ -603,7 +603,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap CUTTER_RECIPES = new RecipeMap<>("cutter", 1, 2, 1, 0, new CutterRecipeBuilder(), false) + public static final RecipeMap CUTTER_RECIPES = new RecipeMap<>("cutter", 1, 1, 1, 2, 0, 1, 0, 0, new CutterRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY) .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY) .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) @@ -623,7 +623,7 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap EXTRUDER_RECIPES = new RecipeMap<>("extruder", 2, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap EXTRUDER_RECIPES = new RecipeMap<>("extruder", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, true, GuiTextures.MOLD_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRUDER, MoveType.HORIZONTAL); @@ -640,36 +640,37 @@ public class RecipeMaps { */ @ZenProperty - public static final RecipeMap FORGE_HAMMER_RECIPES = new RecipeMap<>("forge_hammer", 1, 1, 0, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap FORGE_HAMMER_RECIPES = new RecipeMap<>("forge_hammer", 1, 1, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.HAMMER_OVERLAY) .setSpecialTexture(78, 42, 20, 6, GuiTextures.PROGRESS_BAR_HAMMER_BASE) .setProgressBar(GuiTextures.PROGRESS_BAR_HAMMER, MoveType.VERTICAL); @ZenProperty - public static final RecipeMap PACKER_RECIPES = new RecipeMap<>("packer", 2, 1, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) + public static final RecipeMap PACKER_RECIPES = new RecipeMap<>("packer", 2, 2, 1, 1, 0, 0, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) .setSlotOverlay(false, false, true, GuiTextures.BOX_OVERLAY) .setSlotOverlay(true, false, GuiTextures.BOXED_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_PACKER, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap UNPACKER_RECIPES = new RecipeMap<>("unpacker", 2, 2, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) + public static final RecipeMap UNPACKER_RECIPES = new RecipeMap<>("unpacker", 2, 2, 1, 2, 0, 0, 0, 0, new SimpleRecipeBuilder().EUt(12).duration(10), false) .setSlotOverlay(false, false, GuiTextures.BOXED_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_UNPACKER, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMapAssemblyLine ASSEMBLY_LINE_RECIPES = new RecipeMapAssemblyLine<>("assembly_line", 16, 1, 4, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMapAssemblyLine ASSEMBLY_LINE_RECIPES = new RecipeMapAssemblyLine<>("assembly_line", 4, 16, 1, 1, 0, 4, 0, 0, new SimpleRecipeBuilder(), false) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); // ASSEMBLY_LINE_RECIPES.setSlotOverlay(false, false, GuiTextures.MOLD_OVERLAY); TODO Fix this (???) @ZenProperty - public static final RecipeMap CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>("circuit_assembler", 6, 1, 1, 0, new CircuitAssemblerRecipeBuilder(), false) + public static final RecipeMap CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>("circuit_assembler", + 1, 6, 1, 1, 0, 1, 0, 0, new CircuitAssemblerRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER, ProgressWidget.MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap MASS_FABRICATOR_RECIPES = new RecipeMap<>("mass_fabricator", 1, 0, 1, 2, new SimpleRecipeBuilder(), false) + public static final RecipeMap MASS_FABRICATOR_RECIPES = new RecipeMap<>("mass_fabricator", 0, 1, 0, 0, 0, 1, 1, 2, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.ATOMIC_OVERLAY_1) .setSlotOverlay(false, true, GuiTextures.ATOMIC_OVERLAY_2) .setSlotOverlay(true, true, GuiTextures.POSITIVE_MATTER_OVERLAY) @@ -677,7 +678,7 @@ public class RecipeMaps { .setProgressBar(GuiTextures.PROGRESS_BAR_MASS_FAB, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap REPLICATOR_RECIPES = new RecipeMap<>("replicator", 1, 1, 2, 1, new SimpleRecipeBuilder(), false) + public static final RecipeMap REPLICATOR_RECIPES = new RecipeMap<>("replicator", 1, 1, 0, 1, 1, 2, 0, 1, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.DATA_ORB_OVERLAY) .setSlotOverlay(true, false, GuiTextures.ATOMIC_OVERLAY_1) .setSlotOverlay(true, true, GuiTextures.ATOMIC_OVERLAY_2) @@ -686,13 +687,13 @@ public class RecipeMaps { .setProgressBar(GuiTextures.PROGRESS_BAR_REPLICATOR, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap SCANNER_RECIPES = new RecipeMap<>("scanner", 2, 1, 1, 0, new SimpleRecipeBuilder(), false) + public static final RecipeMap SCANNER_RECIPES = new RecipeMap<>("scanner", 0, 2, 1, 1, 0, 1, 0, 0, new SimpleRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.DATA_ORB_OVERLAY) .setSlotOverlay(false, false, true, GuiTextures.SCANNER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL); @ZenProperty - public static final RecipeMap GAS_COLLECTOR_RECIPES = new RecipeMap<>("gas_collector", 1, 0, 0, 1, new GasCollectorRecipeBuilder(), false) + public static final RecipeMap GAS_COLLECTOR_RECIPES = new RecipeMap<>("gas_collector", 1, 1, 0, 0, 0, 0, 1, 1, new GasCollectorRecipeBuilder(), false) .setSlotOverlay(false, false, GuiTextures.INT_CIRCUIT_OVERLAY) .setSlotOverlay(true, true, GuiTextures.CENTRIFUGE_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, MoveType.HORIZONTAL); diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java index b4da7fb155c..a260ba10b4a 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java @@ -17,8 +17,8 @@ public class RecipeMapAssemblyLine> extends RecipeMap private TextureArea progressBarTexture; private ProgressWidget.MoveType moveType; - public RecipeMapAssemblyLine(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, R defaultRecipe, boolean isHidden) { - super(unlocalizedName, inputs, outputs, fluidInputs, fluidOutputs, defaultRecipe, isHidden); + public RecipeMapAssemblyLine(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, R defaultRecipe, boolean isHidden) { + super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe, isHidden); } @Override diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapDistillationTower.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapDistillationTower.java index 24fd3b405aa..d5a966291ad 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapDistillationTower.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapDistillationTower.java @@ -15,8 +15,8 @@ public class RecipeMapDistillationTower extends RecipeMap { - public RecipeMapDistillationTower(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, UniversalDistillationRecipeBuilder defaultRecipe, boolean isHidden) { - super(unlocalizedName, inputs, outputs, fluidInputs, fluidOutputs, defaultRecipe, isHidden); + public RecipeMapDistillationTower(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, UniversalDistillationRecipeBuilder defaultRecipe, boolean isHidden) { + super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe, isHidden); } @Override diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapFluidCanner.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapFluidCanner.java index ff275024105..9fc1ecdc6e8 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapFluidCanner.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapFluidCanner.java @@ -17,8 +17,8 @@ public class RecipeMapFluidCanner extends RecipeMap { - public RecipeMapFluidCanner(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { - super(unlocalizedName, inputs, outputs, fluidInputs, fluidOutputs, defaultRecipe, isHidden); + public RecipeMapFluidCanner(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { + super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe, isHidden); } @Override diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java index 562f504ee43..8e114e192a5 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapFormingPress.java @@ -21,8 +21,8 @@ public class RecipeMapFormingPress extends RecipeMap { - public RecipeMapFormingPress(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { - super(unlocalizedName, inputs, outputs, fluidInputs, fluidOutputs, defaultRecipe, isHidden); + public RecipeMapFormingPress(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { + super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe, isHidden); } @Override diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java index e5d4a8ae92e..63f64c6e0a1 100644 --- a/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java +++ b/src/main/java/gregtech/api/recipes/machines/RecipeMapFurnace.java @@ -14,8 +14,8 @@ public class RecipeMapFurnace extends RecipeMap { - public RecipeMapFurnace(String unlocalizedName, int inputs, int outputs, int fluidInputs, int fluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { - super(unlocalizedName, inputs, outputs, fluidInputs, fluidOutputs, defaultRecipe, isHidden); + public RecipeMapFurnace(String unlocalizedName, int minInputs, int maxInputs, int minOutputs, int maxOutputs, int minFluidInputs, int maxFluidInputs, int minFluidOutputs, int maxFluidOutputs, SimpleRecipeBuilder defaultRecipe, boolean isHidden) { + super(unlocalizedName, minInputs, maxInputs, minOutputs, maxOutputs, minFluidInputs, maxFluidInputs, minFluidOutputs, maxFluidOutputs, defaultRecipe, isHidden); } @Override