分离ADV的适配mixin到单独mixin&mixinPlugin中增加判断是否加载该mixin

build/generated/sources/modMetadata/META-INF/neoforge.mods.toml

@@ -12,23 +12,17 @@ loaderVersion="[1,)" #mandatory
 
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
-license="All Rights Reserved"
+license = "LGPL-3.0-or-later"
 
 # A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
 
 # A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
+[[mods]]
-
+modId = "extendedae_plus"
-# The modid of the mod
+version = "1.21.1-1.4.3"
-modId="extendedae_plus" #mandatory
+displayName = "ExtendedAE-Plus"
-
+issueTrackerURL = "https://github.com/GaLicn/ExtendedAE_Plus/issues"
-# The version number of the mod
+displayURL = "https://github.com/GaLicn/ExtendedAE_Plus"
-version="1.21.1-1.4.3" #mandatory
-
-# A display name for the mod
-displayName="ExtendedAE-Plus" #mandatory
-
 # A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 
@@ -42,11 +36,10 @@ displayName="ExtendedAE-Plus" #mandatory
 #credits="" #optional
 
 # A text field displayed in the mod UI
-authors="YourNameHere, OtherNameHere" #optional
+authors = "GaLi, C-H716" #optional
 
 # The description text for the mod (multi line!) (#mandatory)
-description='''Example mod description.
+description = '''Add more practical features and auxiliary operations to the Applied Energistics 2 mod'''
-Newline characters can be used and will be replaced properly.'''
 
 # The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded.
 [[mixins]]

src/main/java/com/extendedae_plus/compat/PatternProviderLogicVirtualCompatBridge.java

@@ -0,0 +1,9 @@
+package com.extendedae_plus.compat;
+
+import appeng.api.networking.IManagedGridNode;
+
+public interface PatternProviderLogicVirtualCompatBridge {
+    boolean eap$compatIsVirtualCraftingEnabled();
+
+    IManagedGridNode eap$compatGetMainNode();
+}

src/main/java/com/extendedae_plus/mixin/ExtendedAEPlusMixinPlugin.java

@@ -8,16 +8,24 @@ import java.util.List;
 import java.util.Set;
 
 public class ExtendedAEPlusMixinPlugin implements IMixinConfigPlugin {
-	private static boolean isJeiPresent() {
+	private static boolean isClassPresent(String className) {
 		try {
 			ClassLoader cl = Thread.currentThread().getContextClassLoader();
-			Class.forName("mezz.jei.api.IModPlugin", false, cl);
+			Class.forName(className, false, cl);
 			return true;
 		} catch (Throwable ignored) {
 			return false;
 		}
 	}
 
+	private static boolean isJeiPresent() {
+		return isClassPresent("mezz.jei.api.IModPlugin");
+	}
+
+	private static boolean isAdvancedAePresent() {
+		return isClassPresent("net.pedroksl.advanced_ae.AdvancedAE");
+	}
+
 	@Override
 	public void onLoad(String mixinPackage) { }
 
@@ -31,6 +39,11 @@ public class ExtendedAEPlusMixinPlugin implements IMixinConfigPlugin {
 			if (mixinClassName.startsWith("com.extendedae_plus.mixin.jei")) return false;
 			if (mixinClassName.equals("com.extendedae_plus.mixin.ae2.menu.CraftConfirmMenuGoBackMixin")) return false;
 		}
+		if (!isAdvancedAePresent()) {
+			if (mixinClassName.equals("com.extendedae_plus.mixin.advancedae.compat.PatternProviderLogicVirtualCompletionMixin")) {
+				return false;
+			}
+		}
 		return true;
 	}
 

src/main/java/com/extendedae_plus/mixin/advancedae/compat/PatternProviderLogicVirtualCompletionMixin.java

@@ -0,0 +1,98 @@
+package com.extendedae_plus.mixin.advancedae.compat;
+
+import appeng.api.crafting.IPatternDetails;
+import appeng.api.networking.crafting.ICraftingCPU;
+import appeng.api.networking.crafting.ICraftingService;
+import appeng.api.stacks.KeyCounter;
+import appeng.helpers.patternprovider.PatternProviderLogic;
+import com.extendedae_plus.compat.PatternProviderLogicVirtualCompatBridge;
+import com.extendedae_plus.mixin.advancedae.accessor.AdvCraftingCPULogicAccessor;
+import com.extendedae_plus.mixin.advancedae.accessor.AdvExecutingCraftingJobAccessor;
+import com.extendedae_plus.mixin.advancedae.accessor.AdvExecutingCraftingJobTaskProgressAccessor;
+import net.pedroksl.advanced_ae.common.cluster.AdvCraftingCPU;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/**
+ * AdvancedAE 版本的虚拟完成兼容逻辑。
+ */
+@Mixin(value = PatternProviderLogic.class, priority = 850, remap = false)
+public abstract class PatternProviderLogicVirtualCompletionMixin {
+
+    @Inject(method = "pushPattern", at = @At("RETURN"))
+    private void eap$advancedaeVirtualCompletion(IPatternDetails patternDetails, KeyCounter[] inputHolder,
+                                                 CallbackInfoReturnable<Boolean> cir) {
+        if (!cir.getReturnValueZ()) {
+            return;
+        }
+        if (!(this instanceof PatternProviderLogicVirtualCompatBridge bridge)) {
+            return;
+        }
+        if (!bridge.eap$compatIsVirtualCraftingEnabled()) {
+            return;
+        }
+
+        var mainNode = bridge.eap$compatGetMainNode();
+        if (mainNode == null) {
+            return;
+        }
+
+        var node = mainNode.getNode();
+        if (node == null) {
+            return;
+        }
+
+        var grid = node.getGrid();
+        if (grid == null) {
+            return;
+        }
+
+        ICraftingService craftingService = grid.getCraftingService();
+        if (craftingService == null) {
+            return;
+        }
+
+        for (ICraftingCPU cpu : craftingService.getCpus()) {
+            if (!cpu.isBusy()) {
+                continue;
+            }
+
+            if (cpu instanceof AdvCraftingCPU advCpu) {
+                var logic = advCpu.craftingLogic;
+                if (logic instanceof AdvCraftingCPULogicAccessor advLogicAccessor) {
+                    var job = advLogicAccessor.eap$getAdvJob();
+                    if (job != null && job instanceof AdvExecutingCraftingJobAccessor advJobAccessor) {
+                        var tasks = advJobAccessor.eap$getAdvTasks();
+                        var progress = tasks.get(patternDetails);
+                        if (progress == null && patternDetails != null) {
+                            var patternDefinition = patternDetails.getDefinition();
+                            for (var entry : tasks.entrySet()) {
+                                var taskPattern = entry.getKey();
+                                if (taskPattern == patternDetails) {
+                                    progress = entry.getValue();
+                                    break;
+                                }
+                                if (taskPattern != null && patternDefinition != null) {
+                                    var taskDefinition = taskPattern.getDefinition();
+                                    if (taskDefinition != null && taskDefinition.equals(patternDefinition)) {
+                                        progress = entry.getValue();
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        if (progress instanceof AdvExecutingCraftingJobTaskProgressAccessor advProgressAccessor) {
+                            if (advProgressAccessor.eap$getAdvValue() <= 1) {
+                                advCpu.cancelJob();
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java

@@ -16,19 +16,16 @@ import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
 import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl;
 import com.extendedae_plus.api.bridge.CompatUpgradeProvider;
 import com.extendedae_plus.api.bridge.InterfaceWirelessLinkBridge;
+import com.extendedae_plus.compat.PatternProviderLogicVirtualCompatBridge;
 import com.extendedae_plus.compat.UpgradeSlotCompat;
 import com.extendedae_plus.init.ModItems;
 import com.extendedae_plus.items.materials.ChannelCardItem;
-import com.extendedae_plus.mixin.advancedae.accessor.AdvCraftingCPULogicAccessor;
-import com.extendedae_plus.mixin.advancedae.accessor.AdvExecutingCraftingJobAccessor;
-import com.extendedae_plus.mixin.advancedae.accessor.AdvExecutingCraftingJobTaskProgressAccessor;
 import com.extendedae_plus.mixin.ae2.accessor.CraftingCpuLogicAccessor;
 import com.extendedae_plus.mixin.ae2.accessor.ExecutingCraftingJobAccessor;
 import com.extendedae_plus.util.ExtendedAELogger;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.pedroksl.advanced_ae.common.cluster.AdvCraftingCPU;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -47,7 +44,7 @@ import java.util.List;
  * - 建立到无线主站的网格连接。
  */
 @Mixin(value = PatternProviderLogic.class, priority = 900, remap = false)
-public abstract class PatternProviderLogicCompatMixin implements CompatUpgradeProvider, InterfaceWirelessLinkBridge {
+public abstract class PatternProviderLogicCompatMixin implements CompatUpgradeProvider, InterfaceWirelessLinkBridge, PatternProviderLogicVirtualCompatBridge {
 
     @Unique
     private IUpgradeInventory eap$compatUpgrades = UpgradeInventories.empty();
@@ -486,7 +483,6 @@ public abstract class PatternProviderLogicCompatMixin implements CompatUpgradePr
         }
     }
 
-
     @Unique
     private void eap$compatTryVirtualCompletion(IPatternDetails patternDetails) {
         if (!this.eap$compatVirtualCraftingEnabled) {
@@ -542,43 +538,18 @@ public abstract class PatternProviderLogicCompatMixin implements CompatUpgradePr
                         }
                     }
                 }
-                continue;
-            }
-            if (cpu instanceof AdvCraftingCPU advCpu) {
-                var logic = advCpu.craftingLogic;
-                if (logic instanceof AdvCraftingCPULogicAccessor advLogicAccessor) {
-                    var job = advLogicAccessor.eap$getAdvJob();
-                    if (job != null && job instanceof AdvExecutingCraftingJobAccessor advJobAccessor) {
-                        var tasks = advJobAccessor.eap$getAdvTasks();
-                        var progress = tasks.get(patternDetails);
-                        if (progress == null && patternDetails != null) {
-                            var patternDefinition = patternDetails.getDefinition();
-                            for (var entry : tasks.entrySet()) {
-                                var taskPattern = entry.getKey();
-                                if (taskPattern == patternDetails) {
-                                    progress = entry.getValue();
-                                    break;
-                                }
-                                if (taskPattern != null && patternDefinition != null) {
-                                    var taskDefinition = taskPattern.getDefinition();
-                                    if (taskDefinition != null && taskDefinition.equals(patternDefinition)) {
-                                        progress = entry.getValue();
-                                        break;
-                                    }
             }
         }
     }
 
-                        if (progress instanceof AdvExecutingCraftingJobTaskProgressAccessor advProgressAccessor) {
+    @Override
-                            if (advProgressAccessor.eap$getAdvValue() <= 1) {
+    public boolean eap$compatIsVirtualCraftingEnabled() {
-                                advCpu.cancelJob();
+        return this.eap$compatVirtualCraftingEnabled;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
     }
+
+    @Override
+    public IManagedGridNode eap$compatGetMainNode() {
+        return this.mainNode;
     }
 
     @Unique

src/main/resources/extendedae_plus.mixins.json

@@ -5,11 +5,12 @@
   "plugin": "com.extendedae_plus.mixin.ExtendedAEPlusMixinPlugin",
   "mixins": [
     "advancedae.AdvPatternProviderLogicContainsRedirectMixin",
-    "advancedae.accessor.AdvPatternProviderLogicPatternsAccessor",
-    "advancedae.accessor.AdvPatternProviderMenuAdvancedAccessor",
     "advancedae.accessor.AdvCraftingCPULogicAccessor",
     "advancedae.accessor.AdvExecutingCraftingJobAccessor",
     "advancedae.accessor.AdvExecutingCraftingJobTaskProgressAccessor",
+    "advancedae.accessor.AdvPatternProviderLogicPatternsAccessor",
+    "advancedae.accessor.AdvPatternProviderMenuAdvancedAccessor",
+    "advancedae.compat.PatternProviderLogicVirtualCompletionMixin",
     "advancedae.helpers.AdvPatternProviderLogicAdvancedMixin",
     "advancedae.helpers.AdvPatternProviderLogicDoublingMixin",
     "advancedae.menu.AdvPatternProviderMenuAdvancedMixin",
@@ -17,12 +18,12 @@
     "ae2.CraftingCalculationMixin",
     "ae2.CraftingCPUClusterMixin",
     "ae2.EncodedPatternItemMixin",
-    "ae2.accessor.MEStorageMenuAccessor",
-    "ae2.accessor.PatternEncodingTermMenuAccessor",
-    "ae2.accessor.PatternProviderLogicAccessor",
     "ae2.accessor.CraftingCpuLogicAccessor",
     "ae2.accessor.ExecutingCraftingJobAccessor",
     "ae2.accessor.ExecutingCraftingJobTaskProgressAccessor",
+    "ae2.accessor.MEStorageMenuAccessor",
+    "ae2.accessor.PatternEncodingTermMenuAccessor",
+    "ae2.accessor.PatternProviderLogicAccessor",
     "ae2.accessor.PatternProviderLogicPatternInputsAccessor",
     "ae2.accessor.PatternProviderLogicPatternsAccessor",
     "ae2.accessor.PatternProviderMenuAdvancedAccessor",
@@ -39,16 +40,16 @@
     "ae2.helpers.PatternProviderLogicDoublingMixin",
     "ae2.helpers.PatternProviderLogicUpgradesMixin",
     "ae2.helpers.patternprovider.PatternProviderLogicTickerMixin",
-    "ae2.menu.InterfaceMenuUpgradesMixin",
     "ae2.menu.AEBaseMenuUpgradesDedupMixin",
-    "ae2.menu.PatternProviderMenuUpgradesMixin",
-    "ae2.parts.automation.IOBusPartChannelCardMixin",
-    "ae2.parts.storagebus.StorageBusPartChannelCardMixin",
     "ae2.menu.ContainerPatternEncodingTermMenuMixin",
+    "ae2.menu.InterfaceMenuUpgradesMixin",
     "ae2.menu.MEStorageMenuMixin",
     "ae2.menu.PatternEncodingTermMenuMixin",
     "ae2.menu.PatternProviderMenuAdvancedMixin",
     "ae2.menu.PatternProviderMenuDoublingMixin",
+    "ae2.menu.PatternProviderMenuUpgradesMixin",
+    "ae2.parts.automation.IOBusPartChannelCardMixin",
+    "ae2.parts.storagebus.StorageBusPartChannelCardMixin",
     "ae2WTlib.ContainerUWirelessExPatternTerminalMixin",
     "extendedae.common.PartExPatternProviderMixin",
     "extendedae.common.TileExPatternProviderMixin",