MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

1.14.2 support

Browse Source
This commit is contained in:
Leymooo
2019-05-27 16:21:32 +03:00
committed by Leymooo
parent b5f099824d
commit 85c6238d68
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
View File

@@ -28,8 +28,9 @@ public enum ProtocolVersion {
MINECRAFT_1_13_1(401, "1.13.1"),
MINECRAFT_1_13_2(404, "1.13.2"),
MINECRAFT_1_14(477, "1.14"),
MINECRAFT_1_14_1(480, "1.14.1");
MINECRAFT_1_14_1(480, "1.14.1"),
MINECRAFT_1_14_2(485, "1.14.2");
private final int protocol;
private final String name;
@@ -40,7 +41,7 @@ public enum ProtocolVersion {
/**
* Represents the highest supported version.
*/
public static final ProtocolVersion MAXIMUM_VERSION = MINECRAFT_1_14_1;
public static final ProtocolVersion MAXIMUM_VERSION = values()[values().length - 1];
/**
* The user-friendly representation of the lowest and highest supported versions.

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

@@ -11,6 +11,7 @@ import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_13_1;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_13_2;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_14;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_14_1;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_14_2;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_8;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9_1;
@@ -94,7 +95,7 @@ public enum StateRegistry {
map(0x02, MINECRAFT_1_12, false),
map(0x01, MINECRAFT_1_12_1, false),
map(0x05, MINECRAFT_1_13, false),
map(0x06, MINECRAFT_1_14, false));
map(0x06, MINECRAFT_1_14, false));
serverbound.register(Chat.class, Chat::new,
map(0x01, MINECRAFT_1_8, false),
map(0x02, MINECRAFT_1_9, false),
@@ -254,7 +255,7 @@ public enum StateRegistry {
LINKED_PROTOCOL_VERSIONS.put(MINECRAFT_1_12, EnumSet.of(MINECRAFT_1_12_1));
LINKED_PROTOCOL_VERSIONS.put(MINECRAFT_1_12_1, EnumSet.of(MINECRAFT_1_12_2));
LINKED_PROTOCOL_VERSIONS.put(MINECRAFT_1_13, EnumSet.of(MINECRAFT_1_13_1, MINECRAFT_1_13_2));
LINKED_PROTOCOL_VERSIONS.put(MINECRAFT_1_14, EnumSet.of(MINECRAFT_1_14_1));
LINKED_PROTOCOL_VERSIONS.put(MINECRAFT_1_14, EnumSet.of(MINECRAFT_1_14_1, MINECRAFT_1_14_2));
}
private final Direction direction;
@@ -286,7 +287,7 @@ public enum StateRegistry {
}
<P extends MinecraftPacket> void register(Class<P> clazz, Supplier<P> packetSupplier,
PacketMapping... mappings) {
PacketMapping... mappings) {
if (mappings.length == 0) {
throw new IllegalArgumentException("At least one mapping must be provided.");
}
@@ -332,6 +333,7 @@ public enum StateRegistry {
/**
* Attempts to create a packet from the specified {@code id}.
*
* @param id the packet ID
* @return the packet instance, or {@code null} if the ID is not registered
*/
@@ -345,6 +347,7 @@ public enum StateRegistry {
/**
* Attempts to look up the packet ID for an {@code packet}.
*
* @param packet the packet to look up
* @return the packet ID
* @throws IllegalArgumentException if the packet ID is not found
@@ -416,7 +419,7 @@ public enum StateRegistry {
}
private static PacketMapping[] genericMappings(int id) {
return new PacketMapping[]{
return new PacketMapping[] {
map(id, MINECRAFT_1_8, false),
map(id, MINECRAFT_1_9, false),
map(id, MINECRAFT_1_12, false),