From 134987cb204fe6fd0d868bdf2abea74d9b45682c Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Thu, 6 Dec 2018 09:32:53 +0100 Subject: [PATCH] 18w49a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../assets/viaversion/data/mapping-1.14.json | 32 +++++++++++-------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 2033679db..79247ad83 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index a4e7ccf35..0d1e00fad 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 1a6801a41..5e6b24eef 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 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 c2df96a97..9b290efeb 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 @@ -67,7 +67,7 @@ public class ProtocolVersion { register(v1_13 = new ProtocolVersion(393, "1.13")); register(v1_13_1 = new ProtocolVersion(401, "1.13.1")); register(v1_13_2 = new ProtocolVersion(404, "1.13.2")); - register(v1_14 = new ProtocolVersion(448, "1.14")); + register(v1_14 = new ProtocolVersion(450, "1.14")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json index 958135cc8..3bf8e8f11 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json @@ -10879,16 +10879,20 @@ "10876": "minecraft:bell[face=ceiling,facing=east]", "10877": "minecraft:lantern[hanging=true]", "10878": "minecraft:lantern[hanging=false]", - "10879": "minecraft:structure_block[mode=save]", - "10880": "minecraft:structure_block[mode=load]", - "10881": "minecraft:structure_block[mode=corner]", - "10882": "minecraft:structure_block[mode=data]", - "10883": "minecraft:jigsaw[facing=north]", - "10884": "minecraft:jigsaw[facing=east]", - "10885": "minecraft:jigsaw[facing=south]", - "10886": "minecraft:jigsaw[facing=west]", - "10887": "minecraft:jigsaw[facing=up]", - "10888": "minecraft:jigsaw[facing=down]" + "10879": "minecraft:sweet_berry_bush[age=0]", + "10880": "minecraft:sweet_berry_bush[age=1]", + "10881": "minecraft:sweet_berry_bush[age=2]", + "10882": "minecraft:sweet_berry_bush[age=3]", + "10883": "minecraft:structure_block[mode=save]", + "10884": "minecraft:structure_block[mode=load]", + "10885": "minecraft:structure_block[mode=corner]", + "10886": "minecraft:structure_block[mode=data]", + "10887": "minecraft:jigsaw[facing=north]", + "10888": "minecraft:jigsaw[facing=east]", + "10889": "minecraft:jigsaw[facing=south]", + "10890": "minecraft:jigsaw[facing=west]", + "10891": "minecraft:jigsaw[facing=up]", + "10892": "minecraft:jigsaw[facing=down]" }, "items": { "0": "minecraft:air", @@ -11757,7 +11761,8 @@ "863": "minecraft:smithing_table", "864": "minecraft:stonecutter", "865": "minecraft:bell", - "866": "minecraft:lantern" + "866": "minecraft:lantern", + "867": "minecraft:sweet_berries" }, "sounds": [ "ambient.cave", @@ -13146,7 +13151,8 @@ "666": "stonecutter", "667": "bell", "668": "lantern", - "669": "structure_block", - "670": "jigsaw" + "669": "sweet_berry_bush", + "670": "structure_block", + "671": "jigsaw" } } \ No newline at end of file diff --git a/jar/pom.xml b/jar/pom.xml index 5095f2d82..19f60679d 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index c94180360..568abb5b4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.0.0-18w48a + 2.0.0-18w49a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 476caf699..d062de4bd 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 75f89fe90..e6af2daa0 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index ce3b8c507..e88168e44 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w48a + 2.0.0-18w49a 4.0.0