Migrated some API calls

src/main/java/org/betterx/bclib/BCLibDatagen.java

@@ -11,7 +11,7 @@ import com.mojang.serialization.Encoder;
 import com.mojang.serialization.JsonOps;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
@@ -60,7 +60,7 @@ public class BCLibDatagen implements DataGeneratorEntrypoint {
 
         @Override
         public CompletableFuture<?> run(CachedOutput cachedOutput) {
-            RegistryAccess.Frozen registryAccess = BuiltinRegistries.createAccess();
+            RegistryAccess.Frozen registryAccess = BuiltInRegistries.createAccess();
             RegistryOps<JsonElement> dynamicOps = RegistryOps.create(JsonOps.INSTANCE, registryAccess);
             final List<CompletableFuture<?>> futures = new ArrayList<>();
 

src/main/java/org/betterx/bclib/BCLibPatch.java

@@ -8,7 +8,6 @@ import org.betterx.bclib.api.v2.levelgen.LevelGenUtil;
 import org.betterx.bclib.config.Configs;
 
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;

src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java

@@ -21,7 +21,6 @@ import org.betterx.worlds.together.tag.v3.MineableTags;
 import org.betterx.worlds.together.tag.v3.TagManager;
 
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.core.Registry;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -56,7 +55,7 @@ public class PostInitAPI {
      * @param isClient {@code boolean}, {@code true} for client, {@code false} for server.
      */
     public static void postInit(boolean isClient) {
-        Registry.BLOCK.forEach(block -> {
+        BuiltInRegistries.BLOCK.forEach(block -> {
             processBlockCommon(block);
             if (isClient) {
                 processBlockClient(block);
@@ -64,7 +63,7 @@ public class PostInitAPI {
         });
 
 
-        Registry.ITEM.forEach(item -> {
+        BuiltInRegistries.ITEM.forEach(item -> {
             processItemCommon(item);
         });
 

src/main/java/org/betterx/bclib/api/v2/advancement/AdvancementManager.java

@@ -7,7 +7,6 @@ import org.betterx.bclib.items.complex.EquipmentSet;
 
 import net.minecraft.advancements.*;
 import net.minecraft.advancements.critereon.*;
-import net.minecraft.core.Registry;
 import net.minecraft.data.recipes.RecipeBuilder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
@@ -148,11 +147,11 @@ public class AdvancementManager {
         }
 
         public static Builder create(ItemStack icon, AdvancementType type, Consumer<DisplayBuilder> displayAdapter) {
-            var id = Registry.ITEM.getKey(icon.getItem());
+            var id = BuiltInRegistries.ITEM.getKey(icon.getItem());
             boolean canBuild = true;
             if (id == null || icon.is(Items.AIR)) {
                 canBuild = false;
-                id = Registry.ITEM.getDefaultKey();
+                id = BuiltInRegistries.ITEM.getDefaultKey();
             }
 
             String baseName = "advancements." + id.getNamespace() + "." + id.getPath() + ".";
@@ -214,7 +213,7 @@ public class AdvancementManager {
             if (icon == null) {
                 canBuild = false;
             } else {
-                var id = Registry.ITEM.getKey(icon.getItem());
+                var id = BuiltInRegistries.ITEM.getKey(icon.getItem());
                 if (id == null) {
                     canBuild = false;
                 }
@@ -231,7 +230,7 @@ public class AdvancementManager {
         public Builder awardRecipe(ItemLike... items) {
             var rewardBuilder = startReward();
             for (ItemLike item : items) {
-                var id = Registry.ITEM.getKey(item.asItem());
+                var id = BuiltInRegistries.ITEM.getKey(item.asItem());
                 if (id == null) continue;
                 rewardBuilder.addRecipe(id);
             }

src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java

@@ -8,7 +8,6 @@ import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.KeyDispatchDataCodec;

src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeRegistry.java

@@ -10,7 +10,6 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.KeyDispatchDataCodec;

src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java

@@ -16,7 +16,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BiomeTags;
@@ -63,7 +64,7 @@ public class BiomeAPI {
      * @return {@link BCLBiome}
      */
     public static BCLBiome registerBuiltinBiomeAndOverrideIntendedDimension(BCLBiome bclbiome, BiomeType dim) {
-        return registerBiomeAndOverrideIntendedDimension(bclbiome, dim, BuiltinRegistries.BIOME);
+        return registerBiomeAndOverrideIntendedDimension(bclbiome, dim, Registries.BIOME);
     }
 
     static BCLBiome registerBiomeAndOverrideIntendedDimension(
@@ -472,7 +473,7 @@ public class BiomeAPI {
             Optional<ResourceKey<Biome>> key = InternalBiomeAPI.biomeRegistry.getResourceKey(biome);
             if (key.isPresent()) return key.get();
         }
-        return BuiltinRegistries.BIOME
+        return BuiltInRegistries.BIOME
                 .getResourceKey(biome)
                 .orElseGet(null);
     }

src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java

@@ -7,7 +7,6 @@ import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;

src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java

@@ -5,7 +5,6 @@ import org.betterx.bclib.mixin.common.StructuresAccessor;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.core.*;
-import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.data.worldgen.StructureSets;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;

src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java

@@ -2,7 +2,7 @@ package org.betterx.bclib.api.v2.levelgen.structures;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtUtils;
@@ -120,7 +120,7 @@ public class StructureWorld {
             BlockState[] states = new BlockState[map2.size()];
             for (int i = 0; i < states.length; i++) {
                 states[i] = NbtUtils.readBlockState(
-                        HolderLookup.forRegistry(Registry.BLOCK),
+                        HolderLookup.forRegistry(BuiltInRegistries.BLOCK),
                         (CompoundTag) map2.get(i)
                 );
             }

src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java

@@ -17,7 +17,7 @@ import org.betterx.bclib.util.Triple;
 
 import net.minecraft.core.Direction;
 import net.minecraft.core.Holder;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.random.SimpleWeightedRandomList;
 import net.minecraft.util.valueproviders.ConstantInt;
@@ -211,8 +211,8 @@ public abstract class BCLFeatureBuilder<F extends Feature<FC>, FC extends Featur
             ResourceLocation id,
             ConfiguredFeature<FC, F> cFeature
     ) {
-        return (Holder<ConfiguredFeature<FC, F>>) (Object) BuiltinRegistries.register(
+        return (Holder<ConfiguredFeature<FC, F>>) (Object) BuiltInRegistries.register(
-                BuiltinRegistries.CONFIGURED_FEATURE,
+                BuiltInRegistries.CONFIGURED_FEATURE,
                 id,
                 cFeature
         );

src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java

@@ -3,7 +3,7 @@ package org.betterx.bclib.blocks;
 import org.betterx.bclib.client.models.BasePatterns;
 import org.betterx.bclib.client.models.PatternsHelper;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Optional;
@@ -15,7 +15,7 @@ public class BaseBarkBlock extends BaseRotatedPillarBlock {
 
     @Override
     protected Optional<String> createBlockPattern(ResourceLocation blockId) {
-        blockId = Registry.BLOCK.getKey(this);
+        blockId = BuiltInRegistries.BLOCK.getKey(this);
         return PatternsHelper.createJson(BasePatterns.BLOCK_BASE, replacePath(blockId));
     }
 

src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java

@@ -8,7 +8,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
@@ -51,7 +51,7 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP
     @Override
     @Environment(EnvType.CLIENT)
     public BlockModel getItemModel(ResourceLocation blockId) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern = PatternsHelper.createJson(BasePatterns.ITEM_BUTTON, parentId);
         return ModelsHelper.fromPattern(pattern);
     }
@@ -59,7 +59,7 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern = blockState.getValue(POWERED)
                 ? PatternsHelper.createJson(
                 BasePatterns.BLOCK_BUTTON_PRESSED,

src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java

@@ -8,7 +8,7 @@ import org.betterx.bclib.registry.BaseBlockEntities;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -55,7 +55,7 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider {
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         return ModelsHelper.createBlockEmpty(parentId);
     }
 }

src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java

@@ -8,7 +8,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -42,7 +42,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
     @Override
     @Environment(EnvType.CLIENT)
     public BlockModel getItemModel(ResourceLocation blockId) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern = PatternsHelper.createJson(BasePatterns.ITEM_FENCE, parentId);
         return ModelsHelper.fromPattern(pattern);
     }
@@ -50,7 +50,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         String path = blockId.getPath();
         Optional<String> pattern = Optional.empty();
         if (path.endsWith("_post")) {

src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java

@@ -7,7 +7,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
@@ -50,7 +50,7 @@ public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
         boolean inWall = blockState.getValue(IN_WALL);
         boolean isOpen = blockState.getValue(OPEN);
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern;
         if (inWall) {
             pattern = isOpen

src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java

@@ -11,7 +11,7 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -45,7 +45,7 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi
     }
 
     public Optional<String> getModelString(String block) {
-        ResourceLocation blockId = Registry.BLOCK.getKey(this);
+        ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(this);
         if (block.contains("item")) {
             return PatternsHelper.createJson(BasePatterns.ITEM_BLOCK, blockId);
         }
@@ -65,7 +65,7 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation thisId = Registry.BLOCK.getKey(this);
+        ResourceLocation thisId = BuiltInRegistries.BLOCK.getKey(this);
         String path = blockId.getPath();
         Optional<String> pattern = Optional.empty();
         if (path.endsWith("_post")) {

src/main/java/org/betterx/bclib/blocks/BasePathBlock.java

@@ -7,7 +7,7 @@ import org.betterx.bclib.client.models.PatternsHelper;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -78,7 +78,7 @@ public class BasePathBlock extends BaseBlockNotFull {
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
         String name = blockId.getPath();
-        ResourceLocation bottomId = Registry.BLOCK.getKey(baseBlock);
+        ResourceLocation bottomId = BuiltInRegistries.BLOCK.getKey(baseBlock);
         String bottom = bottomId.getNamespace() + ":block/" + bottomId.getPath();
         Map<String, String> textures = Maps.newHashMap();
         textures.put("%modid%", blockId.getNamespace());

src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java

@@ -7,7 +7,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
@@ -51,7 +51,7 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern;
         if (blockState.getValue(POWERED)) {
             pattern = PatternsHelper.createJson(BasePatterns.BLOCK_PLATE_DOWN, parentId);

src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java

@@ -9,7 +9,7 @@ import org.betterx.bclib.util.BlocksHelper;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
@@ -163,7 +163,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         return ModelsHelper.createBlockEmpty(parentId);
     }
 

src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java

@@ -9,7 +9,7 @@ import org.betterx.bclib.interfaces.CustomItemProvider;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
@@ -59,7 +59,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern;
         if (blockState.getValue(TYPE) == SlabType.DOUBLE) {
             pattern = PatternsHelper.createBlockSimple(parentId);

src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java

@@ -9,7 +9,7 @@ import org.betterx.bclib.interfaces.CustomItemProvider;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
@@ -59,7 +59,7 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern = PatternsHelper.createJson(switch (blockState.getValue(SHAPE)) {
             case STRAIGHT -> BasePatterns.BLOCK_STAIR;
             case INNER_LEFT, INNER_RIGHT -> BasePatterns.BLOCK_STAIR_INNER;

src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java

@@ -11,7 +11,7 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -138,7 +138,7 @@ public class BaseTerrainBlock extends BaseBlock {
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation baseId = Registry.BLOCK.getKey(getBaseBlock());
+        ResourceLocation baseId = BuiltInRegistries.BLOCK.getKey(getBaseBlock());
         String modId = blockId.getNamespace();
         String path = blockId.getPath();
         String bottom = baseId.getNamespace() + ":block/" + baseId.getPath();

src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java

@@ -8,7 +8,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -43,7 +43,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider {
     @Override
     @Environment(EnvType.CLIENT)
     public BlockModel getItemModel(ResourceLocation blockId) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern = PatternsHelper.createJson(BasePatterns.ITEM_WALL, parentId);
         return ModelsHelper.fromPattern(pattern);
     }
@@ -51,7 +51,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider {
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         String path = blockId.getPath();
         Optional<String> pattern = Optional.empty();
         if (path.endsWith("_post")) {

src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java

@@ -7,7 +7,7 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
@@ -56,7 +56,7 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement
     @Override
     @Environment(EnvType.CLIENT)
     public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-        ResourceLocation parentId = Registry.BLOCK.getKey(parent);
+        ResourceLocation parentId = BuiltInRegistries.BLOCK.getKey(parent);
         Optional<String> pattern;
         if (blockState.getValue(POWER) > 0) {
             pattern = PatternsHelper.createJson(BasePatterns.BLOCK_PLATE_DOWN, parentId);

src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java

@@ -1,7 +1,7 @@
 package org.betterx.bclib.blocks;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.Tiers;
@@ -31,7 +31,7 @@ public class LeveledAnvilBlock extends BaseAnvilBlock {
     }
 
     public static List<Block> getAnvils() {
-        return Registry.BLOCK
+        return BuiltInRegistries.BLOCK
                 .stream()
                 .filter(b -> b instanceof LeveledAnvilBlock || b == Blocks.ANVIL)
                 .toList();

src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java

@@ -9,7 +9,6 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.renderer.block.model.multipart.MultiPart;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.level.block.Block;
@@ -32,38 +31,44 @@ public class CustomModelBakery {
     }
 
     public void loadCustomModels(ResourceManager resourceManager) {
-        Registry.BLOCK.stream().parallel().filter(block -> block instanceof BlockModelProvider).forEach(block -> {
+        BuiltInRegistries.BLOCK.stream()
-            ResourceLocation blockID = Registry.BLOCK.getKey(block);
+                               .parallel()
-            ResourceLocation storageID = new ResourceLocation(
+                               .filter(block -> block instanceof BlockModelProvider)
-                    blockID.getNamespace(),
+                               .forEach(block -> {
-                    "blockstates/" + blockID.getPath() + ".json"
+                                   ResourceLocation blockID = BuiltInRegistries.BLOCK.getKey(block);
-            );
+                                   ResourceLocation storageID = new ResourceLocation(
-            if (resourceManager.getResource(storageID).isEmpty()) {
+                                           blockID.getNamespace(),
-                addBlockModel(blockID, block);
+                                           "blockstates/" + blockID.getPath() + ".json"
-            }
+                                   );
-            storageID = new ResourceLocation(blockID.getNamespace(), "models/item/" + blockID.getPath() + ".json");
+                                   if (resourceManager.getResource(storageID).isEmpty()) {
-            if (resourceManager.getResource(storageID).isEmpty()) {
+                                       addBlockModel(blockID, block);
-                addItemModel(blockID, (ItemModelProvider) block);
+                                   }
-            }
+                                   storageID = new ResourceLocation(
-        });
+                                           blockID.getNamespace(),
+                                           "models/item/" + blockID.getPath() + ".json"
+                                   );
+                                   if (resourceManager.getResource(storageID).isEmpty()) {
+                                       addItemModel(blockID, (ItemModelProvider) block);
+                                   }
+                               });
 
-        Registry.ITEM.stream()
+        BuiltInRegistries.ITEM.stream()
-                     .parallel()
+                              .parallel()
-                     .filter(item -> item instanceof ItemModelProvider || RecordItemModelProvider.has(item))
+                              .filter(item -> item instanceof ItemModelProvider || RecordItemModelProvider.has(item))
-                     .forEach(item -> {
+                              .forEach(item -> {
-                         ResourceLocation registryID = Registry.ITEM.getKey(item);
+                                  ResourceLocation registryID = BuiltInRegistries.ITEM.getKey(item);
-                         ResourceLocation storageID = new ResourceLocation(
+                                  ResourceLocation storageID = new ResourceLocation(
-                                 registryID.getNamespace(),
+                                          registryID.getNamespace(),
-                                 "models/item/" + registryID.getPath() + ".json"
+                                          "models/item/" + registryID.getPath() + ".json"
-                         );
+                                  );
-                         final ItemModelProvider provider = (item instanceof ItemModelProvider)
+                                  final ItemModelProvider provider = (item instanceof ItemModelProvider)
-                                 ? (ItemModelProvider) item
+                                          ? (ItemModelProvider) item
-                                 : RecordItemModelProvider.get(item);
+                                          : RecordItemModelProvider.get(item);
 
-                         if (resourceManager.getResource(storageID).isEmpty()) {
+                                  if (resourceManager.getResource(storageID).isEmpty()) {
-                             addItemModel(registryID, provider);
+                                      addItemModel(registryID, provider);
-                         }
+                                  }
-                     });
+                              });
     }
 
     private void addBlockModel(ResourceLocation blockID, Block block) {

src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java

@@ -13,7 +13,6 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.blockentity.BrightnessCombiner;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.*;
@@ -165,7 +164,7 @@ public class BaseChestBlockEntityRenderer implements BlockEntityRenderer<BaseChe
     }
 
     public static void registerRenderLayer(Block block) {
-        ResourceLocation blockId = Registry.BLOCK.getKey(block);
+        ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(block);
         String modId = blockId.getNamespace();
         String path = blockId.getPath();
         LAYERS.put(

src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java

@@ -18,7 +18,6 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.blockentity.SignRenderer;
 import net.minecraft.client.resources.model.Material;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.util.Mth;
@@ -181,7 +180,7 @@ public class BaseSignBlockEntityRenderer implements BlockEntityRenderer<BaseSign
     }
 
     public static void registerRenderLayer(Block block) {
-        ResourceLocation blockId = Registry.BLOCK.getKey(block);
+        ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(block);
         RenderType layer = RenderType.entitySolid(new ResourceLocation(
                 blockId.getNamespace(),
                 "textures/entity/sign/" + blockId.getPath() + ".png"

src/main/java/org/betterx/bclib/integration/ModIntegration.java

@@ -5,7 +5,8 @@ import org.betterx.worlds.together.tag.v3.TagManager;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -38,15 +39,15 @@ public abstract class ModIntegration {
     }
 
     public ResourceKey<PlacedFeature> getFeatureKey(String name) {
-        return ResourceKey.create(Registry.PLACED_FEATURE_REGISTRY, getID(name));
+        return ResourceKey.create(Registries.PLACED_FEATURE, getID(name));
     }
 
     public Block getBlock(String name) {
-        return Registry.BLOCK.get(getID(name));
+        return BuiltInRegistries.BLOCK.get(getID(name));
     }
 
     public Item getItem(String name) {
-        return Registry.ITEM.get(getID(name));
+        return BuiltInRegistries.ITEM.get(getID(name));
     }
 
     public BlockState getDefaultState(String name) {
@@ -63,11 +64,11 @@ public abstract class ModIntegration {
 
 
     public ConfiguredFeature<?, ?> getConfiguredFeature(String name) {
-        return BuiltinRegistries.CONFIGURED_FEATURE.get(getID(name));
+        return BuiltInRegistries.CONFIGURED_FEATURE.get(getID(name));
     }
 
     public Holder<Biome> getBiome(String name) {
-        return BuiltinRegistries.BIOME.getHolder(getKey(name)).orElseThrow();
+        return BuiltInRegistries.BIOME.getHolder(getKey(name)).orElseThrow();
     }
 
     public Class<?> getClass(String path) {

src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java

@@ -1,6 +1,5 @@
 package org.betterx.bclib.interfaces;
 
-import net.minecraft.core.Registry;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -18,7 +17,7 @@ public interface SurvivesOnTags extends SurvivesOnSpecialGround {
     default String getSurvivableBlocksString() {
         return getSurvivableTags()
                 .stream()
-                .map(tag -> Registry.BLOCK.getTag(tag))
+                .map(tag -> BuiltInRegistries.BLOCK.getTag(tag))
                 .filter(named -> named.isPresent())
                 .map(named -> named.get())
                 .flatMap(named -> named.stream())

src/main/java/org/betterx/bclib/items/BaseAnvilItem.java

@@ -5,7 +5,6 @@ import org.betterx.bclib.interfaces.BlockModelProvider;
 import org.betterx.bclib.interfaces.ItemModelProvider;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.core.Registry;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
@@ -73,7 +72,7 @@ public class BaseAnvilItem extends BlockItem implements ItemModelProvider {
     @Environment(EnvType.CLIENT)
     public BlockModel getItemModel(ResourceLocation resourceLocation) {
         Block anvilBlock = getBlock();
-        ResourceLocation blockId = Registry.BLOCK.getKey(anvilBlock);
+        ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(anvilBlock);
         return ((BlockModelProvider) anvilBlock).getBlockModel(blockId, anvilBlock.defaultBlockState());
     }
 }

src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java

@@ -8,7 +8,6 @@ import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColors;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.main.GameConfig;
-import net.minecraft.core.Registry;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -36,7 +35,7 @@ public abstract class MinecraftMixin {
 
     @Inject(method = "<init>*", at = @At("TAIL"))
     private void bclib_onMCInit(GameConfig args, CallbackInfo info) {
-        Registry.BLOCK.forEach(block -> {
+        BuiltInRegistries.BLOCK.forEach(block -> {
             if (block instanceof CustomColorProvider provider) {
                 blockColors.register(provider.getProvider(), block);
                 itemColors.register(provider.getItemProvider(), block.asItem());

src/main/java/org/betterx/bclib/mixin/common/BuiltinRegistriesMixin.java

@@ -6,7 +6,7 @@ import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,13 +15,13 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(BuiltinRegistries.class)
+@Mixin(BuiltInRegistries.class)
 public abstract class BuiltinRegistriesMixin {
     @Shadow
     protected static <T, R extends WritableRegistry<T>> R internalRegister(
             ResourceKey<? extends Registry<T>> resourceKey,
             R writableRegistry,
-            BuiltinRegistries.RegistryBootstrap<T> registryBootstrap,
+            BuiltInRegistries.RegistryBootstrap<T> registryBootstrap,
             Lifecycle lifecycle
     ) {
         throw new RuntimeException("Shadowed Call");

src/main/java/org/betterx/bclib/recipes/AbstractAdvancementRecipe.java

@@ -3,7 +3,6 @@ package org.betterx.bclib.recipes;
 import org.betterx.bclib.api.v2.advancement.AdvancementManager;
 
 import net.minecraft.advancements.RequirementsStrategy;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.ArmorItem;
@@ -105,8 +104,8 @@ public class AbstractAdvancementRecipe {
         String name = "has_" + (nameCounter++) + "_" +
                 Arrays.stream(items)
                       .map(block -> (block instanceof Block)
-                              ? Registry.BLOCK.getKey((Block) block)
+                              ? BuiltInRegistries.BLOCK.getKey((Block) block)
-                              : Registry.ITEM.getKey((Item) block))
+                              : BuiltInRegistries.ITEM.getKey((Item) block))
                       .filter(id -> id != null)
                       .map(id -> id.getPath())
                       .collect(Collectors.joining("_"));

src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java

@@ -209,10 +209,10 @@ public class AnvilRecipe implements Recipe<Container>, UnknownReceipBookCategory
     @Override
     public NonNullList<Ingredient> getIngredients() {
         NonNullList<Ingredient> defaultedList = NonNullList.create();
-        defaultedList.add(Ingredient.of(Registry.ITEM.stream()
+        defaultedList.add(Ingredient.of(BuiltInRegistries.ITEM.stream()
-                                                     .filter(AnvilRecipe::isHammer)
+                                                              .filter(AnvilRecipe::isHammer)
-                                                     .filter(this::canUse)
+                                                              .filter(this::canUse)
-                                                     .map(ItemStack::new))
+                                                              .map(ItemStack::new))
         );
         defaultedList.add(input);
         return defaultedList;

src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java

@@ -117,9 +117,9 @@ public class BCLRecipeManager {
 
     public static boolean exists(ItemLike item) {
         if (item instanceof Block) {
-            return Registry.BLOCK.getKey((Block) item) != Registry.BLOCK.getDefaultKey();
+            return BuiltInRegistries.BLOCK.getKey((Block) item) != BuiltInRegistries.BLOCK.getDefaultKey();
         } else {
-            return item != Items.AIR && Registry.ITEM.getKey(item.asItem()) != Registry.ITEM.getDefaultKey();
+            return item != Items.AIR && BuiltInRegistries.ITEM.getKey(item.asItem()) != BuiltInRegistries.ITEM.getDefaultKey();
         }
     }
 

src/main/java/org/betterx/bclib/util/ItemUtil.java

@@ -2,7 +2,7 @@ package org.betterx.bclib.util;
 
 import org.betterx.bclib.BCLib;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.item.Item;
@@ -21,7 +21,7 @@ public class ItemUtil {
                 throw new IllegalStateException("Stack can't be null!");
             }
             Item item = stack.getItem();
-            return Registry.ITEM.getKey(item) + ":" + stack.getCount();
+            return BuiltInRegistries.ITEM.getKey(item) + ":" + stack.getCount();
         } catch (Exception ex) {
             BCLib.LOGGER.error("ItemStack serialization error!", ex);
         }
@@ -38,13 +38,13 @@ public class ItemUtil {
             if (parts.length < 2) return null;
             if (parts.length == 2) {
                 ResourceLocation itemId = new ResourceLocation(stackString);
-                Item item = Registry.ITEM.getOptional(itemId).orElseThrow(() -> {
+                Item item = BuiltInRegistries.ITEM.getOptional(itemId).orElseThrow(() -> {
                     return new IllegalStateException("Output item " + itemId + " does not exists!");
                 });
                 return new ItemStack(item);
             }
             ResourceLocation itemId = new ResourceLocation(parts[0], parts[1]);
-            Item item = Registry.ITEM.getOptional(itemId).orElseThrow(() -> {
+            Item item = BuiltInRegistries.ITEM.getOptional(itemId).orElseThrow(() -> {
                 return new IllegalStateException("Output item " + itemId + " does not exists!");
             });
             return new ItemStack(item, Integer.valueOf(parts[2]));
@@ -61,7 +61,7 @@ public class ItemUtil {
                 throw new IllegalStateException("Invalid JsonObject. Entry 'item' does not exists!");
             }
             ResourceLocation itemId = new ResourceLocation(GsonHelper.getAsString(recipe, "item"));
-            Item item = Registry.ITEM.getOptional(itemId).orElseThrow(() -> {
+            Item item = BuiltInRegistries.ITEM.getOptional(itemId).orElseThrow(() -> {
                 return new IllegalStateException("Output item " + itemId + " does not exists!");
             });
             int count = GsonHelper.getAsInt(recipe, "count", 1);

src/main/java/org/betterx/bclib/util/RecipeHelper.java

@@ -1,15 +1,15 @@
 package org.betterx.bclib.util;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 
 public class RecipeHelper {
     public static boolean exists(ItemLike item) {
         if (item instanceof Block) {
-            return Registry.BLOCK.getKey((Block) item) != Registry.BLOCK.getDefaultKey();
+            return BuiltInRegistries.BLOCK.getKey((Block) item) != BuiltInRegistries.BLOCK.getDefaultKey();
         } else {
-            return Registry.ITEM.getKey(item.asItem()) != Registry.ITEM.getDefaultKey();
+            return BuiltInRegistries.ITEM.getKey(item.asItem()) != BuiltInRegistries.ITEM.getDefaultKey();
         }
     }
 

src/main/java/org/betterx/bclib/util/StructureHelper.java

@@ -2,8 +2,8 @@ package org.betterx.bclib.util;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
 import net.minecraft.core.Vec3i;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
@@ -69,7 +69,7 @@ public class StructureHelper {
         CompoundTag nbttagcompound = NbtIo.readCompressed(stream);
 
         StructureTemplate template = new StructureTemplate();
-        template.load(HolderLookup.forRegistry(Registry.BLOCK), nbttagcompound);
+        template.load(HolderLookup.forRegistry(BuiltInRegistries.BLOCK), nbttagcompound);
 
         return template;
     }

src/main/java/org/betterx/bclib/util/TranslationHelper.java

@@ -1,7 +1,7 @@
 package org.betterx.bclib.util;
 
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 
 import com.google.common.collect.Sets;
@@ -37,8 +37,8 @@ public class TranslationHelper {
                 ? new JsonObject()
                 : gson.fromJson(new InputStreamReader(inputStream), JsonObject.class);
 
-        Registry.BLOCK.forEach(block -> {
+        BuiltInRegistries.BLOCK.forEach(block -> {
-            if (Registry.BLOCK.getKey(block).getNamespace().equals(modID)) {
+            if (BuiltInRegistries.BLOCK.getKey(block).getNamespace().equals(modID)) {
                 String name = block.getName().getString();
                 if (!translation.has(name)) {
                     missingNames.add(name);
@@ -46,8 +46,8 @@ public class TranslationHelper {
             }
         });
 
-        Registry.ITEM.forEach(item -> {
+        BuiltInRegistries.ITEM.forEach(item -> {
-            if (Registry.ITEM.getKey(item).getNamespace().equals(modID)) {
+            if (BuiltInRegistries.ITEM.getKey(item).getNamespace().equals(modID)) {
                 String name = item.getDescription().getString();
                 if (!translation.has(name)) {
                     missingNames.add(name);

src/main/java/org/betterx/ui/ColorUtil.java

@@ -6,7 +6,7 @@ import org.betterx.bclib.util.MHelper;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.util.Mth;
@@ -299,8 +299,8 @@ public class ColorUtil {
 
     @Environment(EnvType.CLIENT)
     public static int extractColor(Item item) {
-        ResourceLocation id = Registry.ITEM.getKey(item);
+        ResourceLocation id = BuiltInRegistries.ITEM.getKey(item);
-        if (id.equals(Registry.ITEM.getDefaultKey())) return -1;
+        if (id.equals(BuiltInRegistries.ITEM.getDefaultKey())) return -1;
         if (colorPalette.containsKey(id)) {
             return colorPalette.get(id);
         }

src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java

@@ -3,7 +3,7 @@ package org.betterx.worlds.together.flatLevel;
 import org.betterx.worlds.together.tag.v3.TagManager;
 import org.betterx.worlds.together.tag.v3.TagRegistry;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.FlatLevelGeneratorPresetTags;
@@ -12,7 +12,7 @@ import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorPreset;
 public class FlatLevelPresets {
     public static TagRegistry.Simple<FlatLevelGeneratorPreset> FLAT_LEVEL_PRESETS =
             TagManager.registerType(
-                    Registry.FLAT_LEVEL_GENERATOR_PRESET_REGISTRY,
+                    Registries.FLAT_LEVEL_GENERATOR_PRESET,
                     "tags/worldgen/flat_level_generator_preset",
                     (b) -> null
             );
@@ -20,7 +20,7 @@ public class FlatLevelPresets {
 
     public static ResourceKey<FlatLevelGeneratorPreset> register(ResourceLocation loc) {
         ResourceKey<FlatLevelGeneratorPreset> key = ResourceKey.create(
-                Registry.FLAT_LEVEL_GENERATOR_PRESET_REGISTRY,
+                Registries.FLAT_LEVEL_GENERATOR_PRESET,
                 loc
         );
         FLAT_LEVEL_PRESETS.addUntyped(FlatLevelGeneratorPresetTags.VISIBLE, key.location());

src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java

@@ -14,6 +14,7 @@ import org.betterx.worlds.together.worldPreset.WorldPresets;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -44,7 +45,7 @@ public class WorldGenUtil {
             boolean generateBonusChest
     ) {
         WorldDimensions settings = registryAccess
-                .registryOrThrow(Registry.WORLD_PRESET_REGISTRY)
+                .registryOrThrow(Registries.WORLD_PRESET)
                 .getHolderOrThrow(preset)
                 .value()
                 .createWorldDimensions();
@@ -201,7 +202,7 @@ public class WorldGenUtil {
         ResourceLocation id = null;
         RegistryAccess access = WorldBootstrap.getLastRegistryAccessOrElseBuiltin();
 
-        id = access.registryOrThrow(Registry.BIOME_REGISTRY).getKey(biome);
+        id = access.registryOrThrow(Registries.BIOME).getKey(biome);
 
         if (id == null) {
             WorldsTogether.LOGGER.error("Unable to get ID for " + biome + ".");

src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java

@@ -3,7 +3,7 @@ package org.betterx.worlds.together.mixin.common;
 import org.betterx.worlds.together.surfaceRules.SurfaceRuleRegistry;
 
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(BuiltinRegistries.class)
+@Mixin(BuiltInRegistries.class)
 public class BuiltinRegistriesMixin {
 
     @Inject(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V"))
@@ -25,7 +25,7 @@ public class BuiltinRegistriesMixin {
 
     @Shadow
     static protected <T> Registry<T> registerSimple(
-            ResourceKey<? extends Registry<T>> resourceKey, BuiltinRegistries.RegistryBootstrap<T> registryBootstrap
+            ResourceKey<? extends Registry<T>> resourceKey, BuiltInRegistries.RegistryBootstrap<T> registryBootstrap
     ) {
         throw new RuntimeException("Shadowed Call");
     }

src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java

@@ -4,6 +4,7 @@ import org.betterx.worlds.together.world.event.WorldBootstrap;
 
 import net.minecraft.core.LayeredRegistryAccess;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.level.progress.ChunkProgressListener;
@@ -29,7 +30,7 @@ public class MinecraftServerMixin {
     @Inject(method = "createLevels", at = @At(value = "HEAD"))
     private void together_addSurfaceRules(ChunkProgressListener worldGenerationProgressListener, CallbackInfo ci) {
         final Registry<LevelStem> dimensionRegistry = this.registries.compositeAccess()
-                                                                     .registryOrThrow(Registry.LEVEL_STEM_REGISTRY);
+                                                                     .registryOrThrow(Registries.LEVEL_STEM);
         WorldBootstrap.finalizeWorldGenSettings(dimensionRegistry);
     }
 }

src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java

@@ -5,6 +5,7 @@ import org.betterx.worlds.together.chunkgenerator.ChunkGeneratorUtils;
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.core.LayeredRegistryAccess;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.Services;
@@ -42,7 +43,7 @@ public class MinecraftServerMixinLate {
             CallbackInfo ci
     ) {
         final Registry<LevelStem> dimensionRegistry = this.registries.compositeAccess()
-                                                                     .registryOrThrow(Registry.LEVEL_STEM_REGISTRY);
+                                                                     .registryOrThrow(Registries.LEVEL_STEM);
         ChunkGeneratorUtils.restoreOriginalBiomeSourceInAllDimension(dimensionRegistry);
     }
 }

src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java

@@ -5,7 +5,7 @@ import org.betterx.worlds.together.worldPreset.TogetherWorldPreset;
 import com.mojang.datafixers.kinds.App;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.presets.WorldPreset;
@@ -29,7 +29,7 @@ public class WorldPresetMixin {
         final Function<RecordCodecBuilder.Instance<WorldPreset>, App<RecordCodecBuilder.Mu<WorldPreset>, WorldPreset>> CODEC_FUNCTION = builderInstance -> {
             RecordCodecBuilder<WorldPreset, Map<ResourceKey<LevelStem>, LevelStem>> dimensionsBuilder = Codec
                     .unboundedMap(
-                            ResourceKey.codec(Registry.LEVEL_STEM_REGISTRY),
+                            ResourceKey.codec(Registries.LEVEL_STEM),
                             LevelStem.CODEC
                     )
                     .fieldOf("dimensions")

src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java

@@ -4,7 +4,8 @@ import org.betterx.worlds.together.WorldsTogether;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Blocks;
@@ -28,7 +29,7 @@ public class SurfaceRuleRegistry {
 
     @ApiStatus.Internal
     public static Holder<AssignedSurfaceRule> bootstrap(Registry<AssignedSurfaceRule> registry) {
-        return BuiltinRegistries.register(
+        return BuiltInRegistries.register(
                 registry,
                 WorldsTogether.makeID("dummy"),
                 new AssignedSurfaceRule(
@@ -49,7 +50,7 @@ public class SurfaceRuleRegistry {
         );
         Registry.register(SurfaceRuleRegistry.BUILTIN_SURFACE_RULES, key, new AssignedSurfaceRule(
                         SurfaceRules.ifTrue(
-                                SurfaceRules.isBiome(ResourceKey.create(Registry.BIOME_REGISTRY, biomeID)),
+                                SurfaceRules.isBiome(ResourceKey.create(Registries.BIOME, biomeID)),
                                 rules
                         ), biomeID
                 )

src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java

@@ -4,6 +4,7 @@ import org.betterx.worlds.together.chunkgenerator.InjectableSurfaceRules;
 import org.betterx.worlds.together.world.event.WorldBootstrap;
 
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
@@ -31,7 +32,7 @@ public class SurfaceRuleUtil {
     }
 
     private static List<SurfaceRules.RuleSource> getRulesForBiomes(List<Biome> biomes) {
-        Registry<Biome> biomeRegistry = WorldBootstrap.getLastRegistryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
+        Registry<Biome> biomeRegistry = WorldBootstrap.getLastRegistryAccess().registryOrThrow(Registries.BIOME);
         List<ResourceLocation> biomeIDs = biomes.stream()
                                                 .map(b -> biomeRegistry.getKey(b))
                                                 .filter(id -> id != null)

src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java

@@ -6,6 +6,7 @@ import org.betterx.worlds.together.world.event.WorldEventsImpl;
 
 import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
@@ -24,7 +25,7 @@ import org.jetbrains.annotations.ApiStatus;
 public class TagManager {
     private static final Map<String, TagRegistry<?>> TYPES = Maps.newHashMap();
 
-    public static TagRegistry.RegistryBacked<Block> BLOCKS = registerType(Registry.BLOCK);
+    public static TagRegistry.RegistryBacked<Block> BLOCKS = registerType(BuiltInRegistries.BLOCK);
     public static TagRegistry.Items ITEMS = registerItem();
     public static TagRegistry.Biomes BIOMES = registerBiome();
 

src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java

@@ -4,6 +4,8 @@ import org.betterx.worlds.together.WorldsTogether;
 
 import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagEntry;
@@ -79,7 +81,7 @@ public class TagRegistry<T> {
 
     public static class Biomes extends Simple<Biome> {
         Biomes(String directory, Function<Biome, ResourceLocation> locationProvider) {
-            super(Registry.BIOME_REGISTRY, directory, locationProvider);
+            super(Registries.BIOME, directory, locationProvider);
         }
 
         /**
@@ -111,7 +113,7 @@ public class TagRegistry<T> {
     public static class Items extends RegistryBacked<Item> {
 
         Items() {
-            super(Registry.ITEM);
+            super(BuiltInRegistries.ITEM);
         }
 
         @SafeVarargs

src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java

@@ -17,6 +17,7 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.LayeredRegistryAccess;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
@@ -98,7 +99,7 @@ public class WorldBootstrap {
                 var presetKey = currentPreset.get().unwrapKey();
                 if (presetKey.isPresent()) {
                     Optional<Holder.Reference<WorldPreset>> newPreset = LAST_REGISTRY_ACCESS
-                            .registryOrThrow(Registry.WORLD_PRESET_REGISTRY)
+                            .registryOrThrow(Registries.WORLD_PRESET)
                             .getHolder(presetKey.get());
                     if (newPreset.isPresent()) currentPreset = (Optional<Holder<WorldPreset>>) (Optional<?>) newPreset;
                 }
@@ -322,7 +323,7 @@ public class WorldBootstrap {
     public static LayeredRegistryAccess<RegistryLayer> enforceInLayeredRegistry(LayeredRegistryAccess<RegistryLayer> registries) {
         RegistryAccess access = registries.compositeAccess();
         Helpers.onRegistryReady(access);
-        final Registry<LevelStem> dimensions = access.registryOrThrow(Registry.LEVEL_STEM_REGISTRY);
+        final Registry<LevelStem> dimensions = access.registryOrThrow(Registries.LEVEL_STEM);
         final Registry<LevelStem> changedDimensions = WorldGenUtil.repairBiomeSourceInAllDimensions(access, dimensions);
         if (dimensions != changedDimensions) {
             if (Configs.MAIN_CONFIG.verboseLogging()) {

src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java

@@ -14,7 +14,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
@@ -54,7 +55,7 @@ public class TogetherWorldPreset extends WorldPreset {
     }
 
     public static WorldDimensions buildWorldDimensions(Map<ResourceKey<LevelStem>, LevelStem> map) {
-        Registry<LevelStem> registry = new MappedRegistry<>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental());
+        Registry<LevelStem> registry = new MappedRegistry<>(Registries.LEVEL_STEM, Lifecycle.experimental());
         for (var entry : map.entrySet()) {
             Registry.register(registry, entry.getKey(), entry.getValue());
         }
@@ -154,8 +155,8 @@ public class TogetherWorldPreset extends WorldPreset {
     public static Registry<LevelStem> getDimensions(ResourceKey<WorldPreset> key) {
         RegistryAccess access = WorldBootstrap.getLastRegistryAccessOrElseBuiltin();
         var preset = (access == null
-                ? BuiltinRegistries.WORLD_PRESET
+                ? BuiltInRegistries.WORLD_PRESET
-                : access.registryOrThrow(Registry.WORLD_PRESET_REGISTRY))
+                : access.registryOrThrow(Registries.WORLD_PRESET))
                 .getHolder(key);
         if (preset.isEmpty()) return null;
         return preset
@@ -183,7 +184,7 @@ public class TogetherWorldPreset extends WorldPreset {
     private static class DimensionsWrapper {
         public static final Codec<DimensionsWrapper> CODEC = RecordCodecBuilder.create(instance -> instance
                 .group(Codec.unboundedMap(
-                                    ResourceKey.codec(Registry.LEVEL_STEM_REGISTRY),
+                                    ResourceKey.codec(Registries.LEVEL_STEM),
                                     ChunkGenerator.CODEC
                             )
                             .fieldOf("dimensions")

src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java

@@ -11,7 +11,8 @@ import org.betterx.worlds.together.worldPreset.client.WorldPresetsClient;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.WorldPresetTags;
@@ -26,13 +27,13 @@ import org.jetbrains.annotations.ApiStatus;
 public class WorldPresets {
 
     public static final TagRegistry.Simple<WorldPreset> WORLD_PRESETS =
-            TagManager.registerType(BuiltinRegistries.WORLD_PRESET, "tags/worldgen/world_preset");
+            TagManager.registerType(BuiltInRegistries.WORLD_PRESET, "tags/worldgen/world_preset");
     private static Map<ResourceKey<WorldPreset>, PresetBuilder> BUILDERS = Maps.newHashMap();
     private static ResourceKey<WorldPreset> DEFAULT = net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL;
 
     public static Holder<WorldPreset> get(RegistryAccess access, ResourceKey<WorldPreset> key) {
         return access
-                .registryOrThrow(Registry.WORLD_PRESET_REGISTRY)
+                .registryOrThrow(Registries.WORLD_PRESET)
                 .getHolderOrThrow(key);
     }
 
@@ -47,7 +48,7 @@ public class WorldPresets {
      * @return The key you may use to reference your new Preset
      */
     private static ResourceKey<WorldPreset> register(ResourceLocation loc, boolean visibleInUI) {
-        ResourceKey<WorldPreset> key = ResourceKey.create(Registry.WORLD_PRESET_REGISTRY, loc);
+        ResourceKey<WorldPreset> key = ResourceKey.create(Registries.WORLD_PRESET, loc);
         if (visibleInUI) {
             if (!didExplicitlySetDefault && DEFAULT == net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL) {
                 DEFAULT = key;
@@ -89,7 +90,7 @@ public class WorldPresets {
 
         for (Map.Entry<ResourceKey<WorldPreset>, PresetBuilder> e : BUILDERS.entrySet()) {
             TogetherWorldPreset preset = e.getValue().create(overworldStem, netherContext, endContext);
-            BuiltinRegistries.register(presets, e.getKey(), preset);
+            BuiltInRegistries.register(presets, e.getKey(), preset);
         }
         BUILDERS = null;
     }

src/main/resources/bclib.accesswidener

@@ -10,7 +10,7 @@ accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$LazyCondition
 accessible	class	net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource
 accessible  class   net/minecraft/world/level/levelgen/presets/WorldPresets$Bootstrap
 extendable  class   net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator
-accessible  class   net/minecraft/data/BuiltinRegistries$RegistryBootstrap
+accessible class net/minecraft/core/registries/BuiltInRegistries$RegistryBootstrap
 accessible class net/minecraft/core/Registry$RegistryBootstrap
 accessible class net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource
 accessible class net/minecraft/server/dedicated/DedicatedServerProperties$WorldDimensionData