Merge pull request #132 from quentin452/1.7.10-pathfinding-rust-rewrite

1.7.10 pathfinding rust rewrite

Author: quentin452

.gitignore

@@ -33,3 +33,5 @@ src/main/resources/mixins.*([!.]).json
 !gradlew.bat
 libs/ChromatiCraft 1.7.10 V33a.jar
 libs/DragonAPI 1.7.10 V33b.jar
+/optimizationsandtweaks_pathfinding/target
+/CoroUtil

README.md

@@ -9,6 +9,8 @@ The original ArchaicFix doesn't work with my mod due to MixinMapGenStructure on
 # Optimization / Feature List
 [Wiki](https://github.com/quentin452/OptimizationsAndTweaks/wiki)
 
+- Notable feature: **Rewrite Minecraft Pathfinding in Rust asynchronously**
+
 # Links for my project
 - [GitHub](https://github.com/quentin452/OptimizationsAndTweaks)
 - [Modrinth](https://modrinth.com/mod/optimizationsandtweaks)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

optimizationsandtweaks_pathfinding/.cargo/config.toml

@@ -0,0 +1,11 @@
+[target.x86_64-apple-darwin]
+linker = "x86_64-apple-darwin23.5-clang"
+ar = "x86_64-apple-darwin23.5-ar"
+
+[target.aarch64-apple-darwin]
+linker = "aarch64-apple-darwin23.5-clang"
+ar = "aarch64-apple-darwin23.5-ar"
+
+[target.x86_64-pc-windows-gnu]
+linker = "x86_64-w64-mingw32-gcc"
+ar = "x86_64-w64-mingw32-ar"

optimizationsandtweaks_pathfinding/.gitignore

@@ -0,0 +1,16 @@
+# Rust
+target/
+Cargo.lock
+
+# Java
+*.class
+*.jar
+
+# IDE
+.idea/
+.vscode/
+*.iml
+
+# OS
+.DS_Store
+Thumbs.db

optimizationsandtweaks_pathfinding/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "optimizationsandtweaks_pathfinding"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "optimizationsandtweaks_pathfinding"
+crate-type = ["cdylib"]
+
+[dependencies]
+jni = "0.21"
+lazy_static = "1.5.0"
+leaktracer = "0.1"
+rayon = "1.10"
+crossbeam = "0.8"
+lru = "0.12"

optimizationsandtweaks_pathfinding/build-all.py

@@ -0,0 +1,118 @@
+#!/usr/bin/env python3
+import os
+import subprocess
+import shutil
+import sys
+
+print("=== Building Rust FFI Library for All Platforms ===")
+
+# Get the directory where this script is located
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+os.chdir(SCRIPT_DIR)
+
+# Destination base directory
+DEST_BASE = os.path.abspath("../src/main/resources/assets/optimizationsandtweaks/natives")
+
+# Setup osxcross PATH if available
+OSXCROSS_PATH = os.path.expanduser("~/osxcross/target/bin")
+if os.path.isdir(OSXCROSS_PATH):
+    os.environ["PATH"] = f"{OSXCROSS_PATH}:{os.environ.get('PATH', '')}"
+    print(f"✓ osxcross found at {OSXCROSS_PATH}")
+
+def run(cmd, check=True):
+    print(f"$ {' '.join(cmd)}")
+    subprocess.run(cmd, check=check)
+
+def check_target(target):
+    result = subprocess.run(["rustup", "target", "list"], capture_output=True, text=True)
+    if f"{target} (installed)" not in result.stdout:
+        print(f"Installing target {target}...")
+        run(["rustup", "target", "add", target])
+
+def build_for_target(target, os_dir, lib_name):
+    print(f"\n=== Building for {target} ===")
+    run(["cargo", "build", "--release", "--target", target])
+
+    dest_dir = os.path.join(DEST_BASE, os_dir)
+    os.makedirs(dest_dir, exist_ok=True)
+
+    # Try with "lib" prefix first (Linux/macOS convention)
+    src_path = os.path.join(SCRIPT_DIR, "target", target, "release", lib_name)
+    src_path_with_lib = os.path.join(SCRIPT_DIR, "target", target, "release", f"lib{lib_name}")
+    
+    # Check which file exists
+    if os.path.isfile(src_path_with_lib):
+        src_path = src_path_with_lib
+    elif not os.path.isfile(src_path):
+        print(f"✗ Warning: Library not found at {src_path} or {src_path_with_lib}")
+        return
+    
+    dest_path = os.path.join(dest_dir, lib_name)
+    shutil.copy2(src_path, dest_path)
+    print(f"✓ Copied {lib_name} to {dest_path}")
+
+# Linux x86_64
+check_target("x86_64-unknown-linux-gnu")
+build_for_target("x86_64-unknown-linux-gnu", "linux", "liboptimizationsandtweaks_pathfinding.so")
+
+# Windows x86_64
+check_target("x86_64-pc-windows-gnu")
+if shutil.which("x86_64-w64-mingw32-gcc"):
+    build_for_target("x86_64-pc-windows-gnu", "windows", "optimizationsandtweaks_pathfinding.dll")
+else:
+    print("⚠ Warning: MinGW-w64 not found. Skipping Windows build.\n  Install with: sudo apt-get install mingw-w64")
+
+# macOS - Build both architectures and create universal binary
+macos_x86_built = False
+macos_arm_built = False
+
+check_target("x86_64-apple-darwin")
+if sys.platform == "darwin" or shutil.which("x86_64-apple-darwin23.5-clang"):
+    print("\n=== Building for x86_64-apple-darwin ===")
+    run(["cargo", "build", "--release", "--target", "x86_64-apple-darwin"])
+    macos_x86_built = True
+else:
+    print("⚠ Warning: macOS x86_64 build requires macOS host or osxcross. Skipping.")
+
+check_target("aarch64-apple-darwin")
+if sys.platform == "darwin" or shutil.which("aarch64-apple-darwin23.5-clang"):
+    print("\n=== Building for aarch64-apple-darwin ===")
+    run(["cargo", "build", "--release", "--target", "aarch64-apple-darwin"])
+    macos_arm_built = True
+else:
+    print("⚠ Warning: macOS ARM64 build requires macOS host or osxcross. Skipping.")
+
+# Create universal binary if both architectures were built
+if macos_x86_built and macos_arm_built:
+    print("\n=== Creating macOS Universal Binary ===")
+    dest_dir = os.path.join(DEST_BASE, "macos")
+    os.makedirs(dest_dir, exist_ok=True)
+    
+    x86_lib = os.path.join(SCRIPT_DIR, "target", "x86_64-apple-darwin", "release", "liboptimizationsandtweaks_pathfinding.dylib")
+    arm_lib = os.path.join(SCRIPT_DIR, "target", "aarch64-apple-darwin", "release", "liboptimizationsandtweaks_pathfinding.dylib")
+    universal_lib = os.path.join(dest_dir, "liboptimizationsandtweaks_pathfinding.dylib")
+    
+    if shutil.which("lipo"):
+        run(["lipo", "-create", "-output", universal_lib, x86_lib, arm_lib])
+        print(f"✓ Created universal binary at {universal_lib}")
+    else:
+        print("⚠ Warning: 'lipo' not found. Copying ARM64 version only.")
+        shutil.copy2(arm_lib, universal_lib)
+        print(f"✓ Copied ARM64 library to {universal_lib}")
+elif macos_x86_built:
+    dest_dir = os.path.join(DEST_BASE, "macos")
+    os.makedirs(dest_dir, exist_ok=True)
+    x86_lib = os.path.join(SCRIPT_DIR, "target", "x86_64-apple-darwin", "release", "liboptimizationsandtweaks_pathfinding.dylib")
+    dest_path = os.path.join(dest_dir, "liboptimizationsandtweaks_pathfinding.dylib")
+    shutil.copy2(x86_lib, dest_path)
+    print(f"✓ Copied x86_64 library to {dest_path}")
+elif macos_arm_built:
+    dest_dir = os.path.join(DEST_BASE, "macos")
+    os.makedirs(dest_dir, exist_ok=True)
+    arm_lib = os.path.join(SCRIPT_DIR, "target", "aarch64-apple-darwin", "release", "liboptimizationsandtweaks_pathfinding.dylib")
+    dest_path = os.path.join(dest_dir, "liboptimizationsandtweaks_pathfinding.dylib")
+    shutil.copy2(arm_lib, dest_path)
+    print(f"✓ Copied ARM64 library to {dest_path}")
+
+print("\n=== Build Complete ===")
+print(f"Native libraries have been copied to:\n  {DEST_BASE}/linux/\n  {DEST_BASE}/windows/\n  {DEST_BASE}/macos/")

optimizationsandtweaks_pathfinding/build.rs

@@ -0,0 +1,29 @@
+use std::env;
+
+fn main() {
+    println!("cargo:rerun-if-changed=src/lib.rs");
+    
+    // Get the target information from environment variables set by cargo
+    let target = env::var("TARGET").unwrap();
+    let profile = env::var("PROFILE").unwrap();
+    
+    // Only copy the library after the build is complete (not during build.rs execution)
+    // This prevents the infinite loop issue
+    println!("cargo:warning=Building for target: {}", target);
+    println!("cargo:warning=Build profile: {}", profile);
+    
+    // Determine OS-specific subdirectory and library name based on target triple
+    let (os_dir, lib_name) = if target.contains("windows") {
+        ("windows", "optimizationsandtweaks_pathfinding.dll")
+    } else if target.contains("darwin") || target.contains("apple") {
+        ("macos", "optimizationsandtweaks_pathfinding.dylib")
+    } else if target.contains("linux") {
+        ("linux", "optimizationsandtweaks_pathfinding.so")
+    } else {
+        panic!("Unsupported target OS: {}", target);
+    };
+    
+    // Store the OS directory and library name for post-build script
+    println!("cargo:rustc-env=TARGET_OS_DIR={}", os_dir);
+    println!("cargo:rustc-env=TARGET_LIB_NAME={}", lib_name);
+}