From b6acf1af0a0def0bcd5be5c73f2d069ea193d520 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 24 Oct 2021 15:18:21 -0400 Subject: [PATCH] Comparator cleanup --- core/src/mindustry/world/blocks/storage/Unloader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index 931b596bcc..46508a40cc 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -138,10 +138,10 @@ public class Unloader extends Block{ } //sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load - possibleBlocks.sort((e1, e2) -> { - int getsPriority = Boolean.compare((e1.building.block instanceof StorageBlock || e1.building.block instanceof StackConveyor), (e2.building.block instanceof StorageBlock || e2.building.block instanceof StackConveyor)); - return (getsPriority != 0) ? getsPriority : Float.compare(e1.loadFactor, e2.loadFactor); - }); + possibleBlocks.sort(Structs.comps( + Structs.comparingBool(e -> e.building.block instanceof StorageBlock || e.building.block instanceof StackConveyor), + Structs.comparingFloat(e -> e.loadFactor) + )); ContainerStat dumpingFrom = null; ContainerStat dumpingTo = null;