From d97da8fe4c9999ac6dcd308d7ca4fb4bd0bae8d0 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 10 May 2023 17:02:15 -0400 Subject: [PATCH 1/2] Fix resource pack cache not invalidating on F3+T --- .../ReloadableResourceManagerMixin.java | 28 +++++++++++++++++++ .../resources/ICachingResourcePack.java | 5 ++++ .../ModNioResourcePackMixin.java | 11 ++++++-- .../ModFileResourcePackMixin.java | 10 ++++++- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java create mode 100644 common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java rename fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/{fabric_resourcepacks => resourcepacks}/ModNioResourcePackMixin.java (88%) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java new file mode 100644 index 00000000..9250fcbc --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java @@ -0,0 +1,28 @@ +package org.embeddedt.modernfix.common.mixin.perf.resourcepacks; + +import net.minecraft.server.packs.PackResources; +import net.minecraft.server.packs.resources.SimpleReloadableResourceManager; +import org.embeddedt.modernfix.ModernFix; +import org.embeddedt.modernfix.resources.ICachingResourcePack; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; + +@Mixin(SimpleReloadableResourceManager.class) +public class ReloadableResourceManagerMixin { + @Shadow @Final private List packs; + + @Inject(method = "createReload", at = @At("HEAD")) + private void invalidateResourceCaches(CallbackInfoReturnable cir) { + ModernFix.LOGGER.info("Invalidating pack caches"); + for(PackResources pack : this.packs) { + if(pack instanceof ICachingResourcePack) + ((ICachingResourcePack)pack).invalidateCache(); + } + } +} diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java b/common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java new file mode 100644 index 00000000..a9e42bde --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java @@ -0,0 +1,5 @@ +package org.embeddedt.modernfix.resources; + +public interface ICachingResourcePack { + void invalidateCache(); +} diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/fabric_resourcepacks/ModNioResourcePackMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java similarity index 88% rename from fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/fabric_resourcepacks/ModNioResourcePackMixin.java rename to fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java index 1ff34cd7..c839cdd6 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/fabric_resourcepacks/ModNioResourcePackMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java @@ -1,8 +1,9 @@ -package org.embeddedt.modernfix.fabric.mixin.perf.fabric_resourcepacks; +package org.embeddedt.modernfix.fabric.mixin.perf.resourcepacks; import net.fabricmc.fabric.impl.resource.loader.ModNioResourcePack; import net.minecraft.server.packs.PackType; import org.embeddedt.modernfix.annotation.RequiresMod; +import org.embeddedt.modernfix.resources.ICachingResourcePack; import org.embeddedt.modernfix.resources.PackResourcesCacheEngine; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -19,7 +20,7 @@ import java.util.Set; @Mixin(ModNioResourcePack.class) @RequiresMod("fabric-resource-loader-v0") -public abstract class ModNioResourcePackMixin { +public abstract class ModNioResourcePackMixin implements ICachingResourcePack { @Shadow public abstract Set getNamespaces(PackType type); @Shadow @Final private Path basePath; @@ -27,6 +28,12 @@ public abstract class ModNioResourcePackMixin { @Inject(method = "", at = @At("RETURN")) private void cacheResources(CallbackInfo ci) { + invalidateCache(); + } + + @Override + public void invalidateCache() { + this.cacheEngine = null; this.cacheEngine = new PackResourcesCacheEngine(this::getNamespaces, (type, namespace) -> { return basePath.resolve(type.getDirectory()).resolve(namespace); }); 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 d8cc1e46..8f7bf461 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 @@ -5,6 +5,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.ResourcePackFileNotFoundException; import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.packs.ModFileResourcePack; +import org.embeddedt.modernfix.resources.ICachingResourcePack; import org.embeddedt.modernfix.resources.PackResourcesCacheEngine; import org.embeddedt.modernfix.util.PackTypeHelper; import org.spongepowered.asm.mixin.Final; @@ -23,7 +24,7 @@ import java.util.*; import java.util.function.Predicate; @Mixin(ModFileResourcePack.class) -public abstract class ModFileResourcePackMixin { +public abstract class ModFileResourcePackMixin implements ICachingResourcePack { @Shadow public abstract Set getNamespaces(PackType type); @Shadow(remap = false) @Final private ModFile modFile; @@ -32,10 +33,17 @@ public abstract class ModFileResourcePackMixin { @Inject(method = "", at = @At("TAIL")) private void cacheResources(ModFile modFile, CallbackInfo ci) { + invalidateCache(); + } + + @Override + public void invalidateCache() { + this.cacheEngine = null; this.cacheEngine = new PackResourcesCacheEngine(this::getNamespaces, (type, namespace) -> { return modFile.getLocator().findPath(modFile, type.getDirectory(), namespace); }); } + @Inject(method = "getNamespaces", at = @At("HEAD"), cancellable = true) private void useCacheForNamespaces(PackType type, CallbackInfoReturnable> cir) { if(cacheEngine != null) { From d427c5e05005b9ac1ce5453203fb9d591de44e44 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 10 May 2023 18:12:32 -0400 Subject: [PATCH 2/2] Invalidate pack caches directly instead of iterating resource manager pack list --- .../ReloadableResourceManagerMixin.java | 14 ++------------ .../resources/PackResourcesCacheEngine.java | 16 ++++++++++++++++ .../resourcepacks/ModNioResourcePackMixin.java | 1 + .../resourcepacks/ModFileResourcePackMixin.java | 1 + 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java index 9250fcbc..04fb2d8a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java @@ -1,28 +1,18 @@ package org.embeddedt.modernfix.common.mixin.perf.resourcepacks; -import net.minecraft.server.packs.PackResources; import net.minecraft.server.packs.resources.SimpleReloadableResourceManager; import org.embeddedt.modernfix.ModernFix; -import org.embeddedt.modernfix.resources.ICachingResourcePack; -import org.spongepowered.asm.mixin.Final; +import org.embeddedt.modernfix.resources.PackResourcesCacheEngine; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.List; - @Mixin(SimpleReloadableResourceManager.class) public class ReloadableResourceManagerMixin { - @Shadow @Final private List packs; - @Inject(method = "createReload", at = @At("HEAD")) private void invalidateResourceCaches(CallbackInfoReturnable cir) { ModernFix.LOGGER.info("Invalidating pack caches"); - for(PackResources pack : this.packs) { - if(pack instanceof ICachingResourcePack) - ((ICachingResourcePack)pack).invalidateCache(); - } + PackResourcesCacheEngine.invalidate(); } } diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java index a8333fa3..8c592cdf 100644 --- a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java +++ b/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java @@ -154,4 +154,20 @@ public class PackResourcesCacheEngine { } return resources; } + + private static final WeakHashMap cachingPacks = new WeakHashMap<>(); + public static void track(ICachingResourcePack pack) { + synchronized (cachingPacks) { + cachingPacks.put(pack, Boolean.TRUE); + } + } + + public static void invalidate() { + synchronized (cachingPacks) { + cachingPacks.keySet().forEach(pack -> { + if(pack != null) + pack.invalidateCache(); + }); + } + } } 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 c839cdd6..89d0681e 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 @@ -29,6 +29,7 @@ public abstract class ModNioResourcePackMixin implements ICachingResourcePack { @Inject(method = "", at = @At("RETURN")) private void cacheResources(CallbackInfo ci) { invalidateCache(); + PackResourcesCacheEngine.track(this); } @Override 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 8f7bf461..55173bc5 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 @@ -34,6 +34,7 @@ public abstract class ModFileResourcePackMixin implements ICachingResourcePack { @Inject(method = "", at = @At("TAIL")) private void cacheResources(ModFile modFile, CallbackInfo ci) { invalidateCache(); + PackResourcesCacheEngine.track(this); } @Override