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

Fix mixin.perf.resourcepacks overwriting Fusion patches

Browse Source 
Related: #392
This commit is contained in:
embeddedt 2024-04-13 22:26:23 -04:00
parent d7f2e90984
commit c15b95e2be
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ForgePathPackResourcesMixin.java
View File

@ -27,7 +27,7 @@ import java.util.Collection;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@Mixin(PathPackResources.class) @Mixin(value = PathPackResources.class, priority = 1100)
public abstract class ForgePathPackResourcesMixin implements ICachingResourcePack { public abstract class ForgePathPackResourcesMixin implements ICachingResourcePack {
@Shadow(remap = false) protected abstract Path resolve(String... paths); @Shadow(remap = false) protected abstract Path resolve(String... paths);
@ -75,14 +75,15 @@ public abstract class ForgePathPackResourcesMixin implements ICachingResourcePac
this.cacheEngine = null; this.cacheEngine = null;
} }
@Inject(method = "getNamespaces", at = @At("HEAD"), cancellable = true) @Redirect(method = "getNamespaces", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/resource/PathPackResources;getNamespacesFromDisk(Lnet/minecraft/server/packs/PackType;)Ljava/util/Set;"))
private void useCacheForNamespaces(PackType type, CallbackInfoReturnable<Set<String>> cir) { private Set<String> useCacheForNamespaces(PathPackResources instance, PackType type) {
PackResourcesCacheEngine engine = cacheEngine; PackResourcesCacheEngine engine = cacheEngine;
if(engine != null) { if(engine != null) {
Set<String> namespaces = engine.getNamespaces(type); Set<String> namespaces = engine.getNamespaces(type);
if(namespaces != null) if(namespaces != null)
cir.setReturnValue(namespaces); return namespaces;
} }
return this.getNamespacesFromDisk(type);
} }
@Redirect(method = "getRootResource", at = @At(value = "INVOKE", target = "Ljava/nio/file/Files;exists(Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Z")) @Redirect(method = "getRootResource", at = @At(value = "INVOKE", target = "Ljava/nio/file/Files;exists(Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Z"))