PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Extract bungee plugin message channel to constant

Browse Source
This commit is contained in:
md_5 2025-02-12 07:09:05 +11:00
parent ed4a80eb0b
commit 4dad940a2f
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
View File

@ -22,19 +22,21 @@ import net.md_5.bungee.protocol.ProtocolConstants;
public class PluginMessage extends DefinedPacket 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<String, String> MODERNISE = new Function<String, String>() public static final Function<String, String> MODERNISE = new Function<String, String>()
{ {
@Override @Override
public String apply(String tag) public String apply(String tag)
{ {
// Transform as per Bukkit // 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, // Code that gets to here is UNLIKELY to be viable on the Bukkit side of side things,

4
protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java
View File

@ -9,8 +9,8 @@ public class PluginMessageTest
@Test @Test
public void testModerniseChannel() public void testModerniseChannel()
{ {
assertEquals( "bungeecord:main", PluginMessage.MODERNISE.apply( "BungeeCord" ) ); assertEquals( PluginMessage.BUNGEE_CHANNEL_MODERN, PluginMessage.MODERNISE.apply( PluginMessage.BUNGEE_CHANNEL_LEGACY ) );
assertEquals( "BungeeCord", PluginMessage.MODERNISE.apply( "bungeecord:main" ) ); assertEquals( PluginMessage.BUNGEE_CHANNEL_LEGACY, PluginMessage.MODERNISE.apply( PluginMessage.BUNGEE_CHANNEL_MODERN ) );
assertEquals( "legacy:foo", PluginMessage.MODERNISE.apply( "FoO" ) ); assertEquals( "legacy:foo", PluginMessage.MODERNISE.apply( "FoO" ) );
assertEquals( "foo:bar", PluginMessage.MODERNISE.apply( "foo:bar" ) ); assertEquals( "foo:bar", PluginMessage.MODERNISE.apply( "foo:bar" ) );
} }

2
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -180,7 +180,7 @@ public class BungeeCord extends ProxyServer
{ {
// TODO: Proper fallback when we interface the manager // TODO: Proper fallback when we interface the manager
registerChannel( "BungeeCord" ); registerChannel( PluginMessage.BUNGEE_CHANNEL_LEGACY );
} }
public static BungeeCord getInstance() public static BungeeCord getInstance()

12
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -335,7 +335,7 @@ public class DownstreamBridge extends PacketHandler
throw CancelSendSignal.INSTANCE; throw CancelSendSignal.INSTANCE;
} }
if ( pluginMessage.getTag().equals( "BungeeCord" ) ) if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
{ {
ByteArrayDataOutput out = ByteStreams.newDataOutput(); ByteArrayDataOutput out = ByteStreams.newDataOutput();
String subChannel = in.readUTF(); String subChannel = in.readUTF();
@ -359,7 +359,7 @@ public class DownstreamBridge extends PacketHandler
out.write( data ); out.write( data );
byte[] payload = out.toByteArray(); 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 // 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() ) if ( server != this.server.getInfo() )
{ {
server.sendData( "BungeeCord", payload ); server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload );
} }
} }
break; break;
@ -400,7 +400,7 @@ public class DownstreamBridge extends PacketHandler
{ {
if ( server != this.server.getInfo() ) if ( server != this.server.getInfo() )
{ {
server.sendData( "BungeeCord", payload, false ); server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload, false );
} }
} }
break; break;
@ -408,7 +408,7 @@ public class DownstreamBridge extends PacketHandler
ServerInfo server = bungee.getServerInfo( target ); ServerInfo server = bungee.getServerInfo( target );
if ( server != null ) if ( server != null )
{ {
server.sendData( "BungeeCord", payload ); server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, payload );
} }
break; break;
} }
@ -636,7 +636,7 @@ public class DownstreamBridge extends PacketHandler
byte[] b = out.toByteArray(); byte[] b = out.toByteArray();
if ( b.length != 0 ) if ( b.length != 0 )
{ {
server.sendData( "BungeeCord", b ); server.sendData( PluginMessage.BUNGEE_CHANNEL_LEGACY, b );
} }
} }

2
proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@ -302,7 +302,7 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public void handle(PluginMessage pluginMessage) throws Exception 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; throw CancelSendSignal.INSTANCE;
} }