From ebb3aa7ba389b770d4e08d2a561351e1d35d332b Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 8 Apr 2021 07:44:02 +0200 Subject: [PATCH] cleanup: prefer List#sort over Collections#sort --- .../java/client/command/commands/gm1/GotoCommand.java | 7 +++++-- src/main/java/client/inventory/MapleInventory.java | 4 ++-- .../java/client/processor/stat/AssignAPProcessor.java | 6 +++--- .../server/channel/handlers/PlayerLoggedinHandler.java | 2 +- .../coordinator/partysearch/PartySearchStorage.java | 2 +- .../coordinator/session/MapleSessionCoordinator.java | 8 ++++---- .../coordinator/world/MapleMonsterAggroCoordinator.java | 2 +- src/main/java/net/server/world/MapleParty.java | 2 +- src/main/java/net/server/world/World.java | 4 ++-- src/main/java/server/MapleStorage.java | 2 +- .../java/server/life/positioner/MaplePlayerNPCPodium.java | 3 +-- .../server/life/positioner/MaplePlayerNPCPositioner.java | 6 ++++-- src/main/java/server/quest/actions/ItemAction.java | 2 +- src/main/java/tools/MaplePacketCreator.java | 2 +- 14 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index bf4040201a..3568bd8250 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/src/main/java/client/command/commands/gm1/GotoCommand.java @@ -29,7 +29,10 @@ import client.command.Command; import constants.game.GameConstants; import server.maps.*; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class GotoCommand extends Command { @@ -65,7 +68,7 @@ public class GotoCommand extends Command { public static String GOTO_AREAS_INFO = ""; private static void sortGotoEntries(List> listEntries) { - Collections.sort(listEntries, (e1, e2) -> e1.getValue().compareTo(e2.getValue())); + listEntries.sort((e1, e2) -> e1.getValue().compareTo(e2.getValue())); } @Override diff --git a/src/main/java/client/inventory/MapleInventory.java b/src/main/java/client/inventory/MapleInventory.java index 1a5102c6b6..b2e756d1df 100644 --- a/src/main/java/client/inventory/MapleInventory.java +++ b/src/main/java/client/inventory/MapleInventory.java @@ -188,7 +188,7 @@ public class MapleInventory implements Iterable { } if (ret.size() > 1) { - Collections.sort(ret, (i1, i2) -> i1.getPosition() - i2.getPosition()); + ret.sort((i1, i2) -> i1.getPosition() - i2.getPosition()); } return ret; @@ -203,7 +203,7 @@ public class MapleInventory implements Iterable { } if (ret.size() > 1) { - Collections.sort(ret, (i1, i2) -> i1.getPosition() - i2.getPosition()); + ret.sort((i1, i2) -> i1.getPosition() - i2.getPosition()); } return ret; diff --git a/src/main/java/client/processor/stat/AssignAPProcessor.java b/src/main/java/client/processor/stat/AssignAPProcessor.java index c00054fcec..032143883e 100644 --- a/src/main/java/client/processor/stat/AssignAPProcessor.java +++ b/src/main/java/client/processor/stat/AssignAPProcessor.java @@ -92,9 +92,9 @@ public class AssignAPProcessor { statUpdate[2] = chr.getLuk(); statUpdate[3] = chr.getInt(); - Collections.sort(eqpStrList, Collections.reverseOrder()); - Collections.sort(eqpDexList, Collections.reverseOrder()); - Collections.sort(eqpLukList, Collections.reverseOrder()); + eqpStrList.sort(Collections.reverseOrder()); + eqpDexList.sort(Collections.reverseOrder()); + eqpLukList.sort(Collections.reverseOrder()); //Autoassigner looks up the 1st/2nd placed equips for their stats to calculate the optimal upgrade. int eqpStr = getNthHighestStat(eqpStrList, (short) 0) + getNthHighestStat(eqpStrList, (short) 1); diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 0f83d0a9f3..4db6a00253 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -451,7 +451,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { timedBuffs.add(new Pair<>(curtime - pb.usedTime, pb)); } - Collections.sort(timedBuffs, (p1, p2) -> p1.getLeft().compareTo(p2.getLeft())); + timedBuffs.sort((p1, p2) -> p1.getLeft().compareTo(p2.getLeft())); return timedBuffs; } diff --git a/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java b/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java index 23b09ee7ee..d1840f74c9 100644 --- a/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java +++ b/src/main/java/net/server/coordinator/partysearch/PartySearchStorage.java @@ -82,7 +82,7 @@ public class PartySearchStorage { pscList.add(new PartySearchCharacter(chr)); } - Collections.sort(pscList, (c1, c2) -> { + pscList.sort((c1, c2) -> { int levelP1 = c1.getLevel(), levelP2 = c2.getLevel(); return levelP1 > levelP2 ? 1 : (levelP1 == levelP2 ? 0 : -1); }); diff --git a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java b/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java index cca2e0fc94..207d0ec6d6 100644 --- a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java +++ b/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java @@ -579,7 +579,7 @@ public class MapleSessionCoordinator { public void printSessionTrace() { if (!onlineClients.isEmpty()) { List> elist = new ArrayList<>(onlineClients.entrySet()); - Collections.sort(elist, (e1, e2) -> e1.getKey().compareTo(e2.getKey())); + elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); System.out.println("Current online clients: "); for (Entry e : elist) { @@ -600,7 +600,7 @@ public class MapleSessionCoordinator { if (!loginRemoteHosts.isEmpty()) { List>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); - Collections.sort(elist, (e1, e2) -> e1.getKey().compareTo(e2.getKey())); + elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); System.out.println("Current login sessions: "); for (Entry> e : elist) { @@ -614,7 +614,7 @@ public class MapleSessionCoordinator { if (!onlineClients.isEmpty()) { List> elist = new ArrayList<>(onlineClients.entrySet()); - Collections.sort(elist, (e1, e2) -> e1.getKey().compareTo(e2.getKey())); + elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); str += ("Current online clients:\r\n"); for (Entry e : elist) { @@ -635,7 +635,7 @@ public class MapleSessionCoordinator { if (!loginRemoteHosts.isEmpty()) { List>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); - Collections.sort(elist, (e1, e2) -> e1.getKey().compareTo(e2.getKey())); + elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); str += ("Current login sessions:\r\n"); for (Entry> e : elist) { diff --git a/src/main/java/net/server/coordinator/world/MapleMonsterAggroCoordinator.java b/src/main/java/net/server/coordinator/world/MapleMonsterAggroCoordinator.java index fc8e4df614..ae495f88ac 100644 --- a/src/main/java/net/server/coordinator/world/MapleMonsterAggroCoordinator.java +++ b/src/main/java/net/server/coordinator/world/MapleMonsterAggroCoordinator.java @@ -234,7 +234,7 @@ public class MapleMonsterAggroCoordinator { if (!toRemoveIdx.isEmpty()) { // last to first indexes - Collections.sort(toRemoveIdx, (p1, p2) -> p1 < p2 ? 1 : p1.equals(p2) ? 0 : -1); + toRemoveIdx.sort((p1, p2) -> p1 < p2 ? 1 : p1.equals(p2) ? 0 : -1); for (int idx : toRemoveIdx) { sortedAggro.remove(idx); diff --git a/src/main/java/net/server/world/MapleParty.java b/src/main/java/net/server/world/MapleParty.java index cb03e20898..c9fe9faab0 100644 --- a/src/main/java/net/server/world/MapleParty.java +++ b/src/main/java/net/server/world/MapleParty.java @@ -211,7 +211,7 @@ public class MapleParty { lock.unlock(); } - Collections.sort(histList, (o1, o2) -> (o1.getValue()).compareTo(o2.getValue())); + histList.sort((o1, o2) -> (o1.getValue()).compareTo(o2.getValue())); List histSort = new LinkedList<>(); for (Entry e : histList) { diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 0ad12a4993..a17c7abd7a 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -461,7 +461,7 @@ public class World { list.add(e); } - Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey()); + list.sort((o1, o2) -> o1.getKey() - o2.getKey()); return list; } @@ -1844,7 +1844,7 @@ public class World { } } - Collections.sort(hmsAvailable, (p1, p2) -> p1.getLeft().getPrice() - p2.getLeft().getPrice()); + hmsAvailable.sort((p1, p2) -> p1.getLeft().getPrice() - p2.getLeft().getPrice()); hmsAvailable.subList(0, Math.min(hmsAvailable.size(), 200)); //truncates the list to have up to 200 elements return hmsAvailable; diff --git a/src/main/java/server/MapleStorage.java b/src/main/java/server/MapleStorage.java index 1d66f0794c..676adaeaca 100644 --- a/src/main/java/server/MapleStorage.java +++ b/src/main/java/server/MapleStorage.java @@ -233,7 +233,7 @@ public class MapleStorage { lock.lock(); try { - Collections.sort(items, (o1, o2) -> { + items.sort((o1, o2) -> { if (o1.getInventoryType().getType() < o2.getInventoryType().getType()) { return -1; } else if (o1.getInventoryType() == o2.getInventoryType()) { diff --git a/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java b/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java index 3bb902ba41..3ac2eae064 100644 --- a/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java +++ b/src/main/java/server/life/positioner/MaplePlayerNPCPodium.java @@ -31,7 +31,6 @@ import tools.MaplePacketCreator; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; /** @@ -92,7 +91,7 @@ public class MaplePlayerNPCPodium { playerNpcs.add((MaplePlayerNPC) mmo); } - Collections.sort(playerNpcs, (p1, p2) -> { + playerNpcs.sort((p1, p2) -> { return p1.getScriptId() - p2.getScriptId(); // scriptid as playernpc history }); diff --git a/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java b/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java index 148d083dec..15b70471d0 100644 --- a/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java +++ b/src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java @@ -29,8 +29,10 @@ import server.maps.MapleMapObjectType; import tools.MaplePacketCreator; import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; import java.util.List; -import java.util.*; /** * @@ -141,7 +143,7 @@ public class MaplePlayerNPCPositioner { playerNpcs.add((MaplePlayerNPC) mmo); } - Collections.sort(playerNpcs, (p1, p2) -> { + playerNpcs.sort((p1, p2) -> { return p1.getScriptId() - p2.getScriptId(); // scriptid as playernpc history }); diff --git a/src/main/java/server/quest/actions/ItemAction.java b/src/main/java/server/quest/actions/ItemAction.java index b5cc539bc3..25271baa56 100644 --- a/src/main/java/server/quest/actions/ItemAction.java +++ b/src/main/java/server/quest/actions/ItemAction.java @@ -79,7 +79,7 @@ public class ItemAction extends MapleQuestAction { items.add(new ItemData(Integer.parseInt(iEntry.getName()), id, count, prop, job, gender, period)); } - Collections.sort(items, (o1, o2) -> o1.map - o2.map); + items.sort((o1, o2) -> o1.map - o2.map); } @Override diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index b826218c69..453d0f571c 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -986,7 +986,7 @@ public class MaplePacketCreator { } List> mystats = stats; if (mystats.size() > 1) { - Collections.sort(mystats, (o1, o2) -> { + mystats.sort((o1, o2) -> { int val1 = o1.getLeft().getValue(); int val2 = o2.getLeft().getValue(); return (val1 < val2 ? -1 : (val1 == val2 ? 0 : 1));