From d1930e03e1e198cf1f0502b67873e876e7a85395 Mon Sep 17 00:00:00 2001
From: rycbar0 <schmar03@students.zhaw.ch>
Date: Sat, 1 Oct 2022 22:51:36 +0200
Subject: [PATCH] getCorrectedOrigin returns the correct origin

---
 .../java/baritone/process/BuilderProcess.java |  2 +-
 .../litematica/LitematicaHelper.java          | 46 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java
index 3b9ba2dd..65f97543 100644
--- a/src/main/java/baritone/process/BuilderProcess.java
+++ b/src/main/java/baritone/process/BuilderProcess.java
@@ -190,7 +190,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
                 try {
                     LitematicaSchematic schematic1 = new LitematicaSchematic(CompressedStreamTools.readCompressed(Files.newInputStream(LitematicaHelper.getSchematicFile(i).toPath())),false);
                     LitematicaSchematic schematic2 = LitematicaHelper.blackMagicFuckery(schematic1, i);
-                    Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(LitematicaHelper.getOrigin(i), schematic2.getMinimumCorner());
+                    Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(schematic2, i);
 
                     build(name, schematic2, correctedOrigin);
                 } catch (IOException e) {
diff --git a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
index 47d3fe24..5e42ba99 100644
--- a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
+++ b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
@@ -57,8 +57,50 @@ public final class LitematicaHelper {
     public static Mirror getMirror(int i) {
         return DataManager.getSchematicPlacementManager().getAllSchematicsPlacements().get(i).getMirror();
     }
-    public static Vec3i getCorrectedOrigin(Vec3i origin, Vec3i correction) {
-        return new Vec3i(origin.getX()+ correction.getX(), origin.getY() + correction.getY(), origin.getZ() + correction.getZ());
+    public static Vec3i getCorrectedOrigin(LitematicaSchematic schematic, int i) {
+        int x = LitematicaHelper.getOrigin(i).getX() + schematic.getMinimumCorner().getX();
+        int y = LitematicaHelper.getOrigin(i).getY() + schematic.getMinimumCorner().getY();
+        int z = LitematicaHelper.getOrigin(i).getZ() + schematic.getMinimumCorner().getZ();
+        Vec3i correctedOrigin;
+        Mirror mirror = LitematicaHelper.getMirror(i);
+        Rotation rotation = LitematicaHelper.getRotation(i);
+
+        //todo there has to be a better way to do this but i cant finde it atm
+        switch (mirror) {
+            case FRONT_BACK:
+            case LEFT_RIGHT:
+                switch ((mirror.ordinal()*2+rotation.ordinal())%4) {
+                    case 1:
+                        correctedOrigin = new Vec3i(x - schematic.getX()+1, y, z - schematic.getZ()+1);
+                        break;
+                    case 2:
+                        correctedOrigin = new Vec3i(x, y, z - schematic.getZ()+1);
+                        break;
+                    case 3:
+                        correctedOrigin = new Vec3i(x, y, z);
+                        break;
+                    default:
+                        correctedOrigin = new Vec3i(x - schematic.getX()+1, y, z);
+                        break;
+                }
+                break;
+            default:
+                switch (rotation) {
+                    case CLOCKWISE_90:
+                        correctedOrigin = new Vec3i(x - schematic.getX()+1, y, z);
+                        break;
+                    case CLOCKWISE_180:
+                        correctedOrigin = new Vec3i(x - schematic.getX()+1, y, z - schematic.getZ()+1);
+                        break;
+                    case COUNTERCLOCKWISE_90:
+                        correctedOrigin = new Vec3i(x, y, z - schematic.getZ()+1);
+                        break;
+                    default:
+                        correctedOrigin = new Vec3i(x, y, z);
+                        break;
+                }
+        }
+        return correctedOrigin;
     }
     public static Vec3i doMirroring(Vec3i in, int sizeX, int sizeZ, Mirror mirror) {
         int xOut = in.getX();