|
22 | 22 | import java.util.Objects; |
23 | 23 | import java.util.concurrent.Future; |
24 | 24 |
|
25 | | -import appeng.api.networking.crafting.CalculationStrategy; |
26 | | -import appeng.api.networking.crafting.CraftingJobStatus; |
27 | | -import appeng.api.networking.crafting.CraftingSubmitErrorCode; |
28 | | -import appeng.api.networking.crafting.ICraftingCPU; |
29 | | -import appeng.api.networking.crafting.ICraftingPlan; |
30 | | -import appeng.api.networking.crafting.ICraftingService; |
31 | | -import appeng.api.networking.crafting.ICraftingSubmitResult; |
32 | | -import appeng.api.networking.crafting.UnsuitableCpus; |
33 | | -import appeng.me.cluster.implementations.CraftingCPUCluster; |
34 | 25 | import org.jetbrains.annotations.Nullable; |
35 | 26 |
|
36 | 27 | import net.minecraft.network.FriendlyByteBuf; |
|
43 | 34 |
|
44 | 35 | import appeng.api.networking.IGrid; |
45 | 36 | import appeng.api.networking.IGridNode; |
| 37 | +import appeng.api.networking.crafting.CalculationStrategy; |
| 38 | +import appeng.api.networking.crafting.CraftingJobStatus; |
| 39 | +import appeng.api.networking.crafting.CraftingSubmitErrorCode; |
| 40 | +import appeng.api.networking.crafting.ICraftingCPU; |
| 41 | +import appeng.api.networking.crafting.ICraftingPlan; |
| 42 | +import appeng.api.networking.crafting.ICraftingService; |
| 43 | +import appeng.api.networking.crafting.ICraftingSubmitResult; |
| 44 | +import appeng.api.networking.crafting.UnsuitableCpus; |
46 | 45 | import appeng.api.networking.security.IActionHost; |
47 | 46 | import appeng.api.networking.security.IActionSource; |
48 | 47 | import appeng.api.stacks.AEKey; |
|
52 | 51 | import appeng.core.sync.packets.CraftConfirmPlanPacket; |
53 | 52 | import appeng.crafting.execution.CraftingSubmitResult; |
54 | 53 | import appeng.helpers.IMenuCraftingPacket; |
| 54 | +import appeng.me.cluster.implementations.CraftingCPUCluster; |
55 | 55 | import appeng.me.helpers.PlayerSource; |
56 | 56 | import appeng.menu.AEBaseMenu; |
57 | 57 | import appeng.menu.ISubMenu; |
@@ -258,7 +258,8 @@ private boolean cpuMatches(ICraftingCPU c) { |
258 | 258 | if (this.plan.crafting().matches(c.getJobStatus().crafting())) { |
259 | 259 | if (c instanceof CraftingCPUCluster cpuCluster) { |
260 | 260 | if (cpuCluster.craftingLogic.isSameRequester(null)) { |
261 | | - return c.getAvailableStorage() >= this.plan.usedBytes() + cpuCluster.craftingLogic.getCurrentJobSize(); |
| 261 | + return c.getAvailableStorage() >= this.plan.usedBytes() |
| 262 | + + cpuCluster.craftingLogic.getCurrentJobSize(); |
262 | 263 | } |
263 | 264 | } |
264 | 265 | } |
|
0 commit comments