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

Merge 1.16 into 1.18

Browse Source
This commit is contained in:
embeddedt 2024-01-13 11:16:03 -05:00
commit 0a8a88047c
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,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) @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<Boolean> cir) { private void useCacheForExistence(String path, CallbackInfoReturnable<Boolean> cir) {
if(cacheEngine != null) if(cacheEngine != null && (path.startsWith("assets/") || path.startsWith("data/")))
cir.setReturnValue(this.cacheEngine.hasResource(path)); cir.setReturnValue(this.cacheEngine.hasResource(path));
} }
} }

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

@ -76,7 +76,7 @@ public abstract class ModFileResourcePackMixin implements ICachingResourcePack {
@Inject(method = "hasResource(Ljava/lang/String;)Z", at = @At(value = "HEAD"), cancellable = true) @Inject(method = "hasResource(Ljava/lang/String;)Z", at = @At(value = "HEAD"), cancellable = true)
private void useCacheForExistence(String path, CallbackInfoReturnable<Boolean> cir) { private void useCacheForExistence(String path, CallbackInfoReturnable<Boolean> cir) {
PackResourcesCacheEngine engine = this.generateResourceCache(); PackResourcesCacheEngine engine = this.generateResourceCache();
if(engine != null) if(engine != null && (path.startsWith("assets/") || path.startsWith("data/")))
cir.setReturnValue(engine.hasResource(path)); cir.setReturnValue(engine.hasResource(path));
} }