From c124c1c80927aa32fa1ad88a6af1e923f91ddf16 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 14 Feb 2024 17:57:00 +0100 Subject: [PATCH] Sort ProtocolVersions version list, fix base protocol registration --- .../viaversion/api/protocol/version/ProtocolVersion.java | 2 +- .../com/viaversion/viaversion/protocol/ProtocolManagerImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index cb5639af7..b62ab0362 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -108,6 +108,7 @@ public class ProtocolVersion implements Comparable { */ public static void register(ProtocolVersion protocolVersion) { VERSION_LIST.add(protocolVersion); + VERSION_LIST.sort(ProtocolVersion::compareTo); final Int2ObjectMap versions = VERSIONS.computeIfAbsent(protocolVersion.versionType, $ -> new Int2ObjectOpenHashMap<>()); versions.put(protocolVersion.version, protocolVersion); @@ -403,7 +404,6 @@ public class ProtocolVersion implements Comparable { return this.compareTo(other) <= 0; } - /** * Returns whether this protocol version is between the given protocol versions, inclusive. * diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java index 9763cf64b..86c54a9b5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java @@ -135,6 +135,7 @@ public class ProtocolManagerImpl implements ProtocolManager { public void registerProtocols() { // Base Protocol BASE_PROTOCOL.initialize(); + BASE_PROTOCOL.register(Via.getManager().getProviders()); registerBaseProtocol(new BaseProtocol1_7(), Range.closedOpen(ProtocolVersion.v1_7_1, ProtocolVersion.v1_16)); registerBaseProtocol(new BaseProtocol1_16(), Range.atLeast(ProtocolVersion.v1_16));