From bd71833f182ef27ec54f20ba1cc8bc7433c42efa Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Thu, 31 Mar 2022 19:00:43 +0200
Subject: [PATCH] 22w13a

---
 build.gradle.kts                              |  2 +-
 .../packets/EntityPackets1_19.java            |  4 +--
 .../viabackwards/data/mapping-1.18to1.19.json | 36 +++++++++++++++----
 gradle/libs.versions.toml                     |  2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 71f3918d..cc4890d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.3.0-22w12a-SNAPSHOT"
+    version = "4.3.0-22w13a-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
index 79f30606..3a1fda8a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
@@ -24,11 +24,9 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
-import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.api.type.types.version.Types1_18;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
@@ -163,6 +161,8 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
 
         filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger
         mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).jsonName();
+
+        mapEntityTypeWithData(Entity1_19Types.ALLAY, Entity1_19Types.VEX).jsonName();
     }
 
     @Override
diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
index e92728b6..84f7f95e 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.18to1.19.json
@@ -3,10 +3,14 @@
     "minecraft:sculk": "minecraft:black_concrete_powder",
     "minecraft:sculk_vein": "minecraft:glow_lichen[",
     "minecraft:sculk_catalyst": "minecraft:end_stone",
-    "minecraft:sculk_shrieker[shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]",
-    "minecraft:sculk_shrieker[shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]",
-    "minecraft:sculk_shrieker[shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]",
-    "minecraft:sculk_shrieker[shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=true,shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=true,shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=true,shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=true,shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=false,shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=false,shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=false,shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]",
+    "minecraft:sculk_shrieker[can_summon=false,shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]",
     "minecraft:reinforced_deepslate": "minecraft:obsidian",
     "minecraft:mangrove_planks": "minecraft:acacia_planks",
     "minecraft:stripped_mangrove_log": "minecraft:stripped_acacia_log[",
@@ -386,7 +390,15 @@
     "entity.tadpole.flop": "",
     "entity.tadpole.grow_up": "",
     "entity.tadpole.hurt": "",
-    "entity.tadpole.step": ""
+    "entity.tadpole.step": "",
+    "entity.allay.ambient_with_item": "",
+    "entity.allay.ambient_without_item": "",
+    "entity.allay.death": "",
+    "entity.allay.flap": "",
+    "entity.allay.hurt": "",
+    "entity.allay.item_given": "",
+    "entity.allay.item_taken": "",
+    "entity.parrot.imitate.warden": ""
   },
   "items": {
     "minecraft:warden_spawn_egg": {
@@ -564,13 +576,22 @@
     "minecraft:birch_chest_boat": {
       "id": "minecraft:birch_boat",
       "name": "1.19 Birch Chest Boat"
+    },
+    "minecraft:allay_spawn_egg": {
+      "id": "minecraft:zombie_spawn_egg",
+      "name": "1.19 Allay Spawn Egg"
+    },
+    "minecraft:reinforced_deepslate": {
+      "id": "minecraft:obsidian",
+      "name": "1.19 Reinforced Deepslate"
     }
   },
   "particles": {
     "sculk_soul": "soul",
     "sculk_charge": "",
     "sculk_charge_pop": "bubble_pop",
-    "shriek": ""
+    "shriek": "",
+    "allay_dust": "wax_off"
   },
   "blockentities": {
     "sculk_catalyst": "",
@@ -582,6 +603,7 @@
   "entitynames": {
     "warden": "Warden",
     "frog": "Frog",
-    "tadpole": "Tadpole"
+    "tadpole": "Tadpole",
+    "allay": "Allay"
   }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8eb97a66..cc62f0c4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "4.3.0-22w12a-SNAPSHOT"
+viaver = "4.3.0-22w13a-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"