Merge branch '1.21.5' into 1.21.8

Author: rfresh2

common/src/main/java/xaeroplus/feature/render/DrawFeatureFactory.java

@@ -11,6 +11,11 @@
 
 public interface DrawFeatureFactory {
 
+    /**
+     * Refreshed on MC render thread
+     * Single color across all highlights
+     * Color function is called each frame
+     */
     static DrawFeature chunkHighlights(
         String id,
         DirectChunkHighlightSupplier chunkHighlightSupplier,
@@ -28,6 +33,11 @@ static DrawFeature chunkHighlights(
         );
     }
 
+    /**
+     * Refreshed on MC render thread
+     * Color function per-chunk
+     * Color function is called only on refresh
+     */
     static DrawFeature multiColorChunkHighlights(
         String id,
         DirectChunkHighlightSupplier chunkHighlightSupplier,
@@ -45,6 +55,11 @@ static DrawFeature multiColorChunkHighlights(
         );
     }
 
+    /**
+     * Refreshed async, not on the MC render thread
+     * Single color across all highlights
+     * Color function is called each frame
+     */
     static DrawFeature asyncChunkHighlights(
         String id,
         AsyncChunkHighlightSupplier chunkHighlightSupplier,
@@ -60,6 +75,11 @@ static DrawFeature asyncChunkHighlights(
         );
     }
 
+    /**
+     * Refreshed async, not on the MC render thread
+     * Color function per-chunk
+     * Color function is called only on refresh
+     */
     static DrawFeature multiColorAsyncChunkHighlights(
         String id,
         AsyncChunkHighlightSupplier chunkHighlightSupplier,
@@ -75,6 +95,11 @@ static DrawFeature multiColorAsyncChunkHighlights(
         );
     }
 
+    /**
+     * Refreshed on MC render thread
+     * Single color across all lines
+     * Color function is called each frame
+     */
     static DrawFeature lines(
         String id,
         LineSupplier lineSupplier,
@@ -93,6 +118,11 @@ static DrawFeature lines(
         );
     }
 
+    /**
+     * Refreshed on MC render thread
+     * Color function per-line
+     * Color function is called only on refresh
+     */
     static DrawFeature multiColorLines(
         String id,
         MultiColorLineSupplier lineSupplier,
@@ -111,6 +141,9 @@ static DrawFeature multiColorLines(
         );
     }
 
+    /**
+     * Refreshed every frame on MC render thread
+     */
     static DrawFeature text(
         String id,
         TextSupplier textSupplier
@@ -121,7 +154,10 @@ static DrawFeature text(
         );
     }
 
-    static DrawFeature text(
+    /**
+     * Refreshed async, not on the MC render thread
+     */
+    static DrawFeature asyncText(
         String id,
         TextSupplier textSupplier,
         int refreshIntervalMs

common/src/main/java/xaeroplus/feature/render/highlight/AsyncChunkHighlightSupplier.java

@@ -6,5 +6,11 @@
 
 @FunctionalInterface
 public interface AsyncChunkHighlightSupplier {
+    /**
+     * Window = region xz center +- size. meaning the area is: (size*2)^2
+     * @return a map of long-packed chunk positions to timestamp
+     *         timestamp is unused in rendering but included to reduce memory copies
+     *         as this is the map type xp stores its own highlight data in
+     */
     Long2LongMap getHighlights(final int windowRegionX, final int windowRegionZ, final int windowRegionSize, final ResourceKey<Level> dimension);
 }

common/src/main/java/xaeroplus/feature/render/highlight/DirectChunkHighlightSupplier.java

@@ -6,5 +6,10 @@
 
 @FunctionalInterface
 public interface DirectChunkHighlightSupplier {
+    /**
+     * @return a map of long-packed chunk positions to timestamp
+     *         timestamp is unused in rendering but included to reduce memory copies
+     *         as this is the map type xp stores its own highlight data in
+     */
     Long2LongMap getHighlights(final ResourceKey<Level> dimension);
 }

common/src/main/java/xaeroplus/feature/render/line/LineSupplier.java

@@ -7,5 +7,8 @@
 
 @FunctionalInterface
 public interface LineSupplier {
+    /**
+     * Window = region xz center +- size. meaning the area is: (size*2)^2
+     */
     List<Line> getLines(final int windowRegionX, final int windowRegionZ, final int windowRegionSize, final ResourceKey<Level> dimension);
 }

common/src/main/java/xaeroplus/feature/render/line/MultiColorLineSupplier.java

@@ -6,5 +6,8 @@
 
 @FunctionalInterface
 public interface MultiColorLineSupplier {
+    /**
+     * @return Map of line to int color
+     */
     Object2IntMap<Line> getLines(final int windowRegionX, final int windowRegionZ, final int windowRegionSize, final ResourceKey<Level> dimension);
 }

common/src/main/java/xaeroplus/module/impl/RegionGrid.java

@@ -35,7 +35,7 @@ public void onEnable() {
             )
         );
         Globals.drawManager.registry().register(
-            DrawFeatureFactory.text(
+            DrawFeatureFactory.asyncText(
                 "RegionGridText",
                 this::getText,
                 250

fabric/build.gradle.kts

@@ -14,7 +14,8 @@ loom {
 	accessWidenerPath = project(":common").loom.accessWidenerPath
 	runs {
 		getByName("client") {
-			ideConfigGenerated(true)
+			generateRunConfig = true
+			preferGradleTask = true
 			client()
 		}
 	}
@@ -28,8 +29,10 @@ configurations.getByName("developmentFabric").extendsFrom(common)
 afterEvaluate {
 	loom.runs.configureEach {
 		// https://fabricmc.net/wiki/tutorial:mixin_hotswaps
-		vmArg("-javaagent:${ configurations.compileClasspath.get().find { it.name.contains("sponge-mixin") } }")
-//		vmArg("-Dmixin.debug.export=true")
+		jvmArguments.addAll(
+			"-javaagent:${ configurations.compileClasspath.get().find { it.name.contains("sponge-mixin") } }",
+//			"-Dmixin.debug.export=true"
+		)
 	}
 }
 

forge/build.gradle.kts

@@ -27,7 +27,8 @@ loom {
     }
     runs {
         getByName("client") {
-            ideConfigGenerated(true)
+            generateRunConfig = true
+            preferGradleTask = true
             client()
         }
     }

gradle.properties

@@ -3,22 +3,22 @@ org.gradle.parallel=false
 enabled_platforms=fabric,neoforge
 loom.ignoreDependencyLoomVersionValidation=true
 
-mod_version=2.31.6
+mod_version=2.32.0
 
 minecraft_version=1.21.8
 
 parchment_version=2025.07.20
 
-worldmap_version_fabric=1.40.16
+worldmap_version_fabric=1.41.0
 
-minimap_version_fabric=25.3.12
+minimap_version_fabric=26.1.0
 
-worldmap_version_forge=1.40.16
+worldmap_version_forge=1.41.0
 
-minimap_version_forge=25.3.12
+minimap_version_forge=26.1.0
 
-worldmap_version_neo=1.40.18
+worldmap_version_neo=1.41.0
 
-minimap_version_neo=25.3.12
+minimap_version_neo=26.1.0
 
 xaerolib_version=1.1.15