From 3ffc55b539e2d4832ff94e4590b44858f3a791b8 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 9 Oct 2019 18:06:37 +0200 Subject: [PATCH] 19w41a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../assets/viaversion/data/mapping-1.15.json | 69 +++++++++++-------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 50 insertions(+), 37 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 2f90c95f4..f49a3a07a 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 2c48434b0..5ec7a0c8c 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index ae3f0a5b6..3fe868399 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 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 9d144392a..6b97b0a1b 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 @@ -77,7 +77,7 @@ public class ProtocolVersion { register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(v1_14_4 = new ProtocolVersion(498, "1.14.4")); - register(v1_15 = new ProtocolVersion(557, "1.15")); + register(v1_15 = new ProtocolVersion(558, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json index 53765b42a..7eb6d35af 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json @@ -11311,30 +11311,32 @@ "11308": "minecraft:bee_nest[facing=east,honey_level=3]", "11309": "minecraft:bee_nest[facing=east,honey_level=4]", "11310": "minecraft:bee_nest[facing=east,honey_level=5]", - "11311": "minecraft:bee_hive[facing=north,honey_level=0]", - "11312": "minecraft:bee_hive[facing=north,honey_level=1]", - "11313": "minecraft:bee_hive[facing=north,honey_level=2]", - "11314": "minecraft:bee_hive[facing=north,honey_level=3]", - "11315": "minecraft:bee_hive[facing=north,honey_level=4]", - "11316": "minecraft:bee_hive[facing=north,honey_level=5]", - "11317": "minecraft:bee_hive[facing=south,honey_level=0]", - "11318": "minecraft:bee_hive[facing=south,honey_level=1]", - "11319": "minecraft:bee_hive[facing=south,honey_level=2]", - "11320": "minecraft:bee_hive[facing=south,honey_level=3]", - "11321": "minecraft:bee_hive[facing=south,honey_level=4]", - "11322": "minecraft:bee_hive[facing=south,honey_level=5]", - "11323": "minecraft:bee_hive[facing=west,honey_level=0]", - "11324": "minecraft:bee_hive[facing=west,honey_level=1]", - "11325": "minecraft:bee_hive[facing=west,honey_level=2]", - "11326": "minecraft:bee_hive[facing=west,honey_level=3]", - "11327": "minecraft:bee_hive[facing=west,honey_level=4]", - "11328": "minecraft:bee_hive[facing=west,honey_level=5]", - "11329": "minecraft:bee_hive[facing=east,honey_level=0]", - "11330": "minecraft:bee_hive[facing=east,honey_level=1]", - "11331": "minecraft:bee_hive[facing=east,honey_level=2]", - "11332": "minecraft:bee_hive[facing=east,honey_level=3]", - "11333": "minecraft:bee_hive[facing=east,honey_level=4]", - "11334": "minecraft:bee_hive[facing=east,honey_level=5]" + "11311": "minecraft:beehive[facing=north,honey_level=0]", + "11312": "minecraft:beehive[facing=north,honey_level=1]", + "11313": "minecraft:beehive[facing=north,honey_level=2]", + "11314": "minecraft:beehive[facing=north,honey_level=3]", + "11315": "minecraft:beehive[facing=north,honey_level=4]", + "11316": "minecraft:beehive[facing=north,honey_level=5]", + "11317": "minecraft:beehive[facing=south,honey_level=0]", + "11318": "minecraft:beehive[facing=south,honey_level=1]", + "11319": "minecraft:beehive[facing=south,honey_level=2]", + "11320": "minecraft:beehive[facing=south,honey_level=3]", + "11321": "minecraft:beehive[facing=south,honey_level=4]", + "11322": "minecraft:beehive[facing=south,honey_level=5]", + "11323": "minecraft:beehive[facing=west,honey_level=0]", + "11324": "minecraft:beehive[facing=west,honey_level=1]", + "11325": "minecraft:beehive[facing=west,honey_level=2]", + "11326": "minecraft:beehive[facing=west,honey_level=3]", + "11327": "minecraft:beehive[facing=west,honey_level=4]", + "11328": "minecraft:beehive[facing=west,honey_level=5]", + "11329": "minecraft:beehive[facing=east,honey_level=0]", + "11330": "minecraft:beehive[facing=east,honey_level=1]", + "11331": "minecraft:beehive[facing=east,honey_level=2]", + "11332": "minecraft:beehive[facing=east,honey_level=3]", + "11333": "minecraft:beehive[facing=east,honey_level=4]", + "11334": "minecraft:beehive[facing=east,honey_level=5]", + "11335": "minecraft:honey_block", + "11336": "minecraft:honeycomb_block" }, "blocks": { "0": "air", @@ -12014,7 +12016,9 @@ "674": "jigsaw", "675": "composter", "676": "bee_nest", - "677": "bee_hive" + "677": "beehive", + "678": "honey_block", + "679": "honeycomb_block" }, "items": { "0": "minecraft:air", @@ -12897,8 +12901,10 @@ "877": "minecraft:campfire", "878": "minecraft:honeycomb", "879": "minecraft:bee_nest", - "880": "minecraft:bee_hive", - "881": "minecraft:honey_bottle" + "880": "minecraft:beehive", + "881": "minecraft:honey_bottle", + "882": "minecraft:honey_block", + "883": "minecraft:honeycomb_block" }, "sounds": [ "ambient.cave", @@ -13202,6 +13208,12 @@ "entity.guardian.hurt", "entity.guardian.hurt_land", "item.hoe.till", + "block.honey_block.break", + "block.honey_block.fall", + "block.honey_block.hit", + "block.honey_block.place", + "block.honey_block.slide", + "block.honey_block.step", "item.honey_bottle.drink", "entity.horse.ambient", "entity.horse.angry", @@ -13245,8 +13257,10 @@ "block.iron_door.close", "block.iron_door.open", "entity.iron_golem.attack", + "entity.iron_golem.damage", "entity.iron_golem.death", "entity.iron_golem.hurt", + "entity.iron_golem.repair", "entity.iron_golem.step", "block.iron_trapdoor.close", "block.iron_trapdoor.open", @@ -13367,7 +13381,6 @@ "entity.parrot.imitate.husk", "entity.parrot.imitate.illusioner", "entity.parrot.imitate.magma_cube", - "entity.parrot.imitate.panda", "entity.parrot.imitate.phantom", "entity.parrot.imitate.pillager", "entity.parrot.imitate.polar_bear", diff --git a/jar/pom.xml b/jar/pom.xml index 4fe48c73e..01e1c5fea 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index a91f9586e..e29140377 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w40a + 2.1.4-19w41a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 9c1f0abcc..21f7035a4 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 76a23e947..c6afc9096 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 1cb2a7a7a..81a889eee 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0