From 60e7a5bf59a46f3b4450e96d3101add054b0f660 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sun, 12 Jan 2025 13:45:42 -0700 Subject: [PATCH] s/dampingWhenWaiting/regressWhenWaiting/ --- .../com/gregtechceu/gtceu/api/machine/MachineDefinition.java | 2 +- .../gtceu/api/machine/feature/IRecipeLogicMachine.java | 2 +- .../gtceu/api/registry/registrate/MachineBuilder.java | 4 ++-- .../api/registry/registrate/MultiblockMachineBuilder.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java b/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java index 43995360cf..243c3eecfe 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java @@ -91,7 +91,7 @@ public class MachineDefinition implements Supplier { private Consumer afterWorking = (machine) -> {}; @Getter @Setter - private boolean dampingWhenWaiting = true; + private boolean regressWhenWaiting = true; @Getter @Setter diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java index 2ffdab0f2e..e3b85abe06 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java @@ -108,7 +108,7 @@ default void afterWorking() { * Whether progress decrease when machine is waiting for pertick ingredients. (e.g. lack of EU) */ default boolean dampingWhenWaiting() { - return self().getDefinition().isDampingWhenWaiting(); + return self().getDefinition().isRegressWhenWaiting(); } /** diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java index fcc200995f..648eaa67b6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java @@ -148,7 +148,7 @@ public class MachineBuilder extends Builde private Consumer afterWorking = (machine) -> {}; @Getter @Setter - private boolean dampingWhenWaiting = true; + private boolean regressWhenWaiting = true; @Setter private Supplier appearance; @@ -368,7 +368,7 @@ public DEFINITION register() { definition.setOnWorking(this.onWorking); definition.setOnWaiting(this.onWaiting); definition.setAfterWorking(this.afterWorking); - definition.setDampingWhenWaiting(this.dampingWhenWaiting); + definition.setRegressWhenWaiting(this.regressWhenWaiting); if (renderer == null) { renderer = () -> new MachineRenderer(new ResourceLocation(registrate.getModid(), "block/machine/" + name)); diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java index 2877424b37..85216242c7 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java @@ -369,8 +369,8 @@ public MultiblockMachineBuilder afterWorking(Consumer after } @Override - public MultiblockMachineBuilder dampingWhenWaiting(boolean dampingWhenWaiting) { - return (MultiblockMachineBuilder) super.dampingWhenWaiting(dampingWhenWaiting); + public MultiblockMachineBuilder regressWhenWaiting(boolean dampingWhenWaiting) { + return (MultiblockMachineBuilder) super.regressWhenWaiting(dampingWhenWaiting); } @Override