From daa4a2b4afb1b149b7289f7d2b4b5e5e34d22216 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 12 Nov 2022 12:10:59 +0100 Subject: [PATCH] Migrated some API calls --- .../java/org/betterx/bclib/BCLibDatagen.java | 4 +- .../java/org/betterx/bclib/BCLibPatch.java | 1 - .../org/betterx/bclib/api/v2/PostInitAPI.java | 5 +- .../v2/advancement/AdvancementManager.java | 9 ++- .../api/v2/levelgen/biomes/BCLBiome.java | 1 - .../v2/levelgen/biomes/BCLBiomeRegistry.java | 1 - .../api/v2/levelgen/biomes/BiomeAPI.java | 7 +- .../v2/levelgen/biomes/InternalBiomeAPI.java | 1 - .../v2/levelgen/structures/BCLStructure.java | 1 - .../levelgen/structures/StructureWorld.java | 4 +- .../levelgen/features/BCLFeatureBuilder.java | 8 +-- .../betterx/bclib/blocks/BaseBarkBlock.java | 4 +- .../betterx/bclib/blocks/BaseButtonBlock.java | 6 +- .../betterx/bclib/blocks/BaseChestBlock.java | 4 +- .../betterx/bclib/blocks/BaseFenceBlock.java | 6 +- .../betterx/bclib/blocks/BaseGateBlock.java | 4 +- .../bclib/blocks/BaseMetalBarsBlock.java | 6 +- .../betterx/bclib/blocks/BasePathBlock.java | 4 +- .../bclib/blocks/BasePressurePlateBlock.java | 4 +- .../betterx/bclib/blocks/BaseSignBlock.java | 4 +- .../betterx/bclib/blocks/BaseSlabBlock.java | 4 +- .../betterx/bclib/blocks/BaseStairsBlock.java | 4 +- .../bclib/blocks/BaseTerrainBlock.java | 4 +- .../betterx/bclib/blocks/BaseWallBlock.java | 6 +- .../bclib/blocks/BaseWeightedPlateBlock.java | 4 +- .../bclib/blocks/LeveledAnvilBlock.java | 4 +- .../client/models/CustomModelBakery.java | 67 ++++++++++--------- .../render/BaseChestBlockEntityRenderer.java | 3 +- .../render/BaseSignBlockEntityRenderer.java | 3 +- .../bclib/integration/ModIntegration.java | 13 ++-- .../bclib/interfaces/SurvivesOnTags.java | 3 +- .../betterx/bclib/items/BaseAnvilItem.java | 3 +- .../bclib/mixin/client/MinecraftMixin.java | 3 +- .../mixin/common/BuiltinRegistriesMixin.java | 6 +- .../recipes/AbstractAdvancementRecipe.java | 5 +- .../betterx/bclib/recipes/AnvilRecipe.java | 8 +-- .../bclib/recipes/BCLRecipeManager.java | 4 +- .../java/org/betterx/bclib/util/ItemUtil.java | 10 +-- .../org/betterx/bclib/util/RecipeHelper.java | 6 +- .../betterx/bclib/util/StructureHelper.java | 4 +- .../betterx/bclib/util/TranslationHelper.java | 10 +-- src/main/java/org/betterx/ui/ColorUtil.java | 6 +- .../together/flatLevel/FlatLevelPresets.java | 6 +- .../together/levelgen/WorldGenUtil.java | 5 +- .../mixin/common/BuiltinRegistriesMixin.java | 6 +- .../mixin/common/MinecraftServerMixin.java | 3 +- .../common/MinecraftServerMixinLate.java | 3 +- .../mixin/common/WorldPresetMixin.java | 4 +- .../surfaceRules/SurfaceRuleRegistry.java | 7 +- .../surfaceRules/SurfaceRuleUtil.java | 3 +- .../worlds/together/tag/v3/TagManager.java | 3 +- .../worlds/together/tag/v3/TagRegistry.java | 6 +- .../together/world/event/WorldBootstrap.java | 5 +- .../worldPreset/TogetherWorldPreset.java | 11 +-- .../together/worldPreset/WorldPresets.java | 11 +-- src/main/resources/bclib.accesswidener | 2 +- 56 files changed, 172 insertions(+), 167 deletions(-) diff --git a/src/main/java/org/betterx/bclib/BCLibDatagen.java b/src/main/java/org/betterx/bclib/BCLibDatagen.java index 3916bb30..c2b13f20 100644 --- a/src/main/java/org/betterx/bclib/BCLibDatagen.java +++ b/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 dynamicOps = RegistryOps.create(JsonOps.INSTANCE, registryAccess); final List> futures = new ArrayList<>(); diff --git a/src/main/java/org/betterx/bclib/BCLibPatch.java b/src/main/java/org/betterx/bclib/BCLibPatch.java index cf25b9d0..deae690e 100644 --- a/src/main/java/org/betterx/bclib/BCLibPatch.java +++ b/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; diff --git a/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java index 35364550..83b1d9eb 100644 --- a/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java +++ b/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); }); diff --git a/src/main/java/org/betterx/bclib/api/v2/advancement/AdvancementManager.java b/src/main/java/org/betterx/bclib/api/v2/advancement/AdvancementManager.java index 92a03afa..03ad84b0 100644 --- a/src/main/java/org/betterx/bclib/api/v2/advancement/AdvancementManager.java +++ b/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 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); } diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java index e53cc027..c003151b 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java +++ b/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; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeRegistry.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeRegistry.java index 843ba88d..e5df8282 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeRegistry.java +++ b/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; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java index bf7a3b5c..b56048f3 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java +++ b/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> key = InternalBiomeAPI.biomeRegistry.getResourceKey(biome); if (key.isPresent()) return key.get(); } - return BuiltinRegistries.BIOME + return BuiltInRegistries.BIOME .getResourceKey(biome) .orElseGet(null); } diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java index d9ff77fd..3c32d6c8 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java +++ b/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; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java index 915c067e..386a3818 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java +++ b/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; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java index e5c50444..da10abfe 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java +++ b/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) ); } diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java index f5c8c048..5ad56fc3 100644 --- a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java +++ b/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, FC extends Featur ResourceLocation id, ConfiguredFeature cFeature ) { - return (Holder>) (Object) BuiltinRegistries.register( - BuiltinRegistries.CONFIGURED_FEATURE, + return (Holder>) (Object) BuiltInRegistries.register( + BuiltInRegistries.CONFIGURED_FEATURE, id, cFeature ); @@ -671,7 +671,7 @@ public abstract class BCLFeatureBuilder, FC extends Featur // is meant to prevent that... if (NoneFeatureConfiguration.NONE != null) return (FC) NoneFeatureConfiguration.NONE; - + return (FC) NoneFeatureConfiguration.INSTANCE; } return configuration; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java index b4875661..93e67b05 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java +++ b/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 createBlockPattern(ResourceLocation blockId) { - blockId = Registry.BLOCK.getKey(this); + blockId = BuiltInRegistries.BLOCK.getKey(this); return PatternsHelper.createJson(BasePatterns.BLOCK_BASE, replacePath(blockId)); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java index 86a98de6..49cf3d2b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java +++ b/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 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 pattern = blockState.getValue(POWERED) ? PatternsHelper.createJson( BasePatterns.BLOCK_BUTTON_PRESSED, diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java index 577bcad9..d3e7f898 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java +++ b/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); } } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java index 7b987c17..089f2e37 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java +++ b/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 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 pattern = Optional.empty(); if (path.endsWith("_post")) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java index 16a2ff34..22363d3a 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java +++ b/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 pattern; if (inWall) { pattern = isOpen diff --git a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java index fd201df5..bed783e7 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java +++ b/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 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 pattern = Optional.empty(); if (path.endsWith("_post")) { diff --git a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java index 409b78ea..c99e59f3 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java +++ b/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 textures = Maps.newHashMap(); textures.put("%modid%", blockId.getNamespace()); diff --git a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java index f39aaee5..ac90160c 100644 --- a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java +++ b/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 pattern; if (blockState.getValue(POWERED)) { pattern = PatternsHelper.createJson(BasePatterns.BLOCK_PLATE_DOWN, parentId); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java index 57a3a1bd..59b299ef 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java +++ b/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); } diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java index 96631d99..0482e035 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java +++ b/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 pattern; if (blockState.getValue(TYPE) == SlabType.DOUBLE) { pattern = PatternsHelper.createBlockSimple(parentId); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java index 06342f76..2acb7f31 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java +++ b/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 pattern = PatternsHelper.createJson(switch (blockState.getValue(SHAPE)) { case STRAIGHT -> BasePatterns.BLOCK_STAIR; case INNER_LEFT, INNER_RIGHT -> BasePatterns.BLOCK_STAIR_INNER; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index 912fd404..1fe81940 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/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(); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java index f3d25754..a8a10036 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java +++ b/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 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 pattern = Optional.empty(); if (path.endsWith("_post")) { diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java index fd910ef6..ab45b46b 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java +++ b/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 pattern; if (blockState.getValue(POWER) > 0) { pattern = PatternsHelper.createJson(BasePatterns.BLOCK_PLATE_DOWN, parentId); diff --git a/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java b/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java index a8129594..c06635a0 100644 --- a/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java +++ b/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 getAnvils() { - return Registry.BLOCK + return BuiltInRegistries.BLOCK .stream() .filter(b -> b instanceof LeveledAnvilBlock || b == Blocks.ANVIL) .toList(); diff --git a/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java b/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java index e2cbcc46..9fcdeed4 100644 --- a/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java +++ b/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 -> { - ResourceLocation blockID = Registry.BLOCK.getKey(block); - ResourceLocation storageID = new ResourceLocation( - blockID.getNamespace(), - "blockstates/" + blockID.getPath() + ".json" - ); - if (resourceManager.getResource(storageID).isEmpty()) { - addBlockModel(blockID, block); - } - storageID = new ResourceLocation(blockID.getNamespace(), "models/item/" + blockID.getPath() + ".json"); - if (resourceManager.getResource(storageID).isEmpty()) { - addItemModel(blockID, (ItemModelProvider) block); - } - }); + BuiltInRegistries.BLOCK.stream() + .parallel() + .filter(block -> block instanceof BlockModelProvider) + .forEach(block -> { + ResourceLocation blockID = BuiltInRegistries.BLOCK.getKey(block); + ResourceLocation storageID = new ResourceLocation( + blockID.getNamespace(), + "blockstates/" + blockID.getPath() + ".json" + ); + if (resourceManager.getResource(storageID).isEmpty()) { + addBlockModel(blockID, block); + } + storageID = new ResourceLocation( + blockID.getNamespace(), + "models/item/" + blockID.getPath() + ".json" + ); + if (resourceManager.getResource(storageID).isEmpty()) { + addItemModel(blockID, (ItemModelProvider) block); + } + }); - Registry.ITEM.stream() - .parallel() - .filter(item -> item instanceof ItemModelProvider || RecordItemModelProvider.has(item)) - .forEach(item -> { - ResourceLocation registryID = Registry.ITEM.getKey(item); - ResourceLocation storageID = new ResourceLocation( - registryID.getNamespace(), - "models/item/" + registryID.getPath() + ".json" - ); - final ItemModelProvider provider = (item instanceof ItemModelProvider) - ? (ItemModelProvider) item - : RecordItemModelProvider.get(item); + BuiltInRegistries.ITEM.stream() + .parallel() + .filter(item -> item instanceof ItemModelProvider || RecordItemModelProvider.has(item)) + .forEach(item -> { + ResourceLocation registryID = BuiltInRegistries.ITEM.getKey(item); + ResourceLocation storageID = new ResourceLocation( + registryID.getNamespace(), + "models/item/" + registryID.getPath() + ".json" + ); + final ItemModelProvider provider = (item instanceof ItemModelProvider) + ? (ItemModelProvider) item + : RecordItemModelProvider.get(item); - if (resourceManager.getResource(storageID).isEmpty()) { - addItemModel(registryID, provider); - } - }); + if (resourceManager.getResource(storageID).isEmpty()) { + addItemModel(registryID, provider); + } + }); } private void addBlockModel(ResourceLocation blockID, Block block) { diff --git a/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java b/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java index 8827b803..bcefb10b 100644 --- a/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java +++ b/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 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 getBiome(String name) { - return BuiltinRegistries.BIOME.getHolder(getKey(name)).orElseThrow(); + return BuiltInRegistries.BIOME.getHolder(getKey(name)).orElseThrow(); } public Class getClass(String path) { diff --git a/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java b/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java index 11820474..299b8557 100644 --- a/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java +++ b/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()) diff --git a/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java b/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java index 03b7401f..e5fa20d6 100644 --- a/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java +++ b/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()); } } diff --git a/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java b/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java index d306bfa9..0e0834eb 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java +++ b/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 = "*", 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()); diff --git a/src/main/java/org/betterx/bclib/mixin/common/BuiltinRegistriesMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BuiltinRegistriesMixin.java index b5733252..e774a1c4 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/BuiltinRegistriesMixin.java +++ b/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 > R internalRegister( ResourceKey> resourceKey, R writableRegistry, - BuiltinRegistries.RegistryBootstrap registryBootstrap, + BuiltInRegistries.RegistryBootstrap registryBootstrap, Lifecycle lifecycle ) { throw new RuntimeException("Shadowed Call"); diff --git a/src/main/java/org/betterx/bclib/recipes/AbstractAdvancementRecipe.java b/src/main/java/org/betterx/bclib/recipes/AbstractAdvancementRecipe.java index 2f8cf591..8b0b8867 100644 --- a/src/main/java/org/betterx/bclib/recipes/AbstractAdvancementRecipe.java +++ b/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) - : Registry.ITEM.getKey((Item) block)) + ? BuiltInRegistries.BLOCK.getKey((Block) block) + : BuiltInRegistries.ITEM.getKey((Item) block)) .filter(id -> id != null) .map(id -> id.getPath()) .collect(Collectors.joining("_")); diff --git a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java index b3783b38..789731c0 100644 --- a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java +++ b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java @@ -209,10 +209,10 @@ public class AnvilRecipe implements Recipe, UnknownReceipBookCategory @Override public NonNullList getIngredients() { NonNullList defaultedList = NonNullList.create(); - defaultedList.add(Ingredient.of(Registry.ITEM.stream() - .filter(AnvilRecipe::isHammer) - .filter(this::canUse) - .map(ItemStack::new)) + defaultedList.add(Ingredient.of(BuiltInRegistries.ITEM.stream() + .filter(AnvilRecipe::isHammer) + .filter(this::canUse) + .map(ItemStack::new)) ); defaultedList.add(input); return defaultedList; diff --git a/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java b/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java index bccb8937..52f99959 100644 --- a/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java +++ b/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(); } } diff --git a/src/main/java/org/betterx/bclib/util/ItemUtil.java b/src/main/java/org/betterx/bclib/util/ItemUtil.java index 0d964bb6..f3fc9848 100644 --- a/src/main/java/org/betterx/bclib/util/ItemUtil.java +++ b/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); diff --git a/src/main/java/org/betterx/bclib/util/RecipeHelper.java b/src/main/java/org/betterx/bclib/util/RecipeHelper.java index 340e090b..9530195f 100644 --- a/src/main/java/org/betterx/bclib/util/RecipeHelper.java +++ b/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(); } } diff --git a/src/main/java/org/betterx/bclib/util/StructureHelper.java b/src/main/java/org/betterx/bclib/util/StructureHelper.java index eca53bf9..d4fecc77 100644 --- a/src/main/java/org/betterx/bclib/util/StructureHelper.java +++ b/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; } diff --git a/src/main/java/org/betterx/bclib/util/TranslationHelper.java b/src/main/java/org/betterx/bclib/util/TranslationHelper.java index 28339d19..1a1efbb5 100644 --- a/src/main/java/org/betterx/bclib/util/TranslationHelper.java +++ b/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 -> { - if (Registry.BLOCK.getKey(block).getNamespace().equals(modID)) { + BuiltInRegistries.BLOCK.forEach(block -> { + 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 -> { - if (Registry.ITEM.getKey(item).getNamespace().equals(modID)) { + BuiltInRegistries.ITEM.forEach(item -> { + if (BuiltInRegistries.ITEM.getKey(item).getNamespace().equals(modID)) { String name = item.getDescription().getString(); if (!translation.has(name)) { missingNames.add(name); diff --git a/src/main/java/org/betterx/ui/ColorUtil.java b/src/main/java/org/betterx/ui/ColorUtil.java index 81c09d24..4dd8e0b3 100644 --- a/src/main/java/org/betterx/ui/ColorUtil.java +++ b/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); - if (id.equals(Registry.ITEM.getDefaultKey())) return -1; + ResourceLocation id = BuiltInRegistries.ITEM.getKey(item); + if (id.equals(BuiltInRegistries.ITEM.getDefaultKey())) return -1; if (colorPalette.containsKey(id)) { return colorPalette.get(id); } diff --git a/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java b/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java index 3616b232..f15a7e25 100644 --- a/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java +++ b/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 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 register(ResourceLocation loc) { ResourceKey key = ResourceKey.create( - Registry.FLAT_LEVEL_GENERATOR_PRESET_REGISTRY, + Registries.FLAT_LEVEL_GENERATOR_PRESET, loc ); FLAT_LEVEL_PRESETS.addUntyped(FlatLevelGeneratorPresetTags.VISIBLE, key.location()); diff --git a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java b/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java index 0c82377a..ec0cced3 100644 --- a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java +++ b/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 + "."); diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java b/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java index fdfffef1..190494cd 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java +++ b/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 = "", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V")) @@ -25,7 +25,7 @@ public class BuiltinRegistriesMixin { @Shadow static protected Registry registerSimple( - ResourceKey> resourceKey, BuiltinRegistries.RegistryBootstrap registryBootstrap + ResourceKey> resourceKey, BuiltInRegistries.RegistryBootstrap registryBootstrap ) { throw new RuntimeException("Shadowed Call"); } diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java b/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java index 92ed4305..c30c8367 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java +++ b/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 dimensionRegistry = this.registries.compositeAccess() - .registryOrThrow(Registry.LEVEL_STEM_REGISTRY); + .registryOrThrow(Registries.LEVEL_STEM); WorldBootstrap.finalizeWorldGenSettings(dimensionRegistry); } } diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java b/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java index ff92fa09..d41ad786 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java +++ b/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 dimensionRegistry = this.registries.compositeAccess() - .registryOrThrow(Registry.LEVEL_STEM_REGISTRY); + .registryOrThrow(Registries.LEVEL_STEM); ChunkGeneratorUtils.restoreOriginalBiomeSourceInAllDimension(dimensionRegistry); } } diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java b/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java index 7b00b51b..e846a3a4 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java +++ b/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, App, WorldPreset>> CODEC_FUNCTION = builderInstance -> { RecordCodecBuilder, LevelStem>> dimensionsBuilder = Codec .unboundedMap( - ResourceKey.codec(Registry.LEVEL_STEM_REGISTRY), + ResourceKey.codec(Registries.LEVEL_STEM), LevelStem.CODEC ) .fieldOf("dimensions") diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java b/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java index 6aba4351..cc9a1626 100644 --- a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java +++ b/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 bootstrap(Registry 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 ) diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java b/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java index 28358d22..c07e2ef2 100644 --- a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java +++ b/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 getRulesForBiomes(List biomes) { - Registry biomeRegistry = WorldBootstrap.getLastRegistryAccess().registryOrThrow(Registry.BIOME_REGISTRY); + Registry biomeRegistry = WorldBootstrap.getLastRegistryAccess().registryOrThrow(Registries.BIOME); List biomeIDs = biomes.stream() .map(b -> biomeRegistry.getKey(b)) .filter(id -> id != null) diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java b/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java index e547d9cb..f4e526ac 100644 --- a/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java +++ b/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> TYPES = Maps.newHashMap(); - public static TagRegistry.RegistryBacked BLOCKS = registerType(Registry.BLOCK); + public static TagRegistry.RegistryBacked BLOCKS = registerType(BuiltInRegistries.BLOCK); public static TagRegistry.Items ITEMS = registerItem(); public static TagRegistry.Biomes BIOMES = registerBiome(); diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java b/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java index 88f4b2bc..d574f1a4 100644 --- a/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java +++ b/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 { public static class Biomes extends Simple { Biomes(String directory, Function locationProvider) { - super(Registry.BIOME_REGISTRY, directory, locationProvider); + super(Registries.BIOME, directory, locationProvider); } /** @@ -111,7 +113,7 @@ public class TagRegistry { public static class Items extends RegistryBacked { Items() { - super(Registry.ITEM); + super(BuiltInRegistries.ITEM); } @SafeVarargs diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java b/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java index a3ed1594..955a9bb3 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java +++ b/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> newPreset = LAST_REGISTRY_ACCESS - .registryOrThrow(Registry.WORLD_PRESET_REGISTRY) + .registryOrThrow(Registries.WORLD_PRESET) .getHolder(presetKey.get()); if (newPreset.isPresent()) currentPreset = (Optional>) (Optional) newPreset; } @@ -322,7 +323,7 @@ public class WorldBootstrap { public static LayeredRegistryAccess enforceInLayeredRegistry(LayeredRegistryAccess registries) { RegistryAccess access = registries.compositeAccess(); Helpers.onRegistryReady(access); - final Registry dimensions = access.registryOrThrow(Registry.LEVEL_STEM_REGISTRY); + final Registry dimensions = access.registryOrThrow(Registries.LEVEL_STEM); final Registry changedDimensions = WorldGenUtil.repairBiomeSourceInAllDimensions(access, dimensions); if (dimensions != changedDimensions) { if (Configs.MAIN_CONFIG.verboseLogging()) { diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java b/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java index 6913767a..29305228 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java +++ b/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, LevelStem> map) { - Registry registry = new MappedRegistry<>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental()); + Registry 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 getDimensions(ResourceKey key) { RegistryAccess access = WorldBootstrap.getLastRegistryAccessOrElseBuiltin(); var preset = (access == null - ? BuiltinRegistries.WORLD_PRESET - : access.registryOrThrow(Registry.WORLD_PRESET_REGISTRY)) + ? BuiltInRegistries.WORLD_PRESET + : 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 CODEC = RecordCodecBuilder.create(instance -> instance .group(Codec.unboundedMap( - ResourceKey.codec(Registry.LEVEL_STEM_REGISTRY), + ResourceKey.codec(Registries.LEVEL_STEM), ChunkGenerator.CODEC ) .fieldOf("dimensions") diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java b/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java index 75ff1aaf..43bbfaf9 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java +++ b/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 WORLD_PRESETS = - TagManager.registerType(BuiltinRegistries.WORLD_PRESET, "tags/worldgen/world_preset"); + TagManager.registerType(BuiltInRegistries.WORLD_PRESET, "tags/worldgen/world_preset"); private static Map, PresetBuilder> BUILDERS = Maps.newHashMap(); private static ResourceKey DEFAULT = net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL; public static Holder get(RegistryAccess access, ResourceKey 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 register(ResourceLocation loc, boolean visibleInUI) { - ResourceKey key = ResourceKey.create(Registry.WORLD_PRESET_REGISTRY, loc); + ResourceKey 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, 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; } diff --git a/src/main/resources/bclib.accesswidener b/src/main/resources/bclib.accesswidener index b440760e..67ed6298 100644 --- a/src/main/resources/bclib.accesswidener +++ b/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