upstream/EndlessIDs
2
0 Fork 0
mirror of https://github.com/GTMEGA/EndlessIDs.git synced 2026-11-12 02:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compat with Ars Magica 2

Browse Source
This commit is contained in:
FalsePattern committed 2025-04-14 20:50:07 +02:00
1 parent ee8a836413
commit a61359086b
2 files changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
+3 -2
View File
@@ -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"),
src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java
+1
View File
@@ -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-")),