Merge pull request #607 from babbaj/schematica

build the schematic schematica has open

USAGE.md

@@ -28,6 +28,7 @@ Some common examples:
 - `follow playerName` to follow a player. `follow` to follow the entity you're looking at (only works if it hitting range). `followplayers` to follow any players in range (combine with Kill Aura for a fun time).
 - `save waypointName` to save a waypoint. `goto waypointName` to go to it.
 - `build` to build a schematic. `build blah` will load `schematics/blah.schematic` and build it with the origin being your player feet. `build blah x y z` to set the origin. Any of those can be relative to your player (`~ 69 ~-420` would build at x=player x, y=69, z=player z-420).
+- `schematica` to build the schematic that is currently open in schematica
 - `tunnel` to dig just straight ahead and make a tunnel
 - `farm` to automatically harvest, replant, or bone meal crops
 - `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).

build.gradle

@@ -55,6 +55,14 @@ sourceSets {
     launch {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
+
+    schematica_api {
+        compileClasspath += main.compileClasspath
+    }
+    
+    main {
+        compileClasspath += schematica_api.output
+    }
 }
 
 minecraft {

scripts/proguard.pro

@@ -31,6 +31,11 @@
 # need to keep mixin names
 -keep class baritone.launch.** { *; }
 
+#try to keep usage of schematica in separate classes
+-keep class baritone.utils.schematic.schematica.**
+#proguard doesnt like it when it cant find our fake schematica classes
+-dontwarn baritone.utils.schematic.schematica.**
+
 # copy all necessary libraries into tempLibraries to build
 
 # The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with

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

@@ -54,6 +54,8 @@ public interface IBuilderProcess extends IBaritoneProcess {
         return build(schematicFile, file, origin);
     }
 
+    void buildOpenSchematic();
+
     void pause();
 
     void resume();

src/api/java/baritone/api/utils/ExampleBaritoneControl.java

@@ -295,6 +295,10 @@ public class ExampleBaritoneControl implements Helper, AbstractGameEventListener
             logDirect(success ? "Loaded" : "Unable to load");
             return true;
         }
+        if (msg.startsWith("schematica")) {
+            baritone.getBuilderProcess().buildOpenSchematic();
+            return true;
+        }
         if (msg.equals("come")) {
             customGoalProcess.setGoalAndPath(new GoalBlock(new BlockPos(Helper.mc.getRenderViewEntity())));
             logDirect("Coming");

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

@@ -35,6 +35,7 @@ import baritone.utils.BlockStateInterface;
 import baritone.utils.PathingCommandContext;
 import baritone.utils.schematic.AirSchematic;
 import baritone.utils.schematic.Schematic;
+import baritone.utils.schematic.schematica.SchematicaHelper;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockLiquid;
@@ -106,6 +107,20 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
         return true;
     }
 
+    @Override
+    public void buildOpenSchematic() {
+        if (SchematicaHelper.isSchematicaPresent()) {
+            Optional<Tuple<ISchematic, BlockPos>> schematic = SchematicaHelper.getOpenSchematic();
+            if (schematic.isPresent()) {
+                this.build(schematic.get().getFirst().toString(), schematic.get().getFirst(), schematic.get().getSecond());
+            } else {
+                logDirect("No schematic currently open");
+            }
+        } else {
+            logDirect("Schematica is not present");
+        }
+    }
+
     public void clearArea(BlockPos corner1, BlockPos corner2) {
         BlockPos origin = new BlockPos(Math.min(corner1.getX(), corner2.getX()), Math.min(corner1.getY(), corner2.getY()), Math.min(corner1.getZ(), corner2.getZ()));
         int widthX = Math.abs(corner1.getX() - corner2.getX()) + 1;

src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils.schematic.schematica;
+
+import baritone.api.utils.ISchematic;
+
+import com.github.lunatrius.schematica.client.world.SchematicWorld;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+
+public final class SchematicAdapter implements ISchematic {
+    private final SchematicWorld schematic;
+
+    public SchematicAdapter(SchematicWorld schematicWorld) {
+        this.schematic = schematicWorld;
+    }
+
+    @Override
+    public IBlockState desiredState(int x, int y, int z) {
+        return schematic.getSchematic().getBlockState(new BlockPos(x, y, z));
+    }
+
+    @Override
+    public int widthX() {
+        return schematic.getSchematic().getWidth();
+    }
+
+    @Override
+    public int heightY() {
+        return schematic.getSchematic().getHeight();
+    }
+
+    @Override
+    public int lengthZ() {
+        return schematic.getSchematic().getLength();
+    }
+}

src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils.schematic.schematica;
+
+import baritone.api.utils.ISchematic;
+import com.github.lunatrius.schematica.Schematica;
+import com.github.lunatrius.schematica.proxy.ClientProxy;
+import net.minecraft.util.Tuple;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.Optional;
+
+public enum SchematicaHelper {
+    ;
+
+    public static boolean isSchematicaPresent() {
+        try {
+            Class.forName(Schematica.class.getName());
+            return true;
+        } catch (ClassNotFoundException ex) {
+            return false;
+        }
+    }
+
+    public static Optional<Tuple<ISchematic, BlockPos>> getOpenSchematic() {
+        return Optional.ofNullable(ClientProxy.schematic)
+            .map(world -> new Tuple<>(new SchematicAdapter(world), world.position));
+    }
+
+}

src/schematica_api/java/com/github/lunatrius/core/util/math/MBlockPos.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.core.util.math;
+
+import net.minecraft.util.math.BlockPos;
+
+public class MBlockPos extends BlockPos {
+    MBlockPos() {
+        super(6, 6, 6);
+    }
+
+    @Override
+    public int getX() {
+        throw new LinkageError("LOL");
+    }
+
+    @Override
+    public int getY() {
+        throw new LinkageError("LOL");
+    }
+
+    @Override
+    public int getZ() {
+        throw new LinkageError("LOL");
+    }
+}

src/schematica_api/java/com/github/lunatrius/schematica/Schematica.java

@@ -0,0 +1,24 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.schematica;
+
+import com.github.lunatrius.schematica.proxy.CommonProxy;
+
+public class Schematica {
+    public static CommonProxy proxy;
+}

src/schematica_api/java/com/github/lunatrius/schematica/api/ISchematic.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.schematica.api;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+
+public interface ISchematic {
+    IBlockState getBlockState(BlockPos var1);
+
+    int getWidth();
+
+    int getHeight();
+
+    int getLength();
+}

src/schematica_api/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.schematica.client.world;
+
+import com.github.lunatrius.core.util.math.MBlockPos;
+import com.github.lunatrius.schematica.api.ISchematic;
+
+public class SchematicWorld {
+    public final MBlockPos position = (MBlockPos)(Object)"cringe";
+
+    public ISchematic getSchematic() {
+        throw new LinkageError("LOL");
+    }
+}

src/schematica_api/java/com/github/lunatrius/schematica/proxy/ClientProxy.java

@@ -0,0 +1,24 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.schematica.proxy;
+
+import com.github.lunatrius.schematica.client.world.SchematicWorld;
+
+public class ClientProxy extends CommonProxy {
+    public static SchematicWorld schematic;
+}

src/schematica_api/java/com/github/lunatrius/schematica/proxy/CommonProxy.java

@@ -0,0 +1,20 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.github.lunatrius.schematica.proxy;
+
+public abstract class CommonProxy {}