Merge pull-request #7 'unilock/1.20.4' into trunk

.gitignore

@@ -5,6 +5,10 @@ build/
 out/
 classes/
 
+# eclipse
+
+*.launch
+
 # idea
 
 .idea/
@@ -20,7 +24,17 @@ bin/
 .classpath
 .project
 
+# macos
+
+*.DS_Store
+
 # fabric
 
 run/
-remappedSrc
+
+# java
+
+hs_err_*.log
+replay_*.log
+*.hprof
+*.jfr

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ 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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # 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, 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.
+# 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" \

libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 
 # Minecraft
-minecraft_version = "1.20.2"
-minecraft_required = "1.20.2-"
-minecraft_compatible = "1.20.2"
+minecraft_version = "1.20.4"
+minecraft_required = "1.20.3-"
+minecraft_compatible = "1.20.3,1.20.4"
 
-fabric_loader = "0.14.21"
+fabric_loader = "0.14.25"
 
 # Libraries
-annotations = "24.0.1"
+annotations = "24.1.0"
 
 # Plugins
 loom = "1.+"

src/main/java/tfar/fastbench/mixin/CraftingContainerMixin.java

@@ -32,6 +32,7 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import tfar.fastbench.interfaces.CraftingInventoryDuck;
@@ -42,6 +43,7 @@ public class CraftingContainerMixin implements CraftingInventoryDuck {
 	@Shadow
 	@Final
 	private AbstractContainerMenu menu;
+	@Unique
 	public boolean checkMatrixChanges = true;
 
 

src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
     "quickbench.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.7.2",
+    "fabricloader": "*",
     "minecraft": ">=${minecraftRequired}"
   },
   "custom": {

src/main/resources/quickbench.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "tfar.fastbench.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
     "ContainerAccessor",
     "CraftingContainerMixin",