From 821a15ecaafdadcca9077524e3b5ac93c6cc646c Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 26 Apr 2023 14:15:24 -0400 Subject: [PATCH] Turn off Forge resource cache --- .../ResourceCacheManagerMixin.java | 15 ++++ .../VanillaPackResourcesMixin.java | 70 +++++++++++++++++-- src/main/resources/modernfix.mixins.json | 1 + 3 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/ResourceCacheManagerMixin.java diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/ResourceCacheManagerMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/ResourceCacheManagerMixin.java new file mode 100644 index 00000000..cd05ba6a --- /dev/null +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/ResourceCacheManagerMixin.java @@ -0,0 +1,15 @@ +package org.embeddedt.modernfix.mixin.perf.modern_resourcepacks; + +import net.minecraftforge.resource.ResourceCacheManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(value = ResourceCacheManager.class, remap = false) +public class ResourceCacheManagerMixin { + @Inject(method = "shouldUseCache", at = @At("HEAD"), cancellable = true) + private static void disableCache(CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } +} diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/VanillaPackResourcesMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/VanillaPackResourcesMixin.java index 8fc0086a..b2fb6978 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/VanillaPackResourcesMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/VanillaPackResourcesMixin.java @@ -1,22 +1,84 @@ package org.embeddedt.modernfix.mixin.perf.modern_resourcepacks; -import net.minecraft.resources.ResourceLocation; +import com.google.common.base.Joiner; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.LoadingCache; import net.minecraft.server.packs.PackType; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.VanillaPackResources; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +import org.apache.commons.lang3.tuple.Pair; +import org.embeddedt.modernfix.FileWalker; +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; 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.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Map; +import java.nio.file.*; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.stream.Stream; @Mixin(VanillaPackResources.class) public class VanillaPackResourcesMixin { @Shadow @Final private static Map ROOT_DIR_BY_TYPE; + private static LoadingCache, List> pathStreamLoadingCache = CacheBuilder.newBuilder() + .build(FileWalker.INSTANCE); + + private static Set containedPaths = null; + + @Inject(method = "", at = @At("TAIL")) + private void cacheContainedPaths(PackMetadataSection arg, String[] p_i47912_1_, CallbackInfo ci) { + if(containedPaths != null) + return; + containedPaths = new HashSet<>(); + Joiner slashJoiner = Joiner.on('/'); + for(PackType type : PackType.values()) { + if(!PackTypeHelper.isVanillaPackType(type)) + continue; + Path root = ROOT_DIR_BY_TYPE.get(type); + if(root == null) + throw new IllegalStateException("No filesystem for vanilla " + type.name() + " assets"); + try { + try(Stream stream = Files.walk(root)) { + stream + .map(path -> root.relativize(path.toAbsolutePath())) + .forEach(path -> containedPaths.add(slashJoiner.join(type.getDirectory(), path))); + } + } catch(IOException e) { + e.printStackTrace(); + } + } + } + + @Redirect(method = "getResources(Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V", at = @At(value = "INVOKE", target = "Ljava/nio/file/Files;walk(Ljava/nio/file/Path;[Ljava/nio/file/FileVisitOption;)Ljava/util/stream/Stream;")) + private static Stream useCacheForLoading(Path path, FileVisitOption[] fileVisitOptions) throws IOException { + try { + return pathStreamLoadingCache.get(Pair.of(path, Integer.MAX_VALUE)).stream(); + } catch (ExecutionException e) { + if(e.getCause() instanceof IOException) /* generally always should be */ + throw (IOException)e.getCause(); + else + throw new IOException(e); + } + } + + @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 cir) { + if(!PackTypeHelper.isVanillaPackType(type)) + return; + cir.setReturnValue(containedPaths.contains(type.getDirectory() + "/" + location.getNamespace() + "/" + FileUtil.normalize(location.getPath()))); + } /** * @author embeddedt diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json index b6949679..86a50955 100644 --- a/src/main/resources/modernfix.mixins.json +++ b/src/main/resources/modernfix.mixins.json @@ -10,6 +10,7 @@ "bugfix.edge_chunk_not_saved.ChunkManagerMixin", "perf.modern_resourcepacks.VanillaPackResourcesMixin", "perf.modern_resourcepacks.PathPackResourcesMixin", + "perf.modern_resourcepacks.ResourceCacheManagerMixin", "perf.dynamic_structure_manager.StructureManagerMixin", "bugfix.chunk_deadlock.ServerChunkCacheMixin", "perf.dedicated_reload_executor.MinecraftServerMixin",