完善样板镜像功能

Author: Circulate233

build.gradle.kts

@@ -206,6 +206,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
     implementation(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
     implementation(rfg.deobf("curse.maven:mekanism-energistics-1027681:5408319"))
+    implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
 
     // GeckoLib
     implementation("software.bernie.geckolib:geckolib-forge-1.12.2:3.0.31")
@@ -233,7 +234,6 @@ dependencies {
     // Optimization
     implementation(rfg.deobf("curse.maven:stellarcore-1064321:5560444"))
     implementation(rfg.deobf("curse.maven:configanytime-870276:5212709"))
-    implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
 }
 
 // Publishing to a Maven repository

src/main/java/github/kasuminova/mmce/common/world/MachineComponentManager.java

@@ -1,6 +1,8 @@
 package github.kasuminova.mmce.common.world;
 
 import com.github.bsideup.jabel.Desugar;
+import github.kasuminova.mmce.common.tile.MEPatternMirrorImage;
+import github.kasuminova.mmce.common.tile.MEPatternProvider;
 import github.kasuminova.mmce.common.util.concurrent.ExecuteGroup;
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
 import it.unimi.dsi.fastutil.objects.ObjectArraySet;
@@ -9,6 +11,8 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.Optional;
 
 import java.util.Collections;
 import java.util.Map;
@@ -40,16 +44,26 @@ public void removeWorld(World world) {
 
     public void checkComponentShared(TileEntity component, TileMultiblockMachineController ctrl) {
         World world = component.getWorld();
-        BlockPos pos = component.getPos();
+        BlockPos pos;
+        TileEntity te;
+
+        if (Loader.isModLoaded("appliedenergistics2")){
+            Object[] result = getResult(component, world);
+            pos = (BlockPos) result[0];
+            te = (TileEntity) result[1];
+        } else {
+            te = component;
+            pos = component.getPos();
+        }
 
         Map<BlockPos, ComponentInfo> posComponentMap = componentMap.computeIfAbsent(world, v -> new ConcurrentHashMap<>());
 
-        synchronized (component) {
+        synchronized (te) {
             ComponentInfo info = posComponentMap.computeIfAbsent(pos, v -> new ComponentInfo(
-                    component, pos, ReferenceSets.synchronize(new ReferenceOpenHashSet<>(Collections.singleton(ctrl)))));
+                    te, pos, ReferenceSets.synchronize(new ReferenceOpenHashSet<>(Collections.singleton(ctrl)))));
 
-            if (!info.areTileEntityEquals(component)) {
-                ComponentInfo newInfo = new ComponentInfo(component, pos, ReferenceSets.synchronize(new ReferenceOpenHashSet<>(Collections.singleton(ctrl))));
+            if (!info.areTileEntityEquals(te)) {
+                ComponentInfo newInfo = new ComponentInfo(te, pos, ReferenceSets.synchronize(new ReferenceOpenHashSet<>(Collections.singleton(ctrl))));
                 posComponentMap.put(pos, newInfo);
                 return;
             }
@@ -73,9 +87,36 @@ public void checkComponentShared(TileEntity component, TileMultiblockMachineCont
         }
     }
 
+    @Optional.Method(modid = "appliedenergistics2")
+    private static Object[] getResult(TileEntity component, World world) {
+        BlockPos pos = component.getPos();
+        TileEntity te = component;
+
+        if (component instanceof MEPatternMirrorImage mepi){
+            if (mepi.providerPos != null){
+                TileEntity tileEntity = world.getTileEntity(mepi.providerPos);
+                if (tileEntity instanceof MEPatternProvider mep){
+                    te = mep;
+                    pos = mep.getPos();
+                }
+            }
+        }
+        return new Object[]{pos,te};
+    }
+
     public void removeOwner(TileEntity component, TileMultiblockMachineController ctrl) {
         World world = component.getWorld();
-        BlockPos pos = component.getPos();
+        BlockPos pos;
+        TileEntity te;
+
+        if (Loader.isModLoaded("appliedenergistics2")){
+            Object[] result = getResult(component, world);
+            pos = (BlockPos) result[0];
+            te = (TileEntity) result[1];
+        } else {
+            te = component;
+            pos = component.getPos();
+        }
 
         Map<BlockPos, ComponentInfo> posComponentMap = componentMap.computeIfAbsent(world, v -> new ConcurrentHashMap<>());
 
@@ -84,8 +125,8 @@ public void removeOwner(TileEntity component, TileMultiblockMachineController ct
             return;
         }
 
-        if (!info.areTileEntityEquals(component)) {
-            ComponentInfo newInfo = new ComponentInfo(component, pos, new ObjectArraySet<>());
+        if (!info.areTileEntityEquals(te)) {
+            ComponentInfo newInfo = new ComponentInfo(te, pos, new ObjectArraySet<>());
             posComponentMap.put(pos, newInfo);
         } else {
             Set<TileMultiblockMachineController> owners = info.owners;

src/main/java/hellfirepvp/modularmachinery/common/crafting/MachineRecipe.java

@@ -51,7 +51,6 @@ public class MachineRecipe implements Comparable<MachineRecipe> {
 
     protected static int counter = 0;
 
-    protected final boolean loadJEI;
     protected final int sortId;
     protected final String recipeFilePath;
     protected final ResourceLocation owningMachine, registryName;
@@ -66,6 +65,7 @@ public class MachineRecipe implements Comparable<MachineRecipe> {
     protected boolean parallelized;
     protected String threadName;
     protected int maxThreads;
+    protected boolean loadJEI;
 
     public MachineRecipe(String path, ResourceLocation registryName, ResourceLocation owningMachine,
                          int tickTime, int configuredPriority, boolean voidPerTickFailure, boolean parallelized) {
@@ -125,6 +125,7 @@ public MachineRecipe(PreparedRecipe preparedRecipe) {
     public void mergeAdapter(final RecipeAdapterBuilder adapterBuilder) {
         this.parallelized = adapterBuilder.isParallelized();
         this.tooltipList.addAll(adapterBuilder.getTooltipList());
+        this.loadJEI = adapterBuilder.getLoadJEI();
         if (!adapterBuilder.getThreadName().isEmpty()) {
             this.threadName = adapterBuilder.getThreadName();
         }