From 1801551d3b7e1e45512e5c86939c5bee7a4232cb Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Sat, 25 Aug 2018 23:12:43 -0500
Subject: [PATCH] A less atrocious approach to fixing 95

---
 .../{MixinVec3i.java => MixinBlockPos.java}   | 28 ++++++++-----------
 src/main/resources/mixins.baritone.json       |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)
 rename src/main/java/baritone/launch/mixins/{MixinVec3i.java => MixinBlockPos.java} (57%)

diff --git a/src/main/java/baritone/launch/mixins/MixinVec3i.java b/src/main/java/baritone/launch/mixins/MixinBlockPos.java
similarity index 57%
rename from src/main/java/baritone/launch/mixins/MixinVec3i.java
rename to src/main/java/baritone/launch/mixins/MixinBlockPos.java
index 84823015b..1cf52132b 100644
--- a/src/main/java/baritone/launch/mixins/MixinVec3i.java
+++ b/src/main/java/baritone/launch/mixins/MixinBlockPos.java
@@ -21,29 +21,23 @@ import com.google.common.base.MoreObjects;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Brady
  * @since 8/25/2018
  */
-@Mixin(Vec3i.class)
-public class MixinVec3i {
+@Mixin(BlockPos.class)
+public abstract class MixinBlockPos extends Vec3i {
 
-    @Redirect(
-            method = "toString",
-            at = @At(
-                    value = "INVOKE",
-                    target = "com/google/common/base/MoreObjects.toStringHelper(Ljava/lang/Object;)Lcom/google/common/base/MoreObjects$ToStringHelper;"
-            )
-    )
-    private MoreObjects.ToStringHelper toStringHelper(Object object) {
+    public MixinBlockPos(int xIn, int yIn, int zIn) {
+        super(xIn, yIn, zIn);
+    }
 
-        if (object.getClass().equals(BlockPos.class)) {
-            return MoreObjects.toStringHelper("BlockPos");
-        }
-
-        return MoreObjects.toStringHelper(object);
+    @Override
+    @Nonnull
+    public String toString() {
+        return MoreObjects.toStringHelper("BlockPos").add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString();
     }
 }
diff --git a/src/main/resources/mixins.baritone.json b/src/main/resources/mixins.baritone.json
index 2735cdd68..52aa62fdb 100755
--- a/src/main/resources/mixins.baritone.json
+++ b/src/main/resources/mixins.baritone.json
@@ -8,6 +8,7 @@
     "maxShiftBy": 2
   },
   "client": [
+    "MixinBlockPos",
     "MixinEntity",
     "MixinEntityPlayerSP",
     "MixinEntityRenderer",
@@ -19,7 +20,6 @@
     "MixinMinecraft",
     "MixinNetHandlerPlayClient",
     "MixinNetworkManager",
-    "MixinVec3i",
     "MixinWorldClient",
 
     "accessor.IAnvilChunkLoader",