From 9e95be14f38f2fc7a2ca3eddd9f69695e0470b75 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:35:12 -0400
Subject: [PATCH] Ignore non-vanilla PackTypes when caching resources

---
 .../perf/resourcepacks/ModFileResourcePackMixin.java     | 9 ++++++++-
 .../mixin/perf/resourcepacks/VanillaPackMixin.java       | 5 +++++
 .../org/embeddedt/modernfix/util/PackTypeHelper.java     | 9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java

diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
index 1804f3c2..daabe881 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.packs.ModFileResourcePack;
 import org.apache.commons.lang3.tuple.Triple;
 import org.embeddedt.modernfix.util.CachedResourcePath;
 import org.embeddedt.modernfix.util.FileUtil;
+import org.embeddedt.modernfix.util.PackTypeHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -47,12 +48,16 @@ public abstract class ModFileResourcePackMixin {
         this.useNamespaceCaches = false;
         this.namespacesByType = new EnumMap<>(PackType.class);
         for(PackType type : PackType.values()) {
+            if(!PackTypeHelper.isVanillaPackType(type))
+                continue;
             this.namespacesByType.put(type, this.getNamespaces(type));
         }
         this.useNamespaceCaches = true;
         this.rootListingByNamespaceAndType = new EnumMap<>(PackType.class);
         this.containedPaths = new HashSet<>();
         for(PackType type : PackType.values()) {
+            if(!PackTypeHelper.isVanillaPackType(type))
+                continue;
             Set<String> namespaces = this.namespacesByType.get(type);
             HashMap<String, List<CachedResourcePath>> rootListingForNamespaces = new HashMap<>();
             for(String namespace : namespaces) {
@@ -98,7 +103,7 @@ public abstract class ModFileResourcePackMixin {
 
     @Inject(method = "getNamespaces", at = @At("HEAD"), cancellable = true)
     private void useCacheForNamespaces(PackType type, CallbackInfoReturnable<Set<String>> cir) {
-        if(useNamespaceCaches) {
+        if(useNamespaceCaches && PackTypeHelper.isVanillaPackType(type)) {
             cir.setReturnValue(this.namespacesByType.get(type));
         }
     }
@@ -124,6 +129,8 @@ public abstract class ModFileResourcePackMixin {
     @Inject(method = "getResources", at = @At("HEAD"), cancellable = true)
     private void fastGetResources(PackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate<String> filter, CallbackInfoReturnable<Collection<ResourceLocation>> cir)
     {
+        if(!PackTypeHelper.isVanillaPackType(type))
+            return;
         if(!pathIn.endsWith("/"))
             pathIn = pathIn + "/";
         final String testPath = pathIn;
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java
index 018f0cd5..4e991034 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java
@@ -11,6 +11,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.embeddedt.modernfix.FileWalker;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.util.FileUtil;
+import org.embeddedt.modernfix.util.PackTypeHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -42,6 +43,8 @@ public class VanillaPackMixin {
         containedPaths = new HashSet<>();
         Joiner slashJoiner = Joiner.on('/');
         for(PackType type : PackType.values()) {
+            if(!PackTypeHelper.isVanillaPackType(type))
+                continue;
             FileSystem fs = JAR_FILESYSTEM_BY_TYPE.get(type);
             if(fs == null)
                 throw new IllegalStateException("No filesystem for vanilla " + type.name() + " assets");
@@ -72,6 +75,8 @@ public class VanillaPackMixin {
 
     @Inject(method = "hasResource", at = @At(value = "INVOKE", target = "Ljava/lang/Class;getResource(Ljava/lang/String;)Ljava/net/URL;"), cancellable = true)
     private void useCacheForExistence(PackType type, ResourceLocation location, CallbackInfoReturnable<Boolean> cir) {
+        if(!PackTypeHelper.isVanillaPackType(type))
+            return;
         cir.setReturnValue(containedPaths.contains(type.getDirectory() + "/" + location.getNamespace() + "/" + FileUtil.normalize(location.getPath())));
     }
 }
diff --git a/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java b/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java
new file mode 100644
index 00000000..13a76311
--- /dev/null
+++ b/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java
@@ -0,0 +1,9 @@
+package org.embeddedt.modernfix.util;
+
+import net.minecraft.server.packs.PackType;
+
+public class PackTypeHelper {
+    public static boolean isVanillaPackType(PackType type) {
+        return type == PackType.CLIENT_RESOURCES || type == PackType.SERVER_DATA;
+    }
+}