Updated to 1.21.5

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.7.+"
+    id "fabric-loom" version "1.10-SNAPSHOT"
     id 'io.github.juuxel.loom-quiltflower' version '1.8.0'
     id 'maven-publish'
 }

gradle.properties

@@ -2,10 +2,10 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21
-yarn_mappings=1.21+build.7
-loader_version=0.15.11
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.13
 # Mod Properties
-mod_version=1.7
+mod_version=1.8
 maven_group=suso
 archives_base_name=datareload

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/suso/datareload/Utility.java

@@ -21,7 +21,16 @@ public static void sendMessage(Text t) {
     }
 
     public static String removeEx(String msg) {
-        msg = msg.substring(msg.indexOf(": ") + 2);
+        while(true) {
+            final var colonIndex = msg.indexOf(": ");
+            if(colonIndex == -1)
+                break;
+            if(msg.substring(0, colonIndex).contains(" ")) {
+                // Definitely not an error name, so it shouldn't be removed
+                break;
+            }
+            msg = msg.substring(colonIndex + 2);
+        }
         msg = msg.replace("Use JsonReader.setLenient(true) to accept m", "M");
         return msg;
     }

src/main/java/suso/datareload/mixin/loader/JsonDataMixin.java

@@ -1,5 +1,6 @@
 package suso.datareload.mixin.loader;
 
+import com.mojang.serialization.DataResult;
 import net.minecraft.resource.JsonDataLoader;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -11,15 +12,15 @@
 @Mixin(JsonDataLoader.class)
 public class JsonDataMixin {
     @ModifyArg(
-            method = "load",
+            method = "load(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/resource/ResourceFinder;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V",
             at = @At(
                     value = "INVOKE",
                     target = "Lorg/slf4j/Logger;error(Ljava/lang/String;[Ljava/lang/Object;)V",
                     remap = false
             ),
             index = 1
     )
-    private static Object[] parseError(Object[] args) {
+    private static Object[] fileError(Object[] args) {
         Object identifier = args[0];
         Object identifier2 = args[1];
         Exception var14 = (Exception)args[2];
@@ -33,4 +34,28 @@ private static Object[] parseError(Object[] args) {
         Utility.sendMessage(t);
         return args;
     }
+
+    @ModifyArg(
+            method = "method_63567",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lorg/slf4j/Logger;error(Ljava/lang/String;[Ljava/lang/Object;)V",
+                    remap = false
+            ),
+            index = 1
+    )
+    private static Object[] codecError(Object[] args) {
+        Object identifier = args[0];
+        Object identifier2 = args[1];
+        DataResult.Error<?> var14 = (DataResult.Error<?>)args[2];
+        Text t = Text.literal("\n")
+                .append(Utility.strToText("- Couldn't parse data file ", Formatting.RED))
+                .append(Utility.strToText(identifier2.toString(), Formatting.AQUA))
+                .append(Utility.strToText(" from ", Formatting.RED))
+                .append(Utility.strToText(identifier.toString(), Formatting.YELLOW))
+                .append(Utility.strToText("\n "))
+                .append(Utility.strToText(var14.message()));
+        Utility.sendMessage(t);
+        return args;
+    }
 }

src/main/java/suso/datareload/mixin/loader/LootMixin.java

@@ -12,14 +12,14 @@
 @Mixin(ReloadableRegistries.class)
 public class LootMixin {
     @Inject(
-            method = "method_58283",
+            method = "method_61242",
             at = @At(
                     value = "INVOKE",
                     target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V",
                     remap = false
             )
     )
-    private static void error(String name, String message, CallbackInfo ci) {
+    private static void validationWarning(String name, String message, CallbackInfo ci) {
         Text t = Text.literal("\n")
                 .append(Utility.strToText("- Validation problem in loot table ", Formatting.RED))
                 .append(Utility.strToText(name, Formatting.AQUA))

src/main/java/suso/datareload/mixin/loader/ServerAdvancementMixin.java

@@ -1,34 +1,31 @@
 package suso.datareload.mixin.loader;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.JsonElement;
-import net.minecraft.registry.RegistryOps;
 import net.minecraft.server.ServerAdvancementLoader;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import suso.datareload.Utility;
 
 @Mixin(ServerAdvancementLoader.class)
 public class ServerAdvancementMixin {
-    @ModifyVariable(
-            method = "method_20723",
+    @Inject(
+            method = "method_54922",
             at = @At(
                     value = "INVOKE",
-                    target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V",
+                    target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V",
                     remap = false
             )
     )
-    public Exception error(Exception var6, RegistryOps<JsonElement> ops, ImmutableMap.Builder<Identifier, JsonElement> map, Identifier id, JsonElement json) {
+    private static void validationWarning(Identifier id, String error, CallbackInfo ci) {
         Text t = Text.literal("\n")
-                .append(Utility.strToText("- Parsing error loading custom advancement ", Formatting.RED))
+                .append(Utility.strToText("- Validation problem in loot table ", Formatting.RED))
                 .append(Utility.strToText(id.toString(), Formatting.AQUA))
                 .append(Utility.strToText("\n "))
-                .append(Utility.strToText(var6.getMessage()));
+                .append(Utility.strToText(error));
         Utility.sendMessage(t);
-        return var6;
     }
 }

src/main/java/suso/datareload/mixin/loader/TagGroupMixin.java

@@ -54,7 +54,7 @@ public Object[] jsonError(Object[] args) {
                     remap = false
             )
     )
-    private static void referenceError(Identifier id, Collection<Object> collection, CallbackInfo ci) {
+    private static void referenceError(Identifier id, List<Object> collection, CallbackInfo ci) {
         Text t = Text.literal("\n")
                 .append(Utility.strToText("- Couldn't load tag ", Formatting.RED))
                 .append(Utility.strToText(id.toString(), Formatting.AQUA))

src/main/resources/datareload.mixins.json

@@ -8,7 +8,6 @@
     "loader.FunctionMixin",
     "loader.JsonDataMixin",
     "loader.LootMixin",
-    "loader.RecipeMixin",
     "loader.ResourcePackMixin",
     "loader.ServerAdvancementMixin",
     "loader.TagGroupMixin"