optimization: only try to load resources from mods with the given namespace present

Author: contariaa

src/main/java/org/mcsr/speedrunapi/mixin/resourceloader/DefaultResourcePackMixin.java renamed to src/main/java/org/mcsr/speedrunapi/mixin/resourceloader/DefaultClientResourcePackMixin.java

@@ -13,15 +13,48 @@
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Stream;
 
 @Mixin(DefaultClientResourcePack.class)
-public abstract class DefaultResourcePackMixin {
-
+public abstract class DefaultClientResourcePackMixin {
     @Unique
     private static final boolean HAS_FABRIC_RESOURCE_LOADER = FabricLoader.getInstance().isModLoaded("fabric-resource-loader-v0");
+    @Unique
+    private static final Map<String, Set<ModContainer>> NAMESPACES_TO_MODS = new HashMap<>();
+
+    static {
+        for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
+            if (mod.getMetadata().getType().equals("builtin")) {
+                continue;
+            }
+            mod.findPath("assets").filter(Files::isDirectory).ifPresent(assets -> {
+                try (Stream<Path> stream = Files.list(assets)) {
+                    // skip empty namespace directories
+                    // some mods may have template directories left over
+                    if (!stream.findFirst().isPresent()) {
+                        return;
+                    }
+                } catch (IOException ignored) {
+                }
+
+                Set<String> namespaces = new HashSet<>();
+                try (Stream<Path> stream = Files.list(assets)) {
+                    stream.filter(Files::isDirectory).forEach(path -> namespaces.add(path.getFileName().toString()));
+                } catch (IOException e) {
+                    SpeedrunAPI.LOGGER.error("SpeedrunAPI failed to check resources for mod: {}", mod.getMetadata().getId());
+                }
+
+                for (String namespace : namespaces) {
+                    NAMESPACES_TO_MODS.computeIfAbsent(namespace, key -> new TreeSet<>(Comparator.comparing(m -> m.getMetadata().getId(), String::compareTo))).add(mod);
+                }
+            });
+        }
+    }
 
     @ModifyArg(
             method = "<init>",
@@ -30,36 +63,33 @@ public abstract class DefaultResourcePackMixin {
                     target = "Lnet/minecraft/resource/DefaultResourcePack;<init>([Ljava/lang/String;)V"
             )
     )
-    private static String[] addModNamespaces(String[] namespaces) {
+    private static String[] initModsToNamespaces(String[] namespaces) {
         if (HAS_FABRIC_RESOURCE_LOADER) {
             SpeedrunAPI.LOGGER.info("Disabling SpeedrunAPI resource loader in favor of fabric-resource-loader.");
             return namespaces;
         }
 
-        List<ModContainer> mods = new ArrayList<>(FabricLoader.getInstance().getAllMods());
-        mods.removeIf(mod -> mod.getMetadata().getType().equals("builtin"));
-
-        String[] allNamespaces = new String[mods.size() + namespaces.length];
-        int i;
-        for (i = 0; i < namespaces.length; i++) {
-            allNamespaces[i] = namespaces[i];
-        }
-        for (ModContainer mod : mods) {
-            allNamespaces[i++] = mod.getMetadata().getId();
-        }
-        return allNamespaces;
+        Set<String> combined = new LinkedHashSet<>();
+        combined.addAll(Arrays.asList(namespaces));
+        combined.addAll(NAMESPACES_TO_MODS.keySet());
+        return combined.toArray(new String[0]);
     }
 
     @Inject(method = "findInputStream", at = @At("HEAD"), cancellable = true)
     private void loadModResources(ResourceType type, Identifier id, CallbackInfoReturnable<InputStream> cir) {
         if (HAS_FABRIC_RESOURCE_LOADER) {
             return;
         }
-        for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
-            if (mod.getMetadata().getType().equals("builtin")) {
-                continue;
-            }
-            mod.findPath(type.getDirectory() + "/" + id.getNamespace() + "/" + id.getPath()).ifPresent(path -> {
+        // make sure only client resources are loaded
+        if (type != ResourceType.CLIENT_RESOURCES) {
+            return;
+        }
+        Set<ModContainer> mods = NAMESPACES_TO_MODS.get(id.getNamespace());
+        if (mods == null) {
+            return;
+        }
+        for (ModContainer mod : mods) {
+            mod.findPath("assets/" + id.getNamespace() + "/" + id.getPath()).ifPresent(path -> {
                 try {
                     cir.setReturnValue(path.toUri().toURL().openStream());
                 } catch (Exception e) {

src/main/resources/speedrunapi.mixins.json

@@ -8,7 +8,7 @@
   "client": [
     "entrypoint.MinecraftClientMixin",
     "gui.OptionsScreenMixin",
-    "resourceloader.DefaultResourcePackMixin"
+    "resourceloader.DefaultClientResourcePackMixin"
   ],
   "server": [
     "entrypoint.MinecraftDedicatedServerMixin"