Merge 1.16 into 1.18

Author: embeddedt

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java

@@ -65,7 +65,7 @@ private void useCacheForNamespaces(PackType type, CallbackInfoReturnable<Set<Str
 
     @Inject(method = "hasResource", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/impl/resource/loader/ModNioResourcePack;getPath(Ljava/lang/String;)Ljava/nio/file/Path;"), cancellable = true)
     private void useCacheForExistence(String path, CallbackInfoReturnable<Boolean> cir) {
-        if(cacheEngine != null)
+        if(cacheEngine != null && (path.startsWith("assets/") || path.startsWith("data/")))
             cir.setReturnValue(this.cacheEngine.hasResource(path));
     }
 }

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java

@@ -76,7 +76,7 @@ private void useCacheForNamespaces(PackType type, CallbackInfoReturnable<Set<Str
     @Inject(method = "hasResource(Ljava/lang/String;)Z", at = @At(value = "HEAD"), cancellable = true)
     private void useCacheForExistence(String path, CallbackInfoReturnable<Boolean> cir) {
         PackResourcesCacheEngine engine = this.generateResourceCache();
-        if(engine != null)
+        if(engine != null && (path.startsWith("assets/") || path.startsWith("data/")))
             cir.setReturnValue(engine.hasResource(path));
     }