Merge pull request #4315 from ZacSharp/1.20.4-update

Merge 1.19.4 into 1.20.4

Author: leijurv

.github/workflows/gradle_build.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -31,13 +31,13 @@ jobs:
       run: ./gradlew build -Pmod_version="$(git describe --always --tags --first-parent | cut -c2-)"
 
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Artifacts
         path: dist/
 
     - name: Archive mapping.txt
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Mappings
         path: mapping/

.github/workflows/run_tests.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

src/api/java/baritone/api/Settings.java

@@ -385,6 +385,12 @@ public final class Settings {
      */
     public final Setting<Float> blockReachDistance = new Setting<>(4.5f);
 
+    /**
+     * How many ticks between breaking a block and starting to break the next block. Default in game is 6 ticks.
+     * Values under 2 will be clamped.
+     */
+    public final Setting<Integer> blockBreakSpeed = new Setting<>(6);
+
     /**
      * How many degrees to randomize the pitch and yaw every tick. Set to 0 to disable
      */
@@ -1058,6 +1064,11 @@ public final class Settings {
      */
     public final Setting<Double> breakCorrectBlockPenaltyMultiplier = new Setting<>(10d);
 
+    /**
+     * Multiply the cost of placing a block that's incorrect in the builder's schematic by this coefficient
+     */
+    public final Setting<Double> placeIncorrectBlockPenaltyMultiplier = new Setting<>(2d);
+
     /**
      * When this setting is true, build a schematic with the highest X coordinate being the origin, instead of the lowest
      */

src/main/java/baritone/process/BuilderProcess.java

@@ -28,6 +28,7 @@
 import baritone.api.schematic.FillSchematic;
 import baritone.api.schematic.ISchematic;
 import baritone.api.schematic.IStaticSchematic;
+import baritone.api.schematic.MaskSchematic;
 import baritone.api.schematic.SubstituteSchematic;
 import baritone.api.schematic.format.ISchematicFormat;
 import baritone.api.utils.*;
@@ -85,6 +86,14 @@
 
 public final class BuilderProcess extends BaritoneProcessHelper implements IBuilderProcess {
 
+    private static final Set<Property<?>> ORIENTATION_PROPS =
+            ImmutableSet.of(
+                    RotatedPillarBlock.AXIS, HorizontalDirectionalBlock.FACING,
+                    StairBlock.FACING, StairBlock.HALF, StairBlock.SHAPE,
+                    PipeBlock.NORTH, PipeBlock.EAST, PipeBlock.SOUTH, PipeBlock.WEST, PipeBlock.UP,
+                    TrapDoorBlock.OPEN, TrapDoorBlock.HALF
+            );
+
     private HashSet<BetterBlockPos> incorrectPositions;
     private LongOpenHashSet observedCompleted; // positions that are completed even if they're out of render distance and we can't make sure right now
     private String name;
@@ -111,6 +120,14 @@ public void build(String name, ISchematic schematic, Vec3i origin) {
         if (!Baritone.settings().buildSubstitutes.value.isEmpty()) {
             this.schematic = new SubstituteSchematic(this.schematic, Baritone.settings().buildSubstitutes.value);
         }
+        // TODO this preserves the old behavior, but maybe we should bake the setting value right here
+        this.schematic = new MaskSchematic(this.schematic) {
+            @Override
+            public boolean partOfMask(int x, int y, int z, BlockState current) {
+                // partOfMask is only called inside the schematic so desiredState is not null
+                return !Baritone.settings().buildSkipBlocks.value.contains(this.desiredState(x, y, z, current, Collections.emptyList()).getBlock());
+            }
+        };
         int x = origin.getX();
         int y = origin.getY();
         int z = origin.getZ();
@@ -169,15 +186,15 @@ public boolean build(String name, File schematic, Vec3i origin) {
         if (!format.isPresent()) {
             return false;
         }
-        ISchematic parsed;
+        IStaticSchematic parsed;
         try {
             parsed = format.get().parse(new FileInputStream(schematic));
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
-        parsed = applyMapArtAndSelection(origin, (IStaticSchematic) parsed);
-        build(name, parsed, origin);
+        ISchematic schem = applyMapArtAndSelection(origin, parsed);
+        build(name, schem, origin);
         return true;
     }
 
@@ -197,17 +214,10 @@ public void buildOpenSchematic() {
         if (SchematicaHelper.isSchematicaPresent()) {
             Optional<Tuple<IStaticSchematic, BlockPos>> schematic = SchematicaHelper.getOpenSchematic();
             if (schematic.isPresent()) {
-                IStaticSchematic s = schematic.get().getA();
+                IStaticSchematic raw = schematic.get().getA();
                 BlockPos origin = schematic.get().getB();
-                ISchematic schem = Baritone.settings().mapArtMode.value ? new MapArtSchematic(s) : s;
-                if (Baritone.settings().buildOnlySelection.value) {
-                    schem = new SelectionSchematic(schem, origin, baritone.getSelectionManager().getSelections());
-                }
-                this.build(
-                        schematic.get().getA().toString(),
-                        schem,
-                        origin
-                );
+                ISchematic schem = applyMapArtAndSelection(origin, raw);
+                this.build(raw.toString(), schem, origin);
             } else {
                 logDirect("No schematic currently open");
             }
@@ -439,8 +449,8 @@ public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
         return onTick(calcFailed, isSafeToCancel, 0);
     }
 
-    public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel, int recursions) {
-        if (recursions > 1000) { // onTick calls itself, don't crash
+    private PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel, int recursions) {
+        if (recursions > 100) { // onTick calls itself, don't crash
             return new PathingCommand(null, PathingCommandType.SET_GOAL_AND_PATH);
         }
         approxPlaceable = approxPlaceable(36);
@@ -684,8 +694,7 @@ private void fullRecalc(BuilderCalculationContext bcc) {
                         continue;
                     }
                     // this is not in render distance
-                    if (!observedCompleted.contains(BetterBlockPos.longHash(blockX, blockY, blockZ))
-                            && !Baritone.settings().buildSkipBlocks.value.contains(schematic.desiredState(x, y, z, current, this.approxPlaceable).getBlock())) {
+                    if (!observedCompleted.contains(BetterBlockPos.longHash(blockX, blockY, blockZ))) {
                         // and we've never seen this position be correct
                         // therefore mark as incorrect
                         incorrectPositions.add(new BetterBlockPos(blockX, blockY, blockZ));
@@ -1010,15 +1019,7 @@ private List<BlockState> approxPlaceable(int size) {
         return result;
     }
 
-    public static final Set<Property<?>> orientationProps =
-            ImmutableSet.of(
-                RotatedPillarBlock.AXIS, HorizontalDirectionalBlock.FACING,
-                    StairBlock.FACING, StairBlock.HALF, StairBlock.SHAPE,
-                PipeBlock.NORTH, PipeBlock.EAST, PipeBlock.SOUTH, PipeBlock.WEST, PipeBlock.UP,
-                    TrapDoorBlock.OPEN, TrapDoorBlock.HALF
-            );
-
-    private boolean sameBlockstate(BlockState first, BlockState second) {
+    private static boolean sameBlockstate(BlockState first, BlockState second) {
         if (first.getBlock() != second.getBlock()) {
             return false;
         }
@@ -1031,15 +1032,15 @@ private boolean sameBlockstate(BlockState first, BlockState second) {
         ImmutableMap<Property<?>, Comparable<?>> map2 = second.getValues();
         for (Property<?> prop : map1.keySet()) {
             if (map1.get(prop) != map2.get(prop)
-                    && !(ignoreDirection && orientationProps.contains(prop))
+                    && !(ignoreDirection && ORIENTATION_PROPS.contains(prop))
                     && !ignoredProps.contains(prop.getName())) {
                 return false;
             }
         }
         return true;
     }
 
-    private boolean containsBlockState(Collection<BlockState> states, BlockState state) {
+    private static boolean containsBlockState(Collection<BlockState> states, BlockState state) {
         for (BlockState testee : states) {
             if (sameBlockstate(testee, state)) {
                 return true;
@@ -1048,7 +1049,7 @@ private boolean containsBlockState(Collection<BlockState> states, BlockState sta
         return false;
     }
 
-    private boolean valid(BlockState current, BlockState desired, boolean itemVerify) {
+    private static boolean valid(BlockState current, BlockState desired, boolean itemVerify) {
         if (desired == null) {
             return true;
         }
@@ -1067,9 +1068,6 @@ private boolean valid(BlockState current, BlockState desired, boolean itemVerify
         if (!(current.getBlock() instanceof AirBlock) && Baritone.settings().buildIgnoreExisting.value && !itemVerify) {
             return true;
         }
-        if (Baritone.settings().buildSkipBlocks.value.contains(desired.getBlock()) && !itemVerify) {
-            return true;
-        }
         if (Baritone.settings().buildValidSubstitutes.value.getOrDefault(desired.getBlock(), Collections.emptyList()).contains(current.getBlock()) && !itemVerify) {
             return true;
         }
@@ -1113,12 +1111,12 @@ public double costOfPlacingAt(int x, int y, int z, BlockState current) {
                 return COST_INF;
             }
             BlockState sch = getSchematic(x, y, z, current);
-            if (sch != null && !Baritone.settings().buildSkipBlocks.value.contains(sch.getBlock())) {
+            if (sch != null) {
                 // TODO this can return true even when allowPlace is off.... is that an issue?
                 if (sch.getBlock() instanceof AirBlock) {
                     // we want this to be air, but they're asking if they can place here
                     // this won't be a schematic block, this will be a throwaway
-                    return placeBlockCost * 2; // we're going to have to break it eventually
+                    return placeBlockCost * Baritone.settings().placeIncorrectBlockPenaltyMultiplier.value; // we're going to have to break it eventually
                 }
                 if (placeable.contains(sch)) {
                     return 0; // thats right we gonna make it FREE to place a block where it should go in a structure
@@ -1131,7 +1129,7 @@ public double costOfPlacingAt(int x, int y, int z, BlockState current) {
                 }
                 // we want it to be something that we don't have
                 // even more of a pain to place something wrong
-                return placeBlockCost * 3;
+                return placeBlockCost * 1.5 * Baritone.settings().placeIncorrectBlockPenaltyMultiplier.value;
             } else {
                 if (hasThrowaway) {
                     return placeBlockCost;
@@ -1147,7 +1145,7 @@ public double breakCostMultiplierAt(int x, int y, int z, BlockState current) {
                 return COST_INF;
             }
             BlockState sch = getSchematic(x, y, z, current);
-            if (sch != null && !Baritone.settings().buildSkipBlocks.value.contains(sch.getBlock())) {
+            if (sch != null) {
                 if (sch.getBlock() instanceof AirBlock) {
                     // it should be air
                     // regardless of current contents, we can break it

src/main/java/baritone/utils/BlockBreakHelper.java

@@ -17,6 +17,7 @@
 
 package baritone.utils;
 
+import baritone.api.BaritoneAPI;
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.phys.BlockHitResult;
@@ -27,9 +28,12 @@
  * @since 8/25/2018
  */
 public final class BlockBreakHelper {
+    // base ticks between block breaks caused by tick logic
+    private static final int BASE_BREAK_DELAY = 2;
 
     private final IPlayerContext ctx;
     private boolean didBreakLastTick;
+    private int breakDelayTimer = 0;
 
     BlockBreakHelper(IPlayerContext ctx) {
         this.ctx = ctx;
@@ -48,6 +52,10 @@ public void stopBreakingBlock() {
     }
 
     public void tick(boolean isLeftClick) {
+        if (breakDelayTimer > 0) {
+            breakDelayTimer--;
+            return;
+        }
         HitResult trace = ctx.objectMouseOver();
         boolean isBlockTrace = trace != null && trace.getType() == HitResult.Type.BLOCK;
 
@@ -68,6 +76,7 @@ public void tick(boolean isLeftClick) {
             didBreakLastTick = true;
         } else if (didBreakLastTick) {
             stopBreakingBlock();
+            breakDelayTimer = BaritoneAPI.getSettings().blockBreakSpeed.value - BASE_BREAK_DELAY;
             didBreakLastTick = false;
         }
     }

src/main/java/baritone/utils/BlockPlaceHelper.java

@@ -25,6 +25,8 @@
 import net.minecraft.world.phys.HitResult;
 
 public class BlockPlaceHelper {
+    // base ticks between places caused by tick logic
+    private static final int BASE_PLACE_DELAY = 1;
 
     private final IPlayerContext ctx;
     private int rightClickTimer;
@@ -42,7 +44,7 @@ public void tick(boolean rightClickRequested) {
         if (!rightClickRequested || ctx.player().isHandsBusy() || mouseOver == null || mouseOver.getType() != HitResult.Type.BLOCK) {
             return;
         }
-        rightClickTimer = Baritone.settings().rightClickSpeed.value;
+        rightClickTimer = Baritone.settings().rightClickSpeed.value - BASE_PLACE_DELAY;
         for (InteractionHand hand : InteractionHand.values()) {
             if (ctx.playerController().processRightClickBlock(ctx.player(), ctx.world(), hand, (BlockHitResult) mouseOver) == InteractionResult.SUCCESS) {
                 ctx.player().swing(hand);

src/main/java/baritone/utils/schematic/MapArtSchematic.java

@@ -41,19 +41,22 @@ protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
     private static int[][] generateHeightMap(IStaticSchematic schematic) {
         int[][] heightMap = new int[schematic.widthX()][schematic.lengthZ()];
 
+        int missingColumns = 0;
         for (int x = 0; x < schematic.widthX(); x++) {
             for (int z = 0; z < schematic.lengthZ(); z++) {
                 BlockState[] column = schematic.getColumn(x, z);
                 OptionalInt lowestBlockY = lastIndexMatching(column, state -> !(state.getBlock() instanceof AirBlock));
                 if (lowestBlockY.isPresent()) {
                     heightMap[x][z] = lowestBlockY.getAsInt();
                 } else {
-                    System.out.println("Column " + x + "," + z + " has no blocks, but it's apparently map art? wtf");
-                    System.out.println("Letting it be whatever");
-                    heightMap[x][z] = 256;
+                    missingColumns++;
+                    heightMap[x][z] = Integer.MAX_VALUE;
                 }
             }
         }
+        if (missingColumns != 0) {
+            System.out.println(missingColumns + " columns had no block despite being in a map art, letting them be whatever");
+        }
         return heightMap;
     }