mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-27 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from Desetude/feature/1.8

Browse Source 
Add 1.8 support
This commit is contained in:
Andrew Steinborn 2018-08-06 18:41:37 -04:00 committed by GitHub
commit 6a5c40ecdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolConstants.java
View File

@ -3,6 +3,7 @@ package com.velocitypowered.proxy.protocol;
import java.util.Arrays; import java.util.Arrays;
public enum ProtocolConstants { ; public enum ProtocolConstants { ;
public static final int MINECRAFT_1_8 = 47;
public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9 = 107;
public static final int MINECRAFT_1_9_1 = 108; public static final int MINECRAFT_1_9_1 = 108;
public static final int MINECRAFT_1_9_2 = 109; public static final int MINECRAFT_1_9_2 = 109;
@ -15,9 +16,10 @@ public enum ProtocolConstants { ;
public static final int MINECRAFT_1_12_2 = 340; public static final int MINECRAFT_1_12_2 = 340;
public static final int MINECRAFT_1_13 = 393; public static final int MINECRAFT_1_13 = 393;
public static final int MINIMUM_GENERIC_VERSION = MINECRAFT_1_9; public static final int MINIMUM_GENERIC_VERSION = MINECRAFT_1_8;
public static final int[] SUPPORTED_VERSIONS = new int[] { public static final int[] SUPPORTED_VERSIONS = new int[] {
MINECRAFT_1_8,
MINECRAFT_1_9, MINECRAFT_1_9,
MINECRAFT_1_9_1, MINECRAFT_1_9_1,
MINECRAFT_1_9_2, MINECRAFT_1_9_2,

15
proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
View File

@ -32,21 +32,25 @@ public enum StateRegistry {
PLAY { PLAY {
{ {
SERVERBOUND.register(Chat.class, Chat::new, SERVERBOUND.register(Chat.class, Chat::new,
map(0x01, MINECRAFT_1_8),
map(0x02, MINECRAFT_1_9), map(0x02, MINECRAFT_1_9),
map(0x03, MINECRAFT_1_12), map(0x03, MINECRAFT_1_12),
map(0x02, MINECRAFT_1_12_2), map(0x02, MINECRAFT_1_12_2),
map(0x02, MINECRAFT_1_13)); map(0x02, MINECRAFT_1_13));
SERVERBOUND.register(ClientSettings.class, ClientSettings::new, SERVERBOUND.register(ClientSettings.class, ClientSettings::new,
map(0x15, MINECRAFT_1_8),
map(0x04, MINECRAFT_1_9), map(0x04, MINECRAFT_1_9),
map(0x05, MINECRAFT_1_12), map(0x05, MINECRAFT_1_12),
map(0x04, MINECRAFT_1_12_1), map(0x04, MINECRAFT_1_12_1),
map(0x04, MINECRAFT_1_13)); map(0x04, MINECRAFT_1_13));
SERVERBOUND.register(PluginMessage.class, PluginMessage::new, SERVERBOUND.register(PluginMessage.class, PluginMessage::new,
map(0x17, MINECRAFT_1_8),
map(0x09, MINECRAFT_1_9), map(0x09, MINECRAFT_1_9),
map(0x0A, MINECRAFT_1_12), map(0x0A, MINECRAFT_1_12),
map(0x09, MINECRAFT_1_12_1), map(0x09, MINECRAFT_1_12_1),
map(0x0A, MINECRAFT_1_13)); map(0x0A, MINECRAFT_1_13));
SERVERBOUND.register(KeepAlive.class, KeepAlive::new, SERVERBOUND.register(KeepAlive.class, KeepAlive::new,
map(0x00, MINECRAFT_1_8),
map(0x0B, MINECRAFT_1_9), map(0x0B, MINECRAFT_1_9),
map(0x0C, MINECRAFT_1_12), map(0x0C, MINECRAFT_1_12),
map(0x0B, MINECRAFT_1_12_1), map(0x0B, MINECRAFT_1_12_1),
@ -56,46 +60,56 @@ public enum StateRegistry {
map(0x0C, MINECRAFT_1_9), map(0x0C, MINECRAFT_1_9),
map(0x0C, MINECRAFT_1_12)); map(0x0C, MINECRAFT_1_12));
CLIENTBOUND.register(Chat.class, Chat::new, CLIENTBOUND.register(Chat.class, Chat::new,
map(0x02, MINECRAFT_1_8),
map(0x0F, MINECRAFT_1_9), map(0x0F, MINECRAFT_1_9),
map(0x0F, MINECRAFT_1_12), map(0x0F, MINECRAFT_1_12),
map(0x0E, MINECRAFT_1_13)); map(0x0E, MINECRAFT_1_13));
CLIENTBOUND.register(PluginMessage.class, PluginMessage::new, CLIENTBOUND.register(PluginMessage.class, PluginMessage::new,
map(0x3F, MINECRAFT_1_8),
map(0x18, MINECRAFT_1_9), map(0x18, MINECRAFT_1_9),
map(0x18, MINECRAFT_1_12), map(0x18, MINECRAFT_1_12),
map(0x19, MINECRAFT_1_13)); map(0x19, MINECRAFT_1_13));
CLIENTBOUND.register(Disconnect.class, Disconnect::new, CLIENTBOUND.register(Disconnect.class, Disconnect::new,
map(0x40, MINECRAFT_1_8),
map(0x1A, MINECRAFT_1_9), map(0x1A, MINECRAFT_1_9),
map(0x1A, MINECRAFT_1_12), map(0x1A, MINECRAFT_1_12),
map(0x1B, MINECRAFT_1_13)); map(0x1B, MINECRAFT_1_13));
CLIENTBOUND.register(KeepAlive.class, KeepAlive::new, CLIENTBOUND.register(KeepAlive.class, KeepAlive::new,
map(0x00, MINECRAFT_1_8),
map(0x1F, MINECRAFT_1_9), map(0x1F, MINECRAFT_1_9),
map(0x1F, MINECRAFT_1_12), map(0x1F, MINECRAFT_1_12),
map(0x21, MINECRAFT_1_13)); map(0x21, MINECRAFT_1_13));
CLIENTBOUND.register(JoinGame.class, JoinGame::new, CLIENTBOUND.register(JoinGame.class, JoinGame::new,
map(0x01, MINECRAFT_1_8),
map(0x23, MINECRAFT_1_9), map(0x23, MINECRAFT_1_9),
map(0x23, MINECRAFT_1_12), map(0x23, MINECRAFT_1_12),
map(0x25, MINECRAFT_1_13)); map(0x25, MINECRAFT_1_13));
CLIENTBOUND.register(Respawn.class, Respawn::new, CLIENTBOUND.register(Respawn.class, Respawn::new,
map(0x07, MINECRAFT_1_8),
map(0x33, MINECRAFT_1_9), map(0x33, MINECRAFT_1_9),
map(0x34, MINECRAFT_1_12), map(0x34, MINECRAFT_1_12),
map(0x35, MINECRAFT_1_12_2), map(0x35, MINECRAFT_1_12_2),
map(0x38, MINECRAFT_1_13)); map(0x38, MINECRAFT_1_13));
CLIENTBOUND.register(ScoreboardDisplay.class, ScoreboardDisplay::new, CLIENTBOUND.register(ScoreboardDisplay.class, ScoreboardDisplay::new,
map(0x3D, MINECRAFT_1_8),
map(0x38, MINECRAFT_1_9), map(0x38, MINECRAFT_1_9),
map(0x3A, MINECRAFT_1_12), map(0x3A, MINECRAFT_1_12),
map(0x3B, MINECRAFT_1_12_1), map(0x3B, MINECRAFT_1_12_1),
map(0x3E, MINECRAFT_1_13)); map(0x3E, MINECRAFT_1_13));
CLIENTBOUND.register(ScoreboardObjective.class, ScoreboardObjective::new, CLIENTBOUND.register(ScoreboardObjective.class, ScoreboardObjective::new,
map(0x3B, MINECRAFT_1_8),
map(0x3F, MINECRAFT_1_9), map(0x3F, MINECRAFT_1_9),
map(0x41, MINECRAFT_1_12), map(0x41, MINECRAFT_1_12),
map(0x42, MINECRAFT_1_12_1), map(0x42, MINECRAFT_1_12_1),
map(0x45, MINECRAFT_1_13)); map(0x45, MINECRAFT_1_13));
CLIENTBOUND.register(ScoreboardTeam.class, ScoreboardTeam::new, CLIENTBOUND.register(ScoreboardTeam.class, ScoreboardTeam::new,
map(0x3E, MINECRAFT_1_8),
map(0x41, MINECRAFT_1_9), map(0x41, MINECRAFT_1_9),
map(0x43, MINECRAFT_1_12), map(0x43, MINECRAFT_1_12),
map(0x44, MINECRAFT_1_12_1), map(0x44, MINECRAFT_1_12_1),
map(0x47, MINECRAFT_1_13)); map(0x47, MINECRAFT_1_13));
CLIENTBOUND.register(ScoreboardSetScore.class, ScoreboardSetScore::new, CLIENTBOUND.register(ScoreboardSetScore.class, ScoreboardSetScore::new,
map(0x3C, MINECRAFT_1_8),
map(0x42, MINECRAFT_1_9), map(0x42, MINECRAFT_1_9),
map(0x44, MINECRAFT_1_12), map(0x44, MINECRAFT_1_12),
map(0x45, MINECRAFT_1_12_1), map(0x45, MINECRAFT_1_12_1),
@ -266,6 +280,7 @@ public enum StateRegistry {
private static PacketMapping[] genericMappings(int id) { private static PacketMapping[] genericMappings(int id) {
return new PacketMapping[]{ return new PacketMapping[]{
map(id, MINECRAFT_1_8),
map(id, MINECRAFT_1_9), map(id, MINECRAFT_1_9),
map(id, MINECRAFT_1_12), map(id, MINECRAFT_1_12),
map(id, MINECRAFT_1_13) map(id, MINECRAFT_1_13)

10
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ClientSettings.java
View File

@ -80,7 +80,10 @@ public class ClientSettings implements MinecraftPacket {
this.chatVisibility = ProtocolUtils.readVarInt(buf); this.chatVisibility = ProtocolUtils.readVarInt(buf);
this.chatColors = buf.readBoolean(); this.chatColors = buf.readBoolean();
this.skinParts = buf.readUnsignedByte(); this.skinParts = buf.readUnsignedByte();
this.mainHand = ProtocolUtils.readVarInt(buf);
if (protocolVersion >= ProtocolConstants.MINECRAFT_1_9) {
this.mainHand = ProtocolUtils.readVarInt(buf);
}
} }
@Override @Override
@ -90,6 +93,9 @@ public class ClientSettings implements MinecraftPacket {
ProtocolUtils.writeVarInt(buf, chatVisibility); ProtocolUtils.writeVarInt(buf, chatVisibility);
buf.writeBoolean(chatColors); buf.writeBoolean(chatColors);
buf.writeByte(skinParts); buf.writeByte(skinParts);
ProtocolUtils.writeVarInt(buf, mainHand);
if (protocolVersion >= ProtocolConstants.MINECRAFT_1_9) {
ProtocolUtils.writeVarInt(buf, mainHand);
}
} }
} }

12
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java
View File

@ -87,7 +87,11 @@ public class JoinGame implements MinecraftPacket {
public void decode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) { public void decode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
this.entityId = buf.readInt(); this.entityId = buf.readInt();
this.gamemode = buf.readUnsignedByte(); this.gamemode = buf.readUnsignedByte();
this.dimension = buf.readInt(); if (protocolVersion >= ProtocolConstants.MINECRAFT_1_9_1) {
this.dimension = buf.readInt();
} else {
this.dimension = buf.readByte();
}
this.difficulty = buf.readUnsignedByte(); this.difficulty = buf.readUnsignedByte();
this.maxPlayers = buf.readUnsignedByte(); this.maxPlayers = buf.readUnsignedByte();
this.levelType = ProtocolUtils.readString(buf, 16); this.levelType = ProtocolUtils.readString(buf, 16);
@ -98,7 +102,11 @@ public class JoinGame implements MinecraftPacket {
public void encode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) { public void encode(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
buf.writeInt(entityId); buf.writeInt(entityId);
buf.writeByte(gamemode); buf.writeByte(gamemode);
buf.writeInt(dimension); if (protocolVersion >= ProtocolConstants.MINECRAFT_1_9_1) {
buf.writeInt(dimension);
} else {
buf.writeByte(dimension);
}
buf.writeByte(difficulty); buf.writeByte(difficulty);
buf.writeByte(maxPlayers); buf.writeByte(maxPlayers);
ProtocolUtils.writeString(buf, levelType); ProtocolUtils.writeString(buf, levelType);