Skip to content

Fix machine type limits not being applied #5083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jurrejelle merged 4 commits into from
Jul 12, 2026
Merged

Fix machine type limits not being applied #5083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4e27ca
Fix machine type limits not being applied
htmlcsjs Jul 11, 2026
2a18164
Review stuff:
htmlcsjs Jul 11, 2026
4f7fcc4
input size determining if recipe types differ
YoungOnionMC Jul 12, 2026
df5c3a0
primitive :)
YoungOnionMC Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/machine/WorkableTieredMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,11 @@ public WorkableTieredMachine(BlockEntityCreationInfo info, int tier, boolean ene
new NotifiableItemStackHandler(getRecipeType().getMaxInputs(ItemRecipeCapability.CAP),
Comment thread
jurrejelle marked this conversation as resolved.
Outdated
IO.IN, IO.BOTH));
this.exportItems = attachTrait(
new NotifiableItemStackHandler(getRecipeType().getMaxOutputs(ItemRecipeCapability.CAP),
IO.OUT));
new NotifiableItemStackHandler(getMaxOutputSize(ItemRecipeCapability.CAP), IO.OUT));
this.importFluids = attachTrait(new NotifiableFluidTank(getRecipeType().getMaxInputs(FluidRecipeCapability.CAP),
Comment thread
htmlcsjs marked this conversation as resolved.
Outdated
tankScalingFunction.applyAsInt(getTier()), IO.IN));
this.exportFluids = attachTrait(
new NotifiableFluidTank(getRecipeType().getMaxOutputs(FluidRecipeCapability.CAP),
new NotifiableFluidTank(getMaxOutputSize(FluidRecipeCapability.CAP),
tankScalingFunction.applyAsInt(getTier()), IO.OUT));
this.importComputation = attachTrait(new NotifiableComputationContainer(IO.IN, true));
this.exportComputation = attachTrait(new NotifiableComputationContainer(IO.OUT, false));
Expand Down Expand Up @@ -178,6 +177,13 @@ public void setMuffled(boolean muffled) {
syncDataHolder.markClientSyncFieldDirty("isMuffled");
}

private int getMaxOutputSize(RecipeCapability<?> cap) {
int recipeTypeOutputSize = getRecipeType().getMaxOutputs(cap);
Comment thread
htmlcsjs marked this conversation as resolved.
Outdated
int machineTypeOutputLimit = this.getDefinition().getRecipeOutputLimits().getOrDefault(cap,
recipeTypeOutputSize);
return Math.min(recipeTypeOutputSize, machineTypeOutputLimit);
}

//////////////////////////////////////
// ******** OVERCLOCK *********//
//////////////////////////////////////
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ public SimpleSteamMachine(BlockEntityCreationInfo info, boolean isHighPressure)
super(info, isHighPressure);
this.importItems = attachTrait(
new NotifiableItemStackHandler(getRecipeType().getMaxInputs(ItemRecipeCapability.CAP), IO.IN, IO.BOTH));
int recipeTypeOutputSize = getRecipeType().getMaxOutputs(ItemRecipeCapability.CAP);
Comment thread
htmlcsjs marked this conversation as resolved.
Outdated
int machineTypeOutputLimit = this.getDefinition().getRecipeOutputLimits().getOrDefault(ItemRecipeCapability.CAP,
recipeTypeOutputSize);
this.exportItems = attachTrait(
new NotifiableItemStackHandler(getRecipeType().getMaxOutputs(ItemRecipeCapability.CAP), IO.OUT));
new NotifiableItemStackHandler(Math.min(recipeTypeOutputSize, machineTypeOutputLimit), IO.OUT));

this.exhaustVentTrait = attachTrait(new ExhaustVentMachineTrait());
exhaustVentTrait.setVentingDamageAmount(isHighPressure() ? 12F : 6F);
Expand Down
Loading