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

Merge 1.19.4 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-07-13 21:43:49 -04:00
commit faccdb0ed7
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -13,6 +13,7 @@ import org.embeddedt.modernfix.annotation.IgnoreOutsideDev;
import org.embeddedt.modernfix.annotation.RequiresMod;
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.Mixin;
@ -51,10 +52,10 @@ public class ModernFixEarlyConfig {
return ModernFixPlatformHooks.modPresent(modId);
}
private static final String MIXIN_DESC = Mixin.class.descriptorString();
private static final String MIXIN_CLIENT_ONLY_DESC = ClientOnlyMixin.class.descriptorString();
private static final String MIXIN_REQUIRES_MOD_DESC = RequiresMod.class.descriptorString();
private static final String MIXIN_DEV_ONLY_DESC = IgnoreOutsideDev.class.descriptorString();
private static final String MIXIN_DESC = Type.getDescriptor(Mixin.class);
private static final String MIXIN_CLIENT_ONLY_DESC = Type.getDescriptor(ClientOnlyMixin.class);
private static final String MIXIN_REQUIRES_MOD_DESC = Type.getDescriptor(RequiresMod.class);
private static final String MIXIN_DEV_ONLY_DESC = Type.getDescriptor(IgnoreOutsideDev.class);
private static final Pattern PLATFORM_PREFIX = Pattern.compile("(forge|fabric|common)\\.");
@ -223,6 +224,7 @@ public class ModernFixEarlyConfig {
disableIfModPresent("mixin.bugfix.paper_chunk_patches", "c2me");
disableIfModPresent("mixin.perf.cache_strongholds", "littletiles");
disableIfModPresent("mixin.perf.nbt_memory_usage", "c2me");
disableIfModPresent("mixin.bugfix.item_cache_flag", "lithium", "canary", "radium");
// DimThread makes changes to the server chunk manager (understandably), C2ME probably does the same
disableIfModPresent("mixin.bugfix.chunk_deadlock", "c2me", "dimthread");
disableIfModPresent("mixin.perf.reuse_datapacks", "tac");