Added dynamic registry access via AddReloadListenerEvent

Author: Insane96

gradle.properties

@@ -17,5 +17,5 @@ mod_license=All Rights Reserved
 mod_version=6.0.0
 mod_group_id=insane96mcp.mobspropertiesrandomness
 
-insanelib_version=2.0.0.2-alpha
+insanelib_version=2.0.0.3-alpha
 insanelib_version_range=[2.0.0.0-alpha,)

src/main/java/insane96mcp/mobspropertiesrandomness/MPR.java

@@ -20,6 +20,7 @@
 import insane96mcp.mobspropertiesrandomness.data.serializer.*;
 import insane96mcp.mobspropertiesrandomness.setup.MPRConfig;
 import insane96mcp.mobspropertiesrandomness.util.MPRLogger;
+import insane96mcp.mobspropertiesrandomness.util.SerializerUtils;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
@@ -65,6 +66,7 @@ public MPR(IEventBus modEventBus, ModContainer modContainer) {
 
     @SubscribeEvent(priority = EventPriority.LOW)
     public void onAddReloadListener(AddReloadListenerEvent event) {
+        SerializerUtils.REGISTRY_ACCESS = event.getRegistryAccess();
         event.addListener(MPRPresetReloadListener.INSTANCE);
         event.addListener(MPRMobReloadListener.INSTANCE);
     }

src/main/java/insane96mcp/mobspropertiesrandomness/util/SerializerUtils.java

@@ -3,6 +3,7 @@
 import com.google.gson.*;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -13,6 +14,29 @@
 import java.util.List;
 
 public class SerializerUtils {
+    /**
+     * Set from AddReloadListenerEvent before any reload listener runs.
+     * Provides access to dynamic registries (e.g. minecraft:enchantment in 1.21+).
+     */
+    @Nullable
+    public static RegistryAccess REGISTRY_ACCESS = null;
+
+    /**
+     * Gets a registry by key, checking BuiltInRegistries first, then falling back to
+     * the RegistryAccess captured from AddReloadListenerEvent (needed for data-driven
+     * registries like enchantments in 1.21+).
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    private static <T> Registry<T> getRegistry(ResourceKey<Registry<T>> registryKey) {
+        Registry<T> reg = (Registry<T>) BuiltInRegistries.REGISTRY.get(registryKey.location());
+        if (reg != null)
+            return reg;
+        if (REGISTRY_ACCESS != null)
+            return REGISTRY_ACCESS.registry(registryKey).orElse(null);
+        return null;
+    }
+
     public static <T> List<T> deserializeList(JsonObject jObject, String memberName, JsonDeserializationContext context, Class<T> clazz) throws JsonParseException {
         return deserializeList(jObject, memberName, context, clazz, true);
     }
@@ -86,8 +110,7 @@ public static void serializeLocationList(JsonObject jObject, String memberName,
     public static <T> T deserializeRegistryObject(JsonElement jElement, ResourceKey<Registry<T>> registry) throws JsonParseException {
         if (!jElement.isJsonPrimitive())
             throw new JsonParseException("Expected %s to be a string".formatted(jElement));
-        //noinspection unchecked
-        Registry<T> reg = (Registry<T>) BuiltInRegistries.REGISTRY.get(registry.location());
+        Registry<T> reg = getRegistry(registry);
         if (reg == null)
             throw new JsonParseException("Unknown registry %s".formatted(registry.location()));
         ResourceLocation objectId = ResourceLocation.parse(jElement.getAsString());
@@ -141,8 +164,7 @@ public static <T> List<T> deserializeRegistryObjectList(JsonObject jObject, Stri
      * Serializes a registry object (raw T)
      */
     public static <T> JsonElement serializeRegistryObject(T object, ResourceKey<Registry<T>> registry) throws JsonParseException {
-        //noinspection unchecked
-        Registry<T> reg = (Registry<T>) BuiltInRegistries.REGISTRY.get(registry.location());
+        Registry<T> reg = getRegistry(registry);
         if (reg == null)
             throw new JsonParseException("Unknown registry %s".formatted(registry.location()));
         ResourceLocation objectId = reg.getKey(object);
@@ -181,8 +203,7 @@ public static <T> Holder<T> deserializeRegistryObjectAsHolder(JsonElement jEleme
         if (!jElement.isJsonPrimitive())
             throw new JsonParseException("Expected %s to be a string".formatted(jElement));
 
-        //noinspection unchecked
-        Registry<T> reg = (Registry<T>) BuiltInRegistries.REGISTRY.get(registry.location());
+        Registry<T> reg = getRegistry(registry);
         if (reg == null)
             throw new JsonParseException("Unknown registry %s".formatted(registry.location()));