Merge commit 'befdd2c10a' into 1.17

This reverts commit 70b109758d.

build.gradle

@@ -7,12 +7,12 @@ buildscript {
 plugins {
 	id 'idea'
 	id 'eclipse'
-	id 'fabric-loom' version '0.7-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -33,7 +33,7 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	useApi "vazkii.patchouli:Patchouli:1.16.4-${project.patchouli_version}"
+	//useApi "vazkii.patchouli:Patchouli:1.16.4-${project.patchouli_version}"
 }
 
 def useOptional(String dep) {

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.16.5
+minecraft_version= 1.17
-yarn_mappings=6
+yarn_mappings= 6
-loader_version=0.11.3
+loader_version= 0.11.6
 
 # Mod Properties
-mod_version = 0.1.45
+mod_version = 0.2.0
 maven_group = ru.bclib
 archives_base_name = bclib
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 patchouli_version = 50-FABRIC
-fabric_version = 0.32.9+1.16
+fabric_version = 0.36.0+1.17

src/main/java/ru/bclib/blockentities/BaseBarrelBlockEntity.java

@@ -1,5 +1,6 @@
 package ru.bclib.blockentities;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.core.Vec3i;
 import net.minecraft.nbt.CompoundTag;
@@ -26,13 +27,13 @@ public class BaseBarrelBlockEntity extends RandomizableContainerBlockEntity {
 	private NonNullList<ItemStack> inventory;
 	private int viewerCount;
 
-	private BaseBarrelBlockEntity(BlockEntityType<?> type) {
+	private BaseBarrelBlockEntity(BlockEntityType<?> type, BlockPos blockPos, BlockState blockState) {
-		super(type);
+		super(type, blockPos, blockState);
 		this.inventory = NonNullList.withSize(27, ItemStack.EMPTY);
 	}
 
-	public BaseBarrelBlockEntity() {
+	public BaseBarrelBlockEntity(BlockPos blockPos, BlockState blockState) {
-		this(BaseBlockEntities.BARREL);
+		this(BaseBlockEntities.BARREL, blockPos, blockState);
 	}
 
 	public CompoundTag save(CompoundTag tag) {
@@ -44,8 +45,8 @@ public class BaseBarrelBlockEntity extends RandomizableContainerBlockEntity {
 		return tag;
 	}
 
-	public void load(BlockState state, CompoundTag tag) {
+	public void load(CompoundTag tag) {
-		super.load(state, tag);
+		super.load(tag);
 		this.inventory = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
 		if (!this.tryLoadLootTable(tag)) {
 			ContainerHelper.loadAllItems(tag, this.inventory);
@@ -97,10 +98,7 @@ public class BaseBarrelBlockEntity extends RandomizableContainerBlockEntity {
 
 	public void tick() {
 		if (level != null) {
-			int x = worldPosition.getX();
+			viewerCount = ChestBlockEntity.getOpenCount(level, worldPosition);
-			int y = worldPosition.getY();
-			int z = worldPosition.getZ();
-			viewerCount = ChestBlockEntity.getOpenCount(level, this, x, y, z);
 			if (viewerCount > 0) {
 				scheduleUpdate();
 			} else {

src/main/java/ru/bclib/blockentities/BaseChestBlockEntity.java

@@ -1,10 +1,12 @@
 package ru.bclib.blockentities;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.registry.BaseBlockEntities;
 
 public class BaseChestBlockEntity extends ChestBlockEntity {
-	public BaseChestBlockEntity() {
+	public BaseChestBlockEntity(BlockPos blockPos, BlockState blockState) {
-		super(BaseBlockEntities.CHEST);
+		super(BaseBlockEntities.CHEST, blockPos, blockState);
 	}
 }

src/main/java/ru/bclib/blockentities/BaseFurnaceBlockEntity.java

@@ -1,5 +1,6 @@
 package ru.bclib.blockentities;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Inventory;
@@ -7,11 +8,12 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.FurnaceMenu;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.registry.BaseBlockEntities;
 
 public class BaseFurnaceBlockEntity extends AbstractFurnaceBlockEntity {
-	public BaseFurnaceBlockEntity() {
+	public BaseFurnaceBlockEntity(BlockPos blockPos, BlockState blockState) {
-		super(BaseBlockEntities.FURNACE, RecipeType.SMELTING);
+		super(BaseBlockEntities.FURNACE, blockPos, blockState, RecipeType.SMELTING);
 	}
 
 	protected Component getDefaultName() {

src/main/java/ru/bclib/blockentities/BaseSignBlockEntity.java

@@ -1,12 +1,14 @@
 package ru.bclib.blockentities;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.registry.BaseBlockEntities;
 
 public class BaseSignBlockEntity extends SignBlockEntity {
-	public BaseSignBlockEntity() {
+	public BaseSignBlockEntity(BlockPos blockPos, BlockState blockState) {
-		super();
+		super(blockPos, blockState);
 	}
 
 	@Override

src/main/java/ru/bclib/blockentities/DynamicBlockEntityType.java

@@ -6,24 +6,40 @@ import java.util.function.Supplier;
 
 import com.google.common.collect.Sets;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
 
 public class DynamicBlockEntityType<T extends BlockEntity> extends BlockEntityType<T> {
 
 	private final Set<Block> validBlocks = Sets.newHashSet();
+	private final BlockEntitySupplier<? extends T> factory;
 
-	public DynamicBlockEntityType(Supplier<? extends T> supplier) {
+	public DynamicBlockEntityType(BlockEntitySupplier<? extends T> supplier) {
-		super(supplier, Collections.emptySet(), null);
+		super(null, Collections.emptySet(), null);
+		this.factory = supplier;
 	}
 
 	@Override
-	public boolean isValid(Block block) {
+	@Nullable public T create(BlockPos blockPos, BlockState blockState) {
-		return validBlocks.contains(block);
+		return factory.create(blockPos, blockState);
+	}
+
+	@Override
+	public boolean isValid(BlockState blockState) {
+		return validBlocks.contains(blockState.getBlock());
 	}
 
 	public void registerBlock(Block block) {
 		validBlocks.add(block);
 	}
+
+	@FunctionalInterface
+	public
+	interface BlockEntitySupplier<T extends BlockEntity> {
+		T create(BlockPos blockPos, BlockState blockState);
+	}
 }

src/main/java/ru/bclib/blocks/BaseAnvilBlock.java

@@ -35,7 +35,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro
 	public static final IntegerProperty DESTRUCTION = BlockProperties.DESTRUCTION;
 
 	public BaseAnvilBlock(MaterialColor color) {
-		super(FabricBlockSettings.copyOf(Blocks.ANVIL).materialColor(color));
+		super(FabricBlockSettings.copyOf(Blocks.ANVIL).mapColor(color));
 	}
 	
 	@Override
@@ -43,8 +43,9 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro
 		super.createBlockStateDefinition(builder);
 		builder.add(DESTRUCTION);
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack dropStack = new ItemStack(this);
 		int destruction = state.getValue(DESTRUCTION);

src/main/java/ru/bclib/blocks/BaseAttachedBlock.java

@@ -16,12 +16,13 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import ru.bclib.util.BlocksHelper;
 
+@SuppressWarnings("deprecation")
 public abstract class BaseAttachedBlock extends BaseBlockNotFull {
 	public static final DirectionProperty FACING = BlockStateProperties.FACING;
 	
 	public BaseAttachedBlock(Properties settings) {
 		super(settings);
-		this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.UP));
+		registerDefaultState(defaultBlockState().setValue(FACING, Direction.UP));
 	}
 	
 	@Override
@@ -31,7 +32,7 @@ public abstract class BaseAttachedBlock extends BaseBlockNotFull {
 	
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-		BlockState blockState = this.defaultBlockState();
+		BlockState blockState = defaultBlockState();
 		LevelReader worldView = ctx.getLevel();
 		BlockPos blockPos = ctx.getClickedPos();
 		Direction[] directions = ctx.getNearestLookingDirections();
@@ -47,7 +48,7 @@ public abstract class BaseAttachedBlock extends BaseBlockNotFull {
 
 	@Override
 	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
-		Direction direction = (Direction) state.getValue(FACING);
+		Direction direction = state.getValue(FACING);
 		BlockPos blockPos = pos.relative(direction.getOpposite());
 		return canSupportCenter(world, blockPos, direction) || world.getBlockState(blockPos).is(BlockTags.LEAVES);
 	}

src/main/java/ru/bclib/blocks/BaseBarrelBlock.java

@@ -46,11 +46,12 @@ public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider {
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return BaseBlockEntities.BARREL.create();
+		return BaseBlockEntities.BARREL.create(blockPos, blockState);
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		List<ItemStack> drop = super.getDrops(state, builder);
 		drop.add(new ItemStack(this.asItem()));

src/main/java/ru/bclib/blocks/BaseBlock.java

@@ -17,6 +17,7 @@ public class BaseBlock extends Block implements BlockModelProvider {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseBlockWithEntity.java

@@ -3,6 +3,7 @@ package ru.bclib.blocks;
 import java.util.Collections;
 import java.util.List;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.BaseEntityBlock;
@@ -16,11 +17,12 @@ public class BaseBlockWithEntity extends BaseEntityBlock {
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
 		return null;
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseButtonBlock.java

@@ -35,6 +35,7 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseChainBlock.java

@@ -29,10 +29,11 @@ import ru.bclib.interfaces.IRenderTyped;
 
 public class BaseChainBlock extends ChainBlock implements BlockModelProvider, IRenderTyped {
 	public BaseChainBlock(MaterialColor color) {
-		super(FabricBlockSettings.copyOf(Blocks.CHAIN).materialColor(color));
+		super(FabricBlockSettings.copyOf(Blocks.CHAIN).mapColor(color));
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseChestBlock.java

@@ -3,6 +3,7 @@ package ru.bclib.blocks;
 import java.util.List;
 import java.util.Optional;
 
+import net.minecraft.core.BlockPos;
 import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.api.EnvType;
@@ -33,12 +34,12 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider {
 	}
 	
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world)
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-	{
+		return BaseBlockEntities.CHEST.create(blockPos, blockState);
-		return BaseBlockEntities.CHEST.create();
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder)
 	{
 		List<ItemStack> drop = super.getDrops(state, builder);

src/main/java/ru/bclib/blocks/BaseComposterBlock.java

@@ -28,8 +28,9 @@ public class BaseComposterBlock extends ComposterBlock implements BlockModelProv
 	public BaseComposterBlock(Block source) {
 		super(FabricBlockSettings.copyOf(source));
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this.asItem()));
 	}

src/main/java/ru/bclib/blocks/BaseCraftingTableBlock.java

@@ -28,6 +28,7 @@ public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockM
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this.asItem()));
 	}

src/main/java/ru/bclib/blocks/BaseCropBlock.java

@@ -106,8 +106,9 @@ public class BaseCropBlock extends BasePlantBlock {
 	public boolean isBonemealSuccess(Level world, Random random, BlockPos pos, BlockState state) {
 		return state.getValue(AGE) < 3;
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
 		super.tick(state, world, pos, random);
 		if (isBonemealSuccess(world, random, pos, state) && random.nextInt(8) == 0) {

src/main/java/ru/bclib/blocks/BaseDoorBlock.java

@@ -36,6 +36,7 @@ public class BaseDoorBlock extends DoorBlock implements IRenderTyped, BlockModel
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		if (state.getValue(HALF) == DoubleBlockHalf.LOWER)
 			return Collections.singletonList(new ItemStack(this.asItem()));

src/main/java/ru/bclib/blocks/BaseDoublePlantBlock.java

@@ -38,6 +38,7 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 
+@SuppressWarnings("deprecation")
 public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements IRenderTyped, BonemealableBlock {
 	private static final VoxelShape SHAPE = Block.box(4, 2, 4, 12, 16, 12);
 	public static final IntegerProperty ROTATION = BlockProperties.ROTATION;
@@ -110,7 +111,7 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements I
 		}
 		
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

src/main/java/ru/bclib/blocks/BaseFenceBlock.java

@@ -35,6 +35,7 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java

@@ -1,14 +1,7 @@
 package ru.bclib.blocks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -20,14 +13,17 @@ import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FurnaceBlock;
+import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blockentities.BaseFurnaceBlockEntity;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.BlockModelProvider;
@@ -35,6 +31,11 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
+import ru.bclib.registry.BaseBlockEntities;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, IRenderTyped {
 	public BaseFurnaceBlock(Block source) {
@@ -42,8 +43,8 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new BaseFurnaceBlockEntity();
+		return new BaseFurnaceBlockEntity(blockPos, blockState);
 	}
 	
 	@Override
@@ -95,8 +96,9 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 	public BCLRenderLayer getRenderLayer() {
 		return BCLRenderLayer.CUTOUT;
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		List<ItemStack> drop = Lists.newArrayList(new ItemStack(this));
 		BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
@@ -108,4 +110,15 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 		}
 		return drop;
 	}
+
+	@Override
+	@Nullable
+	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
+		return createFurnaceTicker(level, blockEntityType, BaseBlockEntities.FURNACE);
+	}
+
+	@Nullable
+	protected static <T extends BlockEntity> BlockEntityTicker<T> createFurnaceTicker(Level level, BlockEntityType<T> blockEntityType, BlockEntityType<? extends AbstractFurnaceBlockEntity> blockEntityType2) {
+		return level.isClientSide ? null : createTickerHelper(blockEntityType, blockEntityType2, AbstractFurnaceBlockEntity::serverTick);
+	}
 }

src/main/java/ru/bclib/blocks/BaseGateBlock.java

@@ -33,6 +33,7 @@ public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseLadderBlock.java

@@ -39,6 +39,7 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 
+@SuppressWarnings("deprecation")
 public class BaseLadderBlock extends BaseBlockNotFull implements IRenderTyped, BlockModelProvider {
 	public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
@@ -57,17 +58,14 @@ public class BaseLadderBlock extends BaseBlockNotFull implements IRenderTyped, B
 		stateManager.add(WATERLOGGED);
 	}
 
+	@Override
 	public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
-		switch (state.getValue(FACING)) {
+		return switch (state.getValue(FACING)) {
-		case SOUTH:
+			case SOUTH -> SOUTH_SHAPE;
-			return SOUTH_SHAPE;
+			case WEST -> WEST_SHAPE;
-		case WEST:
+			case EAST -> EAST_SHAPE;
-			return WEST_SHAPE;
+			default -> NORTH_SHAPE;
-		case EAST:
+		};
-			return EAST_SHAPE;
-		default:
-			return NORTH_SHAPE;
-		}
 	}
 
 	private boolean canPlaceOn(BlockGetter world, BlockPos pos, Direction side) {
@@ -78,7 +76,7 @@ public class BaseLadderBlock extends BaseBlockNotFull implements IRenderTyped, B
 	@Override
 	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
 		Direction direction = state.getValue(FACING);
-		return this.canPlaceOn(world, pos.relative(direction.getOpposite()), direction);
+		return canPlaceOn(world, pos.relative(direction.getOpposite()), direction);
 	}
 
 	@Override

src/main/java/ru/bclib/blocks/BaseLeavesBlock.java

@@ -29,7 +29,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
 	
 	public BaseLeavesBlock(Block sapling, MaterialColor color) {
 		super(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES)
-				.materialColor(color)
+				.mapColor(color)
 				.breakByTool(FabricToolTags.HOES)
 				.breakByTool(FabricToolTags.SHEARS)
 				.breakByHand(true)
@@ -41,7 +41,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
 	
 	public BaseLeavesBlock(Block sapling, MaterialColor color, int light) {
 		super(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES)
-				.materialColor(color)
+				.mapColor(color)
 				.luminance(light)
 				.breakByTool(FabricToolTags.HOES)
 				.breakByTool(FabricToolTags.SHEARS)
@@ -55,12 +55,13 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
 	public BCLRenderLayer getRenderLayer() {
 		return BCLRenderLayer.CUTOUT;
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null) {
-			if (tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+			if (FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 				return Collections.singletonList(new ItemStack(this));
 			}
 			int fortune = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, tool);

src/main/java/ru/bclib/blocks/BaseMetalBarsBlock.java

@@ -34,6 +34,7 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}
@@ -99,7 +100,7 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi
 
 	@Environment(EnvType.CLIENT)
 	public boolean skipRendering(BlockState state, BlockState stateFrom, Direction direction) {
-		if (direction.getAxis().isVertical() && stateFrom.getBlock().is(this) && !stateFrom.equals(state)) {
+		if (direction.getAxis().isVertical() && stateFrom.getBlock() == this && !stateFrom.equals(state)) {
 			return false;
 		}
 		return super.skipRendering(state, stateFrom, direction);

src/main/java/ru/bclib/blocks/BaseOreBlock.java

@@ -8,6 +8,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
+import net.minecraft.util.valueproviders.UniformInt;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -26,26 +27,20 @@ public class BaseOreBlock extends OreBlock implements BlockModelProvider {
 	private final Item dropItem;
 	private final int minCount;
 	private final int maxCount;
-	private final int experience;
 	
 	public BaseOreBlock(Item drop, int minCount, int maxCount, int experience) {
 		super(FabricBlockSettings.of(Material.STONE, MaterialColor.SAND)
 				.hardness(3F)
 				.resistance(9F)
 				.requiresCorrectToolForDrops()
-				.sound(SoundType.STONE));
+				.sound(SoundType.STONE), UniformInt.of(1, experience));
 		this.dropItem = drop;
 		this.minCount = minCount;
 		this.maxCount = maxCount;
-		this.experience = experience;
-	}
-	
-	@Override
-	protected int xpOnDrop(Random random) {
-		return this.experience > 0 ? random.nextInt(experience) + 1 : 0;
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && tool.isCorrectToolForDrops(state)) {

src/main/java/ru/bclib/blocks/BasePlantBlock.java

@@ -33,6 +33,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+@SuppressWarnings("deprecation")
 public abstract class BasePlantBlock extends BaseBlockNotFull implements IRenderTyped, BonemealableBlock {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
 	
@@ -97,7 +98,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements IRender
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

src/main/java/ru/bclib/blocks/BasePlantWithAgeBlock.java

@@ -53,8 +53,9 @@ public abstract class BasePlantWithAgeBlock extends BasePlantBlock {
 	public boolean isBonemealSuccess(Level world, Random random, BlockPos pos, BlockState state) {
 		return true;
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
 		super.tick(state, world, pos, random);
 		if (random.nextInt(8) == 0) {

src/main/java/ru/bclib/blocks/BasePressurePlateBlock.java

@@ -33,6 +33,7 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseRotatedPillarBlock.java

@@ -30,8 +30,9 @@ public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockM
 	public BaseRotatedPillarBlock(Block block) {
 		super(FabricBlockSettings.copyOf(block));
 	}
-	
+
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseSignBlock.java

@@ -48,6 +48,7 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.ISpetialItem;
 import ru.bclib.util.BlocksHelper;
 
+@SuppressWarnings("deprecation")
 public class BaseSignBlock extends SignBlock implements BlockModelProvider, ISpetialItem {
 	public static final IntegerProperty ROTATION = BlockStateProperties.ROTATION_16;
 	public static final BooleanProperty FLOOR = BooleanProperty.create("floor");
@@ -77,8 +78,8 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, ISpe
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new BaseSignBlockEntity();
+		return new BaseSignBlockEntity(blockPos, blockState);
 	}
 	
 	@Override
@@ -87,7 +88,7 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, ISpe
 			BaseSignBlockEntity sign = (BaseSignBlockEntity) world.getBlockEntity(pos);
 			if (sign != null) {
 				if (!world.isClientSide) {
-					sign.setAllowedPlayerEditor((Player) placer);
+					sign.setAllowedPlayerEditor(placer.getUUID());
 					((ServerPlayer) placer).connection.send(new ClientboundOpenSignEditorPacket(pos));
 				} else {
 					sign.setEditable(true);
@@ -169,12 +170,6 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, ISpe
 		return Collections.singletonList(new ItemStack(this));
 	}
 
-	@Override
-	public Fluid takeLiquid(LevelAccessor world, BlockPos pos, BlockState state) {
-		// TODO Auto-generated method stub
-		return super.takeLiquid(world, pos, state);
-	}
-
 	@Override
 	public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) {
 		// TODO Auto-generated method stub

src/main/java/ru/bclib/blocks/BaseSlabBlock.java

@@ -35,6 +35,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseStairsBlock.java

@@ -37,6 +37,7 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider {
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseStripableLogBlock.java

@@ -20,13 +20,14 @@ public class BaseStripableLogBlock extends BaseRotatedPillarBlock {
 	private final Block striped;
 	
 	public BaseStripableLogBlock(MaterialColor color, Block striped) {
-		super(FabricBlockSettings.copyOf(striped).materialColor(color));
+		super(FabricBlockSettings.copyOf(striped).mapColor(color));
 		this.striped = striped;
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-		if (player.getMainHandItem().getItem().is(FabricToolTags.AXES)) {
+		if (FabricToolTags.AXES.contains(player.getMainHandItem().getItem())) {
 			world.playSound(player, pos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
 			if (!world.isClientSide) {
 				world.setBlock(pos, striped.defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)), 11);

src/main/java/ru/bclib/blocks/BaseTerrainBlock.java

@@ -67,7 +67,7 @@ public class BaseTerrainBlock extends BaseBlock {
 
 	@Override
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-		if (pathBlock != null && player.getMainHandItem().getItem().is(FabricToolTags.SHOVELS)) {
+		if (pathBlock != null && FabricToolTags.SHOVELS.contains(player.getMainHandItem().getItem())) {
 			world.playSound(player, pos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
 			if (!world.isClientSide) {
 				world.setBlockAndUpdate(pos, pathBlock.defaultBlockState());

src/main/java/ru/bclib/blocks/BaseTrapdoorBlock.java

@@ -34,6 +34,7 @@ public class BaseTrapdoorBlock extends TrapDoorBlock implements IRenderTyped, Bl
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseUnderwaterWallPlantBlock.java

@@ -48,6 +48,7 @@ public abstract class BaseUnderwaterWallPlantBlock extends BaseWallPlantBlock im
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public FluidState getFluidState(BlockState state) {
 		return Fluids.WATER.getSource(false);
 	}

src/main/java/ru/bclib/blocks/BaseVineBlock.java

@@ -37,6 +37,7 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 
+@SuppressWarnings("deprecation")
 public class BaseVineBlock extends BaseBlockNotFull implements IRenderTyped, BonemealableBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape VOXEL_SHAPE = Block.box(2, 0, 2, 14, 16, 14);
@@ -106,7 +107,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements IRenderTyped, Bon
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

src/main/java/ru/bclib/blocks/BaseWallBlock.java

@@ -36,6 +36,7 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/BaseWallPlantBlock.java

@@ -113,11 +113,13 @@ public abstract class BaseWallPlantBlock extends BasePlantBlock {
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public BlockState rotate(BlockState state, Rotation rotation) {
 		return BlocksHelper.rotateHorizontal(state, rotation, FACING);
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public BlockState mirror(BlockState state, Mirror mirror) {
 		return BlocksHelper.mirrorHorizontal(state, mirror, FACING);
 	}

src/main/java/ru/bclib/blocks/BaseWeightedPlateBlock.java

@@ -33,6 +33,7 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		return Collections.singletonList(new ItemStack(this));
 	}

src/main/java/ru/bclib/blocks/FeatureSaplingBlock.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.api.EnvType;
@@ -36,6 +37,7 @@ import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+@SuppressWarnings("deprecation")
 public abstract class FeatureSaplingBlock extends SaplingBlock implements IRenderTyped, BlockModelProvider {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
 
@@ -85,7 +87,8 @@ public abstract class FeatureSaplingBlock extends SaplingBlock implements IRende
 
 	@Override
 	public void advanceTree(ServerLevel world, BlockPos pos, BlockState blockState, Random random) {
-		getFeature().place(world, world.getChunkSource().getGenerator(), random, pos, null);
+		FeaturePlaceContext context = new FeaturePlaceContext(world, world.getChunkSource().getGenerator(), random, pos, null);
+		getFeature().place(context);
 	}
 
 	@Override

src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java

@@ -11,7 +11,7 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements IRenderTyped
 	public SimpleLeavesBlock(MaterialColor color) {
 		super(FabricBlockSettings.of(Material.LEAVES)
 				.strength(0.2F)
-				.materialColor(color)
+				.mapColor(color)
 				.sound(SoundType.GRASS)
 				.noOcclusion()
 				.isValidSpawn((state, world, pos, type) -> false)
@@ -22,7 +22,7 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements IRenderTyped
 	public SimpleLeavesBlock(MaterialColor color, int light) {
 		super(FabricBlockSettings.of(Material.LEAVES)
 				.luminance(light)
-				.materialColor(color)
+				.mapColor(color)
 				.strength(0.2F)
 				.sound(SoundType.GRASS)
 				.noOcclusion()

src/main/java/ru/bclib/blocks/StalactiteBlock.java

@@ -43,6 +43,7 @@ import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+@SuppressWarnings("deprecation")
 public class StalactiteBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, LiquidBlockContainer, IRenderTyped {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	public static final BooleanProperty IS_FLOOR = BlockProperties.IS_FLOOR;

src/main/java/ru/bclib/blocks/StripableBarkBlock.java

@@ -20,13 +20,14 @@ public class StripableBarkBlock extends BaseBarkBlock {
 	private final Block striped;
 	
 	public StripableBarkBlock(MaterialColor color, Block striped) {
-		super(FabricBlockSettings.copyOf(striped).materialColor(color));
+		super(FabricBlockSettings.copyOf(striped).mapColor(color));
 		this.striped = striped;
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-		if (player.getMainHandItem().getItem().is(FabricToolTags.AXES)) {
+		if (FabricToolTags.AXES.contains(player.getMainHandItem().getItem())) {
 			world.playSound(player, pos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
 			if (!world.isClientSide) {
 				world.setBlock(pos, striped.defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)), 11);

src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java

@@ -37,6 +37,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+@SuppressWarnings("deprecation")
 public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements IRenderTyped, BonemealableBlock, LiquidBlockContainer {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
 	
@@ -95,7 +96,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements I
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

src/main/java/ru/bclib/blocks/UnderwaterPlantWithAgeBlock.java

@@ -47,6 +47,7 @@ public abstract class UnderwaterPlantWithAgeBlock extends UnderwaterPlantBlock {
 	}
 	
 	@Override
+	@SuppressWarnings("deprecation")
 	public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
 		super.tick(state, world, pos, random);
 		if (isBonemealSuccess(world, random, pos, state)) {

src/main/java/ru/bclib/blocks/UpDownPlantBlock.java

@@ -29,6 +29,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+@SuppressWarnings("deprecation")
 public abstract class UpDownPlantBlock extends BaseBlockNotFull implements IRenderTyped {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 16, 12);
 	
@@ -71,7 +72,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements IRend
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && FabricToolTags.SHEARS.contains(tool.getItem()) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

src/main/java/ru/bclib/client/gui/BlockSignEditScreen.java

@@ -1,7 +1,5 @@
 package ru.bclib.client.gui;
 
-import java.util.Arrays;
-
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -11,8 +9,8 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Matrix4f;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.Util;
@@ -20,22 +18,25 @@ import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.font.TextFieldHelper;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.blockentity.SignRenderer.SignModel;
+import net.minecraft.client.renderer.blockentity.SignRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.WoodType;
 import ru.bclib.blockentities.BaseSignBlockEntity;
 import ru.bclib.blocks.BaseSignBlock;
 import ru.bclib.client.render.BaseSignBlockEntityRenderer;
 
+import java.util.Arrays;
+
 @Environment(EnvType.CLIENT)
 public class BlockSignEditScreen extends Screen {
-	private final SignModel model = new SignModel();
 	private final BaseSignBlockEntity sign;
 	private int ticksSinceOpened;
 	private int currentRow;
@@ -43,6 +44,7 @@ public class BlockSignEditScreen extends Screen {
 	private final String[] text = (String[]) Util.make(new String[4], (strings) -> {
 		Arrays.fill(strings, "");
 	});
+	private SignRenderer.SignModel model;
 
 	public BlockSignEditScreen(BaseSignBlockEntity sign) {
 		super(new TranslatableComponent("sign.edit"));
@@ -50,8 +52,11 @@ public class BlockSignEditScreen extends Screen {
 	}
 
 	protected void init() {
+		//set up a default model
+		model = new SignRenderer.SignModel(this.minecraft.getEntityModels().bakeLayer(ModelLayers.createSignModelName(WoodType.OAK)));
+
 		minecraft.keyboardHandler.setSendRepeatsToGui(true);
-		this.addButton(new Button(this.width / 2 - 100, this.height / 4 + 120, 200, 20, CommonComponents.GUI_DONE,
+		this.addRenderableWidget(new Button(this.width / 2 - 100, this.height / 4 + 120, 200, 20, CommonComponents.GUI_DONE,
 				(buttonWidget) -> {
 					this.finishEditing();
 				}));
@@ -80,7 +85,7 @@ public class BlockSignEditScreen extends Screen {
 
 	public void tick() {
 		++this.ticksSinceOpened;
-		if (!this.sign.getType().isValid(this.sign.getBlockState().getBlock())) {
+		if (!this.sign.getType().isValid(this.sign.getBlockState())) {
 			this.finishEditing();
 		}
 	}
@@ -135,7 +140,7 @@ public class BlockSignEditScreen extends Screen {
 		matrices.scale(0.6666667F, -0.6666667F, -0.6666667F);
 		MultiBufferSource.BufferSource immediate = minecraft.renderBuffers().bufferSource();
 		VertexConsumer vertexConsumer = BaseSignBlockEntityRenderer.getConsumer(immediate, blockState.getBlock());
-		model.sign.render(matrices, vertexConsumer, 15728880, OverlayTexture.NO_OVERLAY);
+		model.root.getChild("sign").render(matrices, vertexConsumer, 15728880, OverlayTexture.NO_OVERLAY);
 
 		if (bl) {
 			model.stick.render(matrices, vertexConsumer, 15728880, OverlayTexture.NO_OVERLAY);
@@ -206,7 +211,7 @@ public class BlockSignEditScreen extends Screen {
 					RenderSystem.disableTexture();
 					RenderSystem.enableColorLogicOp();
 					RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
-					bufferBuilder.begin(7, DefaultVertexFormat.POSITION_COLOR);
+					bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
 					float var32 = (float) x;
 					bufferBuilder.vertex(matrix4f, var32, (float) (l + 9), 0.0F).color(0, 0, 255, 255).endVertex();
 					var32 = (float) y;

src/main/java/ru/bclib/client/models/BaseChestBlockModel.java

@@ -0,0 +1,91 @@
+package ru.bclib.client.models;
+
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.PartPose;
+import net.minecraft.client.model.geom.builders.*;
+
+public class BaseChestBlockModel {
+    public final ModelPart partA;
+    public final ModelPart partC;
+    public final ModelPart partB;
+    public final ModelPart partRightA;
+    public final ModelPart partRightC;
+    public final ModelPart partRightB;
+    public final ModelPart partLeftA;
+    public final ModelPart partLeftC;
+    public final ModelPart partLeftB;
+
+    public static LayerDefinition getTexturedModelData() {
+        MeshDefinition modelData = new MeshDefinition();
+        PartDefinition modelPartData = modelData.getRoot();
+        CubeDeformation deformation_partC = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partC", CubeListBuilder.create()
+                        .texOffs(0, 19)
+                        .addBox(1.0f, 0.0f, 1.0f, 14.0f, 9.0f, 14.0f, deformation_partC),
+                PartPose.ZERO);
+
+        CubeDeformation deformation_partA = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partA", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(1.0f, 0.0f, 0.0f, 14.0f, 5.0f, 14.0f, deformation_partA),
+                PartPose.offset(0.0f, 9.0f, 1.0f));
+
+        CubeDeformation deformation_partB = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partB", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(7.0f, -1.0f, 15.0f, 2.0f, 4.0f, 1.0f, deformation_partB),
+                PartPose.offset(0.0f, 8.0f, 0.0f));
+
+        CubeDeformation deformation_partRightC = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partRightC", CubeListBuilder.create()
+                        .texOffs(0, 19)
+                        .addBox(1.0f, 0.0f, 1.0f, 15.0f, 9.0f, 14.0f, deformation_partRightC),
+                PartPose.ZERO);
+
+        CubeDeformation deformation_partRightA = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partRightA", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(1.0f, 0.0f, 0.0f, 15.0f, 5.0f, 14.0f, deformation_partRightA),
+                PartPose.offset(0.0f, 9.0f, 1.0f));
+
+        CubeDeformation deformation_partRightB = new CubeDeformation(0.0f);
+        PartDefinition partRightB = modelPartData.addOrReplaceChild("partRightB", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(15.0f, -1.0f, 15.0f, 1.0f, 4.0f, 1.0f, deformation_partRightB),
+                PartPose.offset(0.0f, 8.0f, 0.0f));
+
+        CubeDeformation deformation_partLeftC = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partLeftC", CubeListBuilder.create()
+                        .texOffs(0, 19)
+                        .addBox(0.0f, 0.0f, 1.0f, 15.0f, 9.0f, 14.0f, deformation_partLeftC),
+                PartPose.ZERO);
+
+        CubeDeformation deformation_partLeftA = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partLeftA", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(0.0f, 0.0f, 0.0f, 15.0f, 5.0f, 14.0f, deformation_partLeftA),
+                PartPose.offset(0.0f, 9.0f, 1.0f));
+
+        CubeDeformation deformation_partLeftB = new CubeDeformation(0.0f);
+        modelPartData.addOrReplaceChild("partLeftB", CubeListBuilder.create()
+                        .texOffs(0, 0)
+                        .addBox(0.0f, -1.0f, 15.0f, 1.0f, 4.0f, 1.0f, deformation_partLeftB),
+                PartPose.offset(0.0f, 8.0f, 0.0f));
+
+        return LayerDefinition.create(modelData, 64, 64);
+    }
+
+    public BaseChestBlockModel(ModelPart modelPart) {
+        super();
+
+        partC = modelPart.getChild("partC");
+        partA = modelPart.getChild("partA");
+        partB = modelPart.getChild("partB");
+        partRightC = modelPart.getChild("partRightC");
+        partRightA = modelPart.getChild("partRightA");
+        partRightB = modelPart.getChild("partRightB");
+        partLeftC = modelPart.getChild("partLeftC");
+        partLeftA = modelPart.getChild("partLeftA");
+        partLeftB = modelPart.getChild("partLeftB");
+    }
+}

src/main/java/ru/bclib/client/render/BaseChestBlockEntityRenderer.java

@@ -1,12 +1,9 @@
 package ru.bclib.client.render;
 
-import java.util.HashMap;
-
 import com.google.common.collect.Maps;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
-
 import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import net.fabricmc.api.EnvType;
@@ -14,27 +11,25 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 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.AbstractChestBlock;
+import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.DoubleBlockCombiner;
 import net.minecraft.world.level.block.DoubleBlockCombiner.NeighborCombineResult;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
-import net.minecraft.world.level.block.entity.LidBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.ChestType;
 import ru.bclib.blockentities.BaseChestBlockEntity;
+import ru.bclib.client.models.BaseChestBlockModel;
+
+import java.util.HashMap;
 
 @Environment(EnvType.CLIENT)
-public class BaseChestBlockEntityRenderer extends BlockEntityRenderer<BaseChestBlockEntity> {
+public class BaseChestBlockEntityRenderer implements BlockEntityRenderer<BaseChestBlockEntity> {
 	private static final HashMap<Block, RenderType[]> LAYERS = Maps.newHashMap();
 	private static final RenderType[] defaultLayer;
 
@@ -42,53 +37,17 @@ public class BaseChestBlockEntityRenderer extends BlockEntityRenderer<BaseChestB
 	private static final int ID_LEFT = 1;
 	private static final int ID_RIGHT = 2;
 
-	private final ModelPart partA;
+	private final BaseChestBlockModel chestModel;
-	private final ModelPart partC;
+	public BaseChestBlockEntityRenderer(BlockEntityRendererProvider.Context ctx) {
-	private final ModelPart partB;
+		super();
-	private final ModelPart partRightA;
+		chestModel = new BaseChestBlockModel(BaseChestBlockModel.getTexturedModelData().bakeRoot());
-	private final ModelPart partRightC;
-	private final ModelPart partRightB;
-	private final ModelPart partLeftA;
-	private final ModelPart partLeftC;
-	private final ModelPart partLeftB;
-
-	public BaseChestBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
-		super(blockEntityRenderDispatcher);
-
-		this.partC = new ModelPart(64, 64, 0, 19);
-		this.partC.addBox(1.0F, 0.0F, 1.0F, 14.0F, 9.0F, 14.0F, 0.0F);
-		this.partA = new ModelPart(64, 64, 0, 0);
-		this.partA.addBox(1.0F, 0.0F, 0.0F, 14.0F, 5.0F, 14.0F, 0.0F);
-		this.partA.y = 9.0F;
-		this.partA.z = 1.0F;
-		this.partB = new ModelPart(64, 64, 0, 0);
-		this.partB.addBox(7.0F, -1.0F, 15.0F, 2.0F, 4.0F, 1.0F, 0.0F);
-		this.partB.y = 8.0F;
-		this.partRightC = new ModelPart(64, 64, 0, 19);
-		this.partRightC.addBox(1.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F);
-		this.partRightA = new ModelPart(64, 64, 0, 0);
-		this.partRightA.addBox(1.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F);
-		this.partRightA.y = 9.0F;
-		this.partRightA.z = 1.0F;
-		this.partRightB = new ModelPart(64, 64, 0, 0);
-		this.partRightB.addBox(15.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F);
-		this.partRightB.y = 8.0F;
-		this.partLeftC = new ModelPart(64, 64, 0, 19);
-		this.partLeftC.addBox(0.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F);
-		this.partLeftA = new ModelPart(64, 64, 0, 0);
-		this.partLeftA.addBox(0.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F);
-		this.partLeftA.y = 9.0F;
-		this.partLeftA.z = 1.0F;
-		this.partLeftB = new ModelPart(64, 64, 0, 0);
-		this.partLeftB.addBox(0.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F);
-		this.partLeftB.y = 8.0F;
 	}
 
 	public void render(BaseChestBlockEntity entity, float tickDelta, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay) {
 		Level world = entity.getLevel();
 		boolean worldExists = world != null;
-		BlockState blockState = worldExists ? entity.getBlockState() : (BlockState) Blocks.CHEST.defaultBlockState().setValue(ChestBlock.FACING, Direction.SOUTH);
+		BlockState blockState = worldExists ? entity.getBlockState() : Blocks.CHEST.defaultBlockState().setValue(ChestBlock.FACING, Direction.SOUTH);
-		ChestType chestType = blockState.hasProperty(ChestBlock.TYPE) ? (ChestType) blockState.getValue(ChestBlock.TYPE) : ChestType.SINGLE;
+		ChestType chestType = blockState.hasProperty(ChestBlock.TYPE) ? blockState.getValue(ChestBlock.TYPE) : ChestType.SINGLE;
 		Block block = blockState.getBlock();
 		if (block instanceof AbstractChestBlock) {
 			AbstractChestBlock<?> abstractChestBlock = (AbstractChestBlock<?>) block;
@@ -107,7 +66,7 @@ public class BaseChestBlockEntityRenderer extends BlockEntityRenderer<BaseChestB
 				propertySource = DoubleBlockCombiner.Combiner::acceptNone;
 			}
 
-			float pitch = ((Float2FloatFunction) propertySource.apply(ChestBlock.opennessCombiner((LidBlockEntity) entity))).get(tickDelta);
+			float pitch = ((Float2FloatFunction) propertySource.apply(ChestBlock.opennessCombiner(entity))).get(tickDelta);
 			pitch = 1.0F - pitch;
 			pitch = 1.0F - pitch * pitch * pitch;
 			@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -117,12 +76,12 @@ public class BaseChestBlockEntityRenderer extends BlockEntityRenderer<BaseChestB
 
 			if (isDouble) {
 				if (chestType == ChestType.LEFT) {
-					renderParts(matrices, vertexConsumer, this.partLeftA, this.partLeftB, this.partLeftC, pitch, blockLight, overlay);
+					renderParts(matrices, vertexConsumer, chestModel.partLeftA, chestModel.partLeftB, chestModel.partLeftC, pitch, blockLight, overlay);
 				} else {
-					renderParts(matrices, vertexConsumer, this.partRightA, this.partRightB, this.partRightC, pitch, blockLight, overlay);
+					renderParts(matrices, vertexConsumer, chestModel.partRightA, chestModel.partRightB, chestModel.partRightC, pitch, blockLight, overlay);
 				}
 			} else {
-				renderParts(matrices, vertexConsumer, this.partA, this.partB, this.partC, pitch, blockLight, overlay);
+				renderParts(matrices, vertexConsumer, chestModel.partA, chestModel.partB, chestModel.partC, pitch, blockLight, overlay);
 			}
 
 			matrices.popPose();
@@ -138,15 +97,11 @@ public class BaseChestBlockEntityRenderer extends BlockEntityRenderer<BaseChestB
 	}
 
 	private static RenderType getChestTexture(ChestType type, RenderType[] layers) {
-		switch (type) {
+		return switch (type) {
-		case LEFT:
+			case LEFT -> layers[ID_LEFT];
-			return layers[ID_LEFT];
+			case RIGHT -> layers[ID_RIGHT];
-		case RIGHT:
+			default -> layers[ID_NORMAL];
-			return layers[ID_RIGHT];
+		};
-		case SINGLE:
-		default:
-			return layers[ID_NORMAL];
-		}
 	}
 
 	public static VertexConsumer getConsumer(MultiBufferSource provider, Block block, ChestType chestType) {

src/main/java/ru/bclib/client/render/BaseSignBlockEntityRenderer.java

@@ -1,68 +1,84 @@
 package ru.bclib.client.render;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.google.common.collect.Maps;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
-
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.model.geom.ModelLayers;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.Sheets;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 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.renderer.blockentity.SignRenderer.SignModel;
 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;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SignBlock;
 import net.minecraft.world.level.block.StandingSignBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WoodType;
+import net.minecraft.world.phys.Vec3;
 import ru.bclib.blockentities.BaseSignBlockEntity;
 import ru.bclib.blocks.BaseSignBlock;
 
-public class BaseSignBlockEntityRenderer extends BlockEntityRenderer<BaseSignBlockEntity> {
+import java.util.HashMap;
+import java.util.List;
+
+public class BaseSignBlockEntityRenderer implements BlockEntityRenderer<BaseSignBlockEntity> {
 	private static final HashMap<Block, RenderType> LAYERS = Maps.newHashMap();
 	private static final RenderType defaultLayer;
-	private final SignModel model = new SignRenderer.SignModel();
+	private final Font font;
+	private final SignRenderer.SignModel model;
 
-	public BaseSignBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher) {
+
-		super(dispatcher);
+	private static final int OUTLINE_RENDER_DISTANCE = Mth.square(16);
+
+	public BaseSignBlockEntityRenderer(BlockEntityRendererProvider.Context ctx) {
+		super();
+		this.font = ctx.getFont();
+
+		//set up a default model
+		model = new SignRenderer.SignModel(ctx.bakeLayer(ModelLayers.createSignModelName(WoodType.OAK)));
 	}
 
 	public void render(BaseSignBlockEntity signBlockEntity, float tickDelta, PoseStack matrixStack,
 			MultiBufferSource provider, int light, int overlay) {
 		BlockState state = signBlockEntity.getBlockState();
+
 		matrixStack.pushPose();
 
+
 		matrixStack.translate(0.5D, 0.5D, 0.5D);
 		float angle = -((float) (state.getValue(StandingSignBlock.ROTATION) * 360) / 16.0F);
 
 		BlockState blockState = signBlockEntity.getBlockState();
 		if (blockState.getValue(BaseSignBlock.FLOOR)) {
 			matrixStack.mulPose(Vector3f.YP.rotationDegrees(angle));
-			this.model.stick.visible = true;
+			model.stick.visible = true;
 		} else {
 			matrixStack.mulPose(Vector3f.YP.rotationDegrees(angle + 180));
 			matrixStack.translate(0.0D, -0.3125D, -0.4375D);
-			this.model.stick.visible = false;
+			model.stick.visible = false;
 		}
 
 		matrixStack.pushPose();
 		matrixStack.scale(0.6666667F, -0.6666667F, -0.6666667F);
 		VertexConsumer vertexConsumer = getConsumer(provider, state.getBlock());
-		model.sign.render(matrixStack, vertexConsumer, light, overlay);
+
-		model.stick.render(matrixStack, vertexConsumer, light, overlay);
+		model.root.render(matrixStack, vertexConsumer, light, overlay);
+		//model.stick.render(matrixStack, vertexConsumer, light, overlay);
 		matrixStack.popPose();
-		Font textRenderer = renderer.getFont();
+		//Font textRenderer = renderer.getFont();
 		matrixStack.translate(0.0D, 0.3333333432674408D, 0.046666666865348816D);
 		matrixStack.scale(0.010416667F, -0.010416667F, 0.010416667F);
 		int m = signBlockEntity.getColor().getTextColor();
@@ -71,21 +87,59 @@ public class BaseSignBlockEntityRenderer extends BlockEntityRenderer<BaseSignBlo
 		int p = (int) (NativeImage.getB(m) * 0.4D);
 		int q = NativeImage.combine(0, p, o, n);
 
+		FormattedCharSequence[] formattedCharSequences = signBlockEntity
+				.getRenderMessages(Minecraft.getInstance().isTextFilteringEnabled(), (component) -> {
+					List<FormattedCharSequence> list = this.font.split(component, 90);
+					return list.isEmpty() ? FormattedCharSequence.EMPTY : (FormattedCharSequence) list.get(0);
+				});
+		int drawColor;
+		boolean drawOutlined;
+		int drawLight;
+		if (signBlockEntity.hasGlowingText()) {
+			drawColor = signBlockEntity.getColor().getTextColor();
+			drawOutlined = isOutlineVisible(signBlockEntity, drawColor);
+			drawLight = 15728880;
+		} else {
+			drawColor = m;
+			drawOutlined = false;
+			drawLight = light;
+		}
+
 		for (int s = 0; s < 4; ++s) {
-			FormattedCharSequence orderedText = signBlockEntity.getRenderMessage(s, (text) -> {
+			FormattedCharSequence formattedCharSequence = formattedCharSequences[s];
-				List<FormattedCharSequence> list = textRenderer.split(text, 90);
+			float t = (float) (-this.font.width(formattedCharSequence) / 2);
-				return list.isEmpty() ? FormattedCharSequence.EMPTY : list.get(0);
+			if (drawOutlined) {
-			});
+				this.font.drawInBatch8xOutline(formattedCharSequence, t, (float) (s * 10 - 20), drawColor, m,
-			if (orderedText != null) {
+						matrixStack.last().pose(), provider, drawLight);
-				float t = (float) (-textRenderer.width(orderedText) / 2);
+			} else {
-				textRenderer.drawInBatch(orderedText, t, (float) (s * 10 - 20), q, false, matrixStack.last().pose(), provider, false, 0, light);
+				this.font.drawInBatch((FormattedCharSequence) formattedCharSequence, t, (float) (s * 10 - 20), drawColor, false,
+						matrixStack.last().pose(), provider, false, 0, drawLight);
 			}
 		}
 
+
 		matrixStack.popPose();
 	}
 
-	public static Material getModelTexture(Block block) {
+
+
+	private static boolean isOutlineVisible(BaseSignBlockEntity signBlockEntity, int i) {
+		if (i == DyeColor.BLACK.getTextColor()) {
+			return true;
+		} else {
+			Minecraft minecraft = Minecraft.getInstance();
+			LocalPlayer localPlayer = minecraft.player;
+			if (localPlayer != null && minecraft.options.getCameraType().isFirstPerson() && localPlayer.isScoping()) {
+				return true;
+			} else {
+				Entity entity = minecraft.getCameraEntity();
+				return entity != null && entity.distanceToSqr(
+						Vec3.atCenterOf(signBlockEntity.getBlockPos())) < (double) OUTLINE_RENDER_DISTANCE;
+			}
+		}
+	}
+
+	public static WoodType getSignType(Block block) {
 		WoodType signType2;
 		if (block instanceof SignBlock) {
 			signType2 = ((SignBlock) block).type();
@@ -93,7 +147,11 @@ public class BaseSignBlockEntityRenderer extends BlockEntityRenderer<BaseSignBlo
 			signType2 = WoodType.OAK;
 		}
 
-		return Sheets.signTexture(signType2);
+		return signType2;
+	}
+
+	public static Material getModelTexture(Block block) {
+		return Sheets.getSignMaterial(getSignType(block));
 	}
 	
 	public static VertexConsumer getConsumer(MultiBufferSource provider, Block block) {

src/main/java/ru/bclib/items/BaseAnvilItem.java

@@ -34,7 +34,9 @@ public class BaseAnvilItem extends BlockItem implements ItemModelProvider {
 		BlockState blockState = super.getPlacementState(blockPlaceContext);
 		ItemStack stack = blockPlaceContext.getItemInHand();
 		int destruction = stack.getOrCreateTag().getInt(DESTRUCTION);
-		blockState = blockState.setValue(BaseAnvilBlock.DESTRUCTION, destruction);
+		if (blockState != null) {
+			blockState = blockState.setValue(BaseAnvilBlock.DESTRUCTION, destruction);
+		}
 		return blockState;
 	}
 

src/main/java/ru/bclib/items/BaseBucketItem.java

@@ -1,13 +1,14 @@
 package ru.bclib.items;
 
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.item.FishBucketItem;
+import net.minecraft.world.item.MobBucketItem;
 import net.minecraft.world.level.material.Fluids;
 import ru.bclib.client.models.ItemModelProvider;
 
-public class BaseBucketItem extends FishBucketItem implements ItemModelProvider {
+public class BaseBucketItem extends MobBucketItem implements ItemModelProvider {
 	public BaseBucketItem(EntityType<?> type, FabricItemSettings settings) {
-		super(type, Fluids.WATER, settings.stacksTo(1));
+		super(type, Fluids.WATER, SoundEvents.BUCKET_EMPTY_FISH, settings.stacksTo(1));
 	}
 }

src/main/java/ru/bclib/items/BaseDrinkItem.java

@@ -30,7 +30,7 @@ public class BaseDrinkItem extends ModelProviderItem {
 
 	@Override
 	public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-		return ItemUtils.useDrink(world, user, hand);
+		return ItemUtils.startUsingInstantly(world, user, hand);
 	}
 
 	@Override
@@ -41,13 +41,12 @@ public class BaseDrinkItem extends ModelProviderItem {
 			stack.setCount(count);
 		}
 		
-		if (user instanceof ServerPlayer) {
+		if (user instanceof ServerPlayer serverPlayerEntity) {
-			ServerPlayer serverPlayerEntity = (ServerPlayer) user;
 			CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayerEntity, stack);
 			serverPlayerEntity.awardStat(Stats.ITEM_USED.get(this));
 		}
 
-		if (user instanceof Player && !((Player) user).abilities.instabuild) {
+		if (user instanceof Player && !((Player) user).getAbilities().instabuild) {
 			stack.shrink(1);
 		}
 

src/main/java/ru/bclib/items/BaseSpawnEggItem.java

@@ -7,6 +7,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.item.SpawnEggItem;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ItemModelProvider;
@@ -14,7 +15,7 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 
 public class BaseSpawnEggItem extends SpawnEggItem implements ItemModelProvider {
-	public BaseSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Properties settings) {
+	public BaseSpawnEggItem(EntityType<? extends Mob> type, int primaryColor, int secondaryColor, Properties settings) {
 		super(type, primaryColor, secondaryColor, settings);
 	}
 	

src/main/java/ru/bclib/mixin/client/BackgroundRendererMixin.java

@@ -1,5 +1,6 @@
 package ru.bclib.mixin.client;
 
+import net.minecraft.world.level.material.FogType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -41,8 +42,8 @@ public class BackgroundRendererMixin {
 	
 	@Inject(method = "setupColor", at = @At("RETURN"))
 	private static void bcl_onRender(Camera camera, float tickDelta, ClientLevel world, int i, float f, CallbackInfo info) {
-		FluidState fluidState = camera.getFluidInCamera();
+		FogType fogType = camera.getFluidInCamera();
-		if (fluidState.isEmpty() && world.dimension().equals(Level.END)) {
+		if (fogType != FogType.WATER && world.dimension().equals(Level.END)) {
 			Entity entity = camera.getEntity();
 			boolean skip = false;
 			if (entity instanceof LivingEntity) {
@@ -62,10 +63,10 @@ public class BackgroundRendererMixin {
 	}
 	
 	@Inject(method = "setupFog", at = @At("HEAD"), cancellable = true)
-	private static void bcl_fogDensity(Camera camera, FogRenderer.FogMode fogType, float viewDistance, boolean thickFog, CallbackInfo info) {
+	private static void bcl_fogDensity(Camera camera, FogRenderer.FogMode fogMode, float viewDistance, boolean thickFog, CallbackInfo info) {
 		Entity entity = camera.getEntity();
-		FluidState fluidState = camera.getFluidInCamera();
+		FogType fogType = camera.getFluidInCamera();
-		if (fluidState.isEmpty()) {
+		if (fogType != FogType.WATER) {
 			float fog = bcl_getFogDensity(entity.level, entity.getX(), entity.getEyeY(), entity.getZ());
 			BackgroundInfo.fogDensity = fog;
 			float start = viewDistance * 0.75F / fog;
@@ -93,10 +94,8 @@ public class BackgroundRendererMixin {
 				}
 			}
 			
-			RenderSystem.fogStart(start);
+			RenderSystem.setShaderFogStart(start);
-			RenderSystem.fogEnd(end);
+			RenderSystem.setShaderFogEnd(end);
-			RenderSystem.fogMode(GlStateManager.FogMode.LINEAR);
-			RenderSystem.setupNvFogDistance();
 			info.cancel();
 		}
 	}

src/main/java/ru/bclib/mixin/common/FeatureDecoratorsAccessor.java

@@ -0,0 +1,18 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.data.worldgen.Features;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.block.ComposterBlock;
+import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(targets = "net.minecraft.data.worldgen.Features$Decorators")
+public interface FeatureDecoratorsAccessor {
+	@Accessor("HEIGHTMAP_SQUARE")
+	ConfiguredDecorator<?> bcl_getHeightmapSquare();
+}

src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java

@@ -1,26 +1,23 @@
-package ru.bclib.mixin.common;
+package ru.bclib.mixin.common;
-
+
-import java.util.Map;
+import net.minecraft.resources.ResourceLocation;
-import java.util.concurrent.Executor;
+import net.minecraft.tags.Tag;
-import java.util.function.Supplier;
+import net.minecraft.tags.TagLoader;
-
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
+import ru.bclib.util.TagHelper;
-
+
-import net.minecraft.resources.ResourceLocation;
+import java.util.Map;
-import net.minecraft.tags.Tag;
+
-import net.minecraft.tags.TagLoader;
+@Mixin(TagLoader.class)
-import ru.bclib.util.TagHelper;
+public class TagLoaderMixin {
-
+	@Shadow
-@Mixin(TagLoader.class)
+	private String directory;
-public class TagLoaderMixin {
+
-	@Shadow
+	@ModifyArg(method = "loadAndBuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/tags/TagLoader;build(Ljava/util/Map;)Lnet/minecraft/tags/TagCollection;"))
-	private String name;
+	public Map<ResourceLocation, Tag.Builder> be_modifyTags(Map<ResourceLocation, Tag.Builder> tagsMap) {
-
+		return TagHelper.apply(directory, tagsMap);
-	@ModifyArg(method = "prepare", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
+	}
-	public Supplier<Map<ResourceLocation, Tag.Builder>> be_modifyTags(Supplier<Map<ResourceLocation, Tag.Builder>> supplier, Executor executor) {
+}
-		return () -> TagHelper.apply(name, supplier.get());
-	}
-}

src/main/java/ru/bclib/registry/BaseBlockEntities.java

@@ -13,6 +13,7 @@ import ru.bclib.blockentities.BaseChestBlockEntity;
 import ru.bclib.blockentities.BaseFurnaceBlockEntity;
 import ru.bclib.blockentities.BaseSignBlockEntity;
 import ru.bclib.blockentities.DynamicBlockEntityType;
+import ru.bclib.blockentities.DynamicBlockEntityType.BlockEntitySupplier;
 import ru.bclib.blocks.BaseBarrelBlock;
 import ru.bclib.blocks.BaseChestBlock;
 import ru.bclib.blocks.BaseFurnaceBlock;
@@ -24,7 +25,7 @@ public class BaseBlockEntities {
 	public static final DynamicBlockEntityType<BaseSignBlockEntity> SIGN = registerBlockEntityType(BCLib.makeID("sign"), BaseSignBlockEntity::new);
 	public static final DynamicBlockEntityType<BaseFurnaceBlockEntity> FURNACE = registerBlockEntityType(BCLib.makeID("furnace"), BaseFurnaceBlockEntity::new);
 
-	public static <T extends BlockEntity> DynamicBlockEntityType<T> registerBlockEntityType(ResourceLocation typeId, Supplier<? extends T> supplier) {
+	public static <T extends BlockEntity> DynamicBlockEntityType<T> registerBlockEntityType(ResourceLocation typeId, BlockEntitySupplier<? extends T> supplier) {
 		return Registry.register(Registry.BLOCK_ENTITY_TYPE, typeId, new DynamicBlockEntityType<>(supplier));
 	}
 	

src/main/java/ru/bclib/registry/ItemsRegistry.java

@@ -9,6 +9,7 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.CreativeModeTab;
@@ -67,7 +68,7 @@ public abstract class ItemsRegistry extends BaseRegistry<Item> {
 		return item;
 	}
 
-	public Item registerEgg(String name, EntityType<?> type, int background, int dots) {
+	public Item registerEgg(String name, EntityType<? extends Mob> type, int background, int dots) {
 		SpawnEggItem item = new BaseSpawnEggItem(type, background, dots, makeItemSettings());
 		DefaultDispenseItemBehavior behavior = new DefaultDispenseItemBehavior() {
 			public ItemStack execute(BlockSource pointer, ItemStack stack) {

src/main/java/ru/bclib/util/StructureHelper.java

@@ -14,6 +14,7 @@ import com.google.common.collect.Sets;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
@@ -27,6 +28,7 @@ import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.material.Material;
+import net.minecraft.world.phys.Vec3;
 import ru.bclib.api.TagAPI;
 
 public class StructureHelper {
@@ -86,8 +88,8 @@ public class StructureHelper {
 	}
 	
 	public static BlockPos offsetPos(BlockPos pos, StructureTemplate structure, Rotation rotation, Mirror mirror) {
-		BlockPos offset = StructureTemplate.transform(structure.getSize(), mirror, rotation, BlockPos.ZERO);
+		Vec3 offset = StructureTemplate.transform(Vec3.atCenterOf(structure.getSize()), mirror, rotation, BlockPos.ZERO);
-		return pos.offset(-offset.getX() * 0.5, 0, -offset.getZ() * 0.5);
+		return pos.offset(-offset.x * 0.5, 0, -offset.z * 0.5);
 	}
 	
 	public static void placeCenteredBottom(WorldGenLevel world, BlockPos pos, StructureTemplate structure, Rotation rotation, Mirror mirror, Random random) {
@@ -97,7 +99,7 @@ public class StructureHelper {
 	public static void placeCenteredBottom(WorldGenLevel world, BlockPos pos, StructureTemplate structure, Rotation rotation, Mirror mirror, BoundingBox bounds, Random random) {
 		BlockPos offset = offsetPos(pos, structure, rotation, mirror);
 		StructurePlaceSettings placementData = new StructurePlaceSettings().setRotation(rotation).setMirror(mirror).setBoundingBox(bounds);
-		structure.placeInWorldChunk(world, offset, placementData, random);
+		structure.placeInWorld(world, offset, offset, placementData, random, 4);
 	}
 	
 	private static BoundingBox makeBox(BlockPos pos) {
@@ -105,37 +107,37 @@ public class StructureHelper {
 		int sz = ((pos.getZ() >> 4) << 4) - 16;
 		int ex = sx + 47;
 		int ez = sz + 47;
-		return BoundingBox.createProper(sx, 0, sz, ex, 255, ez);
+		return BoundingBox.fromCorners(new Vec3i(sx, 0, sz), new Vec3i(ex, 255, ez));
 	}
 	
 	public static BoundingBox getStructureBounds(BlockPos pos, StructureTemplate structure, Rotation rotation, Mirror mirror) {
-		BlockPos max = structure.getSize();
+		Vec3i max = structure.getSize();
-		BlockPos min = StructureTemplate.transform(structure.getSize(), mirror, rotation, BlockPos.ZERO);
+		Vec3 min = StructureTemplate.transform(Vec3.atCenterOf(structure.getSize()), mirror, rotation, BlockPos.ZERO);
-		max = max.subtract(min);
+		max = max.offset(-min.x, -min.y, -min.z);
-		return new BoundingBox(min.offset(pos), max.offset(pos));
+		return BoundingBox.fromCorners(pos.offset(min.x, min.y, min.z), max.offset(pos));
 	}
 	
 	public static BoundingBox intersectBoxes(BoundingBox box1, BoundingBox box2) {
-		int x1 = MHelper.max(box1.x0, box2.x0);
+		int x1 = MHelper.max(box1.minX(), box2.minX());
-		int y1 = MHelper.max(box1.y0, box2.y0);
+		int y1 = MHelper.max(box1.minY(), box2.minY());
-		int z1 = MHelper.max(box1.z0, box2.z0);
+		int z1 = MHelper.max(box1.minZ(), box2.minZ());
 		
-		int x2 = MHelper.min(box1.x1, box2.x1);
+		int x2 = MHelper.min(box1.maxX(), box2.maxX());
-		int y2 = MHelper.min(box1.y1, box2.y1);
+		int y2 = MHelper.min(box1.maxY(), box2.maxY());
-		int z2 = MHelper.min(box1.z1, box2.z1);
+		int z2 = MHelper.min(box1.maxZ(), box2.maxZ());
 		
-		return BoundingBox.createProper(x1, y1, z1, x2, y2, z2);
+		return BoundingBox.fromCorners(new Vec3i(x1, y1, z1), new Vec3i(x2, y2, z2));
 	}
 	
 	public static void erode(WorldGenLevel world, BoundingBox bounds, int iterations, Random random) {
 		MutableBlockPos mut = new MutableBlockPos();
 		boolean canDestruct = true;
 		for (int i = 0; i < iterations; i++) {
-			for (int x = bounds.x0; x <= bounds.x1; x++) {
+			for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 				mut.setX(x);
-				for (int z = bounds.z0; z <= bounds.z1; z++) {
+				for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 					mut.setZ(z);
-					for (int y = bounds.y1; y >= bounds.y0; y--) {
+					for (int y = bounds.maxY(); y >= bounds.minY(); y--) {
 						mut.setY(y);
 						BlockState state = world.getBlockState(mut);
 						boolean ignore = ignore(state, world, mut);
@@ -183,7 +185,7 @@ public class StructureHelper {
 								if (world.isEmptyBlock(mut.relative(dir)) && world.isEmptyBlock(mut.below().relative(dir))) {
 									BlocksHelper.setWithoutUpdate(world, mut, Blocks.AIR);
 									mut.move(dir).move(Direction.DOWN);
-									for (int py = mut.getY(); y >= bounds.y0 - 10; y--) {
+									for (int py = mut.getY(); y >= bounds.minY() - 10; y--) {
 										mut.setY(py - 1);
 										if (!world.isEmptyBlock(mut)) {
 											mut.setY(py);
@@ -202,16 +204,16 @@ public class StructureHelper {
 				}
 			}
 		}
-		for (int x = bounds.x0; x <= bounds.x1; x++) {
+		for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 			mut.setX(x);
-			for (int z = bounds.z0; z <= bounds.z1; z++) {
+			for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 				mut.setZ(z);
-				for (int y = bounds.y1; y >= bounds.y0; y--) {
+				for (int y = bounds.maxY(); y >= bounds.minY(); y--) {
 					mut.setY(y);
 					BlockState state = world.getBlockState(mut);
 					if (!ignore(state, world, mut) && world.isEmptyBlock(mut.below())) {
 						BlocksHelper.setWithoutUpdate(world, mut, Blocks.AIR);
-						for (int py = mut.getY(); py >= bounds.y0 - 10; py--) {
+						for (int py = mut.getY(); py >= bounds.minY() - 10; py--) {
 							mut.setY(py - 1);
 							if (!world.isEmptyBlock(mut)) {
 								mut.setY(py);
@@ -228,12 +230,12 @@ public class StructureHelper {
 	public static void erodeIntense(WorldGenLevel world, BoundingBox bounds, Random random) {
 		MutableBlockPos mut = new MutableBlockPos();
 		MutableBlockPos mut2 = new MutableBlockPos();
-		int minY = bounds.y0 - 10;
+		int minY = bounds.minY() - 10;
-		for (int x = bounds.x0; x <= bounds.x1; x++) {
+		for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 			mut.setX(x);
-			for (int z = bounds.z0; z <= bounds.z1; z++) {
+			for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 				mut.setZ(z);
-				for (int y = bounds.y1; y >= bounds.y0; y--) {
+				for (int y = bounds.maxY(); y >= bounds.minY(); y--) {
 					mut.setY(y);
 					BlockState state = world.getBlockState(mut);
 					if (!ignore(state, world, mut)) {
@@ -279,11 +281,11 @@ public class StructureHelper {
 		Set<BlockPos> edge = Sets.newHashSet();
 		Set<BlockPos> add = Sets.newHashSet();
 		
-		for (int x = bounds.x0; x <= bounds.x1; x++) {
+		for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 			mut.setX(x);
-			for (int z = bounds.z0; z <= bounds.z1; z++) {
+			for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 				mut.setZ(z);
-				for (int y = bounds.y0; y <= bounds.y1; y++) {
+				for (int y = bounds.minY(); y <= bounds.maxY(); y++) {
 					mut.setY(y);
 					BlockState state = world.getBlockState(mut);
 					if (!ignore(state, world, mut) && isTerrainNear(world, mut)) {
@@ -319,12 +321,12 @@ public class StructureHelper {
 			add.clear();
 		}
 		
-		int minY = bounds.y0 - 10;
+		int minY = bounds.minY() - 10;
-		for (int x = bounds.x0; x <= bounds.x1; x++) {
+		for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 			mut.setX(x);
-			for (int z = bounds.z0; z <= bounds.z1; z++) {
+			for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 				mut.setZ(z);
-				for (int y = bounds.y0; y <= bounds.y1; y++) {
+				for (int y = bounds.minY(); y <= bounds.maxY(); y++) {
 					mut.setY(y);
 					BlockState state = world.getBlockState(mut);
 					if (!ignore(state, world, mut) && !blocks.contains(mut)) {
@@ -355,12 +357,12 @@ public class StructureHelper {
 	
 	public static void cover(WorldGenLevel world, BoundingBox bounds, Random random) {
 		MutableBlockPos mut = new MutableBlockPos();
-		for (int x = bounds.x0; x <= bounds.x1; x++) {
+		for (int x = bounds.minX(); x <= bounds.maxX(); x++) {
 			mut.setX(x);
-			for (int z = bounds.z0; z <= bounds.z1; z++) {
+			for (int z = bounds.minZ(); z <= bounds.maxZ(); z++) {
 				mut.setZ(z);
 				BlockState top = world.getBiome(mut).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
-				for (int y = bounds.y1; y >= bounds.y0; y--) {
+				for (int y = bounds.maxY(); y >= bounds.minY(); y--) {
 					mut.setY(y);
 					BlockState state = world.getBlockState(mut);
 					if (state.is(TagAPI.END_GROUND) && !world.getBlockState(mut.above()).getMaterial().isSolidBlocking()) {

src/main/java/ru/bclib/util/TagHelper.java

@@ -58,11 +58,11 @@ public class TagHelper {
 		return builder;
 	}
 	
-	public static Map<ResourceLocation, Tag.Builder> apply(String entry, Map<ResourceLocation, Tag.Builder> tagsMap) {
+	public static Map<ResourceLocation, Tag.Builder> apply(String directory, Map<ResourceLocation, Tag.Builder> tagsMap) {
 		Map<ResourceLocation, Set<ResourceLocation>> endTags = null;
-		if (entry.equals("block")) {
+		if ("tags/blocks".equals(directory)) {
 			endTags = TAGS_BLOCK;
-		} else if (entry.equals("item")) {
+		} else if ("tags/items".equals(directory)) {
 			endTags = TAGS_ITEM;
 		}
 		if (endTags != null) {

src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java

@@ -28,6 +28,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep.Carving;
 import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
+import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
@@ -345,7 +346,7 @@ public class BCLBiomeDef {
 	
 	private static final class CarverInfo {
 		Carving carverStep;
-		ConfiguredWorldCarver<ProbabilityFeatureConfiguration> carver;
+		ConfiguredWorldCarver<CarverConfiguration> carver;
 	}
 
 	public ResourceLocation getID() {
@@ -364,7 +365,7 @@ public class BCLBiomeDef {
 		return edgeSize;
 	}
 
-	public BCLBiomeDef addCarver(Carving carverStep, ConfiguredWorldCarver<ProbabilityFeatureConfiguration> carver) {
+	public BCLBiomeDef addCarver(Carving carverStep, ConfiguredWorldCarver<CarverConfiguration> carver) {
 		CarverInfo info = new CarverInfo();
 		info.carverStep = carverStep;
 		info.carver = carver;

src/main/java/ru/bclib/world/features/BCLDecorators.java

@@ -0,0 +1,27 @@
+package ru.bclib.world.features;
+
+import net.minecraft.data.worldgen.Features;
+import net.minecraft.world.level.levelgen.placement.ConfiguredDecorator;
+import ru.bclib.BCLib;
+
+import java.lang.reflect.Field;
+
+public class BCLDecorators {
+	public static final ConfiguredDecorator<?> HEIGHTMAP_SQUARE;
+
+	private static final ConfiguredDecorator<?> getDecorator(Field[] fields, int index) {
+		try {
+			return (ConfiguredDecorator<?>) fields[index].get(null);
+		}
+		catch (IllegalAccessException e) {
+			BCLib.LOGGER.error(e.getLocalizedMessage());
+			return null;
+		}
+	}
+
+	static {
+		Class<?>[] classes = Features.class.getDeclaredClasses();
+		Field[] fields = classes[1].getDeclaredFields(); // Decorators class
+		HEIGHTMAP_SQUARE = getDecorator(fields, 17);
+	}
+}

src/main/java/ru/bclib/world/features/BCLFeature.java

@@ -4,9 +4,11 @@ import net.minecraft.core.Registry;
 import net.minecraft.data.BuiltinRegistries;
 import net.minecraft.data.worldgen.Features;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.VerticalAnchor;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.configurations.CountConfiguration;
@@ -17,12 +19,16 @@ import net.minecraft.world.level.levelgen.feature.configurations.RangeDecoratorC
 import net.minecraft.world.level.levelgen.placement.ChanceDecoratorConfiguration;
 import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
+import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
+import ru.bclib.api.TagAPI;
 
 public class BCLFeature {
-	private Feature<?> feature;
+	private static final RuleTest ANY_TERRAIN = new TagMatchTest(TagAPI.GEN_TERRAIN);
 	private ConfiguredFeature<?, ?> featureConfigured;
 	private GenerationStep.Decoration featureStep;
-	
+	private Feature<?> feature;
+
 	public BCLFeature(Feature<?> feature, ConfiguredFeature<?, ?> configuredFeature, GenerationStep.Decoration featureStep) {
 		this.featureConfigured = configuredFeature;
 		this.featureStep = featureStep;
@@ -36,7 +42,7 @@ public class BCLFeature {
 	}
 	
 	public static BCLFeature makeVegetationFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int density) {
-		ConfiguredFeature<?, ?> configured = feature.configured(FeatureConfiguration.NONE).decorated(Features.Decorators.HEIGHTMAP_SQUARE).countRandom(density);
+		ConfiguredFeature<?, ?> configured = feature.configured(FeatureConfiguration.NONE).decorated(BCLDecorators.HEIGHTMAP_SQUARE).countRandom(density);
 		return new BCLFeature(id, feature, GenerationStep.Decoration.VEGETAL_DECORATION, configured);
 	}
 	
@@ -46,17 +52,17 @@ public class BCLFeature {
 	}
 	
 	public static BCLFeature makeLakeFeature(ResourceLocation id, Feature<NoneFeatureConfiguration> feature, int chance) {
-		ConfiguredFeature<?, ?> configured = feature.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.WATER_LAKE.configured(new ChanceDecoratorConfiguration(chance)));
+		ConfiguredFeature<?, ?> configured = feature.configured(FeatureConfiguration.NONE).decorated(FeatureDecorator.LAVA_LAKE.configured(new ChanceDecoratorConfiguration(chance)));
 		return new BCLFeature(id, feature, GenerationStep.Decoration.LAKES, configured);
 	}
 	
 	public static BCLFeature makeOreFeature(ResourceLocation id, Block blockOre, int veins, int veinSize, int offset, int minY, int maxY) {
 		OreConfiguration featureConfig = new OreConfiguration(new BlockMatchTest(Blocks.END_STONE), blockOre.defaultBlockState(), veinSize);
-		RangeDecoratorConfiguration rangeDecorator = new RangeDecoratorConfiguration(offset, minY, maxY);
+		OreConfiguration config = new OreConfiguration(ANY_TERRAIN, blockOre.defaultBlockState(), 33);
 		ConfiguredFeature<?, ?> oreFeature = Feature.ORE.configured(featureConfig)
-			  .decorated(FeatureDecorator.RANGE.configured(rangeDecorator))
+			.rangeUniform(VerticalAnchor.absolute(minY), VerticalAnchor.absolute(maxY))
-			  .squared()
+			.squared()
-			  .count(veins);
+			.count(veins);
 		return new BCLFeature(Feature.ORE, Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, id, oreFeature), GenerationStep.Decoration.UNDERGROUND_ORES);
 	}
 	

src/main/java/ru/bclib/world/features/NBTStructureFeature.java

@@ -7,6 +7,7 @@ import java.util.Random;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.resources.ResourceLocation;
@@ -17,11 +18,13 @@ import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration;
+import net.minecraft.world.phys.Vec3;
 import ru.bclib.api.BiomeAPI;
 import ru.bclib.api.TagAPI;
 import ru.bclib.util.BlocksHelper;
@@ -76,7 +79,11 @@ public abstract class NBTStructureFeature extends DefaultFeature {
 	}
 
 	@Override
-	public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos center, NoneFeatureConfiguration featureConfig) {
+	public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
+		WorldGenLevel world = context.level();
+		Random random = context.random();
+		BlockPos center = context.origin();
+
 		center = new BlockPos(((center.getX() >> 4) << 4) | 8, 128, ((center.getZ() >> 4) << 4) | 8);
 		center = getGround(world, center);
 
@@ -88,14 +95,14 @@ public abstract class NBTStructureFeature extends DefaultFeature {
 		StructureTemplate structure = getStructure(world, center, random);
 		Rotation rotation = getRotation(world, center, random);
 		Mirror mirror = getMirror(world, center, random);
-		BlockPos offset = StructureTemplate.transform(structure.getSize(), mirror, rotation, BlockPos.ZERO);
+		BlockPos offset = StructureTemplate.transform(new BlockPos(structure.getSize()), mirror, rotation, BlockPos.ZERO);
 		center = center.offset(0, getYOffset(structure, world, center, random) + 0.5, 0);
 
 		BoundingBox bounds = makeBox(center);
 		StructurePlaceSettings placementData = new StructurePlaceSettings().setRotation(rotation).setMirror(mirror).setBoundingBox(bounds);
 		addStructureData(placementData);
 		center = center.offset(-offset.getX() * 0.5, 0, -offset.getZ() * 0.5);
-		structure.placeInWorldChunk(world, center, placementData, random);
+		structure.placeInWorld(world, center, center, placementData, random, 4);
 
 		TerrainMerge merge = getTerrainMerge(world, center, random);
 		int x1 = center.getX();
@@ -167,7 +174,7 @@ public abstract class NBTStructureFeature extends DefaultFeature {
 		int sz = ((pos.getZ() >> 4) << 4) - 16;
 		int ex = sx + 47;
 		int ez = sz + 47;
-		return BoundingBox.createProper(sx, 0, sz, ex, 255, ez);
+		return BoundingBox.fromCorners(new Vec3i(sx, 0, sz), new Vec3i(ex, 255, ez));
 	}
 
 	protected static StructureTemplate readStructure(ResourceLocation resource) {

src/main/java/ru/bclib/world/structures/StructureWorld.java

@@ -100,7 +100,7 @@ public class StructureWorld {
 	
 	public BoundingBox getBounds() {
 		if (minX == Integer.MAX_VALUE || maxX == Integer.MIN_VALUE || minZ == Integer.MAX_VALUE || maxZ == Integer.MIN_VALUE) {
-			return BoundingBox.getUnknownBox();
+			return BoundingBox.infinite();
 		}
 		return new BoundingBox(minX << 4, minY, minZ << 4, (maxX << 4) | 15, maxY, (maxZ << 4) | 15);
 	}

src/main/java/ru/bclib/world/surface/DoubleBlockSurfaceBuilder.java

@@ -34,12 +34,6 @@ public class DoubleBlockSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
 		config2 = new SurfaceBuilderBaseConfiguration(block.defaultBlockState(), stone, stone);
 		return this;
 	}
-
-	@Override
-	public void apply(Random random, ChunkAccess chunk, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderBaseConfiguration surfaceBlocks) {
-		noise = NOISE.eval(x * 0.1, z * 0.1) + MHelper.randRange(-0.4, 0.4, random);
-		SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, noise > 0 ? config1 : config2);
-	}
 	
 	public static DoubleBlockSurfaceBuilder register(String name) {
 		return Registry.register(Registry.SURFACE_BUILDER, name, new DoubleBlockSurfaceBuilder());
@@ -49,4 +43,10 @@ public class DoubleBlockSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBase
 		BlockState stone = Blocks.END_STONE.defaultBlockState();
 		return this.configured(new SurfaceBuilderBaseConfiguration(config1.getTopMaterial(), stone, stone));
 	}
+
+	@Override
+	public void apply(Random random, ChunkAccess chunkAccess, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int l, int m, long seed, SurfaceBuilderBaseConfiguration surfaceBuilderConfiguration) {
+		noise = NOISE.eval(x * 0.1, z * 0.1) + MHelper.randRange(-0.4, 0.4, random);
+		SurfaceBuilder.DEFAULT.apply(random, chunkAccess, biome, x, z, height, noise, defaultBlock, defaultFluid, l, m, seed, noise > 0 ? config1 : config2);
+	}
 }