From 6e011f929703002eb1e817e3405f4c30254f6077 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Sun, 8 Nov 2020 11:44:28 +0100
Subject: [PATCH] Finish mappings except for sounds

---
 .../api/data/VBMappingDataLoader.java         |   6 +-
 .../Protocol1_16_4To1_17.java                 |   2 +-
 .../data/mapping-1.16.2to1.17.json            | 676 ++++++++++++++++++
 3 files changed, 682 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java b/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java
index 21864762..bb2de383 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java
@@ -113,6 +113,10 @@ public class VBMappingDataLoader {
     }
 
     public static Int2ObjectMap<MappedItem> loadItemMappings(JsonObject oldMapping, JsonObject newMapping, JsonObject diffMapping) {
+        return loadItemMappings(oldMapping, newMapping, diffMapping, false);
+    }
+
+    public static Int2ObjectMap<MappedItem> loadItemMappings(JsonObject oldMapping, JsonObject newMapping, JsonObject diffMapping, boolean warnOnMissing) {
         Int2ObjectMap<MappedItem> itemMapping = new Int2ObjectOpenHashMap<>(diffMapping.size(), 1F);
         Object2IntMap<String> newIdenfierMap = MappingDataLoader.indexedObjectToMap(newMapping);
         Object2IntMap<String> oldIdenfierMap = MappingDataLoader.indexedObjectToMap(oldMapping);
@@ -140,7 +144,7 @@ public class VBMappingDataLoader {
         }
 
         // Look for missing keys
-        if (!Via.getConfig().isSuppressConversionWarnings()) {
+        if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings()) {
             for (Object2IntMap.Entry<String> entry : oldIdenfierMap.object2IntEntrySet()) {
                 if (!newIdenfierMap.containsKey(entry.getKey()) && !itemMapping.containsKey(entry.getIntValue())) {
                     ViaBackwards.getPlatform().getLogger().warning("No item mapping for " + entry.getKey() + " :( ");
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
index e63008ac..ea5d6233 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
@@ -14,7 +14,7 @@ import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4;
 
 public class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_16_2, ClientboundPackets1_16_2, ServerboundPackets1_16_2, ServerboundPackets1_16_2> {
 
-    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.17", "1.16.2", Protocol1_17To1_16_4.class, false);
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.17", "1.16.2", Protocol1_17To1_16_4.class, true);
 
     public Protocol1_16_4To1_17() {
         super(ClientboundPackets1_16_2.class, ClientboundPackets1_16_2.class, ServerboundPackets1_16_2.class, ServerboundPackets1_16_2.class);
diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
index 7ad4e7aa..b7a0b225 100644
--- a/core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
+++ b/core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
@@ -113,11 +113,684 @@
     "minecraft:activator_rail[powered=false,shape=ascending_north,waterlogged=false]": "minecraft:activator_rail[powered=false,shape=ascending_north]",
     "minecraft:activator_rail[powered=false,shape=ascending_south,waterlogged=true]": "minecraft:activator_rail[powered=false,shape=ascending_south]",
     "minecraft:activator_rail[powered=false,shape=ascending_south,waterlogged=false]": "minecraft:activator_rail[powered=false,shape=ascending_south]",
+    "minecraft:candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:white_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:white_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:white_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:white_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:white_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:white_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:white_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:white_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:white_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:white_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:white_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:white_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:white_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:white_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:white_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:white_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:orange_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:orange_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:orange_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:orange_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:orange_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:orange_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:orange_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:orange_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:orange_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:orange_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:orange_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:orange_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:orange_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:orange_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:orange_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:orange_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:magenta_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:magenta_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:magenta_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:magenta_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:magenta_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:magenta_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:magenta_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:magenta_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:magenta_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:magenta_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:magenta_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:magenta_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:magenta_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:magenta_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:magenta_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:magenta_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:light_blue_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:light_blue_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:yellow_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:yellow_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:yellow_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:yellow_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:yellow_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:yellow_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:yellow_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:yellow_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:yellow_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:yellow_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:yellow_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:yellow_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:yellow_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:yellow_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:yellow_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:yellow_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:lime_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:lime_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:lime_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:lime_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:lime_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:lime_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:lime_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:lime_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:lime_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:lime_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:lime_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:lime_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:lime_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:lime_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:lime_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:lime_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:pink_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:pink_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:pink_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:pink_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:pink_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:pink_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:pink_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:pink_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:pink_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:pink_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:pink_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:pink_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:pink_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:pink_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:pink_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:pink_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:gray_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:gray_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:gray_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:gray_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:gray_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:gray_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:gray_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:gray_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:gray_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:gray_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:gray_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:gray_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:gray_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:gray_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:gray_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:gray_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:light_gray_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:light_gray_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:cyan_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:cyan_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:cyan_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:cyan_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:cyan_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:cyan_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:cyan_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:cyan_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:cyan_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:cyan_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:cyan_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:cyan_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:cyan_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:cyan_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:cyan_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:cyan_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:purple_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:purple_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:purple_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:purple_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:purple_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:purple_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:purple_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:purple_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:purple_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:purple_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:purple_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:purple_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:purple_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:purple_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:purple_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:purple_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:blue_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:blue_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:blue_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:blue_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:blue_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:blue_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:blue_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:blue_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:blue_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:blue_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:blue_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:blue_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:blue_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:blue_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:blue_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:blue_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:brown_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:brown_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:brown_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:brown_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:brown_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:brown_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:brown_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:brown_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:brown_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:brown_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:brown_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:brown_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:brown_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:brown_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:brown_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:brown_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:green_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:green_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:green_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:green_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:green_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:green_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:green_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:green_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:green_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:green_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:green_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:green_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:green_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:green_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:green_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:green_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:red_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:red_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:red_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:red_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:red_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:red_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:red_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:red_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:red_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:red_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:red_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:red_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:red_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:red_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:red_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:red_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:black_candle[candles=1,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:black_candle[candles=1,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:black_candle[candles=1,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=1,waterlogged=true]",
+    "minecraft:black_candle[candles=1,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=1,waterlogged=false]",
+    "minecraft:black_candle[candles=2,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:black_candle[candles=2,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:black_candle[candles=2,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=2,waterlogged=true]",
+    "minecraft:black_candle[candles=2,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=2,waterlogged=false]",
+    "minecraft:black_candle[candles=3,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:black_candle[candles=3,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:black_candle[candles=3,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=3,waterlogged=true]",
+    "minecraft:black_candle[candles=3,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=3,waterlogged=false]",
+    "minecraft:black_candle[candles=4,lit=true,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:black_candle[candles=4,lit=true,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:black_candle[candles=4,lit=false,waterlogged=true]": "minecraft:sea_pickle[pickles=4,waterlogged=true]",
+    "minecraft:black_candle[candles=4,lit=false,waterlogged=false]": "minecraft:sea_pickle[pickles=4,waterlogged=false]",
+    "minecraft:candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:white_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:white_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:orange_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:orange_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:magenta_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:magenta_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:light_blue_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:light_blue_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:yellow_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:yellow_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:lime_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:lime_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:pink_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:pink_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:gray_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:gray_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:light_gray_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:light_gray_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:cyan_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:cyan_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:purple_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:purple_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:blue_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:blue_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:brown_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:brown_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:green_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:green_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:red_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:red_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:black_candle_cake[lit=true]": "minecraft:cake[bites=0]",
+    "minecraft:black_candle_cake[lit=false]": "minecraft:cake[bites=0]",
+    "minecraft:amethyst_block": "minecraft:purpur_block",
+    "minecraft:budding_amethyst": "minecraft:purpur_pillar[axis=y]",
+    "minecraft:amethyst_cluster[facing=north,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=north,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=north,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=north,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=east,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=east,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=east,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=east,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=south,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=south,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=south,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=south,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=west,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=west,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=west,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=west,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=up,lit=true,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=up,lit=true,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=up,lit=false,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:amethyst_cluster[facing=up,lit=false,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:amethyst_cluster[facing=down,lit=true,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:amethyst_cluster[facing=down,lit=true,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:amethyst_cluster[facing=down,lit=false,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:amethyst_cluster[facing=down,lit=false,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:large_amethyst_bud[facing=north,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=north,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=north,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=north,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=east,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=east,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=east,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=east,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=south,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=south,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=south,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=south,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=west,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=west,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=west,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=west,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=up,lit=true,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=up,lit=true,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=up,lit=false,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:large_amethyst_bud[facing=up,lit=false,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:large_amethyst_bud[facing=down,lit=true,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:large_amethyst_bud[facing=down,lit=true,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:large_amethyst_bud[facing=down,lit=false,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:large_amethyst_bud[facing=down,lit=false,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:medium_amethyst_bud[facing=north,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=north,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=north,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=north,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=east,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=east,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=east,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=east,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=south,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=south,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=south,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=south,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=west,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=west,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=west,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=west,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=up,lit=true,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=up,lit=true,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=up,lit=false,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:medium_amethyst_bud[facing=up,lit=false,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:medium_amethyst_bud[facing=down,lit=true,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:medium_amethyst_bud[facing=down,lit=true,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:medium_amethyst_bud[facing=down,lit=false,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:medium_amethyst_bud[facing=down,lit=false,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:small_amethyst_bud[facing=north,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=north,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=north,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=north,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=north,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=east,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=east,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=east,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=east,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=east,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=south,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=south,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=south,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=south,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=south,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=west,lit=true,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=west,lit=true,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=west,lit=false,waterlogged=true]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=west,lit=false,waterlogged=false]": "minecraft:bubble_coral_wall_fan[facing=west,waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=up,lit=true,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=up,lit=true,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=up,lit=false,waterlogged=true]": "minecraft:bubble_coral_fan[waterlogged=true]",
+    "minecraft:small_amethyst_bud[facing=up,lit=false,waterlogged=false]": "minecraft:bubble_coral_fan[waterlogged=false]",
+    "minecraft:small_amethyst_bud[facing=down,lit=true,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:small_amethyst_bud[facing=down,lit=true,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:small_amethyst_bud[facing=down,lit=false,waterlogged=true]": "minecraft:weeping_vines[age=0]",
+    "minecraft:small_amethyst_bud[facing=down,lit=false,waterlogged=false]": "minecraft:weeping_vines[age=0]",
+    "minecraft:weathered_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:semi_weathered_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:lightly_weathered_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_semi_weathered_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_lightly_weathered_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_cut_copper_stairs": "minecraft:brick_stairs[",
+    "minecraft:waxed_semi_weathered_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:waxed_lightly_weathered_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:waxed_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:weathered_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:semi_weathered_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:lightly_weathered_cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:cut_copper_slab": "minecraft:brick_slab[",
+    "minecraft:weathered_copper_block": "minecraft:bricks",
+    "minecraft:semi_weathered_copper_block": "minecraft:bricks",
+    "minecraft:lightly_weathered_copper_block": "minecraft:bricks",
+    "minecraft:copper_block": "minecraft:bricks",
+    "minecraft:copper_ore": "minecraft:iron_ore",
+    "minecraft:weathered_cut_copper": "minecraft:bricks",
+    "minecraft:semi_weathered_cut_copper": "minecraft:bricks",
+    "minecraft:lightly_weathered_cut_copper": "minecraft:bricks",
+    "minecraft:cut_copper": "minecraft:bricks",
+    "minecraft:waxed_copper": "minecraft:bricks",
+    "minecraft:waxed_semi_weathered_copper": "minecraft:bricks",
+    "minecraft:waxed_lightly_weathered_copper": "minecraft:bricks",
+    "minecraft:waxed_semi_weathered_cut_copper": "minecraft:bricks",
+    "minecraft:waxed_lightly_weathered_cut_copper": "minecraft:bricks",
+    "minecraft:waxed_cut_copper": "minecraft:bricks"
   },
   "items": {
     "minecraft:dirt_path": {
       "id": "minecraft:grass_path",
       "name": "1.17 Dirt Path"
+    },
+    "minecraft:calcite": {
+      "id": "minecraft:polished_diorite",
+      "name": "1.17 Calcite"
+    },
+    "minecraft:tuff": {
+      "id": "minecraft:cobblestone",
+      "name": "1.17 Tuff"
+    },
+    "minecraft:copper_ore": {
+      "id": "minecraft:iron_ore",
+      "name": "1.17 Copper Ore"
+    },
+    "minecraft:tinted_glass": {
+      "id": "minecraft:black_stained_glass",
+      "name": "1.17 Tinted Glass"
+    },
+    "minecraft:copper_ingot": {
+      "id": "minecraft:brick",
+      "name": "1.17 Copper Ingot"
+    },
+    "minecraft:bundle": {
+      "id": "minecraft:rabbit_hide",
+      "name": "1.17 Bundle"
+    },
+    "minecraft:candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Candle"
+    },
+    "minecraft:white_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 White Candle"
+    },
+    "minecraft:orange_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Orange Candle"
+    },
+    "minecraft:magenta_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Magenta Candle"
+    },
+    "minecraft:light_blue_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Light Blue Candle"
+    },
+    "minecraft:yellow_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Yellow Candle"
+    },
+    "minecraft:lime_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Lime Candle"
+    },
+    "minecraft:pink_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Pink Candle"
+    },
+    "minecraft:gray_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Gray Candle"
+    },
+    "minecraft:light_gray_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Light Gray Candle"
+    },
+    "minecraft:cyan_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Cyan Candle"
+    },
+    "minecraft:purple_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Purple Candle"
+    },
+    "minecraft:blue_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Blue Candle"
+    },
+    "minecraft:brown_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Brown Candle"
+    },
+    "minecraft:green_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Green Candle"
+    },
+    "minecraft:red_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Red Candle"
+    },
+    "minecraft:black_candle": {
+      "id": "minecraft:sea_pickle",
+      "name": "1.17 Black Candle"
+    },
+    "minecraft:amethyst_shard": {
+      "id": "minecraft:prismarine_shard",
+      "name": "1.17 Amethyst Shard"
+    },
+    "minecraft:amethyst_block": {
+      "id": "minecraft:purpur_block",
+      "name": "1.17 Amethyst Block"
+    },
+    "minecraft:budding_amethyst": {
+      "id": "minecraft:purpur_pillar",
+      "name": "1.17 Budding Amethyst"
+    },
+    "minecraft:small_amethyst_bud": {
+      "id": "minecraft:bubble_coral_fan",
+      "name": "1.17 Small Amethyst Bud"
+    },
+    "minecraft:medium_amethyst_bud": {
+      "id": "minecraft:bubble_coral_fan",
+      "name": "1.17 Medium Amethyst Bud"
+    },
+    "minecraft:large_amethyst_bud": {
+      "id": "minecraft:bubble_coral_fan",
+      "name": "1.17 Large Amethyst Bud"
+    },
+    "minecraft:amethyst_cluster": {
+      "id": "minecraft:bubble_coral_fan",
+      "name": "1.17 Amethyst Cluster"
+    },
+    "minecraft:spyglass": {
+      "id": "minecraft:stick",
+      "name": "1.17 Spyglass"
+    },
+    "minecraft:copper_block": {
+      "id": "minecraft:iron_block",
+      "name": "1.17 Copper Block"
+    },
+    "minecraft:lightly_weathered_copper_block": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Lightly Weathered Copper Block"
+    },
+    "minecraft:semi_weathered_copper_block": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Semi Weathered Copper Block"
+    },
+    "minecraft:weathered_copper_block": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Weathered Copper Block"
+    },
+    "minecraft:cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Cut Copper"
+    },
+    "minecraft:lightly_weathered_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Lightly Weathered Cut Copper"
+    },
+    "minecraft:semi_weathered_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Semi Weathered Cut Copper"
+    },
+    "minecraft:weathered_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Weathered Cut Copper"
+    },
+    "minecraft:cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Cut Copper Stairs"
+    },
+    "minecraft:lightly_weathered_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Lightly Weathered Cut Copper Stairs"
+    },
+    "minecraft:semi_weathered_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Semi Weathered Cut Copper Stairs"
+    },
+    "minecraft:weathered_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Weathered Cut Copper Stairs"
+    },
+    "minecraft:cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Cut Copper Slab"
+    },
+    "minecraft:lightly_weathered_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Lightly Weathered Cut Copper Slab"
+    },
+    "minecraft:semi_weathered_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Semi Weathered Cut Copper Slab"
+    },
+    "minecraft:weathered_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Weathered Cut Copper Slab"
+    },
+    "minecraft:waxed_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Copper"
+    },
+    "minecraft:waxed_lightly_weathered_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Lightly Weathered Copper"
+    },
+    "minecraft:waxed_semi_weathered_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Semi Weathered Copper"
+    },
+    "minecraft:waxed_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Cut Copper"
+    },
+    "minecraft:waxed_lightly_weathered_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Lightly Weathered Cut Copper"
+    },
+    "minecraft:waxed_semi_weathered_cut_copper": {
+      "id": "minecraft:bricks",
+      "name": "1.17 Waxed Semi Weathered Cut Copper"
+    },
+    "minecraft:waxed_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Waxed Cut Copper Stairs"
+    },
+    "minecraft:waxed_lightly_weathered_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Waxed Lightly Weathered Cut Copper Stairs"
+    },
+    "minecraft:waxed_semi_weathered_cut_copper_stairs": {
+      "id": "minecraft:brick_stairs",
+      "name": "1.17 Waxed Semi Weathered Cut Copper Stairs"
+    },
+    "minecraft:waxed_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Waxed Cut Copper Slab"
+    },
+    "minecraft:waxed_lightly_weathered_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Waxed Lightly Weathered Cut Copper Slab"
+    },
+    "minecraft:waxed_semi_weathered_cut_copper_slab": {
+      "id": "minecraft:brick_slab",
+      "name": "1.17 Waxed Semi Weathered Cut Copper Slab"
+    },
+    "minecraft:lightning_rod": {
+      "id": "minecraft:end_rod",
+      "name": "1.17 Lightning Rod"
     }
   },
   "sounds": {
@@ -165,5 +838,8 @@
     "block.tuff.hit": "",
     "block.tuff.fall": "",
     "small_flame": ""
+  },
+  "particles": {
+    "small_flame": "flame"
   }
 }
\ No newline at end of file