Fix mixin conflict with lithium and its forks (#1229)

IzzelAliz · Mar 11, 2024 · b9be849 · b9be849
1 parent 8d86124
commit b9be849
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/...c/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java b/...c/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@Mixin(PortalForcer.class)
+@Mixin(value = PortalForcer.class, priority = 1500)
 public abstract class PortalForcerMixin implements TeleporterBridge {
 
     // @formatter:off
@@ -38,7 +38,7 @@ public abstract class PortalForcerMixin implements TeleporterBridge {
     @Shadow public abstract Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos p_192986_, boolean p_192987_, WorldBorder p_192988_);
     // @formatter:on
 
-    @ModifyVariable(method = "findPortalAround", index = 5, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;ensureLoadedAndValid(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;I)V"))
+    @ModifyVariable(method = "findPortalAround", ordinal = 0, at = @At(value = "STORE", ordinal = 0))
     private int arclight$useSearchRadius(int i) {
         return this.arclight$searchRadius == -1 ? i : this.arclight$searchRadius;
     }

diff --git a/...va/io/izzel/arclight/common/mixin/optimization/general/ClassInheritanceMultiMapMixin.java b/...va/io/izzel/arclight/common/mixin/optimization/general/ClassInheritanceMultiMapMixin.java
@@ -1,5 +1,7 @@
 package io.izzel.arclight.common.mixin.optimization.general;
 
+import io.izzel.arclight.common.mod.compat.ModIds;
+import io.izzel.arclight.common.mod.mixins.annotation.LoadIfMod;
 import net.minecraft.util.ClassInstanceMultiMap;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,6 +19,7 @@
 import java.util.Map;
 
 @Mixin(ClassInstanceMultiMap.class)
+@LoadIfMod(modid = {ModIds.LITHIUM, ModIds.CANARY, ModIds.RADIUM}, condition = LoadIfMod.ModCondition.ABSENT)
 public class ClassInheritanceMultiMapMixin<T> {
 
     // @formatter:off

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/ModIds.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/ModIds.java
@@ -3,4 +3,10 @@
 public class ModIds {
 
     public static final String IMMERSIVE_PORTALS = "immersive_portals";
+
+    // known lithium forks, so far
+    public static final String
+        LITHIUM = "lithium",
+        CANARY = "canary",
+        RADIUM = "radium";
 }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/LoadIfModProcessor.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/LoadIfModProcessor.java
@@ -6,6 +6,7 @@
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 
+import java.util.List;
 import java.util.Objects;
 
 public class LoadIfModProcessor {
@@ -17,17 +18,32 @@ static boolean shouldApply(ClassNode node) {
             if (ann.desc.equals(TYPE)) {
                 var loadIfModData = parse(ann);
                 return switch (loadIfModData.condition()) {
-                    case ABSENT -> !ArclightCommon.api().isModLoaded(loadIfModData.modid());
-                    case PRESENT -> ArclightCommon.api().isModLoaded(loadIfModData.modid());
+                    case ABSENT -> {
+                        for (var modid : loadIfModData.modids()) {
+                            if (ArclightCommon.api().isModLoaded(modid)) {
+                                yield false;
+                            }
+                        }
+                        yield true;
+                    }
+                    case PRESENT -> {
+                        for (var modid : loadIfModData.modids()) {
+                            if (ArclightCommon.api().isModLoaded(modid)) {
+                                yield true;
+                            }
+                        }
+                        yield false;
+                    }
                 };
             }
         }
         return true;
     }
 
+    @SuppressWarnings("unchecked")
     private static LoadIfModData parse(AnnotationNode ann) {
         LoadIfMod.ModCondition condition = null;
-        String modid = null;
+        List<String> modids = null;
         for (int i = 0; i < ann.values.size(); i += 2) {
             var name = ((String) ann.values.get(i));
             var value = ann.values.get(i + 1);
@@ -36,13 +52,13 @@ private static LoadIfModData parse(AnnotationNode ann) {
                     var condName = ((String[]) value)[1];
                     condition = LoadIfMod.ModCondition.valueOf(condName);
                 }
-                case "modid" -> modid = ((String) value);
+                case "modid" -> modids = ((List<String>) value);
             }
         }
         return new LoadIfModData(Objects.requireNonNull(condition, "condition"),
-            Objects.requireNonNull(modid, "modid"));
+            Objects.requireNonNull(modids, "modid"));
     }
 
-    private record LoadIfModData(LoadIfMod.ModCondition condition, String modid) {
+    private record LoadIfModData(LoadIfMod.ModCondition condition, List<String> modids) {
     }
 }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/annotation/LoadIfMod.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/annotation/LoadIfMod.java
@@ -9,7 +9,7 @@
 @Retention(RetentionPolicy.CLASS)
 public @interface LoadIfMod {
 
-    String modid();
+    String[] modid();
 
     ModCondition condition();