From dccda57fc097be61d02b5be072b439983df55060 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 14 Feb 2024 19:14:41 +0100 Subject: [PATCH] Consistent equalTo names --- .../viaversion/api/protocol/version/ProtocolVersion.java | 6 +++--- .../bukkit/listeners/multiversion/PlayerSneakListener.java | 4 ++-- .../bukkit/providers/BukkitInventoryQuickMoveProvider.java | 6 +++--- .../viaversion/bungee/handlers/BungeeServerHandler.java | 6 +++--- .../viaversion/viaversion/protocols/base/BaseProtocol.java | 2 +- .../viaversion/protocols/base/BaseProtocol1_7.java | 2 +- .../protocol1_12to1_11_1/Protocol1_12To1_11_1.java | 2 +- .../blockconnections/GlassConnectionHandler.java | 2 +- 8 files changed, 15 insertions(+), 15 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 b62ab0362..07cca2068 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 @@ -380,7 +380,7 @@ public class ProtocolVersion implements Comparable { * @param other other protocol version * @return true if this protocol version is higher than or equal to the other protocol version */ - public boolean newerThanOrEquals(final ProtocolVersion other) { + public boolean newerThanOrEqualTo(final ProtocolVersion other) { return this.compareTo(other) >= 0; } @@ -400,7 +400,7 @@ public class ProtocolVersion implements Comparable { * @param other other protocol version * @return true if this protocol version is lower than or equal to the other protocol version */ - public boolean olderThanOrEquals(final ProtocolVersion other) { + public boolean olderThanOrEqualTo(final ProtocolVersion other) { return this.compareTo(other) <= 0; } @@ -412,7 +412,7 @@ public class ProtocolVersion implements Comparable { * @return true if this protocol version is between the given protocol versions, inclusive */ public boolean betweenInclusive(final ProtocolVersion min, final ProtocolVersion max) { - return this.newerThanOrEquals(min) && this.olderThanOrEquals(max); + return this.newerThanOrEqualTo(min) && this.olderThanOrEqualTo(max); } /** diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java index 4f52e291d..e290adbaa 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/multiversion/PlayerSneakListener.java @@ -96,7 +96,7 @@ public class PlayerSneakListener extends ViaBukkitListener { if (info == null) return; ProtocolVersion protocolVersion = info.protocolVersion(); - if (is1_14Fix && protocolVersion.newerThanOrEquals(ProtocolVersion.v1_14)) { + if (is1_14Fix && protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_14)) { setHeight(player, event.isSneaking() ? HEIGHT_1_14 : STANDING_HEIGHT); if (event.isSneaking()) sneakingUuids.add(player.getUniqueId()); @@ -108,7 +108,7 @@ public class PlayerSneakListener extends ViaBukkitListener { sneaking.put(player, true); else sneaking.remove(player); - } else if (is1_9Fix && protocolVersion.newerThanOrEquals(ProtocolVersion.v1_9)) { + } else if (is1_9Fix && protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_9)) { setHeight(player, event.isSneaking() ? HEIGHT_1_9 : STANDING_HEIGHT); if (!useCache) return; if (event.isSneaking()) diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java index d08907ae5..94aacf86e 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java @@ -133,7 +133,7 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider final ProtocolVersion protocol = Via.getAPI().getServerVersion().lowestSupportedProtocolVersion(); if (protocol.equalTo(ProtocolVersion.v1_8)) { ReflectionUtil.set(packet, "shift", 1); - } else if (protocol.newerThanOrEquals(ProtocolVersion.v1_9)) { + } else if (protocol.newerThanOrEqualTo(ProtocolVersion.v1_9)) { ReflectionUtil.set(packet, "shift", clickTypeEnum); } } catch (Exception e) { @@ -170,7 +170,7 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider try { this.windowClickPacketClass = NMSUtil.nms("PacketPlayInWindowClick"); final ProtocolVersion protocol = Via.getAPI().getServerVersion().lowestSupportedProtocolVersion(); - if (protocol.newerThanOrEquals(ProtocolVersion.v1_9)) { + if (protocol.newerThanOrEqualTo(ProtocolVersion.v1_9)) { Class eclassz = NMSUtil.nms("InventoryClickType"); Object[] constants = eclassz.getEnumConstants(); this.clickTypeEnum = constants[1]; // QUICK_MOVE @@ -199,6 +199,6 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider private boolean isSupported() { final ProtocolVersion protocol = Via.getAPI().getServerVersion().lowestSupportedProtocolVersion(); - return protocol.newerThanOrEquals(ProtocolVersion.v1_8) && protocol.olderThanOrEquals(ProtocolVersion.v1_11_1); + return protocol.newerThanOrEqualTo(ProtocolVersion.v1_8) && protocol.olderThanOrEqualTo(ProtocolVersion.v1_11_1); } } \ No newline at end of file diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java index 529cd5385..67cf34f1c 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java @@ -173,7 +173,7 @@ public class BungeeServerHandler implements Listener { String serverName = server.getInfo().getName(); storage.setCurrentServer(serverName); ProtocolVersion serverProtocolVersion = Via.proxyPlatform().protocolDetectorService().serverProtocolVersion(serverName); - if (serverProtocolVersion.olderThanOrEquals(ProtocolVersion.v1_8) && storage.getBossbar() != null) { // 1.8 doesn't have BossBar packet + if (serverProtocolVersion.olderThanOrEqualTo(ProtocolVersion.v1_8) && storage.getBossbar() != null) { // 1.8 doesn't have BossBar packet // This ensures we can encode it properly as only the 1.9 protocol is currently implemented. if (user.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) { for (UUID uuid : storage.getBossbar()) { @@ -210,8 +210,8 @@ public class BungeeServerHandler implements Listener { pipeline.add(Via.getManager().getProtocolManager().getBaseProtocol(serverProtocolVersion)); // Workaround 1.13 server change - boolean toNewId = previousServerProtocol.olderThan(ProtocolVersion.v1_13) && serverProtocolVersion.newerThanOrEquals(ProtocolVersion.v1_13); - boolean toOldId = previousServerProtocol.newerThanOrEquals(ProtocolVersion.v1_13) && serverProtocolVersion.olderThan(ProtocolVersion.v1_13); + boolean toNewId = previousServerProtocol.olderThan(ProtocolVersion.v1_13) && serverProtocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_13); + boolean toOldId = previousServerProtocol.newerThanOrEqualTo(ProtocolVersion.v1_13) && serverProtocolVersion.olderThan(ProtocolVersion.v1_13); if (previousServerProtocol.isKnown() && (toNewId || toOldId)) { Collection registeredChannels = (Collection) getRegisteredChannels.invoke(event.getPlayer().getPendingConnection()); if (!registeredChannels.isEmpty()) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java index d4d9c05b6..465d912ef 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java @@ -71,7 +71,7 @@ public class BaseProtocol extends AbstractProtocol protocolPath = null; // Only allow newer clients (or 1.9.2 on 1.9.4 server if the server supports it) - if (info.protocolVersion().newerThanOrEquals(serverProtocol) || Via.getPlatform().isOldClientsAllowed()) { + if (info.protocolVersion().newerThanOrEqualTo(serverProtocol) || Via.getPlatform().isOldClientsAllowed()) { protocolPath = Via.getManager().getProtocolManager().getProtocolPath(info.protocolVersion(), serverProtocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java index 2e965aab9..e50f7bd9c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java @@ -100,7 +100,7 @@ public class BaseProtocol1_7 extends AbstractProtocol protocols = null; - if (info.protocolVersion().newerThanOrEquals(closestServerProtocol) || Via.getPlatform().isOldClientsAllowed()) { + if (info.protocolVersion().newerThanOrEqualTo(closestServerProtocol) || Via.getPlatform().isOldClientsAllowed()) { protocols = Via.getManager().getProtocolManager() .getProtocolPath(info.protocolVersion(), closestServerProtocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java index f965e13fc..5952f618c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java @@ -152,7 +152,7 @@ public class Protocol1_12To1_11_1 extends AbstractProtocol packetWrapper.write(Type.VAR_INT, 0)) .scheduleSend(Protocol1_13To1_12_2.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java index 32f1344e7..40aaf9b4b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java @@ -59,7 +59,7 @@ public class GlassConnectionHandler extends AbstractFenceConnectionHandler { if (states != 0) return states; ProtocolInfo protocolInfo = user.getProtocolInfo(); - return protocolInfo.serverProtocolVersion().olderThanOrEquals(ProtocolVersion.v1_8) + return protocolInfo.serverProtocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_8) && protocolInfo.serverProtocolVersion().isKnown() ? 0xF : states; } }