From 56a34ec2f803b6f4175073fe12cd0c3ae7456b62 Mon Sep 17 00:00:00 2001 From: Myles Date: Mon, 13 May 2019 13:15:14 +0100 Subject: [PATCH 1/2] Update to 2.1.0 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 1842c9d90..87cf8bd2e 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index ac1ef5bd1..c653889a0 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 25b5cd1ba..2ec21e778 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index a4d6c0b56..c2bd43181 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index e3b074655..3a7506244 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.0-SNAPSHOT + 2.1.0 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 5cc396d0f..b63fd662b 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 00a8043e9..4a12c8421 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 1209a673e..a7060246f 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 From a075e31a4e26c8c3922f5c902e9689ed70b142cb Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Thu, 16 May 2019 19:21:26 +0200 Subject: [PATCH 2/2] 1.14.2-pre1 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolRegistry.java | 2 ++ .../api/protocol/ProtocolVersion.java | 2 ++ .../Protocol1_14_2To1_14_1.java | 17 +++++++++++++++++ jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 11 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 87cf8bd2e..3bc6cd3bb 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index c653889a0..10472ee92 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 2ec21e778..21383b1ce 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java index a56806bc3..42fca79f9 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java @@ -16,6 +16,7 @@ import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; import us.myles.ViaVersion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; import us.myles.ViaVersion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14; +import us.myles.ViaVersion.protocols.protocol1_14_2to1_14_1.Protocol1_14_2To1_14_1; import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4; import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1To1_9; @@ -64,6 +65,7 @@ public class ProtocolRegistry { registerProtocol(new Protocol1_14To1_13_2(), Arrays.asList(ProtocolVersion.v1_14.getId()), ProtocolVersion.v1_13_2.getId()); registerProtocol(new Protocol1_14_1To1_14(), Arrays.asList(ProtocolVersion.v1_14_1.getId()), ProtocolVersion.v1_14.getId()); + registerProtocol(new Protocol1_14_2To1_14_1(), Arrays.asList(ProtocolVersion.v1_14_2.getId()), ProtocolVersion.v1_14_1.getId()); } /** diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 67be0178d..980d968d5 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -37,6 +37,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_13_2; public static final ProtocolVersion v1_14; public static final ProtocolVersion v1_14_1; + public static final ProtocolVersion v1_14_2; public static final ProtocolVersion unknown; private final int id; @@ -70,6 +71,7 @@ public class ProtocolVersion { register(v1_13_2 = new ProtocolVersion(404, "1.13.2")); register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); + register(v1_14_2 = new ProtocolVersion(481, "1.14.2")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java new file mode 100644 index 000000000..25a7ab132 --- /dev/null +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java @@ -0,0 +1,17 @@ +package us.myles.ViaVersion.protocols.protocol1_14_2to1_14_1; + +import us.myles.ViaVersion.api.data.UserConnection; +import us.myles.ViaVersion.api.protocol.Protocol; + +public class Protocol1_14_2To1_14_1 extends Protocol { + + @Override + protected void registerPackets() { + + } + + @Override + public void init(UserConnection userConnection) { + + } +} diff --git a/jar/pom.xml b/jar/pom.xml index c2bd43181..aeac00431 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 3a7506244..71923041c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.0 + 2.1.1-1.14.2-pre1 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index b63fd662b..6cc0a22ea 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 4a12c8421..9c686fbd2 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index a7060246f..884e88d15 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.0 + 2.1.1-1.14.2-pre1 4.0.0