Minecraft 1.14-pre5 support
This commit is contained in:
parent
5aaccd2e9e
commit
3f01748d75
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-api</artifactId>
|
<artifactId>bungeecord-api</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-API</name>
|
<name>BungeeCord-API</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-bootstrap</artifactId>
|
<artifactId>bungeecord-bootstrap</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Bootstrap</name>
|
<name>BungeeCord-Bootstrap</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-chat</artifactId>
|
<artifactId>bungeecord-chat</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Chat</name>
|
<name>BungeeCord-Chat</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-config</artifactId>
|
<artifactId>bungeecord-config</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Config</name>
|
<name>BungeeCord-Config</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-event</artifactId>
|
<artifactId>bungeecord-event</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Event</name>
|
<name>BungeeCord-Event</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-log</artifactId>
|
<artifactId>bungeecord-log</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Log</name>
|
<name>BungeeCord-Log</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-cmd-alert</artifactId>
|
<artifactId>bungeecord-module-cmd-alert</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>cmd_alert</name>
|
<name>cmd_alert</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-cmd-find</artifactId>
|
<artifactId>bungeecord-module-cmd-find</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>cmd_find</name>
|
<name>cmd_find</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-cmd-list</artifactId>
|
<artifactId>bungeecord-module-cmd-list</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>cmd_list</name>
|
<name>cmd_list</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-cmd-send</artifactId>
|
<artifactId>bungeecord-module-cmd-send</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>cmd_send</name>
|
<name>cmd_send</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-cmd-server</artifactId>
|
<artifactId>bungeecord-module-cmd-server</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>cmd_server</name>
|
<name>cmd_server</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>BungeeCord Modules</name>
|
<name>BungeeCord Modules</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module</artifactId>
|
<artifactId>bungeecord-module</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-module-reconnect-yaml</artifactId>
|
<artifactId>bungeecord-module-reconnect-yaml</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>reconnect_yaml</name>
|
<name>reconnect_yaml</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-native</artifactId>
|
<artifactId>bungeecord-native</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Native</name>
|
<name>BungeeCord-Native</name>
|
||||||
|
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Parent</name>
|
<name>BungeeCord-Parent</name>
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-protocol</artifactId>
|
<artifactId>bungeecord-protocol</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Protocol</name>
|
<name>BungeeCord-Protocol</name>
|
||||||
|
@ -63,7 +63,8 @@ public enum Protocol
|
|||||||
KeepAlive.class,
|
KeepAlive.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x21 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x20 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
Login.class,
|
Login.class,
|
||||||
@ -83,7 +84,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x38 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x38 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x3A )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
BossBar.class,
|
BossBar.class,
|
||||||
@ -94,7 +96,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x30 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x30 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x33 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
TabCompleteResponse.class,
|
TabCompleteResponse.class,
|
||||||
@ -108,7 +111,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x45 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x45 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x49 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
ScoreboardScore.class,
|
ScoreboardScore.class,
|
||||||
@ -116,7 +120,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x48 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x48 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x4C )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
ScoreboardDisplay.class,
|
ScoreboardDisplay.class,
|
||||||
@ -124,7 +129,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x3E )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x3E ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x42 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
Team.class,
|
Team.class,
|
||||||
@ -132,26 +138,30 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x47 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x47 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x4B )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
PluginMessage.class,
|
PluginMessage.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x19 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x18 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
Kick.class,
|
Kick.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x1B )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x1A )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
Title.class,
|
Title.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x4B )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x4F )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
PlayerListHeaderFooter.class,
|
PlayerListHeaderFooter.class,
|
||||||
@ -160,13 +170,15 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
|
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x49 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x49 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x4A ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x4A ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x4E )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x4E ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x53 )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
EntityStatus.class,
|
EntityStatus.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x1C )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x1B )
|
||||||
);
|
);
|
||||||
TO_CLIENT.registerPacket(
|
TO_CLIENT.registerPacket(
|
||||||
Commands.class,
|
Commands.class,
|
||||||
@ -179,14 +191,16 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x0E )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x0F )
|
||||||
);
|
);
|
||||||
TO_SERVER.registerPacket(
|
TO_SERVER.registerPacket(
|
||||||
Chat.class,
|
Chat.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 )
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x03 )
|
||||||
);
|
);
|
||||||
TO_SERVER.registerPacket(
|
TO_SERVER.registerPacket(
|
||||||
TabCompleteRequest.class,
|
TabCompleteRequest.class,
|
||||||
@ -194,14 +208,16 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x05 )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x05 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x06 )
|
||||||
);
|
);
|
||||||
TO_SERVER.registerPacket(
|
TO_SERVER.registerPacket(
|
||||||
ClientSettings.class,
|
ClientSettings.class,
|
||||||
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
|
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 )
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x05 )
|
||||||
);
|
);
|
||||||
TO_SERVER.registerPacket(
|
TO_SERVER.registerPacket(
|
||||||
PluginMessage.class,
|
PluginMessage.class,
|
||||||
@ -209,7 +225,8 @@ public enum Protocol
|
|||||||
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
|
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
|
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
|
map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
|
||||||
map( ProtocolConstants.MINECRAFT_1_13, 0x0A )
|
map( ProtocolConstants.MINECRAFT_1_13, 0x0A ),
|
||||||
|
map( ProtocolConstants.MINECRAFT_1_14, 0x0B )
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -20,13 +20,15 @@ public class ProtocolConstants
|
|||||||
public static final int MINECRAFT_1_13 = 393;
|
public static final int MINECRAFT_1_13 = 393;
|
||||||
public static final int MINECRAFT_1_13_1 = 401;
|
public static final int MINECRAFT_1_13_1 = 401;
|
||||||
public static final int MINECRAFT_1_13_2 = 404;
|
public static final int MINECRAFT_1_13_2 = 404;
|
||||||
|
public static final int MINECRAFT_1_14 = 476;
|
||||||
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
||||||
"1.8.x",
|
"1.8.x",
|
||||||
"1.9.x",
|
"1.9.x",
|
||||||
"1.10.x",
|
"1.10.x",
|
||||||
"1.11.x",
|
"1.11.x",
|
||||||
"1.12.x",
|
"1.12.x",
|
||||||
"1.13.x"
|
"1.13.x",
|
||||||
|
"1.14.x"
|
||||||
);
|
);
|
||||||
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
|
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
|
||||||
ProtocolConstants.MINECRAFT_1_8,
|
ProtocolConstants.MINECRAFT_1_8,
|
||||||
@ -42,7 +44,8 @@ public class ProtocolConstants
|
|||||||
ProtocolConstants.MINECRAFT_1_12_2,
|
ProtocolConstants.MINECRAFT_1_12_2,
|
||||||
ProtocolConstants.MINECRAFT_1_13,
|
ProtocolConstants.MINECRAFT_1_13,
|
||||||
ProtocolConstants.MINECRAFT_1_13_1,
|
ProtocolConstants.MINECRAFT_1_13_1,
|
||||||
ProtocolConstants.MINECRAFT_1_13_2
|
ProtocolConstants.MINECRAFT_1_13_2,
|
||||||
|
ProtocolConstants.MINECRAFT_1_14
|
||||||
);
|
);
|
||||||
|
|
||||||
public enum Direction
|
public enum Direction
|
||||||
|
@ -492,7 +492,9 @@ public class Commands extends DefinedPacket
|
|||||||
PROVIDERS.put( "minecraft:color", VOID );
|
PROVIDERS.put( "minecraft:color", VOID );
|
||||||
PROVIDERS.put( "minecraft:component", VOID );
|
PROVIDERS.put( "minecraft:component", VOID );
|
||||||
PROVIDERS.put( "minecraft:message", VOID );
|
PROVIDERS.put( "minecraft:message", VOID );
|
||||||
PROVIDERS.put( "minecraft:nbt", VOID );
|
PROVIDERS.put( "minecraft:nbt_compound_tag", VOID ); // 1.14
|
||||||
|
PROVIDERS.put( "minecraft:nbt_tag", VOID ); // 1.14
|
||||||
|
PROVIDERS.put( "minecraft:nbt", VOID ); // 1.13
|
||||||
PROVIDERS.put( "minecraft:nbt_path", VOID );
|
PROVIDERS.put( "minecraft:nbt_path", VOID );
|
||||||
PROVIDERS.put( "minecraft:objective", VOID );
|
PROVIDERS.put( "minecraft:objective", VOID );
|
||||||
PROVIDERS.put( "minecraft:objective_criteria", VOID );
|
PROVIDERS.put( "minecraft:objective_criteria", VOID );
|
||||||
@ -513,6 +515,7 @@ public class Commands extends DefinedPacket
|
|||||||
PROVIDERS.put( "minecraft:item_enchantment", VOID );
|
PROVIDERS.put( "minecraft:item_enchantment", VOID );
|
||||||
PROVIDERS.put( "minecraft:entity_summon", VOID );
|
PROVIDERS.put( "minecraft:entity_summon", VOID );
|
||||||
PROVIDERS.put( "minecraft:dimension", VOID );
|
PROVIDERS.put( "minecraft:dimension", VOID );
|
||||||
|
PROVIDERS.put( "minecraft:time", VOID ); // 1.14
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ArgumentType<?> read(String key, ByteBuf buf)
|
private static ArgumentType<?> read(String key, ByteBuf buf)
|
||||||
|
@ -22,6 +22,7 @@ public class Login extends DefinedPacket
|
|||||||
private short difficulty;
|
private short difficulty;
|
||||||
private short maxPlayers;
|
private short maxPlayers;
|
||||||
private String levelType;
|
private String levelType;
|
||||||
|
private int viewDistance;
|
||||||
private boolean reducedDebugInfo;
|
private boolean reducedDebugInfo;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -36,9 +37,16 @@ public class Login extends DefinedPacket
|
|||||||
{
|
{
|
||||||
dimension = buf.readByte();
|
dimension = buf.readByte();
|
||||||
}
|
}
|
||||||
difficulty = buf.readUnsignedByte();
|
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
difficulty = buf.readUnsignedByte();
|
||||||
|
}
|
||||||
maxPlayers = buf.readUnsignedByte();
|
maxPlayers = buf.readUnsignedByte();
|
||||||
levelType = readString( buf );
|
levelType = readString( buf );
|
||||||
|
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
viewDistance = readVarInt( buf );
|
||||||
|
}
|
||||||
if ( protocolVersion >= 29 )
|
if ( protocolVersion >= 29 )
|
||||||
{
|
{
|
||||||
reducedDebugInfo = buf.readBoolean();
|
reducedDebugInfo = buf.readBoolean();
|
||||||
@ -57,9 +65,16 @@ public class Login extends DefinedPacket
|
|||||||
{
|
{
|
||||||
buf.writeByte( dimension );
|
buf.writeByte( dimension );
|
||||||
}
|
}
|
||||||
buf.writeByte( difficulty );
|
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
buf.writeByte( difficulty );
|
||||||
|
}
|
||||||
buf.writeByte( maxPlayers );
|
buf.writeByte( maxPlayers );
|
||||||
writeString( levelType, buf );
|
writeString( levelType, buf );
|
||||||
|
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
writeVarInt( viewDistance, buf );
|
||||||
|
}
|
||||||
if ( protocolVersion >= 29 )
|
if ( protocolVersion >= 29 )
|
||||||
{
|
{
|
||||||
buf.writeBoolean( reducedDebugInfo );
|
buf.writeBoolean( reducedDebugInfo );
|
||||||
|
@ -7,6 +7,7 @@ import lombok.Data;
|
|||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import net.md_5.bungee.protocol.AbstractPacketHandler;
|
import net.md_5.bungee.protocol.AbstractPacketHandler;
|
||||||
|
import net.md_5.bungee.protocol.ProtocolConstants;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@ -21,19 +22,25 @@ public class Respawn extends DefinedPacket
|
|||||||
private String levelType;
|
private String levelType;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void read(ByteBuf buf)
|
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||||
{
|
{
|
||||||
dimension = buf.readInt();
|
dimension = buf.readInt();
|
||||||
difficulty = buf.readUnsignedByte();
|
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
difficulty = buf.readUnsignedByte();
|
||||||
|
}
|
||||||
gameMode = buf.readUnsignedByte();
|
gameMode = buf.readUnsignedByte();
|
||||||
levelType = readString( buf );
|
levelType = readString( buf );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(ByteBuf buf)
|
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||||
{
|
{
|
||||||
buf.writeInt( dimension );
|
buf.writeInt( dimension );
|
||||||
buf.writeByte( difficulty );
|
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
|
||||||
|
{
|
||||||
|
buf.writeByte( difficulty );
|
||||||
|
}
|
||||||
buf.writeByte( gameMode );
|
buf.writeByte( gameMode );
|
||||||
writeString( levelType, buf );
|
writeString( levelType, buf );
|
||||||
}
|
}
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-proxy</artifactId>
|
<artifactId>bungeecord-proxy</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Proxy</name>
|
<name>BungeeCord-Proxy</name>
|
||||||
|
@ -210,7 +210,7 @@ public class ServerConnector extends PacketHandler
|
|||||||
|
|
||||||
// Set tab list size, TODO: what shall we do about packet mutability
|
// Set tab list size, TODO: what shall we do about packet mutability
|
||||||
Login modLogin = new Login( login.getEntityId(), login.getGameMode(), (byte) login.getDimension(), login.getDifficulty(),
|
Login modLogin = new Login( login.getEntityId(), login.getGameMode(), (byte) login.getDimension(), login.getDifficulty(),
|
||||||
(byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.isReducedDebugInfo() );
|
(byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() );
|
||||||
|
|
||||||
user.unsafe().sendPacket( modLogin );
|
user.unsafe().sendPacket( modLogin );
|
||||||
|
|
||||||
|
@ -433,13 +433,13 @@ public final class UserConnection implements ProxiedPlayer
|
|||||||
@Override
|
@Override
|
||||||
public void sendMessage(BaseComponent... message)
|
public void sendMessage(BaseComponent... message)
|
||||||
{
|
{
|
||||||
sendMessage( ChatMessageType.CHAT, message );
|
sendMessage( ChatMessageType.SYSTEM, message );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendMessage(BaseComponent message)
|
public void sendMessage(BaseComponent message)
|
||||||
{
|
{
|
||||||
sendMessage( ChatMessageType.CHAT, message );
|
sendMessage( ChatMessageType.SYSTEM, message );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendMessage(ChatMessageType position, String message)
|
private void sendMessage(ChatMessageType position, String message)
|
||||||
|
@ -51,6 +51,8 @@ public abstract class EntityMap
|
|||||||
case ProtocolConstants.MINECRAFT_1_13_1:
|
case ProtocolConstants.MINECRAFT_1_13_1:
|
||||||
case ProtocolConstants.MINECRAFT_1_13_2:
|
case ProtocolConstants.MINECRAFT_1_13_2:
|
||||||
return EntityMap_1_13.INSTANCE;
|
return EntityMap_1_13.INSTANCE;
|
||||||
|
case ProtocolConstants.MINECRAFT_1_14:
|
||||||
|
return EntityMap_1_14.INSTANCE;
|
||||||
}
|
}
|
||||||
throw new RuntimeException( "Version " + version + " has no entity map" );
|
throw new RuntimeException( "Version " + version + " has no entity map" );
|
||||||
}
|
}
|
||||||
@ -149,18 +151,37 @@ public abstract class EntityMap
|
|||||||
continue;
|
continue;
|
||||||
case 15: // particle
|
case 15: // particle
|
||||||
int particleId = DefinedPacket.readVarInt( packet );
|
int particleId = DefinedPacket.readVarInt( packet );
|
||||||
switch ( particleId )
|
|
||||||
|
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_14 )
|
||||||
{
|
{
|
||||||
case 3:
|
switch ( particleId )
|
||||||
case 20:
|
{
|
||||||
DefinedPacket.readVarInt( packet ); // block state
|
case 3: // minecraft:block
|
||||||
break;
|
case 23: // minecraft:falling_dust
|
||||||
case 11: // dust
|
DefinedPacket.readVarInt( packet ); // block state
|
||||||
packet.skipBytes( 16 ); // float, float, float, flat
|
break;
|
||||||
break;
|
case 14: // minecraft:dust
|
||||||
case 27: // item
|
packet.skipBytes( 16 ); // float, float, float, flat
|
||||||
readSkipSlot( packet, protocolVersion );
|
break;
|
||||||
break;
|
case 32: // minecraft:item
|
||||||
|
readSkipSlot( packet, protocolVersion );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
switch ( particleId )
|
||||||
|
{
|
||||||
|
case 3: // minecraft:block
|
||||||
|
case 20: // minecraft:falling_dust
|
||||||
|
DefinedPacket.readVarInt( packet ); // block state
|
||||||
|
break;
|
||||||
|
case 11: // minecraft:dust
|
||||||
|
packet.skipBytes( 16 ); // float, float, float, flat
|
||||||
|
break;
|
||||||
|
case 27: // minecraft:item
|
||||||
|
readSkipSlot( packet, protocolVersion );
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
default:
|
default:
|
||||||
@ -232,6 +253,23 @@ public abstract class EntityMap
|
|||||||
throw Throwables.propagate( ex );
|
throw Throwables.propagate( ex );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 15:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
break;
|
||||||
|
case 16:
|
||||||
|
if ( index == metaIndex )
|
||||||
|
{
|
||||||
|
int position = packet.readerIndex();
|
||||||
|
rewriteVarInt( packet, oldId + 1, newId + 1, position );
|
||||||
|
packet.readerIndex( position );
|
||||||
|
}
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
break;
|
||||||
|
case 17:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException( "Unknown meta type " + type );
|
throw new IllegalArgumentException( "Unknown meta type " + type );
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,187 @@
|
|||||||
|
package net.md_5.bungee.entitymap;
|
||||||
|
|
||||||
|
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import net.md_5.bungee.BungeeCord;
|
||||||
|
import net.md_5.bungee.UserConnection;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
import net.md_5.bungee.protocol.DefinedPacket;
|
||||||
|
import net.md_5.bungee.protocol.ProtocolConstants;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
class EntityMap_1_14 extends EntityMap
|
||||||
|
{
|
||||||
|
|
||||||
|
static final EntityMap_1_14 INSTANCE = new EntityMap_1_14();
|
||||||
|
|
||||||
|
EntityMap_1_14()
|
||||||
|
{
|
||||||
|
addRewrite( 0x00, ProtocolConstants.Direction.TO_CLIENT, true ); // Spawn Object : PacketPlayOutSpawnEntity
|
||||||
|
addRewrite( 0x01, ProtocolConstants.Direction.TO_CLIENT, true ); // Spawn Experience Orb : PacketPlayOutSpawnEntityExperienceOrb
|
||||||
|
addRewrite( 0x03, ProtocolConstants.Direction.TO_CLIENT, true ); // Spawn Mob : PacketPlayOutSpawnEntityLiving
|
||||||
|
addRewrite( 0x04, ProtocolConstants.Direction.TO_CLIENT, true ); // Spawn Painting : PacketPlayOutSpawnEntityPainting
|
||||||
|
addRewrite( 0x05, ProtocolConstants.Direction.TO_CLIENT, true ); // Spawn Player : PacketPlayOutNamedEntitySpawn
|
||||||
|
addRewrite( 0x06, ProtocolConstants.Direction.TO_CLIENT, true ); // Animation : PacketPlayOutAnimation
|
||||||
|
addRewrite( 0x08, ProtocolConstants.Direction.TO_CLIENT, true ); // Block Break Animation : PacketPlayOutBlockBreakAnimation
|
||||||
|
addRewrite( 0x1B, ProtocolConstants.Direction.TO_CLIENT, false ); // Entity Status : PacketPlayOutEntityStatus
|
||||||
|
addRewrite( 0x28, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Relative Move : PacketPlayOutRelEntityMove
|
||||||
|
addRewrite( 0x29, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Look and Relative Move : PacketPlayOutRelEntityMoveLook
|
||||||
|
addRewrite( 0x2A, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Look : PacketPlayOutEntityLook
|
||||||
|
addRewrite( 0x2B, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity : PacketPlayOutEntity
|
||||||
|
addRewrite( 0x38, ProtocolConstants.Direction.TO_CLIENT, true ); // Remove Entity Effect : PacketPlayOutRemoveEntityEffect
|
||||||
|
addRewrite( 0x3B, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Head Look : PacketPlayOutEntityHeadRotation
|
||||||
|
addRewrite( 0x3E, ProtocolConstants.Direction.TO_CLIENT, true ); // Camera : PacketPlayOutCamera
|
||||||
|
addRewrite( 0x43, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Metadata : PacketPlayOutEntityMetadata
|
||||||
|
addRewrite( 0x44, ProtocolConstants.Direction.TO_CLIENT, false ); // Attach Entity : PacketPlayOutAttachEntity
|
||||||
|
addRewrite( 0x45, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Velocity : PacketPlayOutEntityVelocity
|
||||||
|
addRewrite( 0x46, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Equipment : PacketPlayOutEntityEquipment
|
||||||
|
addRewrite( 0x4A, ProtocolConstants.Direction.TO_CLIENT, true ); // Set Passengers : PacketPlayOutMount
|
||||||
|
addRewrite( 0x55, ProtocolConstants.Direction.TO_CLIENT, true ); // Collect Item : PacketPlayOutCollect
|
||||||
|
addRewrite( 0x56, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Teleport : PacketPlayOutEntityTeleport
|
||||||
|
addRewrite( 0x58, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Properties : PacketPlayOutUpdateAttributes
|
||||||
|
addRewrite( 0x59, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Effect : PacketPlayOutEntityEffect
|
||||||
|
|
||||||
|
addRewrite( 0x0E, ProtocolConstants.Direction.TO_SERVER, true ); // Use Entity : PacketPlayInUseEntity
|
||||||
|
addRewrite( 0x1B, ProtocolConstants.Direction.TO_SERVER, true ); // Entity Action : PacketPlayInEntityAction
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
|
||||||
|
public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protocolVersion)
|
||||||
|
{
|
||||||
|
super.rewriteClientbound( packet, oldId, newId );
|
||||||
|
|
||||||
|
// Special cases
|
||||||
|
int readerIndex = packet.readerIndex();
|
||||||
|
int packetId = DefinedPacket.readVarInt( packet );
|
||||||
|
int packetIdLength = packet.readerIndex() - readerIndex;
|
||||||
|
int jumpIndex = packet.readerIndex();
|
||||||
|
switch ( packetId )
|
||||||
|
{
|
||||||
|
case 0x44 /* Attach Entity : PacketPlayOutAttachEntity */:
|
||||||
|
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength + 4 );
|
||||||
|
break;
|
||||||
|
case 0x55 /* Collect Item : PacketPlayOutCollect */:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
rewriteVarInt( packet, oldId, newId, packet.readerIndex() );
|
||||||
|
break;
|
||||||
|
case 0x4A /* Set Passengers : PacketPlayOutMount */:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
jumpIndex = packet.readerIndex();
|
||||||
|
// Fall through on purpose to int array of IDs
|
||||||
|
case 0x37 /* Destroy Entities : PacketPlayOutEntityDestroy */:
|
||||||
|
int count = DefinedPacket.readVarInt( packet );
|
||||||
|
int[] ids = new int[ count ];
|
||||||
|
for ( int i = 0; i < count; i++ )
|
||||||
|
{
|
||||||
|
ids[i] = DefinedPacket.readVarInt( packet );
|
||||||
|
}
|
||||||
|
packet.readerIndex( jumpIndex );
|
||||||
|
packet.writerIndex( jumpIndex );
|
||||||
|
DefinedPacket.writeVarInt( count, packet );
|
||||||
|
for ( int id : ids )
|
||||||
|
{
|
||||||
|
if ( id == oldId )
|
||||||
|
{
|
||||||
|
id = newId;
|
||||||
|
} else if ( id == newId )
|
||||||
|
{
|
||||||
|
id = oldId;
|
||||||
|
}
|
||||||
|
DefinedPacket.writeVarInt( id, packet );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 0x00 /* Spawn Object : PacketPlayOutSpawnEntity */:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
DefinedPacket.readUUID( packet );
|
||||||
|
int type = packet.readUnsignedByte();
|
||||||
|
|
||||||
|
if ( type == 60 || type == 90 || type == 91 )
|
||||||
|
{
|
||||||
|
if ( type == 60 || type == 91 )
|
||||||
|
{
|
||||||
|
oldId = oldId + 1;
|
||||||
|
newId = newId + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
packet.skipBytes( 26 ); // double, double, double, byte, byte
|
||||||
|
int position = packet.readerIndex();
|
||||||
|
int readId = packet.readInt();
|
||||||
|
if ( readId == oldId )
|
||||||
|
{
|
||||||
|
packet.setInt( position, newId );
|
||||||
|
} else if ( readId == newId )
|
||||||
|
{
|
||||||
|
packet.setInt( position, oldId );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 0x05 /* Spawn Player : PacketPlayOutNamedEntitySpawn */:
|
||||||
|
DefinedPacket.readVarInt( packet ); // Entity ID
|
||||||
|
int idLength = packet.readerIndex() - readerIndex - packetIdLength;
|
||||||
|
UUID uuid = DefinedPacket.readUUID( packet );
|
||||||
|
ProxiedPlayer player;
|
||||||
|
if ( ( player = BungeeCord.getInstance().getPlayerByOfflineUUID( uuid ) ) != null )
|
||||||
|
{
|
||||||
|
int previous = packet.writerIndex();
|
||||||
|
packet.readerIndex( readerIndex );
|
||||||
|
packet.writerIndex( readerIndex + packetIdLength + idLength );
|
||||||
|
DefinedPacket.writeUUID( player.getUniqueId(), packet );
|
||||||
|
packet.writerIndex( previous );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 0x32 /* Combat Event : PacketPlayOutCombatEvent */:
|
||||||
|
int event = packet.readUnsignedByte();
|
||||||
|
if ( event == 1 /* End Combat*/ )
|
||||||
|
{
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
rewriteInt( packet, oldId, newId, packet.readerIndex() );
|
||||||
|
} else if ( event == 2 /* Entity Dead */ )
|
||||||
|
{
|
||||||
|
int position = packet.readerIndex();
|
||||||
|
rewriteVarInt( packet, oldId, newId, packet.readerIndex() );
|
||||||
|
packet.readerIndex( position );
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
rewriteInt( packet, oldId, newId, packet.readerIndex() );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 0x43 /* EntityMetadata : PacketPlayOutEntityMetadata */:
|
||||||
|
DefinedPacket.readVarInt( packet ); // Entity ID
|
||||||
|
rewriteMetaVarInt( packet, oldId + 1, newId + 1, 7, protocolVersion ); // fishing hook
|
||||||
|
rewriteMetaVarInt( packet, oldId, newId, 8, protocolVersion ); // fireworks (et al)
|
||||||
|
break;
|
||||||
|
case 0x50 /* Entity Sound Effect : PacketPlayOutEntitySound */:
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
DefinedPacket.readVarInt( packet );
|
||||||
|
rewriteVarInt( packet, oldId, newId, packet.readerIndex() );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
packet.readerIndex( readerIndex );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void rewriteServerbound(ByteBuf packet, int oldId, int newId)
|
||||||
|
{
|
||||||
|
super.rewriteServerbound( packet, oldId, newId );
|
||||||
|
// Special cases
|
||||||
|
int readerIndex = packet.readerIndex();
|
||||||
|
int packetId = DefinedPacket.readVarInt( packet );
|
||||||
|
int packetIdLength = packet.readerIndex() - readerIndex;
|
||||||
|
|
||||||
|
if ( packetId == 0x2B /* Spectate : PacketPlayInSpectate */ && !BungeeCord.getInstance().getConfig().isIpForward() )
|
||||||
|
{
|
||||||
|
UUID uuid = DefinedPacket.readUUID( packet );
|
||||||
|
ProxiedPlayer player;
|
||||||
|
if ( ( player = BungeeCord.getInstance().getPlayer( uuid ) ) != null )
|
||||||
|
{
|
||||||
|
int previous = packet.writerIndex();
|
||||||
|
packet.readerIndex( readerIndex );
|
||||||
|
packet.writerIndex( readerIndex + packetIdLength );
|
||||||
|
DefinedPacket.writeUUID( ( (UserConnection) player ).getPendingConnection().getOfflineId(), packet );
|
||||||
|
packet.writerIndex( previous );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
packet.readerIndex( readerIndex );
|
||||||
|
}
|
||||||
|
}
|
@ -6,13 +6,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-parent</artifactId>
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-query</artifactId>
|
<artifactId>bungeecord-query</artifactId>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<version>1.14-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>BungeeCord-Query</name>
|
<name>BungeeCord-Query</name>
|
||||||
|
Loading…
Reference in New Issue
Block a user