Skip to content
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

Rename IRecipeLogicMachine.dampingWhenWaiting to regressWhenWaiting. #2737

Open
wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Rename IRecipeLogicMachine.dampingWhenWaiting to regressWhenWaiting. #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @Not
}

@Override
public boolean dampingWhenWaiting() {
public boolean regressWhenWaiting() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ default void afterWorking() {
/**
* Whether progress decrease when machine is waiting for pertick ingredients. (e.g. lack of EU)
*/
default boolean dampingWhenWaiting() {
default boolean regressWhenWaiting() {
return self().getDefinition().isRegressWhenWaiting();
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public void handleRecipeWorking() {
setWaiting(result.reason().get());
}
if (isWaiting()) {
doDamping();
doRegressing();
}
if (last == Status.WORKING && getStatus() != Status.WORKING) {
lastRecipe.postWorking(machine);
Expand All @@ -279,8 +279,8 @@ public void handleRecipeWorking() {
}
}

protected void doDamping() {
if (progress > 0 && machine.dampingWhenWaiting()) {
protected void doRegressing() {
if (progress > 0 && machine.regressWhenWaiting()) {
if (ConfigHolder.INSTANCE.machines.recipeProgressLowEnergy) {
this.progress = 1;
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ public MultiblockMachineBuilder afterWorking(Consumer<IRecipeLogicMachine> after
}

@Override
public MultiblockMachineBuilder regressWhenWaiting(boolean dampingWhenWaiting) {
return (MultiblockMachineBuilder) super.regressWhenWaiting(dampingWhenWaiting);
public MultiblockMachineBuilder regressWhenWaiting(boolean regressWhenWaiting) {
return (MultiblockMachineBuilder) super.regressWhenWaiting(regressWhenWaiting);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/machine/electric/AirScrubberMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public AirScrubberMachine(IMachineBlockEntity holder, int tier, Object... args)
}

@Override
public boolean dampingWhenWaiting() {
public boolean regressWhenWaiting() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void onStructureInvalid() {
}

@Override
public boolean dampingWhenWaiting() {
public boolean regressWhenWaiting() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...m/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public boolean onWorking() {
}

@Override
public boolean dampingWhenWaiting() {
public boolean regressWhenWaiting() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeTurbineMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @Not
}

@Override
public boolean dampingWhenWaiting() {
public boolean regressWhenWaiting() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/machine/trait/CleanroomLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void serverTick() {
if (maintenanceMachine == null || maintenanceMachine.getNumMaintenanceProblems() < 6 || zone != null) {
// drain the energy
if (!consumeEnergy()) {
if (progress > 0 && machine.dampingWhenWaiting()) {
if (progress > 0 && machine.regressWhenWaiting()) {
if (ConfigHolder.INSTANCE.machines.recipeProgressLowEnergy) {
this.progress = 1;
} else {
Expand Down
Loading