From d7146a06674e3682f36dd6e7642e1f889f2f53b7 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 13 Jan 2024 11:14:59 -0500 Subject: [PATCH] Restrict resource pack cache to assets/ and data/ folders --- .../mixin/perf/resourcepacks/ModNioResourcePackMixin.java | 2 +- .../mixin/perf/resourcepacks/ModFileResourcePackMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java index 40358925..93356848 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java @@ -58,7 +58,7 @@ public abstract class ModNioResourcePackMixin implements ICachingResourcePack { @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 cir) { - if(cacheEngine != null) + if(cacheEngine != null && (path.startsWith("assets/") || path.startsWith("data/"))) cir.setReturnValue(this.cacheEngine.hasResource(path)); } } diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java index 55173bc5..c3e4c03c 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java @@ -56,7 +56,7 @@ public abstract class ModFileResourcePackMixin implements ICachingResourcePack { @Inject(method = "hasResource(Ljava/lang/String;)Z", at = @At(value = "HEAD"), cancellable = true) private void useCacheForExistence(String path, CallbackInfoReturnable cir) { - if(cacheEngine != null) + if(cacheEngine != null && (path.startsWith("assets/") || path.startsWith("data/"))) cir.setReturnValue(this.cacheEngine.hasResource(path)); }