Replace the native nether-pathfinder with a Java port

build.gradle

@@ -72,18 +72,12 @@ allprojects {
             }
         }
         mavenCentral()
-        maven {
-            name = 'babbaj-repo'
-            url = 'https://babbaj.github.io/maven/'
-        }
     }
 
     dependencies {
         compileOnly "org.spongepowered:mixin:${project.mixin_version}"
         compileOnly "org.ow2.asm:asm:${project.asm_version}"
 
-        implementation "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-
         implementation 'com.google.code.findbugs:jsr305:3.0.2'
     }
 

fabric/build.gradle

@@ -47,7 +47,6 @@ dependencies {
         common sourceSet.output
         shadowCommon sourceSet.output
     }
-    include "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
 }
 
 processResources {

forge/build.gradle

@@ -54,7 +54,6 @@ dependencies {
         common sourceSet.output
         shadowCommon sourceSet.output
     }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
 }
 
 processResources {

gradle.properties

@@ -16,8 +16,6 @@ neoforge_version=9-beta
 
 fabric_version=0.16.9
 
-nether_pathfinder_version=1.6
-
 // These dependencies are used for common and tweaker
 // while mod loaders usually ship their own version
 mixin_version=0.8.5

neoforge/build.gradle

@@ -62,7 +62,6 @@ dependencies {
         common sourceSet.output
         shadowCommon sourceSet.output
     }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
 }
 
 processResources {

scripts/proguard.pro

@@ -54,11 +54,6 @@
 -dontwarn baritone.utils.schematic.schematica.**
 -dontwarn baritone.utils.schematic.litematica.**
 
-# nether-pathfinder uses JNI to acess its own classes
-# and some of our builds include it before running proguard
-# conservatively keep all of it, even though only PathSegment.<init> is needed
--keep,allowoptimization class dev.babbaj.pathfinder.** { *; }
-
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.
 -keepclasseswithmembers public class * {

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

@@ -1549,10 +1549,6 @@ 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.

src/main/java/baritone/cache/CachedRegion.java

@@ -44,7 +44,8 @@ public final class CachedRegion implements ICachedRegion {
     /**
      * Magic value to detect invalid cache files, or incompatible cache files saved in an old version of Baritone
      */
-    private static final int CACHED_REGION_MAGIC = 456022911;
+    // Public: the elytra pathfinder's region reader checks the same header.
+    public static final int CACHED_REGION_MAGIC = 456022911;
 
     /**
      * All of the chunks in this region: A 32x32 array of them.

src/main/java/baritone/process/ElytraProcess.java

@@ -110,9 +110,7 @@ private ElytraProcess(Baritone baritone) {
     }
 
     public static IElytraProcess create(final Baritone baritone) {
-        return NetherPathfinderContext.isSupported()
-                ? new ElytraProcess(baritone)
-                : new NullElytraProcess(baritone);
+        return new ElytraProcess(baritone);
     }
 
     @Override

src/main/java/baritone/process/elytra/BlockStateOctreeInterface.java

@@ -17,27 +17,28 @@
 
 package baritone.process.elytra;
 
-import dev.babbaj.pathfinder.NetherPathfinder;
-import dev.babbaj.pathfinder.Octree;
-import net.minecraft.world.level.dimension.DimensionType;
+import baritone.process.elytra.pathfinder.Chunk;
+import baritone.process.elytra.pathfinder.NetherPathfinder;
 
 /**
  * @author Brady
  */
 public final class BlockStateOctreeInterface {
 
     private final NetherPathfinderContext context;
-    private final long contextPtr;
+    private final NetherPathfinder pathfinder;
     private final int minY;
-    transient long chunkPtr;
+    // The chunk the last lookup fell in, so that a run of lookups inside one chunk costs one table
+    // lookup. Cleared under the write lock by whatever replaces or culls chunks.
+    Chunk chunk;
 
     // Guarantee that the first lookup will fetch the context by setting MAX_VALUE
     private int prevChunkX = Integer.MAX_VALUE;
     private int prevChunkZ = Integer.MAX_VALUE;
 
     public BlockStateOctreeInterface(final NetherPathfinderContext context) {
         this.context = context;
-        this.contextPtr = context.context;
+        this.pathfinder = context.context;
         this.minY = context.minY;
     }
 
@@ -48,11 +49,11 @@ public boolean get0(final int x, final int y, final int z) {
         }
         final int chunkX = x >> 4;
         final int chunkZ = z >> 4;
-        if (this.chunkPtr == 0 | ((chunkX ^ this.prevChunkX) | (chunkZ ^ this.prevChunkZ)) != 0) {
+        if (this.chunk == null | ((chunkX ^ this.prevChunkX) | (chunkZ ^ this.prevChunkZ)) != 0) {
             this.prevChunkX = chunkX;
             this.prevChunkZ = chunkZ;
-            this.chunkPtr = NetherPathfinder.getChunkOrDefault(this.contextPtr, chunkX, chunkZ, true);
+            this.chunk = this.pathfinder.getChunkOrDefault(chunkX, chunkZ, true);
         }
-        return Octree.getBlock(this.chunkPtr, x & 0xF, adjustedY, z & 0xF);
+        return this.chunk.isSolid(x & 0xF, adjustedY, z & 0xF);
     }
 }