2.1.1 (1.21)

README.md

@@ -28,17 +28,17 @@ If you have any ideas, please let me know!
 ## Requirements
 
 - All Platforms
-    - [Minecraft](https://minecraft.net) `1.20.6`
+    - [Minecraft](https://minecraft.net) `1.21`
     - [YACL](https://github.com/isXander/yetanotherconfiglib) `3.*`
 - Fabric Only
     - [Fabric Loader](https://fabricmc.net/) `0.15.*` (or the equivalent [Quilt](https://quiltmc.org/) version)
-    - [ModMenu](https://github.com/TerraformersMC/ModMenu) `10.*`
-    - [Fabric Language Kotlin](https://github.com/FabricMC/fabric-language-kotlin) `1.10.*` (or the
+    - [ModMenu](https://github.com/TerraformersMC/ModMenu) `11.*`
+    - [Fabric Language Kotlin](https://github.com/FabricMC/fabric-language-kotlin) `1.11.*` (or the
       equivalent [QKL](https://modrinth.com/mod/qkl) version)
-    - [Fabric API](https://modrinth.com/mod/fabric-api) `0.90.*` (or the
+    - [Fabric API](https://modrinth.com/mod/fabric-api) `0.100.*` (or the
       equivalent [QFAPI](https://modrinth.com/mod/qsl) version)
 - NeoForge Only
-    - [NeoForge](https://neoforged.net/) `20.6.*`
+    - [NeoForge](https://neoforged.net/) `21.*`
     - [Kotlin for Forge](https://modrinth.com/mod/kotlin-for-forge) `5.*`
 
 ## Future Plans

build.gradle.kts

@@ -62,7 +62,7 @@ allprojects {
 		maven(uri("https://oss.sonatype.org/content/repositories/snapshots"))
 
 		mavenCentral()
-		mavenLocal() // currently using a 1.20.5 version of yacl for neoforge, which doesn't officially exist
+		// mavenLocal() // currently using a 1.20.5 version of yacl for neoforge, which doesn't officially exist
 	}
 
 	tasks {

common/src/main/java/io/github/trainb0y/fabrizoom/mixin/GuiMixin.java

@@ -2,6 +2,7 @@
 
 import io.github.trainb0y.fabrizoom.Overlay;
 import io.github.trainb0y.fabrizoom.ZoomLogic;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
@@ -21,9 +22,9 @@ public abstract class GuiMixin implements Overlay {
 
 	@Inject(
 			at = @At(value = "INVOKE", target = "net/minecraft/world/entity/player/Inventory.getArmor(I)Lnet/minecraft/world/item/ItemStack;"),
-			method = "renderCameraOverlays(Lnet/minecraft/client/gui/GuiGraphics;F)V"
+			method = "renderCameraOverlays(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V"
 	)
-	public void injectZoomOverlay(GuiGraphics context, float tickDelta, CallbackInfo ci) {
-		ZoomLogic.renderZoomOverlay(context, tickDelta, this);
+	public void injectZoomOverlay(GuiGraphics context, DeltaTracker tickDelta, CallbackInfo ci) {
+		ZoomLogic.renderZoomOverlay(context, tickDelta.getGameTimeDeltaTicks(), this);
 	}
 }

common/src/main/kotlin/io/github/trainb0y/fabrizoom/FabriZoom.kt

@@ -9,7 +9,7 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 object FabriZoom {
-	val ZOOM_OVERLAY = ResourceLocation("fabrizoom:textures/zoom_overlay.png")
+	val ZOOM_OVERLAY = ResourceLocation.parse("fabrizoom:textures/zoom_overlay.png")
 
 	lateinit var platform: Platform
 

fabric/src/main/resources/fabric.mod.json

@@ -31,12 +31,12 @@
   ],
   "depends": {
     "fabricloader": ">=0.15",
-    "fabric-language-kotlin": ">=1.10.19+kotlin.1.9.23",
+    "fabric-language-kotlin": ">=1.11.0+kotlin.2.0.0",
     "fabric-key-binding-api-v1": "*",
     "yet_another_config_lib_v3": "3.*.*"
   },
   "recommends": {
-    "modmenu": "10.*.*",
-    "minecraft": "1.20.6"
+    "modmenu": "11.*.*",
+    "minecraft": "1.21"
   }
 }

gradle.properties

@@ -1,27 +1,27 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx3G
 # Kotlin
-kotlin_version=1.9.23
-kotlinx_json_version=1.6.3
+kotlin_version=2.0.0
+kotlinx_json_version=1.7.0
 shadow_version=8.1.1
 # Minecraft
-minecraft_version=1.20.6
+minecraft_version=1.21
 enabled_platforms=fabric,neoforge
 # Architectury
 architectury_version=12.0.27-beta
 architectury_loom_version=1.6-SNAPSHOT
 architectury_gradle_plugin_version=3.4-SNAPSHOT
 # Fabric
-fabric_loader_version=0.15.10
-fabric_kotlin_version=1.10.19+kotlin.1.9.23
-fabric_api_version=0.97.8+1.20.6
+fabric_loader_version=0.15.11
+fabric_kotlin_version=1.11.0+kotlin.2.0.0
+fabric_api_version=0.100.1+1.21
 # NeoForge
-neoforge_version=20.6.2-beta
-forge_kotlin_version=5.0.1
+neoforge_version=21.0.0-beta
+forge_kotlin_version=5.2.0
 # Dependencies
-fabric_mod_menu_version=10.0.0-beta.1
-yacl_version=3.4.1+1.20.5
+fabric_mod_menu_version=11.0.0-beta.1
+yacl_version=3.5.0+1.21
 # Mod Properties
-mod_version=2.1.0+1.20.6
+mod_version=2.1.1+1.21
 maven_group=io.github.trainb0y
 archives_base_name=fabrizoom

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-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/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -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
@@ -130,26 +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=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
@@ -198,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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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
 
@@ -57,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
 

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -17,20 +17,20 @@ config = "fabrizoom.mixins.json"
 [[dependencies.fabrizoom]]
 modId = "neoforge"
 mandatory = true
-versionRange = "[20,)"
+versionRange = "[21.0.0-beta,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.fabrizoom]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.6]"
+versionRange = "[1.21]"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.fabrizoom]]
 modId = "yet_another_config_lib_v3"
 mandatory = true
-versionRange = "[3.4,)"
+versionRange = "[3.5,)"
 ordering = "NONE"
 side = "CLIENT"