From 9b9cdf8b8fcaf1a19ded4d030efb308ced8d2f21 Mon Sep 17 00:00:00 2001 From: Matsv Date: Thu, 26 Oct 2017 15:39:57 +0200 Subject: [PATCH] Support for 17w43a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 4 ++-- common/pom.xml | 2 +- .../api/protocol/ProtocolRegistry.java | 4 ++++ .../ViaVersion/api/protocol/ProtocolVersion.java | 3 +++ .../ProtocolSnapshotTo1_12_2.java | 16 ++++++++++++++++ jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- 10 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java diff --git a/bukkit/pom.xml b/bukkit/pom.xml index ddfe17af8..a308a44a2 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 5f151bfe5..c777f5067 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 4.0.0 @@ -37,7 +37,7 @@ us.myles viaversion-common - 1.3.0 + 1.4.0-17w43a \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 756860dab..ca89a9cda 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 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 4f442175a..6a450c4c9 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_9_1to1_9.Protocol1_9_1TO1_9; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; import us.myles.ViaVersion.protocols.protocol1_9to1_9_1.Protocol1_9TO1_9_1; +import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.ProtocolSnapshotTo1_12_2; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -47,6 +48,9 @@ public class ProtocolRegistry { registerProtocol(new Protocol1_12To1_11_1(), Collections.singletonList(ProtocolVersion.v1_12.getId()), ProtocolVersion.v1_11_1.getId()); registerProtocol(new Protocol1_12_1TO1_12(), Collections.singletonList(ProtocolVersion.v1_12_1.getId()), ProtocolVersion.v1_12.getId()); registerProtocol(new Protocol1_12_2TO1_12_1(), Collections.singletonList(ProtocolVersion.v1_12_2.getId()), ProtocolVersion.v1_12_1.getId()); + + // 1.13 support in development! (: + registerProtocol(new ProtocolSnapshotTo1_12_2(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_12_2.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 e067422d6..9777059c2 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 @@ -32,6 +32,8 @@ public class ProtocolVersion { public static final ProtocolVersion v1_12; public static final ProtocolVersion v1_12_1; public static final ProtocolVersion v1_12_2; + // v1_13 as name for better ViaBackwards compatibility. + public static final ProtocolVersion v1_13; public static final ProtocolVersion unknown; private final int id; @@ -60,6 +62,7 @@ public class ProtocolVersion { register(v1_12 = new ProtocolVersion(335, "1.12")); register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); + register(v1_13 = new ProtocolVersion(341, "17w43a")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java new file mode 100644 index 000000000..8a6e2dcef --- /dev/null +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java @@ -0,0 +1,16 @@ +package us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2; + +import us.myles.ViaVersion.api.data.UserConnection; +import us.myles.ViaVersion.api.protocol.Protocol; + +// Development of 1.13 support! +public class ProtocolSnapshotTo1_12_2 extends Protocol { + @Override + protected void registerPackets() { + } + + @Override + public void init(UserConnection userConnection) { + + } +} diff --git a/jar/pom.xml b/jar/pom.xml index f58c809ca..762b309ce 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 8de887111..f87ccc2d7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 1.3.0 + 1.4.0-17w43a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index c4db781c9..1bc711a83 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index c1cea83bd..532b14b5b 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.3.0 + 1.4.0-17w43a 4.0.0