--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -3,18 +3,18 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 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;
-import com.mojang.datafixers.DSL.TypeReference;
 import com.mojang.datafixers.DataFixerBuilder.Result;
+import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -23,205 +23,7 @@
 import java.util.stream.Stream;
 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.AreaEffectCloudPotionFix;
-import net.minecraft.util.datafix.fixes.AttributeModifierIdFix;
-import net.minecraft.util.datafix.fixes.AttributesRename;
-import net.minecraft.util.datafix.fixes.BannerEntityCustomNameToOverrideComponentFix;
-import net.minecraft.util.datafix.fixes.BannerPatternFormatFix;
-import net.minecraft.util.datafix.fixes.BedItemColorFix;
-import net.minecraft.util.datafix.fixes.BeehiveFieldRenameFix;
-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.BlockEntityRenameFix;
-import net.minecraft.util.datafix.fixes.BlockEntityShulkerBoxColorFix;
-import net.minecraft.util.datafix.fixes.BlockEntitySignDoubleSidedEditableTextFix;
-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.BlockPosFormatAndRenamesFix;
-import net.minecraft.util.datafix.fixes.BlockRenameFix;
-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.ChestedHorsesInventoryZeroIndexingFix;
-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.ChunkDeleteLightFix;
-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.DecoratedPotFieldRenameFix;
-import net.minecraft.util.datafix.fixes.DropInvalidSignDataFix;
-import net.minecraft.util.datafix.fixes.DyeItemRenameFix;
-import net.minecraft.util.datafix.fixes.EffectDurationFix;
-import net.minecraft.util.datafix.fixes.EmptyItemInHotbarFix;
-import net.minecraft.util.datafix.fixes.EmptyItemInVillagerTradeFix;
-import net.minecraft.util.datafix.fixes.EntityArmorStandSilentFix;
-import net.minecraft.util.datafix.fixes.EntityBlockStateFix;
-import net.minecraft.util.datafix.fixes.EntityBrushableBlockFieldsRenameFix;
-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.FeatureFlagRemoveFix;
-import net.minecraft.util.datafix.fixes.FilteredBooksFix;
-import net.minecraft.util.datafix.fixes.FilteredSignsFix;
-import net.minecraft.util.datafix.fixes.FixProjectileStoredItem;
-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.HorseBodyArmorItemFix;
-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.ItemStackComponentizationFix;
-import net.minecraft.util.datafix.fixes.ItemStackCustomNameToOverrideComponentFix;
-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.JukeboxTicksSinceSongStartedFix;
-import net.minecraft.util.datafix.fixes.LeavesFix;
-import net.minecraft.util.datafix.fixes.LegacyDragonFightFix;
-import net.minecraft.util.datafix.fixes.LevelDataGeneratorOptionsFix;
-import net.minecraft.util.datafix.fixes.LevelFlatGeneratorInfoFix;
-import net.minecraft.util.datafix.fixes.LevelLegacyWorldGenSettingsFix;
-import net.minecraft.util.datafix.fixes.LevelUUIDFix;
-import net.minecraft.util.datafix.fixes.LodestoneCompassComponentFix;
-import net.minecraft.util.datafix.fixes.MapBannerBlockPosFormatFix;
-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.MobEffectIdFix;
-import net.minecraft.util.datafix.fixes.MobSpawnerEntityIdentifiersFix;
-import net.minecraft.util.datafix.fixes.NamedEntityFix;
-import net.minecraft.util.datafix.fixes.NamespacedTypeRenameFix;
-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.OptionsAccessibilityOnboardFix;
-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.OptionsMenuBlurrinessFix;
-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.ParticleUnflatteningFix;
-import net.minecraft.util.datafix.fixes.PlayerHeadBlockProfileFix;
-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.PrimedTntBlockStateFixer;
-import net.minecraft.util.datafix.fixes.ProjectileStoredWeaponFix;
-import net.minecraft.util.datafix.fixes.RandomSequenceSettingsFix;
-import net.minecraft.util.datafix.fixes.RecipesFix;
-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.RemapChunkStatusFix;
-import net.minecraft.util.datafix.fixes.RemoveEmptyItemInBrushableBlockFix;
-import net.minecraft.util.datafix.fixes.RemoveGolemGossipFix;
-import net.minecraft.util.datafix.fixes.RenameEnchantmentsFix;
-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.ScoreboardDisplaySlotFix;
-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.TippedArrowPotionToItemFix;
-import net.minecraft.util.datafix.fixes.TrappedChestBlockEntityFix;
-import net.minecraft.util.datafix.fixes.TrialSpawnerConfigFix;
-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;
@@ -313,1053 +115,897 @@
 import net.minecraft.util.datafix.schemas.V99;
 
 public class DataFixers {
+
     private static final BiFunction<Integer, Schema, Schema> SAME = Schema::new;
     private static final BiFunction<Integer, Schema, Schema> SAME_NAMESPACED = NamespacedSchema::new;
-    private static final Result DATA_FIXER = createFixerUpper();
+    private static final Result DATA_FIXER = DataFixers.createFixerUpper();
     public static final int BLENDING_VERSION = 3441;
 
-    private DataFixers() {
-    }
+    private DataFixers() {}
 
     public static DataFixer getDataFixer() {
-        return DATA_FIXER.fixer();
+        return DataFixers.DATA_FIXER.fixer();
     }
 
     private static Result createFixerUpper() {
-        DataFixerBuilder dataFixerBuilder = new DataFixerBuilder(SharedConstants.getCurrentVersion().getDataVersion().getVersion());
-        addFixers(dataFixerBuilder);
-        return dataFixerBuilder.build();
+        DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getCurrentVersion().getDataVersion().getVersion());
+
+        DataFixers.addFixers(datafixerbuilder);
+        return datafixerbuilder.build();
     }
 
     public static CompletableFuture<?> optimize(Set<TypeReference> requiredTypes) {
         if (requiredTypes.isEmpty()) {
-            return CompletableFuture.completedFuture(null);
+            return CompletableFuture.completedFuture((Object) null);
         } else {
-            Executor executor = Executors.newSingleThreadExecutor(
-                new ThreadFactoryBuilder().setNameFormat("Datafixer Bootstrap").setDaemon(true).setPriority(1).build()
-            );
-            return DATA_FIXER.optimize(requiredTypes, executor);
+            ExecutorService executorservice = Executors.newSingleThreadExecutor((new ThreadFactoryBuilder()).setNameFormat("Datafixer Bootstrap").setDaemon(true).setPriority(1).build());
+
+            return DataFixers.DATA_FIXER.optimize(requiredTypes, executorservice);
         }
     }
 
     private static void addFixers(DataFixerBuilder builder) {
         builder.addSchema(99, V99::new);
         Schema schema = builder.addSchema(100, V100::new);
+
         builder.addFixer(new EntityEquipmentToArmorAndHandFix(schema, true));
-        Schema schema2 = builder.addSchema(101, 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, 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));
-        Schema schema7 = builder.addSchema(108, SAME);
-        builder.addFixer(new EntityStringUuidFix(schema7, true));
-        Schema schema8 = builder.addSchema(109, SAME);
-        builder.addFixer(new EntityHealthFix(schema8, true));
-        Schema schema9 = builder.addSchema(110, SAME);
-        builder.addFixer(new EntityHorseSaddleFix(schema9, true));
-        Schema schema10 = builder.addSchema(111, SAME);
-        builder.addFixer(new EntityPaintingItemFrameDirectionFix(schema10, true));
-        Schema schema11 = builder.addSchema(113, 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, SAME);
-        builder.addFixer(new EntityArmorStandSilentFix(schema14, true));
-        Schema schema15 = builder.addSchema(165, 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, SAME);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema17,
-                "cooked_fished item renamer",
-                id -> Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:cooked_fished") ? "minecraft:cooked_fish" : id
-            )
-        );
-        builder.addFixer(new EntityZombieVillagerTypeFix(schema17, false));
-        Schema schema18 = builder.addSchema(505, 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));
-        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, SAME_NAMESPACED);
-        builder.addFixer(new ItemBannerColorFix(schema25, true));
-        Schema schema26 = builder.addSchema(806, 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, SAME_NAMESPACED);
-        builder.addFixer(new EntityShulkerColorFix(schema28, false));
-        Schema schema29 = builder.addSchema(813, SAME_NAMESPACED);
-        builder.addFixer(new ItemShulkerBoxColorFix(schema29, false));
-        builder.addFixer(new BlockEntityShulkerBoxColorFix(schema29, false));
-        Schema schema30 = builder.addSchema(816, SAME_NAMESPACED);
-        builder.addFixer(new OptionsLowerCaseLanguageFix(schema30, false));
-        Schema schema31 = builder.addSchema(820, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema31, "totem item renamer", 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, SAME_NAMESPACED);
-        builder.addFixer(new OptionsKeyLwjgl3Fix(schema34, false));
-        Schema schema35 = builder.addSchema(1446, SAME_NAMESPACED);
-        builder.addFixer(new OptionsKeyTranslationFix(schema35, false));
-        Schema schema36 = builder.addSchema(1450, 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 BlockEntityJukeboxFix(schema43, false));
-        Schema schema44 = builder.addSchema(1451, 7, SAME_NAMESPACED);
-        builder.addFixer(new VillagerTradeFix(schema44));
-        Schema schema45 = builder.addSchema(1456, SAME_NAMESPACED);
-        builder.addFixer(new EntityItemFrameDirectionFix(schema45, false));
-        Schema schema46 = builder.addSchema(1458, SAME_NAMESPACED);
-        builder.addFixer(new EntityCustomNameToComponentFix(schema46, false));
-        builder.addFixer(new ItemCustomNameToComponentFix(schema46, false));
-        builder.addFixer(new BlockEntityCustomNameToComponentFix(schema46, false));
-        Schema schema47 = builder.addSchema(1460, V1460::new);
-        builder.addFixer(new EntityPaintingMotiveFix(schema47, false));
-        Schema schema48 = builder.addSchema(1466, V1466::new);
-        builder.addFixer(new AddNewChoices(schema48, "Add DUMMY block entity", References.BLOCK_ENTITY));
-        builder.addFixer(new ChunkToProtochunkFix(schema48, true));
-        Schema schema49 = builder.addSchema(1470, V1470::new);
-        builder.addFixer(new AddNewChoices(schema49, "Add 1.13 entities fix", References.ENTITY));
-        Schema schema50 = builder.addSchema(1474, SAME_NAMESPACED);
-        builder.addFixer(new ColorlessShulkerEntityFix(schema50, false));
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema50,
-                "Colorless shulker block fixer",
-                id -> Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : id
-            )
-        );
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema50,
-                "Colorless shulker item fixer",
-                id -> Objects.equals(NamespacedSchema.ensureNamespaced(id), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : id
-            )
-        );
-        Schema schema51 = builder.addSchema(1475, SAME_NAMESPACED);
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema51,
-                "Flowing fixer",
-                createRenamer(ImmutableMap.of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava"))
-            )
-        );
-        Schema schema52 = builder.addSchema(1480, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema52, "Rename coral blocks", createRenamer(RenamedCoralFix.RENAMED_IDS)));
-        builder.addFixer(ItemRenameFix.create(schema52, "Rename coral items", createRenamer(RenamedCoralFix.RENAMED_IDS)));
-        Schema schema53 = builder.addSchema(1481, V1481::new);
-        builder.addFixer(new AddNewChoices(schema53, "Add conduit", References.BLOCK_ENTITY));
-        Schema schema54 = builder.addSchema(1483, V1483::new);
-        builder.addFixer(new EntityPufferfishRenameFix(schema54, true));
-        builder.addFixer(ItemRenameFix.create(schema54, "Rename pufferfish egg item", createRenamer(EntityPufferfishRenameFix.RENAMED_IDS)));
-        Schema schema55 = builder.addSchema(1484, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema55,
-                "Rename seagrass items",
-                createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))
-            )
-        );
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema55,
-                "Rename seagrass blocks",
-                createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))
-            )
-        );
-        builder.addFixer(new HeightmapRenamingFix(schema55, false));
-        Schema schema56 = builder.addSchema(1486, V1486::new);
-        builder.addFixer(new EntityCodSalmonFix(schema56, true));
-        builder.addFixer(ItemRenameFix.create(schema56, "Rename cod/salmon egg items", createRenamer(EntityCodSalmonFix.RENAMED_EGG_IDS)));
-        Schema schema57 = builder.addSchema(1487, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema57,
-                "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(
-                schema57,
-                "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 schema58 = builder.addSchema(1488, SAME_NAMESPACED);
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema58,
-                "Rename kelp/kelptop",
-                createRenamer(ImmutableMap.of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant"))
-            )
-        );
-        builder.addFixer(ItemRenameFix.create(schema58, "Rename kelptop", createRenamer("minecraft:kelp_top", "minecraft:kelp")));
-        builder.addFixer(
-            new NamedEntityFix(schema58, false, "Command block block entity custom name fix", References.BLOCK_ENTITY, "minecraft:command_block") {
-                @Override
-                protected Typed<?> fix(Typed<?> inputTyped) {
-                    return inputTyped.update(DSL.remainderFinder(), EntityCustomNameToComponentFix::fixTagCustomName);
-                }
+        Schema schema1 = builder.addSchema(101, DataFixers.SAME);
+
+        builder.addFixer(new BlockEntitySignTextStrictJsonFix(schema1, false));
+        Schema schema2 = builder.addSchema(102, V102::new);
+
+        builder.addFixer(new ItemIdFix(schema2, true));
+        builder.addFixer(new ItemPotionFix(schema2, false));
+        Schema schema3 = builder.addSchema(105, DataFixers.SAME);
+
+        builder.addFixer(new ItemSpawnEggFix(schema3, true));
+        Schema schema4 = builder.addSchema(106, V106::new);
+
+        builder.addFixer(new MobSpawnerEntityIdentifiersFix(schema4, true));
+        Schema schema5 = builder.addSchema(107, V107::new);
+
+        builder.addFixer(new EntityMinecartIdentifiersFix(schema5));
+        Schema schema6 = builder.addSchema(108, DataFixers.SAME);
+
+        builder.addFixer(new EntityStringUuidFix(schema6, true));
+        Schema schema7 = builder.addSchema(109, DataFixers.SAME);
+
+        builder.addFixer(new EntityHealthFix(schema7, true));
+        Schema schema8 = builder.addSchema(110, DataFixers.SAME);
+
+        builder.addFixer(new EntityHorseSaddleFix(schema8, true));
+        Schema schema9 = builder.addSchema(111, DataFixers.SAME);
+
+        builder.addFixer(new EntityPaintingItemFrameDirectionFix(schema9, true));
+        Schema schema10 = builder.addSchema(113, DataFixers.SAME);
+
+        builder.addFixer(new EntityRedundantChanceTagsFix(schema10, true));
+        Schema schema11 = builder.addSchema(135, V135::new);
+
+        builder.addFixer(new EntityRidingToPassengersFix(schema11, true));
+        Schema schema12 = builder.addSchema(143, V143::new);
+
+        builder.addFixer(new EntityTippedArrowFix(schema12, true));
+        Schema schema13 = builder.addSchema(147, DataFixers.SAME);
+
+        builder.addFixer(new EntityArmorStandSilentFix(schema13, true));
+        Schema schema14 = builder.addSchema(165, DataFixers.SAME);
+
+        builder.addFixer(new ItemWrittenBookPagesStrictJsonFix(schema14, true));
+        Schema schema15 = builder.addSchema(501, V501::new);
+
+        builder.addFixer(new AddNewChoices(schema15, "Add 1.10 entities fix", References.ENTITY));
+        Schema schema16 = builder.addSchema(502, DataFixers.SAME);
+
+        builder.addFixer(ItemRenameFix.create(schema16, "cooked_fished item renamer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:cooked_fished") ? "minecraft:cooked_fish" : s;
+        }));
+        builder.addFixer(new EntityZombieVillagerTypeFix(schema16, false));
+        Schema schema17 = builder.addSchema(505, DataFixers.SAME);
+
+        builder.addFixer(new OptionsForceVBOFix(schema17, false));
+        Schema schema18 = builder.addSchema(700, V700::new);
+
+        builder.addFixer(new EntityElderGuardianSplitFix(schema18, true));
+        Schema schema19 = builder.addSchema(701, V701::new);
+
+        builder.addFixer(new EntitySkeletonSplitFix(schema19, true));
+        Schema schema20 = builder.addSchema(702, V702::new);
+
+        builder.addFixer(new EntityZombieSplitFix(schema20));
+        Schema schema21 = builder.addSchema(703, V703::new);
+
+        builder.addFixer(new EntityHorseSplitFix(schema21, true));
+        Schema schema22 = builder.addSchema(704, V704::new);
+
+        builder.addFixer(new BlockEntityIdFix(schema22, true));
+        Schema schema23 = builder.addSchema(705, V705::new);
+
+        builder.addFixer(new EntityIdFix(schema23, true));
+        Schema schema24 = builder.addSchema(804, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemBannerColorFix(schema24, true));
+        Schema schema25 = builder.addSchema(806, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemWaterPotionFix(schema25, false));
+        Schema schema26 = builder.addSchema(808, V808::new);
+
+        builder.addFixer(new AddNewChoices(schema26, "added shulker box", References.BLOCK_ENTITY));
+        Schema schema27 = builder.addSchema(808, 1, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityShulkerColorFix(schema27, false));
+        Schema schema28 = builder.addSchema(813, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemShulkerBoxColorFix(schema28, false));
+        builder.addFixer(new BlockEntityShulkerBoxColorFix(schema28, false));
+        Schema schema29 = builder.addSchema(816, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsLowerCaseLanguageFix(schema29, false));
+        Schema schema30 = builder.addSchema(820, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema30, "totem item renamer", DataFixers.createRenamer("minecraft:totem", "minecraft:totem_of_undying")));
+        Schema schema31 = builder.addSchema(1022, V1022::new);
+
+        builder.addFixer(new WriteAndReadFix(schema31, "added shoulder entities to players", References.PLAYER));
+        Schema schema32 = builder.addSchema(1125, V1125::new);
+
+        builder.addFixer(new ChunkBedBlockEntityInjecterFix(schema32, true));
+        builder.addFixer(new BedItemColorFix(schema32, false));
+        Schema schema33 = builder.addSchema(1344, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsKeyLwjgl3Fix(schema33, false));
+        Schema schema34 = builder.addSchema(1446, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsKeyTranslationFix(schema34, false));
+        Schema schema35 = builder.addSchema(1450, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockStateStructureTemplateFix(schema35, false));
+        Schema schema36 = builder.addSchema(1451, V1451::new);
+
+        builder.addFixer(new AddNewChoices(schema36, "AddTrappedChestFix", References.BLOCK_ENTITY));
+        Schema schema37 = builder.addSchema(1451, 1, V1451_1::new);
+
+        builder.addFixer(new ChunkPalettedStorageFix(schema37, true));
+        Schema schema38 = builder.addSchema(1451, 2, V1451_2::new);
+
+        builder.addFixer(new BlockEntityBlockStateFix(schema38, true));
+        Schema schema39 = builder.addSchema(1451, 3, V1451_3::new);
+
+        builder.addFixer(new EntityBlockStateFix(schema39, true));
+        builder.addFixer(new ItemStackMapIdFix(schema39, false));
+        Schema schema40 = builder.addSchema(1451, 4, V1451_4::new);
+
+        builder.addFixer(new BlockNameFlatteningFix(schema40, true));
+        builder.addFixer(new ItemStackTheFlatteningFix(schema40, false));
+        Schema schema41 = builder.addSchema(1451, 5, V1451_5::new);
+
+        builder.addFixer(new ItemRemoveBlockEntityTagFix(schema41, 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(schema41, "RemoveNoteBlockFlowerPotFix", References.BLOCK_ENTITY));
+        builder.addFixer(new ItemStackSpawnEggFix(schema41, false, "minecraft:spawn_egg"));
+        builder.addFixer(new EntityWolfColorFix(schema41, false));
+        builder.addFixer(new BlockEntityBannerColorFix(schema41, false));
+        builder.addFixer(new LevelFlatGeneratorInfoFix(schema41, false));
+        Schema schema42 = builder.addSchema(1451, 6, V1451_6::new);
+
+        builder.addFixer(new StatsCounterFix(schema42, true));
+        builder.addFixer(new BlockEntityJukeboxFix(schema42, false));
+        Schema schema43 = builder.addSchema(1451, 7, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerTradeFix(schema43));
+        Schema schema44 = builder.addSchema(1456, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityItemFrameDirectionFix(schema44, false));
+        Schema schema45 = builder.addSchema(1458, DataFixers.SAME_NAMESPACED);
+
+        // CraftBukkit start
+        builder.addFixer(new com.mojang.datafixers.DataFix(schema45, 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);
+                    });
+                });
             }
-        );
-        builder.addFixer(new NamedEntityFix(schema58, false, "Command block minecart custom name fix", References.ENTITY, "minecraft:commandblock_minecart") {
+        });
+        // CraftBukkit end
+        builder.addFixer(new EntityCustomNameToComponentFix(schema45, false));
+        builder.addFixer(new ItemCustomNameToComponentFix(schema45, false));
+        builder.addFixer(new BlockEntityCustomNameToComponentFix(schema45, false));
+        Schema schema46 = builder.addSchema(1460, V1460::new);
+
+        builder.addFixer(new EntityPaintingMotiveFix(schema46, false));
+        Schema schema47 = builder.addSchema(1466, V1466::new);
+
+        builder.addFixer(new AddNewChoices(schema47, "Add DUMMY block entity", References.BLOCK_ENTITY));
+        builder.addFixer(new ChunkToProtochunkFix(schema47, true));
+        Schema schema48 = builder.addSchema(1470, V1470::new);
+
+        builder.addFixer(new AddNewChoices(schema48, "Add 1.13 entities fix", References.ENTITY));
+        Schema schema49 = builder.addSchema(1474, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ColorlessShulkerEntityFix(schema49, false));
+        builder.addFixer(BlockRenameFix.create(schema49, "Colorless shulker block fixer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : s;
+        }));
+        builder.addFixer(ItemRenameFix.create(schema49, "Colorless shulker item fixer", (s) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s), "minecraft:purple_shulker_box") ? "minecraft:shulker_box" : s;
+        }));
+        Schema schema50 = builder.addSchema(1475, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema50, "Flowing fixer", DataFixers.createRenamer(ImmutableMap.of("minecraft:flowing_water", "minecraft:water", "minecraft:flowing_lava", "minecraft:lava"))));
+        Schema schema51 = builder.addSchema(1480, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema51, "Rename coral blocks", DataFixers.createRenamer(RenamedCoralFix.RENAMED_IDS)));
+        builder.addFixer(ItemRenameFix.create(schema51, "Rename coral items", DataFixers.createRenamer(RenamedCoralFix.RENAMED_IDS)));
+        Schema schema52 = builder.addSchema(1481, V1481::new);
+
+        builder.addFixer(new AddNewChoices(schema52, "Add conduit", References.BLOCK_ENTITY));
+        Schema schema53 = builder.addSchema(1483, V1483::new);
+
+        builder.addFixer(new EntityPufferfishRenameFix(schema53, true));
+        builder.addFixer(ItemRenameFix.create(schema53, "Rename pufferfish egg item", DataFixers.createRenamer(EntityPufferfishRenameFix.RENAMED_IDS)));
+        Schema schema54 = builder.addSchema(1484, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema54, "Rename seagrass items", DataFixers.createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
+        builder.addFixer(BlockRenameFix.create(schema54, "Rename seagrass blocks", DataFixers.createRenamer(ImmutableMap.of("minecraft:sea_grass", "minecraft:seagrass", "minecraft:tall_sea_grass", "minecraft:tall_seagrass"))));
+        builder.addFixer(new HeightmapRenamingFix(schema54, false));
+        Schema schema55 = builder.addSchema(1486, V1486::new);
+
+        builder.addFixer(new EntityCodSalmonFix(schema55, true));
+        builder.addFixer(ItemRenameFix.create(schema55, "Rename cod/salmon egg items", DataFixers.createRenamer(EntityCodSalmonFix.RENAMED_EGG_IDS)));
+        Schema schema56 = builder.addSchema(1487, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema56, "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(schema56, "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 schema57 = builder.addSchema(1488, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema57, "Rename kelp/kelptop", DataFixers.createRenamer(ImmutableMap.of("minecraft:kelp_top", "minecraft:kelp", "minecraft:kelp", "minecraft:kelp_plant"))));
+        builder.addFixer(ItemRenameFix.create(schema57, "Rename kelptop", DataFixers.createRenamer("minecraft:kelp_top", "minecraft:kelp")));
+        builder.addFixer(new NamedEntityFix(schema57, false, "Command block block entity custom name fix", References.BLOCK_ENTITY, "minecraft:command_block") {
             @Override
             protected Typed<?> fix(Typed<?> inputTyped) {
                 return inputTyped.update(DSL.remainderFinder(), EntityCustomNameToComponentFix::fixTagCustomName);
             }
         });
-        builder.addFixer(new IglooMetadataRemovalFix(schema58, false));
-        Schema schema59 = builder.addSchema(1490, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema59, "Rename melon_block", createRenamer("minecraft:melon_block", "minecraft:melon")));
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema59,
-                "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 schema60 = builder.addSchema(1492, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStructuresTemplateRenameFix(schema60, false));
-        Schema schema61 = builder.addSchema(1494, SAME_NAMESPACED);
-        builder.addFixer(new ItemStackEnchantmentNamesFix(schema61, false));
-        Schema schema62 = builder.addSchema(1496, SAME_NAMESPACED);
-        builder.addFixer(new LeavesFix(schema62, false));
-        Schema schema63 = builder.addSchema(1500, SAME_NAMESPACED);
-        builder.addFixer(new BlockEntityKeepPacked(schema63, false));
-        Schema schema64 = builder.addSchema(1501, SAME_NAMESPACED);
-        builder.addFixer(new AdvancementsFix(schema64, false));
-        Schema schema65 = builder.addSchema(1502, SAME_NAMESPACED);
-        builder.addFixer(new NamespacedTypeRenameFix(schema65, "Recipes fix", References.RECIPE, createRenamer(RecipesFix.RECIPES)));
-        Schema schema66 = builder.addSchema(1506, SAME_NAMESPACED);
-        builder.addFixer(new LevelDataGeneratorOptionsFix(schema66, false));
-        Schema schema67 = builder.addSchema(1510, V1510::new);
-        builder.addFixer(BlockRenameFix.create(schema67, "Block renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_BLOCKS)));
-        builder.addFixer(ItemRenameFix.create(schema67, "Item renamening fix", createRenamer(EntityTheRenameningFix.RENAMED_ITEMS)));
-        builder.addFixer(new NamespacedTypeRenameFix(schema67, "Recipes renamening fix", References.RECIPE, createRenamer(RecipesRenameningFix.RECIPES)));
-        builder.addFixer(new EntityTheRenameningFix(schema67, true));
-        builder.addFixer(
-            new StatsRenameFix(
-                schema67,
-                "SwimStatsRenameFix",
-                ImmutableMap.of("minecraft:swim_one_cm", "minecraft:walk_on_water_one_cm", "minecraft:dive_one_cm", "minecraft:walk_under_water_one_cm")
-            )
-        );
-        Schema schema68 = builder.addSchema(1514, SAME_NAMESPACED);
-        builder.addFixer(new ObjectiveDisplayNameFix(schema68, false));
-        builder.addFixer(new TeamDisplayNameFix(schema68, false));
-        builder.addFixer(new ObjectiveRenderTypeFix(schema68, false));
-        Schema schema69 = builder.addSchema(1515, SAME_NAMESPACED);
-        builder.addFixer(BlockRenameFix.create(schema69, "Rename coral fan blocks", createRenamer(RenamedCoralFansFix.RENAMED_IDS)));
-        Schema schema70 = builder.addSchema(1624, SAME_NAMESPACED);
-        builder.addFixer(new TrappedChestBlockEntityFix(schema70, false));
-        Schema schema71 = builder.addSchema(1800, V1800::new);
-        builder.addFixer(new AddNewChoices(schema71, "Added 1.14 mobs fix", References.ENTITY));
-        builder.addFixer(ItemRenameFix.create(schema71, "Rename dye items", createRenamer(DyeItemRenameFix.RENAMED_IDS)));
-        Schema schema72 = builder.addSchema(1801, V1801::new);
-        builder.addFixer(new AddNewChoices(schema72, "Added Illager Beast", References.ENTITY));
-        Schema schema73 = builder.addSchema(1802, SAME_NAMESPACED);
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema73,
-                "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(
-                schema73,
-                "Rename sign item & stone slabs",
-                createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign"))
-            )
-        );
-        Schema schema74 = builder.addSchema(1803, SAME_NAMESPACED);
-        builder.addFixer(new ItemLoreFix(schema74, false));
-        Schema schema75 = builder.addSchema(1904, V1904::new);
-        builder.addFixer(new AddNewChoices(schema75, "Added Cats", References.ENTITY));
-        builder.addFixer(new EntityCatSplitFix(schema75, false));
-        Schema schema76 = builder.addSchema(1905, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStatusFix(schema76, false));
-        Schema schema77 = builder.addSchema(1906, V1906::new);
-        builder.addFixer(new AddNewChoices(schema77, "Add POI Blocks", References.BLOCK_ENTITY));
-        Schema schema78 = builder.addSchema(1909, V1909::new);
-        builder.addFixer(new AddNewChoices(schema78, "Add jigsaw", References.BLOCK_ENTITY));
-        Schema schema79 = builder.addSchema(1911, SAME_NAMESPACED);
-        builder.addFixer(new ChunkStatusFix2(schema79, false));
-        Schema schema80 = builder.addSchema(1914, SAME_NAMESPACED);
-        builder.addFixer(new WeaponSmithChestLootTableFix(schema80, false));
-        Schema schema81 = builder.addSchema(1917, SAME_NAMESPACED);
-        builder.addFixer(new CatTypeFix(schema81, false));
-        Schema schema82 = builder.addSchema(1918, SAME_NAMESPACED);
-        builder.addFixer(new VillagerDataFix(schema82, "minecraft:villager"));
-        builder.addFixer(new VillagerDataFix(schema82, "minecraft:zombie_villager"));
-        Schema schema83 = builder.addSchema(1920, V1920::new);
-        builder.addFixer(new NewVillageFix(schema83, false));
-        builder.addFixer(new AddNewChoices(schema83, "Add campfire", References.BLOCK_ENTITY));
-        Schema schema84 = builder.addSchema(1925, SAME_NAMESPACED);
-        builder.addFixer(new MapIdFix(schema84, false));
-        Schema schema85 = builder.addSchema(1928, V1928::new);
-        builder.addFixer(new EntityRavagerRenameFix(schema85, true));
-        builder.addFixer(ItemRenameFix.create(schema85, "Rename ravager egg item", createRenamer(EntityRavagerRenameFix.RENAMED_IDS)));
-        Schema schema86 = builder.addSchema(1929, V1929::new);
-        builder.addFixer(new AddNewChoices(schema86, "Add Wandering Trader and Trader Llama", References.ENTITY));
-        Schema schema87 = builder.addSchema(1931, V1931::new);
-        builder.addFixer(new AddNewChoices(schema87, "Added Fox", References.ENTITY));
-        Schema schema88 = builder.addSchema(1936, SAME_NAMESPACED);
-        builder.addFixer(new OptionsAddTextBackgroundFix(schema88, false));
-        Schema schema89 = builder.addSchema(1946, SAME_NAMESPACED);
-        builder.addFixer(new ReorganizePoi(schema89, false));
-        Schema schema90 = builder.addSchema(1948, SAME_NAMESPACED);
-        builder.addFixer(new OminousBannerRenameFix(schema90));
-        Schema schema91 = builder.addSchema(1953, SAME_NAMESPACED);
-        builder.addFixer(new OminousBannerBlockEntityRenameFix(schema91, false));
-        Schema schema92 = builder.addSchema(1955, SAME_NAMESPACED);
-        builder.addFixer(new VillagerRebuildLevelAndXpFix(schema92, false));
-        builder.addFixer(new ZombieVillagerRebuildXpFix(schema92, false));
-        Schema schema93 = builder.addSchema(1961, SAME_NAMESPACED);
-        builder.addFixer(new ChunkLightRemoveFix(schema93, false));
-        Schema schema94 = builder.addSchema(1963, SAME_NAMESPACED);
-        builder.addFixer(new RemoveGolemGossipFix(schema94, false));
-        Schema schema95 = builder.addSchema(2100, V2100::new);
-        builder.addFixer(new AddNewChoices(schema95, "Added Bee and Bee Stinger", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema95, "Add beehive", References.BLOCK_ENTITY));
-        builder.addFixer(
-            new NamespacedTypeRenameFix(schema95, "Rename sugar recipe", References.RECIPE, createRenamer("minecraft:sugar", "minecraft:sugar_from_sugar_cane"))
-        );
-        builder.addFixer(
-            new AdvancementsRenameFix(
-                schema95,
-                false,
-                "Rename sugar recipe advancement",
-                createRenamer("minecraft:recipes/misc/sugar", "minecraft:recipes/misc/sugar_from_sugar_cane")
-            )
-        );
-        Schema schema96 = builder.addSchema(2202, SAME_NAMESPACED);
-        builder.addFixer(new ChunkBiomeFix(schema96, false));
-        Schema schema97 = builder.addSchema(2209, SAME_NAMESPACED);
-        UnaryOperator<String> unaryOperator = createRenamer("minecraft:bee_hive", "minecraft:beehive");
-        builder.addFixer(ItemRenameFix.create(schema97, "Rename bee_hive item to beehive", unaryOperator));
-        builder.addFixer(new PoiTypeRenameFix(schema97, "Rename bee_hive poi to beehive", unaryOperator));
-        builder.addFixer(BlockRenameFix.create(schema97, "Rename bee_hive block to beehive", unaryOperator));
-        Schema schema98 = builder.addSchema(2211, SAME_NAMESPACED);
-        builder.addFixer(new StructureReferenceCountFix(schema98, false));
-        Schema schema99 = builder.addSchema(2218, SAME_NAMESPACED);
-        builder.addFixer(new ForcePoiRebuild(schema99, false));
-        Schema schema100 = builder.addSchema(2501, V2501::new);
-        builder.addFixer(new FurnaceRecipeFix(schema100, true));
-        Schema schema101 = builder.addSchema(2502, V2502::new);
-        builder.addFixer(new AddNewChoices(schema101, "Added Hoglin", References.ENTITY));
-        Schema schema102 = builder.addSchema(2503, SAME_NAMESPACED);
-        builder.addFixer(new WallPropertyFix(schema102, false));
-        builder.addFixer(
-            new AdvancementsRenameFix(
-                schema102, false, "Composter category change", createRenamer("minecraft:recipes/misc/composter", "minecraft:recipes/decorations/composter")
-            )
-        );
-        Schema schema103 = builder.addSchema(2505, V2505::new);
-        builder.addFixer(new AddNewChoices(schema103, "Added Piglin", References.ENTITY));
-        builder.addFixer(new MemoryExpiryDataFix(schema103, "minecraft:villager"));
-        Schema schema104 = builder.addSchema(2508, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema104,
-                "Renamed fungi items to fungus",
-                createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))
-            )
-        );
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema104,
-                "Renamed fungi blocks to fungus",
-                createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))
-            )
-        );
-        Schema schema105 = builder.addSchema(2509, V2509::new);
-        builder.addFixer(new EntityZombifiedPiglinRenameFix(schema105));
-        builder.addFixer(ItemRenameFix.create(schema105, "Rename zombie pigman egg item", createRenamer(EntityZombifiedPiglinRenameFix.RENAMED_IDS)));
-        Schema schema106 = builder.addSchema(2511, SAME_NAMESPACED);
-        builder.addFixer(new EntityProjectileOwnerFix(schema106));
-        Schema schema107 = builder.addSchema(2514, SAME_NAMESPACED);
-        builder.addFixer(new EntityUUIDFix(schema107));
-        builder.addFixer(new BlockEntityUUIDFix(schema107));
-        builder.addFixer(new PlayerUUIDFix(schema107));
-        builder.addFixer(new LevelUUIDFix(schema107));
-        builder.addFixer(new SavedDataUUIDFix(schema107));
-        builder.addFixer(new ItemStackUUIDFix(schema107));
-        Schema schema108 = builder.addSchema(2516, SAME_NAMESPACED);
-        builder.addFixer(new GossipUUIDFix(schema108, "minecraft:villager"));
-        builder.addFixer(new GossipUUIDFix(schema108, "minecraft:zombie_villager"));
-        Schema schema109 = builder.addSchema(2518, SAME_NAMESPACED);
-        builder.addFixer(new JigsawPropertiesFix(schema109, false));
-        builder.addFixer(new JigsawRotationFix(schema109, false));
-        Schema schema110 = builder.addSchema(2519, V2519::new);
-        builder.addFixer(new AddNewChoices(schema110, "Added Strider", References.ENTITY));
-        Schema schema111 = builder.addSchema(2522, V2522::new);
-        builder.addFixer(new AddNewChoices(schema111, "Added Zoglin", References.ENTITY));
-        Schema schema112 = builder.addSchema(2523, SAME_NAMESPACED);
-        builder.addFixer(
-            new AttributesRename(
-                schema112,
-                "Attribute renames",
-                createRenamerNoNamespace(
-                    ImmutableMap.<String, String>builder()
-                        .put("generic.maxHealth", "minecraft:generic.max_health")
-                        .put("Max Health", "minecraft:generic.max_health")
-                        .put("zombie.spawnReinforcements", "minecraft:zombie.spawn_reinforcements")
-                        .put("Spawn Reinforcements Chance", "minecraft:zombie.spawn_reinforcements")
-                        .put("horse.jumpStrength", "minecraft:horse.jump_strength")
-                        .put("Jump Strength", "minecraft:horse.jump_strength")
-                        .put("generic.followRange", "minecraft:generic.follow_range")
-                        .put("Follow Range", "minecraft:generic.follow_range")
-                        .put("generic.knockbackResistance", "minecraft:generic.knockback_resistance")
-                        .put("Knockback Resistance", "minecraft:generic.knockback_resistance")
-                        .put("generic.movementSpeed", "minecraft:generic.movement_speed")
-                        .put("Movement Speed", "minecraft:generic.movement_speed")
-                        .put("generic.flyingSpeed", "minecraft:generic.flying_speed")
-                        .put("Flying Speed", "minecraft:generic.flying_speed")
-                        .put("generic.attackDamage", "minecraft:generic.attack_damage")
-                        .put("generic.attackKnockback", "minecraft:generic.attack_knockback")
-                        .put("generic.attackSpeed", "minecraft:generic.attack_speed")
-                        .put("generic.armorToughness", "minecraft:generic.armor_toughness")
-                        .build()
-                )
-            )
-        );
-        Schema schema113 = builder.addSchema(2527, SAME_NAMESPACED);
-        builder.addFixer(new BitStorageAlignFix(schema113));
-        Schema schema114 = builder.addSchema(2528, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema114,
-                "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(
-                schema114,
-                "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 schema115 = builder.addSchema(2529, SAME_NAMESPACED);
-        builder.addFixer(new StriderGravityFix(schema115, false));
-        Schema schema116 = builder.addSchema(2531, SAME_NAMESPACED);
-        builder.addFixer(new RedstoneWireConnectionsFix(schema116));
-        Schema schema117 = builder.addSchema(2533, SAME_NAMESPACED);
-        builder.addFixer(new VillagerFollowRangeFix(schema117));
-        Schema schema118 = builder.addSchema(2535, SAME_NAMESPACED);
-        builder.addFixer(new EntityShulkerRotationFix(schema118));
-        Schema schema119 = builder.addSchema(2538, SAME_NAMESPACED);
-        builder.addFixer(new LevelLegacyWorldGenSettingsFix(schema119));
-        Schema schema120 = builder.addSchema(2550, 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, SAME_NAMESPACED);
-        builder.addFixer(
-            new NamespacedTypeRenameFix(schema122, "Nether biome rename", References.BIOME, createRenamer("minecraft:nether", "minecraft:nether_wastes"))
-        );
-        Schema schema123 = builder.addSchema(2553, SAME_NAMESPACED);
-        builder.addFixer(new NamespacedTypeRenameFix(schema123, "Biomes fix", References.BIOME, createRenamer(BiomeFix.BIOMES)));
-        Schema schema124 = builder.addSchema(2558, 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, SAME_NAMESPACED);
-        builder.addFixer(new CauldronRenameFix(schema127, false));
-        Schema schema128 = builder.addSchema(2680, SAME_NAMESPACED);
-        builder.addFixer(ItemRenameFix.create(schema128, "Renamed grass path item to dirt path", createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
-        builder.addFixer(
-            BlockRenameFix.create(schema128, "Renamed grass path block to dirt path", 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, 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(schema132, "Renamed copper block items to new oxidized terms", createRenamer(immutableMap)));
-        builder.addFixer(BlockRenameFix.create(schema132, "Renamed copper blocks to new oxidized terms", createRenamer(immutableMap)));
-        Schema schema133 = 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(schema133, "Rename copper item suffixes", createRenamer(immutableMap2)));
-        builder.addFixer(BlockRenameFix.create(schema133, "Rename copper blocks suffixes", createRenamer(immutableMap2)));
-        Schema schema134 = builder.addSchema(2693, SAME_NAMESPACED);
-        builder.addFixer(new AddFlagIfNotPresentFix(schema134, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
-        Schema schema135 = 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(schema135, "Renamed grimstone block items to deepslate", createRenamer(immutableMap3)));
-        builder.addFixer(BlockRenameFix.create(schema135, "Renamed grimstone blocks to deepslate", createRenamer(immutableMap3)));
-        Schema schema136 = builder.addSchema(2700, SAME_NAMESPACED);
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema136,
-                "Renamed cave vines blocks",
-                createRenamer(ImmutableMap.of("minecraft:cave_vines_head", "minecraft:cave_vines", "minecraft:cave_vines_body", "minecraft:cave_vines_plant"))
-            )
-        );
-        Schema schema137 = builder.addSchema(2701, SAME_NAMESPACED);
-        builder.addFixer(new SavedDataFeaturePoolElementFix(schema137));
-        Schema schema138 = builder.addSchema(2702, 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, 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, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema142,
-                "Rename azalea_leaves_flowers",
-                createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))
-            )
-        );
-        builder.addFixer(
-            BlockRenameFix.create(
-                schema142,
-                "Rename azalea_leaves_flowers items",
-                createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))
-            )
-        );
-        Schema schema143 = builder.addSchema(2825, 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, SAME_NAMESPACED);
-        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema146));
-        Schema schema147 = builder.addSchema(2838, SAME_NAMESPACED);
-        builder.addFixer(
-            new NamespacedTypeRenameFix(schema147, "Caves and Cliffs biome renames", References.BIOME, createRenamer(CavesAndCliffsRenames.RENAMES))
-        );
-        Schema schema148 = builder.addSchema(2841, SAME_NAMESPACED);
-        builder.addFixer(new ChunkProtoTickListFix(schema148));
-        Schema schema149 = builder.addSchema(2842, V2842::new);
-        builder.addFixer(new ChunkRenamesFix(schema149));
-        Schema schema150 = builder.addSchema(2843, SAME_NAMESPACED);
-        builder.addFixer(new OverreachingTickFix(schema150));
-        builder.addFixer(
-            new NamespacedTypeRenameFix(
-                schema150, "Remove Deep Warm Ocean", References.BIOME, createRenamer("minecraft:deep_warm_ocean", "minecraft:warm_ocean")
-            )
-        );
-        Schema schema151 = builder.addSchema(2846, SAME_NAMESPACED);
-        builder.addFixer(
-            new AdvancementsRenameFix(
-                schema151,
-                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 schema152 = builder.addSchema(2852, SAME_NAMESPACED);
-        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema152));
-        Schema schema153 = builder.addSchema(2967, SAME_NAMESPACED);
-        builder.addFixer(new StructureSettingsFlattenFix(schema153));
-        Schema schema154 = builder.addSchema(2970, 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, 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, SAME_NAMESPACED);
-        builder.addFixer(
-            new NamespacedTypeRenameFix(
-                schema161,
-                "game_event_renames_3084",
-                References.GAME_EVENT_NAME,
-                createRenamer(
-                    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, SAME_NAMESPACED);
-        builder.addFixer(
-            new EntityVariantFix(
-                schema162, "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(
-                schema162, "Migrate cat variant advancement", "minecraft:husbandry/complete_catalogue", string -> immutableMap4.getOrDefault(string, string)
-            )
-        );
-        Schema schema163 = builder.addSchema(3087, SAME_NAMESPACED);
-        builder.addFixer(
-            new EntityVariantFix(
-                schema163, "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 schema164 = builder.addSchema(3090, SAME_NAMESPACED);
-        builder.addFixer(new EntityPaintingFieldsRenameFix(schema164));
-        Schema schema165 = builder.addSchema(3093, SAME_NAMESPACED);
-        builder.addFixer(new EntityGoatMissingStateFix(schema165));
-        Schema schema166 = builder.addSchema(3094, SAME_NAMESPACED);
-        builder.addFixer(new GoatHornIdFix(schema166));
-        Schema schema167 = builder.addSchema(3097, SAME_NAMESPACED);
-        builder.addFixer(new FilteredBooksFix(schema167));
-        builder.addFixer(new FilteredSignsFix(schema167));
+        builder.addFixer(new NamedEntityFix(schema57, false, "Command block minecart custom name fix", References.ENTITY, "minecraft:commandblock_minecart") {
+            @Override
+            protected Typed<?> fix(Typed<?> inputTyped) {
+                return inputTyped.update(DSL.remainderFinder(), EntityCustomNameToComponentFix::fixTagCustomName);
+            }
+        });
+        builder.addFixer(new IglooMetadataRemovalFix(schema57, false));
+        Schema schema58 = builder.addSchema(1490, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema58, "Rename melon_block", DataFixers.createRenamer("minecraft:melon_block", "minecraft:melon")));
+        builder.addFixer(ItemRenameFix.create(schema58, "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 schema59 = builder.addSchema(1492, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStructuresTemplateRenameFix(schema59, false));
+        Schema schema60 = builder.addSchema(1494, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemStackEnchantmentNamesFix(schema60, false));
+        Schema schema61 = builder.addSchema(1496, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LeavesFix(schema61, false));
+        Schema schema62 = builder.addSchema(1500, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockEntityKeepPacked(schema62, false));
+        Schema schema63 = builder.addSchema(1501, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AdvancementsFix(schema63, false));
+        Schema schema64 = builder.addSchema(1502, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new NamespacedTypeRenameFix(schema64, "Recipes fix", References.RECIPE, DataFixers.createRenamer(RecipesFix.RECIPES)));
+        Schema schema65 = builder.addSchema(1506, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LevelDataGeneratorOptionsFix(schema65, false));
+        Schema schema66 = builder.addSchema(1510, V1510::new);
+
+        builder.addFixer(BlockRenameFix.create(schema66, "Block renamening fix", DataFixers.createRenamer(EntityTheRenameningFix.RENAMED_BLOCKS)));
+        builder.addFixer(ItemRenameFix.create(schema66, "Item renamening fix", DataFixers.createRenamer(EntityTheRenameningFix.RENAMED_ITEMS)));
+        builder.addFixer(new NamespacedTypeRenameFix(schema66, "Recipes renamening fix", References.RECIPE, DataFixers.createRenamer(RecipesRenameningFix.RECIPES)));
+        builder.addFixer(new EntityTheRenameningFix(schema66, true));
+        builder.addFixer(new StatsRenameFix(schema66, "SwimStatsRenameFix", ImmutableMap.of("minecraft:swim_one_cm", "minecraft:walk_on_water_one_cm", "minecraft:dive_one_cm", "minecraft:walk_under_water_one_cm")));
+        Schema schema67 = builder.addSchema(1514, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ObjectiveDisplayNameFix(schema67, false));
+        builder.addFixer(new TeamDisplayNameFix(schema67, false));
+        builder.addFixer(new ObjectiveRenderTypeFix(schema67, false));
+        Schema schema68 = builder.addSchema(1515, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema68, "Rename coral fan blocks", DataFixers.createRenamer(RenamedCoralFansFix.RENAMED_IDS)));
+        Schema schema69 = builder.addSchema(1624, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new TrappedChestBlockEntityFix(schema69, false));
+        Schema schema70 = builder.addSchema(1800, V1800::new);
+
+        builder.addFixer(new AddNewChoices(schema70, "Added 1.14 mobs fix", References.ENTITY));
+        builder.addFixer(ItemRenameFix.create(schema70, "Rename dye items", DataFixers.createRenamer(DyeItemRenameFix.RENAMED_IDS)));
+        Schema schema71 = builder.addSchema(1801, V1801::new);
+
+        builder.addFixer(new AddNewChoices(schema71, "Added Illager Beast", References.ENTITY));
+        Schema schema72 = builder.addSchema(1802, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema72, "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(schema72, "Rename sign item & stone slabs", DataFixers.createRenamer(ImmutableMap.of("minecraft:stone_slab", "minecraft:smooth_stone_slab", "minecraft:sign", "minecraft:oak_sign"))));
+        Schema schema73 = builder.addSchema(1803, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemLoreFix(schema73, false));
+        Schema schema74 = builder.addSchema(1904, V1904::new);
+
+        builder.addFixer(new AddNewChoices(schema74, "Added Cats", References.ENTITY));
+        builder.addFixer(new EntityCatSplitFix(schema74, false));
+        Schema schema75 = builder.addSchema(1905, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStatusFix(schema75, false));
+        Schema schema76 = builder.addSchema(1906, V1906::new);
+
+        builder.addFixer(new AddNewChoices(schema76, "Add POI Blocks", References.BLOCK_ENTITY));
+        Schema schema77 = builder.addSchema(1909, V1909::new);
+
+        builder.addFixer(new AddNewChoices(schema77, "Add jigsaw", References.BLOCK_ENTITY));
+        Schema schema78 = builder.addSchema(1911, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkStatusFix2(schema78, false));
+        Schema schema79 = builder.addSchema(1914, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WeaponSmithChestLootTableFix(schema79, false));
+        Schema schema80 = builder.addSchema(1917, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new CatTypeFix(schema80, false));
+        Schema schema81 = builder.addSchema(1918, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerDataFix(schema81, "minecraft:villager"));
+        builder.addFixer(new VillagerDataFix(schema81, "minecraft:zombie_villager"));
+        Schema schema82 = builder.addSchema(1920, V1920::new);
+
+        builder.addFixer(new NewVillageFix(schema82, false));
+        builder.addFixer(new AddNewChoices(schema82, "Add campfire", References.BLOCK_ENTITY));
+        Schema schema83 = builder.addSchema(1925, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MapIdFix(schema83, false));
+        Schema schema84 = builder.addSchema(1928, V1928::new);
+
+        builder.addFixer(new EntityRavagerRenameFix(schema84, true));
+        builder.addFixer(ItemRenameFix.create(schema84, "Rename ravager egg item", DataFixers.createRenamer(EntityRavagerRenameFix.RENAMED_IDS)));
+        Schema schema85 = builder.addSchema(1929, V1929::new);
+
+        builder.addFixer(new AddNewChoices(schema85, "Add Wandering Trader and Trader Llama", References.ENTITY));
+        Schema schema86 = builder.addSchema(1931, V1931::new);
+
+        builder.addFixer(new AddNewChoices(schema86, "Added Fox", References.ENTITY));
+        Schema schema87 = builder.addSchema(1936, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsAddTextBackgroundFix(schema87, false));
+        Schema schema88 = builder.addSchema(1946, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ReorganizePoi(schema88, false));
+        Schema schema89 = builder.addSchema(1948, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OminousBannerRenameFix(schema89));
+        Schema schema90 = builder.addSchema(1953, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OminousBannerBlockEntityRenameFix(schema90, false));
+        Schema schema91 = builder.addSchema(1955, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerRebuildLevelAndXpFix(schema91, false));
+        builder.addFixer(new ZombieVillagerRebuildXpFix(schema91, false));
+        Schema schema92 = builder.addSchema(1961, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkLightRemoveFix(schema92, false));
+        Schema schema93 = builder.addSchema(1963, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RemoveGolemGossipFix(schema93, false));
+        Schema schema94 = builder.addSchema(2100, V2100::new);
+
+        builder.addFixer(new AddNewChoices(schema94, "Added Bee and Bee Stinger", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema94, "Add beehive", References.BLOCK_ENTITY));
+        builder.addFixer(new NamespacedTypeRenameFix(schema94, "Rename sugar recipe", References.RECIPE, DataFixers.createRenamer("minecraft:sugar", "minecraft:sugar_from_sugar_cane")));
+        builder.addFixer(new AdvancementsRenameFix(schema94, false, "Rename sugar recipe advancement", DataFixers.createRenamer("minecraft:recipes/misc/sugar", "minecraft:recipes/misc/sugar_from_sugar_cane")));
+        Schema schema95 = builder.addSchema(2202, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkBiomeFix(schema95, false));
+        Schema schema96 = builder.addSchema(2209, DataFixers.SAME_NAMESPACED);
+        UnaryOperator<String> unaryoperator = DataFixers.createRenamer("minecraft:bee_hive", "minecraft:beehive");
+
+        builder.addFixer(ItemRenameFix.create(schema96, "Rename bee_hive item to beehive", unaryoperator));
+        builder.addFixer(new PoiTypeRenameFix(schema96, "Rename bee_hive poi to beehive", unaryoperator));
+        builder.addFixer(BlockRenameFix.create(schema96, "Rename bee_hive block to beehive", unaryoperator));
+        Schema schema97 = builder.addSchema(2211, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructureReferenceCountFix(schema97, false));
+        Schema schema98 = builder.addSchema(2218, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ForcePoiRebuild(schema98, false));
+        Schema schema99 = builder.addSchema(2501, V2501::new);
+
+        builder.addFixer(new FurnaceRecipeFix(schema99, true));
+        Schema schema100 = builder.addSchema(2502, V2502::new);
+
+        builder.addFixer(new AddNewChoices(schema100, "Added Hoglin", References.ENTITY));
+        Schema schema101 = builder.addSchema(2503, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WallPropertyFix(schema101, false));
+        builder.addFixer(new AdvancementsRenameFix(schema101, false, "Composter category change", DataFixers.createRenamer("minecraft:recipes/misc/composter", "minecraft:recipes/decorations/composter")));
+        Schema schema102 = builder.addSchema(2505, V2505::new);
+
+        builder.addFixer(new AddNewChoices(schema102, "Added Piglin", References.ENTITY));
+        builder.addFixer(new MemoryExpiryDataFix(schema102, "minecraft:villager"));
+        Schema schema103 = builder.addSchema(2508, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema103, "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(schema103, "Renamed fungi blocks to fungus", DataFixers.createRenamer(ImmutableMap.of("minecraft:warped_fungi", "minecraft:warped_fungus", "minecraft:crimson_fungi", "minecraft:crimson_fungus"))));
+        Schema schema104 = builder.addSchema(2509, V2509::new);
+
+        builder.addFixer(new EntityZombifiedPiglinRenameFix(schema104));
+        builder.addFixer(ItemRenameFix.create(schema104, "Rename zombie pigman egg item", DataFixers.createRenamer(EntityZombifiedPiglinRenameFix.RENAMED_IDS)));
+        Schema schema105 = builder.addSchema(2511, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityProjectileOwnerFix(schema105));
+        Schema schema106 = builder.addSchema(2514, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityUUIDFix(schema106));
+        builder.addFixer(new BlockEntityUUIDFix(schema106));
+        builder.addFixer(new PlayerUUIDFix(schema106));
+        builder.addFixer(new LevelUUIDFix(schema106));
+        builder.addFixer(new SavedDataUUIDFix(schema106));
+        builder.addFixer(new ItemStackUUIDFix(schema106));
+        Schema schema107 = builder.addSchema(2516, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new GossipUUIDFix(schema107, "minecraft:villager"));
+        builder.addFixer(new GossipUUIDFix(schema107, "minecraft:zombie_villager"));
+        Schema schema108 = builder.addSchema(2518, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new JigsawPropertiesFix(schema108, false));
+        builder.addFixer(new JigsawRotationFix(schema108, false));
+        Schema schema109 = builder.addSchema(2519, V2519::new);
+
+        builder.addFixer(new AddNewChoices(schema109, "Added Strider", References.ENTITY));
+        Schema schema110 = builder.addSchema(2522, V2522::new);
+
+        builder.addFixer(new AddNewChoices(schema110, "Added Zoglin", References.ENTITY));
+        Schema schema111 = builder.addSchema(2523, DataFixers.SAME_NAMESPACED);
+
+        // CraftBukkit - decompile error
+        builder.addFixer(new AttributesRename(schema111, "Attribute renames", DataFixers.createRenamerNoNamespace(ImmutableMap.<String, String>builder().put("generic.maxHealth", "minecraft:generic.max_health").put("Max Health", "minecraft:generic.max_health").put("zombie.spawnReinforcements", "minecraft:zombie.spawn_reinforcements").put("Spawn Reinforcements Chance", "minecraft:zombie.spawn_reinforcements").put("horse.jumpStrength", "minecraft:horse.jump_strength").put("Jump Strength", "minecraft:horse.jump_strength").put("generic.followRange", "minecraft:generic.follow_range").put("Follow Range", "minecraft:generic.follow_range").put("generic.knockbackResistance", "minecraft:generic.knockback_resistance").put("Knockback Resistance", "minecraft:generic.knockback_resistance").put("generic.movementSpeed", "minecraft:generic.movement_speed").put("Movement Speed", "minecraft:generic.movement_speed").put("generic.flyingSpeed", "minecraft:generic.flying_speed").put("Flying Speed", "minecraft:generic.flying_speed").put("generic.attackDamage", "minecraft:generic.attack_damage").put("generic.attackKnockback", "minecraft:generic.attack_knockback").put("generic.attackSpeed", "minecraft:generic.attack_speed").put("generic.armorToughness", "minecraft:generic.armor_toughness").build())));
+        Schema schema112 = builder.addSchema(2527, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BitStorageAlignFix(schema112));
+        Schema schema113 = builder.addSchema(2528, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema113, "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(schema113, "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 schema114 = builder.addSchema(2529, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StriderGravityFix(schema114, false));
+        Schema schema115 = builder.addSchema(2531, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RedstoneWireConnectionsFix(schema115));
+        Schema schema116 = builder.addSchema(2533, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new VillagerFollowRangeFix(schema116));
+        Schema schema117 = builder.addSchema(2535, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityShulkerRotationFix(schema117));
+        Schema schema118 = builder.addSchema(2538, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LevelLegacyWorldGenSettingsFix(schema118));
+        Schema schema119 = builder.addSchema(2550, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsFix(schema119));
+        Schema schema120 = builder.addSchema(2551, V2551::new);
+
+        builder.addFixer(new WriteAndReadFix(schema120, "add types to WorldGenData", References.WORLD_GEN_SETTINGS));
+        Schema schema121 = builder.addSchema(2552, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new NamespacedTypeRenameFix(schema121, "Nether biome rename", References.BIOME, DataFixers.createRenamer("minecraft:nether", "minecraft:nether_wastes")));
+        Schema schema122 = builder.addSchema(2553, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new NamespacedTypeRenameFix(schema122, "Biomes fix", References.BIOME, DataFixers.createRenamer(BiomeFix.BIOMES)));
+        Schema schema123 = builder.addSchema(2558, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MissingDimensionFix(schema123, false));
+        builder.addFixer(new OptionsRenameFieldFix(schema123, false, "Rename swapHands setting", "key_key.swapHands", "key_key.swapOffhand"));
+        Schema schema124 = builder.addSchema(2568, V2568::new);
+
+        builder.addFixer(new AddNewChoices(schema124, "Added Piglin Brute", References.ENTITY));
+        Schema schema125 = builder.addSchema(2571, V2571::new);
+
+        builder.addFixer(new AddNewChoices(schema125, "Added Goat", References.ENTITY));
+        Schema schema126 = builder.addSchema(2679, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new CauldronRenameFix(schema126, false));
+        Schema schema127 = builder.addSchema(2680, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema127, "Renamed grass path item to dirt path", DataFixers.createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
+        builder.addFixer(BlockRenameFix.create(schema127, "Renamed grass path block to dirt path", DataFixers.createRenamer("minecraft:grass_path", "minecraft:dirt_path")));
+        Schema schema128 = builder.addSchema(2684, V2684::new);
+
+        builder.addFixer(new AddNewChoices(schema128, "Added Sculk Sensor", References.BLOCK_ENTITY));
+        Schema schema129 = builder.addSchema(2686, V2686::new);
+
+        builder.addFixer(new AddNewChoices(schema129, "Added Axolotl", References.ENTITY));
+        Schema schema130 = builder.addSchema(2688, V2688::new);
+
+        builder.addFixer(new AddNewChoices(schema130, "Added Glow Squid", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema130, "Added Glow Item Frame", References.ENTITY));
+        Schema schema131 = 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(schema131, "Renamed copper block items to new oxidized terms", DataFixers.createRenamer(immutablemap)));
+        builder.addFixer(BlockRenameFix.create(schema131, "Renamed copper blocks to new oxidized terms", DataFixers.createRenamer(immutablemap)));
+        Schema schema132 = 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(schema132, "Rename copper item suffixes", DataFixers.createRenamer(immutablemap1)));
+        builder.addFixer(BlockRenameFix.create(schema132, "Rename copper blocks suffixes", DataFixers.createRenamer(immutablemap1)));
+        Schema schema133 = builder.addSchema(2693, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AddFlagIfNotPresentFix(schema133, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
+        Schema schema134 = 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(schema134, "Renamed grimstone block items to deepslate", DataFixers.createRenamer(immutablemap2)));
+        builder.addFixer(BlockRenameFix.create(schema134, "Renamed grimstone blocks to deepslate", DataFixers.createRenamer(immutablemap2)));
+        Schema schema135 = builder.addSchema(2700, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(BlockRenameFix.create(schema135, "Renamed cave vines blocks", DataFixers.createRenamer(ImmutableMap.of("minecraft:cave_vines_head", "minecraft:cave_vines", "minecraft:cave_vines_body", "minecraft:cave_vines_plant"))));
+        Schema schema136 = builder.addSchema(2701, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new SavedDataFeaturePoolElementFix(schema136));
+        Schema schema137 = builder.addSchema(2702, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AbstractArrowPickupFix(schema137));
+        Schema schema138 = builder.addSchema(2704, V2704::new);
+
+        builder.addFixer(new AddNewChoices(schema138, "Added Goat", References.ENTITY));
+        Schema schema139 = builder.addSchema(2707, V2707::new);
+
+        builder.addFixer(new AddNewChoices(schema139, "Added Marker", References.ENTITY));
+        builder.addFixer(new AddFlagIfNotPresentFix(schema139, References.WORLD_GEN_SETTINGS, "has_increased_height_already", true));
+        Schema schema140 = builder.addSchema(2710, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StatsRenameFix(schema140, "Renamed play_one_minute stat to play_time", ImmutableMap.of("minecraft:play_one_minute", "minecraft:play_time")));
+        Schema schema141 = builder.addSchema(2717, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema141, "Rename azalea_leaves_flowers", DataFixers.createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
+        builder.addFixer(BlockRenameFix.create(schema141, "Rename azalea_leaves_flowers items", DataFixers.createRenamer(ImmutableMap.of("minecraft:azalea_leaves_flowers", "minecraft:flowering_azalea_leaves"))));
+        Schema schema142 = builder.addSchema(2825, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AddFlagIfNotPresentFix(schema142, References.WORLD_GEN_SETTINGS, "has_increased_height_already", false));
+        Schema schema143 = builder.addSchema(2831, V2831::new);
+
+        builder.addFixer(new SpawnerDataFix(schema143));
+        Schema schema144 = builder.addSchema(2832, V2832::new);
+
+        builder.addFixer(new WorldGenSettingsHeightAndBiomeFix(schema144));
+        builder.addFixer(new ChunkHeightAndBiomeFix(schema144));
+        Schema schema145 = builder.addSchema(2833, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema145));
+        Schema schema146 = builder.addSchema(2838, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new NamespacedTypeRenameFix(schema146, "Caves and Cliffs biome renames", References.BIOME, DataFixers.createRenamer(CavesAndCliffsRenames.RENAMES)));
+        Schema schema147 = builder.addSchema(2841, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkProtoTickListFix(schema147));
+        Schema schema148 = builder.addSchema(2842, V2842::new);
+
+        builder.addFixer(new ChunkRenamesFix(schema148));
+        Schema schema149 = builder.addSchema(2843, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OverreachingTickFix(schema149));
+        builder.addFixer(new NamespacedTypeRenameFix(schema149, "Remove Deep Warm Ocean", References.BIOME, DataFixers.createRenamer("minecraft:deep_warm_ocean", "minecraft:warm_ocean")));
+        Schema schema150 = builder.addSchema(2846, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AdvancementsRenameFix(schema150, 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 schema151 = builder.addSchema(2852, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new WorldGenSettingsDisallowOldCustomWorldsFix(schema151));
+        Schema schema152 = builder.addSchema(2967, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructureSettingsFlattenFix(schema152));
+        Schema schema153 = builder.addSchema(2970, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new StructuresBecomeConfiguredFix(schema153));
+        Schema schema154 = builder.addSchema(3076, V3076::new);
+
+        builder.addFixer(new AddNewChoices(schema154, "Added Sculk Catalyst", References.BLOCK_ENTITY));
+        Schema schema155 = builder.addSchema(3077, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkDeleteIgnoredLightDataFix(schema155));
+        Schema schema156 = builder.addSchema(3078, V3078::new);
+
+        builder.addFixer(new AddNewChoices(schema156, "Added Frog", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema156, "Added Tadpole", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema156, "Added Sculk Shrieker", References.BLOCK_ENTITY));
+        Schema schema157 = builder.addSchema(3081, V3081::new);
+
+        builder.addFixer(new AddNewChoices(schema157, "Added Warden", References.ENTITY));
+        Schema schema158 = builder.addSchema(3082, V3082::new);
+
+        builder.addFixer(new AddNewChoices(schema158, "Added Chest Boat", References.ENTITY));
+        Schema schema159 = builder.addSchema(3083, V3083::new);
+
+        builder.addFixer(new AddNewChoices(schema159, "Added Allay", References.ENTITY));
+        Schema schema160 = builder.addSchema(3084, DataFixers.SAME_NAMESPACED);
+
+        // CraftBukkit - decompile error
+        builder.addFixer(new NamespacedTypeRenameFix(schema160, "game_event_renames_3084", References.GAME_EVENT_NAME, DataFixers.createRenamer(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 schema161 = 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(schema161, "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(schema161, "Migrate cat variant advancement", "minecraft:husbandry/complete_catalogue", (s) -> {
+            return (String) immutablemap3.getOrDefault(s, s);
+        }));
+        Schema schema162 = 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(schema162, "Change frog variant type", typereference, "minecraft:frog", "Variant", int2objectopenhashmap::get));
+        Schema schema163 = builder.addSchema(3090, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityPaintingFieldsRenameFix(schema163));
+        Schema schema164 = builder.addSchema(3093, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EntityGoatMissingStateFix(schema164));
+        Schema schema165 = builder.addSchema(3094, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new GoatHornIdFix(schema165));
+        Schema schema166 = builder.addSchema(3097, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new FilteredBooksFix(schema166));
+        builder.addFixer(new FilteredSignsFix(schema166));
         Map<String, String> map = Map.of("minecraft:british", "minecraft:british_shorthair");
-        builder.addFixer(new VariantRenameFix(schema167, "Rename british shorthair", References.ENTITY, "minecraft:cat", map));
-        builder.addFixer(
-            new CriteriaRenameFix(
-                schema167,
-                "Migrate cat variant advancement for british shorthair",
-                "minecraft:husbandry/complete_catalogue",
-                string -> map.getOrDefault(string, string)
-            )
-        );
-        builder.addFixer(new PoiTypeRemoveFix(schema167, "Remove unpopulated villager PoI types", Set.of("minecraft:unemployed", "minecraft:nitwit")::contains));
-        Schema schema168 = builder.addSchema(3108, SAME_NAMESPACED);
-        builder.addFixer(new BlendingDataRemoveFromNetherEndFix(schema168));
-        Schema schema169 = builder.addSchema(3201, SAME_NAMESPACED);
-        builder.addFixer(new OptionsProgrammerArtFix(schema169));
-        Schema schema170 = builder.addSchema(3202, V3202::new);
-        builder.addFixer(new AddNewChoices(schema170, "Added Hanging Sign", References.BLOCK_ENTITY));
-        Schema schema171 = builder.addSchema(3203, V3203::new);
-        builder.addFixer(new AddNewChoices(schema171, "Added Camel", References.ENTITY));
-        Schema schema172 = builder.addSchema(3204, V3204::new);
-        builder.addFixer(new AddNewChoices(schema172, "Added Chiseled Bookshelf", References.BLOCK_ENTITY));
-        Schema schema173 = builder.addSchema(3209, SAME_NAMESPACED);
-        builder.addFixer(new ItemStackSpawnEggFix(schema173, false, "minecraft:pig_spawn_egg"));
-        Schema schema174 = builder.addSchema(3214, SAME_NAMESPACED);
-        builder.addFixer(new OptionsAmbientOcclusionFix(schema174));
-        Schema schema175 = builder.addSchema(3319, SAME_NAMESPACED);
-        builder.addFixer(new OptionsAccessibilityOnboardFix(schema175));
-        Schema schema176 = builder.addSchema(3322, SAME_NAMESPACED);
-        builder.addFixer(new EffectDurationFix(schema176));
-        Schema schema177 = builder.addSchema(3325, V3325::new);
-        builder.addFixer(new AddNewChoices(schema177, "Added displays", References.ENTITY));
-        Schema schema178 = builder.addSchema(3326, V3326::new);
-        builder.addFixer(new AddNewChoices(schema178, "Added Sniffer", References.ENTITY));
-        Schema schema179 = builder.addSchema(3327, V3327::new);
-        builder.addFixer(new AddNewChoices(schema179, "Archaeology", References.BLOCK_ENTITY));
-        Schema schema180 = builder.addSchema(3328, V3328::new);
-        builder.addFixer(new AddNewChoices(schema180, "Added interaction", References.ENTITY));
-        Schema schema181 = builder.addSchema(3438, V3438::new);
-        builder.addFixer(
-            BlockEntityRenameFix.create(
-                schema181, "Rename Suspicious Sand to Brushable Block", createRenamer("minecraft:suspicious_sand", "minecraft:brushable_block")
-            )
-        );
-        builder.addFixer(new EntityBrushableBlockFieldsRenameFix(schema181));
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema181,
-                "Pottery shard renaming",
-                createRenamer(
-                    ImmutableMap.of(
-                        "minecraft:pottery_shard_archer",
-                        "minecraft:archer_pottery_shard",
-                        "minecraft:pottery_shard_prize",
-                        "minecraft:prize_pottery_shard",
-                        "minecraft:pottery_shard_arms_up",
-                        "minecraft:arms_up_pottery_shard",
-                        "minecraft:pottery_shard_skull",
-                        "minecraft:skull_pottery_shard"
-                    )
-                )
-            )
-        );
-        builder.addFixer(new AddNewChoices(schema181, "Added calibrated sculk sensor", References.BLOCK_ENTITY));
-        Schema schema182 = builder.addSchema(3439, SAME_NAMESPACED);
-        builder.addFixer(new BlockEntitySignDoubleSidedEditableTextFix(schema182, "Updated sign text format for Signs", "minecraft:sign"));
-        builder.addFixer(new BlockEntitySignDoubleSidedEditableTextFix(schema182, "Updated sign text format for Hanging Signs", "minecraft:hanging_sign"));
-        Schema schema183 = builder.addSchema(3440, SAME_NAMESPACED);
-        builder.addFixer(
-            new NamespacedTypeRenameFix(
-                schema183,
-                "Replace experimental 1.20 overworld",
-                References.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST,
-                createRenamer("minecraft:overworld_update_1_20", "minecraft:overworld")
-            )
-        );
-        builder.addFixer(new FeatureFlagRemoveFix(schema183, "Remove 1.20 feature toggle", Set.of("minecraft:update_1_20")));
-        Schema schema184 = builder.addSchema(3441, SAME_NAMESPACED);
-        builder.addFixer(new BlendingDataFix(schema184));
-        Schema schema185 = builder.addSchema(3447, SAME_NAMESPACED);
-        builder.addFixer(
-            ItemRenameFix.create(
-                schema185,
-                "Pottery shard item renaming to Pottery sherd",
-                createRenamer(
-                    Stream.of(
-                            "minecraft:angler_pottery_shard",
-                            "minecraft:archer_pottery_shard",
-                            "minecraft:arms_up_pottery_shard",
-                            "minecraft:blade_pottery_shard",
-                            "minecraft:brewer_pottery_shard",
-                            "minecraft:burn_pottery_shard",
-                            "minecraft:danger_pottery_shard",
-                            "minecraft:explorer_pottery_shard",
-                            "minecraft:friend_pottery_shard",
-                            "minecraft:heart_pottery_shard",
-                            "minecraft:heartbreak_pottery_shard",
-                            "minecraft:howl_pottery_shard",
-                            "minecraft:miner_pottery_shard",
-                            "minecraft:mourner_pottery_shard",
-                            "minecraft:plenty_pottery_shard",
-                            "minecraft:prize_pottery_shard",
-                            "minecraft:sheaf_pottery_shard",
-                            "minecraft:shelter_pottery_shard",
-                            "minecraft:skull_pottery_shard",
-                            "minecraft:snort_pottery_shard"
-                        )
-                        .collect(Collectors.toMap(Function.identity(), string -> string.replace("_pottery_shard", "_pottery_sherd")))
-                )
-            )
-        );
-        Schema schema186 = builder.addSchema(3448, V3448::new);
-        builder.addFixer(new DecoratedPotFieldRenameFix(schema186));
-        Schema schema187 = builder.addSchema(3450, SAME_NAMESPACED);
-        builder.addFixer(
-            new RemapChunkStatusFix(
-                schema187,
-                "Remove liquid_carvers and heightmap chunk statuses",
-                createRenamer(Map.of("minecraft:liquid_carvers", "minecraft:carvers", "minecraft:heightmaps", "minecraft:spawn"))
-            )
-        );
-        Schema schema188 = builder.addSchema(3451, SAME_NAMESPACED);
-        builder.addFixer(new ChunkDeleteLightFix(schema188));
-        Schema schema189 = builder.addSchema(3459, SAME_NAMESPACED);
-        builder.addFixer(new LegacyDragonFightFix(schema189));
-        Schema schema190 = builder.addSchema(3564, SAME_NAMESPACED);
-        builder.addFixer(new DropInvalidSignDataFix(schema190, "Drop invalid sign datafix data", "minecraft:sign"));
-        builder.addFixer(new DropInvalidSignDataFix(schema190, "Drop invalid hanging sign datafix data", "minecraft:hanging_sign"));
-        Schema schema191 = builder.addSchema(3565, SAME_NAMESPACED);
-        builder.addFixer(new RandomSequenceSettingsFix(schema191));
-        Schema schema192 = builder.addSchema(3566, SAME_NAMESPACED);
-        builder.addFixer(new ScoreboardDisplaySlotFix(schema192));
-        Schema schema193 = builder.addSchema(3568, SAME_NAMESPACED);
-        builder.addFixer(new MobEffectIdFix(schema193));
-        Schema schema194 = builder.addSchema(3682, V3682::new);
-        builder.addFixer(new AddNewChoices(schema194, "Added Crafter", References.BLOCK_ENTITY));
-        Schema schema195 = builder.addSchema(3683, V3683::new);
-        builder.addFixer(new PrimedTntBlockStateFixer(schema195));
-        Schema schema196 = builder.addSchema(3685, V3685::new);
-        builder.addFixer(new FixProjectileStoredItem(schema196));
-        Schema schema197 = builder.addSchema(3689, V3689::new);
-        builder.addFixer(new AddNewChoices(schema197, "Added Breeze", References.ENTITY));
-        builder.addFixer(new AddNewChoices(schema197, "Added Trial Spawner", References.BLOCK_ENTITY));
-        Schema schema198 = builder.addSchema(3692, SAME_NAMESPACED);
-        UnaryOperator<String> unaryOperator2 = createRenamer(Map.of("minecraft:grass", "minecraft:short_grass"));
-        builder.addFixer(BlockRenameFix.create(schema198, "Rename grass block to short_grass", unaryOperator2));
-        builder.addFixer(ItemRenameFix.create(schema198, "Rename grass item to short_grass", unaryOperator2));
-        Schema schema199 = builder.addSchema(3799, V3799::new);
-        builder.addFixer(new AddNewChoices(schema199, "Added Armadillo", References.ENTITY));
-        Schema schema200 = builder.addSchema(3800, SAME_NAMESPACED);
-        UnaryOperator<String> unaryOperator3 = createRenamer(Map.of("minecraft:scute", "minecraft:turtle_scute"));
-        builder.addFixer(ItemRenameFix.create(schema200, "Rename scute item to turtle_scute", unaryOperator3));
-        Schema schema201 = builder.addSchema(3803, SAME_NAMESPACED);
-        builder.addFixer(
-            new RenameEnchantmentsFix(schema201, "Rename sweeping enchant to sweeping_edge", Map.of("minecraft:sweeping", "minecraft:sweeping_edge"))
-        );
-        Schema schema202 = builder.addSchema(3807, V3807::new);
-        builder.addFixer(new AddNewChoices(schema202, "Added Vault", References.BLOCK_ENTITY));
-        Schema schema203 = builder.addSchema(3807, 1, SAME_NAMESPACED);
-        builder.addFixer(new MapBannerBlockPosFormatFix(schema203));
-        Schema schema204 = builder.addSchema(3808, V3808::new);
-        builder.addFixer(new HorseBodyArmorItemFix(schema204, "minecraft:horse", "ArmorItem", true));
-        Schema schema205 = builder.addSchema(3808, 1, V3808_1::new);
-        builder.addFixer(new HorseBodyArmorItemFix(schema205, "minecraft:llama", "DecorItem", false));
-        Schema schema206 = builder.addSchema(3808, 2, V3808_2::new);
-        builder.addFixer(new HorseBodyArmorItemFix(schema206, "minecraft:trader_llama", "DecorItem", false));
-        Schema schema207 = builder.addSchema(3809, SAME_NAMESPACED);
-        builder.addFixer(new ChestedHorsesInventoryZeroIndexingFix(schema207));
-        Schema schema208 = builder.addSchema(3812, SAME_NAMESPACED);
-        builder.addFixer(new FixWolfHealth(schema208));
-        Schema schema209 = builder.addSchema(3813, SAME_NAMESPACED);
-        builder.addFixer(new BlockPosFormatAndRenamesFix(schema209));
-        Schema schema210 = builder.addSchema(3814, SAME_NAMESPACED);
-        builder.addFixer(
-            new AttributesRename(schema210, "Rename jump strength attribute", createRenamer("minecraft:horse.jump_strength", "minecraft:generic.jump_strength"))
-        );
-        Schema schema211 = builder.addSchema(3816, V3816::new);
-        builder.addFixer(new AddNewChoices(schema211, "Added Bogged", References.ENTITY));
-        Schema schema212 = builder.addSchema(3818, V3818::new);
-        builder.addFixer(new BeehiveFieldRenameFix(schema212));
-        builder.addFixer(new EmptyItemInHotbarFix(schema212));
-        Schema schema213 = builder.addSchema(3818, 1, SAME_NAMESPACED);
-        builder.addFixer(new BannerPatternFormatFix(schema213));
-        Schema schema214 = builder.addSchema(3818, 2, SAME_NAMESPACED);
-        builder.addFixer(new TippedArrowPotionToItemFix(schema214));
-        Schema schema215 = builder.addSchema(3818, 3, V3818_3::new);
-        builder.addFixer(new WriteAndReadFix(schema215, "Inject data component types", References.DATA_COMPONENTS));
-        Schema schema216 = builder.addSchema(3818, 4, V3818_4::new);
-        builder.addFixer(new ParticleUnflatteningFix(schema216));
-        Schema schema217 = builder.addSchema(3818, 5, V3818_5::new);
-        builder.addFixer(new ItemStackComponentizationFix(schema217));
-        Schema schema218 = builder.addSchema(3818, 6, SAME_NAMESPACED);
-        builder.addFixer(new AreaEffectCloudPotionFix(schema218));
-        Schema schema219 = builder.addSchema(3820, SAME_NAMESPACED);
-        builder.addFixer(new PlayerHeadBlockProfileFix(schema219));
-        builder.addFixer(new LodestoneCompassComponentFix(schema219));
-        Schema schema220 = builder.addSchema(3825, V3825::new);
-        builder.addFixer(new ItemStackCustomNameToOverrideComponentFix(schema220));
-        builder.addFixer(new BannerEntityCustomNameToOverrideComponentFix(schema220));
-        builder.addFixer(new TrialSpawnerConfigFix(schema220));
-        builder.addFixer(new AddNewChoices(schema220, "Added Ominous Item Spawner", References.ENTITY));
-        Schema schema221 = builder.addSchema(3828, SAME_NAMESPACED);
-        builder.addFixer(new EmptyItemInVillagerTradeFix(schema221));
-        Schema schema222 = builder.addSchema(3833, SAME_NAMESPACED);
-        builder.addFixer(new RemoveEmptyItemInBrushableBlockFix(schema222));
-        Schema schema223 = builder.addSchema(3938, V3938::new);
-        builder.addFixer(new ProjectileStoredWeaponFix(schema223));
-        Schema schema224 = builder.addSchema(3939, SAME_NAMESPACED);
-        builder.addFixer(new FeatureFlagRemoveFix(schema224, "Remove 1.21 feature toggle", Set.of("minecraft:update_1_21")));
-        Schema schema225 = builder.addSchema(3943, SAME_NAMESPACED);
-        builder.addFixer(new OptionsMenuBlurrinessFix(schema225));
-        Schema schema226 = builder.addSchema(3945, SAME_NAMESPACED);
-        builder.addFixer(new AttributeModifierIdFix(schema226));
-        builder.addFixer(new JukeboxTicksSinceSongStartedFix(schema226));
+
+        builder.addFixer(new VariantRenameFix(schema166, "Rename british shorthair", References.ENTITY, "minecraft:cat", map));
+        builder.addFixer(new CriteriaRenameFix(schema166, "Migrate cat variant advancement for british shorthair", "minecraft:husbandry/complete_catalogue", (s) -> {
+            return (String) map.getOrDefault(s, s);
+        }));
+        Set set = Set.of("minecraft:unemployed", "minecraft:nitwit");
+
+        Objects.requireNonNull(set);
+        builder.addFixer(new PoiTypeRemoveFix(schema166, "Remove unpopulated villager PoI types", set::contains));
+        Schema schema167 = builder.addSchema(3108, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlendingDataRemoveFromNetherEndFix(schema167));
+        Schema schema168 = builder.addSchema(3201, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsProgrammerArtFix(schema168));
+        Schema schema169 = builder.addSchema(3202, V3202::new);
+
+        builder.addFixer(new AddNewChoices(schema169, "Added Hanging Sign", References.BLOCK_ENTITY));
+        Schema schema170 = builder.addSchema(3203, V3203::new);
+
+        builder.addFixer(new AddNewChoices(schema170, "Added Camel", References.ENTITY));
+        Schema schema171 = builder.addSchema(3204, V3204::new);
+
+        builder.addFixer(new AddNewChoices(schema171, "Added Chiseled Bookshelf", References.BLOCK_ENTITY));
+        Schema schema172 = builder.addSchema(3209, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ItemStackSpawnEggFix(schema172, false, "minecraft:pig_spawn_egg"));
+        Schema schema173 = builder.addSchema(3214, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsAmbientOcclusionFix(schema173));
+        Schema schema174 = builder.addSchema(3319, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsAccessibilityOnboardFix(schema174));
+        Schema schema175 = builder.addSchema(3322, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EffectDurationFix(schema175));
+        Schema schema176 = builder.addSchema(3325, V3325::new);
+
+        builder.addFixer(new AddNewChoices(schema176, "Added displays", References.ENTITY));
+        Schema schema177 = builder.addSchema(3326, V3326::new);
+
+        builder.addFixer(new AddNewChoices(schema177, "Added Sniffer", References.ENTITY));
+        Schema schema178 = builder.addSchema(3327, V3327::new);
+
+        builder.addFixer(new AddNewChoices(schema178, "Archaeology", References.BLOCK_ENTITY));
+        Schema schema179 = builder.addSchema(3328, V3328::new);
+
+        builder.addFixer(new AddNewChoices(schema179, "Added interaction", References.ENTITY));
+        Schema schema180 = builder.addSchema(3438, V3438::new);
+
+        builder.addFixer(BlockEntityRenameFix.create(schema180, "Rename Suspicious Sand to Brushable Block", DataFixers.createRenamer("minecraft:suspicious_sand", "minecraft:brushable_block")));
+        builder.addFixer(new EntityBrushableBlockFieldsRenameFix(schema180));
+        builder.addFixer(ItemRenameFix.create(schema180, "Pottery shard renaming", DataFixers.createRenamer(ImmutableMap.of("minecraft:pottery_shard_archer", "minecraft:archer_pottery_shard", "minecraft:pottery_shard_prize", "minecraft:prize_pottery_shard", "minecraft:pottery_shard_arms_up", "minecraft:arms_up_pottery_shard", "minecraft:pottery_shard_skull", "minecraft:skull_pottery_shard"))));
+        builder.addFixer(new AddNewChoices(schema180, "Added calibrated sculk sensor", References.BLOCK_ENTITY));
+        Schema schema181 = builder.addSchema(3439, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockEntitySignDoubleSidedEditableTextFix(schema181, "Updated sign text format for Signs", "minecraft:sign"));
+        builder.addFixer(new BlockEntitySignDoubleSidedEditableTextFix(schema181, "Updated sign text format for Hanging Signs", "minecraft:hanging_sign"));
+        Schema schema182 = builder.addSchema(3440, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new NamespacedTypeRenameFix(schema182, "Replace experimental 1.20 overworld", References.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST, DataFixers.createRenamer("minecraft:overworld_update_1_20", "minecraft:overworld")));
+        builder.addFixer(new FeatureFlagRemoveFix(schema182, "Remove 1.20 feature toggle", Set.of("minecraft:update_1_20")));
+        Schema schema183 = builder.addSchema(3441, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlendingDataFix(schema183));
+        Schema schema184 = builder.addSchema(3447, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(ItemRenameFix.create(schema184, "Pottery shard item renaming to Pottery sherd", DataFixers.createRenamer((Map) Stream.of("minecraft:angler_pottery_shard", "minecraft:archer_pottery_shard", "minecraft:arms_up_pottery_shard", "minecraft:blade_pottery_shard", "minecraft:brewer_pottery_shard", "minecraft:burn_pottery_shard", "minecraft:danger_pottery_shard", "minecraft:explorer_pottery_shard", "minecraft:friend_pottery_shard", "minecraft:heart_pottery_shard", "minecraft:heartbreak_pottery_shard", "minecraft:howl_pottery_shard", "minecraft:miner_pottery_shard", "minecraft:mourner_pottery_shard", "minecraft:plenty_pottery_shard", "minecraft:prize_pottery_shard", "minecraft:sheaf_pottery_shard", "minecraft:shelter_pottery_shard", "minecraft:skull_pottery_shard", "minecraft:snort_pottery_shard").collect(Collectors.toMap(Function.identity(), (s) -> {
+            return s.replace("_pottery_shard", "_pottery_sherd");
+        })))));
+        Schema schema185 = builder.addSchema(3448, V3448::new);
+
+        builder.addFixer(new DecoratedPotFieldRenameFix(schema185));
+        Schema schema186 = builder.addSchema(3450, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RemapChunkStatusFix(schema186, "Remove liquid_carvers and heightmap chunk statuses", DataFixers.createRenamer(Map.of("minecraft:liquid_carvers", "minecraft:carvers", "minecraft:heightmaps", "minecraft:spawn"))));
+        Schema schema187 = builder.addSchema(3451, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChunkDeleteLightFix(schema187));
+        Schema schema188 = builder.addSchema(3459, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new LegacyDragonFightFix(schema188));
+        Schema schema189 = builder.addSchema(3564, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new DropInvalidSignDataFix(schema189, "Drop invalid sign datafix data", "minecraft:sign"));
+        builder.addFixer(new DropInvalidSignDataFix(schema189, "Drop invalid hanging sign datafix data", "minecraft:hanging_sign"));
+        Schema schema190 = builder.addSchema(3565, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RandomSequenceSettingsFix(schema190));
+        Schema schema191 = builder.addSchema(3566, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ScoreboardDisplaySlotFix(schema191));
+        Schema schema192 = builder.addSchema(3568, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MobEffectIdFix(schema192));
+        Schema schema193 = builder.addSchema(3682, V3682::new);
+
+        builder.addFixer(new AddNewChoices(schema193, "Added Crafter", References.BLOCK_ENTITY));
+        Schema schema194 = builder.addSchema(3683, V3683::new);
+
+        builder.addFixer(new PrimedTntBlockStateFixer(schema194));
+        Schema schema195 = builder.addSchema(3685, V3685::new);
+
+        builder.addFixer(new FixProjectileStoredItem(schema195));
+        Schema schema196 = builder.addSchema(3689, V3689::new);
+
+        builder.addFixer(new AddNewChoices(schema196, "Added Breeze", References.ENTITY));
+        builder.addFixer(new AddNewChoices(schema196, "Added Trial Spawner", References.BLOCK_ENTITY));
+        Schema schema197 = builder.addSchema(3692, DataFixers.SAME_NAMESPACED);
+        UnaryOperator<String> unaryoperator1 = DataFixers.createRenamer(Map.of("minecraft:grass", "minecraft:short_grass"));
+
+        builder.addFixer(BlockRenameFix.create(schema197, "Rename grass block to short_grass", unaryoperator1));
+        builder.addFixer(ItemRenameFix.create(schema197, "Rename grass item to short_grass", unaryoperator1));
+        Schema schema198 = builder.addSchema(3799, V3799::new);
+
+        builder.addFixer(new AddNewChoices(schema198, "Added Armadillo", References.ENTITY));
+        Schema schema199 = builder.addSchema(3800, DataFixers.SAME_NAMESPACED);
+        UnaryOperator<String> unaryoperator2 = DataFixers.createRenamer(Map.of("minecraft:scute", "minecraft:turtle_scute"));
+
+        builder.addFixer(ItemRenameFix.create(schema199, "Rename scute item to turtle_scute", unaryoperator2));
+        Schema schema200 = builder.addSchema(3803, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RenameEnchantmentsFix(schema200, "Rename sweeping enchant to sweeping_edge", Map.of("minecraft:sweeping", "minecraft:sweeping_edge")));
+        Schema schema201 = builder.addSchema(3807, V3807::new);
+
+        builder.addFixer(new AddNewChoices(schema201, "Added Vault", References.BLOCK_ENTITY));
+        Schema schema202 = builder.addSchema(3807, 1, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new MapBannerBlockPosFormatFix(schema202));
+        Schema schema203 = builder.addSchema(3808, V3808::new);
+
+        builder.addFixer(new HorseBodyArmorItemFix(schema203, "minecraft:horse", "ArmorItem", true));
+        Schema schema204 = builder.addSchema(3808, 1, V3808_1::new);
+
+        builder.addFixer(new HorseBodyArmorItemFix(schema204, "minecraft:llama", "DecorItem", false));
+        Schema schema205 = builder.addSchema(3808, 2, V3808_2::new);
+
+        builder.addFixer(new HorseBodyArmorItemFix(schema205, "minecraft:trader_llama", "DecorItem", false));
+        Schema schema206 = builder.addSchema(3809, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new ChestedHorsesInventoryZeroIndexingFix(schema206));
+        Schema schema207 = builder.addSchema(3812, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new FixWolfHealth(schema207));
+        Schema schema208 = builder.addSchema(3813, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BlockPosFormatAndRenamesFix(schema208));
+        Schema schema209 = builder.addSchema(3814, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AttributesRename(schema209, "Rename jump strength attribute", DataFixers.createRenamer("minecraft:horse.jump_strength", "minecraft:generic.jump_strength")));
+        Schema schema210 = builder.addSchema(3816, V3816::new);
+
+        builder.addFixer(new AddNewChoices(schema210, "Added Bogged", References.ENTITY));
+        Schema schema211 = builder.addSchema(3818, V3818::new);
+
+        builder.addFixer(new BeehiveFieldRenameFix(schema211));
+        builder.addFixer(new EmptyItemInHotbarFix(schema211));
+        Schema schema212 = builder.addSchema(3818, 1, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new BannerPatternFormatFix(schema212));
+        Schema schema213 = builder.addSchema(3818, 2, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new TippedArrowPotionToItemFix(schema213));
+        Schema schema214 = builder.addSchema(3818, 3, V3818_3::new);
+
+        builder.addFixer(new WriteAndReadFix(schema214, "Inject data component types", References.DATA_COMPONENTS));
+        Schema schema215 = builder.addSchema(3818, 4, V3818_4::new);
+
+        builder.addFixer(new ParticleUnflatteningFix(schema215));
+        Schema schema216 = builder.addSchema(3818, 5, V3818_5::new);
+
+        builder.addFixer(new ItemStackComponentizationFix(schema216));
+        Schema schema217 = builder.addSchema(3818, 6, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AreaEffectCloudPotionFix(schema217));
+        Schema schema218 = builder.addSchema(3820, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new PlayerHeadBlockProfileFix(schema218));
+        builder.addFixer(new LodestoneCompassComponentFix(schema218));
+        Schema schema219 = builder.addSchema(3825, V3825::new);
+
+        builder.addFixer(new ItemStackCustomNameToOverrideComponentFix(schema219));
+        builder.addFixer(new BannerEntityCustomNameToOverrideComponentFix(schema219));
+        builder.addFixer(new TrialSpawnerConfigFix(schema219));
+        builder.addFixer(new AddNewChoices(schema219, "Added Ominous Item Spawner", References.ENTITY));
+        Schema schema220 = builder.addSchema(3828, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new EmptyItemInVillagerTradeFix(schema220));
+        Schema schema221 = builder.addSchema(3833, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new RemoveEmptyItemInBrushableBlockFix(schema221));
+        Schema schema222 = builder.addSchema(3938, V3938::new);
+
+        builder.addFixer(new ProjectileStoredWeaponFix(schema222));
+        Schema schema223 = builder.addSchema(3939, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new FeatureFlagRemoveFix(schema223, "Remove 1.21 feature toggle", Set.of("minecraft:update_1_21")));
+        Schema schema224 = builder.addSchema(3943, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new OptionsMenuBlurrinessFix(schema224));
+        Schema schema225 = builder.addSchema(3945, DataFixers.SAME_NAMESPACED);
+
+        builder.addFixer(new AttributeModifierIdFix(schema225));
+        builder.addFixer(new JukeboxTicksSinceSongStartedFix(schema225));
     }
 
     private static UnaryOperator<String> createRenamerNoNamespace(Map<String, String> replacements) {
-        return string -> replacements.getOrDefault(string, string);
+        return (s) -> {
+            return (String) replacements.getOrDefault(s, s);
+        };
     }
 
     private static UnaryOperator<String> createRenamer(Map<String, String> replacements) {
-        return string -> replacements.getOrDefault(NamespacedSchema.ensureNamespaced(string), string);
+        return (s) -> {
+            return (String) replacements.getOrDefault(NamespacedSchema.ensureNamespaced(s), s);
+        };
     }
 
     private static UnaryOperator<String> createRenamer(String old, String current) {
-        return string -> Objects.equals(NamespacedSchema.ensureNamespaced(string), old) ? current : string;
+        return (s2) -> {
+            return Objects.equals(NamespacedSchema.ensureNamespaced(s2), old) ? current : s2;
+        };
     }
 }
