Update to 1.21.5

Author: ErrorCraft

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Mod Properties

src/main/java/net/errorcraft/codecium/mixin/minecraft/nbt/NbtOpsExtender.java

@@ -1,6 +1,7 @@
 package net.errorcraft.codecium.mixin.minecraft.nbt;
 
 import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.serialization.DataResult;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
@@ -19,12 +20,12 @@ public class NbtOpsExtender {
         method = "getNumberValue(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;",
         at = @At(
             value = "INVOKE",
-            target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
+            target = "Ljava/util/Optional;orElseGet(Ljava/util/function/Supplier;)Ljava/lang/Object;",
             remap = false
         )
     )
-    private Supplier<String> notANumberUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final NbtElement input) {
-        return () -> "Element is not a number: " + input;
+    private Supplier<DataResult<Number>> notANumberUseBetterErrorMessage(Supplier<DataResult<Number>> supplier, @Local(argsOnly = true) final NbtElement input) {
+        return () -> DataResult.error(() -> "Element is not a number: " + input);
     }
 
     @ModifyArg(

src/main/java/net/errorcraft/codecium/mixin/minecraft/util/IdentifierExtender.java

@@ -7,7 +7,6 @@
 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.ModifyArg;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -49,9 +48,8 @@ private static Supplier<String> identifierExceptionUseBetterMessage(Supplier<Str
             target = "Lnet/minecraft/util/Identifier;isNamespaceValid(Ljava/lang/String;)Z"
         )
     )
-    @Unique
     private static boolean validateNamespaceUseBetterMessage(String namespace, String path) {
-        for (int i = 0; i < namespace.length(); ++i) {
+        for (int i = 0; i < namespace.length(); i++) {
             if (!isNamespaceCharacterValid(namespace.charAt(i))) {
                 InvalidIdentifierException exception = new InvalidIdentifierException("Invalid character '" + namespace.charAt(i) + "' in namespace of resource location");
                 ((InvalidIdentifierExceptionAccess) exception).codecium$setGivenIdentifier(namespace + NAMESPACE_SEPARATOR + path);
@@ -69,7 +67,7 @@ private static boolean validateNamespaceUseBetterMessage(String namespace, Strin
         )
     )
     private static boolean validatePathUseBetterMessage(String path, String namespace) {
-        for (int i = 0; i < path.length(); ++i) {
+        for (int i = 0; i < path.length(); i++) {
             if (!isPathCharacterValid(path.charAt(i))) {
                 InvalidIdentifierException exception = new InvalidIdentifierException("Invalid character '" + path.charAt(i) + "' in path of resource location");
                 ((InvalidIdentifierExceptionAccess) exception).codecium$setGivenIdentifier(namespace + NAMESPACE_SEPARATOR + path);