Skip to content

Commit 9059763

Browse files
spotless
1 parent d8b4064 commit 9059763

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.UUID;
2323
import java.util.function.Consumer;
2424

25-
import appeng.crafting.CraftingLinkNexus;
2625
import com.google.common.base.Preconditions;
2726

2827
import org.jetbrains.annotations.Nullable;
@@ -48,6 +47,7 @@
4847
import appeng.core.sync.network.NetworkHandler;
4948
import appeng.core.sync.packets.CraftingJobStatusPacket;
5049
import appeng.crafting.CraftingLink;
50+
import appeng.crafting.CraftingLinkNexus;
5151
import appeng.crafting.inv.ListCraftingInventory;
5252
import appeng.hooks.ticking.TickHandler;
5353
import appeng.me.cluster.implementations.CraftingCPUCluster;
@@ -227,8 +227,9 @@ public int executeCrafting(int maxPatterns, CraftingService craftingService, IEn
227227
for (var patternInputs : craftingContainer) {
228228
if (patternInputs != null) {
229229
for (var input : patternInputs) {
230-
//match byte size from ICraftingSimulationState
231-
bytes += (long) ((double) input.getLongValue() / input.getKey().getType().getAmountPerByte() * 8);
230+
// match byte size from ICraftingSimulationState
231+
bytes += (long) ((double) input.getLongValue() / input.getKey().getType().getAmountPerByte()
232+
* 8);
232233
}
233234
}
234235
}
@@ -254,7 +255,7 @@ public int executeCrafting(int maxPatterns, CraftingService craftingService, IEn
254255
task.getValue().value--;
255256
if (task.getValue().value <= 0) {
256257
it.remove();
257-
//task removed means node removed. 8 byte for each node as in CraftingCalculation
258+
// task removed means node removed. 8 byte for each node as in CraftingCalculation
258259
job.freeBytes(8);
259260
continue taskLoop;
260261
}

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@
2222
import java.util.Objects;
2323
import java.util.concurrent.Future;
2424

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;
3425
import org.jetbrains.annotations.Nullable;
3526

3627
import net.minecraft.network.FriendlyByteBuf;
@@ -43,6 +34,14 @@
4334

4435
import appeng.api.networking.IGrid;
4536
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;
4645
import appeng.api.networking.security.IActionHost;
4746
import appeng.api.networking.security.IActionSource;
4847
import appeng.api.stacks.AEKey;
@@ -52,6 +51,7 @@
5251
import appeng.core.sync.packets.CraftConfirmPlanPacket;
5352
import appeng.crafting.execution.CraftingSubmitResult;
5453
import appeng.helpers.IMenuCraftingPacket;
54+
import appeng.me.cluster.implementations.CraftingCPUCluster;
5555
import appeng.me.helpers.PlayerSource;
5656
import appeng.menu.AEBaseMenu;
5757
import appeng.menu.ISubMenu;
@@ -258,7 +258,8 @@ private boolean cpuMatches(ICraftingCPU c) {
258258
if (this.plan.crafting().matches(c.getJobStatus().crafting())) {
259259
if (c instanceof CraftingCPUCluster cpuCluster) {
260260
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();
262263
}
263264
}
264265
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525
import java.util.Objects;
2626

27-
import appeng.api.stacks.GenericStack;
2827
import com.google.common.collect.ImmutableList;
2928

3029
import net.minecraft.network.FriendlyByteBuf;
@@ -41,7 +40,8 @@
4140
* @param usedBytes
4241
* @param simulation
4342
*/
44-
public record CraftingPlanSummary(long usedBytes, boolean simulation, List<CraftingPlanSummaryEntry> entries, AEKey crafting) {
43+
public record CraftingPlanSummary(long usedBytes, boolean simulation, List<CraftingPlanSummaryEntry> entries,
44+
AEKey crafting) {
4545

4646
public void write(FriendlyByteBuf buffer) {
4747
buffer.writeVarLong(usedBytes);

0 commit comments

Comments
 (0)