From 8d380f42782c1defa535fcd83feabbe2e6610c6e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Thu, 24 Mar 2022 19:29:58 +0100
Subject: [PATCH] 22w12a

---
 build.gradle.kts                              |   2 +-
 .../data/BackwardsMappings.java               |   7 +-
 .../packets/BlockItemPackets1_18.java         |   2 +-
 .../Protocol1_18_2To1_19.java                 |   2 +-
 .../packets/BlockItemPackets1_19.java         |  22 +-
 .../packets/EntityPackets1_19.java            |  10 +-
 .../viabackwards/data/mapping-1.18to1.19.json | 290 +++++++++++++++++-
 gradle/libs.versions.toml                     |   2 +-
 8 files changed, 296 insertions(+), 41 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 65a5b77a..71f3918d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.3.0-22w11a-SNAPSHOT"
+    version = "4.3.0-22w12a-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java
index 7a02973c..4f8845ed 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java
@@ -41,7 +41,6 @@ import java.util.Map;
 public class BackwardsMappings extends com.viaversion.viabackwards.api.data.BackwardsMappings {
     private final Int2ObjectMap<String> statisticMappings = new Int2ObjectOpenHashMap<>();
     private final Map<String, String> translateMappings = new HashMap<>();
-    private Mappings enchantmentMappings;
 
     public BackwardsMappings() {
         super("1.13", "1.12", Protocol1_13To1_12_2.class, true);
@@ -50,7 +49,7 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
     @Override
     public void loadVBExtras(JsonObject oldMappings, JsonObject newMappings) {
         enchantmentMappings = VBMappings.vbBuilder().warnOnMissing(false)
-                .unmapped(oldMappings.getAsJsonObject("enchantments")).mapped(newMappings.getAsJsonObject("enchantments")).build();
+                .unmapped(oldMappings.getAsJsonArray("enchantments")).mapped(newMappings.getAsJsonObject("legacy_enchantments")).build();
         for (Map.Entry<String, Integer> entry : StatisticMappings.CUSTOM_STATS.entrySet()) {
             statisticMappings.put(entry.getValue().intValue(), entry.getKey());
         }
@@ -145,8 +144,4 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
     public Map<String, String> getTranslateMappings() {
         return translateMappings;
     }
-
-    public Mappings getEnchantmentMappings() {
-        return enchantmentMappings;
-    }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
index 893fb7e2..f9a80a78 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
@@ -173,7 +173,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                 handler(wrapper -> {
                     final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
                     final Chunk1_18Type chunkType = new Chunk1_18Type(tracker.currentWorldSectionHeight(),
-                            MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().size()),
+                            MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
                             MathUtil.ceilLog2(tracker.biomesSent()));
                     final Chunk oldChunk = wrapper.read(chunkType);
                     final ChunkSection[] sections = oldChunk.getSections();
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
index af704181..f74bda87 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java
@@ -55,7 +55,7 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
         //TODO block entity update, chunk?
         executeAsyncAfterLoaded(Protocol1_19To1_18_2.class, MAPPINGS::load);
 
-        //TODO update translation mappings
+        //TODO translation mappings
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19.CHAT_MESSAGE);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19.ACTIONBAR);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19.TITLE_TEXT);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java
index 35c46f04..726a7f0a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java
@@ -68,25 +68,7 @@ public final class BlockItemPackets1_19 extends ItemRewriter<Protocol1_18_2To1_1
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_19.WINDOW_PROPERTY, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.UNSIGNED_BYTE); // Window Id
-                map(Type.SHORT); // Property
-                map(Type.SHORT); // Value
-                handler(wrapper -> {
-                    short property = wrapper.get(Type.SHORT, 0);
-                    if (property >= 4 && property <= 6) { // Enchantment id
-                        short enchantmentId = wrapper.get(Type.SHORT, 1);
-                        if (enchantmentId > 12) { // Fast sneaking
-                            wrapper.set(Type.SHORT, 1, --enchantmentId);
-                        } else if (enchantmentId == 12) {
-                            wrapper.set(Type.SHORT, 1, (short) -1);
-                        }
-                    }
-                });
-            }
-        });
+        registerWindowPropertyEnchantmentHandler(ClientboundPackets1_19.WINDOW_PROPERTY);
 
         protocol.registerClientbound(ClientboundPackets1_19.BLOCK_CHANGED_ACK, null, new PacketRemapper() {
             @Override
@@ -137,7 +119,7 @@ public final class BlockItemPackets1_19 extends ItemRewriter<Protocol1_18_2To1_1
                 handler(wrapper -> {
                     final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
                     final Chunk1_18Type chunkType = new Chunk1_18Type(tracker.currentWorldSectionHeight(),
-                            MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().size()),
+                            MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
                             MathUtil.ceilLog2(tracker.biomesSent()));
                     final Chunk chunk = wrapper.passthrough(chunkType);
                     for (final ChunkSection section : chunk.getSections()) {
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 7d7f2152..70899e09 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
@@ -53,7 +53,7 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
         registerMetadataRewriter(ClientboundPackets1_19.ENTITY_METADATA, Types1_19.METADATA_LIST, Types1_18.METADATA_LIST);
         registerRemoveEntities(ClientboundPackets1_19.REMOVE_ENTITIES);
 
-        /*protocol.registerClientbound(ClientboundPackets1_19.ENTITY_EFFECT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_19.ENTITY_EFFECT, new PacketRemapper() {
             @Override
             public void registerMap() {
                 map(Type.VAR_INT); // Entity id
@@ -68,7 +68,7 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
                     }
                 });
             }
-        });*/ //TODO experimental snapshot
+        });
 
         protocol.registerClientbound(ClientboundPackets1_19.JOIN_GAME, new PacketRemapper() {
             @Override
@@ -160,10 +160,10 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
         }).jsonName();
 
         mapEntityTypeWithData(Entity1_19Types.TADPOLE, Entity1_19Types.PUFFERFISH).jsonName();
+        mapEntityTypeWithData(Entity1_19Types.CHEST_BOAT, Entity1_19Types.BOAT);
 
-        //TODO experimental snapshot
-        /*filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger
-        mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).jsonName();*/
+        filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger
+        mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).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 85c1aee9..30669580 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
@@ -13,7 +13,6 @@
     "minecraft:stripped_mangrove_wood": "minecraft:stripped_acacia_wood[",
     "minecraft:mangrove_wood": "minecraft:acacia_wood[",
     "minecraft:mangrove_log": "minecraft:acacia_log[",
-    "minecraft:mangrove_leaves": "minecraft:acacia_leaves[",
     "minecraft:mangrove_sign": "minecraft:acacia_sign[",
     "minecraft:mangrove_wall_sign": "minecraft:acacia_wall_sign[",
     "minecraft:mangrove_pressure_plate": "minecraft:acacia_pressure_plate[",
@@ -37,7 +36,259 @@
     "minecraft:verdant_froglight": "minecraft:sea_lantern",
     "minecraft:pearlescent_froglight": "minecraft:sea_lantern",
     "minecraft:potted_mangrove_propagule": "minecraft:potted_acacia_sapling",
-    "minecraft:frogspawn": "minecraft:air"
+    "minecraft:frogspawn": "minecraft:air",
+    "minecraft:oak_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=1,persistent=true]",
+    "minecraft:oak_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=1,persistent=true]",
+    "minecraft:oak_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=1,persistent=false]",
+    "minecraft:oak_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=1,persistent=false]",
+    "minecraft:oak_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=2,persistent=true]",
+    "minecraft:oak_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=2,persistent=true]",
+    "minecraft:oak_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=2,persistent=false]",
+    "minecraft:oak_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=2,persistent=false]",
+    "minecraft:oak_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=3,persistent=true]",
+    "minecraft:oak_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=3,persistent=true]",
+    "minecraft:oak_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=3,persistent=false]",
+    "minecraft:oak_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=3,persistent=false]",
+    "minecraft:oak_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=4,persistent=true]",
+    "minecraft:oak_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=4,persistent=true]",
+    "minecraft:oak_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=4,persistent=false]",
+    "minecraft:oak_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=4,persistent=false]",
+    "minecraft:oak_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=5,persistent=true]",
+    "minecraft:oak_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=5,persistent=true]",
+    "minecraft:oak_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=5,persistent=false]",
+    "minecraft:oak_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=5,persistent=false]",
+    "minecraft:oak_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=6,persistent=true]",
+    "minecraft:oak_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=6,persistent=true]",
+    "minecraft:oak_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=6,persistent=false]",
+    "minecraft:oak_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=6,persistent=false]",
+    "minecraft:oak_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:oak_leaves[distance=7,persistent=true]",
+    "minecraft:oak_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:oak_leaves[distance=7,persistent=true]",
+    "minecraft:oak_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:oak_leaves[distance=7,persistent=false]",
+    "minecraft:oak_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:oak_leaves[distance=7,persistent=false]",
+    "minecraft:spruce_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=1,persistent=true]",
+    "minecraft:spruce_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=1,persistent=true]",
+    "minecraft:spruce_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=1,persistent=false]",
+    "minecraft:spruce_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=1,persistent=false]",
+    "minecraft:spruce_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=2,persistent=true]",
+    "minecraft:spruce_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=2,persistent=true]",
+    "minecraft:spruce_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=2,persistent=false]",
+    "minecraft:spruce_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=2,persistent=false]",
+    "minecraft:spruce_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=3,persistent=true]",
+    "minecraft:spruce_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=3,persistent=true]",
+    "minecraft:spruce_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=3,persistent=false]",
+    "minecraft:spruce_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=3,persistent=false]",
+    "minecraft:spruce_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=4,persistent=true]",
+    "minecraft:spruce_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=4,persistent=true]",
+    "minecraft:spruce_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=4,persistent=false]",
+    "minecraft:spruce_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=4,persistent=false]",
+    "minecraft:spruce_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=5,persistent=true]",
+    "minecraft:spruce_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=5,persistent=true]",
+    "minecraft:spruce_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=5,persistent=false]",
+    "minecraft:spruce_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=5,persistent=false]",
+    "minecraft:spruce_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=6,persistent=true]",
+    "minecraft:spruce_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=6,persistent=true]",
+    "minecraft:spruce_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=6,persistent=false]",
+    "minecraft:spruce_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=6,persistent=false]",
+    "minecraft:spruce_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:spruce_leaves[distance=7,persistent=true]",
+    "minecraft:spruce_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:spruce_leaves[distance=7,persistent=true]",
+    "minecraft:spruce_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:spruce_leaves[distance=7,persistent=false]",
+    "minecraft:spruce_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:spruce_leaves[distance=7,persistent=false]",
+    "minecraft:birch_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=1,persistent=true]",
+    "minecraft:birch_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=1,persistent=true]",
+    "minecraft:birch_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=1,persistent=false]",
+    "minecraft:birch_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=1,persistent=false]",
+    "minecraft:birch_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=2,persistent=true]",
+    "minecraft:birch_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=2,persistent=true]",
+    "minecraft:birch_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=2,persistent=false]",
+    "minecraft:birch_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=2,persistent=false]",
+    "minecraft:birch_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=3,persistent=true]",
+    "minecraft:birch_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=3,persistent=true]",
+    "minecraft:birch_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=3,persistent=false]",
+    "minecraft:birch_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=3,persistent=false]",
+    "minecraft:birch_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=4,persistent=true]",
+    "minecraft:birch_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=4,persistent=true]",
+    "minecraft:birch_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=4,persistent=false]",
+    "minecraft:birch_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=4,persistent=false]",
+    "minecraft:birch_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=5,persistent=true]",
+    "minecraft:birch_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=5,persistent=true]",
+    "minecraft:birch_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=5,persistent=false]",
+    "minecraft:birch_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=5,persistent=false]",
+    "minecraft:birch_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=6,persistent=true]",
+    "minecraft:birch_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=6,persistent=true]",
+    "minecraft:birch_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=6,persistent=false]",
+    "minecraft:birch_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=6,persistent=false]",
+    "minecraft:birch_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:birch_leaves[distance=7,persistent=true]",
+    "minecraft:birch_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:birch_leaves[distance=7,persistent=true]",
+    "minecraft:birch_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:birch_leaves[distance=7,persistent=false]",
+    "minecraft:birch_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:birch_leaves[distance=7,persistent=false]",
+    "minecraft:jungle_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=1,persistent=true]",
+    "minecraft:jungle_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=1,persistent=true]",
+    "minecraft:jungle_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=1,persistent=false]",
+    "minecraft:jungle_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=1,persistent=false]",
+    "minecraft:jungle_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=2,persistent=true]",
+    "minecraft:jungle_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=2,persistent=true]",
+    "minecraft:jungle_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=2,persistent=false]",
+    "minecraft:jungle_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=2,persistent=false]",
+    "minecraft:jungle_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=3,persistent=true]",
+    "minecraft:jungle_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=3,persistent=true]",
+    "minecraft:jungle_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=3,persistent=false]",
+    "minecraft:jungle_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=3,persistent=false]",
+    "minecraft:jungle_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=4,persistent=true]",
+    "minecraft:jungle_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=4,persistent=true]",
+    "minecraft:jungle_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=4,persistent=false]",
+    "minecraft:jungle_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=4,persistent=false]",
+    "minecraft:jungle_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=5,persistent=true]",
+    "minecraft:jungle_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=5,persistent=true]",
+    "minecraft:jungle_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=5,persistent=false]",
+    "minecraft:jungle_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=5,persistent=false]",
+    "minecraft:jungle_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=6,persistent=true]",
+    "minecraft:jungle_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=6,persistent=true]",
+    "minecraft:jungle_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=6,persistent=false]",
+    "minecraft:jungle_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=6,persistent=false]",
+    "minecraft:jungle_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:jungle_leaves[distance=7,persistent=true]",
+    "minecraft:jungle_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:jungle_leaves[distance=7,persistent=true]",
+    "minecraft:jungle_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:jungle_leaves[distance=7,persistent=false]",
+    "minecraft:jungle_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:jungle_leaves[distance=7,persistent=false]",
+    "minecraft:acacia_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=1,persistent=true]",
+    "minecraft:acacia_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=1,persistent=true]",
+    "minecraft:acacia_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=1,persistent=false]",
+    "minecraft:acacia_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=1,persistent=false]",
+    "minecraft:acacia_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=2,persistent=true]",
+    "minecraft:acacia_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=2,persistent=true]",
+    "minecraft:acacia_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=2,persistent=false]",
+    "minecraft:acacia_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=2,persistent=false]",
+    "minecraft:acacia_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=3,persistent=true]",
+    "minecraft:acacia_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=3,persistent=true]",
+    "minecraft:acacia_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=3,persistent=false]",
+    "minecraft:acacia_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=3,persistent=false]",
+    "minecraft:acacia_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=4,persistent=true]",
+    "minecraft:acacia_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=4,persistent=true]",
+    "minecraft:acacia_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=4,persistent=false]",
+    "minecraft:acacia_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=4,persistent=false]",
+    "minecraft:acacia_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=5,persistent=true]",
+    "minecraft:acacia_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=5,persistent=true]",
+    "minecraft:acacia_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=5,persistent=false]",
+    "minecraft:acacia_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=5,persistent=false]",
+    "minecraft:acacia_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=6,persistent=true]",
+    "minecraft:acacia_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=6,persistent=true]",
+    "minecraft:acacia_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=6,persistent=false]",
+    "minecraft:acacia_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=6,persistent=false]",
+    "minecraft:acacia_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=7,persistent=true]",
+    "minecraft:acacia_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=7,persistent=true]",
+    "minecraft:acacia_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=7,persistent=false]",
+    "minecraft:acacia_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=7,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=1,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=1,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=1,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=1,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=2,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=2,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=2,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=2,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=3,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=3,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=3,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=3,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=4,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=4,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=4,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=4,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=5,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=5,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=5,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=5,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=6,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=6,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=6,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=6,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:dark_oak_leaves[distance=7,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:dark_oak_leaves[distance=7,persistent=true]",
+    "minecraft:dark_oak_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:dark_oak_leaves[distance=7,persistent=false]",
+    "minecraft:dark_oak_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:dark_oak_leaves[distance=7,persistent=false]",
+    "minecraft:mangrove_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=1,persistent=true]",
+    "minecraft:mangrove_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=1,persistent=true]",
+    "minecraft:mangrove_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=1,persistent=false]",
+    "minecraft:mangrove_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=1,persistent=false]",
+    "minecraft:mangrove_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=2,persistent=true]",
+    "minecraft:mangrove_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=2,persistent=true]",
+    "minecraft:mangrove_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=2,persistent=false]",
+    "minecraft:mangrove_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=2,persistent=false]",
+    "minecraft:mangrove_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=3,persistent=true]",
+    "minecraft:mangrove_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=3,persistent=true]",
+    "minecraft:mangrove_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=3,persistent=false]",
+    "minecraft:mangrove_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=3,persistent=false]",
+    "minecraft:mangrove_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=4,persistent=true]",
+    "minecraft:mangrove_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=4,persistent=true]",
+    "minecraft:mangrove_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=4,persistent=false]",
+    "minecraft:mangrove_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=4,persistent=false]",
+    "minecraft:mangrove_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=5,persistent=true]",
+    "minecraft:mangrove_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=5,persistent=true]",
+    "minecraft:mangrove_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=5,persistent=false]",
+    "minecraft:mangrove_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=5,persistent=false]",
+    "minecraft:mangrove_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=6,persistent=true]",
+    "minecraft:mangrove_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=6,persistent=true]",
+    "minecraft:mangrove_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=6,persistent=false]",
+    "minecraft:mangrove_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=6,persistent=false]",
+    "minecraft:mangrove_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:acacia_leaves[distance=7,persistent=true]",
+    "minecraft:mangrove_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:acacia_leaves[distance=7,persistent=true]",
+    "minecraft:mangrove_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:acacia_leaves[distance=7,persistent=false]",
+    "minecraft:mangrove_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:acacia_leaves[distance=7,persistent=false]",
+    "minecraft:azalea_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=1,persistent=true]",
+    "minecraft:azalea_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=1,persistent=true]",
+    "minecraft:azalea_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=1,persistent=false]",
+    "minecraft:azalea_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=1,persistent=false]",
+    "minecraft:azalea_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=2,persistent=true]",
+    "minecraft:azalea_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=2,persistent=true]",
+    "minecraft:azalea_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=2,persistent=false]",
+    "minecraft:azalea_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=2,persistent=false]",
+    "minecraft:azalea_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=3,persistent=true]",
+    "minecraft:azalea_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=3,persistent=true]",
+    "minecraft:azalea_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=3,persistent=false]",
+    "minecraft:azalea_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=3,persistent=false]",
+    "minecraft:azalea_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=4,persistent=true]",
+    "minecraft:azalea_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=4,persistent=true]",
+    "minecraft:azalea_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=4,persistent=false]",
+    "minecraft:azalea_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=4,persistent=false]",
+    "minecraft:azalea_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=5,persistent=true]",
+    "minecraft:azalea_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=5,persistent=true]",
+    "minecraft:azalea_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=5,persistent=false]",
+    "minecraft:azalea_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=5,persistent=false]",
+    "minecraft:azalea_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=6,persistent=true]",
+    "minecraft:azalea_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=6,persistent=true]",
+    "minecraft:azalea_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=6,persistent=false]",
+    "minecraft:azalea_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=6,persistent=false]",
+    "minecraft:azalea_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:azalea_leaves[distance=7,persistent=true]",
+    "minecraft:azalea_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:azalea_leaves[distance=7,persistent=true]",
+    "minecraft:azalea_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:azalea_leaves[distance=7,persistent=false]",
+    "minecraft:azalea_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:azalea_leaves[distance=7,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=1,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=1,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=1,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=1,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=1,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=1,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=1,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=1,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=2,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=2,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=2,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=2,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=2,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=2,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=2,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=2,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=3,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=3,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=3,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=3,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=3,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=3,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=3,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=3,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=4,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=4,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=4,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=4,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=4,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=4,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=4,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=4,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=5,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=5,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=5,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=5,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=5,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=5,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=5,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=5,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=6,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=6,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=6,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=6,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=6,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=6,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=6,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=6,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=7,persistent=true,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=7,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=7,persistent=true,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=7,persistent=true]",
+    "minecraft:flowering_azalea_leaves[distance=7,persistent=false,waterlogged=true]": "minecraft:flowering_azalea_leaves[distance=7,persistent=false]",
+    "minecraft:flowering_azalea_leaves[distance=7,persistent=false,waterlogged=false]": "minecraft:flowering_azalea_leaves[distance=7,persistent=false]"
   },
   "sounds": {
     "music.overworld.deep_dark": "",
@@ -158,10 +409,6 @@
       "id": "minecraft:end_portal_frame",
       "name": "1.19 Sculk Shrieker"
     },
-    "minecraft:reinforced_deepslate": {
-      "id": "minecraft:obsidian",
-      "name": "1.19 Reinforced Deepslate"
-    },
     "minecraft:mud": {
       "id": "minecraft:coarse_dirt",
       "name": "1.19 Mud"
@@ -289,6 +536,34 @@
     "minecraft:frogspawn": {
       "id": "minecraft:glow_lichen",
       "name": "1.19 Frogspawn"
+    },
+    "minecraft:acacia_chest_boat": {
+      "id": "minecraft:acacia_boat",
+      "name": "1.19 Acacia Chest Boat"
+    },
+    "minecraft:dark_oak_chest_boat": {
+      "id": "minecraft:dark_oak_boat",
+      "name": "1.19 Dark Oak Chest Boat"
+    },
+    "minecraft:mangrove_chest_boat": {
+      "id": "minecraft:acacia_boat",
+      "name": "1.19 Mangrove Chest Boat"
+    },
+    "minecraft:jungle_chest_boat": {
+      "id": "minecraft:jungle_boat",
+      "name": "1.19 Jungle Chest Boat"
+    },
+    "minecraft:spruce_chest_boat": {
+      "id": "minecraft:spruce_boat",
+      "name": "1.19 Spruce Chest Boat"
+    },
+    "minecraft:oak_chest_boat": {
+      "id": "minecraft:oak_boat",
+      "name": "1.19 Oak Chest Boat"
+    },
+    "minecraft:birch_chest_boat": {
+      "id": "minecraft:birch_boat",
+      "name": "1.19 Birch Chest Boat"
     }
   },
   "particles": {
@@ -301,6 +576,9 @@
     "sculk_catalyst": "",
     "sculk_shrieker": ""
   },
+  "enchantments": {
+    "minecraft:swift_sneak": "minecraft:soul_speed"
+  },
   "entitynames": {
     "warden": "Warden",
     "frog": "Frog",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb896130..8eb97a66 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-22w11a-SNAPSHOT"
+viaver = "4.3.0-22w12a-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"