fix logic issues. fix gui showing busy and unmergeable cpus

Author: PrototypeTrousers

src/main/java/appeng/client/gui/me/crafting/CraftConfirmScreen.java

@@ -95,7 +95,7 @@ protected void updateBeforeRender() {
             } else {
                 cpuDetails = GuiText.ConfirmCraftNoCpu.text();
             }
-            if (menu.craftMatches()) {
+            if (menu.selectedMatches()) {
                 this.start.setMessage(GuiText.Merge.text());
             } else {
                 this.start.setMessage(GuiText.Start.text());

src/main/java/appeng/crafting/execution/CraftingCpuLogic.java

@@ -22,6 +22,7 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
+import appeng.crafting.CraftingLinkNexus;
 import com.google.common.base.Preconditions;
 
 import org.jetbrains.annotations.Nullable;
@@ -476,7 +477,11 @@ public ICraftingLink getLastLink() {
 
     public boolean isSameRequester(ICraftingRequester requester) {
         if (this.job != null) {
-            return this.job.link.getTie().getRequest().getRequester() == requester;
+            CraftingLinkNexus tie = this.job.link.getTie();
+            if (tie == null) {
+                return requester == null;
+            }
+            return tie.isRequester(requester);
         }
         return false;
     }

src/main/java/appeng/me/service/CraftingService.java

@@ -381,16 +381,17 @@ private CraftingCPUCluster findSuitableCraftingCPU(ICraftingPlan job, boolean pr
                 offline++;
                 continue;
             }
+            boolean mayMerge = false;
             if (cpu.isBusy()) {
-                if (!cpu.craftingLogic.getFinalJobOutput().what().equals(job.finalOutput().what())) {
-                    busy++;
-                    continue;
-                } else if (!cpu.craftingLogic.isSameRequester(requestingMachine)) {
-                    busy++;
-                    continue;
+                if (cpu.craftingLogic.getFinalJobOutput().what().equals(job.finalOutput().what())) {
+                    if (cpu.craftingLogic.isSameRequester(requestingMachine)) {
+                        if (cpu.getAvailableStorage() >= job.bytes() + cpu.craftingLogic.getCurrentJobSize()) {
+                            mayMerge = true;
+                        }
+                    }
                 }
-                if (cpu.getAvailableStorage() < job.bytes() + cpu.craftingLogic.getCurrentJobSize()) {
-                    tooSmall++;
+                if (!mayMerge) {
+                    busy++;
                     continue;
                 }
             }

src/main/java/appeng/menu/me/crafting/CraftConfirmMenu.java

@@ -30,6 +30,7 @@
 import appeng.api.networking.crafting.ICraftingService;
 import appeng.api.networking.crafting.ICraftingSubmitResult;
 import appeng.api.networking.crafting.UnsuitableCpus;
+import appeng.me.cluster.implementations.CraftingCPUCluster;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.network.FriendlyByteBuf;
@@ -253,12 +254,28 @@ private boolean cpuMatches(ICraftingCPU c) {
         if (this.plan == null) {
             return true;
         }
+        if (c.isBusy()) {
+            if (craftMatches(c)) {
+                if (c instanceof CraftingCPUCluster cpuCluster) {
+                    if (cpuCluster.craftingLogic.isSameRequester(null)) {
+                        return c.getAvailableStorage() >= this.plan.usedBytes() + cpuCluster.craftingLogic.getCurrentJobSize();
+                    }
+                }
+            }
+            return false;
+        }
         return c.getAvailableStorage() >= this.plan.usedBytes();
     }
+    public boolean craftMatches (ICraftingCPU c) {
+        if (plan != null) {
+            return this.plan.crafting().matches(c.getJobStatus().crafting());
+        }
+        return false;
+    }
 
-    public boolean craftMatches () {
-        if (stackToCraft != null && plan != null) {
-            return stackToCraft.what().equals(this.plan.crafting());
+    public boolean selectedMatches () {
+        if (plan != null) {
+            return this.plan.crafting().matches(this.stackToCraft);
         }
         return false;
     }