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

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-05-11 10:37:59 -04:00
commit 9efbc47f78
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/ReloadableResourceManagerMixin.java
View File

@ -1,27 +1,18 @@
package org.embeddedt.modernfix.common.mixin.perf.resourcepacks; package org.embeddedt.modernfix.common.mixin.perf.resourcepacks;
import net.minecraft.server.packs.PackResources;
import net.minecraft.server.packs.resources.ReloadableResourceManager; import net.minecraft.server.packs.resources.ReloadableResourceManager;
import net.minecraft.util.Unit;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.resources.ICachingResourcePack; import org.embeddedt.modernfix.resources.PackResourcesCacheEngine;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@Mixin(ReloadableResourceManager.class) @Mixin(ReloadableResourceManager.class)
public class ReloadableResourceManagerMixin { public class ReloadableResourceManagerMixin {
@Inject(method = "createReload", at = @At("HEAD")) @Inject(method = "createReload", at = @At("HEAD"))
private void invalidateResourceCaches(Executor backgroundExecutor, Executor gameExecutor, CompletableFuture<Unit> waitingFor, List<PackResources> resourcePacks, CallbackInfoReturnable<?> cir) { private void invalidateResourceCaches(CallbackInfoReturnable<?> cir) {
ModernFix.LOGGER.info("Invalidating pack caches"); ModernFix.LOGGER.info("Invalidating pack caches");
for(PackResources pack : resourcePacks) { PackResourcesCacheEngine.invalidate();
if(pack instanceof ICachingResourcePack)
((ICachingResourcePack)pack).invalidateCache();
}
} }
} }

16
common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
View File

@ -154,4 +154,20 @@ public class PackResourcesCacheEngine {
} }
return resources; return resources;
} }
private static final WeakHashMap<ICachingResourcePack, Boolean> 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();
});
}
}
} }

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

@ -32,6 +32,7 @@ public abstract class ModNioResourcePackMixin implements ICachingResourcePack {
@Inject(method = "<init>", at = @At("RETURN")) @Inject(method = "<init>", at = @At("RETURN"))
private void cacheResources(CallbackInfo ci) { private void cacheResources(CallbackInfo ci) {
invalidateCache(); invalidateCache();
PackResourcesCacheEngine.track(this);
} }
@Override @Override

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

@ -27,7 +27,8 @@ public abstract class ModFileResourcePackMixin implements ICachingResourcePack {
@Inject(method = "<init>", at = @At("TAIL")) @Inject(method = "<init>", at = @At("TAIL"))
private void cacheResources(String packName, Path source, CallbackInfo ci) { private void cacheResources(String packName, Path source, CallbackInfo ci) {
this.cacheEngine = null; invalidateCache();
PackResourcesCacheEngine.track(this);
} }
private PackResourcesCacheEngine generateResourceCache() { private PackResourcesCacheEngine generateResourceCache() {