From 8da0c4310c72ac38660748c07f9bf50ce7355b83 Mon Sep 17 00:00:00 2001 From: Myles Date: Wed, 8 Feb 2017 14:10:18 +0000 Subject: [PATCH] Update to 17w06a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 4 ++-- common/pom.xml | 2 +- .../api/protocol/ProtocolRegistry.java | 7 +++++-- .../api/protocol/ProtocolVersion.java | 2 ++ .../ProtocolSnapshotTo1_11_1.java | 18 ++++++++++++++++++ jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- 10 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 8dd4ace6b..075f7b408 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index f0e5459cf..eab24ca7a 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 4.0.0 @@ -37,7 +37,7 @@ us.myles viaversion-common - 1.0.5-SNAPSHOT + 1.0.5-17w06a \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index eb9de6be4..2cf8ff93b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 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 3a6def501..e545e7047 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 @@ -13,6 +13,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_11_1.ProtocolSnapshotTo1_11_1; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -38,9 +39,11 @@ public class ProtocolRegistry { registerProtocol(new Protocol1_9_1_2TO1_9_3_4(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9_3.getId()); registerProtocol(new Protocol1_10To1_9_3_4(), Collections.singletonList(ProtocolVersion.v1_10.getId()), ProtocolVersion.v1_9_3.getId()); - registerProtocol(new Protocol1_11To1_10(), Arrays.asList(ProtocolVersion.v1_11.getId()), ProtocolVersion.v1_10.getId()); - registerProtocol(new Protocol1_11_1To1_11(), Arrays.asList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_11.getId()); + registerProtocol(new Protocol1_11To1_10(), Collections.singletonList(ProtocolVersion.v1_11.getId()), ProtocolVersion.v1_10.getId()); + registerProtocol(new Protocol1_11_1To1_11(), Collections.singletonList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_11.getId()); + // Snapshot + registerProtocol(new ProtocolSnapshotTo1_11_1(), Collections.singletonList(ProtocolVersion.snapshot.getId()), ProtocolVersion.v1_11_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 867411fad..1fae4c592 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 @@ -29,6 +29,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_10; public static final ProtocolVersion v1_11; public static final ProtocolVersion v1_11_1; + public static final ProtocolVersion snapshot; public static final ProtocolVersion unknown; private final int id; @@ -54,6 +55,7 @@ public class ProtocolVersion { register(v1_10 = new ProtocolVersion(210, "1.10")); register(v1_11 = new ProtocolVersion(315, "1.11")); register(v1_11_1 = new ProtocolVersion(316, "1.11.1")); + register(snapshot = new ProtocolVersion(317, "17w06a")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java new file mode 100644 index 000000000..54601fff0 --- /dev/null +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java @@ -0,0 +1,18 @@ +package us.myles.ViaVersion.protocols.protocolsnapshotto1_11_1; + +import us.myles.ViaVersion.api.data.UserConnection; +import us.myles.ViaVersion.api.protocol.Protocol; + +public class ProtocolSnapshotTo1_11_1 extends Protocol { + + @Override + protected void registerPackets() { + // No noted packet changes for 17w06a + } + + + @Override + public void init(UserConnection userConnection) { + + } +} diff --git a/jar/pom.xml b/jar/pom.xml index e8c2b1a84..07171a2f7 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 6ccc4768c..d561b231a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 1.0.5-SNAPSHOT + 1.0.5-17w06a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 8a168acda..e21a75359 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 0617f13b7..c6f3d173d 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.0.5-SNAPSHOT + 1.0.5-17w06a 4.0.0