Merge upstream port + fix conflicts

.github/workflows/publish.yml

@@ -13,11 +13,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for Gradlew
         run: chmod +x gradlew

components/mixin-config-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/fabric.gradle

@@ -3,7 +3,7 @@ apply plugin: "dev.architectury.loom"
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

lithium-mixin-config.md

@@ -20,22 +20,6 @@ mixin.gen.biome_noise_cache=false
 (default: `true`)  
 Mob AI optimizations  
 
-### `mixin.ai.nearby_entity_tracking`
-(default: `false`)  
-Event-based system for tracking nearby entities.
-
-Requirements:
-- `mixin.util.entity_section_position=true`
-- `mixin.util.accessors=true`  
-
-### `mixin.ai.nearby_entity_tracking.goals`
-(default: `true`)  
-A number of AI goals which query for nearby entities in the world every tick will use the event-based
-system for tracking nearby entities. In other words, instead of entities constantly polling to see if
-other entities are nearby, they will instead be notified only occasionally when such an entity enters
-their range.
-
-
 ### `mixin.ai.pathing`
 (default: `true`)  
 A faster code path is used for determining what kind of path-finding node type is associated with a
@@ -275,18 +259,6 @@ In chunks with many mobs in ladders a separate list of pushable entities for cra
 Requirements:
 - `mixin.chunk.entity_class_groups=true`  
 
-### `mixin.entity.data_tracker`
-(default: `true`)  
-Various entity data tracker optimizations  
-
-### `mixin.entity.data_tracker.no_locks`
-(default: `true`)  
-Remove unnecessary locking when accessing the data tracker  
-
-### `mixin.entity.data_tracker.use_arrays`
-(default: `true`)  
-Data trackers use a custom optimized entry map  
-
 ### `mixin.entity.fast_elytra_check`
 (default: `true`)  
 Skip repeatedly writing to the data tracker that an entity is not flying  
@@ -303,10 +275,6 @@ Skip checking whether an entity is inside powder snow for movement speed slowdow
 (default: `true`)  
 Access entities faster when accessing a relatively small number of entity sections  
 
-### `mixin.entity.hopper_minecart`
-(default: `true`)  
-Hopper minecarts search for item entities faster by combining multiple item entity searches. Also eliminates duplicated item entity pickup attempts  
-
 ### `mixin.entity.inactive_navigations`
 (default: `true`)  
 Block updates skip notifying mobs that won't react to the block update anyways  

src/main/java/me/jellysquid/mods/lithium/common/ai/MemoryModificationCounter.java

@@ -2,5 +2,5 @@
 
 public interface MemoryModificationCounter {
 
-    long getModCount();
+    long lithium$getModCount();
 }

src/main/java/me/jellysquid/mods/lithium/common/ai/pathing/BlockStatePathingCache.java

@@ -3,9 +3,9 @@
 import net.minecraft.entity.ai.pathing.PathNodeType;
 
 public interface BlockStatePathingCache {
-    PathNodeType getPathNodeType();
+    PathNodeType lithium$getPathNodeType();
 
-    PathNodeType getNeighborPathNodeType();
+    PathNodeType lithium$getNeighborPathNodeType();
 
     void lithium$initPathCache();
 }

src/main/java/me/jellysquid/mods/lithium/common/ai/pathing/PathNodeCache.java

@@ -5,9 +5,11 @@
 import me.jellysquid.mods.lithium.common.util.Pos;
 import me.jellysquid.mods.lithium.common.world.ChunkView;
 import me.jellysquid.mods.lithium.common.world.WorldHelper;
+import me.jellysquid.mods.lithium.mixin.ai.pathing.PathContextAccessor;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.ai.pathing.LandPathNodeMaker;
+import net.minecraft.entity.ai.pathing.PathContext;
 import net.minecraft.entity.ai.pathing.PathNodeType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
@@ -21,15 +23,15 @@ private static boolean isChunkSectionDangerousNeighbor(ChunkSection section) {
     }
 
     public static PathNodeType getPathNodeType(BlockState state) {
-        return ((BlockStatePathingCache) state).getPathNodeType();
+        return ((BlockStatePathingCache) state).lithium$getPathNodeType();
     }
 
     public static PathNodeType getNeighborPathNodeType(AbstractBlock.AbstractBlockState state) {
-        return ((BlockStatePathingCache) state).getNeighborPathNodeType();
+        return ((BlockStatePathingCache) state).lithium$getNeighborPathNodeType();
     }
 
     /**
-     * Returns whether or not a chunk section is free of dangers. This makes use of a caching layer to greatly
+     * Returns whether a chunk section is free of dangers. This makes use of a caching layer to greatly
      * accelerate neighbor danger checks when path-finding.
      *
      * @param section The chunk section to test for dangers
@@ -43,28 +45,26 @@ public static boolean isSectionSafeAsNeighbor(ChunkSection section) {
         }
 
         if (BlockStateFlags.ENABLED) {
-            return !((BlockCountingSection) section).mayContainAny(BlockStateFlags.PATH_NOT_OPEN);
+            return !((BlockCountingSection) section).lithium$mayContainAny(BlockStateFlags.PATH_NOT_OPEN);
         }
         return !isChunkSectionDangerousNeighbor(section);
     }
 
 
-    public static PathNodeType getNodeTypeFromNeighbors(BlockView world, BlockPos.Mutable pos, PathNodeType type) {
-        int x = pos.getX();
-        int y = pos.getY();
-        int z = pos.getZ();
+    public static PathNodeType getNodeTypeFromNeighbors(PathContext context, int x, int y, int z, PathNodeType fallback) {
+        BlockView world = context.getWorld();
 
         ChunkSection section = null;
 
         // Check that all the block's neighbors are within the same chunk column. If so, we can isolate all our block
         // reads to just one chunk and avoid hits against the server chunk manager.
-        if (world instanceof ChunkView chunkView && WorldHelper.areNeighborsWithinSameChunkSection(pos)) {
+        if (world instanceof ChunkView chunkView && WorldHelper.areNeighborsWithinSameChunkSection(x, y, z)) {
             // If the y-coordinate is within bounds, we can cache the chunk section. Otherwise, the if statement to check
             // if the cached chunk section was initialized will early-exit.
             if (!world.isOutOfHeightLimit(y)) {
-                Chunk chunk = chunkView.getLoadedChunk(Pos.ChunkCoord.fromBlockCoord(x), Pos.ChunkCoord.fromBlockCoord(z));
+                Chunk chunk = chunkView.lithium$getLoadedChunk(Pos.ChunkCoord.fromBlockCoord(x), Pos.ChunkCoord.fromBlockCoord(z));
 
-                // If the chunk is absent, the cached section above will remain null, as there is no chunk section anyways.
+                // If the chunk is absent, the cached section above will remain null, as there is no chunk section anyway.
                 // An empty chunk or section will never pose any danger sources, which will be caught later.
                 if (chunk != null) {
                     section = chunk.getSectionArray()[Pos.SectionYIndex.fromBlockCoord(world, y)];
@@ -75,7 +75,7 @@ public static PathNodeType getNodeTypeFromNeighbors(BlockView world, BlockPos.Mu
             // section is empty or contains any dangerous blocks within the palette. If not, we can assume any checks
             // against this chunk section will always fail, allowing us to fast-exit.
             if (section == null || PathNodeCache.isSectionSafeAsNeighbor(section)) {
-                return type;
+                return fallback; //TODO side effects of vanilla's path node caching
             }
         }
 
@@ -103,19 +103,19 @@ public static PathNodeType getNodeTypeFromNeighbors(BlockView world, BlockPos.Mu
                     if (section != null) {
                         state = section.getBlockState(adjX & 15, adjY & 15, adjZ & 15);
                     } else {
-                        state = world.getBlockState(pos.set(adjX, adjY, adjZ));
+                        BlockPos.Mutable pos = ((PathContextAccessor) context).getLastNodePos().set(adjX, adjY, adjZ);
+                        state = world.getBlockState(pos);
                     }
 
-                    // Ensure that the block isn't air first to avoid expensive hash table accesses
                     if (state.isAir()) {
                         continue;
                     }
 
                     PathNodeType neighborType = PathNodeCache.getNeighborPathNodeType(state);
 
-                    if (neighborType == null) { //Here null means that no path node type is cached (uninitalized or dynamic)
+                    if (neighborType == null) { //Here null means that no path node type is cached (uninitialized or dynamic)
                         //Passing null as previous node type to the method signals to other lithium mixins that we only want the neighbor behavior of this block and not its neighbors
-                        neighborType = LandPathNodeMaker.getNodeTypeFromNeighbors(world, pos, null);
+                        neighborType = LandPathNodeMaker.getNodeTypeFromNeighbors(context, adjX + 1, adjY + 1, adjZ + 1, null);
                         //Here null means that the path node type is not changed by the block!
                         if (neighborType == null) {
                             neighborType = PathNodeType.OPEN;
@@ -128,7 +128,7 @@ public static PathNodeType getNodeTypeFromNeighbors(BlockView world, BlockPos.Mu
             }
         }
 
-        return type;
+        return fallback;
     }
 
 }

src/main/java/me/jellysquid/mods/lithium/common/ai/raid/OminousBannerCache.java

@@ -0,0 +1,7 @@
+package me.jellysquid.mods.lithium.common.ai.raid;
+
+import net.minecraft.item.ItemStack;
+
+public interface OminousBannerCache {
+    ItemStack lithium$getCachedOminousBanner();
+}