From b12c4e9f8cf958417d825ecc5db7e2815f44dba2 Mon Sep 17 00:00:00 2001
From: ZacSharp <68165024+ZacSharp@users.noreply.github.com>
Date: Mon, 29 Jul 2024 18:15:13 +0200
Subject: [PATCH] Merge loading steps

---
 .../java/baritone/process/BuilderProcess.java |  8 +++----
 .../litematica/LitematicaHelper.java          | 23 ++++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java
index e2e63fc8e..4e04e60f5 100644
--- a/src/main/java/baritone/process/BuilderProcess.java
+++ b/src/main/java/baritone/process/BuilderProcess.java
@@ -51,7 +51,6 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
-import net.minecraft.nbt.NbtIo;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.BlockItem;
@@ -232,10 +231,9 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
             if (LitematicaHelper.hasLoadedSchematic(i)) {
                 String name = LitematicaHelper.getName(i);
                 try {
-                    LitematicaSchematic schematic1 = new LitematicaSchematic(NbtIo.readCompressed(Files.newInputStream(LitematicaHelper.getSchematicFile(i).toPath())));
-                    Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(schematic1, i);
-                    ISchematic schematic2 = LitematicaHelper.applyPlacementRotation(schematic1, i);
-                    schematic2 = applyMapArtAndSelection(origin, (IStaticSchematic) schematic2);
+                    Tuple<IStaticSchematic, Vec3i> schematic = LitematicaHelper.getSchematic(i);
+                    Vec3i correctedOrigin = schematic.getB();
+                    ISchematic schematic2 = applyMapArtAndSelection(correctedOrigin, schematic.getA());
                     build(name, schematic2, correctedOrigin);
                 } catch (Exception e) {
                     logDirect("Schematic File could not be loaded.");
diff --git a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
index c43d79b26..d300db091 100644
--- a/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
+++ b/src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
@@ -17,17 +17,21 @@
 
 package baritone.utils.schematic.litematica;
 
+import baritone.api.schematic.IStaticSchematic;
 import baritone.utils.schematic.StaticSchematic;
 import baritone.utils.schematic.format.defaults.LitematicaSchematic;
 import fi.dy.masa.litematica.Litematica;
 import fi.dy.masa.litematica.data.DataManager;
 import fi.dy.masa.litematica.schematic.placement.SchematicPlacement;
 import net.minecraft.core.Vec3i;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 
 /**
  * Helper class that provides access or processes data related to Litmatica schematics.
@@ -68,21 +72,12 @@ public final class LitematicaHelper {
         return getPlacement(i).getName();
     }
 
-    /**
-     * @param i index of the Schematic in the schematic placement list.
-     * @return Filepath of the schematic file.
-     */
-    public static File getSchematicFile(int i) {
-        return getPlacement(i).getSchematicFile();
-    }
-
     /**
      * @param schematic original schematic.
      * @param i         index of the Schematic in the schematic placement list.
      * @return the minimum corner coordinates of the schematic, after the original schematic got rotated and mirrored.
      */
-    public static Vec3i getCorrectedOrigin(LitematicaSchematic schematic, int i) {
-        SchematicPlacement placement = getPlacement(i);
+    private static Vec3i getCorrectedOrigin(SchematicPlacement placement, LitematicaSchematic schematic) {
         Vec3i origin = placement.getOrigin();
         Vec3i minCorner = schematic.getOffsetMinCorner();
         int sx = 2 - schematic.widthX(); // this is because the position needs to be adjusted
@@ -137,10 +132,12 @@ public final class LitematicaHelper {
      * @param i       index of the Schematic in the schematic placement list.
      * @return get it out rotated and mirrored.
      */
-    public static StaticSchematic applyPlacementRotation(LitematicaSchematic schemIn, int i) {
+    public static Tuple<IStaticSchematic, Vec3i> getSchematic(int i) throws IOException {
         SchematicPlacement placement = getPlacement(i);
         Rotation rotation = placement.getRotation();
         Mirror mirror = placement.getMirror();
+        LitematicaSchematic schemIn = new LitematicaSchematic(NbtIo.readCompressed(Files.newInputStream(placement.getSchematicFile().toPath())));
+        Vec3i origin = getCorrectedOrigin(placement, schemIn);
         boolean flip = rotation == Rotation.CLOCKWISE_90 || rotation == Rotation.COUNTERCLOCKWISE_90;
         BlockState[][][] states = new BlockState[flip ? schemIn.lengthZ() : schemIn.widthX()][flip ? schemIn.widthX() : schemIn.lengthZ()][schemIn.heightY()];
         for (int yCounter = 0; yCounter < schemIn.heightY(); yCounter++) {
@@ -155,6 +152,6 @@ public final class LitematicaHelper {
                 }
             }
         }
-        return new StaticSchematic(states);
+        return new Tuple<>(new StaticSchematic(states), origin);
     }
 }
\ No newline at end of file