From 3d1489401c2fae21bb71fd73dd42b7465044b91f Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 26 Jan 2023 00:05:44 +0100 Subject: [PATCH] quick fix : Collections.sort() can be replaced with List.sort() --- .../library/component/TankLayerScan.java | 4 ++-- .../tconstruct/util/network/PacketPipeline.java | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 78c31449..10486d57 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -130,8 +130,8 @@ public class TankLayerScan extends LogicComponent { // @SuppressWarnings({ "unchecked" }) protected void finalizeStructure() { - Collections.sort(blockCoords, new CoordTupleSort()); - Collections.sort(airCoords, new CoordTupleSort()); + blockCoords.sort(new CoordTupleSort()); + airCoords.sort(new CoordTupleSort()); for (CoordTuple coord : blockCoords) { TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index c1ab25cf..e75bf433 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -137,19 +137,13 @@ public class PacketPipeline extends MessageToMessageCodec>() { - - @Override - public int compare(Class clazz1, Class clazz2) { - int com = String.CASE_INSENSITIVE_ORDER.compare(clazz1.getCanonicalName(), clazz2.getCanonicalName()); - if (com == 0) { - com = clazz1.getCanonicalName().compareTo(clazz2.getCanonicalName()); - } - - return com; + this.packets.sort((clazz1, clazz2) -> { + int com = String.CASE_INSENSITIVE_ORDER.compare(clazz1.getCanonicalName(), clazz2.getCanonicalName()); + if (com == 0) { + com = clazz1.getCanonicalName().compareTo(clazz2.getCanonicalName()); } + return com; }); }