From d1761cf43a7aba7ced14ca6645f4d63daf7f0767 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:37:14 -0700 Subject: [PATCH] Add option to disable automated_sieve nerf. --- .../exdeorum/blockentity/SieveBlockEntity.java | 2 +- src/main/java/thedarkcolour/exdeorum/config/EConfig.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java index ce4f0534..05ecfc08 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java @@ -112,7 +112,7 @@ public class SieveBlockEntity extends AbstractSieveBlockEntity { var time = level.getGameTime(); var realPlayer = !(player instanceof FakePlayer); - if (realPlayer && EConfig.SERVER.simultaneousSieveUsage.get()) { + if ((realPlayer || !EConfig.SERVER.nerfAutomatedSieves.get()) && EConfig.SERVER.simultaneousSieveUsage.get()) { int range = EConfig.SERVER.simultaneousSieveUsageRange.get(); var cursor = this.worldPosition.mutable().move(-range, 0, -range); diff --git a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java index 9cc3ac46..a58a0fd8 100644 --- a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java +++ b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java @@ -124,6 +124,7 @@ public class EConfig { public final BooleanValue simultaneousSieveUsage; public final IntValue simultaneousSieveUsageRange; public final BooleanValue automatedSieves; + public final BooleanValue nerfAutomatedSieves; public final DoubleValue barrelProgressStep; public final BooleanValue witchWaterDirtGenerator; public final BooleanValue witchWaterNetherrackGenerator; @@ -154,8 +155,11 @@ public class EConfig { .comment("The range from which simultaneous sieve usage can reach. 1 means a maximum of 3x3 sieves at once, 2 means a maximum of 5x5, 3 means maximum of 7x7 simultaneous sieves, and so on.") .defineInRange("simultaneous_sieve_range", 2, 0, 6); this.automatedSieves = builder - .comment("Whether machines/fake players can interact with the Sieve.") + .comment("Whether machines/fake players can interact with the Sieve. Keep in mind, the intended automation method is to use the Mechanical Sieve.") .define("automated_sieves", false); + this.nerfAutomatedSieves = builder + .comment("Whether machines/fake players that interact with the Sieve can sieve in a 3x3 or larger. This option does nothing if automated_sieves is set to false.") + .define("nerf_automated_sieves", true); this.barrelProgressStep = builder .comment("The progress to increment by each tick for barrel composting.") .defineInRange("barrel_progress_step", 0.004, 0.0f, 1.0f);