GabrielTofvesson/SpigotInvTweaks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor sorting comparator as lambda

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-04-24 00:37:00 +02:00
parent ae911e8b40
commit 7c97a97acd
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java
View File

@ -108,7 +108,28 @@ public class SortCommandExecutor implements CommandExecutor {
}
private static void sortStacks(final ItemStack[] stacks) {
Arrays.sort(stacks, new ItemStackComparator());
Arrays.sort(stacks, (o1, o2) -> {
if (o1 == null || o2 == null)
return o1 == o2 ? 0 : o1 == null ? 1 : -1;
final Material m1 = o1.getType();
final Material m2 = o2.getType();
// Technically not a stable sort, but w/e
if (m1 == AIR || m1 == CAVE_AIR || m1 == VOID_AIR)
return m2 == AIR || m2 == CAVE_AIR || m2 == VOID_AIR ? 0 : -1;
// Blocks appear earlier than items
if (m1.isBlock() != m2.isBlock())
return m1.isBlock() ? 1 : -1;
// Stacks of similar type are organized according to stack size
if (o1.isSimilar(o2))
return Integer.compare(o1.getAmount(), o2.getAmount());
// Differing stacks are sorted according to enum ordinal (arbitrary but I'm not manually designing an order)
return Integer.compare(m1.ordinal(), m2.ordinal());
});
}
private static void mergeStacks(final ItemStack[] stacks) {
@ -157,30 +178,4 @@ public class SortCommandExecutor implements CommandExecutor {
}
}
}
private static class ItemStackComparator implements Comparator<ItemStack> {
@Override
public int compare(ItemStack o1, ItemStack o2) {
if (o1 == null || o2 == null)
return o1 == o2 ? 0 : o1 == null ? 1 : -1;
final Material m1 = o1.getType();
final Material m2 = o2.getType();
// Technically not a stable sort, but w/e
if (m1 == AIR || m1 == CAVE_AIR || m1 == VOID_AIR)
return m2 == AIR || m2 == CAVE_AIR || m2 == VOID_AIR ? 0 : -1;
// Blocks appear earlier than items
if (m1.isBlock() != m2.isBlock())
return m1.isBlock() ? 1 : -1;
// Stacks of similar type are organized according to stack size
if (o1.isSimilar(o2))
return Integer.compare(o1.getAmount(), o2.getAmount());
// Differing stacks are sorted according to enum ordinal (arbitrary but I'm not manually designing an order)
return Integer.compare(m1.ordinal(), m2.ordinal());
}
}
}