feat(data-manipulation): introduce declarative (entrypoint-based) API for interceptor registration

libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/ResourcePackInterceptor.java

@@ -0,0 +1,33 @@
+package io.gitlab.jfronny.libjf.data.manipulation.api;
+
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.resource.metadata.ResourceMetadataReader;
+import net.minecraft.util.Identifier;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.function.Supplier;
+
+/**
+ * An interceptor for resource pack operations.
+ * Register as a libjf:resource_pack_interceptor entrypoint.
+ */
+public interface ResourcePackInterceptor {
+    default InputSupplier<InputStream> openRoot(String[] fileName, InputSupplier<InputStream> previous, ResourcePack pack) {
+        return previous;
+    }
+
+    default InputSupplier<InputStream> open(ResourceType type, Identifier id, InputSupplier<InputStream> previous, ResourcePack pack) {
+        return previous;
+    }
+
+    default ResourcePack.ResultConsumer findResources(ResourceType type, String namespace, String prefix, ResourcePack.ResultConsumer previous, ResourcePack pack) {
+        return previous;
+    }
+
+    default <T> T parseMetadata(ResourceMetadataReader<T> reader, Supplier<T> previous, ResourcePack pack) throws IOException {
+        return previous.get();
+    }
+}

libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/api/UserResourceEvents.java

@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.util.function.Supplier;
 
 @SuppressWarnings("unused")
+@Deprecated
 public class UserResourceEvents {
     public static <TVal, TEx extends Throwable> TVal disable(ThrowingSupplier<TVal, TEx> then) throws TEx {
         try {

libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/ResourcePackHook.java

@@ -2,7 +2,9 @@ package io.gitlab.jfronny.libjf.data.manipulation.impl;
 
 import io.gitlab.jfronny.commons.LazySupplier;
 import io.gitlab.jfronny.commons.concurrent.ScopedValue;
-import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
+import io.gitlab.jfronny.libjf.LibJf;
+import io.gitlab.jfronny.libjf.data.manipulation.api.ResourcePackInterceptor;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resource.*;
 import net.minecraft.resource.metadata.ResourceMetadataReader;
 import net.minecraft.util.Identifier;
@@ -10,12 +12,17 @@ import org.jetbrains.annotations.ApiStatus;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 
 @SuppressWarnings("unused")
 @ApiStatus.Internal
 public class ResourcePackHook {
     @ApiStatus.Internal
     public static final ScopedValue<Boolean> DISABLED = new ScopedValue<>();
+    private static final List<ResourcePackInterceptor> INTERCEPTORS = FabricLoader.getInstance()
+            .getEntrypoints(LibJf.MOD_ID + ":resource_pack_interceptor", ResourcePackInterceptor.class)
+            .stream()
+            .toList();
 
     private static boolean isDisabled() {
         Boolean b = DISABLED.orElse(false);
@@ -24,22 +31,42 @@ public class ResourcePackHook {
 
     public static InputSupplier<InputStream> hookOpenRoot(InputSupplier<InputStream> value, ResourcePack pack, String[] fileName) {
         if (isDisabled()) return value;
-        return UserResourceEvents.OPEN_ROOT.invoker().openRoot(fileName, value, pack);
+        for (ResourcePackInterceptor interceptor : INTERCEPTORS) {
+            value = interceptor.openRoot(fileName, value, pack);
+        }
+        return value;
     }
 
     public static InputSupplier<InputStream> hookOpen(InputSupplier<InputStream> value, ResourcePack pack, ResourceType type, Identifier id) {
         if (isDisabled()) return value;
-        return UserResourceEvents.OPEN.invoker().open(type, id, value, pack);
+        for (ResourcePackInterceptor interceptor : INTERCEPTORS) {
+            value = interceptor.open(type, id, value, pack);
+        }
+        return value;
     }
 
     public static ResourcePack.ResultConsumer hookFindResources(ResourcePack pack, ResourceType type, String namespace, String prefix, ResourcePack.ResultConsumer target) {
         if (isDisabled()) return target;
-        return UserResourceEvents.FIND_RESOURCE.invoker().findResources(type, namespace, prefix, target, pack);
+        for (ResourcePackInterceptor interceptor : INTERCEPTORS.reversed()) {
+            target = interceptor.findResources(type, namespace, prefix, target, pack);
+        }
+        return target;
     }
 
     public static <T> T hookParseMetadata(T value, ResourcePack pack, ResourceMetadataReader<T> reader) throws IOException {
         if (isDisabled()) return value;
-        return UserResourceEvents.PARSE_METADATA.invoker().parseMetadata(reader, new LazySupplier<>(value), pack);
+        LazySupplier<T> lazy = new LazySupplier<>(value);
+        for (ResourcePackInterceptor interceptor : INTERCEPTORS) {
+            lazy = lazy.andThen(supplier -> {
+                try {
+                    return interceptor.parseMetadata(reader, supplier, pack);
+                } catch (IOException e) {
+                    LibJf.LOGGER.error("Could not call ResourcePack.OPEN_ROOT listener", e);
+                    return null;
+                }
+            });
+        }
+        return lazy.get();
     }
 
     public static <T> T hookParseMetadataEx(IOException ex, ResourcePack pack, ResourceMetadataReader<T> reader) throws IOException {

libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/UserResourceEventsInterceptor.java

@@ -0,0 +1,39 @@
+package io.gitlab.jfronny.libjf.data.manipulation.impl;
+
+import io.gitlab.jfronny.libjf.data.manipulation.api.ResourcePackInterceptor;
+import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.resource.metadata.ResourceMetadataReader;
+import net.minecraft.util.Identifier;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.function.Supplier;
+
+/**
+ * Glue code for the deprecated UserResourceEvents API.
+ */
+@Deprecated
+public class UserResourceEventsInterceptor implements ResourcePackInterceptor {
+    @Override
+    public InputSupplier<InputStream> openRoot(String[] fileName, InputSupplier<InputStream> previous, ResourcePack pack) {
+        return UserResourceEvents.OPEN_ROOT.invoker().openRoot(fileName, previous, pack);
+    }
+
+    @Override
+    public InputSupplier<InputStream> open(ResourceType type, Identifier id, InputSupplier<InputStream> previous, ResourcePack pack) {
+        return UserResourceEvents.OPEN.invoker().open(type, id, previous, pack);
+    }
+
+    @Override
+    public ResourcePack.ResultConsumer findResources(ResourceType type, String namespace, String prefix, ResourcePack.ResultConsumer previous, ResourcePack pack) {
+        return UserResourceEvents.FIND_RESOURCE.invoker().findResources(type, namespace, prefix, previous, pack);
+    }
+
+    @Override
+    public <T> T parseMetadata(ResourceMetadataReader<T> reader, Supplier<T> previous, ResourcePack pack) throws IOException {
+        return UserResourceEvents.PARSE_METADATA.invoker().parseMetadata(reader, previous, pack);
+    }
+}

libjf-data-manipulation-v0/src/main/resources/fabric.mod.json

@@ -16,9 +16,8 @@
   "environment": "*",
   "mixins": ["libjf-data-manipulation-v0.mixins.json"],
   "entrypoints": {
-    "libjf:asm": [
+    "libjf:asm": ["io.gitlab.jfronny.libjf.data.manipulation.impl.ResourcePackHookPatch"],
-      "io.gitlab.jfronny.libjf.data.manipulation.impl.ResourcePackHookPatch"
+    "libjf:resource_pack_interceptor": ["io.gitlab.jfronny.libjf.data.manipulation.impl.UserResourceEventsInterceptor"]
-    ]
   },
   "depends": {
     "fabricloader": ">=0.12.0",