Update build script and fix mixin crash

build.gradle

@@ -1,16 +1,11 @@
 plugins {
-    id "fabric-loom" version "1.3-SNAPSHOT"
-    id 'legacy-looming' version "1.3-SNAPSHOT"
-    id 'io.github.juuxel.loom-vineflower' version "1.11.0"
+    id "fabric-loom" version "1.4-SNAPSHOT"
+    id 'legacy-looming' version "1.4-SNAPSHOT"
     id "com.modrinth.minotaur" version "2.+"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
     id "maven-publish"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
+base.archivesName = project.archives_base_name
 version = "${project.mod_version}+${project.minecraft_version_supported}"
 group = project.maven_group
 
@@ -42,12 +37,6 @@ dependencies {
     modImplementation "maven.modrinth:legacy-mod-menu:${modmenu_version}"
 }
 
-def includeFabricApiModule(String moduleName) {
-    Object dependency = fabricApi.module(moduleName, project.fabric_version)
-    dependencies.modImplementation(dependency)
-    dependencies.include(dependency)
-}
-
 processResources {
     Map modJsonProperties = Map.of(
             "version", project.version,
@@ -64,10 +53,15 @@ processResources {
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
 
-    it.options.release = 8
+    if (JavaVersion.current().isJava9Compatible()) {
+        it.options.release = 8
+    }
 }
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
     withSourcesJar()
 }
 

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
     # https://grayray75.github.io/LegacyFabric-Versions/
     minecraft_version=1.8.9
-    yarn_mappings_build=514
-    loader_version=0.14.21
+    yarn_mappings_build=533
+    loader_version=0.14.25
 
 # Mod Properties
     mod_version=3.1.0

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.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -144,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
@@ -201,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" \

src/main/java/io/grayray75/mods/fpsdisplay/FpsDisplayMod.java

@@ -29,7 +29,7 @@ public void onInitializeClient() {
                 "key.fpsdisplay.category"));
 
         ClientTickEvents.START_CLIENT_TICK.register(client -> {
-            int currentFps = ((MinecraftClientAccessor) client).getCurrentFps();
+            int currentFps = MinecraftClientAccessor.getCurrentFps();
             FpsHistory.add(currentFps);
         });
 

src/main/java/io/grayray75/mods/fpsdisplay/mixin/InGameHudMixin.java

@@ -23,10 +23,10 @@ public void render(float tickDelta, CallbackInfo info) {
         if (!client.options.debugEnabled && config.enabled && config.textAlpha > 3 && FpsDisplayMod.ShowOverlay) {
             String text;
             if (!config.advancedStats) {
-                text = ((MinecraftClientAccessor) client).getCurrentFps() + " FPS";
+                text = MinecraftClientAccessor.getCurrentFps() + " FPS";
             }
             else {
-                text = String.format("%d FPS (%d min | %d avg | %d max)", ((MinecraftClientAccessor) client).getCurrentFps(),
+                text = String.format("%d FPS (%d min | %d avg | %d max)", MinecraftClientAccessor.getCurrentFps(),
                         FpsDisplayMod.FpsHistory.getMinimum(), FpsDisplayMod.FpsHistory.getAverage(), FpsDisplayMod.FpsHistory.getMaximum());
             }
 

src/main/java/io/grayray75/mods/fpsdisplay/mixin/MinecraftClientAccessor.java

@@ -7,5 +7,7 @@
 @Mixin(MinecraftClient.class)
 public interface MinecraftClientAccessor {
     @Accessor("currentFps")
-    int getCurrentFps();
+    public static int getCurrentFps() {
+        throw new AssertionError();
+    }
 }