SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Merge pull request #210 from Leymooo/1.14.2-protocol

Quellcode durchsuchen 
1.14.2 support
Dieser Commit ist enthalten in:
Andrew Steinborn 2019-05-27 13:46:01 -04:00 committet von GitHub
Commit 5baf3c8236
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 11 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

5
api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
Datei anzeigen

@ -28,7 +28,8 @@ public enum ProtocolVersion {
MINECRAFT_1_13_1(401, "1.13.1"), MINECRAFT_1_13_1(401, "1.13.1"),
MINECRAFT_1_13_2(404, "1.13.2"), MINECRAFT_1_13_2(404, "1.13.2"),
MINECRAFT_1_14(477, "1.14"), 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 int protocol;
private final String name; private final String name;
@ -40,7 +41,7 @@ public enum ProtocolVersion {
/** /**
* Represents the highest supported version. * 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. * The user-friendly representation of the lowest and highest supported versions.

5
proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
Datei anzeigen

@ -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_13_2;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_14; 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_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_8;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9_1; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9_1;
@ -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, 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_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_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; private final Direction direction;
@ -332,6 +333,7 @@ public enum StateRegistry {
/** /**
* Attempts to create a packet from the specified {@code id}. * Attempts to create a packet from the specified {@code id}.
*
* @param id the packet ID * @param id the packet ID
* @return the packet instance, or {@code null} if the ID is not registered * @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}. * Attempts to look up the packet ID for an {@code packet}.
*
* @param packet the packet to look up * @param packet the packet to look up
* @return the packet ID * @return the packet ID
* @throws IllegalArgumentException if the packet ID is not found * @throws IllegalArgumentException if the packet ID is not found