Merge pull request #4636 from Lyzev/1.19.4

add(Settings): added settings to control block placement in fluid sources and flowing fluids
cabaletta · Feb 8, 2025 · 849072f · 849072f
2 parents 3c9f5b2 + 59157c1
commit 849072f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
@@ -77,6 +77,16 @@ public final class Settings {
      */
     public final Setting<Boolean> allowPlace = new Setting<>(true);
 
+    /**
+     * Allow Baritone to place blocks in fluid source blocks
+     */
+    public final Setting<Boolean> allowPlaceInFluidsSource = new Setting<>(true);
+
+    /**
+     * Allow Baritone to place blocks in flowing fluid
+     */
+    public final Setting<Boolean> allowPlaceInFluidsFlow = new Setting<>(true);
+
     /**
      * Allow Baritone to move items in your inventory to your hotbar
      */

diff --git a/src/main/java/baritone/pathing/movement/CalculationContext.java b/src/main/java/baritone/pathing/movement/CalculationContext.java
@@ -161,6 +161,12 @@ public double costOfPlacingAt(int x, int y, int z, BlockState current) {
         if (!worldBorder.canPlaceAt(x, z)) {
             return COST_INF;
         }
+        if (!Baritone.settings().allowPlaceInFluidsSource.value && current.getFluidState().isSource()) {
+            return COST_INF;
+        }
+        if (!Baritone.settings().allowPlaceInFluidsFlow.value && !current.getFluidState().isEmpty() && !current.getFluidState().isSource()) {
+            return COST_INF;
+        }
         return placeBlockCost;
     }