diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 89ad855..1562f28 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -32,6 +32,7 @@ import lombok.RequiredArgsConstructor; import java.util.List; import java.util.function.Predicate; +import static com.falsepattern.endlessids.mixin.plugin.TargetedMod.AM2; import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.avoid; import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.condition; import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.require; @@ -271,8 +272,8 @@ public enum Mixin implements IMixin { //region vanilla PotionEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.PotionEffectMixin"), PotionMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.PotionMixin"), - S1DPacketEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.network.S1DPacketEntityEffectMixin"), - S1EPacketRemoveEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.network.S1EPacketRemoveEntityEffectMixin"), + S1DPacketEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion).and(avoid(AM2)), "potion.vanilla.network.S1DPacketEntityEffectMixin"), + S1EPacketRemoveEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion).and(avoid(AM2)), "potion.vanilla.network.S1EPacketRemoveEntityEffectMixin"), //endregion vanilla //region Thaumcraft common_potion_Thaumcraft_ConfigMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion).and(require(TargetedMod.THAUMCRAFT)), "potion.thaumcraft.ConfigMixin"), diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index 16f6f13..63b3f4f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -36,6 +36,7 @@ public enum TargetedMod implements ITargetedMod { ABYSSALCRAFT("AbyssalCraft", false, contains("abyssalcraft-")), AROCKETRY("Advanced Rocketry", false, contains("advancedrocketry-")), ATG("Alternate Terrain Generation", false, contains("atg")), + AM2("Ars Magica 2", false, contains("am2").or(contains("arsmagica2"))), ANTIQUEATLAS("Antique Atlas", false, contains("antiqueatlas")), ANTIIDCONFLICT("Anti ID Conflict", false, contains("antiidconflict")), BOP("Biomes O' Plenty", false, contains("biomesoplenty-")),