swimming

1.19.4

fabric/src/main/resources/fabric.mod.json

@@ -26,6 +26,6 @@
 
   "depends": {
     "fabricloader": ">=0.11.0",
-    "minecraft": "1.19.3"
+    "minecraft": "1.19.4"
   }
-}
+}

forge/src/main/resources/META-INF/mods.toml

@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.19.3]"
+versionRange="[1.19.4]"
 ordering="NONE"
-side="BOTH"
+side="BOTH"

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx4G
 
-mod_version=1.9.1
+mod_version=1.9.3
 maven_group=baritone
 archives_base_name=baritone
 
-minecraft_version=1.19.3
-forge_version=1.19.3-44.0.1
+minecraft_version=1.19.4
+forge_version=1.19.4-45.0.43
 fabric_version=0.14.11

settings.gradle

@@ -44,7 +44,6 @@ rootProject.name = 'baritone'
 include("tweaker")
 if (System.getProperty("Baritone.enabled_platforms") == null) {
     System.setProperty("Baritone.enabled_platforms", "fabric,forge")
-//    System.setProperty("Baritone.enabled_platforms", "fabric")
 }
 for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) {
        include(platform)

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

@@ -27,12 +27,13 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+
 import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -730,6 +731,11 @@ public final class Settings {
      */
     public final Setting<Boolean> sprintInWater = new Setting<>(true);
 
+    /**
+     * Attempt to enter the underwater swimming state
+     */
+    public final Setting<Boolean> swimInWater = new Setting<>(true);
+
     /**
      * When GetToBlockProcess or MineProcess fails to calculate a path, instead of just giving up, mark the closest instance
      * of that block as "unreachable" and go towards the next closest. GetToBlock expands this search to the whole "vein"; MineProcess does not.

src/main/java/baritone/pathing/movement/Movement.java

@@ -24,13 +24,15 @@ import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.*;
 import baritone.api.utils.input.Input;
 import baritone.behavior.PathingBehavior;
+import baritone.pathing.movement.movements.MovementTraverse;
 import baritone.utils.BlockStateInterface;
-import java.util.*;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.phys.AABB;
 
+import java.util.*;
+
 public abstract class Movement implements IMovement, MovementHelper {
 
     public static final Direction[] HORIZONTALS_BUT_ALSO_DOWN_____SO_EVERY_DIRECTION_EXCEPT_UP = {Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST, Direction.DOWN};
@@ -123,7 +125,7 @@ public abstract class Movement implements IMovement, MovementHelper {
     public MovementStatus update() {
         ctx.player().getAbilities().flying = false;
         currentState = updateState(currentState);
-        if (MovementHelper.isLiquid(ctx, ctx.playerFeet()) && ctx.player().position().y < dest.y + 0.6) {
+        if ((MovementHelper.isLiquid(ctx, ctx.playerFeet()) && ctx.player().position().y < dest.y + 0.6) && !(Baritone.settings().swimInWater.value && this instanceof MovementTraverse)) {
             currentState.setInput(Input.JUMP, true);
         }
         if (ctx.player().isInWall()) {

src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java

@@ -21,6 +21,7 @@ import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.utils.Rotation;
 import baritone.api.utils.input.Input;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
@@ -29,9 +30,6 @@ import baritone.pathing.movement.MovementState;
 import baritone.utils.BlockStateInterface;
 import baritone.utils.pathing.MutableMoveResult;
 import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -39,6 +37,10 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 public class MovementDiagonal extends Movement {
 
     private static final double SQRT_2 = Math.sqrt(2);
@@ -271,6 +273,10 @@ public class MovementDiagonal extends Movement {
             state.setInput(Input.SPRINT, true);
         }
         MovementHelper.moveTowards(ctx, state, dest);
+        if (ctx.player().isSwimming() && Baritone.settings().swimInWater.value) {
+            state.setInput(Input.SPRINT, true);
+            state.setTarget(new MovementState.MovementTarget(new Rotation(state.getTarget().getRotation().get().getYaw(), -30), true));
+        }
         return state;
     }
 

src/main/java/baritone/pathing/movement/movements/MovementTraverse.java

@@ -32,14 +32,7 @@ import baritone.pathing.movement.MovementState;
 import baritone.utils.BlockStateInterface;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.AirBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.CarpetBlock;
-import net.minecraft.world.level.block.DoorBlock;
-import net.minecraft.world.level.block.FenceGateBlock;
-import net.minecraft.world.level.block.LadderBlock;
-import net.minecraft.world.level.block.SlabBlock;
+import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.phys.Vec3;
@@ -240,10 +233,16 @@ public class MovementTraverse extends Movement {
                 }
             }
         }
-
+        boolean swim = Baritone.settings().swimInWater.value &&
+                MovementHelper.isLiquid(ctx, src) &&
+                MovementHelper.isLiquid(ctx, dest) &&
+                (ctx.player().isSwimming() || (ctx.world().getBlockState(dest.below()).equals(pb1) &&
+                        ctx.world().getBlockState(src.below()).equals(pb1))) &&
+                ctx.playerFeetAsVec().y >= src.y - 1;
         boolean isTheBridgeBlockThere = MovementHelper.canWalkOn(ctx, positionToPlace) || ladder || MovementHelper.canUseFrostWalker(ctx, positionToPlace);
         BlockPos feet = ctx.playerFeet();
-        if (feet.getY() != dest.getY() && !ladder) {
+        state.setInput(Input.JUMP, false);
+        if (feet.getY() != dest.getY() && !ladder && !swim) {
             logDebug("Wrong Y coordinate");
             if (feet.getY() < dest.getY()) {
                 System.out.println("In movement traverse");
@@ -283,6 +282,9 @@ public class MovementTraverse extends Movement {
                 }
             }
             MovementHelper.moveTowards(ctx, state, against);
+            if (swim) {
+                state.setTarget(new MovementState.MovementTarget(new Rotation(state.getTarget().getRotation().get().getYaw(), -30), true));
+            }
             return state;
         } else {
             wasTheBridgeBlockAlwaysThere = false;

src/main/java/baritone/process/FarmProcess.java

@@ -24,6 +24,7 @@ import baritone.api.pathing.goals.GoalComposite;
 import baritone.api.process.IFarmProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.RayTraceUtils;
 import baritone.api.utils.Rotation;
 import baritone.api.utils.RotationUtils;
@@ -306,7 +307,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
                 ItemEntity ei = (ItemEntity) entity;
                 if (PICKUP_DROPPED.contains(ei.getItem().getItem())) {
                     // +0.1 because of farmland's 0.9375 dummy height lol
-                    goalz.add(new GoalBlock(new BlockPos(entity.position().x, entity.position().y + 0.1, entity.position().z)));
+                    goalz.add(new GoalBlock(new BetterBlockPos(entity.position().x, entity.position().y + 0.1, entity.position().z)));
                 }
             }
         }

src/main/java/baritone/process/FollowProcess.java

@@ -25,6 +25,7 @@ import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.process.IFollowProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
+import baritone.api.utils.BetterBlockPos;
 import baritone.utils.BaritoneProcessHelper;
 import java.util.List;
 import java.util.function.Predicate;
@@ -59,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
             pos = following.blockPosition();
         } else {
             GoalXZ g = GoalXZ.fromDirection(following.position(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value);
-            pos = new BlockPos(g.getX(), following.position().y, g.getZ());
+            pos = new BetterBlockPos(g.getX(), following.position().y, g.getZ());
         }
         return new GoalNear(pos, Baritone.settings().followRadius.value);
     }

src/main/java/baritone/utils/GuiClick.java

@@ -27,6 +27,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -133,7 +134,7 @@ public class GuiClick extends Screen implements Helper {
                 //TODO: check
                 IRenderer.glColor(Color.RED, 0.4F);
                 RenderSystem.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
-                RenderSystem.disableTexture();
+                RenderSystem.setShader(GameRenderer::getPositionColorShader);
                 RenderSystem.depthMask(false);
                 RenderSystem.disableDepthTest();
                 BetterBlockPos a = new BetterBlockPos(currentMouseOver);
@@ -142,7 +143,6 @@ public class GuiClick extends Screen implements Helper {
                 RenderSystem.enableDepthTest();
 
                 RenderSystem.depthMask(true);
-                RenderSystem.enableTexture();
                 RenderSystem.disableBlend();
             }
         }

src/main/java/baritone/utils/IRenderer.java

@@ -24,6 +24,8 @@ import baritone.utils.accessor.IEntityRenderManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import java.awt.*;
+
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.world.phys.AABB;
 import org.joml.Matrix4f;
 
@@ -48,10 +50,10 @@ public interface IRenderer {
 
     static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
         RenderSystem.enableBlend();
+        RenderSystem.setShader(GameRenderer::getPositionColorShader);
         RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
         glColor(color, alpha);
         RenderSystem.lineWidth(lineWidth);
-        RenderSystem.disableTexture();
         RenderSystem.depthMask(false);
 
         if (ignoreDepth) {
@@ -69,7 +71,6 @@ public interface IRenderer {
         }
 
         RenderSystem.depthMask(true);
-        RenderSystem.enableTexture();
         RenderSystem.disableBlend();
     }