Merge pull request #1481 from Gerrygames/dev

19w41a

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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"));
     }
 

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]",
+    "11311": "minecraft:beehive[facing=north,honey_level=0]",
-    "11312": "minecraft:bee_hive[facing=north,honey_level=1]",
+    "11312": "minecraft:beehive[facing=north,honey_level=1]",
-    "11313": "minecraft:bee_hive[facing=north,honey_level=2]",
+    "11313": "minecraft:beehive[facing=north,honey_level=2]",
-    "11314": "minecraft:bee_hive[facing=north,honey_level=3]",
+    "11314": "minecraft:beehive[facing=north,honey_level=3]",
-    "11315": "minecraft:bee_hive[facing=north,honey_level=4]",
+    "11315": "minecraft:beehive[facing=north,honey_level=4]",
-    "11316": "minecraft:bee_hive[facing=north,honey_level=5]",
+    "11316": "minecraft:beehive[facing=north,honey_level=5]",
-    "11317": "minecraft:bee_hive[facing=south,honey_level=0]",
+    "11317": "minecraft:beehive[facing=south,honey_level=0]",
-    "11318": "minecraft:bee_hive[facing=south,honey_level=1]",
+    "11318": "minecraft:beehive[facing=south,honey_level=1]",
-    "11319": "minecraft:bee_hive[facing=south,honey_level=2]",
+    "11319": "minecraft:beehive[facing=south,honey_level=2]",
-    "11320": "minecraft:bee_hive[facing=south,honey_level=3]",
+    "11320": "minecraft:beehive[facing=south,honey_level=3]",
-    "11321": "minecraft:bee_hive[facing=south,honey_level=4]",
+    "11321": "minecraft:beehive[facing=south,honey_level=4]",
-    "11322": "minecraft:bee_hive[facing=south,honey_level=5]",
+    "11322": "minecraft:beehive[facing=south,honey_level=5]",
-    "11323": "minecraft:bee_hive[facing=west,honey_level=0]",
+    "11323": "minecraft:beehive[facing=west,honey_level=0]",
-    "11324": "minecraft:bee_hive[facing=west,honey_level=1]",
+    "11324": "minecraft:beehive[facing=west,honey_level=1]",
-    "11325": "minecraft:bee_hive[facing=west,honey_level=2]",
+    "11325": "minecraft:beehive[facing=west,honey_level=2]",
-    "11326": "minecraft:bee_hive[facing=west,honey_level=3]",
+    "11326": "minecraft:beehive[facing=west,honey_level=3]",
-    "11327": "minecraft:bee_hive[facing=west,honey_level=4]",
+    "11327": "minecraft:beehive[facing=west,honey_level=4]",
-    "11328": "minecraft:bee_hive[facing=west,honey_level=5]",
+    "11328": "minecraft:beehive[facing=west,honey_level=5]",
-    "11329": "minecraft:bee_hive[facing=east,honey_level=0]",
+    "11329": "minecraft:beehive[facing=east,honey_level=0]",
-    "11330": "minecraft:bee_hive[facing=east,honey_level=1]",
+    "11330": "minecraft:beehive[facing=east,honey_level=1]",
-    "11331": "minecraft:bee_hive[facing=east,honey_level=2]",
+    "11331": "minecraft:beehive[facing=east,honey_level=2]",
-    "11332": "minecraft:bee_hive[facing=east,honey_level=3]",
+    "11332": "minecraft:beehive[facing=east,honey_level=3]",
-    "11333": "minecraft:bee_hive[facing=east,honey_level=4]",
+    "11333": "minecraft:beehive[facing=east,honey_level=4]",
-    "11334": "minecraft:bee_hive[facing=east,honey_level=5]"
+    "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",
+    "880": "minecraft:beehive",
-    "881": "minecraft:honey_bottle"
+    "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",

jar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>2.1.4-19w40a</version>
+    <version>2.1.4-19w41a</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>

sponge-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sponge/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.1.4-19w40a</version>
+        <version>2.1.4-19w41a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>