From 46040b1f5d2e5464b317b699c8d082ec9ee1c16d Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 23 Oct 2024 17:04:54 +0200 Subject: [PATCH] Mark fallback return value in getProtocol as unknown --- .../api/protocol/version/ProtocolVersion.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 2facea3aa..a30826a0e 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 @@ -89,6 +89,10 @@ public class ProtocolVersion implements Comparable { public static final ProtocolVersion v1_21_2 = register(768, "1.21.2-1.21.3", new SubVersionRange("1.21", 2, 3)); public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null); + static { + unknown.known = false; + } + public static ProtocolVersion register(int version, String name) { return register(version, -1, name); } @@ -152,7 +156,11 @@ public class ProtocolVersion implements Comparable { return protocolVersion; } } - return new ProtocolVersion(VersionType.SPECIAL, version, -1, "Unknown (" + version + ")", null); + + // Will be made nullable instead in the future... + final ProtocolVersion unknown = new ProtocolVersion(versionType, version, -1, "Unknown (" + version + ")", null); + unknown.known = false; + return unknown; } public static @NonNull ProtocolVersion getProtocol(final int version) { @@ -203,6 +211,8 @@ public class ProtocolVersion implements Comparable { private final int snapshotVersion; private final String name; private final Set includedVersions; + @Deprecated // Remove when getProtocol is made nullable + private boolean known = true; /** * Constructs a new ProtocolVersion instance. @@ -292,7 +302,7 @@ public class ProtocolVersion implements Comparable { * @return true if the protocol version is unknown */ public boolean isKnown() { - return this != unknown; + return known; } /**