some renames. clean up.

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.selectedMatches()) {
+            if (menu.craftingMatchesSelectedCPU()) {
                 this.start.setMessage(GuiText.Merge.text());
             } else {
                 this.start.setMessage(GuiText.Start.text());

src/main/java/appeng/crafting/CraftingLink.java

@@ -175,7 +175,7 @@ void setCanceled(boolean canceled) {
         this.canceled = canceled;
     }
 
-    public ICraftingRequester getRequester() {
+    ICraftingRequester getRequester() {
         return this.req;
     }
 

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

@@ -353,7 +353,7 @@ public ICraftingSubmitResult submitJob(ICraftingPlan job, ICraftingRequester req
             cpuCluster = (CraftingCPUCluster) target;
         } else {
             var unsuitableCpusResult = new MutableObject<UnsuitableCpus>();
-            cpuCluster = findSuitableCraftingCPU(job, prioritizePower, src, unsuitableCpusResult, requestingMachine);
+            cpuCluster = findSuitableCraftingCPU(job, prioritizePower, src, requestingMachine, unsuitableCpusResult);
             if (cpuCluster == null) {
                 var unsuitableCpus = unsuitableCpusResult.getValue();
                 // If no CPUs were unsuitable, but we couldn't find one, that means there aren't any
@@ -370,7 +370,7 @@ public ICraftingSubmitResult submitJob(ICraftingPlan job, ICraftingRequester req
 
     @Nullable
     private CraftingCPUCluster findSuitableCraftingCPU(ICraftingPlan job, boolean prioritizePower, IActionSource src,
-            MutableObject<UnsuitableCpus> unsuitableCpus, ICraftingRequester requestingMachine) {
+            ICraftingRequester requestingMachine, MutableObject<UnsuitableCpus> unsuitableCpus) {
         var validCpusClusters = new ArrayList<CraftingCPUCluster>(this.craftingCPUClusters.size());
         int offline = 0;
         int busy = 0;

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

@@ -103,7 +103,7 @@ public class CraftConfirmMenu extends AEBaseMenu implements ISubMenu {
     @GuiSync(8)
     public SyncableSubmitResult submitError = NO_ERROR;
     @GuiSync(9)
-    public GenericStack stackToCraft;
+    public GenericStack currentlyCraftingStack;
 
     private CraftingPlanSummary plan;
 
@@ -255,7 +255,7 @@ private boolean cpuMatches(ICraftingCPU c) {
             return true;
         }
         if (c.isBusy()) {
-            if (craftMatches(c)) {
+            if (this.plan.crafting().matches(c.getJobStatus().crafting())) {
                 if (c instanceof CraftingCPUCluster cpuCluster) {
                     if (cpuCluster.craftingLogic.isSameRequester(null)) {
                         return c.getAvailableStorage() >= this.plan.usedBytes() + cpuCluster.craftingLogic.getCurrentJobSize();
@@ -266,16 +266,10 @@ private boolean cpuMatches(ICraftingCPU c) {
         }
         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 selectedMatches () {
+    public boolean craftingMatchesSelectedCPU() {
         if (plan != null) {
-            return this.plan.crafting().matches(this.stackToCraft);
+            return this.plan.crafting().matches(this.currentlyCraftingStack);
         }
         return false;
     }
@@ -332,17 +326,17 @@ private void onCPUSelectionChanged(CraftingCPURecord cpuRecord, boolean cpusAvai
             cpuCoProcessors = 0;
             cpuName = null;
             selectedCpu = null;
-            stackToCraft = null;
+            currentlyCraftingStack = null;
         } else {
             cpuBytesAvail = cpuRecord.getSize();
             cpuCoProcessors = cpuRecord.getProcessors();
             cpuName = cpuRecord.getName();
             selectedCpu = cpuRecord.getCpu();
             CraftingJobStatus jobStatus = selectedCpu.getJobStatus();
             if (jobStatus == null) {
-                stackToCraft = null;
+                currentlyCraftingStack = null;
             } else {
-                stackToCraft = jobStatus.crafting();
+                currentlyCraftingStack = jobStatus.crafting();
             }
         }
     }