Fix errors from updating

mankool0 · Aug 6, 2024 · f867a3b · f867a3b
1 parent 7a2beb5
commit f867a3b
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 211 deletions.
diff --git a/src/api/java/baritone/api/behavior/INetherHighwayBuilderBehavior.java b/src/api/java/baritone/api/behavior/INetherHighwayBuilderBehavior.java
@@ -17,12 +17,12 @@
 
 package baritone.api.behavior;
 
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.Vec3i;
 
 public interface INetherHighwayBuilderBehavior extends IBehavior {
     boolean isBuildingHighwayState();
 
-    void build(int startX, int startZ, Vec3 direct, boolean selfSolve, boolean pave);
+    void build(int startX, int startZ, Vec3i direct, boolean selfSolve, boolean pave);
 
     void stop();
 

diff --git a/src/api/java/baritone/api/utils/IPlayerContext.java b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -18,6 +18,7 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
+import baritone.api.utils.accessor.IClientPlayerEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
@@ -45,6 +46,8 @@ public interface IPlayerContext {
 
     IPlayerController playerController();
 
+    IClientPlayerEntity getPlayerEntity();
+
     Level world();
 
     default Iterable<Entity> entities() {

diff --git a/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java b/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
@@ -22,13 +22,15 @@
 import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
+import baritone.api.utils.accessor.IClientPlayerEntity;
 import baritone.behavior.LookBehavior;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.player.Abilities;
 import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -39,7 +41,7 @@
  * @since 8/1/2018
  */
 @Mixin(LocalPlayer.class)
-public class MixinClientPlayerEntity {
+public abstract class MixinClientPlayerEntity implements IClientPlayerEntity {
 
     @Inject(
             method = "tick",
@@ -122,4 +124,16 @@ private boolean isFlyEnabled(ItemStack stack) {
         }
         return ElytraItem.isFlyEnabled(stack);
     }
+
+    @Accessor("xLast")
+    @Override
+    public abstract double getXLast();
+
+    @Accessor("yLast1")
+    @Override
+    public abstract double getYLast();
+
+    @Accessor("zLast")
+    @Override
+    public abstract double getZLast();
 }
diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json
@@ -18,7 +18,6 @@
     "MixinFireworkRocketEntity",
     "MixinItemStack",
     "MixinLivingEntity",
-    "MixinLongArrayNBT",
     "MixinLootContext",
     "MixinMinecraft",
     "MixinNetworkManager",

diff --git a/src/main/java/baritone/behavior/NetherHighwayBuilderBehavior.java b/src/main/java/baritone/behavior/NetherHighwayBuilderBehavior.java
diff --git a/src/main/java/baritone/command/defaults/HighwayBuilderCommands.java b/src/main/java/baritone/command/defaults/HighwayBuilderCommands.java
@@ -21,7 +21,7 @@
 import baritone.api.command.Command;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.core.Vec3i;
 
 import java.util.Arrays;
 import java.util.List;
@@ -68,7 +68,7 @@ public void execute(String label, IArgConsumer args) throws CommandException {
 
                 logDirect("Calculating build location");
 
-                baritone.getNetherHighwayBuilderBehavior().build(origX, origZ, new Vec3(xDir, 0, zDir), selfSolve, doPaving);
+                baritone.getNetherHighwayBuilderBehavior().build(origX, origZ, new Vec3i(xDir, 0, zDir), selfSolve, doPaving);
             }
 
             @Override

diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java
@@ -28,6 +28,7 @@
 import baritone.api.schematic.*;
 import baritone.api.schematic.format.ISchematicFormat;
 import baritone.api.utils.*;
+import baritone.api.utils.Rotation;
 import baritone.api.utils.input.Input;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
@@ -284,7 +285,7 @@ private List<Optional<Tuple<BetterBlockPos, Rotation>>> toBreakNearPlayer(Builde
         for (BetterBlockPos pos : toBreakEntity) {
             BlockState curr = bcc.bsi.get0(pos);
             if (curr.getBlock() != Blocks.AIR && !(curr.getBlock() instanceof LiquidBlock) && !valid(curr, Blocks.AIR.defaultBlockState(), false)) {
-                Optional<Rotation> rot = RotationUtils.reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
+                Optional<Rotation> rot = RotationUtils.reachable(ctx, pos, ctx.playerController().getBlockReachDistance());
                 rot.ifPresent(rotation -> toReturn.add(Optional.of(new Tuple<>(pos, rotation))));
             }
         }

diff --git a/src/main/java/baritone/utils/player/BaritonePlayerContext.java b/src/main/java/baritone/utils/player/BaritonePlayerContext.java
@@ -20,6 +20,7 @@
 import baritone.Baritone;
 import baritone.api.cache.IWorldData;
 import baritone.api.utils.*;
+import baritone.api.utils.accessor.IClientPlayerEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.Entity;
@@ -59,6 +60,11 @@ public IPlayerController playerController() {
         return this.playerController;
     }
 
+    @Override
+    public IClientPlayerEntity getPlayerEntity() {
+        return ClientPlayerEntity.INSTANCE;
+    }
+
     @Override
     public Level world() {
         return this.mc.level;