Skip to content

Commit b0815bc

Browse files
committed
Merge 1.19.2 into 1.19.4
2 parents ec1bacd + c684b56 commit b0815bc

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.embeddedt.modernfix.annotation.RequiresMod;
1414
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
1515
import org.objectweb.asm.ClassReader;
16+
import org.objectweb.asm.Type;
1617
import org.objectweb.asm.tree.AnnotationNode;
1718
import org.objectweb.asm.tree.ClassNode;
1819
import org.spongepowered.asm.mixin.Mixin;
@@ -51,10 +52,10 @@ private static boolean modPresent(String modId) {
5152
return ModernFixPlatformHooks.modPresent(modId);
5253
}
5354

54-
private static final String MIXIN_DESC = Mixin.class.descriptorString();
55-
private static final String MIXIN_CLIENT_ONLY_DESC = ClientOnlyMixin.class.descriptorString();
56-
private static final String MIXIN_REQUIRES_MOD_DESC = RequiresMod.class.descriptorString();
57-
private static final String MIXIN_DEV_ONLY_DESC = IgnoreOutsideDev.class.descriptorString();
55+
private static final String MIXIN_DESC = Type.getDescriptor(Mixin.class);
56+
private static final String MIXIN_CLIENT_ONLY_DESC = Type.getDescriptor(ClientOnlyMixin.class);
57+
private static final String MIXIN_REQUIRES_MOD_DESC = Type.getDescriptor(RequiresMod.class);
58+
private static final String MIXIN_DEV_ONLY_DESC = Type.getDescriptor(IgnoreOutsideDev.class);
5859

5960
private static final Pattern PLATFORM_PREFIX = Pattern.compile("(forge|fabric|common)\\.");
6061

@@ -222,6 +223,7 @@ private ModernFixEarlyConfig(File file) {
222223
disableIfModPresent("mixin.bugfix.paper_chunk_patches", "c2me");
223224
disableIfModPresent("mixin.perf.cache_strongholds", "littletiles");
224225
disableIfModPresent("mixin.perf.nbt_memory_usage", "c2me");
226+
disableIfModPresent("mixin.bugfix.item_cache_flag", "lithium", "canary", "radium");
225227
// DimThread makes changes to the server chunk manager (understandably), C2ME probably does the same
226228
disableIfModPresent("mixin.bugfix.chunk_deadlock", "c2me", "dimthread");
227229
disableIfModPresent("mixin.perf.reuse_datapacks", "tac");

0 commit comments

Comments
 (0)