--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.DSL.TypeReference;
 import com.mojang.datafixers.DataFixer;
 import com.mojang.datafixers.DataFixerBuilder;
 import com.mojang.datafixers.Typed;
@@ -15,169 +16,7 @@
 import java.util.function.UnaryOperator;
 import net.minecraft.SharedConstants;
 import net.minecraft.Util;
-import net.minecraft.util.datafix.fixes.AbstractArrowPickupFix;
-import net.minecraft.util.datafix.fixes.AddFlagIfNotPresentFix;
-import net.minecraft.util.datafix.fixes.AddNewChoices;
-import net.minecraft.util.datafix.fixes.AdvancementsFix;
-import net.minecraft.util.datafix.fixes.AdvancementsRenameFix;
-import net.minecraft.util.datafix.fixes.AttributesRename;
-import net.minecraft.util.datafix.fixes.BedItemColorFix;
-import net.minecraft.util.datafix.fixes.BiomeFix;
-import net.minecraft.util.datafix.fixes.BitStorageAlignFix;
-import net.minecraft.util.datafix.fixes.BlendingDataFix;
-import net.minecraft.util.datafix.fixes.BlendingDataRemoveFromNetherEndFix;
-import net.minecraft.util.datafix.fixes.BlockEntityBannerColorFix;
-import net.minecraft.util.datafix.fixes.BlockEntityBlockStateFix;
-import net.minecraft.util.datafix.fixes.BlockEntityCustomNameToComponentFix;
-import net.minecraft.util.datafix.fixes.BlockEntityIdFix;
-import net.minecraft.util.datafix.fixes.BlockEntityJukeboxFix;
-import net.minecraft.util.datafix.fixes.BlockEntityKeepPacked;
-import net.minecraft.util.datafix.fixes.BlockEntityShulkerBoxColorFix;
-import net.minecraft.util.datafix.fixes.BlockEntitySignTextStrictJsonFix;
-import net.minecraft.util.datafix.fixes.BlockEntityUUIDFix;
-import net.minecraft.util.datafix.fixes.BlockNameFlatteningFix;
-import net.minecraft.util.datafix.fixes.BlockRenameFix;
-import net.minecraft.util.datafix.fixes.BlockRenameFixWithJigsaw;
-import net.minecraft.util.datafix.fixes.BlockStateStructureTemplateFix;
-import net.minecraft.util.datafix.fixes.CatTypeFix;
-import net.minecraft.util.datafix.fixes.CauldronRenameFix;
-import net.minecraft.util.datafix.fixes.CavesAndCliffsRenames;
-import net.minecraft.util.datafix.fixes.ChunkBedBlockEntityInjecterFix;
-import net.minecraft.util.datafix.fixes.ChunkBiomeFix;
-import net.minecraft.util.datafix.fixes.ChunkDeleteIgnoredLightDataFix;
-import net.minecraft.util.datafix.fixes.ChunkHeightAndBiomeFix;
-import net.minecraft.util.datafix.fixes.ChunkLightRemoveFix;
-import net.minecraft.util.datafix.fixes.ChunkPalettedStorageFix;
-import net.minecraft.util.datafix.fixes.ChunkProtoTickListFix;
-import net.minecraft.util.datafix.fixes.ChunkRenamesFix;
-import net.minecraft.util.datafix.fixes.ChunkStatusFix;
-import net.minecraft.util.datafix.fixes.ChunkStatusFix2;
-import net.minecraft.util.datafix.fixes.ChunkStructuresTemplateRenameFix;
-import net.minecraft.util.datafix.fixes.ChunkToProtochunkFix;
-import net.minecraft.util.datafix.fixes.ColorlessShulkerEntityFix;
-import net.minecraft.util.datafix.fixes.CriteriaRenameFix;
-import net.minecraft.util.datafix.fixes.DyeItemRenameFix;
-import net.minecraft.util.datafix.fixes.EntityArmorStandSilentFix;
-import net.minecraft.util.datafix.fixes.EntityBlockStateFix;
-import net.minecraft.util.datafix.fixes.EntityCatSplitFix;
-import net.minecraft.util.datafix.fixes.EntityCodSalmonFix;
-import net.minecraft.util.datafix.fixes.EntityCustomNameToComponentFix;
-import net.minecraft.util.datafix.fixes.EntityElderGuardianSplitFix;
-import net.minecraft.util.datafix.fixes.EntityEquipmentToArmorAndHandFix;
-import net.minecraft.util.datafix.fixes.EntityGoatMissingStateFix;
-import net.minecraft.util.datafix.fixes.EntityHealthFix;
-import net.minecraft.util.datafix.fixes.EntityHorseSaddleFix;
-import net.minecraft.util.datafix.fixes.EntityHorseSplitFix;
-import net.minecraft.util.datafix.fixes.EntityIdFix;
-import net.minecraft.util.datafix.fixes.EntityItemFrameDirectionFix;
-import net.minecraft.util.datafix.fixes.EntityMinecartIdentifiersFix;
-import net.minecraft.util.datafix.fixes.EntityPaintingFieldsRenameFix;
-import net.minecraft.util.datafix.fixes.EntityPaintingItemFrameDirectionFix;
-import net.minecraft.util.datafix.fixes.EntityPaintingMotiveFix;
-import net.minecraft.util.datafix.fixes.EntityProjectileOwnerFix;
-import net.minecraft.util.datafix.fixes.EntityPufferfishRenameFix;
-import net.minecraft.util.datafix.fixes.EntityRavagerRenameFix;
-import net.minecraft.util.datafix.fixes.EntityRedundantChanceTagsFix;
-import net.minecraft.util.datafix.fixes.EntityRidingToPassengersFix;
-import net.minecraft.util.datafix.fixes.EntityShulkerColorFix;
-import net.minecraft.util.datafix.fixes.EntityShulkerRotationFix;
-import net.minecraft.util.datafix.fixes.EntitySkeletonSplitFix;
-import net.minecraft.util.datafix.fixes.EntityStringUuidFix;
-import net.minecraft.util.datafix.fixes.EntityTheRenameningFix;
-import net.minecraft.util.datafix.fixes.EntityTippedArrowFix;
-import net.minecraft.util.datafix.fixes.EntityUUIDFix;
-import net.minecraft.util.datafix.fixes.EntityVariantFix;
-import net.minecraft.util.datafix.fixes.EntityWolfColorFix;
-import net.minecraft.util.datafix.fixes.EntityZombieSplitFix;
-import net.minecraft.util.datafix.fixes.EntityZombieVillagerTypeFix;
-import net.minecraft.util.datafix.fixes.EntityZombifiedPiglinRenameFix;
-import net.minecraft.util.datafix.fixes.FilteredBooksFix;
-import net.minecraft.util.datafix.fixes.FilteredSignsFix;
-import net.minecraft.util.datafix.fixes.ForcePoiRebuild;
-import net.minecraft.util.datafix.fixes.FurnaceRecipeFix;
-import net.minecraft.util.datafix.fixes.GoatHornIdFix;
-import net.minecraft.util.datafix.fixes.GossipUUIDFix;
-import net.minecraft.util.datafix.fixes.HeightmapRenamingFix;
-import net.minecraft.util.datafix.fixes.IglooMetadataRemovalFix;
-import net.minecraft.util.datafix.fixes.ItemBannerColorFix;
-import net.minecraft.util.datafix.fixes.ItemCustomNameToComponentFix;
-import net.minecraft.util.datafix.fixes.ItemIdFix;
-import net.minecraft.util.datafix.fixes.ItemLoreFix;
-import net.minecraft.util.datafix.fixes.ItemPotionFix;
-import net.minecraft.util.datafix.fixes.ItemRemoveBlockEntityTagFix;
-import net.minecraft.util.datafix.fixes.ItemRenameFix;
-import net.minecraft.util.datafix.fixes.ItemShulkerBoxColorFix;
-import net.minecraft.util.datafix.fixes.ItemSpawnEggFix;
-import net.minecraft.util.datafix.fixes.ItemStackEnchantmentNamesFix;
-import net.minecraft.util.datafix.fixes.ItemStackMapIdFix;
-import net.minecraft.util.datafix.fixes.ItemStackSpawnEggFix;
-import net.minecraft.util.datafix.fixes.ItemStackTheFlatteningFix;
-import net.minecraft.util.datafix.fixes.ItemStackUUIDFix;
-import net.minecraft.util.datafix.fixes.ItemWaterPotionFix;
-import net.minecraft.util.datafix.fixes.ItemWrittenBookPagesStrictJsonFix;
-import net.minecraft.util.datafix.fixes.JigsawPropertiesFix;
-import net.minecraft.util.datafix.fixes.JigsawRotationFix;
-import net.minecraft.util.datafix.fixes.LeavesFix;
-import net.minecraft.util.datafix.fixes.LevelDataGeneratorOptionsFix;
-import net.minecraft.util.datafix.fixes.LevelFlatGeneratorInfoFix;
-import net.minecraft.util.datafix.fixes.LevelUUIDFix;
-import net.minecraft.util.datafix.fixes.MapIdFix;
-import net.minecraft.util.datafix.fixes.MemoryExpiryDataFix;
-import net.minecraft.util.datafix.fixes.MissingDimensionFix;
-import net.minecraft.util.datafix.fixes.MobSpawnerEntityIdentifiersFix;
-import net.minecraft.util.datafix.fixes.NamedEntityFix;
-import net.minecraft.util.datafix.fixes.NewVillageFix;
-import net.minecraft.util.datafix.fixes.ObjectiveDisplayNameFix;
-import net.minecraft.util.datafix.fixes.ObjectiveRenderTypeFix;
-import net.minecraft.util.datafix.fixes.OminousBannerBlockEntityRenameFix;
-import net.minecraft.util.datafix.fixes.OminousBannerRenameFix;
-import net.minecraft.util.datafix.fixes.OptionsAddTextBackgroundFix;
-import net.minecraft.util.datafix.fixes.OptionsAmbientOcclusionFix;
-import net.minecraft.util.datafix.fixes.OptionsForceVBOFix;
-import net.minecraft.util.datafix.fixes.OptionsKeyLwjgl3Fix;
-import net.minecraft.util.datafix.fixes.OptionsKeyTranslationFix;
-import net.minecraft.util.datafix.fixes.OptionsLowerCaseLanguageFix;
-import net.minecraft.util.datafix.fixes.OptionsProgrammerArtFix;
-import net.minecraft.util.datafix.fixes.OptionsRenameFieldFix;
-import net.minecraft.util.datafix.fixes.OverreachingTickFix;
-import net.minecraft.util.datafix.fixes.PlayerUUIDFix;
-import net.minecraft.util.datafix.fixes.PoiTypeRemoveFix;
-import net.minecraft.util.datafix.fixes.PoiTypeRenameFix;
-import net.minecraft.util.datafix.fixes.RecipesFix;
-import net.minecraft.util.datafix.fixes.RecipesRenameFix;
-import net.minecraft.util.datafix.fixes.RecipesRenameningFix;
-import net.minecraft.util.datafix.fixes.RedstoneWireConnectionsFix;
-import net.minecraft.util.datafix.fixes.References;
-import net.minecraft.util.datafix.fixes.RemoveGolemGossipFix;
-import net.minecraft.util.datafix.fixes.RenameBiomesFix;
-import net.minecraft.util.datafix.fixes.RenamedCoralFansFix;
-import net.minecraft.util.datafix.fixes.RenamedCoralFix;
-import net.minecraft.util.datafix.fixes.ReorganizePoi;
-import net.minecraft.util.datafix.fixes.SavedDataFeaturePoolElementFix;
-import net.minecraft.util.datafix.fixes.SavedDataUUIDFix;
-import net.minecraft.util.datafix.fixes.SavedDataVillageCropFix;
-import net.minecraft.util.datafix.fixes.SimpleRenameFix;
-import net.minecraft.util.datafix.fixes.SpawnerDataFix;
-import net.minecraft.util.datafix.fixes.StatsCounterFix;
-import net.minecraft.util.datafix.fixes.StatsRenameFix;
-import net.minecraft.util.datafix.fixes.StriderGravityFix;
-import net.minecraft.util.datafix.fixes.StructureReferenceCountFix;
-import net.minecraft.util.datafix.fixes.StructureSettingsFlattenFix;
-import net.minecraft.util.datafix.fixes.StructuresBecomeConfiguredFix;
-import net.minecraft.util.datafix.fixes.TeamDisplayNameFix;
-import net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix;
-import net.minecraft.util.datafix.fixes.VariantRenameFix;
-import net.minecraft.util.datafix.fixes.VillagerDataFix;
-import net.minecraft.util.datafix.fixes.VillagerFollowRangeFix;
-import net.minecraft.util.datafix.fixes.VillagerRebuildLevelAndXpFix;
-import net.minecraft.util.datafix.fixes.VillagerTradeFix;
-import net.minecraft.util.datafix.fixes.WallPropertyFix;
-import net.minecraft.util.datafix.fixes.WeaponSmithChestLootTableFix;
-import net.minecraft.util.datafix.fixes.WorldGenSettingsDisallowOldCustomWorldsFix;
-import net.minecraft.util.datafix.fixes.WorldGenSettingsFix;
-import net.minecraft.util.datafix.fixes.WorldGenSettingsHeightAndBiomeFix;
-import net.minecraft.util.datafix.fixes.WriteAndReadFix;
-import net.minecraft.util.datafix.fixes.ZombieVillagerRebuildXpFix;
+import net.minecraft.util.datafix.fixes.*;
 import net.minecraft.util.datafix.schemas.NamespacedSchema;
 import net.minecraft.util.datafix.schemas.V100;
 import net.minecraft.util.datafix.schemas.V102;
@@ -249,521 +88,727 @@
 import org.slf4j.Logger;
 
 public class DataFixers {
+
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final BiFunction<Integer, Schema, Schema> SAME = Schema::new;
     private static final BiFunction<Integer, Schema, Schema> SAME_NAMESPACED = NamespacedSchema::new;
-    private static final DataFixer dataFixer = createFixerUpper();
+    private static final DataFixer dataFixer = DataFixers.createFixerUpper();
     public static final int BLENDING_VERSION = 3088;
 
-    private DataFixers() {
-    }
+    private DataFixers() {}
 
     public static DataFixer getDataFixer() {
-        return dataFixer;
+        return DataFixers.dataFixer;
     }
 
     private static synchronized DataFixer createFixerUpper() {
-        DataFixerBuilder dataFixerBuilder = new DataFixerBuilder(SharedConstants.getCurrentVersion().getWorldVersion());
-        addFixers(dataFixerBuilder);
-        boolean var10000;
+        DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getCurrentVersion().getWorldVersion());
+
+        DataFixers.addFixers(datafixerbuilder);
+        boolean flag;
+
         switch (SharedConstants.DATAFIXER_OPTIMIZATION_OPTION) {
             case UNINITIALIZED_OPTIMIZED:
-                var10000 = true;
+                flag = true;
                 break;
             case UNINITIALIZED_UNOPTIMIZED:
-                var10000 = false;
+                flag = false;
                 break;
             default:
                 throw new IllegalStateException("Already loaded");
         }
 
-        boolean bl = var10000;
-        SharedConstants.DATAFIXER_OPTIMIZATION_OPTION = bl ? DataFixerOptimizationOption.INITIALIZED_OPTIMIZED : DataFixerOptimizationOption.INITIALIZED_UNOPTIMIZED;
-        LOGGER.info("Building {} datafixer", (Object)(bl ? "optimized" : "unoptimized"));
-        return bl ? dataFixerBuilder.buildOptimized(Util.bootstrapExecutor()) : dataFixerBuilder.buildUnoptimized();
+        boolean flag1 = flag;
+
+        SharedConstants.DATAFIXER_OPTIMIZATION_OPTION = flag1 ? DataFixerOptimizationOption.INITIALIZED_OPTIMIZED : DataFixerOptimizationOption.INITIALIZED_UNOPTIMIZED;
+        DataFixers.LOGGER.info("Building {} datafixer", flag1 ? "optimized" : "unoptimized");
+        return flag1 ? datafixerbuilder.buildOptimized(Util.bootstrapExecutor()) : datafixerbuilder.buildUnoptimized();
     }
 
     private static void addFixers(DataFixerBuilder builder) {
         Schema schema = builder.addSchema(99, V99::new);
-        Schema schema2 = builder.addSchema(100, V100::new);
-        builder.addFixer(new EntityEquipmentToArmorAndHandFix(schema2, true));
-        Schema schema3 = builder.addSchema(101, SAME);
-        builder.addFixer(new BlockEntitySignTextStrictJsonFix(schema3, false));
-        Schema schema4 = builder.addSchema(102, V102::new);
-        builder.addFixer(new ItemIdFix(schema4, true));
-        builder.addFixer(new ItemPotionFix(schema4, false));
-        Schema schema5 = builder.addSchema(105, SAME);
-        builder.addFixer(new ItemSpawnEggFix(schema5, true));
-        Schema schema6 = builder.addSchema(106, V106::new);
-        builder.addFixer(new MobSpawnerEntityIdentifiersFix(schema6, true));
-        Schema schema7 = builder.addSchema(107, V107::new);
-        builder.addFixer(new EntityMinecartIdentifiersFix(schema7, true));
-        Schema schema8 = builder.addSchema(108, SAME);
-        builder.addFixer(new EntityStringUuidFix(schema8, true));
-        Schema schema9 = builder.addSchema(109, SAME);
-        builder.addFixer(new EntityHealthFix(schema9, true));
-        Schema schema10 = builder.addSchema(110, SAME);
-        builder.addFixer(new EntityHorseSaddleFix(schema10, true));
-        Schema schema11 = builder.addSchema(111, SAME);
-        builder.addFixer(new EntityPaintingItemFrameDirectionFix(schema11, true));
-        Schema schema12 = builder.addSchema(113, SAME);
-        builder.addFixer(new EntityRedundantChanceTagsFix(schema12, true));
-        Schema schema13 = builder.addSchema(135, V135::new);
-        builder.addFixer(new EntityRidingToPassengersFix(schema13, true));
-        Schema schema14 = builder.addSchema(143, V143::new);
-        builder.addFixer(new EntityTippedArrowFix(schema14, true));
-        Schema schema15 = builder.addSchema(147, SAME);
-        builder.addFixer(new EntityArmorStandSilentFix(schema15, true));
-        Schema schema16 = builder.addSchema(165, SAME);
-        builder.addFixer(new ItemWrittenBookPagesStrictJsonFix(schema16, true));
-        Schema schema17 = builder.addSchema(501, V501::new);
-        builder.addFixer(new AddNewChoices(schema17, "Add 1.10 entities fix", References.ENTITY));
-        Schema schema18 = builder.addSchema(502, SAME);
-        builder.addFixer(ItemRenameFix.create(schema18, "cooked_fished item renamer", (id) -> {
-            return Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:cooked_fished") ? "minecraft:cooked_fish" : id;
+        Schema schema1 = builder.addSchema(100, V100::new);
+
+        builder.addFixer(new EntityEquipmentToArmorAndHandFix(schema1, true));
+        Schema schema2 = builder.addSchema(101, DataFixers.SAME);
+
+        builder.addFixer(new BlockEntitySignTextStrictJsonFix(schema2, false));
+        Schema schema3 = builder.addSchema(102, V102::new);
+
+        builder.addFixer(new ItemIdFix(schema3, true));
+        builder.addFixer(new ItemPotionFix(schema3, false));
+        Schema schema4 = builder.addSchema(105, DataFixers.SAME);
+
+        builder.addFixer(new ItemSpawnEggFix(schema4, true));
+        Schema schema5 = builder.addSchema(106, V106::new);
+
+        builder.addFixer(new MobSpawnerEntityIdentifiersFix(schema5, true));
+        Schema schema6 = builder.addSchema(107, V107::new);
+
+        builder.addFixer(new EntityMinecartIdentifiersFix(schema6, true));
+        Schema schema7 = builder.addSchema(108, DataFixers.SAME);
+
+        builder.addFixer(new EntityStringUuidFix(schema7, true));
+        Schema schema8 = builder.addSchema(109, DataFixers.SAME);
+
+        builder.addFixer(new EntityHealthFix(schema8, true));
+        Schema schema9 = builder.addSchema(110, DataFixers.SAME);
+
+        builder.addFixer(new EntityHorseSaddleFix(schema9, true));
+        Schema schema10 = builder.addSchema(111, DataFixers.SAME);
+
+        builder.addFixer(new EntityPaintingItemFrameDirectionFix(schema10, true));
+        Schema schema11 = builder.addSchema(113, DataFixers.SAME);
+
+        builder.addFixer(new EntityRedundantChanceTagsFix(schema11, true));
+        Schema schema12 = builder.addSchema(135, V135::new);
+
+        builder.addFixer(new EntityRidingToPassengersFix(schema12, true));
+        Schema schema13 = builder.addSchema(143, V143::new);
+
+        builder.addFixer(new EntityTippedArrowFix(schema13, true));
+        Schema schema14 = builder.addSchema(147, DataFixers.SAME);
+
+        builder.addFixer(new EntityArmorStandSilentFix(schema14, true));
+        Schema schema15 = builder.addSchema(165, DataFixers.SAME);
+
+        builder.addFixer(new ItemWrittenBookPagesStrictJsonFix(schema15, true));
+        Schema schema16 = builder.addSchema(501, V501::new);
+
+        builder.addFixer(new AddNewChoices(schema16, "Add 1.10 entities fix", References.ENTITY));
+        Schema schema17 = builder.addSchema(502, DataFixers.SAME);
+
+        builder.addFixer(ItemRenameFix.create(schema17, "cooked_fished item renamer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:cooked_fished") ? "minecraft:cooked_fish" : s;
         }));
-        builder.addFixer(new EntityZombieVillagerTypeFix(schema18, false));
-        Schema schema19 = builder.addSchema(505, SAME);
-        builder.addFixer(new OptionsForceVBOFix(schema19, false));
-        Schema schema20 = builder.addSchema(700, V700::new);
-        builder.addFixer(new EntityElderGuardianSplitFix(schema20, true));
-        Schema schema21 = builder.addSchema(701, V701::new);
-        builder.addFixer(new EntitySkeletonSplitFix(schema21, true));
-        Schema schema22 = builder.addSchema(702, V702::new);
-        builder.addFixer(new EntityZombieSplitFix(schema22, true));
-        Schema schema23 = builder.addSchema(703, V703::new);
-        builder.addFixer(new EntityHorseSplitFix(schema23, true));
-        Schema schema24 = builder.addSchema(704, V704::new);
-        builder.addFixer(new BlockEntityIdFix(schema24, true));
-        Schema schema25 = builder.addSchema(705, V705::new);
-        builder.addFixer(new EntityIdFix(schema25, true));
-        Schema schema26 = builder.addSchema(804, SAME_NAMESPACED);
-        builder.addFixer(new ItemBannerColorFix(schema26, true));
-        Schema schema27 = builder.addSchema(806, SAME_NAMESPACED);
-        builder.addFixer(new ItemWaterPotionFix(schema27, false));
-        Schema schema28 = builder.addSchema(808, V808::new);
-        builder.addFixer(new AddNewChoices(schema28, "added shulker box", References.BLOCK_ENTITY));
-        Schema schema29 = builder.addSchema(808, 1, SAME_NAMESPACED);
-        builder.addFixer(new EntityShulkerColorFix(schema29, false));
-        Schema schema30 = builder.addSchema(813, SAME_NAMESPACED);
-        builder.addFixer(new ItemShulkerBoxColorFix(schema30, false));
-        builder.addFixer(new BlockEntityShulkerBoxColorFix(schema30, false));
-        Schema schema31 = builder.addSchema(816, SAME_NAMESPACED);
-        builder.addFixer(new OptionsLowerCaseLanguageFix(schema31, false));
-        Schema schema32 = builder.addSchema(820, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema32, "totem item renamer", createRenamer("minecraft:totem", "minecraft:totem_of_undying")));
-        Schema schema33 = builder.addSchema(1022, V1022::new);
-        builder.addFixer(new WriteAndReadFix(schema33, "added shoulder entities to players", References.PLAYER));
-        Schema schema34 = builder.addSchema(1125, V1125::new);
-        builder.addFixer(new ChunkBedBlockEntityInjecterFix(schema34, true));
-        builder.addFixer(new BedItemColorFix(schema34, false));
-        Schema schema35 = builder.addSchema(1344, SAME_NAMESPACED);
-        builder.addFixer(new OptionsKeyLwjgl3Fix(schema35, false));
-        Schema schema36 = builder.addSchema(1446, SAME_NAMESPACED);
-        builder.addFixer(new OptionsKeyTranslationFix(schema36, false));
-        Schema schema37 = builder.addSchema(1450, SAME_NAMESPACED);
-        builder.addFixer(new BlockStateStructureTemplateFix(schema37, false));
-        Schema schema38 = builder.addSchema(1451, V1451::new);
-        builder.addFixer(new AddNewChoices(schema38, "AddTrappedChestFix", References.BLOCK_ENTITY));
-        Schema schema39 = builder.addSchema(1451, 1, V1451_1::new);
-        builder.addFixer(new ChunkPalettedStorageFix(schema39, true));
-        Schema schema40 = builder.addSchema(1451, 2, V1451_2::new);
-        builder.addFixer(new BlockEntityBlockStateFix(schema40, true));
-        Schema schema41 = builder.addSchema(1451, 3, V1451_3::new);
-        builder.addFixer(new EntityBlockStateFix(schema41, true));
-        builder.addFixer(new ItemStackMapIdFix(schema41, false));
-        Schema schema42 = builder.addSchema(1451, 4, V1451_4::new);
-        builder.addFixer(new BlockNameFlatteningFix(schema42, true));
-        builder.addFixer(new ItemStackTheFlatteningFix(schema42, false));
-        Schema schema43 = builder.addSchema(1451, 5, V1451_5::new);
-        builder.addFixer(new ItemRemoveBlockEntityTagFix(schema43, false, Set.of("minecraft:note_block", "minecraft:flower_pot", "minecraft:dandelion", "minecraft:poppy", "minecraft:blue_orchid", "minecraft:allium", "minecraft:azure_bluet", "minecraft:red_tulip", "minecraft:orange_tulip", "minecraft:white_tulip", "minecraft:pink_tulip", "minecraft:oxeye_daisy", "minecraft:cactus", "minecraft:brown_mushroom", "minecraft:red_mushroom", "minecraft:oak_sapling", "minecraft:spruce_sapling", "minecraft:birch_sapling", "minecraft:jungle_sapling", "minecraft:acacia_sapling", "minecraft:dark_oak_sapling", "minecraft:dead_bush", "minecraft:fern")));
-        builder.addFixer(new AddNewChoices(schema43, "RemoveNoteBlockFlowerPotFix", References.BLOCK_ENTITY));
-        builder.addFixer(new ItemStackSpawnEggFix(schema43, false, "minecraft:spawn_egg"));
-        builder.addFixer(new EntityWolfColorFix(schema43, false));
-        builder.addFixer(new BlockEntityBannerColorFix(schema43, false));
-        builder.addFixer(new LevelFlatGeneratorInfoFix(schema43, false));
-        Schema schema44 = builder.addSchema(1451, 6, V1451_6::new);
-        builder.addFixer(new StatsCounterFix(schema44, true));
-        builder.addFixer(new WriteAndReadFix(schema44, "Rewrite objectives", References.OBJECTIVE));
-        builder.addFixer(new BlockEntityJukeboxFix(schema44, false));
-        Schema schema45 = builder.addSchema(1451, 7, V1451_7::new);
-        builder.addFixer(new SavedDataVillageCropFix(schema45, true));
-        Schema schema46 = builder.addSchema(1451, 7, SAME_NAMESPACED);
-        builder.addFixer(new VillagerTradeFix(schema46, false));
-        Schema schema47 = builder.addSchema(1456, SAME_NAMESPACED);
-        builder.addFixer(new EntityItemFrameDirectionFix(schema47, false));
-        Schema schema48 = builder.addSchema(1458, SAME_NAMESPACED);
-        builder.addFixer(new EntityCustomNameToComponentFix(schema48, false));
-        builder.addFixer(new ItemCustomNameToComponentFix(schema48, false));
-        builder.addFixer(new BlockEntityCustomNameToComponentFix(schema48, false));
-        Schema schema49 = builder.addSchema(1460, V1460::new);
-        builder.addFixer(new EntityPaintingMotiveFix(schema49, false));
-        Schema schema50 = builder.addSchema(1466, V1466::new);
-        builder.addFixer(new ChunkToProtochunkFix(schema50, true));
-        Schema schema51 = builder.addSchema(1470, V1470::new);
-        builder.addFixer(new AddNewChoices(schema51, "Add 1.13 entities fix", References.ENTITY));
-        Schema schema52 = builder.addSchema(1474, SAME_NAMESPACED);
-        builder.addFixer(new ColorlessShulkerEntityFix(schema52, false));
-        builder.addFixer(BlockRenameFix.create(schema52, "Colorless shulker block fixer", (id) -> {
-            return Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : id;
+        builder.addFixer(new EntityZombieVillagerTypeFix(schema17, false));
+        Schema schema18 = builder.addSchema(505, DataFixers.SAME);
+
+        builder.addFixer(new OptionsForceVBOFix(schema18, false));
+        Schema schema19 = builder.addSchema(700, V700::new);
+
+        builder.addFixer(new EntityElderGuardianSplitFix(schema19, true));
+        Schema schema20 = builder.addSchema(701, V701::new);
+
+        builder.addFixer(new EntitySkeletonSplitFix(schema20, true));
+        Schema schema21 = builder.addSchema(702, V702::new);
+
+        builder.addFixer(new EntityZombieSplitFix(schema21, true));
+        Schema schema22 = builder.addSchema(703, V703::new);
+
+        builder.addFixer(new EntityHorseSplitFix(schema22, true));
+        Schema schema23 = builder.addSchema(704, V704::new);
+
+        builder.addFixer(new BlockEntityIdFix(schema23, true));
+        Schema schema24 = builder.addSchema(705, V705::new);
+
+        builder.addFixer(new EntityIdFix(schema24, true));
+        Schema schema25 = builder.addSchema(804, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemBannerColorFix(schema25, true));
+        Schema schema26 = builder.addSchema(806, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemWaterPotionFix(schema26, false));
+        Schema schema27 = builder.addSchema(808, V808::new);
+
+        builder.addFixer(new AddNewChoices(schema27, "added shulker box", References.BLOCK_ENTITY));
+        Schema schema28 = builder.addSchema(808, 1, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityShulkerColorFix(schema28, false));
+        Schema schema29 = builder.addSchema(813, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemShulkerBoxColorFix(schema29, false));
+        builder.addFixer(new BlockEntityShulkerBoxColorFix(schema29, false));
+        Schema schema30 = builder.addSchema(816, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsLowerCaseLanguageFix(schema30, false));
+        Schema schema31 = builder.addSchema(820, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema31, "totem item renamer", DataFixers.createRenamer("minecraft:totem", "minecraft:totem_of_undying")));
+        Schema schema32 = builder.addSchema(1022, V1022::new);
+
+        builder.addFixer(new WriteAndReadFix(schema32, "added shoulder entities to players", References.PLAYER));
+        Schema schema33 = builder.addSchema(1125, V1125::new);
+
+        builder.addFixer(new ChunkBedBlockEntityInjecterFix(schema33, true));
+        builder.addFixer(new BedItemColorFix(schema33, false));
+        Schema schema34 = builder.addSchema(1344, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsKeyLwjgl3Fix(schema34, false));
+        Schema schema35 = builder.addSchema(1446, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsKeyTranslationFix(schema35, false));
+        Schema schema36 = builder.addSchema(1450, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockStateStructureTemplateFix(schema36, false));
+        Schema schema37 = builder.addSchema(1451, V1451::new);
+
+        builder.addFixer(new AddNewChoices(schema37, "AddTrappedChestFix", References.BLOCK_ENTITY));
+        Schema schema38 = builder.addSchema(1451, 1, V1451_1::new);
+
+        builder.addFixer(new ChunkPalettedStorageFix(schema38, true));
+        Schema schema39 = builder.addSchema(1451, 2, V1451_2::new);
+
+        builder.addFixer(new BlockEntityBlockStateFix(schema39, true));
+        Schema schema40 = builder.addSchema(1451, 3, V1451_3::new);
+
+        builder.addFixer(new EntityBlockStateFix(schema40, true));
+        builder.addFixer(new ItemStackMapIdFix(schema40, false));
+        Schema schema41 = builder.addSchema(1451, 4, V1451_4::new);
+
+        builder.addFixer(new BlockNameFlatteningFix(schema41, true));
+        builder.addFixer(new ItemStackTheFlatteningFix(schema41, false));
+        Schema schema42 = builder.addSchema(1451, 5, V1451_5::new);
+
+        builder.addFixer(new ItemRemoveBlockEntityTagFix(schema42, false, Set.of("minecraft:note_block", "minecraft:flower_pot", "minecraft:dandelion", "minecraft:poppy", "minecraft:blue_orchid", "minecraft:allium", "minecraft:azure_bluet", "minecraft:red_tulip", "minecraft:orange_tulip", "minecraft:white_tulip", "minecraft:pink_tulip", "minecraft:oxeye_daisy", "minecraft:cactus", "minecraft:brown_mushroom", "minecraft:red_mushroom", "minecraft:oak_sapling", "minecraft:spruce_sapling", "minecraft:birch_sapling", "minecraft:jungle_sapling", "minecraft:acacia_sapling", "minecraft:dark_oak_sapling", "minecraft:dead_bush", "minecraft:fern")));
+        builder.addFixer(new AddNewChoices(schema42, "RemoveNoteBlockFlowerPotFix", References.BLOCK_ENTITY));
+        builder.addFixer(new ItemStackSpawnEggFix(schema42, false, "minecraft:spawn_egg"));
+        builder.addFixer(new EntityWolfColorFix(schema42, false));
+        builder.addFixer(new BlockEntityBannerColorFix(schema42, false));
+        builder.addFixer(new LevelFlatGeneratorInfoFix(schema42, false));
+        Schema schema43 = builder.addSchema(1451, 6, V1451_6::new);
+
+        builder.addFixer(new StatsCounterFix(schema43, true));
+        builder.addFixer(new WriteAndReadFix(schema43, "Rewrite objectives", References.OBJECTIVE));
+        builder.addFixer(new BlockEntityJukeboxFix(schema43, false));
+        Schema schema44 = builder.addSchema(1451, 7, V1451_7::new);
+
+        builder.addFixer(new SavedDataVillageCropFix(schema44, true));
+        Schema schema45 = builder.addSchema(1451, 7, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerTradeFix(schema45, false));
+        Schema schema46 = builder.addSchema(1456, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityItemFrameDirectionFix(schema46, false));
+        Schema schema47 = builder.addSchema(1458, DataFixers.SAME_NAMESPACED);
+
+        // CraftBukkit start
+        builder.addFixer(new com.mojang.datafixers.DataFix(schema47, false) {
+            @Override
+            protected com.mojang.datafixers.TypeRewriteRule makeRule() {
+                return this.fixTypeEverywhereTyped("Player CustomName", this.getInputSchema().getType(References.PLAYER), (typed) -> {
+                    return typed.update(DSL.remainderFinder(), (dynamic) -> {
+                        return EntityCustomNameToComponentFix.fixTagCustomName(dynamic);
+                    });
+                });
+            }
+        });
+        // CraftBukkit end
+        builder.addFixer(new EntityCustomNameToComponentFix(schema47, false));
+        builder.addFixer(new ItemCustomNameToComponentFix(schema47, false));
+        builder.addFixer(new BlockEntityCustomNameToComponentFix(schema47, false));
+        Schema schema48 = builder.addSchema(1460, V1460::new);
+
+        builder.addFixer(new EntityPaintingMotiveFix(schema48, false));
+        Schema schema49 = builder.addSchema(1466, V1466::new);
+
+        builder.addFixer(new ChunkToProtochunkFix(schema49, true));
+        Schema schema50 = builder.addSchema(1470, V1470::new);
+
+        builder.addFixer(new AddNewChoices(schema50, "Add 1.13 entities fix", References.ENTITY));
+        Schema schema51 = builder.addSchema(1474, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ColorlessShulkerEntityFix(schema51, false));
+        builder.addFixer(BlockRenameFix.create(schema51, "Colorless shulker block fixer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : s;
         }));
-        builder.addFixer(ItemRenameFix.create(schema52, "Colorless shulker item fixer", (id) -> {
-            return Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : id;
+        builder.addFixer(ItemRenameFix.create(schema51, "Colorless shulker item fixer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : s;
         }));
-        Schema schema53 = builder.addSchema(1475, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema53, "Flowing fixer", createRenamer(ImmutableMap.of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava"))));
-        Schema schema54 = builder.addSchema(1480, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema54, "Rename coral blocks", createRenamer(RenamedCoralFix.RENAMED_IDS)));
-        builder.addFixer(ItemRenameFix.create(schema54, "Rename coral items", createRenamer(RenamedCoralFix.RENAMED_IDS)));
-        Schema schema55 = builder.addSchema(1481, V1481::new);
-        builder.addFixer(new AddNewChoices(schema55, "Add conduit", References.BLOCK_ENTITY));
-        Schema schema56 = builder.addSchema(1483, V1483::new);
-        builder.addFixer(new EntityPufferfishRenameFix(schema56, true));
-        builder.addFixer(ItemRenameFix.create(schema56, "Rename pufferfish egg item", createRenamer(EntityPufferfishRenameFix.RENAMED_IDS)));
-        Schema schema57 = builder.addSchema(1484, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema57, "Rename seagrass items", createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
-        builder.addFixer(BlockRenameFix.create(schema57, "Rename seagrass blocks", createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
-        builder.addFixer(new HeightmapRenamingFix(schema57, false));
-        Schema schema58 = builder.addSchema(1486, V1486::new);
-        builder.addFixer(new EntityCodSalmonFix(schema58, true));
-        builder.addFixer(ItemRenameFix.create(schema58, "Rename cod/salmon egg items", createRenamer(EntityCodSalmonFix.RENAMED_EGG_IDS)));
-        Schema schema59 = builder.addSchema(1487, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema59, "Rename prismarine_brick(s)_* blocks", createRenamer(ImmutableMap.of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
-        builder.addFixer(BlockRenameFix.create(schema59, "Rename prismarine_brick(s)_* items", createRenamer(ImmutableMap.of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
-        Schema schema60 = builder.addSchema(1488, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema60, "Rename kelp/kelptop", createRenamer(ImmutableMap.of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant"))));
-        builder.addFixer(ItemRenameFix.create(schema60, "Rename kelptop", createRenamer("minecraft:kelp_top", "minecraft:kelp")));
-        builder.addFixer(new NamedEntityFix(schema60, false, "Command block block entity custom name fix", References.BLOCK_ENTITY, "minecraft:command_block") {
+        Schema schema52 = builder.addSchema(1475, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema52, "Flowing fixer", DataFixers.createRenamer(ImmutableMap.of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava"))));
+        Schema schema53 = builder.addSchema(1480, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema53, "Rename coral blocks", DataFixers.createRenamer(RenamedCoralFix.RENAMED_IDS)));
+        builder.addFixer(ItemRenameFix.create(schema53, "Rename coral items", DataFixers.createRenamer(RenamedCoralFix.RENAMED_IDS)));
+        Schema schema54 = builder.addSchema(1481, V1481::new);
+
+        builder.addFixer(new AddNewChoices(schema54, "Add conduit", References.BLOCK_ENTITY));
+        Schema schema55 = builder.addSchema(1483, V1483::new);
+
+        builder.addFixer(new EntityPufferfishRenameFix(schema55, true));
+        builder.addFixer(ItemRenameFix.create(schema55, "Rename pufferfish egg item", DataFixers.createRenamer(EntityPufferfishRenameFix.RENAMED_IDS)));
+        Schema schema56 = builder.addSchema(1484, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema56, "Rename seagrass items", DataFixers.createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
+        builder.addFixer(BlockRenameFix.create(schema56, "Rename seagrass blocks", DataFixers.createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
+        builder.addFixer(new HeightmapRenamingFix(schema56, false));
+        Schema schema57 = builder.addSchema(1486, V1486::new);
+
+        builder.addFixer(new EntityCodSalmonFix(schema57, true));
+        builder.addFixer(ItemRenameFix.create(schema57, "Rename cod/salmon egg items", DataFixers.createRenamer(EntityCodSalmonFix.RENAMED_EGG_IDS)));
+        Schema schema58 = builder.addSchema(1487, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema58, "Rename prismarine_brick(s)_* blocks", DataFixers.createRenamer(ImmutableMap.of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
+        builder.addFixer(BlockRenameFix.create(schema58, "Rename prismarine_brick(s)_* items", DataFixers.createRenamer(ImmutableMap.of("minecraft:prismarine_bricks_slab", "minecraft:prismarine_brick_slab", "minecraft:prismarine_bricks_stairs", "minecraft:prismarine_brick_stairs"))));
+        Schema schema59 = builder.addSchema(1488, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema59, "Rename kelp/kelptop", DataFixers.createRenamer(ImmutableMap.of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant"))));
+        builder.addFixer(ItemRenameFix.create(schema59, "Rename kelptop", DataFixers.createRenamer("minecraft:kelp_top", "minecraft:kelp")));
+        builder.addFixer(new NamedEntityFix(schema59, false, "Command block block entity custom name fix", References.BLOCK_ENTITY, "minecraft:command_block") {
             @Override
             protected Typed<?> fix(Typed<?> inputType) {
                 return inputType.update(DSL.remainderFinder(), EntityCustomNameToComponentFix::fixTagCustomName);
             }
         });
-        builder.addFixer(new NamedEntityFix(schema60, false, "Command block minecart custom name fix", References.ENTITY, "minecraft:commandblock_minecart") {
+        builder.addFixer(new NamedEntityFix(schema59, false, "Command block minecart custom name fix", References.ENTITY, "minecraft:commandblock_minecart") {
             @Override
             protected Typed<?> fix(Typed<?> inputType) {
                 return inputType.update(DSL.remainderFinder(), EntityCustomNameToComponentFix::fixTagCustomName);
             }
         });
-        builder.addFixer(new IglooMetadataRemovalFix(schema60, false));
-        Schema schema61 = builder.addSchema(1490, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema61, "Rename melon_block", createRenamer("minecraft:melon_block", "minecraft:melon")));
-        builder.addFixer(ItemRenameFix.create(schema61, "Rename melon_block/melon/speckled_melon", createRenamer(ImmutableMap.of("minecraft:melon_block", "minecraft:melon", "minecraft:melon", "minecraft:melon_slice", "minecraft:speckled_melon", "minecraft:glistering_melon_slice"))));
-        Schema schema62 = builder.addSchema(1492, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStructuresTemplateRenameFix(schema62, false));
-        Schema schema63 = builder.addSchema(1494, SAME_NAMESPACED);
-        builder.addFixer(new ItemStackEnchantmentNamesFix(schema63, false));
-        Schema schema64 = builder.addSchema(1496, SAME_NAMESPACED);
-        builder.addFixer(new LeavesFix(schema64, false));
-        Schema schema65 = builder.addSchema(1500, SAME_NAMESPACED);
-        builder.addFixer(new BlockEntityKeepPacked(schema65, false));
-        Schema schema66 = builder.addSchema(1501, SAME_NAMESPACED);
-        builder.addFixer(new AdvancementsFix(schema66, false));
-        Schema schema67 = builder.addSchema(1502, SAME_NAMESPACED);
-        builder.addFixer(new RecipesFix(schema67, false));
-        Schema schema68 = builder.addSchema(1506, SAME_NAMESPACED);
-        builder.addFixer(new LevelDataGeneratorOptionsFix(schema68, false));
-        Schema schema69 = builder.addSchema(1510, V1510::new);
-        builder.addFixer(BlockRenameFix.create(schema69, "Block renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_BLOCKS)));
-        builder.addFixer(ItemRenameFix.create(schema69, "Item renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_ITEMS)));
-        builder.addFixer(new RecipesRenameningFix(schema69, false));
-        builder.addFixer(new EntityTheRenameningFix(schema69, true));
-        builder.addFixer(new StatsRenameFix(schema69, "SwimStatsRenameFix", ImmutableMap.of("minecraft:swim_one_cm", "minecraft:walk_on_water_one_cm", "minecraft:dive_one_cm", "minecraft:walk_under_water_one_cm")));
-        Schema schema70 = builder.addSchema(1514, SAME_NAMESPACED);
-        builder.addFixer(new ObjectiveDisplayNameFix(schema70, false));
-        builder.addFixer(new TeamDisplayNameFix(schema70, false));
-        builder.addFixer(new ObjectiveRenderTypeFix(schema70, false));
-        Schema schema71 = builder.addSchema(1515, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema71, "Rename coral fan blocks", createRenamer(RenamedCoralFansFix.RENAMED_IDS)));
-        Schema schema72 = builder.addSchema(1624, SAME_NAMESPACED);
-        builder.addFixer(new TrappedChestBlockEntityFix(schema72, false));
-        Schema schema73 = builder.addSchema(1800, V1800::new);
-        builder.addFixer(new AddNewChoices(schema73, "Added 1.14 mobs fix", References.ENTITY));
-        builder.addFixer(ItemRenameFix.create(schema73, "Rename dye items", createRenamer(DyeItemRenameFix.RENAMED_IDS)));
-        Schema schema74 = builder.addSchema(1801, V1801::new);
-        builder.addFixer(new AddNewChoices(schema74, "Added Illager Beast", References.ENTITY));
-        Schema schema75 = builder.addSchema(1802, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema75, "Rename sign blocks & stone slabs", createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign", "minecraft:wall_sign", "minecraft:oak_wall_sign"))));
-        builder.addFixer(ItemRenameFix.create(schema75, "Rename sign item & stone slabs", createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign"))));
-        Schema schema76 = builder.addSchema(1803, SAME_NAMESPACED);
-        builder.addFixer(new ItemLoreFix(schema76, false));
-        Schema schema77 = builder.addSchema(1904, V1904::new);
-        builder.addFixer(new AddNewChoices(schema77, "Added Cats", References.ENTITY));
-        builder.addFixer(new EntityCatSplitFix(schema77, false));
-        Schema schema78 = builder.addSchema(1905, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStatusFix(schema78, false));
-        Schema schema79 = builder.addSchema(1906, V1906::new);
-        builder.addFixer(new AddNewChoices(schema79, "Add POI Blocks", References.BLOCK_ENTITY));
-        Schema schema80 = builder.addSchema(1909, V1909::new);
-        builder.addFixer(new AddNewChoices(schema80, "Add jigsaw", References.BLOCK_ENTITY));
-        Schema schema81 = builder.addSchema(1911, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStatusFix2(schema81, false));
-        Schema schema82 = builder.addSchema(1914, SAME_NAMESPACED);
-        builder.addFixer(new WeaponSmithChestLootTableFix(schema82, false));
-        Schema schema83 = builder.addSchema(1917, SAME_NAMESPACED);
-        builder.addFixer(new CatTypeFix(schema83, false));
-        Schema schema84 = builder.addSchema(1918, SAME_NAMESPACED);
-        builder.addFixer(new VillagerDataFix(schema84, "minecraft:villager"));
-        builder.addFixer(new VillagerDataFix(schema84, "minecraft:zombie_villager"));
-        Schema schema85 = builder.addSchema(1920, V1920::new);
-        builder.addFixer(new NewVillageFix(schema85, false));
-        builder.addFixer(new AddNewChoices(schema85, "Add campfire", References.BLOCK_ENTITY));
-        Schema schema86 = builder.addSchema(1925, SAME_NAMESPACED);
-        builder.addFixer(new MapIdFix(schema86, false));
-        Schema schema87 = builder.addSchema(1928, V1928::new);
-        builder.addFixer(new EntityRavagerRenameFix(schema87, true));
-        builder.addFixer(ItemRenameFix.create(schema87, "Rename ravager egg item", createRenamer(EntityRavagerRenameFix.RENAMED_IDS)));
-        Schema schema88 = builder.addSchema(1929, V1929::new);
-        builder.addFixer(new AddNewChoices(schema88, "Add Wandering Trader and Trader Llama", References.ENTITY));
-        Schema schema89 = builder.addSchema(1931, V1931::new);
-        builder.addFixer(new AddNewChoices(schema89, "Added Fox", References.ENTITY));
-        Schema schema90 = builder.addSchema(1936, SAME_NAMESPACED);
-        builder.addFixer(new OptionsAddTextBackgroundFix(schema90, false));
-        Schema schema91 = builder.addSchema(1946, SAME_NAMESPACED);
-        builder.addFixer(new ReorganizePoi(schema91, false));
-        Schema schema92 = builder.addSchema(1948, SAME_NAMESPACED);
-        builder.addFixer(new OminousBannerRenameFix(schema92));
-        Schema schema93 = builder.addSchema(1953, SAME_NAMESPACED);
-        builder.addFixer(new OminousBannerBlockEntityRenameFix(schema93, false));
-        Schema schema94 = builder.addSchema(1955, SAME_NAMESPACED);
-        builder.addFixer(new VillagerRebuildLevelAndXpFix(schema94, false));
-        builder.addFixer(new ZombieVillagerRebuildXpFix(schema94, false));
-        Schema schema95 = builder.addSchema(1961, SAME_NAMESPACED);
-        builder.addFixer(new ChunkLightRemoveFix(schema95, false));
-        Schema schema96 = builder.addSchema(1963, SAME_NAMESPACED);
-        builder.addFixer(new RemoveGolemGossipFix(schema96, false));
-        Schema schema97 = builder.addSchema(2100, V2100::new);
-        builder.addFixer(new AddNewChoices(schema97, "Added Bee and Bee Stinger", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema97, "Add beehive", References.BLOCK_ENTITY));
-        builder.addFixer(new RecipesRenameFix(schema97, false, "Rename sugar recipe", createRenamer("minecraft:sugar", "sugar_from_sugar_cane")));
-        builder.addFixer(new AdvancementsRenameFix(schema97, false, "Rename sugar recipe advancement", createRenamer("minecraft:recipes/misc/sugar", "minecraft:recipes/misc/sugar_from_sugar_cane")));
-        Schema schema98 = builder.addSchema(2202, SAME_NAMESPACED);
-        builder.addFixer(new ChunkBiomeFix(schema98, false));
-        Schema schema99 = builder.addSchema(2209, SAME_NAMESPACED);
-        UnaryOperator<String> unaryOperator = createRenamer("minecraft:bee_hive", "minecraft:beehive");
-        builder.addFixer(ItemRenameFix.create(schema99, "Rename bee_hive item to beehive", unaryOperator));
-        builder.addFixer(new PoiTypeRenameFix(schema99, "Rename bee_hive poi to beehive", unaryOperator));
-        builder.addFixer(BlockRenameFix.create(schema99, "Rename bee_hive block to beehive", unaryOperator));
-        Schema schema100 = builder.addSchema(2211, SAME_NAMESPACED);
-        builder.addFixer(new StructureReferenceCountFix(schema100, false));
-        Schema schema101 = builder.addSchema(2218, SAME_NAMESPACED);
-        builder.addFixer(new ForcePoiRebuild(schema101, false));
-        Schema schema102 = builder.addSchema(2501, V2501::new);
-        builder.addFixer(new FurnaceRecipeFix(schema102, true));
-        Schema schema103 = builder.addSchema(2502, V2502::new);
-        builder.addFixer(new AddNewChoices(schema103, "Added Hoglin", References.ENTITY));
-        Schema schema104 = builder.addSchema(2503, SAME_NAMESPACED);
-        builder.addFixer(new WallPropertyFix(schema104, false));
-        builder.addFixer(new AdvancementsRenameFix(schema104, false, "Composter category change", createRenamer("minecraft:recipes/misc/composter", "minecraft:recipes/decorations/composter")));
-        Schema schema105 = builder.addSchema(2505, V2505::new);
-        builder.addFixer(new AddNewChoices(schema105, "Added Piglin", References.ENTITY));
-        builder.addFixer(new MemoryExpiryDataFix(schema105, "minecraft:villager"));
-        Schema schema106 = builder.addSchema(2508, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema106, "Renamed fungi items to fungus", createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
-        builder.addFixer(BlockRenameFix.create(schema106, "Renamed fungi blocks to fungus", createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
-        Schema schema107 = builder.addSchema(2509, V2509::new);
-        builder.addFixer(new EntityZombifiedPiglinRenameFix(schema107));
-        builder.addFixer(ItemRenameFix.create(schema107, "Rename zombie pigman egg item", createRenamer(EntityZombifiedPiglinRenameFix.RENAMED_IDS)));
-        Schema schema108 = builder.addSchema(2511, SAME_NAMESPACED);
-        builder.addFixer(new EntityProjectileOwnerFix(schema108));
-        Schema schema109 = builder.addSchema(2514, SAME_NAMESPACED);
-        builder.addFixer(new EntityUUIDFix(schema109));
-        builder.addFixer(new BlockEntityUUIDFix(schema109));
-        builder.addFixer(new PlayerUUIDFix(schema109));
-        builder.addFixer(new LevelUUIDFix(schema109));
-        builder.addFixer(new SavedDataUUIDFix(schema109));
-        builder.addFixer(new ItemStackUUIDFix(schema109));
-        Schema schema110 = builder.addSchema(2516, SAME_NAMESPACED);
-        builder.addFixer(new GossipUUIDFix(schema110, "minecraft:villager"));
-        builder.addFixer(new GossipUUIDFix(schema110, "minecraft:zombie_villager"));
-        Schema schema111 = builder.addSchema(2518, SAME_NAMESPACED);
-        builder.addFixer(new JigsawPropertiesFix(schema111, false));
-        builder.addFixer(new JigsawRotationFix(schema111, false));
-        Schema schema112 = builder.addSchema(2519, V2519::new);
-        builder.addFixer(new AddNewChoices(schema112, "Added Strider", References.ENTITY));
-        Schema schema113 = builder.addSchema(2522, V2522::new);
-        builder.addFixer(new AddNewChoices(schema113, "Added Zoglin", References.ENTITY));
-        Schema schema114 = builder.addSchema(2523, SAME_NAMESPACED);
-        builder.addFixer(new AttributesRename(schema114));
-        Schema schema115 = builder.addSchema(2527, SAME_NAMESPACED);
-        builder.addFixer(new BitStorageAlignFix(schema115));
-        Schema schema116 = builder.addSchema(2528, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema116, "Rename soul fire torch and soul fire lantern", createRenamer(ImmutableMap.of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
-        builder.addFixer(BlockRenameFix.create(schema116, "Rename soul fire torch and soul fire lantern", createRenamer(ImmutableMap.of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_wall_torch", "minecraft:soul_wall_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
-        Schema schema117 = builder.addSchema(2529, SAME_NAMESPACED);
-        builder.addFixer(new StriderGravityFix(schema117, false));
-        Schema schema118 = builder.addSchema(2531, SAME_NAMESPACED);
-        builder.addFixer(new RedstoneWireConnectionsFix(schema118));
-        Schema schema119 = builder.addSchema(2533, SAME_NAMESPACED);
-        builder.addFixer(new VillagerFollowRangeFix(schema119));
-        Schema schema120 = builder.addSchema(2535, SAME_NAMESPACED);
-        builder.addFixer(new EntityShulkerRotationFix(schema120));
-        Schema schema121 = builder.addSchema(2550, SAME_NAMESPACED);
-        builder.addFixer(new WorldGenSettingsFix(schema121));
-        Schema schema122 = builder.addSchema(2551, V2551::new);
-        builder.addFixer(new WriteAndReadFix(schema122, "add types to WorldGenData", References.WORLD_GEN_SETTINGS));
-        Schema schema123 = builder.addSchema(2552, SAME_NAMESPACED);
-        builder.addFixer(new RenameBiomesFix(schema123, false, "Nether biome rename", ImmutableMap.of("minecraft:nether", "minecraft:nether_wastes")));
-        Schema schema124 = builder.addSchema(2553, SAME_NAMESPACED);
-        builder.addFixer(new BiomeFix(schema124, false));
-        Schema schema125 = builder.addSchema(2558, SAME_NAMESPACED);
-        builder.addFixer(new MissingDimensionFix(schema125, false));
-        builder.addFixer(new OptionsRenameFieldFix(schema125, false, "Rename swapHands setting", "key_key.swapHands", "key_key.swapOffhand"));
-        Schema schema126 = builder.addSchema(2568, V2568::new);
-        builder.addFixer(new AddNewChoices(schema126, "Added Piglin Brute", References.ENTITY));
-        Schema schema127 = builder.addSchema(2571, V2571::new);
-        builder.addFixer(new AddNewChoices(schema127, "Added Goat", References.ENTITY));
-        Schema schema128 = builder.addSchema(2679, SAME_NAMESPACED);
-        builder.addFixer(new CauldronRenameFix(schema128, false));
-        Schema schema129 = builder.addSchema(2680, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema129, "Renamed grass path item to dirt path", createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
-        builder.addFixer(BlockRenameFixWithJigsaw.create(schema129, "Renamed grass path block to dirt path", createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
-        Schema schema130 = builder.addSchema(2684, V2684::new);
-        builder.addFixer(new AddNewChoices(schema130, "Added Sculk Sensor", References.BLOCK_ENTITY));
-        Schema schema131 = builder.addSchema(2686, V2686::new);
-        builder.addFixer(new AddNewChoices(schema131, "Added Axolotl", References.ENTITY));
-        Schema schema132 = builder.addSchema(2688, V2688::new);
-        builder.addFixer(new AddNewChoices(schema132, "Added Glow Squid", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema132, "Added Glow Item Frame", References.ENTITY));
-        Schema schema133 = builder.addSchema(2690, SAME_NAMESPACED);
-        ImmutableMap<String, String> immutableMap = ImmutableMap.<String, String>builder().put("minecraft:weathered_copper_block", "minecraft:oxidized_copper_block").put("minecraft:semi_weathered_copper_block", "minecraft:weathered_copper_block").put("minecraft:lightly_weathered_copper_block", "minecraft:exposed_copper_block").put("minecraft:weathered_cut_copper", "minecraft:oxidized_cut_copper").put("minecraft:semi_weathered_cut_copper", "minecraft:weathered_cut_copper").put("minecraft:lightly_weathered_cut_copper", "minecraft:exposed_cut_copper").put("minecraft:weathered_cut_copper_stairs", "minecraft:oxidized_cut_copper_stairs").put("minecraft:semi_weathered_cut_copper_stairs", "minecraft:weathered_cut_copper_stairs").put("minecraft:lightly_weathered_cut_copper_stairs", "minecraft:exposed_cut_copper_stairs").put("minecraft:weathered_cut_copper_slab", "minecraft:oxidized_cut_copper_slab").put("minecraft:semi_weathered_cut_copper_slab", "minecraft:weathered_cut_copper_slab").put("minecraft:lightly_weathered_cut_copper_slab", "minecraft:exposed_cut_copper_slab").put("minecraft:waxed_semi_weathered_copper", "minecraft:waxed_weathered_copper").put("minecraft:waxed_lightly_weathered_copper", "minecraft:waxed_exposed_copper").put("minecraft:waxed_semi_weathered_cut_copper", "minecraft:waxed_weathered_cut_copper").put("minecraft:waxed_lightly_weathered_cut_copper", "minecraft:waxed_exposed_cut_copper").put("minecraft:waxed_semi_weathered_cut_copper_stairs", "minecraft:waxed_weathered_cut_copper_stairs").put("minecraft:waxed_lightly_weathered_cut_copper_stairs", "minecraft:waxed_exposed_cut_copper_stairs").put("minecraft:waxed_semi_weathered_cut_copper_slab", "minecraft:waxed_weathered_cut_copper_slab").put("minecraft:waxed_lightly_weathered_cut_copper_slab", "minecraft:waxed_exposed_cut_copper_slab").build();
-        builder.addFixer(ItemRenameFix.create(schema133, "Renamed copper block items to new oxidized terms", createRenamer(immutableMap)));
-        builder.addFixer(BlockRenameFixWithJigsaw.create(schema133, "Renamed copper blocks to new oxidized terms", createRenamer(immutableMap)));
-        Schema schema134 = builder.addSchema(2691, SAME_NAMESPACED);
-        ImmutableMap<String, String> immutableMap2 = ImmutableMap.<String, String>builder().put("minecraft:waxed_copper", "minecraft:waxed_copper_block").put("minecraft:oxidized_copper_block", "minecraft:oxidized_copper").put("minecraft:weathered_copper_block", "minecraft:weathered_copper").put("minecraft:exposed_copper_block", "minecraft:exposed_copper").build();
-        builder.addFixer(ItemRenameFix.create(schema134, "Rename copper item suffixes", createRenamer(immutableMap2)));
-        builder.addFixer(BlockRenameFixWithJigsaw.create(schema134, "Rename copper blocks suffixes", createRenamer(immutableMap2)));
-        Schema schema135 = builder.addSchema(2693, SAME_NAMESPACED);
-        builder.addFixer(new AddFlagIfNotPresentFix(schema135, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
-        Schema schema136 = builder.addSchema(2696, SAME_NAMESPACED);
-        ImmutableMap<String, String> immutableMap3 = ImmutableMap.<String, String>builder().put("minecraft:grimstone", "minecraft:deepslate").put("minecraft:grimstone_slab", "minecraft:cobbled_deepslate_slab").put("minecraft:grimstone_stairs", "minecraft:cobbled_deepslate_stairs").put("minecraft:grimstone_wall", "minecraft:cobbled_deepslate_wall").put("minecraft:polished_grimstone", "minecraft:polished_deepslate").put("minecraft:polished_grimstone_slab", "minecraft:polished_deepslate_slab").put("minecraft:polished_grimstone_stairs", "minecraft:polished_deepslate_stairs").put("minecraft:polished_grimstone_wall", "minecraft:polished_deepslate_wall").put("minecraft:grimstone_tiles", "minecraft:deepslate_tiles").put("minecraft:grimstone_tile_slab", "minecraft:deepslate_tile_slab").put("minecraft:grimstone_tile_stairs", "minecraft:deepslate_tile_stairs").put("minecraft:grimstone_tile_wall", "minecraft:deepslate_tile_wall").put("minecraft:grimstone_bricks", "minecraft:deepslate_bricks").put("minecraft:grimstone_brick_slab", "minecraft:deepslate_brick_slab").put("minecraft:grimstone_brick_stairs", "minecraft:deepslate_brick_stairs").put("minecraft:grimstone_brick_wall", "minecraft:deepslate_brick_wall").put("minecraft:chiseled_grimstone", "minecraft:chiseled_deepslate").build();
-        builder.addFixer(ItemRenameFix.create(schema136, "Renamed grimstone block items to deepslate", createRenamer(immutableMap3)));
-        builder.addFixer(BlockRenameFixWithJigsaw.create(schema136, "Renamed grimstone blocks to deepslate", createRenamer(immutableMap3)));
-        Schema schema137 = builder.addSchema(2700, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFixWithJigsaw.create(schema137, "Renamed cave vines blocks", createRenamer(ImmutableMap.of("minecraft:cave_vines_head", "minecraft:cave_vines", "minecraft:cave_vines_body", "minecraft:cave_vines_plant"))));
-        Schema schema138 = builder.addSchema(2701, SAME_NAMESPACED);
-        builder.addFixer(new SavedDataFeaturePoolElementFix(schema138));
-        Schema schema139 = builder.addSchema(2702, SAME_NAMESPACED);
-        builder.addFixer(new AbstractArrowPickupFix(schema139));
-        Schema schema140 = builder.addSchema(2704, V2704::new);
-        builder.addFixer(new AddNewChoices(schema140, "Added Goat", References.ENTITY));
-        Schema schema141 = builder.addSchema(2707, V2707::new);
-        builder.addFixer(new AddNewChoices(schema141, "Added Marker", References.ENTITY));
-        builder.addFixer(new AddFlagIfNotPresentFix(schema141, References.WORLD_GEN_SETTINGS, "has_increased_height_already", true));
-        Schema schema142 = builder.addSchema(2710, SAME_NAMESPACED);
-        builder.addFixer(new StatsRenameFix(schema142, "Renamed play_one_minute stat to play_time", ImmutableMap.of("minecraft:play_one_minute", "minecraft:play_time")));
-        Schema schema143 = builder.addSchema(2717, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema143, "Rename azalea_leaves_flowers", createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
-        builder.addFixer(BlockRenameFix.create(schema143, "Rename azalea_leaves_flowers items", createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
-        Schema schema144 = builder.addSchema(2825, SAME_NAMESPACED);
-        builder.addFixer(new AddFlagIfNotPresentFix(schema144, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
-        Schema schema145 = builder.addSchema(2831, V2831::new);
-        builder.addFixer(new SpawnerDataFix(schema145));
-        Schema schema146 = builder.addSchema(2832, V2832::new);
-        builder.addFixer(new WorldGenSettingsHeightAndBiomeFix(schema146));
-        builder.addFixer(new ChunkHeightAndBiomeFix(schema146));
-        Schema schema147 = builder.addSchema(2833, SAME_NAMESPACED);
-        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema147));
-        Schema schema148 = builder.addSchema(2838, SAME_NAMESPACED);
-        builder.addFixer(new RenameBiomesFix(schema148, false, "Caves and Cliffs biome renames", CavesAndCliffsRenames.RENAMES));
-        Schema schema149 = builder.addSchema(2841, SAME_NAMESPACED);
-        builder.addFixer(new ChunkProtoTickListFix(schema149));
-        Schema schema150 = builder.addSchema(2842, V2842::new);
-        builder.addFixer(new ChunkRenamesFix(schema150));
-        Schema schema151 = builder.addSchema(2843, SAME_NAMESPACED);
-        builder.addFixer(new OverreachingTickFix(schema151));
-        builder.addFixer(new RenameBiomesFix(schema151, false, "Remove Deep Warm Ocean", Map.of("minecraft:deep_warm_ocean", "minecraft:warm_ocean")));
-        Schema schema152 = builder.addSchema(2846, SAME_NAMESPACED);
-        builder.addFixer(new AdvancementsRenameFix(schema152, false, "Rename some C&C part 2 advancements", createRenamer(ImmutableMap.of("minecraft:husbandry/play_jukebox_in_meadows", "minecraft:adventure/play_jukebox_in_meadows", "minecraft:adventure/caves_and_cliff", "minecraft:adventure/fall_from_world_height", "minecraft:adventure/ride_strider_in_overworld_lava", "minecraft:nether/ride_strider_in_overworld_lava"))));
-        Schema schema153 = builder.addSchema(2852, SAME_NAMESPACED);
-        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema153));
-        Schema schema154 = builder.addSchema(2967, SAME_NAMESPACED);
-        builder.addFixer(new StructureSettingsFlattenFix(schema154));
-        Schema schema155 = builder.addSchema(2970, SAME_NAMESPACED);
-        builder.addFixer(new StructuresBecomeConfiguredFix(schema155));
-        Schema schema156 = builder.addSchema(3076, V3076::new);
-        builder.addFixer(new AddNewChoices(schema156, "Added Sculk Catalyst", References.BLOCK_ENTITY));
-        Schema schema157 = builder.addSchema(3077, SAME_NAMESPACED);
-        builder.addFixer(new ChunkDeleteIgnoredLightDataFix(schema157));
-        Schema schema158 = builder.addSchema(3078, V3078::new);
-        builder.addFixer(new AddNewChoices(schema158, "Added Frog", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema158, "Added Tadpole", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema158, "Added Sculk Shrieker", References.BLOCK_ENTITY));
-        Schema schema159 = builder.addSchema(3081, V3081::new);
-        builder.addFixer(new AddNewChoices(schema159, "Added Warden", References.ENTITY));
-        Schema schema160 = builder.addSchema(3082, V3082::new);
-        builder.addFixer(new AddNewChoices(schema160, "Added Chest Boat", References.ENTITY));
-        Schema schema161 = builder.addSchema(3083, V3083::new);
-        builder.addFixer(new AddNewChoices(schema161, "Added Allay", References.ENTITY));
-        Schema schema162 = builder.addSchema(3084, SAME_NAMESPACED);
-        builder.addFixer(new SimpleRenameFix(schema162, References.GAME_EVENT_NAME, 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").put("minecraft:block_unswitch", "minecraft:block_deactivate").put("minecraft:drinking_finish", "minecraft:drink").put("minecraft:elytra_free_fall", "minecraft:elytra_glide").put("minecraft:entity_damaged", "minecraft:entity_damage").put("minecraft:entity_dying", "minecraft:entity_die").put("minecraft:entity_killed", "minecraft:entity_die").put("minecraft:mob_interact", "minecraft:entity_interact").put("minecraft:ravager_roar", "minecraft:entity_roar").put("minecraft:ring_bell", "minecraft:block_change").put("minecraft:shulker_close", "minecraft:container_close").put("minecraft:shulker_open", "minecraft:container_open").put("minecraft:wolf_shaking", "minecraft:entity_shake").build()));
-        Schema schema163 = builder.addSchema(3086, SAME_NAMESPACED);
-        builder.addFixer(new EntityVariantFix(schema163, "Change cat variant type", References.ENTITY, "minecraft:cat", "CatType", Util.make(new Int2ObjectOpenHashMap(), (catVariants) -> {
-            catVariants.defaultReturnValue("minecraft:tabby");
-            catVariants.put(0, "minecraft:tabby");
-            catVariants.put(1, "minecraft:black");
-            catVariants.put(2, "minecraft:red");
-            catVariants.put(3, "minecraft:siamese");
-            catVariants.put(4, "minecraft:british");
-            catVariants.put(5, "minecraft:calico");
-            catVariants.put(6, "minecraft:persian");
-            catVariants.put(7, "minecraft:ragdoll");
-            catVariants.put(8, "minecraft:white");
-            catVariants.put(9, "minecraft:jellie");
-            catVariants.put(10, "minecraft:all_black");
-        })::get));
-        ImmutableMap<String, String> immutableMap4 = 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").put("textures/entity/cat/siamese.png", "minecraft:siamese").put("textures/entity/cat/british_shorthair.png", "minecraft:british").put("textures/entity/cat/calico.png", "minecraft:calico").put("textures/entity/cat/persian.png", "minecraft:persian").put("textures/entity/cat/ragdoll.png", "minecraft:ragdoll").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();
-        builder.addFixer(new CriteriaRenameFix(schema163, "Migrate cat variant advancement", "minecraft:husbandry/complete_catalogue", (string) -> {
-            return immutableMap4.getOrDefault(string, string);
+        builder.addFixer(new IglooMetadataRemovalFix(schema59, false));
+        Schema schema60 = builder.addSchema(1490, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema60, "Rename melon_block", DataFixers.createRenamer("minecraft:melon_block", "minecraft:melon")));
+        builder.addFixer(ItemRenameFix.create(schema60, "Rename melon_block/melon/speckled_melon", DataFixers.createRenamer(ImmutableMap.of("minecraft:melon_block", "minecraft:melon", "minecraft:melon", "minecraft:melon_slice", "minecraft:speckled_melon", "minecraft:glistering_melon_slice"))));
+        Schema schema61 = builder.addSchema(1492, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStructuresTemplateRenameFix(schema61, false));
+        Schema schema62 = builder.addSchema(1494, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemStackEnchantmentNamesFix(schema62, false));
+        Schema schema63 = builder.addSchema(1496, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LeavesFix(schema63, false));
+        Schema schema64 = builder.addSchema(1500, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockEntityKeepPacked(schema64, false));
+        Schema schema65 = builder.addSchema(1501, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AdvancementsFix(schema65, false));
+        Schema schema66 = builder.addSchema(1502, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RecipesFix(schema66, false));
+        Schema schema67 = builder.addSchema(1506, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LevelDataGeneratorOptionsFix(schema67, false));
+        Schema schema68 = builder.addSchema(1510, V1510::new);
+
+        builder.addFixer(BlockRenameFix.create(schema68, "Block renamening fix", DataFixers.createRenamer(EntityTheRenameningFix.RENAMED_BLOCKS)));
+        builder.addFixer(ItemRenameFix.create(schema68, "Item renamening fix", DataFixers.createRenamer(EntityTheRenameningFix.RENAMED_ITEMS)));
+        builder.addFixer(new RecipesRenameningFix(schema68, false));
+        builder.addFixer(new EntityTheRenameningFix(schema68, true));
+        builder.addFixer(new StatsRenameFix(schema68, "SwimStatsRenameFix", ImmutableMap.of("minecraft:swim_one_cm", "minecraft:walk_on_water_one_cm", "minecraft:dive_one_cm", "minecraft:walk_under_water_one_cm")));
+        Schema schema69 = builder.addSchema(1514, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ObjectiveDisplayNameFix(schema69, false));
+        builder.addFixer(new TeamDisplayNameFix(schema69, false));
+        builder.addFixer(new ObjectiveRenderTypeFix(schema69, false));
+        Schema schema70 = builder.addSchema(1515, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema70, "Rename coral fan blocks", DataFixers.createRenamer(RenamedCoralFansFix.RENAMED_IDS)));
+        Schema schema71 = builder.addSchema(1624, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new TrappedChestBlockEntityFix(schema71, false));
+        Schema schema72 = builder.addSchema(1800, V1800::new);
+
+        builder.addFixer(new AddNewChoices(schema72, "Added 1.14 mobs fix", References.ENTITY));
+        builder.addFixer(ItemRenameFix.create(schema72, "Rename dye items", DataFixers.createRenamer(DyeItemRenameFix.RENAMED_IDS)));
+        Schema schema73 = builder.addSchema(1801, V1801::new);
+
+        builder.addFixer(new AddNewChoices(schema73, "Added Illager Beast", References.ENTITY));
+        Schema schema74 = builder.addSchema(1802, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema74, "Rename sign blocks & stone slabs", DataFixers.createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign", "minecraft:wall_sign", "minecraft:oak_wall_sign"))));
+        builder.addFixer(ItemRenameFix.create(schema74, "Rename sign item & stone slabs", DataFixers.createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign"))));
+        Schema schema75 = builder.addSchema(1803, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemLoreFix(schema75, false));
+        Schema schema76 = builder.addSchema(1904, V1904::new);
+
+        builder.addFixer(new AddNewChoices(schema76, "Added Cats", References.ENTITY));
+        builder.addFixer(new EntityCatSplitFix(schema76, false));
+        Schema schema77 = builder.addSchema(1905, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStatusFix(schema77, false));
+        Schema schema78 = builder.addSchema(1906, V1906::new);
+
+        builder.addFixer(new AddNewChoices(schema78, "Add POI Blocks", References.BLOCK_ENTITY));
+        Schema schema79 = builder.addSchema(1909, V1909::new);
+
+        builder.addFixer(new AddNewChoices(schema79, "Add jigsaw", References.BLOCK_ENTITY));
+        Schema schema80 = builder.addSchema(1911, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStatusFix2(schema80, false));
+        Schema schema81 = builder.addSchema(1914, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WeaponSmithChestLootTableFix(schema81, false));
+        Schema schema82 = builder.addSchema(1917, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new CatTypeFix(schema82, false));
+        Schema schema83 = builder.addSchema(1918, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerDataFix(schema83, "minecraft:villager"));
+        builder.addFixer(new VillagerDataFix(schema83, "minecraft:zombie_villager"));
+        Schema schema84 = builder.addSchema(1920, V1920::new);
+
+        builder.addFixer(new NewVillageFix(schema84, false));
+        builder.addFixer(new AddNewChoices(schema84, "Add campfire", References.BLOCK_ENTITY));
+        Schema schema85 = builder.addSchema(1925, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MapIdFix(schema85, false));
+        Schema schema86 = builder.addSchema(1928, V1928::new);
+
+        builder.addFixer(new EntityRavagerRenameFix(schema86, true));
+        builder.addFixer(ItemRenameFix.create(schema86, "Rename ravager egg item", DataFixers.createRenamer(EntityRavagerRenameFix.RENAMED_IDS)));
+        Schema schema87 = builder.addSchema(1929, V1929::new);
+
+        builder.addFixer(new AddNewChoices(schema87, "Add Wandering Trader and Trader Llama", References.ENTITY));
+        Schema schema88 = builder.addSchema(1931, V1931::new);
+
+        builder.addFixer(new AddNewChoices(schema88, "Added Fox", References.ENTITY));
+        Schema schema89 = builder.addSchema(1936, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsAddTextBackgroundFix(schema89, false));
+        Schema schema90 = builder.addSchema(1946, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ReorganizePoi(schema90, false));
+        Schema schema91 = builder.addSchema(1948, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OminousBannerRenameFix(schema91));
+        Schema schema92 = builder.addSchema(1953, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OminousBannerBlockEntityRenameFix(schema92, false));
+        Schema schema93 = builder.addSchema(1955, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerRebuildLevelAndXpFix(schema93, false));
+        builder.addFixer(new ZombieVillagerRebuildXpFix(schema93, false));
+        Schema schema94 = builder.addSchema(1961, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkLightRemoveFix(schema94, false));
+        Schema schema95 = builder.addSchema(1963, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RemoveGolemGossipFix(schema95, false));
+        Schema schema96 = builder.addSchema(2100, V2100::new);
+
+        builder.addFixer(new AddNewChoices(schema96, "Added Bee and Bee Stinger", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema96, "Add beehive", References.BLOCK_ENTITY));
+        builder.addFixer(new RecipesRenameFix(schema96, false, "Rename sugar recipe", DataFixers.createRenamer("minecraft:sugar", "sugar_from_sugar_cane")));
+        builder.addFixer(new AdvancementsRenameFix(schema96, false, "Rename sugar recipe advancement", DataFixers.createRenamer("minecraft:recipes/misc/sugar", "minecraft:recipes/misc/sugar_from_sugar_cane")));
+        Schema schema97 = builder.addSchema(2202, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkBiomeFix(schema97, false));
+        Schema schema98 = builder.addSchema(2209, DataFixers.SAME_NAMESPACED);
+        UnaryOperator<String> unaryoperator = DataFixers.createRenamer("minecraft:bee_hive", "minecraft:beehive");
+
+        builder.addFixer(ItemRenameFix.create(schema98, "Rename bee_hive item to beehive", unaryoperator));
+        builder.addFixer(new PoiTypeRenameFix(schema98, "Rename bee_hive poi to beehive", unaryoperator));
+        builder.addFixer(BlockRenameFix.create(schema98, "Rename bee_hive block to beehive", unaryoperator));
+        Schema schema99 = builder.addSchema(2211, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructureReferenceCountFix(schema99, false));
+        Schema schema100 = builder.addSchema(2218, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ForcePoiRebuild(schema100, false));
+        Schema schema101 = builder.addSchema(2501, V2501::new);
+
+        builder.addFixer(new FurnaceRecipeFix(schema101, true));
+        Schema schema102 = builder.addSchema(2502, V2502::new);
+
+        builder.addFixer(new AddNewChoices(schema102, "Added Hoglin", References.ENTITY));
+        Schema schema103 = builder.addSchema(2503, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WallPropertyFix(schema103, false));
+        builder.addFixer(new AdvancementsRenameFix(schema103, false, "Composter category change", DataFixers.createRenamer("minecraft:recipes/misc/composter", "minecraft:recipes/decorations/composter")));
+        Schema schema104 = builder.addSchema(2505, V2505::new);
+
+        builder.addFixer(new AddNewChoices(schema104, "Added Piglin", References.ENTITY));
+        builder.addFixer(new MemoryExpiryDataFix(schema104, "minecraft:villager"));
+        Schema schema105 = builder.addSchema(2508, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema105, "Renamed fungi items to fungus", DataFixers.createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
+        builder.addFixer(BlockRenameFix.create(schema105, "Renamed fungi blocks to fungus", DataFixers.createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
+        Schema schema106 = builder.addSchema(2509, V2509::new);
+
+        builder.addFixer(new EntityZombifiedPiglinRenameFix(schema106));
+        builder.addFixer(ItemRenameFix.create(schema106, "Rename zombie pigman egg item", DataFixers.createRenamer(EntityZombifiedPiglinRenameFix.RENAMED_IDS)));
+        Schema schema107 = builder.addSchema(2511, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityProjectileOwnerFix(schema107));
+        Schema schema108 = builder.addSchema(2514, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityUUIDFix(schema108));
+        builder.addFixer(new BlockEntityUUIDFix(schema108));
+        builder.addFixer(new PlayerUUIDFix(schema108));
+        builder.addFixer(new LevelUUIDFix(schema108));
+        builder.addFixer(new SavedDataUUIDFix(schema108));
+        builder.addFixer(new ItemStackUUIDFix(schema108));
+        Schema schema109 = builder.addSchema(2516, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new GossipUUIDFix(schema109, "minecraft:villager"));
+        builder.addFixer(new GossipUUIDFix(schema109, "minecraft:zombie_villager"));
+        Schema schema110 = builder.addSchema(2518, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new JigsawPropertiesFix(schema110, false));
+        builder.addFixer(new JigsawRotationFix(schema110, false));
+        Schema schema111 = builder.addSchema(2519, V2519::new);
+
+        builder.addFixer(new AddNewChoices(schema111, "Added Strider", References.ENTITY));
+        Schema schema112 = builder.addSchema(2522, V2522::new);
+
+        builder.addFixer(new AddNewChoices(schema112, "Added Zoglin", References.ENTITY));
+        Schema schema113 = builder.addSchema(2523, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AttributesRename(schema113));
+        Schema schema114 = builder.addSchema(2527, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BitStorageAlignFix(schema114));
+        Schema schema115 = builder.addSchema(2528, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema115, "Rename soul fire torch and soul fire lantern", DataFixers.createRenamer(ImmutableMap.of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
+        builder.addFixer(BlockRenameFix.create(schema115, "Rename soul fire torch and soul fire lantern", DataFixers.createRenamer(ImmutableMap.of("minecraft:soul_fire_torch", "minecraft:soul_torch", "minecraft:soul_fire_wall_torch", "minecraft:soul_wall_torch", "minecraft:soul_fire_lantern", "minecraft:soul_lantern"))));
+        Schema schema116 = builder.addSchema(2529, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StriderGravityFix(schema116, false));
+        Schema schema117 = builder.addSchema(2531, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RedstoneWireConnectionsFix(schema117));
+        Schema schema118 = builder.addSchema(2533, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerFollowRangeFix(schema118));
+        Schema schema119 = builder.addSchema(2535, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityShulkerRotationFix(schema119));
+        Schema schema120 = builder.addSchema(2550, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsFix(schema120));
+        Schema schema121 = builder.addSchema(2551, V2551::new);
+
+        builder.addFixer(new WriteAndReadFix(schema121, "add types to WorldGenData", References.WORLD_GEN_SETTINGS));
+        Schema schema122 = builder.addSchema(2552, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RenameBiomesFix(schema122, false, "Nether biome rename", ImmutableMap.of("minecraft:nether", "minecraft:nether_wastes")));
+        Schema schema123 = builder.addSchema(2553, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BiomeFix(schema123, false));
+        Schema schema124 = builder.addSchema(2558, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MissingDimensionFix(schema124, false));
+        builder.addFixer(new OptionsRenameFieldFix(schema124, false, "Rename swapHands setting", "key_key.swapHands", "key_key.swapOffhand"));
+        Schema schema125 = builder.addSchema(2568, V2568::new);
+
+        builder.addFixer(new AddNewChoices(schema125, "Added Piglin Brute", References.ENTITY));
+        Schema schema126 = builder.addSchema(2571, V2571::new);
+
+        builder.addFixer(new AddNewChoices(schema126, "Added Goat", References.ENTITY));
+        Schema schema127 = builder.addSchema(2679, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new CauldronRenameFix(schema127, false));
+        Schema schema128 = builder.addSchema(2680, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema128, "Renamed grass path item to dirt path", DataFixers.createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
+        builder.addFixer(BlockRenameFixWithJigsaw.create(schema128, "Renamed grass path block to dirt path", DataFixers.createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
+        Schema schema129 = builder.addSchema(2684, V2684::new);
+
+        builder.addFixer(new AddNewChoices(schema129, "Added Sculk Sensor", References.BLOCK_ENTITY));
+        Schema schema130 = builder.addSchema(2686, V2686::new);
+
+        builder.addFixer(new AddNewChoices(schema130, "Added Axolotl", References.ENTITY));
+        Schema schema131 = builder.addSchema(2688, V2688::new);
+
+        builder.addFixer(new AddNewChoices(schema131, "Added Glow Squid", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema131, "Added Glow Item Frame", References.ENTITY));
+        Schema schema132 = builder.addSchema(2690, DataFixers.SAME_NAMESPACED);
+        // CraftBukkit - decompile error
+        ImmutableMap<String, String> immutablemap = ImmutableMap.<String, String>builder().put("minecraft:weathered_copper_block", "minecraft:oxidized_copper_block").put("minecraft:semi_weathered_copper_block", "minecraft:weathered_copper_block").put("minecraft:lightly_weathered_copper_block", "minecraft:exposed_copper_block").put("minecraft:weathered_cut_copper", "minecraft:oxidized_cut_copper").put("minecraft:semi_weathered_cut_copper", "minecraft:weathered_cut_copper").put("minecraft:lightly_weathered_cut_copper", "minecraft:exposed_cut_copper").put("minecraft:weathered_cut_copper_stairs", "minecraft:oxidized_cut_copper_stairs").put("minecraft:semi_weathered_cut_copper_stairs", "minecraft:weathered_cut_copper_stairs").put("minecraft:lightly_weathered_cut_copper_stairs", "minecraft:exposed_cut_copper_stairs").put("minecraft:weathered_cut_copper_slab", "minecraft:oxidized_cut_copper_slab").put("minecraft:semi_weathered_cut_copper_slab", "minecraft:weathered_cut_copper_slab").put("minecraft:lightly_weathered_cut_copper_slab", "minecraft:exposed_cut_copper_slab").put("minecraft:waxed_semi_weathered_copper", "minecraft:waxed_weathered_copper").put("minecraft:waxed_lightly_weathered_copper", "minecraft:waxed_exposed_copper").put("minecraft:waxed_semi_weathered_cut_copper", "minecraft:waxed_weathered_cut_copper").put("minecraft:waxed_lightly_weathered_cut_copper", "minecraft:waxed_exposed_cut_copper").put("minecraft:waxed_semi_weathered_cut_copper_stairs", "minecraft:waxed_weathered_cut_copper_stairs").put("minecraft:waxed_lightly_weathered_cut_copper_stairs", "minecraft:waxed_exposed_cut_copper_stairs").put("minecraft:waxed_semi_weathered_cut_copper_slab", "minecraft:waxed_weathered_cut_copper_slab").put("minecraft:waxed_lightly_weathered_cut_copper_slab", "minecraft:waxed_exposed_cut_copper_slab").build();
+
+        builder.addFixer(ItemRenameFix.create(schema132, "Renamed copper block items to new oxidized terms", DataFixers.createRenamer(immutablemap)));
+        builder.addFixer(BlockRenameFixWithJigsaw.create(schema132, "Renamed copper blocks to new oxidized terms", DataFixers.createRenamer(immutablemap)));
+        Schema schema133 = builder.addSchema(2691, DataFixers.SAME_NAMESPACED);
+        // CraftBukkit - decompile error
+        ImmutableMap<String, String> immutablemap1 = ImmutableMap.<String, String>builder().put("minecraft:waxed_copper", "minecraft:waxed_copper_block").put("minecraft:oxidized_copper_block", "minecraft:oxidized_copper").put("minecraft:weathered_copper_block", "minecraft:weathered_copper").put("minecraft:exposed_copper_block", "minecraft:exposed_copper").build();
+
+        builder.addFixer(ItemRenameFix.create(schema133, "Rename copper item suffixes", DataFixers.createRenamer(immutablemap1)));
+        builder.addFixer(BlockRenameFixWithJigsaw.create(schema133, "Rename copper blocks suffixes", DataFixers.createRenamer(immutablemap1)));
+        Schema schema134 = builder.addSchema(2693, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AddFlagIfNotPresentFix(schema134, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
+        Schema schema135 = builder.addSchema(2696, DataFixers.SAME_NAMESPACED);
+        // CraftBukkit - decompile error
+        ImmutableMap<String, String> immutablemap2 = ImmutableMap.<String, String>builder().put("minecraft:grimstone", "minecraft:deepslate").put("minecraft:grimstone_slab", "minecraft:cobbled_deepslate_slab").put("minecraft:grimstone_stairs", "minecraft:cobbled_deepslate_stairs").put("minecraft:grimstone_wall", "minecraft:cobbled_deepslate_wall").put("minecraft:polished_grimstone", "minecraft:polished_deepslate").put("minecraft:polished_grimstone_slab", "minecraft:polished_deepslate_slab").put("minecraft:polished_grimstone_stairs", "minecraft:polished_deepslate_stairs").put("minecraft:polished_grimstone_wall", "minecraft:polished_deepslate_wall").put("minecraft:grimstone_tiles", "minecraft:deepslate_tiles").put("minecraft:grimstone_tile_slab", "minecraft:deepslate_tile_slab").put("minecraft:grimstone_tile_stairs", "minecraft:deepslate_tile_stairs").put("minecraft:grimstone_tile_wall", "minecraft:deepslate_tile_wall").put("minecraft:grimstone_bricks", "minecraft:deepslate_bricks").put("minecraft:grimstone_brick_slab", "minecraft:deepslate_brick_slab").put("minecraft:grimstone_brick_stairs", "minecraft:deepslate_brick_stairs").put("minecraft:grimstone_brick_wall", "minecraft:deepslate_brick_wall").put("minecraft:chiseled_grimstone", "minecraft:chiseled_deepslate").build();
+
+        builder.addFixer(ItemRenameFix.create(schema135, "Renamed grimstone block items to deepslate", DataFixers.createRenamer(immutablemap2)));
+        builder.addFixer(BlockRenameFixWithJigsaw.create(schema135, "Renamed grimstone blocks to deepslate", DataFixers.createRenamer(immutablemap2)));
+        Schema schema136 = builder.addSchema(2700, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFixWithJigsaw.create(schema136, "Renamed cave vines blocks", DataFixers.createRenamer(ImmutableMap.of("minecraft:cave_vines_head", "minecraft:cave_vines", "minecraft:cave_vines_body", "minecraft:cave_vines_plant"))));
+        Schema schema137 = builder.addSchema(2701, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new SavedDataFeaturePoolElementFix(schema137));
+        Schema schema138 = builder.addSchema(2702, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AbstractArrowPickupFix(schema138));
+        Schema schema139 = builder.addSchema(2704, V2704::new);
+
+        builder.addFixer(new AddNewChoices(schema139, "Added Goat", References.ENTITY));
+        Schema schema140 = builder.addSchema(2707, V2707::new);
+
+        builder.addFixer(new AddNewChoices(schema140, "Added Marker", References.ENTITY));
+        builder.addFixer(new AddFlagIfNotPresentFix(schema140, References.WORLD_GEN_SETTINGS, "has_increased_height_already", true));
+        Schema schema141 = builder.addSchema(2710, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StatsRenameFix(schema141, "Renamed play_one_minute stat to play_time", ImmutableMap.of("minecraft:play_one_minute", "minecraft:play_time")));
+        Schema schema142 = builder.addSchema(2717, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema142, "Rename azalea_leaves_flowers", DataFixers.createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
+        builder.addFixer(BlockRenameFix.create(schema142, "Rename azalea_leaves_flowers items", DataFixers.createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
+        Schema schema143 = builder.addSchema(2825, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AddFlagIfNotPresentFix(schema143, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
+        Schema schema144 = builder.addSchema(2831, V2831::new);
+
+        builder.addFixer(new SpawnerDataFix(schema144));
+        Schema schema145 = builder.addSchema(2832, V2832::new);
+
+        builder.addFixer(new WorldGenSettingsHeightAndBiomeFix(schema145));
+        builder.addFixer(new ChunkHeightAndBiomeFix(schema145));
+        Schema schema146 = builder.addSchema(2833, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema146));
+        Schema schema147 = builder.addSchema(2838, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RenameBiomesFix(schema147, false, "Caves and Cliffs biome renames", CavesAndCliffsRenames.RENAMES));
+        Schema schema148 = builder.addSchema(2841, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkProtoTickListFix(schema148));
+        Schema schema149 = builder.addSchema(2842, V2842::new);
+
+        builder.addFixer(new ChunkRenamesFix(schema149));
+        Schema schema150 = builder.addSchema(2843, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OverreachingTickFix(schema150));
+        builder.addFixer(new RenameBiomesFix(schema150, false, "Remove Deep Warm Ocean", Map.of("minecraft:deep_warm_ocean", "minecraft:warm_ocean")));
+        Schema schema151 = builder.addSchema(2846, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AdvancementsRenameFix(schema151, false, "Rename some C&C part 2 advancements", DataFixers.createRenamer(ImmutableMap.of("minecraft:husbandry/play_jukebox_in_meadows", "minecraft:adventure/play_jukebox_in_meadows", "minecraft:adventure/caves_and_cliff", "minecraft:adventure/fall_from_world_height", "minecraft:adventure/ride_strider_in_overworld_lava", "minecraft:nether/ride_strider_in_overworld_lava"))));
+        Schema schema152 = builder.addSchema(2852, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema152));
+        Schema schema153 = builder.addSchema(2967, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructureSettingsFlattenFix(schema153));
+        Schema schema154 = builder.addSchema(2970, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructuresBecomeConfiguredFix(schema154));
+        Schema schema155 = builder.addSchema(3076, V3076::new);
+
+        builder.addFixer(new AddNewChoices(schema155, "Added Sculk Catalyst", References.BLOCK_ENTITY));
+        Schema schema156 = builder.addSchema(3077, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkDeleteIgnoredLightDataFix(schema156));
+        Schema schema157 = builder.addSchema(3078, V3078::new);
+
+        builder.addFixer(new AddNewChoices(schema157, "Added Frog", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema157, "Added Tadpole", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema157, "Added Sculk Shrieker", References.BLOCK_ENTITY));
+        Schema schema158 = builder.addSchema(3081, V3081::new);
+
+        builder.addFixer(new AddNewChoices(schema158, "Added Warden", References.ENTITY));
+        Schema schema159 = builder.addSchema(3082, V3082::new);
+
+        builder.addFixer(new AddNewChoices(schema159, "Added Chest Boat", References.ENTITY));
+        Schema schema160 = builder.addSchema(3083, V3083::new);
+
+        builder.addFixer(new AddNewChoices(schema160, "Added Allay", References.ENTITY));
+        Schema schema161 = builder.addSchema(3084, DataFixers.SAME_NAMESPACED);
+
+        // CraftBukkit - decompile error
+        builder.addFixer(new SimpleRenameFix(schema161, References.GAME_EVENT_NAME, 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").put("minecraft:block_unswitch", "minecraft:block_deactivate").put("minecraft:drinking_finish", "minecraft:drink").put("minecraft:elytra_free_fall", "minecraft:elytra_glide").put("minecraft:entity_damaged", "minecraft:entity_damage").put("minecraft:entity_dying", "minecraft:entity_die").put("minecraft:entity_killed", "minecraft:entity_die").put("minecraft:mob_interact", "minecraft:entity_interact").put("minecraft:ravager_roar", "minecraft:entity_roar").put("minecraft:ring_bell", "minecraft:block_change").put("minecraft:shulker_close", "minecraft:container_close").put("minecraft:shulker_open", "minecraft:container_open").put("minecraft:wolf_shaking", "minecraft:entity_shake").build()));
+        Schema schema162 = builder.addSchema(3086, DataFixers.SAME_NAMESPACED);
+        TypeReference typereference = References.ENTITY;
+        Int2ObjectOpenHashMap<String> int2objectopenhashmap = (Int2ObjectOpenHashMap) Util.make(new Int2ObjectOpenHashMap(), (int2objectopenhashmap1) -> { // CraftBukkit - decompile error
+            int2objectopenhashmap1.defaultReturnValue("minecraft:tabby");
+            int2objectopenhashmap1.put(0, "minecraft:tabby");
+            int2objectopenhashmap1.put(1, "minecraft:black");
+            int2objectopenhashmap1.put(2, "minecraft:red");
+            int2objectopenhashmap1.put(3, "minecraft:siamese");
+            int2objectopenhashmap1.put(4, "minecraft:british");
+            int2objectopenhashmap1.put(5, "minecraft:calico");
+            int2objectopenhashmap1.put(6, "minecraft:persian");
+            int2objectopenhashmap1.put(7, "minecraft:ragdoll");
+            int2objectopenhashmap1.put(8, "minecraft:white");
+            int2objectopenhashmap1.put(9, "minecraft:jellie");
+            int2objectopenhashmap1.put(10, "minecraft:all_black");
+        });
+
+        Objects.requireNonNull(int2objectopenhashmap);
+        builder.addFixer(new EntityVariantFix(schema162, "Change cat variant type", typereference, "minecraft:cat", "CatType", int2objectopenhashmap::get));
+        // CraftBukkit - decompile error
+        ImmutableMap<String, String> immutablemap3 = 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").put("textures/entity/cat/siamese.png", "minecraft:siamese").put("textures/entity/cat/british_shorthair.png", "minecraft:british").put("textures/entity/cat/calico.png", "minecraft:calico").put("textures/entity/cat/persian.png", "minecraft:persian").put("textures/entity/cat/ragdoll.png", "minecraft:ragdoll").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();
+
+        builder.addFixer(new CriteriaRenameFix(schema162, "Migrate cat variant advancement", "minecraft:husbandry/complete_catalogue", (s) -> {
+            return (String) immutablemap3.getOrDefault(s, s);
         }));
-        Schema schema164 = builder.addSchema(3087, SAME_NAMESPACED);
-        builder.addFixer(new EntityVariantFix(schema164, "Change frog variant type", References.ENTITY, "minecraft:frog", "Variant", Util.make(new Int2ObjectOpenHashMap(), (frogVariants) -> {
-            frogVariants.put(0, "minecraft:temperate");
-            frogVariants.put(1, "minecraft:warm");
-            frogVariants.put(2, "minecraft:cold");
-        })::get));
-        Schema schema165 = builder.addSchema(3088, SAME_NAMESPACED);
-        builder.addFixer(new BlendingDataFix(schema165));
-        Schema schema166 = builder.addSchema(3090, SAME_NAMESPACED);
-        builder.addFixer(new EntityPaintingFieldsRenameFix(schema166));
-        Schema schema167 = builder.addSchema(3093, SAME_NAMESPACED);
-        builder.addFixer(new EntityGoatMissingStateFix(schema167));
-        Schema schema168 = builder.addSchema(3094, SAME_NAMESPACED);
-        builder.addFixer(new GoatHornIdFix(schema168));
-        Schema schema169 = builder.addSchema(3097, SAME_NAMESPACED);
-        builder.addFixer(new FilteredBooksFix(schema169));
-        builder.addFixer(new FilteredSignsFix(schema169));
+        Schema schema163 = builder.addSchema(3087, DataFixers.SAME_NAMESPACED);
+
+        typereference = References.ENTITY;
+        int2objectopenhashmap = (Int2ObjectOpenHashMap) Util.make(new Int2ObjectOpenHashMap(), (int2objectopenhashmap1) -> {
+            int2objectopenhashmap1.put(0, "minecraft:temperate");
+            int2objectopenhashmap1.put(1, "minecraft:warm");
+            int2objectopenhashmap1.put(2, "minecraft:cold");
+        });
+        Objects.requireNonNull(int2objectopenhashmap);
+        builder.addFixer(new EntityVariantFix(schema163, "Change frog variant type", typereference, "minecraft:frog", "Variant", int2objectopenhashmap::get));
+        Schema schema164 = builder.addSchema(3088, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlendingDataFix(schema164));
+        Schema schema165 = builder.addSchema(3090, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityPaintingFieldsRenameFix(schema165));
+        Schema schema166 = builder.addSchema(3093, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityGoatMissingStateFix(schema166));
+        Schema schema167 = builder.addSchema(3094, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new GoatHornIdFix(schema167));
+        Schema schema168 = builder.addSchema(3097, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new FilteredBooksFix(schema168));
+        builder.addFixer(new FilteredSignsFix(schema168));
         Map<String, String> map = Map.of("minecraft:british", "minecraft:british_shorthair");
-        builder.addFixer(new VariantRenameFix(schema169, "Rename british shorthair", References.ENTITY, "minecraft:cat", map));
-        builder.addFixer(new CriteriaRenameFix(schema169, "Migrate cat variant advancement for british shorthair", "minecraft:husbandry/complete_catalogue", (string) -> {
-            return map.getOrDefault(string, string);
+
+        builder.addFixer(new VariantRenameFix(schema168, "Rename british shorthair", References.ENTITY, "minecraft:cat", map));
+        builder.addFixer(new CriteriaRenameFix(schema168, "Migrate cat variant advancement for british shorthair", "minecraft:husbandry/complete_catalogue", (s) -> {
+            return (String) map.getOrDefault(s, s);
         }));
-        builder.addFixer(new PoiTypeRemoveFix(schema169, "Remove unpopulated villager PoI types", Set.of("minecraft:unemployed", "minecraft:nitwit")::contains));
-        Schema schema170 = builder.addSchema(3108, SAME_NAMESPACED);
-        builder.addFixer(new BlendingDataRemoveFromNetherEndFix(schema170));
-        Schema schema171 = builder.addSchema(3201, SAME_NAMESPACED);
-        builder.addFixer(new OptionsProgrammerArtFix(schema171));
-        Schema schema172 = builder.addSchema(3202, V3202::new);
-        builder.addFixer(new AddNewChoices(schema172, "Added Hanging Sign", References.BLOCK_ENTITY));
-        Schema schema173 = builder.addSchema(3203, V3203::new);
-        builder.addFixer(new AddNewChoices(schema173, "Added Camel", References.ENTITY));
-        Schema schema174 = builder.addSchema(3204, V3204::new);
-        builder.addFixer(new AddNewChoices(schema174, "Added Chiseled Bookshelf", References.BLOCK_ENTITY));
-        Schema schema175 = builder.addSchema(3209, SAME_NAMESPACED);
-        builder.addFixer(new ItemStackSpawnEggFix(schema175, false, "minecraft:pig_spawn_egg"));
-        Schema schema176 = builder.addSchema(3214, SAME_NAMESPACED);
-        builder.addFixer(new OptionsAmbientOcclusionFix(schema176));
+        Set set = Set.of("minecraft:unemployed", "minecraft:nitwit");
+
+        Objects.requireNonNull(set);
+        builder.addFixer(new PoiTypeRemoveFix(schema168, "Remove unpopulated villager PoI types", set::contains));
+        Schema schema169 = builder.addSchema(3108, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlendingDataRemoveFromNetherEndFix(schema169));
+        Schema schema170 = builder.addSchema(3201, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsProgrammerArtFix(schema170));
+        Schema schema171 = builder.addSchema(3202, V3202::new);
+
+        builder.addFixer(new AddNewChoices(schema171, "Added Hanging Sign", References.BLOCK_ENTITY));
+        Schema schema172 = builder.addSchema(3203, V3203::new);
+
+        builder.addFixer(new AddNewChoices(schema172, "Added Camel", References.ENTITY));
+        Schema schema173 = builder.addSchema(3204, V3204::new);
+
+        builder.addFixer(new AddNewChoices(schema173, "Added Chiseled Bookshelf", References.BLOCK_ENTITY));
+        Schema schema174 = builder.addSchema(3209, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemStackSpawnEggFix(schema174, false, "minecraft:pig_spawn_egg"));
+        Schema schema175 = builder.addSchema(3214, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsAmbientOcclusionFix(schema175));
     }
 
     private static UnaryOperator<String> createRenamer(Map<String, String> replacements) {
-        return (string) -> {
-            return replacements.getOrDefault(string, string);
+        return (s) -> {
+            return (String) replacements.getOrDefault(s, s);
         };
     }
 
     private static UnaryOperator<String> createRenamer(String old, String current) {
-        return (string) -> {
-            return Objects.equals(string, old) ? current : string;
+        return (s2) -> {
+            return Objects.equals(s2, old) ? current : s2;
         };
     }
 }
