Eagler-Lambda
/
EaglerLBungee
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

update to 1.9.4

This commit is contained in:
HoosierTransfer 2024-05-11 10:17:00 -04:00
parent 06f03a918c
commit 82665ab9d6
4 changed files with 778 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BungeeCord.jar
View File

Binary file not shown.

1260
src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpWebSocketHandler.java
View File

File diff suppressed because it is too large Load Diff

65
src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/bungeeprotocol/EaglerBungeeProtocol.java
View File

@ -24,44 +24,45 @@ public enum EaglerBungeeProtocol {
HANDSHAKE { HANDSHAKE {
{ {
TO_SERVER.registerPacket(Handshake.class, Handshake::new, map(ProtocolConstants.MINECRAFT_1_8, 0x00)); TO_SERVER.registerPacket(Handshake.class, Handshake::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x00));
} }
}, },
// 0 // 0
GAME { GAME {
{ {
TO_CLIENT.registerPacket(KeepAlive.class, KeepAlive::new, map(ProtocolConstants.MINECRAFT_1_8, 0x00)); TO_CLIENT.registerPacket(KeepAlive.class, KeepAlive::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x1F));
TO_CLIENT.registerPacket(Login.class, Login::new, map(ProtocolConstants.MINECRAFT_1_8, 0x01)); TO_CLIENT.registerPacket(Login.class, Login::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x23));
TO_CLIENT.registerPacket(Chat.class, Chat::new, map(ProtocolConstants.MINECRAFT_1_8, 0x02)); TO_CLIENT.registerPacket(Chat.class, Chat::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x0F));
TO_CLIENT.registerPacket(Respawn.class, Respawn::new, map(ProtocolConstants.MINECRAFT_1_8, 0x07)); TO_CLIENT.registerPacket(Respawn.class, Respawn::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x33));
TO_CLIENT.registerPacket(PlayerListItem.class, // PlayerInfo TO_CLIENT.registerPacket(PlayerListItem.class, // PlayerInfo
PlayerListItem::new, map(ProtocolConstants.MINECRAFT_1_8, 0x38)); PlayerListItem::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x2D));
TO_CLIENT.registerPacket(TabCompleteResponse.class, TabCompleteResponse::new, TO_CLIENT.registerPacket(TabCompleteResponse.class, TabCompleteResponse::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x3A)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x0E));
TO_CLIENT.registerPacket(ScoreboardObjective.class, ScoreboardObjective::new, TO_CLIENT.registerPacket(ScoreboardObjective.class, ScoreboardObjective::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x3B)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x3F));
TO_CLIENT.registerPacket(ScoreboardScore.class, ScoreboardScore::new, TO_CLIENT.registerPacket(ScoreboardScore.class, ScoreboardScore::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x3C)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x42));
TO_CLIENT.registerPacket(ScoreboardDisplay.class, ScoreboardDisplay::new, TO_CLIENT.registerPacket(ScoreboardDisplay.class, ScoreboardDisplay::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x3D)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x38));
TO_CLIENT.registerPacket(Team.class, Team::new, map(ProtocolConstants.MINECRAFT_1_8, 0x3E)); TO_CLIENT.registerPacket(Team.class, Team::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x41));
TO_CLIENT.registerPacket(PluginMessage.class, PluginMessage::new, TO_CLIENT.registerPacket(PluginMessage.class, PluginMessage::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x3F)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x18));
TO_CLIENT.registerPacket(Kick.class, Kick::new, map(ProtocolConstants.MINECRAFT_1_8, 0x40)); TO_CLIENT.registerPacket(Kick.class, Kick::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x1A));
TO_CLIENT.registerPacket(Title.class, Title::new, map(ProtocolConstants.MINECRAFT_1_8, 0x45)); TO_CLIENT.registerPacket(Title.class, Title::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x45));
TO_CLIENT.registerPacket(PlayerListHeaderFooter.class, PlayerListHeaderFooter::new, TO_CLIENT.registerPacket(PlayerListHeaderFooter.class, PlayerListHeaderFooter::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x47)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x47));
TO_CLIENT.registerPacket(EntityStatus.class, EntityStatus::new, map(ProtocolConstants.MINECRAFT_1_8, 0x1A)); TO_CLIENT.registerPacket(EntityStatus.class, EntityStatus::new,
map(ProtocolConstants.MINECRAFT_1_9_4, 0x1B));
TO_SERVER.registerPacket(KeepAlive.class, KeepAlive::new, map(ProtocolConstants.MINECRAFT_1_8, 0x00)); TO_SERVER.registerPacket(KeepAlive.class, KeepAlive::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x0B));
TO_SERVER.registerPacket(Chat.class, Chat::new, map(ProtocolConstants.MINECRAFT_1_8, 0x01)); TO_SERVER.registerPacket(Chat.class, Chat::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x02));
TO_SERVER.registerPacket(TabCompleteRequest.class, TabCompleteRequest::new, TO_SERVER.registerPacket(TabCompleteRequest.class, TabCompleteRequest::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x14)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x01));
TO_SERVER.registerPacket(ClientSettings.class, ClientSettings::new, TO_SERVER.registerPacket(ClientSettings.class, ClientSettings::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x15)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x04));
TO_SERVER.registerPacket(PluginMessage.class, PluginMessage::new, TO_SERVER.registerPacket(PluginMessage.class, PluginMessage::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x17)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x09));
} }
}, },
// 1 // 1
@ -69,28 +70,30 @@ public enum EaglerBungeeProtocol {
{ {
TO_CLIENT.registerPacket(StatusResponse.class, StatusResponse::new, TO_CLIENT.registerPacket(StatusResponse.class, StatusResponse::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x00)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x00));
TO_CLIENT.registerPacket(PingPacket.class, PingPacket::new, map(ProtocolConstants.MINECRAFT_1_8, 0x01)); TO_CLIENT.registerPacket(PingPacket.class, PingPacket::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x01));
TO_SERVER.registerPacket(StatusRequest.class, StatusRequest::new, TO_SERVER.registerPacket(StatusRequest.class, StatusRequest::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x00)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x00));
TO_SERVER.registerPacket(PingPacket.class, PingPacket::new, map(ProtocolConstants.MINECRAFT_1_8, 0x01)); TO_SERVER.registerPacket(PingPacket.class, PingPacket::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x01));
} }
}, },
// 2 // 2
LOGIN { LOGIN {
{ {
TO_CLIENT.registerPacket(Kick.class, Kick::new, map(ProtocolConstants.MINECRAFT_1_8, 0x00)); TO_CLIENT.registerPacket(Kick.class, Kick::new, map(ProtocolConstants.MINECRAFT_1_9_4, 0x00));
TO_CLIENT.registerPacket(EncryptionRequest.class, EncryptionRequest::new, TO_CLIENT.registerPacket(EncryptionRequest.class, EncryptionRequest::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x01)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x01));
TO_CLIENT.registerPacket(LoginSuccess.class, LoginSuccess::new, map(ProtocolConstants.MINECRAFT_1_8, 0x02)); TO_CLIENT.registerPacket(LoginSuccess.class, LoginSuccess::new,
map(ProtocolConstants.MINECRAFT_1_9_4, 0x02));
TO_CLIENT.registerPacket(SetCompression.class, SetCompression::new, TO_CLIENT.registerPacket(SetCompression.class, SetCompression::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x03)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x03));
TO_SERVER.registerPacket(LoginRequest.class, LoginRequest::new, map(ProtocolConstants.MINECRAFT_1_8, 0x00)); TO_SERVER.registerPacket(LoginRequest.class, LoginRequest::new,
map(ProtocolConstants.MINECRAFT_1_9_4, 0x00));
TO_SERVER.registerPacket(EncryptionResponse.class, EncryptionResponse::new, TO_SERVER.registerPacket(EncryptionResponse.class, EncryptionResponse::new,
map(ProtocolConstants.MINECRAFT_1_8, 0x01)); map(ProtocolConstants.MINECRAFT_1_9_4, 0x01));
} }
}, },
// 3 // 3

4
src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/VersionQueryHandler.java
View File

@ -38,10 +38,10 @@ public class VersionQueryHandler extends EaglerQuerySimpleHandler {
handshakeVersions.add(3); handshakeVersions.add(3);
responseObj.add("handshakeVersions", handshakeVersions); responseObj.add("handshakeVersions", handshakeVersions);
JsonArray protocolVersions = new JsonArray(); JsonArray protocolVersions = new JsonArray();
protocolVersions.add(47); protocolVersions.add(110);
responseObj.add("protocolVersions", protocolVersions); responseObj.add("protocolVersions", protocolVersions);
JsonArray gameVersions = new JsonArray(); JsonArray gameVersions = new JsonArray();
gameVersions.add("1.8"); gameVersions.add("1.9.4");
responseObj.add("gameVersions", gameVersions); responseObj.add("gameVersions", gameVersions);
JsonObject proxyInfo = new JsonObject(); JsonObject proxyInfo = new JsonObject();
proxyInfo.addProperty("brand", ProxyServer.getInstance().getName()); proxyInfo.addProperty("brand", ProxyServer.getInstance().getName());