Skip to content

Commit

Permalink
Revert "remove RecipeMap minimums"
Browse files Browse the repository at this point in the history 
This reverts commit 201c564.
  • Loading branch information
@serenibyss
serenibyss committed Aug 13, 2021
1 parent 806dfd2 commit 807092a
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 102 deletions.
3 changes: 2 additions & 1 deletion src/main/java/gregtech/api/capability/impl/RecipeMapSteamMultiblockController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ protected boolean checkStructureComponents(List<IMultiblockPart> parts, Map<Mult
//basically check minimal requirements for inputs count
int itemInputsCount = abilities.getOrDefault(MultiblockAbility.STEAM_IMPORT_ITEMS, Collections.emptyList())
.stream().map(it -> (IItemHandler) it).mapToInt(IItemHandler::getSlots).sum();
return itemInputsCount > 0 && abilities.containsKey(MultiblockAbility.STEAM);
return itemInputsCount >= recipeMap.getMinInputs() &&
abilities.containsKey(MultiblockAbility.STEAM);
}
}
18 changes: 6 additions & 12 deletions src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,15 @@ protected void addDisplayText(List<ITextComponent> textList) {
@Override
protected boolean checkStructureComponents(List<IMultiblockPart> parts, Map<MultiblockAbility<Object>, List<Object>> 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
Expand Down
77 changes: 47 additions & 30 deletions src/main/java/gregtech/api/recipes/RecipeMap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ public class RecipeMap<R extends RecipeBuilder<R>> {
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<TextureArea> slotOverlays;
protected TextureArea specialTexture;
protected int[] specialTexturePosition;
Expand All @@ -65,16 +67,24 @@ public class RecipeMap<R extends RecipeBuilder<R>> {
private final Map<FluidKey, Collection<Recipe>> recipeFluidMap = new HashMap<>();
private final List<Recipe> 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);
Expand Down Expand Up @@ -182,36 +192,23 @@ public boolean removeRecipe(Recipe recipe) {
protected ValidationResult<Recipe> postValidateRecipe(ValidationResult<Recipe> 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;
}
Expand All @@ -237,10 +234,10 @@ public Recipe findRecipe(long voltage, IItemHandlerModifiable inputs, IMultipleT
public Recipe findRecipe(long voltage, List<ItemStack> inputs, List<FluidStack> 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) {
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 807092a

Please sign in to comment.