diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0761-Rewrite-dataconverter-system.patch
index c70ea092ab..adadd49386 100644
--- a/patches/server/0761-Rewrite-dataconverter-system.patch
+++ b/patches/server/0761-Rewrite-dataconverter-system.patch
@@ -66,54 +66,6 @@ index 0000000000000000000000000000000000000000..1863c606be715683d53863a0c9293525
 +        return getVersion(encoded) + "." + getStep(encoded);
 +    }
 +}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/advancements/ConverterCriteriaRename.java b/src/main/java/ca/spottedleaf/dataconverter/converters/advancements/ConverterCriteriaRename.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b22ea7fc8bfef32cb1d30a4af182836125a245a1
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/advancements/ConverterCriteriaRename.java
-@@ -0,0 +1,42 @@
-+package ca.spottedleaf.dataconverter.converters.advancements;
-+
-+import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.minecraft.converters.helpers.RenameHelper;
-+import ca.spottedleaf.dataconverter.types.MapType;
-+import java.util.function.Function;
-+
-+public final class ConverterCriteriaRename extends DataConverter<MapType<String>, MapType<String>> {
-+
-+    public final String path;
-+    public final Function<String, String> conversion;
-+
-+    public ConverterCriteriaRename(final int toVersion, final String path, final Function<String, String> conversion) {
-+        super(toVersion);
-+        this.path = path;
-+        this.conversion = conversion;
-+    }
-+
-+    public ConverterCriteriaRename(final int toVersion, final int versionStep, final String path, final Function<String, String> conversion) {
-+        super(toVersion, versionStep);
-+        this.path = path;
-+        this.conversion = conversion;
-+    }
-+
-+    @Override
-+    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
-+        final MapType<String> advancement = data.getMap(this.path);
-+        if (advancement == null) {
-+            return null;
-+        }
-+
-+        final MapType<String> criteria = advancement.getMap("criteria");
-+        if (criteria == null) {
-+            return null;
-+        }
-+
-+        RenameHelper.renameKeys(criteria, this.conversion);
-+
-+        return null;
-+    }
-+
-+}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java b/src/main/java/ca/spottedleaf/dataconverter/converters/datatypes/DataHook.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0b92c5c66ad3a5198873f98287a5ced71c231d09
@@ -157,158 +109,6 @@ index 0000000000000000000000000000000000000000..cf9fae4451ead4860343b915fb70e3a7
 +    public MapType<String> walk(final MapType<K> data, final long fromVersion, final long toVersion);
 +
 +}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariant.java b/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariant.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2861c667706d7b20be523b3340b17e50b5272eb4
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariant.java
-@@ -0,0 +1,44 @@
-+package ca.spottedleaf.dataconverter.converters.entity;
-+
-+import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.types.MapType;
-+import java.util.function.IntFunction;
-+
-+public final class ConverterEntityVariant extends DataConverter<MapType<String>, MapType<String>> {
-+
-+    public final String path;
-+    public final IntFunction<String> conversion;
-+
-+    public ConverterEntityVariant(final int toVersion, final String path, final IntFunction<String> conversion) {
-+        super(toVersion);
-+        this.path = path;
-+        this.conversion = conversion;
-+    }
-+
-+    public ConverterEntityVariant(final int toVersion, final int versionStep, final String path, final IntFunction<String> conversion) {
-+        super(toVersion, versionStep);
-+        this.path = path;
-+        this.conversion = conversion;
-+    }
-+
-+    @Override
-+    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
-+        final Number value = data.getNumber(this.path);
-+        if (value == null) {
-+            // nothing to do, DFU does the same
-+            return null;
-+        }
-+
-+        final String converted = this.conversion.apply(value.intValue());
-+
-+        if (converted == null) {
-+            throw new NullPointerException("Conversion " + this.conversion + " cannot return null value!");
-+        }
-+
-+        // DFU doesn't appear to remove the old field, so why should we?
-+
-+        data.setString("variant", converted);
-+
-+        return null;
-+    }
-+}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariantRename.java b/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariantRename.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..95deb3435d0a13d7c6af0650b2b5e259203f3d9d
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/entity/ConverterEntityVariantRename.java
-@@ -0,0 +1,37 @@
-+package ca.spottedleaf.dataconverter.converters.entity;
-+
-+import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.types.MapType;
-+import java.util.function.Function;
-+
-+public final class ConverterEntityVariantRename extends DataConverter<MapType<String>, MapType<String>> {
-+
-+    private final Function<String, String> renamer;
-+
-+    public ConverterEntityVariantRename(final int toVersion, final Function<String, String> renamer) {
-+        super(toVersion);
-+        this.renamer = renamer;
-+    }
-+
-+    public ConverterEntityVariantRename(final int toVersion, final int versionStep, final Function<String, String> renamer) {
-+        super(toVersion, versionStep);
-+        this.renamer = renamer;
-+    }
-+
-+    @Override
-+    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
-+        final String variant = data.getString("variant");
-+
-+        if (variant == null) {
-+            return null;
-+        }
-+
-+        final String rename = this.renamer.apply(variant);
-+
-+        if (rename != null) {
-+            data.setString("variant", rename);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/converters/poi/ConverterPoiDelete.java b/src/main/java/ca/spottedleaf/dataconverter/converters/poi/ConverterPoiDelete.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..4bbfb2217e696af10b8eb25e0d994096ebb8eff3
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/converters/poi/ConverterPoiDelete.java
-@@ -0,0 +1,53 @@
-+package ca.spottedleaf.dataconverter.converters.poi;
-+
-+import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.types.ListType;
-+import ca.spottedleaf.dataconverter.types.MapType;
-+import ca.spottedleaf.dataconverter.types.ObjectType;
-+import java.util.function.Predicate;
-+
-+public final class ConverterPoiDelete extends DataConverter<MapType<String>, MapType<String>> {
-+
-+    private final Predicate<String> delete;
-+
-+    public ConverterPoiDelete(final int toVersion, final Predicate<String> delete) {
-+        super(toVersion);
-+        this.delete = delete;
-+    }
-+
-+    public ConverterPoiDelete(final int toVersion, final int versionStep, final Predicate<String> delete) {
-+        super(toVersion, versionStep);
-+        this.delete = delete;
-+    }
-+
-+    @Override
-+    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
-+        final MapType<String> sections = data.getMap("Sections");
-+        if (sections == null) {
-+            return null;
-+        }
-+
-+        for (final String key : sections.keys()) {
-+            final MapType<String> section = sections.getMap(key);
-+
-+            final ListType records = section.getList("Records", ObjectType.MAP);
-+
-+            if (records == null) {
-+                continue;
-+            }
-+
-+            for (int i = 0; i < records.size();) {
-+                final MapType<String> record = records.getMap(i);
-+
-+                final String type = record.getString("type");
-+                if (type != null && this.delete.test(type)) {
-+                    records.remove(i);
-+                    continue;
-+                }
-+                ++i;
-+            }
-+        }
-+
-+        return null;
-+    }
-+}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCDataConverter.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..dde9d36bf6212196caa18f3c9c535aec330a33ed
@@ -1187,166 +987,6 @@ index 0000000000000000000000000000000000000000..18bcb79899a5ccb63096cba8075d6438
 +    public static final int V1_19_RC1             = 3103;
 +    public static final int V1_19_RC2             = 3104;
 +}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0c8eb9e326ce1941db176e5e5bc3ea7738c4b80a
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/ReplacedDataFixerUpper.java
-@@ -0,0 +1,154 @@
-+package ca.spottedleaf.dataconverter.minecraft;
-+
-+import ca.spottedleaf.dataconverter.converters.datatypes.DataType;
-+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCDataType;
-+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
-+import com.google.gson.JsonObject;
-+import com.mojang.datafixers.DSL;
-+import com.mojang.datafixers.DataFixer;
-+import com.mojang.datafixers.schemas.Schema;
-+import com.mojang.serialization.Dynamic;
-+import net.minecraft.SharedConstants;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.util.datafix.fixes.References;
-+import org.apache.logging.log4j.LogManager;
-+import org.apache.logging.log4j.Logger;
-+import java.util.Set;
-+import java.util.concurrent.ConcurrentHashMap;
-+
-+public class ReplacedDataFixerUpper implements DataFixer {
-+
-+    protected static final Set<DSL.TypeReference> WARNED_TYPES = ConcurrentHashMap.newKeySet();
-+
-+    private static final Logger LOGGER = LogManager.getLogger();
-+
-+    public final DataFixer wrapped;
-+
-+    public ReplacedDataFixerUpper(final DataFixer wrapped) {
-+        this.wrapped = wrapped;
-+    }
-+
-+    @Override
-+    public <T> Dynamic<T> update(final DSL.TypeReference type, final Dynamic<T> input, final int version, final int newVersion) {
-+        DataType<?, ?> equivType = null;
-+        boolean warn = true;
-+
-+        if (type == References.LEVEL) {
-+            warn = false;
-+        }
-+        if (type == References.PLAYER) {
-+            equivType = MCTypeRegistry.PLAYER;
-+        }
-+        if (type == References.CHUNK) {
-+            equivType = MCTypeRegistry.CHUNK;
-+        }
-+        if (type == References.HOTBAR) {
-+            warn = false;
-+        }
-+        if (type == References.OPTIONS) {
-+            warn = false;
-+        }
-+        if (type == References.STRUCTURE) {
-+            equivType = MCTypeRegistry.STRUCTURE;
-+        }
-+        if (type == References.STATS) {
-+            warn = false;
-+        }
-+        if (type == References.SAVED_DATA) {
-+            equivType = MCTypeRegistry.SAVED_DATA;
-+        }
-+        if (type == References.ADVANCEMENTS) {
-+            warn = false;
-+        }
-+        if (type == References.POI_CHUNK) {
-+            equivType = MCTypeRegistry.POI_CHUNK;
-+        }
-+        if (type == References.ENTITY_CHUNK) {
-+            equivType = MCTypeRegistry.ENTITY_CHUNK;
-+        }
-+        if (type == References.BLOCK_ENTITY) {
-+            equivType = MCTypeRegistry.TILE_ENTITY;
-+        }
-+        if (type == References.ITEM_STACK) {
-+            equivType = MCTypeRegistry.ITEM_STACK;
-+        }
-+        if (type == References.BLOCK_STATE) {
-+            equivType = MCTypeRegistry.BLOCK_STATE;
-+        }
-+        if (type == References.ENTITY_NAME) {
-+            equivType = MCTypeRegistry.ENTITY_NAME;
-+        }
-+        if (type == References.ENTITY_TREE) {
-+            equivType = MCTypeRegistry.ENTITY;
-+        }
-+        if (type == References.ENTITY) {
-+            // NO EQUIV TYPE (this is ENTITY without passengers/riding)
-+            // Only used internally for DFU, so we shouldn't get here
-+        }
-+        if (type == References.BLOCK_NAME) {
-+            equivType = MCTypeRegistry.BLOCK_NAME;
-+        }
-+        if (type == References.ITEM_NAME) {
-+            equivType = MCTypeRegistry.ITEM_NAME;
-+        }
-+        if (type == References.UNTAGGED_SPAWNER) {
-+            equivType = MCTypeRegistry.UNTAGGED_SPAWNER;
-+        }
-+        if (type == References.STRUCTURE_FEATURE) {
-+            equivType = MCTypeRegistry.STRUCTURE_FEATURE;
-+        }
-+        if (type == References.OBJECTIVE) {
-+            warn = false;
-+        }
-+        if (type == References.TEAM) {
-+            warn = false;
-+        }
-+        if (type == References.RECIPE) {
-+            warn = false;
-+        }
-+        if (type == References.BIOME) {
-+            equivType = MCTypeRegistry.BIOME;
-+        }
-+        if (type == References.WORLD_GEN_SETTINGS) {
-+            warn = false;
-+        }
-+
-+        if (equivType != null) {
-+            if (newVersion > version) {
-+                try {
-+                    final Dynamic<T> ret = new Dynamic<>(input.getOps(), (T)MCDataConverter.copy(convertUnwrapped((DataType)equivType, input.getValue(), false, version, newVersion)));
-+                    return ret;
-+                } catch (final Exception ex) {
-+                    LOGGER.error("Failed to convert data using DataConverter, falling back to DFU", new Throwable());
-+                    // In dev environment this should hard fail
-+                }
-+
-+                return this.wrapped.update(type, input, version, newVersion);
-+            } else {
-+                return input;
-+            }
-+        } else {
-+            if (warn && WARNED_TYPES.add(type)) {
-+                LOGGER.error("No equiv type for " + type, new Throwable());
-+            }
-+
-+            return this.wrapped.update(type, input, version, newVersion);
-+        }
-+    }
-+
-+    public static <T, R> R convertUnwrapped(final DataType<T, R> type, final T data, final boolean compressedJson, final int fromVersion, final int toVersion) {
-+        if (data instanceof CompoundTag) {
-+            return (R)MCDataConverter.convertTag((MCDataType)type, (CompoundTag)data, fromVersion, toVersion);
-+        }
-+        if (data instanceof JsonObject) {
-+            return (R)MCDataConverter.convertJson((MCDataType)type, (JsonObject)data, compressedJson, fromVersion, toVersion);
-+        }
-+
-+        return MCDataConverter.convert(type, data, fromVersion, toVersion);
-+    }
-+
-+    @Override
-+    public Schema getSchema(final int key) {
-+        return this.wrapped.getSchema(key);
-+    }
-+}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..ae3aed21c1fccb688e9a1665e2d317a77508d157
@@ -1381,6 +1021,54 @@ index 0000000000000000000000000000000000000000..ae3aed21c1fccb688e9a1665e2d317a7
 +    }
 +
 +}
+diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b2a4d16e6a2f9d71dbfa692922671581c2bec136
+--- /dev/null
++++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterCriteriaRename.java
+@@ -0,0 +1,42 @@
++package ca.spottedleaf.dataconverter.minecraft.converters.advancements;
++
++import ca.spottedleaf.dataconverter.converters.DataConverter;
++import ca.spottedleaf.dataconverter.minecraft.converters.helpers.RenameHelper;
++import ca.spottedleaf.dataconverter.types.MapType;
++import java.util.function.Function;
++
++public final class ConverterCriteriaRename extends DataConverter<MapType<String>, MapType<String>> {
++
++    public final String path;
++    public final Function<String, String> conversion;
++
++    public ConverterCriteriaRename(final int toVersion, final String path, final Function<String, String> conversion) {
++        super(toVersion);
++        this.path = path;
++        this.conversion = conversion;
++    }
++
++    public ConverterCriteriaRename(final int toVersion, final int versionStep, final String path, final Function<String, String> conversion) {
++        super(toVersion, versionStep);
++        this.path = path;
++        this.conversion = conversion;
++    }
++
++    @Override
++    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
++        final MapType<String> advancement = data.getMap(this.path);
++        if (advancement == null) {
++            return null;
++        }
++
++        final MapType<String> criteria = advancement.getMap("criteria");
++        if (criteria == null) {
++            return null;
++        }
++
++        RenameHelper.renameKeys(criteria, this.conversion);
++
++        return null;
++    }
++
++}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/blockname/ConverterAbstractBlockRename.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..ba9daaab1abd53a3fbdebd78e05ba363251188c6
@@ -2526,6 +2214,99 @@ index 0000000000000000000000000000000000000000..06c075e643415d98b73734b749d90430
 +    }
 +
 +}
+diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..985af815e3c23ad7c8b774eac46a7202d3020234
+--- /dev/null
++++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityToVariant.java
+@@ -0,0 +1,44 @@
++package ca.spottedleaf.dataconverter.minecraft.converters.entity;
++
++import ca.spottedleaf.dataconverter.converters.DataConverter;
++import ca.spottedleaf.dataconverter.types.MapType;
++import java.util.function.IntFunction;
++
++public final class ConverterEntityToVariant extends DataConverter<MapType<String>, MapType<String>> {
++
++    public final String path;
++    public final IntFunction<String> conversion;
++
++    public ConverterEntityToVariant(final int toVersion, final String path, final IntFunction<String> conversion) {
++        super(toVersion);
++        this.path = path;
++        this.conversion = conversion;
++    }
++
++    public ConverterEntityToVariant(final int toVersion, final int versionStep, final String path, final IntFunction<String> conversion) {
++        super(toVersion, versionStep);
++        this.path = path;
++        this.conversion = conversion;
++    }
++
++    @Override
++    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
++        final Number value = data.getNumber(this.path);
++        if (value == null) {
++            // nothing to do, DFU does the same
++            return null;
++        }
++
++        final String converted = this.conversion.apply(value.intValue());
++
++        if (converted == null) {
++            throw new NullPointerException("Conversion " + this.conversion + " cannot return null value!");
++        }
++
++        // DFU doesn't appear to remove the old field, so why should we?
++
++        data.setString("variant", converted);
++
++        return null;
++    }
++}
+diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ed5dcf6f8160742c07e23e98c85409209350a7d4
+--- /dev/null
++++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterEntityVariantRename.java
+@@ -0,0 +1,37 @@
++package ca.spottedleaf.dataconverter.minecraft.converters.entity;
++
++import ca.spottedleaf.dataconverter.converters.DataConverter;
++import ca.spottedleaf.dataconverter.types.MapType;
++import java.util.function.Function;
++
++public final class ConverterEntityVariantRename extends DataConverter<MapType<String>, MapType<String>> {
++
++    private final Function<String, String> renamer;
++
++    public ConverterEntityVariantRename(final int toVersion, final Function<String, String> renamer) {
++        super(toVersion);
++        this.renamer = renamer;
++    }
++
++    public ConverterEntityVariantRename(final int toVersion, final int versionStep, final Function<String, String> renamer) {
++        super(toVersion, versionStep);
++        this.renamer = renamer;
++    }
++
++    @Override
++    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
++        final String variant = data.getString("variant");
++
++        if (variant == null) {
++            return null;
++        }
++
++        final String rename = this.renamer.apply(variant);
++
++        if (rename != null) {
++            data.setString("variant", rename);
++        }
++
++        return null;
++    }
++}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/entity/ConverterFlattenEntity.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..afad2d92f78d4727ff4440ad2778f018d5a2a609
@@ -6203,6 +5984,65 @@ index 0000000000000000000000000000000000000000..57e210bf2bb189b15a32899011c4800b
 +        });
 +    }
 +}
+diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..36aa9c3eedb3f2e2f577efed3622fed74268bce1
+--- /dev/null
++++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/poi/ConverterPoiDelete.java
+@@ -0,0 +1,53 @@
++package ca.spottedleaf.dataconverter.minecraft.converters.poi;
++
++import ca.spottedleaf.dataconverter.converters.DataConverter;
++import ca.spottedleaf.dataconverter.types.ListType;
++import ca.spottedleaf.dataconverter.types.MapType;
++import ca.spottedleaf.dataconverter.types.ObjectType;
++import java.util.function.Predicate;
++
++public final class ConverterPoiDelete extends DataConverter<MapType<String>, MapType<String>> {
++
++    private final Predicate<String> delete;
++
++    public ConverterPoiDelete(final int toVersion, final Predicate<String> delete) {
++        super(toVersion);
++        this.delete = delete;
++    }
++
++    public ConverterPoiDelete(final int toVersion, final int versionStep, final Predicate<String> delete) {
++        super(toVersion, versionStep);
++        this.delete = delete;
++    }
++
++    @Override
++    public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
++        final MapType<String> sections = data.getMap("Sections");
++        if (sections == null) {
++            return null;
++        }
++
++        for (final String key : sections.keys()) {
++            final MapType<String> section = sections.getMap(key);
++
++            final ListType records = section.getList("Records", ObjectType.MAP);
++
++            if (records == null) {
++                continue;
++            }
++
++            for (int i = 0; i < records.size();) {
++                final MapType<String> record = records.getMap(i);
++
++                final String type = record.getString("type");
++                if (type != null && this.delete.test(type)) {
++                    records.remove(i);
++                    continue;
++                }
++                ++i;
++            }
++        }
++
++        return null;
++    }
++}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/recipe/ConverterAbstractRecipeRename.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..8f35cbbd78a629712f9ae3cd5d180269f015a11d
@@ -17317,7 +17157,7 @@ index 0000000000000000000000000000000000000000..97da66165f3e3788af0dfe667509ca7e
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7d72e5a28821ef1c147d9817d47013f8c3c18d45
+index 0000000000000000000000000000000000000000..4271eae27756eb5cbad77679dd562e676d644748
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3078.java
 @@ -0,0 +1,21 @@
@@ -17325,6 +17165,7 @@ index 0000000000000000000000000000000000000000..7d72e5a28821ef1c147d9817d47013f8
 +
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
++import ca.spottedleaf.dataconverter.minecraft.walkers.game_event.GameEventListenerWalker;
 +import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
 +
 +public final class V3078 {
@@ -17338,89 +17179,20 @@ index 0000000000000000000000000000000000000000..7d72e5a28821ef1c147d9817d47013f8
 +    public static void register() {
 +        registerMob("minecraft:frog");
 +        registerMob("minecraft:tadpole");
-+        // minecraft:sculk_shrieker -> simple tile entity
-+    }
-+
-+}
-diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3079.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3079.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8e6070f3e80174e5a9bc1723c94e60cafa9a411e
---- /dev/null
-+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3079.java
-@@ -0,0 +1,63 @@
-+package ca.spottedleaf.dataconverter.minecraft.versions;
-+
-+import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
-+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
-+import ca.spottedleaf.dataconverter.types.MapType;
-+import ca.spottedleaf.dataconverter.types.Types;
-+import ca.spottedleaf.dataconverter.util.NamespaceUtil;
-+import java.util.Arrays;
-+import java.util.HashSet;
-+import java.util.Set;
-+
-+public final class V3079 {
-+
-+    protected static final int VERSION = MCVersions.V1_18_2 + 104;
-+
-+    private static final Set<String> STATUSES_TO_SKIP_BLENDING = new HashSet<>(
-+            Arrays.asList(
-+                    "minecraft:empty",
-+                    "minecraft:structure_starts",
-+                    "minecraft:structure_references",
-+                    "minecraft:biomes"
-+            )
-+    );
-+
-+    public static void register() {
-+        MCTypeRegistry.CHUNK.addStructureConverter(new DataConverter<>(VERSION) {
-+
-+            // maxSection is exclusive
-+            private static MapType<String> createBlendingData(final int minSection, final int maxSection) {
-+                final MapType<String> ret = Types.NBT.createEmptyMap();
-+
-+                ret.setInt("min_section", minSection);
-+                ret.setInt("max_section", maxSection);
-+
-+                return ret;
-+            }
-+
-+            @Override
-+            public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
-+                data.remove("blending_data");
-+
-+                final String status = NamespaceUtil.correctNamespace(data.getString("Status"));
-+                if (status == null) {
-+                    return null;
-+                }
-+
-+                final MapType<String> belowZeroRetrogen = data.getMap("below_zero_retrogen");
-+
-+                if (!STATUSES_TO_SKIP_BLENDING.contains(status)) {
-+                    data.setMap("blending_data", createBlendingData(0 >> 4, 256 >> 4));
-+                } else if (belowZeroRetrogen != null) {
-+                    final String realStatus = NamespaceUtil.correctNamespace(belowZeroRetrogen.getString("target_status", "empty"));
-+                    if (!STATUSES_TO_SKIP_BLENDING.contains(realStatus)) {
-+                        data.setMap("blending_data", createBlendingData(-64 >> 4, 320 >> 4));
-+                    }
-+                }
-+
-+                return null;
-+            }
-+        });
++        MCTypeRegistry.TILE_ENTITY.addWalker(VERSION, "minecraft:sculk_shrieker", new GameEventListenerWalker());
 +    }
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..89506537916bcd1bbb29b6778b79158574c48862
+index 0000000000000000000000000000000000000000..c0cd7cd8c2656713b97f83b7e02b65008b62c297
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3081.java
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,20 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
++import ca.spottedleaf.dataconverter.minecraft.walkers.game_event.GameEventListenerWalker;
 +import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
 +
 +public final class V3081 {
@@ -17433,14 +17205,15 @@ index 0000000000000000000000000000000000000000..89506537916bcd1bbb29b6778b791585
 +
 +    public static void register() {
 +        registerMob("minecraft:warden");
++        MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:warden", new GameEventListenerWalker());
 +    }
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..cc77d16d2e9678c70c52a38212109c9afc07439b
+index 0000000000000000000000000000000000000000..ab6ebf4d10842d20c20bcbcc76483d9cfe081862
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3082.java
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,14 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
@@ -17454,11 +17227,10 @@ index 0000000000000000000000000000000000000000..cc77d16d2e9678c70c52a38212109c9a
 +    public static void register() {
 +        MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:chest_boat", new DataWalkerItemLists("Items"));
 +    }
-+
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d64e57c69f9e87e7f9bc00abcae38bfa7db91b76
+index 0000000000000000000000000000000000000000..0b133d6a806d571b976d8e96b9ca1e3b6933af20
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3083.java
 @@ -0,0 +1,20 @@
@@ -17479,15 +17251,15 @@ index 0000000000000000000000000000000000000000..d64e57c69f9e87e7f9bc00abcae38bfa
 +
 +    public static void register() {
 +        registerMob("minecraft:allay");
-+        MCTypeRegistry.ENTITY.addStructureWalker(VERSION, new GameEventListenerWalker());
++        MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:allay", new GameEventListenerWalker());
 +    }
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d971d232f417eda2bef9f9bfbfcbe16272306f95
+index 0000000000000000000000000000000000000000..52d8510e00d2373226f35e77db6fc7a893ec0764
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3084.java
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,39 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
@@ -17495,13 +17267,14 @@ index 0000000000000000000000000000000000000000..d971d232f417eda2bef9f9bfbfcbe162
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
 +import ca.spottedleaf.dataconverter.util.NamespaceUtil;
 +import com.google.common.collect.ImmutableMap;
++import java.util.HashMap;
 +import java.util.Map;
 +
 +public final class V3084 {
 +
 +    protected static final int VERSION = MCVersions.V22W12A + 2;
 +
-+    protected static final Map<String, String> GAME_EVENT_RENAMES = ImmutableMap.<String, String>builder()
++    protected static final Map<String, String> GAME_EVENT_RENAMES = new HashMap<>(ImmutableMap.<String, String>builder()
 +            .put("minecraft:block_press", "minecraft:block_activate")
 +            .put("minecraft:block_switch", "minecraft:block_activate")
 +            .put("minecraft:block_unpress", "minecraft:block_deactivate")
@@ -17517,7 +17290,8 @@ index 0000000000000000000000000000000000000000..d971d232f417eda2bef9f9bfbfcbe162
 +            .put("minecraft:shulker_close", "minecraft:container_close")
 +            .put("minecraft:shulker_open", "minecraft:container_open")
 +            .put("minecraft:wolf_shaking", "minecraft:entity_shake")
-+            .build();
++            .build()
++    );
 +
 +    public static void register() {
 +        ConverterAbstractStringValueTypeRename.register(VERSION, MCTypeRegistry.GAME_EVENT_NAME, (final String name) -> {
@@ -17527,18 +17301,19 @@ index 0000000000000000000000000000000000000000..d971d232f417eda2bef9f9bfbfcbe162
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6a6f6cb083ead170bc5ef50bd26aa4f4f133ff13
+index 0000000000000000000000000000000000000000..554df81bb4f1a66bce539b42493f3ea7d4dff153
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3086.java
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,51 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
-+import ca.spottedleaf.dataconverter.converters.advancements.ConverterCriteriaRename;
-+import ca.spottedleaf.dataconverter.converters.entity.ConverterEntityVariant;
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
++import ca.spottedleaf.dataconverter.minecraft.converters.advancements.ConverterCriteriaRename;
++import ca.spottedleaf.dataconverter.minecraft.converters.entity.ConverterEntityToVariant;
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
 +import com.google.common.collect.ImmutableMap;
 +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
++import java.util.HashMap;
 +import java.util.Map;
 +
 +public final class V3086 {
@@ -17561,7 +17336,7 @@ index 0000000000000000000000000000000000000000..6a6f6cb083ead170bc5ef50bd26aa4f4
 +        CAT_ID_CONVERSION.put(10, "minecraft:all_black");
 +    }
 +
-+    protected static final Map<String, String> CAT_ADVANCEMENTS_CONVERSION = ImmutableMap.<String, String>builder()
++    protected static final Map<String, String> CAT_ADVANCEMENTS_CONVERSION = new HashMap<>(ImmutableMap.<String, String>builder()
 +            .put("textures/entity/cat/tabby.png", "minecraft:tabby")
 +            .put("textures/entity/cat/black.png", "minecraft:black")
 +            .put("textures/entity/cat/red.png", "minecraft:red")
@@ -17573,23 +17348,24 @@ index 0000000000000000000000000000000000000000..6a6f6cb083ead170bc5ef50bd26aa4f4
 +            .put("textures/entity/cat/white.png", "minecraft:white")
 +            .put("textures/entity/cat/jellie.png", "minecraft:jellie")
 +            .put("textures/entity/cat/all_black.png", "minecraft:all_black")
-+            .build();
++            .build()
++    );
 +
 +    public static void register() {
-+        MCTypeRegistry.ENTITY.addConverterForId("minecraft:cat", new ConverterEntityVariant(VERSION, "CatType", CAT_ID_CONVERSION::get));
++        MCTypeRegistry.ENTITY.addConverterForId("minecraft:cat", new ConverterEntityToVariant(VERSION, "CatType", CAT_ID_CONVERSION::get));
 +        MCTypeRegistry.ADVANCEMENTS.addStructureConverter(new ConverterCriteriaRename(VERSION, "minecraft:husbandry/complete_catalogue", CAT_ADVANCEMENTS_CONVERSION::get));
 +    }
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..be6b3619d684c3f9ad61024f14177a42504251e2
+index 0000000000000000000000000000000000000000..8cc7cadb921d52ebb5b8ed25078145536db5e7b5
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3087.java
 @@ -0,0 +1,22 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
-+import ca.spottedleaf.dataconverter.converters.entity.ConverterEntityVariant;
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
++import ca.spottedleaf.dataconverter.minecraft.converters.entity.ConverterEntityToVariant;
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
 +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 +
@@ -17605,12 +17381,12 @@ index 0000000000000000000000000000000000000000..be6b3619d684c3f9ad61024f14177a42
 +    }
 +
 +    public static void register() {
-+        MCTypeRegistry.ENTITY.addConverterForId("minecraft:frog", new ConverterEntityVariant(VERSION, "Variant", FROG_ID_CONVERSION::get));
++        MCTypeRegistry.ENTITY.addConverterForId("minecraft:frog", new ConverterEntityToVariant(VERSION, "Variant", FROG_ID_CONVERSION::get));
 +    }
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd7d5436b3eaf7ae133c506fe4a7406b79803bc7
+index 0000000000000000000000000000000000000000..61c1424d8ee55b43d320ea8148d860f089026bb4
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3088.java
 @@ -0,0 +1,63 @@
@@ -17632,12 +17408,12 @@ index 0000000000000000000000000000000000000000..bd7d5436b3eaf7ae133c506fe4a7406b
 +    protected static final int VERSION = MCVersions.V22W14A;
 +
 +    private static final Set<String> STATUSES_TO_SKIP_BLENDING = new HashSet<>(
-+        Arrays.asList(
-+            "minecraft:empty",
-+            "minecraft:structure_starts",
-+            "minecraft:structure_references",
-+            "minecraft:biomes"
-+        )
++            Arrays.asList(
++                    "minecraft:empty",
++                    "minecraft:structure_starts",
++                    "minecraft:structure_references",
++                    "minecraft:biomes"
++            )
 +    );
 +
 +    public static void register() {
@@ -17736,10 +17512,10 @@ index 0000000000000000000000000000000000000000..8354c85fc4d92f36555c7de9dc0dffd1
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..522dcc0fe2ec30bb295a50de400308541b5ee467
+index 0000000000000000000000000000000000000000..39540b5f76af1c7d51a51db9d711f32a3c7f624c
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3094.java
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.converters.DataConverter;
@@ -17762,7 +17538,6 @@ index 0000000000000000000000000000000000000000..522dcc0fe2ec30bb295a50de40030854
 +            "minecraft:dream_goat_horn"
 +    };
 +
-+
 +    public static void register() {
 +        MCTypeRegistry.ITEM_STACK.addConverterForId("minecraft:goat_horn", new DataConverter<>(VERSION) {
 +            @Override
@@ -17785,17 +17560,17 @@ index 0000000000000000000000000000000000000000..522dcc0fe2ec30bb295a50de40030854
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2dfb4f4f9fdd064021a9f43352c7a7ddb19297e1
+index 0000000000000000000000000000000000000000..d5ac17b59c0dcc9baaeff022ecbf827c237cf9d6
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3097.java
 @@ -0,0 +1,61 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.converters.DataConverter;
-+import ca.spottedleaf.dataconverter.converters.advancements.ConverterCriteriaRename;
-+import ca.spottedleaf.dataconverter.converters.entity.ConverterEntityVariantRename;
-+import ca.spottedleaf.dataconverter.converters.poi.ConverterPoiDelete;
 +import ca.spottedleaf.dataconverter.minecraft.MCVersions;
++import ca.spottedleaf.dataconverter.minecraft.converters.advancements.ConverterCriteriaRename;
++import ca.spottedleaf.dataconverter.minecraft.converters.entity.ConverterEntityVariantRename;
++import ca.spottedleaf.dataconverter.minecraft.converters.poi.ConverterPoiDelete;
 +import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
 +import ca.spottedleaf.dataconverter.types.MapType;
 +import java.util.HashMap;