PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

WIP

Browse Source
This commit is contained in:
md_5
2013-10-11 18:40:21 +11:00
parent 96acdb97fd
commit 4257b81d8c
74 changed files with 745 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,9 +57,9 @@ import net.md_5.bungee.command.*;
import net.md_5.bungee.config.YamlConfig;
import net.md_5.bungee.log.LoggingOutputStream;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet2Chat;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.Vanilla;
import net.md_5.bungee.query.RemoteQuery;
import net.md_5.bungee.tab.Custom;
@@ -447,9 +447,9 @@ public class BungeeCord extends ProxyServer
return Collections.unmodifiableCollection( pluginChannels );
}
public PacketFAPluginMessage registerChannels()
public Packet42PluginMessage registerChannels()
{
return new PacketFAPluginMessage( "REGISTER", Util.format( pluginChannels, "\00" ).getBytes() );
return new Packet42PluginMessage( "REGISTER", Util.format( pluginChannels, "\00" ).getBytes() );
}
@Override
@@ -482,7 +482,7 @@ public class BungeeCord extends ProxyServer
getConsole().sendMessage( message );
// TODO: Here too
String encoded = BungeeCord.getInstance().gson.toJson( message );
broadcast( new Packet3Chat( "{\"text\":" + encoded + "}" ) );
broadcast( new Packet2Chat( "{\"text\":" + encoded + "}" ) );
}
public void addConnection(UserConnection con)

6
proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
View File

@@ -25,8 +25,8 @@ import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.connection.PingHandler;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
@RequiredArgsConstructor
public class BungeeServerInfo implements ServerInfo
@@ -97,7 +97,7 @@ public class BungeeServerInfo implements ServerInfo
server.sendData( channel, data );
} else
{
packetQueue.add( new PacketFAPluginMessage( channel, data ) );
packetQueue.add( new Packet42PluginMessage( channel, data ) );
}
}
}

4
proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
View File

@@ -15,7 +15,7 @@ import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import lombok.Getter;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.login.Packet1EncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
/**
@@ -49,7 +49,7 @@ public class EncryptionUtil
return new PacketFDEncryptionRequest( hash, pubKey, verify );
}
public static SecretKey getSecret(PacketFCEncryptionResponse resp, PacketFDEncryptionRequest request) throws GeneralSecurityException
public static SecretKey getSecret(Packet1EncryptionResponse resp, PacketFDEncryptionRequest request) throws GeneralSecurityException
{
Cipher cipher = Cipher.getInstance( "RSA" );
cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );

16
proxy/src/main/java/net/md_5/bungee/PacketConstants.java
View File

@@ -1,18 +1,18 @@
package net.md_5.bungee;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.game.Packet7Respawn;
import net.md_5.bungee.protocol.game.Packet16ClientStatus;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
public class PacketConstants
{
public static final Packet9Respawn DIM1_SWITCH = new Packet9Respawn( (byte) 1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final Packet9Respawn DIM2_SWITCH = new Packet9Respawn( (byte) -1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final PacketCDClientStatus CLIENT_LOGIN = new PacketCDClientStatus( (byte) 0 );
public static final PacketFAPluginMessage FORGE_MOD_REQUEST = new PacketFAPluginMessage( "FML", new byte[]
public static final Packet7Respawn DIM1_SWITCH = new Packet7Respawn( (byte) 1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final Packet7Respawn DIM2_SWITCH = new Packet7Respawn( (byte) -1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final Packet16ClientStatus CLIENT_LOGIN = new Packet16ClientStatus( (byte) 0 );
public static final Packet42PluginMessage FORGE_MOD_REQUEST = new Packet42PluginMessage( "FML", new byte[]
{
0, 0, 0, 0, 0, 2
} );
public static final PacketFAPluginMessage I_AM_BUNGEE = new PacketFAPluginMessage( "BungeeCord", new byte[ 0 ] );
public static final Packet42PluginMessage I_AM_BUNGEE = new Packet42PluginMessage( "BungeeCord", new byte[ 0 ] );
}

10
proxy/src/main/java/net/md_5/bungee/ServerConnection.java
View File

@@ -7,9 +7,9 @@ import lombok.RequiredArgsConstructor;
import lombok.Setter;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.game.Packet43Kick;
@RequiredArgsConstructor
public class ServerConnection implements Server
@@ -34,7 +34,7 @@ public class ServerConnection implements Server
@Override
public void sendData(String channel, byte[] data)
{
unsafe().sendPacket( new PacketFAPluginMessage( channel, data ) );
unsafe().sendPacket( new Packet42PluginMessage( channel, data ) );
}
@Override
@@ -43,7 +43,7 @@ public class ServerConnection implements Server
if ( !ch.isClosed() )
{
// TODO: Can we just use a future here?
unsafe().sendPacket( new PacketFFKick( reason ) );
unsafe().sendPacket( new Packet43Kick( reason ) );
ch.getHandle().eventLoop().schedule( new Runnable()
{
@Override

40
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@@ -30,15 +30,15 @@ import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.Forge;
import net.md_5.bungee.protocol.MinecraftOutput;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet1Login;
import net.md_5.bungee.protocol.game.Packet7Respawn;
import net.md_5.bungee.protocol.game.Packet3EScoreboardObjective;
import net.md_5.bungee.protocol.game.Packet41Team;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.login.Packet1EncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.game.Packet43Kick;
import net.md_5.bungee.protocol.packet.forge.Forge1Login;
@RequiredArgsConstructor
@@ -81,7 +81,7 @@ public class ServerConnector extends PacketHandler
out.writeUTF( "Login" );
out.writeUTF( user.getAddress().getHostString() );
out.writeInt( user.getAddress().getPort() );
channel.write( new PacketFAPluginMessage( "BungeeCord", out.toByteArray() ) );
channel.write( new Packet42PluginMessage( "BungeeCord", out.toByteArray() ) );
channel.write( user.getPendingConnection().getHandshake() );
@@ -117,13 +117,13 @@ public class ServerConnector extends PacketHandler
}
}
for ( PacketFAPluginMessage message : user.getPendingConnection().getRegisterMessages() )
for ( Packet42PluginMessage message : user.getPendingConnection().getRegisterMessages() )
{
ch.write( message );
}
if ( !sentMessages )
{
for ( PacketFAPluginMessage message : user.getPendingConnection().getLoginMessages() )
for ( Packet42PluginMessage message : user.getPendingConnection().getLoginMessages() )
{
ch.write( message );
}
@@ -157,7 +157,7 @@ public class ServerConnector extends PacketHandler
MinecraftOutput out = new MinecraftOutput();
out.writeStringUTF8WithoutLengthHeaderBecauseDinnerboneStuffedUpTheMCBrandPacket( ProxyServer.getInstance().getName() + " (" + ProxyServer.getInstance().getVersion() + ")" );
user.unsafe().sendPacket( new PacketFAPluginMessage( "MC|Brand", out.toArray() ) );
user.unsafe().sendPacket( new Packet42PluginMessage( "MC|Brand", out.toArray() ) );
} else
{
user.getTabList().onServerChange();
@@ -165,18 +165,18 @@ public class ServerConnector extends PacketHandler
Scoreboard serverScoreboard = user.getServerSentScoreboard();
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new PacketCEScoreboardObjective( objective.getName(), objective.getValue(), (byte) 1 ) );
user.unsafe().sendPacket( new Packet3EScoreboardObjective( objective.getName(), objective.getValue(), (byte) 1 ) );
}
for ( Team team : serverScoreboard.getTeams() )
{
user.unsafe().sendPacket( new PacketD1Team( team.getName() ) );
user.unsafe().sendPacket( new Packet41Team( team.getName() ) );
}
serverScoreboard.clear();
user.sendDimensionSwitch();
user.setServerEntityId( login.getEntityId() );
user.unsafe().sendPacket( new Packet9Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), (short) 256, login.getLevelType() ) );
user.unsafe().sendPacket( new Packet7Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), (short) 256, login.getLevelType() ) );
// Remove from old servers
user.getServer().setObsolete( true );
@@ -222,7 +222,7 @@ public class ServerConnector extends PacketHandler
byte[] shared = EncryptionUtil.encrypt( publickey, secretkey.getEncoded() );
byte[] token = EncryptionUtil.encrypt( publickey, encryptRequest.getVerifyToken() );
ch.write( new PacketFCEncryptionResponse( shared, token ) );
ch.write( new Packet1EncryptionResponse( shared, token ) );
Cipher encrypt = EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, secretkey );
ch.addBefore( PipelineUtils.PACKET_DECODE_HANDLER, PipelineUtils.ENCRYPT_HANDLER, new CipherEncoder( encrypt ) );
@@ -235,7 +235,7 @@ public class ServerConnector extends PacketHandler
}
@Override
public void handle(PacketFCEncryptionResponse encryptResponse) throws Exception
public void handle(Packet1EncryptionResponse encryptResponse) throws Exception
{
Preconditions.checkState( thisState == State.ENCRYPT_RESPONSE, "Not expecting ENCRYPT_RESPONSE" );
@@ -249,7 +249,7 @@ public class ServerConnector extends PacketHandler
}
@Override
public void handle(PacketFFKick kick) throws Exception
public void handle(Packet43Kick kick) throws Exception
{
ServerInfo def = bungee.getServerInfo( user.getPendingConnection().getListener().getFallbackServer() );
if ( Objects.equals( target, def ) )
@@ -274,7 +274,7 @@ public class ServerConnector extends PacketHandler
}
@Override
public void handle(PacketFAPluginMessage pluginMessage) throws Exception
public void handle(Packet42PluginMessage pluginMessage) throws Exception
{
if ( pluginMessage.equals( PacketConstants.I_AM_BUNGEE ) )
{
@@ -299,7 +299,7 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( pluginMessage ); // We have to forward these to the user, especially with Forge as stuff might break
if ( !sentMessages && user.getPendingConnection().getForgeLogin() != null )
{
for ( PacketFAPluginMessage message : user.getPendingConnection().getLoginMessages() )
for ( Packet42PluginMessage message : user.getPendingConnection().getLoginMessages() )
{
ch.write( message );
}

20
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@@ -32,11 +32,11 @@ import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PacketWrapper;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet2Chat;
import net.md_5.bungee.protocol.game.Packet15Settings;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.game.Packet43Kick;
import net.md_5.bungee.util.CaseInsensitiveSet;
@RequiredArgsConstructor
@@ -88,7 +88,7 @@ public final class UserConnection implements ProxiedPlayer
private int serverEntityId;
@Getter
@Setter
private PacketCCSettings settings;
private Packet15Settings settings;
@Getter
private final Scoreboard serverSentScoreboard = new Scoreboard();
/*========================================================================*/
@@ -251,7 +251,7 @@ public final class UserConnection implements ProxiedPlayer
if ( ch.getHandle().isActive() )
{
bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason );
unsafe().sendPacket( new PacketFFKick( reason ) );
unsafe().sendPacket( new Packet43Kick( reason ) );
ch.close();
if ( server != null )
{
@@ -264,7 +264,7 @@ public final class UserConnection implements ProxiedPlayer
public void chat(String message)
{
Preconditions.checkState( server != null, "Not connected to server" );
server.getCh().write( new Packet3Chat( message ) );
server.getCh().write( new Packet2Chat( message ) );
}
@Override
@@ -272,7 +272,7 @@ public final class UserConnection implements ProxiedPlayer
{
// TODO: Fix this
String encoded = BungeeCord.getInstance().gson.toJson( message );
unsafe().sendPacket( new Packet3Chat( "{\"text\":" + encoded + "}" ) );
unsafe().sendPacket( new Packet2Chat( "{\"text\":" + encoded + "}" ) );
}
@Override
@@ -287,7 +287,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void sendData(String channel, byte[] data)
{
unsafe().sendPacket( new PacketFAPluginMessage( channel, data ) );
unsafe().sendPacket( new Packet42PluginMessage( channel, data ) );
}
@Override

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

@@ -22,14 +22,14 @@ import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.PacketWrapper;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.game.Packet0KeepAlive;
import net.md_5.bungee.protocol.game.Packet3BPlayerListItem;
import net.md_5.bungee.protocol.game.Packet3EScoreboardObjective;
import net.md_5.bungee.protocol.game.Packet3FScoreboardScore;
import net.md_5.bungee.protocol.game.Packet40DisplayScoreboard;
import net.md_5.bungee.protocol.game.Packet41Team;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.game.Packet43Kick;
@RequiredArgsConstructor
public class DownstreamBridge extends PacketHandler
@@ -88,7 +88,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketC9PlayerListItem playerList) throws Exception
public void handle(Packet3BPlayerListItem playerList) throws Exception
{
if ( !con.getTabList().onListUpdate( playerList.getUsername(), playerList.isOnline(), playerList.getPing() ) )
@@ -98,7 +98,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketCEScoreboardObjective objective) throws Exception
public void handle(Packet3EScoreboardObjective objective) throws Exception
{
Scoreboard serverScoreboard = con.getServerSentScoreboard();
switch ( objective.getAction() )
@@ -113,7 +113,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketCFScoreboardScore score) throws Exception
public void handle(Packet3FScoreboardScore score) throws Exception
{
Scoreboard serverScoreboard = con.getServerSentScoreboard();
switch ( score.getAction() )
@@ -130,7 +130,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketD0DisplayScoreboard displayScoreboard) throws Exception
public void handle(Packet40DisplayScoreboard displayScoreboard) throws Exception
{
Scoreboard serverScoreboard = con.getServerSentScoreboard();
serverScoreboard.setName( displayScoreboard.getName() );
@@ -138,7 +138,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketD1Team team) throws Exception
public void handle(Packet41Team team) throws Exception
{
Scoreboard serverScoreboard = con.getServerSentScoreboard();
// Remove team and move on
@@ -185,7 +185,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketFAPluginMessage pluginMessage) throws Exception
public void handle(Packet42PluginMessage pluginMessage) throws Exception
{
DataInput in = pluginMessage.getStream();
PluginMessageEvent event = new PluginMessageEvent( con.getServer(), con, pluginMessage.getTag(), pluginMessage.getData().clone() );
@@ -330,7 +330,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
public void handle(PacketFFKick kick) throws Exception
public void handle(Packet43Kick kick) throws Exception
{
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
if ( Objects.equals( server.getInfo(), def ) )

26
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -44,15 +44,15 @@ import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.Forge;
import net.md_5.bungee.protocol.MinecraftInput;
import net.md_5.bungee.protocol.Vanilla;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.game.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.game.Packet16ClientStatus;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import net.md_5.bungee.protocol.login.Packet1EncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.game.Packet43Kick;
import net.md_5.bungee.api.AbstractReconnectHandler;
import net.md_5.bungee.api.event.PlayerHandshakeEvent;
@@ -70,9 +70,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private Packet2Handshake handshake;
private PacketFDEncryptionRequest request;
@Getter
private List<PacketFAPluginMessage> loginMessages = new ArrayList<>();
private List<Packet42PluginMessage> loginMessages = new ArrayList<>();
@Getter
private List<PacketFAPluginMessage> registerMessages = new ArrayList<>();
private List<Packet42PluginMessage> registerMessages = new ArrayList<>();
private State thisState = State.HANDSHAKE;
private SecretKey sharedKey;
private final Unsafe unsafe = new Unsafe()
@@ -110,7 +110,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
@Override
public void handle(PacketFAPluginMessage pluginMessage) throws Exception
public void handle(Packet42PluginMessage pluginMessage) throws Exception
{
if ( pluginMessage.getTag().equals( "MC|PingHost" ) )
{
@@ -243,7 +243,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
@Override
public void handle(final PacketFCEncryptionResponse encryptResponse) throws Exception
public void handle(final Packet1EncryptionResponse encryptResponse) throws Exception
{
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
@@ -323,7 +323,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( ch.getHandle().isActive() )
{
unsafe().sendPacket( new PacketFCEncryptionResponse( new byte[ 0 ], new byte[ 0 ] ) );
unsafe().sendPacket( new Packet1EncryptionResponse( new byte[ 0 ], new byte[ 0 ] ) );
try
{
Cipher encrypt = EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, sharedKey );
@@ -343,7 +343,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
@Override
public void handle(PacketCDClientStatus clientStatus) throws Exception
public void handle(Packet16ClientStatus clientStatus) throws Exception
{
Preconditions.checkState( thisState == State.LOGIN, "Not expecting LOGIN" );
@@ -373,7 +373,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( !ch.isClosed() )
{
unsafe().sendPacket( new PacketFFKick( reason ) );
unsafe().sendPacket( new Packet43Kick( reason ) );
ch.close();
}
}

4
proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
View File

@@ -8,7 +8,7 @@ import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.game.Packet43Kick;
@RequiredArgsConstructor
public class PingHandler extends PacketHandler
@@ -34,7 +34,7 @@ public class PingHandler extends PacketHandler
}
@Override
public void handle(PacketFFKick kick) throws Exception
public void handle(Packet43Kick kick) throws Exception
{
String[] split = kick.getMessage().split( "\00" );
ServerPing ping = new ServerPing( Byte.parseByte( split[1] ), split[2], split[3], Integer.parseInt( split[4] ), Integer.parseInt( split[5] ) );

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

@@ -11,11 +11,11 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.PacketWrapper;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketCBTabComplete;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.game.Packet0KeepAlive;
import net.md_5.bungee.protocol.game.Packet2Chat;
import net.md_5.bungee.protocol.game.Packet3DTabComplete;
import net.md_5.bungee.protocol.game.Packet15Settings;
import net.md_5.bungee.protocol.game.Packet42PluginMessage;
import java.util.ArrayList;
import java.util.List;
@@ -78,7 +78,7 @@ public class UpstreamBridge extends PacketHandler
}
@Override
public void handle(Packet3Chat chat) throws Exception
public void handle(Packet2Chat chat) throws Exception
{
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
@@ -93,7 +93,7 @@ public class UpstreamBridge extends PacketHandler
}
@Override
public void handle(PacketCBTabComplete tabComplete) throws Exception
public void handle(Packet3DTabComplete tabComplete) throws Exception
{
if ( tabComplete.getCursor().startsWith( "/" ) )
{
@@ -102,20 +102,20 @@ public class UpstreamBridge extends PacketHandler
if ( !results.isEmpty() )
{
con.unsafe().sendPacket( new PacketCBTabComplete( results.toArray( new String[ results.size() ] ) ) );
con.unsafe().sendPacket( new Packet3DTabComplete( results.toArray( new String[ results.size() ] ) ) );
throw new CancelSendSignal();
}
}
}
@Override
public void handle(PacketCCSettings settings) throws Exception
public void handle(Packet15Settings settings) throws Exception
{
con.setSettings( settings );
}
@Override
public void handle(PacketFAPluginMessage pluginMessage) throws Exception
public void handle(Packet42PluginMessage pluginMessage) throws Exception
{
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

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

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.DefinedPacket;
@ChannelHandler.Sharable
public class DefinedPacketEncoder extends MessageToByteEncoder<DefinedPacket>

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

@@ -8,7 +8,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.skip.PacketReader;
/**

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

@@ -1,6 +1,6 @@
package net.md_5.bungee.netty;
public abstract class PacketHandler extends net.md_5.bungee.protocol.packet.AbstractPacketHandler
public abstract class PacketHandler extends net.md_5.bungee.protocol.AbstractPacketHandler
{
@Override

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

@@ -3,7 +3,7 @@ package net.md_5.bungee.netty;
import io.netty.buffer.ByteBuf;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.DefinedPacket;
@RequiredArgsConstructor
public class PacketWrapper

6
proxy/src/main/java/net/md_5/bungee/tab/Custom.java
View File

@@ -7,7 +7,7 @@ import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.tab.CustomTabList;
import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.game.Packet3BPlayerListItem;
public class Custom extends TabListAdapter implements CustomTabList
{
@@ -96,7 +96,7 @@ public class Custom extends TabListAdapter implements CustomTabList
{
String text = ( slots[i][j] != null ) ? slots[i][j] : new StringBuilder().append( base( i ) ).append( base( j ) ).toString();
sent[i][j] = text;
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( text, true, (short) 0 ) );
getPlayer().unsafe().sendPacket( new Packet3BPlayerListItem( text, true, (short) 0 ) );
}
}
}
@@ -112,7 +112,7 @@ public class Custom extends TabListAdapter implements CustomTabList
{
String text = sent[i][j];
sent[i][j] = null;
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( text, false, (short) 9999 ) );
getPlayer().unsafe().sendPacket( new Packet3BPlayerListItem( text, false, (short) 9999 ) );
}
}
}

10
proxy/src/main/java/net/md_5/bungee/tab/Global.java
View File

@@ -4,7 +4,7 @@ import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.game.Packet3BPlayerListItem;
public class Global extends TabListAdapter
{
@@ -16,9 +16,9 @@ public class Global extends TabListAdapter
{
for ( ProxiedPlayer p : ProxyServer.getInstance().getPlayers() )
{
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( p.getDisplayName(), true, (short) p.getPing() ) );
getPlayer().unsafe().sendPacket( new Packet3BPlayerListItem( p.getDisplayName(), true, (short) p.getPing() ) );
}
BungeeCord.getInstance().broadcast( new PacketC9PlayerListItem( getPlayer().getDisplayName(), true, (short) getPlayer().getPing() ) );
BungeeCord.getInstance().broadcast( new Packet3BPlayerListItem( getPlayer().getDisplayName(), true, (short) getPlayer().getPing() ) );
}
@Override
@@ -27,14 +27,14 @@ public class Global extends TabListAdapter
if ( !sentPing )
{
sentPing = true;
BungeeCord.getInstance().broadcast( new PacketC9PlayerListItem( getPlayer().getDisplayName(), true, (short) getPlayer().getPing() ) );
BungeeCord.getInstance().broadcast( new Packet3BPlayerListItem( getPlayer().getDisplayName(), true, (short) getPlayer().getPing() ) );
}
}
@Override
public void onDisconnect()
{
BungeeCord.getInstance().broadcast( new PacketC9PlayerListItem( getPlayer().getDisplayName(), false, (short) 9999 ) );
BungeeCord.getInstance().broadcast( new Packet3BPlayerListItem( getPlayer().getDisplayName(), false, (short) 9999 ) );
}
@Override

4
proxy/src/main/java/net/md_5/bungee/tab/GlobalPing.java
View File

@@ -2,7 +2,7 @@ package net.md_5.bungee.tab;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.game.Packet3BPlayerListItem;
public class GlobalPing extends Global
{
@@ -17,7 +17,7 @@ public class GlobalPing extends Global
if ( ping - PING_THRESHOLD > lastPing && ping + PING_THRESHOLD < lastPing )
{
lastPing = ping;
BungeeCord.getInstance().broadcast( new PacketC9PlayerListItem( getPlayer().getDisplayName(), true, (short) ping ) );
BungeeCord.getInstance().broadcast( new Packet3BPlayerListItem( getPlayer().getDisplayName(), true, (short) ping ) );
}
}
}

4
proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
View File

@@ -3,7 +3,7 @@ package net.md_5.bungee.tab;
import java.util.Collection;
import java.util.HashSet;
import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.game.Packet3BPlayerListItem;
public class ServerUnique extends TabListAdapter
{
@@ -17,7 +17,7 @@ public class ServerUnique extends TabListAdapter
{
for ( String username : usernames )
{
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( username, false, (short) 9999 ) );
getPlayer().unsafe().sendPacket( new Packet3BPlayerListItem( username, false, (short) 9999 ) );
}
usernames.clear();
}