Elytra in overworld

gradle.properties

@@ -12,7 +12,7 @@ forge_version=45.0.43
 
 fabric_version=0.14.11
 
-nether_pathfinder_version=1.4.1
+nether_pathfinder_version=1.6
 
 // These dependencies are used for common and tweaker
 // while mod loaders usually ship their own version

src/api/java/baritone/api/Settings.java

@@ -1543,6 +1543,36 @@ public final class Settings {
      */
     public final Setting<Boolean> elytraChatSpam = new Setting<>(false);
 
+    /**
+     * May reduce memory usage by using a custom allocator for pathfinding
+     */
+    public final Setting<Boolean> elytraCustomAllocator = new Setting<>(true);
+
+    /**
+     * Allow the pathfinder to attempt flight in tighter spaces, useful in caves but can be dangerous.
+     */
+    public final Setting<Boolean> elytraAllowTightSpaces = new Setting<>(false);
+
+    /**
+     * Allow the pathfinder to fly above y 128 in the nether.
+     */
+    public final Setting<Boolean> elytraAllowAboveRoof = new Setting<>(false);
+
+    /**
+     * Allow the pathfinder to access the baritone cache to improve pathing
+     */
+    public final Setting<Boolean> elytraUseCache = new Setting<>(true);
+
+    /**
+     * Allow the pathfinder to fly above the build limit in the overworld and end.
+     */
+    public final Setting<Boolean> elytraAllowAboveBuildLimit = new Setting<>(true);
+
+    /**
+     * Minimum distance in blocks of an elytra trip before the pathfinder will try to fly above build limit. (Minimum: 32). Requires {@link #elytraAllowAboveBuildLimit} to be enabled.
+     */
+    public final Setting<Integer> elytraLongDistanceThreshold = new Setting<>(500);
+
     /**
      * A map of lowercase setting field names to their respective setting
      */

src/api/java/baritone/api/pathing/elytra/IElytraContextFactory.java

@@ -0,0 +1,26 @@
+/*
+ * 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.api.pathing.elytra;
+
+import baritone.api.utils.IPlayerContext;
+
+import java.nio.file.Path;
+
+public interface IElytraContextFactory {
+    IElytraPathfinderContext create(IPlayerContext ctx, Path cacheDir);
+}

src/api/java/baritone/api/pathing/elytra/IElytraPathfinderContext.java

@@ -0,0 +1,56 @@
+/*
+ * 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.api.pathing.elytra;
+
+import baritone.api.event.events.BlockChangeEvent;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.phys.Vec3;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface IElytraPathfinderContext {
+    public boolean hasChunk(ChunkPos pos);
+    public void queueCacheCulling(int chunkX, int chunkZ, int maxDistanceBlocks);
+    public void queueForPacking(final LevelChunk chunkIn);
+    public void queueBlockUpdate(BlockChangeEvent event);
+    public CompletableFuture<UnpackedSegment> pathFindAsync(final BlockPos src, final BlockPos dst);
+    public boolean raytrace(final double startX, final double startY, final double startZ,
+                            final double endX, final double endY, final double endZ);
+    public boolean raytrace(final Vec3 start, final Vec3 end);
+    public boolean raytrace(final int count, final double[] src, final double[] dst, final int visibility);
+    public void cancel();
+    public void destroy();
+    public long getSeed();
+
+    public void RLock();
+    public void RUnlock();
+
+    public int getMaxHeight();
+    public boolean passable(int x, int y, int z);
+
+    public static final class Visibility {
+        public static final int ALL = 0;
+        public static final int NONE = 1;
+        public static final int ANY = 2;
+        private Visibility() {}
+    }
+}
+
+

src/main/java/baritone/process/elytra/UnpackedSegment.java → src/api/java/baritone/api/pathing/elytra/UnpackedSegment.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.process.elytra;
+package baritone.api.pathing.elytra;
 
 import baritone.api.utils.BetterBlockPos;
 import dev.babbaj.pathfinder.PathSegment;

src/api/java/baritone/api/process/IElytraProcess.java

@@ -17,6 +17,7 @@
 
 package baritone.api.process;
 
+import baritone.api.pathing.elytra.IElytraContextFactory;
 import baritone.api.pathing.goals.Goal;
 import net.minecraft.core.BlockPos;
 
@@ -43,6 +44,11 @@ public interface IElytraProcess extends IBaritoneProcess {
      */
     boolean isLoaded();
 
+
+    IElytraContextFactory getContextFactory();
+    void setContextFactory(IElytraContextFactory factory);
+
+
     /*
      * FOR INTERNAL USE ONLY. MAY BE REMOVED AT ANY TIME.
      */

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

@@ -71,9 +71,6 @@ public void execute(String label, IArgConsumer args) throws CommandException {
             if (iGoal == null) {
                 throw new CommandInvalidStateException("No goal has been set");
             }
-            if (ctx.world().dimension() != Level.NETHER) {
-                throw new CommandInvalidStateException("Only works in the nether");
-            }
             try {
                 elytra.pathTo(iGoal);
             } catch (IllegalArgumentException ex) {
@@ -85,7 +82,11 @@ public void execute(String label, IArgConsumer args) throws CommandException {
         final String action = args.getString();
         switch (action) {
             case "reset": {
-                elytra.resetState();
+                try {
+                    elytra.resetState();
+                } catch (IllegalArgumentException ex) {
+                    throw new CommandInvalidStateException(ex.getMessage());
+                }
                 logDirect("Reset state but still flying to same goal");
                 break;
             }
@@ -128,22 +129,26 @@ private Component suggest2b2tSeeds() {
     private void gatekeep() {
         MutableComponent gatekeep = Component.literal("");
         gatekeep.append("To disable this message, enable the setting elytraTermsAccepted\n");
-        gatekeep.append("Baritone Elytra is an experimental feature. It is only intended for long distance travel in the Nether using fireworks for vanilla boost. It will not work with any other mods (\"hacks\") for non-vanilla boost. ");
+        gatekeep.append("Baritone Elytra is an experimental feature. It is intended for long distance travel in the Nether but will also work in the Overworld, using fireworks for vanilla boost. It will not work with any other mods (\"hacks\") for non-vanilla boost. ");
         MutableComponent gatekeep2 = Component.literal("If you want Baritone to attempt to take off from the ground for you, you can enable the elytraAutoJump setting (not advisable on laggy servers!). ");
         gatekeep2.setStyle(gatekeep2.getStyle().withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.literal(Baritone.settings().prefix.value + "set elytraAutoJump true"))));
         gatekeep.append(gatekeep2);
         MutableComponent gatekeep3 = Component.literal("If you want Baritone to go slower, enable the elytraConserveFireworks setting and/or decrease the elytraFireworkSpeed setting. ");
         gatekeep3.setStyle(gatekeep3.getStyle().withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.literal(Baritone.settings().prefix.value + "set elytraConserveFireworks true\n" + Baritone.settings().prefix.value + "set elytraFireworkSpeed 0.6\n(the 0.6 number is just an example, tweak to your liking)"))));
         gatekeep.append(gatekeep3);
-        MutableComponent gatekeep4 = Component.literal("Baritone Elytra ");
-        MutableComponent red = Component.literal("wants to know the seed");
-        red.setStyle(red.getStyle().withColor(ChatFormatting.RED).withUnderlined(true).withBold(true));
-        gatekeep4.append(red);
+        MutableComponent gatekeep4 = Component.literal("Baritone Elytra for use in the ");
+        MutableComponent red1 = Component.literal("Nether");
+        red1.setStyle(red1.getStyle().withColor(ChatFormatting.RED).withUnderlined(true).withBold(true));
+        gatekeep4.append(red1);
+        gatekeep4.append(", ");
+        MutableComponent red2 = Component.literal("wants to know the seed");
+        red2.setStyle(red2.getStyle().withColor(ChatFormatting.RED).withUnderlined(true).withBold(true));
+        gatekeep4.append(red2);
         gatekeep4.append(" of the world you are in. If it doesn't have the correct seed, it will frequently backtrack. It uses the seed to generate terrain far beyond what you can see, since terrain obstacles in the Nether can be much larger than your render distance. ");
         gatekeep.append(gatekeep4);
         gatekeep.append("\n");
         if (detectOn2b2t()) {
-            MutableComponent gatekeep5 = Component.literal("It looks like you're on 2b2t. ");
+            MutableComponent gatekeep5 = Component.literal("It looks like you're on 2b2t. Terrain prediction can be used but new nether terrain can not be predicted on 2b2t. ");
             gatekeep5.append(suggest2b2tSeeds());
             if (!Baritone.settings().elytraPredictTerrain.value) {
                 gatekeep5.append(Baritone.settings().prefix.value + "elytraPredictTerrain is currently disabled. ");

src/main/java/baritone/process/CustomGoalProcess.java

@@ -23,6 +23,7 @@
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
 import baritone.utils.BaritoneProcessHelper;
+import net.minecraft.ChatFormatting;
 
 /**
  * As set by ExampleBaritoneControl or something idk
@@ -57,7 +58,11 @@ public void setGoal(Goal goal) {
         this.goal = goal;
         this.mostRecentGoal = goal;
         if (baritone.getElytraProcess().isActive()) {
-            baritone.getElytraProcess().pathTo(goal);
+            try {
+                baritone.getElytraProcess().pathTo(goal);
+            } catch (IllegalArgumentException e) {
+                logDirect("Failed to update elytra goal because: " + e.getMessage(), ChatFormatting.RED);
+            }
         }
         if (this.state == State.NONE) {
             this.state = State.GOAL_SET;