From 4dad940a2fee447f60b03c01d673d966b7908247 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2025 07:09:05 +1100 Subject: [PATCH] Extract bungee plugin message channel to constant --- .../md_5/bungee/protocol/packet/PluginMessage.java | 10 ++++++---- .../bungee/protocol/packet/PluginMessageTest.java | 4 ++-- proxy/src/main/java/net/md_5/bungee/BungeeCord.java | 2 +- .../net/md_5/bungee/connection/DownstreamBridge.java | 12 ++++++------ .../net/md_5/bungee/connection/UpstreamBridge.java | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java index 70b292f03..1a7d85127 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java @@ -22,19 +22,21 @@ import net.md_5.bungee.protocol.ProtocolConstants; public class PluginMessage extends DefinedPacket { + public static final String BUNGEE_CHANNEL_LEGACY = "BungeeCord"; + public static final String BUNGEE_CHANNEL_MODERN = "bungeecord:main"; public static final Function MODERNISE = new Function() { @Override public String apply(String tag) { // Transform as per Bukkit - if ( tag.equals( "BungeeCord" ) ) + if ( tag.equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) ) { - return "bungeecord:main"; + return PluginMessage.BUNGEE_CHANNEL_MODERN; } - if ( tag.equals( "bungeecord:main" ) ) + if ( tag.equals( PluginMessage.BUNGEE_CHANNEL_MODERN ) ) { - return "BungeeCord"; + return PluginMessage.BUNGEE_CHANNEL_LEGACY; } // Code that gets to here is UNLIKELY to be viable on the Bukkit side of side things, diff --git a/protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java b/protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java index 5d52f3006..9045b8ec1 100644 --- a/protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java +++ b/protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java @@ -9,8 +9,8 @@ public class PluginMessageTest @Test public void testModerniseChannel() { - assertEquals( "bungeecord:main", PluginMessage.MODERNISE.apply( "BungeeCord" ) ); - assertEquals( "BungeeCord", PluginMessage.MODERNISE.apply( "bungeecord:main" ) ); + assertEquals( PluginMessage.BUNGEE_CHANNEL_MODERN, PluginMessage.MODERNISE.apply( PluginMessage.BUNGEE_CHANNEL_LEGACY ) ); + assertEquals( PluginMessage.BUNGEE_CHANNEL_LEGACY, PluginMessage.MODERNISE.apply( PluginMessage.BUNGEE_CHANNEL_MODERN ) ); assertEquals( "legacy:foo", PluginMessage.MODERNISE.apply( "FoO" ) ); assertEquals( "foo:bar", PluginMessage.MODERNISE.apply( "foo:bar" ) ); } diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index e7f3f09af..305718e71 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -180,7 +180,7 @@ public class BungeeCord extends ProxyServer { // TODO: Proper fallback when we interface the manager - registerChannel( "BungeeCord" ); + registerChannel( PluginMessage.BUNGEE_CHANNEL_LEGACY ); } public static BungeeCord getInstance() diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 59b4e63cb..64e9a7641 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -335,7 +335,7 @@ public class DownstreamBridge extends PacketHandler throw CancelSendSignal.INSTANCE; } - if ( pluginMessage.getTag().equals( "BungeeCord" ) ) + if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) ) { ByteArrayDataOutput out = ByteStreams.newDataOutput(); String subChannel = in.readUTF(); @@ -359,7 +359,7 @@ public class DownstreamBridge extends PacketHandler out.write( data ); byte[] payload = out.toByteArray(); - target.getServer().sendData( "BungeeCord", payload ); + target.getServer().sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload ); } // Null out stream, important as we don't want to send to ourselves @@ -391,7 +391,7 @@ public class DownstreamBridge extends PacketHandler { if ( server != this.server.getInfo() ) { - server.sendData( "BungeeCord", payload ); + server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload ); } } break; @@ -400,7 +400,7 @@ public class DownstreamBridge extends PacketHandler { if ( server != this.server.getInfo() ) { - server.sendData( "BungeeCord", payload, false ); + server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload, false ); } } break; @@ -408,7 +408,7 @@ public class DownstreamBridge extends PacketHandler ServerInfo server = bungee.getServerInfo( target ); if ( server != null ) { - server.sendData( "BungeeCord", payload ); + server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload ); } break; } @@ -636,7 +636,7 @@ public class DownstreamBridge extends PacketHandler byte[] b = out.toByteArray(); if ( b.length != 0 ) { - server.sendData( "BungeeCord", b ); + server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, b ); } } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java index e508ad91e..89ce8a5f7 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -302,7 +302,7 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(PluginMessage pluginMessage) throws Exception { - if ( pluginMessage.getTag().equals( "BungeeCord" ) ) + if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) || pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_MODERN ) ) { throw CancelSendSignal.INSTANCE; }