Rework AECapFix integration to not require AECF on the client side

also condense mixin configs into one
62832 · May 6, 2024 · 002c1dd · 002c1dd
1 parent 9c6cb65
commit 002c1dd
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 56 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -61,7 +61,6 @@ minecraft {
 mixin {
     add(sourceSets.main.get(), "$modId.refmap.json")
     config("$modId.mixins.json")
-    config("deargodwhy.mixins.json")
 }
 
 dependencies {

diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -15,14 +15,11 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraftforge.client.event.RegisterColorHandlersEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.network.NetworkRegistry;
 import net.minecraftforge.network.simple.SimpleChannel;
 import net.minecraftforge.registries.DeferredRegister;
@@ -71,7 +68,6 @@
 import gripe._90.appliede.part.EMCExportBusPart;
 import gripe._90.appliede.part.EMCImportBusPart;
 import gripe._90.appliede.part.EMCInterfacePart;
-import gripe._90.appliede.part.EMCInterfacePartAECF;
 import gripe._90.appliede.part.EMCModulePart;
 import gripe._90.appliede.part.TransmutationTerminalPart;
 
@@ -110,9 +106,7 @@ public final class AppliedE {
         ITEMS.register("emc_interface", () -> new BlockItem(block, new Item.Properties()));
         return block;
     });
-    public static final RegistryObject<Item> CABLE_EMC_INTERFACE = ITEMS.register("cable_emc_interface", () -> isModLoaded("aecapfix")
-            ? part(EMCInterfacePartAECF.class, EMCInterfacePartAECF::new)
-            : part(EMCInterfacePart.class, EMCInterfacePart::new));
+    public static final RegistryObject<Item> CABLE_EMC_INTERFACE = ITEMS.register("cable_emc_interface", () -> part(EMCInterfacePart.class, EMCInterfacePart::new));
 
     @SuppressWarnings("DataFlowIssue")
     public static final RegistryObject<BlockEntityType<EMCInterfaceBlockEntity>> EMC_INTERFACE_BE = BE_TYPES.register("emc_interface", () -> {
@@ -203,12 +197,6 @@ public static ResourceLocation id(String path) {
         return new ResourceLocation(MODID, path);
     }
 
-    public static boolean isModLoaded(String modId) {
-        return ModList.get() != null
-                ? ModList.get().isLoaded(modId)
-                : LoadingModList.get().getMods().stream().map(ModInfo::getModId).anyMatch(modId::equals);
-    }
-
     public static long clampedLong(BigInteger toClamp) {
         return toClamp.min(BigInteger.valueOf(Long.MAX_VALUE)).longValue();
     }

diff --git a/src/main/java/gripe/_90/appliede/emc/P2PTunnelMapper.java b/src/main/java/gripe/_90/appliede/emc/P2PTunnelMapper.java
@@ -10,7 +10,7 @@
 
 import appeng.api.features.P2PTunnelAttunement;
 
-import gripe._90.appliede.mixin.P2PTunnelAttunementAccessor;
+import gripe._90.appliede.mixin.main.P2PTunnelAttunementAccessor;
 
 import moze_intel.projecte.api.mapper.EMCMapper;
 import moze_intel.projecte.api.mapper.IEMCMapper;

diff --git a/src/main/java/gripe/_90/appliede/me/service/KnowledgeService.java b/src/main/java/gripe/_90/appliede/me/service/KnowledgeService.java
@@ -30,7 +30,7 @@
 import appeng.api.storage.MEStorage;
 import appeng.me.storage.NullInventory;
 
-import gripe._90.appliede.mixin.TransmutationOfflineAccessor;
+import gripe._90.appliede.mixin.main.TransmutationOfflineAccessor;
 import gripe._90.appliede.part.EMCModulePart;
 
 import moze_intel.projecte.api.capabilities.IKnowledgeProvider;

diff --git a/src/main/java/gripe/_90/appliede/me/service/TeamProjectEHandler.java b/src/main/java/gripe/_90/appliede/me/service/TeamProjectEHandler.java
@@ -7,8 +7,7 @@
 
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.server.ServerStoppedEvent;
-
-import gripe._90.appliede.AppliedE;
+import net.minecraftforge.fml.ModList;
 
 import cn.leomc.teamprojecte.TPTeam;
 import cn.leomc.teamprojecte.TeamChangeEvent;
@@ -43,7 +42,7 @@ static class Proxy {
         private Object handler;
 
         Proxy() {
-            if (AppliedE.isModLoaded("teamprojecte")) {
+            if (ModList.get().isLoaded("teamprojecte")) {
                 handler = new TeamProjectEHandler();
             }
         }

diff --git a/src/main/java/gripe/_90/appliede/mixin/Plugin.java b/src/main/java/gripe/_90/appliede/mixin/Plugin.java
@@ -0,0 +1,43 @@
+package gripe._90.appliede.mixin;
+
+import java.util.List;
+import java.util.Set;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
+
+public class Plugin implements IMixinConfigPlugin {
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        return !mixinClassName.contains("aecapfix")
+                || LoadingModList.get().getMods().stream()
+                        .map(ModInfo::getModId)
+                        .anyMatch("aecapfix"::equals);
+    }
+
+    @Override
+    public void onLoad(String mixinPackage) {}
+
+    @Override
+    public String getRefMapperConfig() {
+        return "";
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
+
+    @Override
+    public List<String> getMixins() {
+        return List.of();
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
+}
diff --git a/src/main/java/gripe/_90/appliede/mixin/aecapfix/EMCInterfacePartMixin.java b/src/main/java/gripe/_90/appliede/mixin/aecapfix/EMCInterfacePartMixin.java
@@ -0,0 +1,26 @@
+package gripe._90.appliede.mixin.aecapfix;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import appeng.api.parts.IPartItem;
+import appeng.parts.AEBasePart;
+
+import gripe._90.aecapfix.AECapFix;
+import gripe._90.appliede.me.misc.EMCInterfaceLogic;
+import gripe._90.appliede.part.EMCInterfacePart;
+
+@Mixin(value = EMCInterfacePart.class, remap = false)
+public abstract class EMCInterfacePartMixin extends AEBasePart implements AECapFix.Invalidator {
+    public EMCInterfacePartMixin(IPartItem<?> partItem) {
+        super(partItem);
+    }
+
+    @Shadow
+    public abstract EMCInterfaceLogic getInterfaceLogic();
+
+    @Override
+    public void aecapfix$invalidate() {
+        getInterfaceLogic().invalidateCaps();
+    }
+}
diff --git a/...de/mixin/P2PTunnelAttunementAccessor.java → ...xin/main/P2PTunnelAttunementAccessor.java b/...de/mixin/P2PTunnelAttunementAccessor.java → ...xin/main/P2PTunnelAttunementAccessor.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin;
+package gripe._90.appliede.mixin.main;
 
 import java.util.Map;
 

diff --git a/...e/mixin/TransmutationOfflineAccessor.java → ...in/main/TransmutationOfflineAccessor.java b/...e/mixin/TransmutationOfflineAccessor.java → ...in/main/TransmutationOfflineAccessor.java
@@ -1,4 +1,4 @@
-package gripe._90.appliede.mixin;
+package gripe._90.appliede.mixin.main;
 
 import java.util.UUID;
 

diff --git a/src/main/java/gripe/_90/appliede/part/EMCInterfacePartAECF.java b/src/main/java/gripe/_90/appliede/part/EMCInterfacePartAECF.java
diff --git a/src/main/resources/appliede.mixins.json b/src/main/resources/appliede.mixins.json
@@ -3,5 +3,17 @@
   "required": true,
   "compatibilityLevel": "JAVA_17",
   "package": "gripe._90.appliede.mixin",
-  "mixins": ["P2PTunnelAttunementAccessor", "TransmutationOfflineAccessor"]
+  "refmap": "appliede.refmap.json",
+  "plugin": "gripe._90.appliede.mixin.Plugin",
+  "mixins": [
+    "aecapfix.EMCInterfacePartMixin",
+    "main.P2PTunnelAttunementAccessor",
+    "main.TransmutationOfflineAccessor",
+    "tooltip.BasePacketAccessor",
+    "tooltip.GridInventoryEntryMixin",
+    "tooltip.MEInventoryUpdatePacketAccessor",
+    "tooltip.MEInventoryUpdatePacketMixin",
+    "tooltip.MEStorageMenuMixin"
+  ],
+  "client": ["tooltip.MEStorageScreenMixin", "tooltip.RepoMixin"]
 }
diff --git a/src/main/resources/deargodwhy.mixins.json b/src/main/resources/deargodwhy.mixins.json