Merge b8b6caccb3 into 62b2f81ba1

src/api/java/baritone/api/process/IBuilderProcess.java

@@ -58,6 +58,8 @@ public interface IBuilderProcess extends IBaritoneProcess {
 
     void buildOpenSchematic();
 
+    void buildOpenLitematic();
+
     void buildOpenLitematic(int i);
 
     void pause();

src/main/java/baritone/command/defaults/LitematicaCommand.java

@@ -40,11 +40,13 @@ public class LitematicaCommand extends Command {
             if (args.is(Integer.class)) {
                 schematic = args.getAs(Integer.class) - 1;
             }
-        }
-        try {
-            baritone.getBuilderProcess().buildOpenLitematic(schematic);
-        } catch (IndexOutOfBoundsException e) {
-            logDirect("Pleas provide a valid index.");
+            try {
+                baritone.getBuilderProcess().buildOpenLitematic(schematic);
+            } catch (IndexOutOfBoundsException e) {
+                logDirect("Pleas provide a valid index.");
+            }
+        } else {
+            baritone.getBuilderProcess().buildOpenLitematic();
         }
     }
 

src/main/java/baritone/process/BuilderProcess.java

@@ -225,6 +225,20 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
         }
     }
 
+    @Override
+    public void buildOpenLitematic() {
+        if (LitematicaHelper.isLitematicaPresent()) {
+            Integer selectedIndex = LitematicaHelper.getSelectedIndex();
+            if (selectedIndex != -1) {
+                buildOpenLitematic(selectedIndex);
+            } else {
+                logDirect("No schematic currently selected");
+            }
+        } else {
+            logDirect("Litematica is not present");
+        }
+    }
+
     @Override
     public void buildOpenLitematic(int i) {
         if (LitematicaHelper.isLitematicaPresent()) {

src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java

@@ -54,6 +54,17 @@ public final class LitematicaHelper {
         return DataManager.getSchematicPlacementManager().getAllSchematicsPlacements().size() > 0;
     }
 
+    /**
+     * @return the index of the currently selected schematic. -1 if none selected.
+     */
+    public static Integer getSelectedIndex() {
+        try {
+            return DataManager.getSchematicPlacementManager().getAllSchematicsPlacements().indexOf(DataManager.getSchematicPlacementManager().getSelectedSchematicPlacement());
+        } catch (NullPointerException e) {
+            return -1;
+        }
+    }
+
     /**
      * @param i index of the Schematic in the schematic placement list.
      * @return the name of the requested schematic.

src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacementManager.java

@@ -19,13 +19,21 @@ package fi.dy.masa.litematica.schematic.placement;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
 
 public class SchematicPlacementManager {
     private final List<SchematicPlacement> schematicPlacements = new ArrayList<>();
 
+    @Nullable
+    private SchematicPlacement selectedPlacement;
+
     //in case of a java.lang.NoSuchMethodError try change the name of this method to getAllSchematicPlacements()
     //there are inconsistencies in the litematica mod about the naming of this method
     public List<SchematicPlacement> getAllSchematicsPlacements() {
         return schematicPlacements;
     }
+
+    public SchematicPlacement getSelectedSchematicPlacement() {
+        return selectedPlacement;
+    }
 }