From a8d13fadb33b1265e937e02c5cd82ab243c47096 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Mon, 3 Jun 2019 20:21:33 +0200 Subject: [PATCH 1/8] 1.14.3 pre-1 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolRegistry.java | 4 +- .../api/protocol/ProtocolVersion.java | 2 + .../Protocol1_14_3To1_14_2.java | 51 +++++++++++++++++++ jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 11 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 8f2ff1233..a11c94f4e 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 8c79373a0..0f7cec5fb 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 6f79eec06..3fdf97815 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-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 42fca79f9..f8368bee1 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,17 +13,18 @@ import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10; import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.Protocol1_12_1To1_12; import us.myles.ViaVersion.protocols.protocol1_12_2to1_12_1.Protocol1_12_2To1_12_1; import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; +import us.myles.ViaVersion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; 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_14_3to1_14_2.Protocol1_14_3To1_14_2; 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; 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.protocol1_13_1to1_13.Protocol1_13_1To1_13; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -66,6 +67,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()); + registerProtocol(new Protocol1_14_3To1_14_2(), Arrays.asList(ProtocolVersion.v1_14_3.getId()), ProtocolVersion.v1_14_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 85351fbaa..2bac4757b 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 @@ -38,6 +38,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_14; public static final ProtocolVersion v1_14_1; public static final ProtocolVersion v1_14_2; + public static final ProtocolVersion v1_14_3; public static final ProtocolVersion unknown; private final int id; @@ -72,6 +73,7 @@ public class ProtocolVersion { register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); + register(v1_14_3 = new ProtocolVersion(486, "1.14.3")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java new file mode 100644 index 000000000..a203ef542 --- /dev/null +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java @@ -0,0 +1,51 @@ +package us.myles.ViaVersion.protocols.protocol1_14_3to1_14_2; + +import us.myles.ViaVersion.api.PacketWrapper; +import us.myles.ViaVersion.api.data.UserConnection; +import us.myles.ViaVersion.api.protocol.Protocol; +import us.myles.ViaVersion.api.remapper.PacketHandler; +import us.myles.ViaVersion.api.remapper.PacketRemapper; +import us.myles.ViaVersion.api.type.Type; +import us.myles.ViaVersion.packets.State; + +public class Protocol1_14_3To1_14_2 extends Protocol { + + @Override + protected void registerPackets() { + // Trade list + registerOutgoing(State.PLAY, 0x27, 0x27, new PacketRemapper() { + @Override + public void registerMap() { + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + wrapper.passthrough(Type.VAR_INT); + int size = wrapper.passthrough(Type.UNSIGNED_BYTE); + for (int i = 0; i < size; i++) { + wrapper.passthrough(Type.FLAT_VAR_INT_ITEM); + wrapper.passthrough(Type.FLAT_VAR_INT_ITEM); + if (wrapper.passthrough(Type.BOOLEAN)) { + wrapper.passthrough(Type.FLAT_VAR_INT_ITEM); + } + wrapper.passthrough(Type.BOOLEAN); + wrapper.passthrough(Type.INT); + wrapper.passthrough(Type.INT); + wrapper.passthrough(Type.INT); + wrapper.passthrough(Type.INT); + wrapper.passthrough(Type.FLOAT); + } + wrapper.passthrough(Type.VAR_INT); + wrapper.passthrough(Type.VAR_INT); + wrapper.passthrough(Type.BOOLEAN); + + wrapper.write(Type.BOOLEAN, true); // new "restockable" boolean added in pre-1 + } + }); + } + }); + } + + @Override + public void init(UserConnection userConnection) { + } +} diff --git a/jar/pom.xml b/jar/pom.xml index 674d3a4ad..2179bd614 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 61b708dce..49cad27b8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index ced1e6ce0..bc8cdfa3d 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 9a0406c00..dd8af63a4 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index c7404d0ef..299d44771 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-SNAPSHOT + 2.2.0-1.14.3-pre1 4.0.0 From 907b5e020c64b5ecf61555ba073d07aa01a5e473 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Mon, 3 Jun 2019 21:20:32 +0200 Subject: [PATCH 2/8] Change new trade list boolean --- .../protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java index a203ef542..5bfe35315 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java @@ -36,9 +36,8 @@ public class Protocol1_14_3To1_14_2 extends Protocol { } wrapper.passthrough(Type.VAR_INT); wrapper.passthrough(Type.VAR_INT); - wrapper.passthrough(Type.BOOLEAN); - - wrapper.write(Type.BOOLEAN, true); // new "restockable" boolean added in pre-1 + boolean regularVillager = wrapper.passthrough(Type.BOOLEAN); + wrapper.write(Type.BOOLEAN, regularVillager); // new boolean added in pre-1 } }); } From 5ad9d51fb09c351e44f7afdef7ad45eff70df01f Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Mon, 3 Jun 2019 21:59:19 +0200 Subject: [PATCH 3/8] Set version to 2.1.2 --- 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 a11c94f4e..ae5a43287 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 0f7cec5fb..5dbf36aa4 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3fdf97815..fb4adf565 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 2179bd614..acef872f2 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 49cad27b8..d4fcc6757 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index bc8cdfa3d..7eb458882 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index dd8af63a4..7dad314b6 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 299d44771..ba838b2ab 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.2.0-1.14.3-pre1 + 2.1.2-1.14.3-pre1 4.0.0 From 97a8f41e129aad9463bc785ce419a0443d0fff02 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Fri, 7 Jun 2019 12:36:37 +0200 Subject: [PATCH 4/8] 1.14.3 pre-2 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index ae5a43287..efb626e14 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 5dbf36aa4..7ec1352aa 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index fb4adf565..396207630 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 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 2bac4757b..615657258 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 @@ -73,7 +73,7 @@ public class ProtocolVersion { register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); - register(v1_14_3 = new ProtocolVersion(486, "1.14.3")); + register(v1_14_3 = new ProtocolVersion(487, "1.14.3")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index acef872f2..51909ef35 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index d4fcc6757..dec02c5f8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 7eb458882..e5481749d 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 7dad314b6..780f54c7d 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index ba838b2ab..ab1c5c1f3 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre1 + 2.1.2-1.14.3-pre2 4.0.0 From 1c9309ac981643d2f2c0d84f42fa50e984d26787 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Fri, 14 Jun 2019 11:17:38 +0200 Subject: [PATCH 5/8] 1.14.3 pre-3 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index efb626e14..d9e438346 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 7ec1352aa..85b18b497 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 396207630..b776f54e1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 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 615657258..a3e10ff66 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 @@ -73,7 +73,7 @@ public class ProtocolVersion { register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); - register(v1_14_3 = new ProtocolVersion(487, "1.14.3")); + register(v1_14_3 = new ProtocolVersion(488, "1.14.3")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index 51909ef35..2614ddcc4 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index dec02c5f8..4c55e4a65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index e5481749d..2613c8731 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 780f54c7d..7cee49758 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index ab1c5c1f3..8cb211e0d 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre2 + 2.1.2-1.14.3-pre3 4.0.0 From c0e56c7c1906e104974a7d8a37f2047868d4ba15 Mon Sep 17 00:00:00 2001 From: Myles Date: Wed, 19 Jun 2019 23:11:54 +0100 Subject: [PATCH 6/8] 1.14.3 Pre-4 support --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index d9e438346..224985658 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 85b18b497..4d1c9dd15 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index b776f54e1..274b60c94 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 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 a3e10ff66..34ba4d7db 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 @@ -73,7 +73,7 @@ public class ProtocolVersion { register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); - register(v1_14_3 = new ProtocolVersion(488, "1.14.3")); + register(v1_14_3 = new ProtocolVersion(489, "1.14.3")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index 2614ddcc4..ae90c5e64 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 4c55e4a65..b54b4c494 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 2613c8731..99c905482 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 7cee49758..dda266c89 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 8cb211e0d..c6edc4032 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre3 + 2.1.2-1.14.3-pre4 4.0.0 From e4750249e9deb099cbe7928549debc4d99acefc0 Mon Sep 17 00:00:00 2001 From: Myles Date: Mon, 24 Jun 2019 16:14:31 +0100 Subject: [PATCH 7/8] 1.14.3 support --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 224985658..9b629664a 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 4d1c9dd15..892a7a780 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 274b60c94..8b17ac242 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 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 34ba4d7db..3bdda1e7e 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 @@ -73,7 +73,7 @@ public class ProtocolVersion { register(v1_14 = new ProtocolVersion(477, "1.14")); register(v1_14_1 = new ProtocolVersion(480, "1.14.1")); register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); - register(v1_14_3 = new ProtocolVersion(489, "1.14.3")); + register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index ae90c5e64..339ec7292 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index b54b4c494..fc29280e4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2-1.14.3-pre4 + 2.1.2 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 99c905482..f12061384 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index dda266c89..3cce2c7f7 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index c6edc4032..9da39b964 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2-1.14.3-pre4 + 2.1.2 4.0.0 From bae0cd5e3ed986de90b330251382ae3ae897f852 Mon Sep 17 00:00:00 2001 From: Myles Date: Mon, 24 Jun 2019 16:23:35 +0100 Subject: [PATCH 8/8] Back to snapshot --- 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 9b629664a..041162ecf 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 892a7a780..90bffd55f 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 8b17ac242..5fd695d26 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 339ec7292..838a9165f 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index fc29280e4..ca983504e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.2 + 2.1.3-SNAPSHOT pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index f12061384..5fc376669 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 3cce2c7f7..fb967638c 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 9da39b964..4dee723e5 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.2 + 2.1.3-SNAPSHOT 4.0.0