From c9ac3e4fa03f7e900a847c91d09929d118c313e5 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 27 Apr 2026 19:47:52 +0200 Subject: [PATCH 1/2] disable thaumcraft compat mixins with salis arcana --- .../java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java | 1 + .../com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java index b223f0fcd..176f6be7d 100644 --- a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java +++ b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java @@ -28,6 +28,7 @@ public enum Mixins implements IMixins { THAUMCRAFT(new MixinBuilder() .addClientMixins("thaumcraft.ClientTickEventsFMLMixin") .setPhase(Phase.LATE) + .addExcludedMod(TargetedMod.SALISARCANA) .addRequiredMod(TargetedMod.THAUMCRAFT)), NEI(new MixinBuilder() .addCommonMixins("nei.RecipeInfoMixin") diff --git a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java index 59755b4e2..f1bf0578d 100644 --- a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java +++ b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/TargetedMod.java @@ -6,6 +6,7 @@ public enum TargetedMod implements ITargetMod { + SALISARCANA("salisarcana"), THAUMCRAFT("Thaumcraft"), NEI("NotEnoughItems"); From d2a502d925707bd5c623f5caffb1714cca2630a9 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 28 Apr 2026 11:47:00 +0200 Subject: [PATCH 2/2] add comment --- .../java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java index 176f6be7d..5fac43332 100644 --- a/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java +++ b/src/main/java/com/cleanroommc/modularui/core/mixinplugin/Mixins.java @@ -28,6 +28,7 @@ public enum Mixins implements IMixins { THAUMCRAFT(new MixinBuilder() .addClientMixins("thaumcraft.ClientTickEventsFMLMixin") .setPhase(Phase.LATE) + // salis arcana implements the same mixin so our fails .addExcludedMod(TargetedMod.SALISARCANA) .addRequiredMod(TargetedMod.THAUMCRAFT)), NEI(new MixinBuilder()