From 8949bdab484223bae9ed3aee5f3d3e7977bbb1a5 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Tue, 31 Mar 2020 10:11:33 -0400 Subject: [PATCH] [O] Fix syntax problems for 1.14.4 --- .../java/baritone/launch/mixins/MixinMouse.java | 8 ++++---- .../java/org/hydev/hyritone/utils/PlayerUtils.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/launch/java/baritone/launch/mixins/MixinMouse.java b/src/launch/java/baritone/launch/mixins/MixinMouse.java index e54a4fc4..06468d97 100644 --- a/src/launch/java/baritone/launch/mixins/MixinMouse.java +++ b/src/launch/java/baritone/launch/mixins/MixinMouse.java @@ -76,24 +76,24 @@ public abstract class MixinMouse implements IMouse @Override public void rightHold() { - mouseButtonCallback(minecraft.getMainWindow().getHandle(), 1, 1, 0); + mouseButtonCallback(minecraft.mainWindow.getHandle(), 1, 1, 0); } @Override public void rightRelease() { - mouseButtonCallback(minecraft.getMainWindow().getHandle(), 1, 0, 0); + mouseButtonCallback(minecraft.mainWindow.getHandle(), 1, 0, 0); } @Override public void leftHold() { - mouseButtonCallback(minecraft.getMainWindow().getHandle(), 0, 1, 0); + mouseButtonCallback(minecraft.mainWindow.getHandle(), 0, 1, 0); } @Override public void leftRelease() { - mouseButtonCallback(minecraft.getMainWindow().getHandle(), 0, 0, 0); + mouseButtonCallback(minecraft.mainWindow.getHandle(), 0, 0, 0); } } diff --git a/src/main/java/org/hydev/hyritone/utils/PlayerUtils.java b/src/main/java/org/hydev/hyritone/utils/PlayerUtils.java index 0ce4de01..846ca2d1 100644 --- a/src/main/java/org/hydev/hyritone/utils/PlayerUtils.java +++ b/src/main/java/org/hydev/hyritone/utils/PlayerUtils.java @@ -44,9 +44,9 @@ public class PlayerUtils { assert player() != null; - return new Vec3d(player().getPosX(), - player().getPosY() + player().getEyeHeight(player().getPose()), - player().getPosZ()); + return new Vec3d(player().getPositionVec().x, + player().getPositionVec().y + player().getEyeHeight(player().getPose()), + player().getPositionVec().z); } /** @@ -111,11 +111,11 @@ public class PlayerUtils BlockState state = world().getBlockState(pos); for (int i = 0; i < sides.length; i++) { - // check line of sight - if (world().rayTraceBlocks(eyesPos, hitVecs[i], pos, state.getShape(world(), pos), state) != null) + // check line of sight TODO + /*if (world().rayTraceBlocks(new RayTraceContext(eyesPos, hitVecs[i], pos, state.getShape(world(), pos), state)) != null) { continue; - } + }*/ side = sides[i]; break;