feat: Add compatibility with Salis Arcana

Closes: https://github.com/GTMEGA/EndlessIDs/issues/267
This commit is contained in:
FalsePattern committed 2025-09-25 19:31:19 +02:00
1 parent cb302ea1fa
commit 6b31762c17
4 files changed
+12 -1

No files matched your search

+3
View File
@@ -79,6 +79,9 @@ dependencies {
//Hbm's Nuclear Tech Mod 1.0.27X5188
compileOnly(deobfCurse("hbm-ntm-235439:6017897"))
//Salis Arcana 2.3.0
compileOnly(deobfCurse("salis-arcana-1162488:7016994"))
// endregion
// region unmaintained mods
@@ -48,7 +48,12 @@ public abstract class PotionEffectMixin {
recovery:
if (id != p_i1576_1_ && Potion.potionTypes[id] == null) {
//Maybe vanilla code?
val realId = id;
id = id & 0xFF;
if (Potion.potionTypes[id] == null) {
//Nope
id = realId;
}
}
if (Potion.potionTypes[id] == null) {
EndlessIDs.LOG.error("Encountered invalid potion ID: {}. See the following stacktrace for more info.", p_i1576_1_);
@@ -83,6 +83,7 @@ import static com.falsepattern.endlessids.mixin.plugin.TargetMod.RealisticTerrai
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.RealisticWorldGen;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.Restructured;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.Ruins;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.SalisArcana;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.Tardis;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.Thaumcraft;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.TheMistsOfRioV;
@@ -94,6 +95,7 @@ import static com.falsepattern.endlessids.mixin.plugin.TargetMod.Witchery;
import static com.falsepattern.endlessids.mixin.plugin.TargetMod.WorldEdit;
import static com.falsepattern.lib.mixin.v2.MixinHelper.avoid;
import static com.falsepattern.lib.mixin.v2.MixinHelper.builder;
import static com.falsepattern.lib.mixin.v2.MixinHelper.mods;
import static com.falsepattern.lib.mixin.v2.MixinHelper.require;
@SuppressWarnings("UnstableApiUsage")
@@ -525,7 +527,7 @@ public enum Mixin implements IMixins {
Potion_Thaumcraft(Phase.LATE,
Ext.Potion,
require(Thaumcraft),
mods(require(Thaumcraft), avoid(SalisArcana)),
common("potion.thaumcraft.ConfigMixin")),
// endregion Potion
@@ -47,6 +47,7 @@ public enum TargetMod implements ITargetMod {
GalaxySpace("galaxyspace.GalaxySpace"),
LordOfTheRings("lotr.common.LOTRMod"),
RandomThings("lumien.randomthings.RandomThings"),
SalisArcana("dev.rndmorris.salisarcana.SalisArcana"),
//regular mods
AbyssalCraft("com.shinoow.abyssalcraft.AbyssalCraft"),
AlternateTerrainGeneration("ttftcuts.atg.ATG"),