R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resource pack cache not invalidating on F3+T

Browse Source
This commit is contained in:
embeddedt 2023-05-10 17:02:15 -04:00
parent b5c08b996f
commit d97da8fe4c
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java Normal file
View File

@ -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<PackResources> 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();
}
}
}

5
common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java Normal file
View File

@ -0,0 +1,5 @@
package org.embeddedt.modernfix.resources;
public interface ICachingResourcePack {
void invalidateCache();
}

11
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/fabric_resourcepacks/ModNioResourcePackMixin.java → fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/resourcepacks/ModNioResourcePackMixin.java
View File

@ -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<String> getNamespaces(PackType type);
@Shadow @Final private Path basePath;
@ -27,6 +28,12 @@ public abstract class ModNioResourcePackMixin {
@Inject(method = "<init>", 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);
});

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

@ -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<String> getNamespaces(PackType type);
@Shadow(remap = false) @Final private ModFile modFile;
@ -32,10 +33,17 @@ public abstract class ModFileResourcePackMixin {
@Inject(method = "<init>", 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<Set<String>> cir) {
if(cacheEngine != null) {