Switching to BCLib interfaces

src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java

@@ -5,10 +5,10 @@ import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
 import ru.bclib.blocks.BaseBlock;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 
-public class AmaranitaHymenophoreBlock extends BaseBlock implements IRenderTypeable {
+public class AmaranitaHymenophoreBlock extends BaseBlock implements IRenderTyped {
 	public AmaranitaHymenophoreBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sound(SoundType.WOOD));
 	}

src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -17,10 +21,6 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 public class AncientEmeraldIceBlock extends BaseBlock {
 	public AncientEmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.BLUE_ICE).randomTicks());

src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java

@@ -20,15 +20,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IColorProvider;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IColorProvider;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndItems;
 import ru.betterend.registry.EndTags;
 
-public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider {
+public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyped, IColorProvider {
 	public static final Vec3i[] COLORS;
 	private static final int MIN_DROP = 1;
 	private static final int MAX_DROP = 4;

src/main/java/ru/betterend/blocks/BlueVineBlock.java

@@ -4,8 +4,8 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
-import ru.bclib.blocks.UpDownPlantBlock;
 import ru.bclib.blocks.BlockProperties;
+import ru.bclib.blocks.UpDownPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
 public class BlueVineBlock extends UpDownPlantBlock {

src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java

@@ -1,19 +1,19 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 	@Override
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {

src/main/java/ru/betterend/blocks/BoluxMushroomBlock.java

@@ -1,6 +1,10 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
@@ -14,9 +18,6 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-import java.util.Random;
-
 public class BoluxMushroomBlock extends EndPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(1, 0, 1, 15, 9, 15);
 	

src/main/java/ru/betterend/blocks/BrimstoneBlock.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
@@ -16,14 +20,11 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.MaterialColor;
-import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlock;
-import ru.bclib.util.BlocksHelper;
 import ru.bclib.blocks.BlockProperties;
+import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class BrimstoneBlock extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 	

src/main/java/ru/betterend/blocks/BubbleCoralBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -17,8 +19,6 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 
-import java.util.Random;
-
 public class BubbleCoralBlock extends EndUnderwaterPlantBlock {
 
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 14, 16);

src/main/java/ru/betterend/blocks/BulbVineBlock.java

@@ -1,20 +1,21 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+
 import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.blocks.BaseVineBlock;
+import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.List;
-
 public class BulbVineBlock extends BaseVineBlock {
 	public BulbVineBlock() {
 		super(15, true);

src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java

@@ -22,12 +22,12 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.blocks.basis.EndLanternBlock;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 
-public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable, BlockModelProvider {
+public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTyped, BlockModelProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(4, 4, 4, 12, 16, 12);
 	private static final VoxelShape SHAPE_FLOOR = Block.box(4, 0, 4, 12, 12, 12);
 	

src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.ColorUtil;
-import ru.betterend.interfaces.IColorProvider;
 
 public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider {
 	public BulbVineLanternColoredBlock(FabricBlockSettings settings) {

src/main/java/ru/betterend/blocks/BulbVineSeedBlock.java

@@ -1,19 +1,19 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.api.TagAPI;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.BlocksHelper;
-import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class BulbVineSeedBlock extends EndPlantWithAgeBlock {
 
 	@Override

src/main/java/ru/betterend/blocks/CavePumpkinBlock.java

@@ -1,5 +1,8 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
@@ -15,14 +18,11 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Collections;
+public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTyped {
-import java.util.List;
-
-public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTypeable {
 	public static final BooleanProperty SMALL = BlockProperties.SMALL;
 	private static final VoxelShape SHAPE_SMALL;
 	private static final VoxelShape SHAPE_BIG;
@@ -43,7 +43,6 @@ public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTypeabl
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
 		return state.getValue(SMALL) ? SHAPE_SMALL : SHAPE_BIG;
 	}

src/main/java/ru/betterend/blocks/CavePumpkinVineBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -16,8 +18,6 @@ import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class CavePumpkinVineBlock extends EndPlantWithAgeBlock {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 16, 12);
 	

src/main/java/ru/betterend/blocks/ChandelierBlock.java

@@ -1,6 +1,13 @@
 package ru.betterend.blocks;
 
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -14,19 +21,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 
-import java.util.EnumMap;
+public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped, BlockModelProvider {
-import java.util.Map;
-import java.util.Optional;
-
-public class ChandelierBlock extends BaseAttachedBlock implements IRenderTypeable, BlockModelProvider {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	
 	public ChandelierBlock(Block source) {

src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java

@@ -1,5 +1,8 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -9,13 +12,10 @@ 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 ru.bclib.blocks.BaseBlock;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 
-import java.util.Collections;
+public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTyped {
-import java.util.List;
-
-public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTypeable {
 	public DenseEmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.PACKED_ICE));
 	}

src/main/java/ru/betterend/blocks/EmeraldIceBlock.java

@@ -25,10 +25,10 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.client.models.BlockModelProvider;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 
-public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderTypeable, BlockModelProvider {
+public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderTyped, BlockModelProvider {
 	public EmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.ICE));
 	}

src/main/java/ru/betterend/blocks/EndLilyBlock.java

@@ -1,6 +1,11 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -32,10 +37,6 @@ import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 public class EndLilyBlock extends EndUnderwaterPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape SHAPE_BOTTOM = Block.box(4, 0, 4, 12, 16, 12);

src/main/java/ru/betterend/blocks/EndLilySeedBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
@@ -10,8 +12,6 @@ import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class EndLilySeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {

src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -18,8 +21,6 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-
 public class EndLotusFlowerBlock extends EndPlantBlock {
 	private static final VoxelShape SHAPE_OUTLINE = Block.box(2, 0, 2, 14, 14, 14);
 	private static final VoxelShape SHAPE_COLLISION = Block.box(0, 0, 0, 16, 2, 16);

src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java

@@ -21,15 +21,14 @@ import net.minecraft.world.level.material.WaterFluid;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseBlockNotFull;
-import ru.bclib.blocks.BlockProperties.TripleShape;
-import ru.bclib.util.BlocksHelper;
 import ru.bclib.blocks.BlockProperties;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.blocks.BlockProperties.TripleShape;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
+import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-@SuppressWarnings("deprecation")
+public class EndLotusLeafBlock extends BaseBlockNotFull implements IRenderTyped {
-public class EndLotusLeafBlock extends BaseBlockNotFull implements IRenderTypeable {
 	public static final EnumProperty<Direction> HORIZONTAL_FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape VSHAPE = Block.box(0, 0, 0, 16, 1, 16);

src/main/java/ru/betterend/blocks/EndLotusSeedBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -12,8 +14,6 @@ import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {

src/main/java/ru/betterend/blocks/EndLotusStemBlock.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Map;
+
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -8,7 +11,11 @@ import net.minecraft.core.Direction.Axis;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelAccessor;
-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.Mirror;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -21,14 +28,11 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 
-import java.util.Map;
+public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, IRenderTyped {
-
-@SuppressWarnings("deprecation")
-public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, IRenderTypeable {
 	public static final EnumProperty<Direction> FACING = BlockStateProperties.FACING;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	public static final BooleanProperty LEAF = BooleanProperty.create("leaf");

src/main/java/ru/betterend/blocks/EndPortalBlock.java

@@ -32,15 +32,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.dimension.DimensionType;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IColorProvider;
+import ru.bclib.interfaces.IColorProvider;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.interfaces.TeleportingEntity;
 import ru.betterend.registry.EndParticles;
 import ru.betterend.registry.EndPortals;
 import ru.betterend.rituals.EternalRitual;
 
-public class EndPortalBlock extends NetherPortalBlock implements IRenderTypeable, IColorProvider {
+public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, IColorProvider {
 	public static final IntegerProperty PORTAL = EndBlockProperties.PORTAL;
 
 	public EndPortalBlock() {

src/main/java/ru/betterend/blocks/EndStoneSmelter.java

@@ -1,6 +1,10 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -17,7 +21,12 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -32,10 +41,6 @@ import net.minecraft.world.phys.BlockHitResult;
 import ru.bclib.blocks.BaseBlockWithEntity;
 import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
 
-import java.util.List;
-import java.util.Random;
-
-@SuppressWarnings("deprecation")
 public class EndStoneSmelter extends BaseBlockWithEntity {
 	public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;
 	public static final BooleanProperty LIT = BlockStateProperties.LIT;

src/main/java/ru/betterend/blocks/EternalPedestal.java

@@ -28,7 +28,6 @@ import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndPortals;
 import ru.betterend.rituals.EternalRitual;
 
-@SuppressWarnings("deprecation")
 public class EternalPedestal extends PedestalBlock {
 	public static final BooleanProperty ACTIVATED = EndBlockProperties.ACTIVE;
 	

src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.EnumMap;
+
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -13,12 +16,10 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseAttachedBlock;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 
-import java.util.EnumMap;
+public class FilaluxWingsBlock extends BaseAttachedBlock implements IRenderTyped {
-
-public class FilaluxWingsBlock extends BaseAttachedBlock implements IRenderTypeable {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	
 	public FilaluxWingsBlock() {

src/main/java/ru/betterend/blocks/GlowingPillarSeedBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -11,15 +13,13 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Material;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 
 	public GlowingPillarSeedBlock() {

src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java

@@ -1,6 +1,10 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.color.block.BlockColor;
@@ -20,15 +24,12 @@ import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseBlock;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Collections;
-import java.util.List;
-
 public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

src/main/java/ru/betterend/blocks/HydraluxBlock.java

@@ -1,6 +1,11 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -24,10 +29,6 @@ import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 public class HydraluxBlock extends UnderwaterPlantBlock {
 
 	public static final EnumProperty<HydraluxShape> SHAPE = EndBlockProperties.HYDRALUX_SHAPE;

src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java

@@ -11,9 +11,9 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.interfaces.IColorProvider;
 
 public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements IColorProvider {
 	public HydraluxPetalColoredBlock(FabricBlockSettings settings) {

src/main/java/ru/betterend/blocks/HydraluxSaplingBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.world.level.WorldGenLevel;
@@ -11,8 +13,6 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock {
 
 	@Override

src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -15,7 +19,12 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
-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.EntityBlock;
+import net.minecraft.world.level.block.LiquidBlockContainer;
+import net.minecraft.world.level.block.SimpleWaterloggedBlock;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -27,7 +36,6 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
@@ -35,8 +43,6 @@ import ru.betterend.blocks.entities.BlockEntityHydrothermalVent;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
-import java.util.Random;
-
 @SuppressWarnings("deprecation")
 public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlock, LiquidBlockContainer, SimpleWaterloggedBlock {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

src/main/java/ru/betterend/blocks/InfusionPedestal.java

@@ -1,11 +1,8 @@
 package ru.betterend.blocks;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;

src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java

@@ -25,15 +25,15 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IColorProvider;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IColorProvider;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.noise.OpenSimplexNoise;
 
-public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider, IColorProvider {
+public class JellyshroomCapBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider, IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	private final Vec3i colorStart;

src/main/java/ru/betterend/blocks/LanceleafBlock.java

@@ -1,5 +1,8 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.ItemStack;
@@ -12,15 +15,12 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.PentaShape;
 import ru.bclib.util.MHelper;
-import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Collections;
-import java.util.List;
-
 public class LanceleafBlock extends EndPlantBlock {
 
 	public static final EnumProperty<PentaShape> SHAPE = BlockProperties.PENTA_SHAPE;

src/main/java/ru/betterend/blocks/LanceleafSeedBlock.java

@@ -8,10 +8,10 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.PentaShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 

src/main/java/ru/betterend/blocks/LumecornBlock.java

@@ -1,5 +1,8 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -21,18 +24,15 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.api.TagAPI;
 import ru.bclib.blocks.BaseBlockNotFull;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.LumecornShape;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.Collections;
-import java.util.List;
-
 @SuppressWarnings("deprecation")
-public class LumecornBlock extends BaseBlockNotFull implements IRenderTypeable {
+public class LumecornBlock extends BaseBlockNotFull implements IRenderTyped {
 	public static final EnumProperty<LumecornShape> SHAPE = EnumProperty.create("shape", LumecornShape.class);
 	private static final VoxelShape SHAPE_BOTTOM = Block.box(6, 0, 6, 10, 16, 10);
 	private static final VoxelShape SHAPE_TOP = Block.box(6, 0, 6, 10, 8, 10);

src/main/java/ru/betterend/blocks/LumecornSeedBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -8,8 +10,6 @@ import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
-import java.util.Random;
-
 public class LumecornSeedBlock extends EndPlantWithAgeBlock {
 
 	@Override

src/main/java/ru/betterend/blocks/MengerSpongeBlock.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Queue;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -17,14 +20,12 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
 import ru.bclib.blocks.BaseBlockNotFull;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Queue;
-
 @SuppressWarnings("deprecation")
-public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTypeable {
+public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.SPONGE).noOcclusion());
 	}

src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -18,15 +20,13 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import ru.bclib.blocks.BaseBlockNotFull;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 @SuppressWarnings("deprecation")
-public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTypeable {
+public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeWetBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE).noOcclusion());
 	}

src/main/java/ru/betterend/blocks/MossyDragonBoneBlock.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -17,10 +21,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseRotatedPillarBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 @SuppressWarnings("deprecation")
 public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 	public MossyDragonBoneBlock() {

src/main/java/ru/betterend/blocks/MossyObsidian.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -16,10 +20,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseBlock;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 public class MossyObsidian extends BaseBlock {
 	public MossyObsidian() {
 		super(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).hardness(3).randomTicks());

src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java

@@ -1,7 +1,12 @@
 package ru.betterend.blocks;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
@@ -11,8 +16,16 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.*;
+import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -26,21 +39,17 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.api.TagAPI;
 import ru.bclib.blocks.BaseBlockNotFull;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.CactusBottom;
-import ru.bclib.blocks.BlockProperties;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Random;
-
 @SuppressWarnings("deprecation")
-public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, IRenderTypeable {
+public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, IRenderTyped {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	public static final EnumProperty<CactusBottom> CACTUS_BOTTOM = EndBlockProperties.CACTUS_BOTTOM;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

src/main/java/ru/betterend/blocks/PondAnemoneBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -17,8 +19,6 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 
-import java.util.Random;
-
 public class PondAnemoneBlock extends EndUnderwaterPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14);
 	

src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java

@@ -1,6 +1,11 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
@@ -30,22 +35,19 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IColorProvider;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.ColorUtil;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IColorProvider;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.List;
+public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IRenderTyped {
-
-public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IRenderTypeable {
 	private static final VoxelShape VOXEL_SHAPE_BOTTOM = Block.box(1, 0, 1, 15, 16, 15);
 	private static final VoxelShape VOXEL_SHAPE_MIDDLE_TOP = Block.box(2, 0, 2, 14, 16, 14);
 	

src/main/java/ru/betterend/blocks/RunedFlavolite.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.List;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Explosion;
@@ -15,8 +18,6 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-
 public class RunedFlavolite extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 

src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -34,8 +36,6 @@ import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
-import java.util.Random;
-
 public class SilkMothHiveBlock extends BaseBlock {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;

src/main/java/ru/betterend/blocks/SilkMothNestBlock.java

@@ -1,5 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -17,7 +21,11 @@ import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-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.Mirror;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -32,19 +40,15 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseBlock;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.entity.SilkMothEntity;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
-import java.util.Collections;
+public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
-import java.util.List;
-import java.util.Random;
-
-public class SilkMothNestBlock extends BaseBlock implements IRenderTypeable {
 	public static final BooleanProperty ACTIVE = EndBlockProperties.ACTIVE;
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;

src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java

@@ -1,7 +1,12 @@
 package ru.betterend.blocks;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -26,16 +31,12 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.api.TagAPI;
 import ru.bclib.blocks.BaseAttachedBlock;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndFeatures;
 
-import java.util.EnumMap;
+public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderTyped, BonemealableBlock {
-import java.util.List;
-import java.util.Random;
-
-public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderTypeable, BonemealableBlock {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	
 	public SmallJellyshroomBlock() {

src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java

@@ -1,6 +1,9 @@
 package ru.betterend.blocks;
 
+import java.util.EnumMap;
+
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -17,18 +20,20 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.material.*;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseAttachedBlock;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
+import ru.bclib.interfaces.IRenderTyped;
-
-import java.util.EnumMap;
 
 @SuppressWarnings("deprecation")
-public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
+public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	

src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java

@@ -1,7 +1,12 @@
 package ru.betterend.blocks;
 
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -20,24 +25,24 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
-import net.minecraft.world.level.material.*;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseAttachedBlock;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.List;
-
 @SuppressWarnings("deprecation")
-public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
+public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	public static final IntegerProperty AGE = IntegerProperty.create("age", 0, 2);
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

src/main/java/ru/betterend/blocks/TenaneaFlowersBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.color.block.BlockColor;
@@ -11,13 +13,11 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.blocks.BaseVineBlock;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.registry.EndParticles;
 
-import java.util.Random;
-
 public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider {
 	public static final Vec3i[] COLORS;
 	

src/main/java/ru/betterend/blocks/TwistedUmbrellaMossBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -12,8 +14,6 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class TwistedUmbrellaMossBlock extends EndPlantBlock {
 	public TwistedUmbrellaMossBlock() {
 		super(11);

src/main/java/ru/betterend/blocks/TwistedUmbrellaMossTallBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -8,8 +10,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class TwistedUmbrellaMossTallBlock extends BaseDoublePlantBlock {
 	public TwistedUmbrellaMossTallBlock() {
 		super(12);

src/main/java/ru/betterend/blocks/UmbrellaMossBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -12,8 +14,6 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class UmbrellaMossBlock extends EndPlantBlock {
 	public UmbrellaMossBlock() {
 		super(11);

src/main/java/ru/betterend/blocks/UmbrellaMossTallBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -8,8 +10,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class UmbrellaMossTallBlock extends BaseDoublePlantBlock {
 	public UmbrellaMossTallBlock() {
 		super(12);

src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java

@@ -1,5 +1,7 @@
 package ru.betterend.blocks;
 
+import java.util.Random;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
@@ -13,8 +15,6 @@ import ru.bclib.blocks.BaseBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class UmbrellaTreeClusterEmptyBlock extends BaseBlock {
 	public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL;
 	

src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java

@@ -23,13 +23,13 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
 import ru.bclib.client.models.BlockModelProvider;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
-public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider {
+public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	

src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java

@@ -1,5 +1,8 @@
 package ru.betterend.blocks.basis;
 
+import java.util.List;
+import java.util.Objects;
+
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -14,9 +17,6 @@ import ru.bclib.blocks.BaseAnvilBlock;
 import ru.betterend.blocks.complex.MetalMaterial;
 import ru.betterend.item.EndAnvilItem;
 
-import java.util.List;
-import java.util.Objects;
-
 public class EndAnvilBlock extends BaseAnvilBlock {
 
 	protected final int level;

src/main/java/ru/betterend/blocks/basis/FurBlock.java

@@ -24,11 +24,11 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.blocks.BaseAttachedBlock;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
 
-public class FurBlock extends BaseAttachedBlock implements IRenderTypeable {
+public class FurBlock extends BaseAttachedBlock implements IRenderTyped {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	private final ItemLike drop;
 	private final int dropChance;

src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java

@@ -16,8 +16,8 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.interfaces.IColorProvider;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.registry.EndBlocks;
 
 public class StoneLanternBlock extends EndLanternBlock implements IColorProvider {

src/main/java/ru/betterend/blocks/complex/CrystalSubblocksMaterial.java

@@ -4,7 +4,11 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Block;
-import ru.bclib.blocks.*;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
+import ru.bclib.blocks.BaseSlabBlock;
+import ru.bclib.blocks.BaseStairsBlock;
+import ru.bclib.blocks.BaseWallBlock;
 import ru.bclib.util.TagHelper;
 import ru.betterend.blocks.EndPedestal;
 import ru.betterend.recipe.CraftingRecipes;

src/main/java/ru/betterend/blocks/complex/MetalMaterial.java

@@ -14,18 +14,33 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.bclib.blocks.*;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BaseChainBlock;
+import ru.bclib.blocks.BaseDoorBlock;
+import ru.bclib.blocks.BaseMetalBarsBlock;
+import ru.bclib.blocks.BaseSlabBlock;
+import ru.bclib.blocks.BaseStairsBlock;
+import ru.bclib.blocks.BaseTrapdoorBlock;
+import ru.bclib.blocks.WoodenPressurePlateBlock;
 import ru.bclib.items.ModelProviderItem;
-import ru.bclib.items.tool.*;
+import ru.bclib.items.tool.BaseAxeItem;
+import ru.bclib.items.tool.BaseHoeItem;
+import ru.bclib.items.tool.BasePickaxeItem;
+import ru.bclib.items.tool.BaseShovelItem;
+import ru.bclib.items.tool.BaseSwordItem;
 import ru.bclib.util.TagHelper;
 import ru.betterend.blocks.BulbVineLanternBlock;
 import ru.betterend.blocks.BulbVineLanternColoredBlock;
 import ru.betterend.blocks.ChandelierBlock;
-import ru.betterend.blocks.basis.*;
+import ru.betterend.blocks.basis.EndAnvilBlock;
 import ru.betterend.item.EndAnvilItem;
 import ru.betterend.item.EndArmorItem;
 import ru.betterend.item.tool.EndHammerItem;
-import ru.betterend.recipe.builders.*;
+import ru.betterend.recipe.builders.AlloyingRecipe;
+import ru.betterend.recipe.builders.AnvilRecipe;
+import ru.betterend.recipe.builders.FurnaceRecipe;
+import ru.betterend.recipe.builders.GridRecipe;
+import ru.betterend.recipe.builders.SmithingTableRecipe;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 import ru.betterend.registry.EndTags;

src/main/java/ru/betterend/blocks/complex/StoneMaterial.java

@@ -7,10 +7,17 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.bclib.api.TagAPI;
-import ru.bclib.blocks.*;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BaseFurnaceBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
+import ru.bclib.blocks.BaseSlabBlock;
+import ru.bclib.blocks.BaseStairsBlock;
+import ru.bclib.blocks.BaseStoneButtonBlock;
+import ru.bclib.blocks.BaseWallBlock;
+import ru.bclib.blocks.StonePressurePlateBlock;
 import ru.bclib.util.TagHelper;
 import ru.betterend.blocks.EndPedestal;
-import ru.betterend.blocks.basis.*;
+import ru.betterend.blocks.basis.StoneLanternBlock;
 import ru.betterend.recipe.CraftingRecipes;
 import ru.betterend.recipe.builders.GridRecipe;
 import ru.betterend.registry.EndBlocks;

src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java

@@ -12,7 +12,25 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.bclib.api.TagAPI;
-import ru.bclib.blocks.*;
+import ru.bclib.blocks.BaseBarkBlock;
+import ru.bclib.blocks.BaseBarrelBlock;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BaseBookshelfBlock;
+import ru.bclib.blocks.BaseComposterBlock;
+import ru.bclib.blocks.BaseCraftingTableBlock;
+import ru.bclib.blocks.BaseDoorBlock;
+import ru.bclib.blocks.BaseFenceBlock;
+import ru.bclib.blocks.BaseGateBlock;
+import ru.bclib.blocks.BaseLadderBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
+import ru.bclib.blocks.BaseSignBlock;
+import ru.bclib.blocks.BaseSlabBlock;
+import ru.bclib.blocks.BaseStairsBlock;
+import ru.bclib.blocks.BaseStripableLogBlock;
+import ru.bclib.blocks.BaseTrapdoorBlock;
+import ru.bclib.blocks.BaseWoodenButtonBlock;
+import ru.bclib.blocks.StripableBarkBlock;
+import ru.bclib.blocks.WoodenPressurePlateBlock;
 import ru.bclib.util.TagHelper;
 import ru.betterend.BetterEnd;
 import ru.betterend.recipe.builders.GridRecipe;

src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java

@@ -16,7 +16,6 @@ import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import ru.betterend.blocks.HydrothermalVentBlock;
 import ru.betterend.interfaces.FallFlyingItem;
-import ru.betterend.item.ArmoredElytra;
 import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;

src/main/java/ru/betterend/client/BetterEndClient.java

@@ -15,11 +15,11 @@ import ru.bclib.blocks.BaseChestBlock;
 import ru.bclib.blocks.BaseSignBlock;
 import ru.bclib.client.render.BaseChestBlockEntityRenderer;
 import ru.bclib.client.render.BaseSignBlockEntityRenderer;
+import ru.bclib.client.render.ERenderLayer;
+import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.TranslationHelper;
 import ru.betterend.BetterEnd;
-import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.events.ItemTooltipCallback;
-import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.interfaces.MultiModelItem;
 import ru.betterend.item.CrystaliteArmor;
 import ru.betterend.registry.EndBlockEntityRenders;
@@ -67,8 +67,8 @@ public class BetterEndClient implements ClientModInitializer {
 		RenderType cutout = RenderType.cutout();
 		RenderType translucent = RenderType.translucent();
 		Registry.BLOCK.forEach(block -> {
-			if (block instanceof IRenderTypeable) {
+			if (block instanceof IRenderTyped) {
-				ERenderLayer layer = ((IRenderTypeable) block).getRenderLayer();
+				ERenderLayer layer = ((IRenderTyped) block).getRenderLayer();
 				if (layer == ERenderLayer.CUTOUT)
 					BlockRenderLayerMap.INSTANCE.putBlock(block, cutout);
 				else if (layer == ERenderLayer.TRANSLUCENT)

src/main/java/ru/betterend/client/render/ERenderLayer.java

@@ -1,6 +0,0 @@
-package ru.betterend.client.render;
-
-public enum ERenderLayer {
-	CUTOUT,
-	TRANSLUCENT;
-}

src/main/java/ru/betterend/client/render/EndCrystalRenderer.java

@@ -2,8 +2,6 @@ package ru.betterend.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix3f;
-import com.mojang.math.Matrix4f;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
 
@@ -11,9 +9,7 @@ import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
 
 public class EndCrystalRenderer {
 	private static final ResourceLocation CRYSTAL_TEXTURE = new ResourceLocation("textures/entity/end_crystal/end_crystal.png");

src/main/java/ru/betterend/integration/rei/REIPlugin.java

@@ -1,6 +1,10 @@
 package ru.betterend.integration.rei;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import com.google.common.collect.Lists;
+
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.RecipeHelper;
 import me.shedaniel.rei.api.plugins.REIPluginV0;
@@ -19,9 +23,6 @@ import ru.betterend.recipe.builders.AnvilRecipe;
 import ru.betterend.recipe.builders.InfusionRecipe;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Environment(EnvType.CLIENT)
 public class REIPlugin implements REIPluginV0 {
 

src/main/java/ru/betterend/interfaces/IColorProvider.java

@@ -1,9 +0,0 @@
-package ru.betterend.interfaces;
-
-import net.minecraft.client.color.block.BlockColor;
-import net.minecraft.client.color.item.ItemColor;
-
-public interface IColorProvider {
-	BlockColor getProvider();
-	ItemColor getItemProvider();
-}

src/main/java/ru/betterend/interfaces/IRenderTypeable.java

@@ -1,8 +0,0 @@
-package ru.betterend.interfaces;
-
-import ru.betterend.client.render.ERenderLayer;
-
-public interface IRenderTypeable
-{
-	public ERenderLayer getRenderLayer();
-}

src/main/java/ru/betterend/item/EndAnvilItem.java

@@ -1,24 +1,12 @@
 package ru.betterend.item;
 
-import java.util.List;
-
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ItemModelProvider;
 import ru.bclib.items.BaseAnvilItem;
 import ru.betterend.blocks.basis.EndAnvilBlock;

src/main/java/ru/betterend/mixin/client/LocalPlayerMixin.java

@@ -19,7 +19,6 @@ import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.ItemStack;
 import ru.betterend.interfaces.FallFlyingItem;
-import ru.betterend.item.ArmoredElytra;
 
 @Mixin(LocalPlayer.class)
 public abstract class LocalPlayerMixin extends AbstractClientPlayer {

src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java

@@ -21,8 +21,8 @@ import net.minecraft.core.Registry;
 import net.minecraft.sounds.Music;
 import net.minecraft.sounds.Musics;
 import net.minecraft.world.level.Level;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.MHelper;
-import ru.betterend.interfaces.IColorProvider;
 
 @Mixin(Minecraft.class)
 public class MinecraftClientMixin {

src/main/java/ru/betterend/mixin/common/AnvilMenuMixin.java

@@ -1,27 +1,32 @@
 package ru.betterend.mixin.common;
 
-import net.minecraft.tags.BlockTags;
+import java.util.Collections;
-import net.minecraft.world.entity.player.Inventory;
+import java.util.List;
-import net.minecraft.world.entity.player.Player;
+import java.util.stream.Collectors;
-import net.minecraft.world.inventory.*;
+
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AnvilMenu;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.DataSlot;
+import net.minecraft.world.inventory.ItemCombinerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.blocks.basis.EndAnvilBlock;
 import ru.betterend.interfaces.AnvilScreenHandlerExtended;
 import ru.betterend.recipe.builders.AnvilRecipe;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Mixin(AnvilMenu.class)
 public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilScreenHandlerExtended {
 	private List<AnvilRecipe> be_recipes = Collections.emptyList();

src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java

@@ -32,8 +32,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
-import ru.betterend.interfaces.MobEffectApplier;
 import ru.betterend.interfaces.FallFlyingItem;
+import ru.betterend.interfaces.MobEffectApplier;
 import ru.betterend.item.CrystaliteArmor;
 import ru.betterend.registry.EndAttributes;
 

src/main/java/ru/betterend/particle/ParticleTenaneaPetal.java

@@ -12,8 +12,8 @@ import net.minecraft.client.particle.TextureSheetParticle;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.Mth;
+import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.MHelper;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.registry.EndBlocks;
 
 @Environment(EnvType.CLIENT)

src/main/java/ru/betterend/registry/EndBlocks.java

@@ -1,5 +1,10 @@
 package ru.betterend.registry;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.jetbrains.annotations.NotNull;
+
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
@@ -7,22 +12,41 @@ import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.MaterialColor;
-import org.jetbrains.annotations.NotNull;
+import ru.bclib.blocks.BaseBarrelBlock;
-import ru.bclib.blocks.*;
+import ru.bclib.blocks.BaseChestBlock;
+import ru.bclib.blocks.BaseCropBlock;
+import ru.bclib.blocks.BaseFurnaceBlock;
+import ru.bclib.blocks.BaseLeavesBlock;
+import ru.bclib.blocks.BaseOreBlock;
+import ru.bclib.blocks.BasePathBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
+import ru.bclib.blocks.BaseSignBlock;
+import ru.bclib.blocks.BaseSlabBlock;
+import ru.bclib.blocks.BaseStairsBlock;
+import ru.bclib.blocks.BaseVineBlock;
+import ru.bclib.blocks.SimpleLeavesBlock;
+import ru.bclib.blocks.StalactiteBlock;
 import ru.bclib.registry.BaseBlockEntities;
 import ru.bclib.registry.BlocksRegistry;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.*;
-import ru.betterend.blocks.basis.*;
+import ru.betterend.blocks.basis.EndTerrainBlock;
-import ru.betterend.blocks.complex.*;
+import ru.betterend.blocks.basis.EndTripleTerrain;
+import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock;
+import ru.betterend.blocks.basis.EndWallMushroom;
+import ru.betterend.blocks.basis.EndWallPlantBlock;
+import ru.betterend.blocks.basis.FurBlock;
+import ru.betterend.blocks.basis.StoneLanternBlock;
+import ru.betterend.blocks.complex.ColoredMaterial;
+import ru.betterend.blocks.complex.CrystalSubblocksMaterial;
+import ru.betterend.blocks.complex.MetalMaterial;
+import ru.betterend.blocks.complex.StoneMaterial;
+import ru.betterend.blocks.complex.WoodenMaterial;
 import ru.betterend.config.Configs;
 import ru.betterend.item.material.EndArmorMaterial;
 import ru.betterend.item.material.EndToolMaterial;
 import ru.betterend.tab.CreativeTabs;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @SuppressWarnings("unused")
 public class EndBlocks extends BlocksRegistry {
 	// Terrain //

src/main/java/ru/betterend/registry/EndItems.java

@@ -28,7 +28,15 @@ import ru.bclib.items.tool.BaseSwordItem;
 import ru.bclib.registry.ItemsRegistry;
 import ru.betterend.BetterEnd;
 import ru.betterend.config.Configs;
-import ru.betterend.item.*;
+import ru.betterend.item.ArmoredElytra;
+import ru.betterend.item.CrystaliteBoots;
+import ru.betterend.item.CrystaliteChestplate;
+import ru.betterend.item.CrystaliteElytra;
+import ru.betterend.item.CrystaliteHelmet;
+import ru.betterend.item.CrystaliteLeggings;
+import ru.betterend.item.EnchantedItem;
+import ru.betterend.item.EndBucketItem;
+import ru.betterend.item.EternalCrystalItem;
 import ru.betterend.item.material.EndArmorMaterial;
 import ru.betterend.item.material.EndToolMaterial;
 import ru.betterend.item.tool.EndHammerItem;

src/main/java/ru/betterend/registry/EndTags.java

@@ -1,6 +1,10 @@
 package ru.betterend.registry;
 
+import java.util.List;
+import java.util.function.Supplier;
+
 import com.google.common.collect.Lists;
+
 import net.fabricmc.fabric.api.tag.TagRegistry;
 import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl;
 import net.fabricmc.fabric.impl.tool.attribute.handlers.ModdedToolsVanillaBlocksToolHandler;
@@ -29,9 +33,6 @@ import ru.betterend.blocks.basis.PedestalBlock;
 import ru.betterend.item.tool.EndHammerItem;
 import ru.betterend.mixin.common.ComposterBlockAccessor;
 
-import java.util.List;
-import java.util.function.Supplier;
-
 @SuppressWarnings("unused")
 public class EndTags {
 	// Table with common (c) tags:

src/main/java/ru/betterend/rituals/InfusionRitual.java

@@ -1,5 +1,9 @@
 package ru.betterend.rituals;
 
+import java.awt.Point;
+import java.util.Arrays;
+import java.util.Objects;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -15,10 +19,6 @@ import ru.betterend.blocks.entities.PedestalBlockEntity;
 import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.recipe.builders.InfusionRecipe;
 
-import java.awt.*;
-import java.util.Arrays;
-import java.util.Objects;
-
 public class InfusionRitual implements Container {
 	private static final Point[] PEDESTALS_MAP = new Point[] {
 			new Point(0, 3),

src/main/java/ru/betterend/util/BlockFixer.java

@@ -1,6 +1,9 @@
 package ru.betterend.util;
 
+import java.util.Set;
+
 import com.google.common.collect.Sets;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -16,8 +19,6 @@ import ru.betterend.blocks.BlueVineBlock;
 import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Set;
-
 public class BlockFixer {
 	private static final MutableBlockPos POS = new MutableBlockPos();
 	private static final BlockState AIR = Blocks.AIR.defaultBlockState();

src/main/java/ru/betterend/world/features/DoublePlantFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Block;
@@ -8,8 +10,6 @@ import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
 
-import java.util.Random;
-
 public class DoublePlantFeature extends ScatterFeature {
 	private final Block smallPlant;
 	private final Block largePlant;

src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -11,8 +13,6 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.EndLotusLeafBlock;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class EndLotusLeafFeature extends ScatterFeature {
 	public EndLotusLeafFeature(int radius) {
 		super(radius);

src/main/java/ru/betterend/world/features/FilaluxFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
@@ -9,11 +11,8 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.EndBlockProperties;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class FilaluxFeature extends SkyScatterFeature {
 	public FilaluxFeature() {
 		super(10);

src/main/java/ru/betterend/world/features/SilkMothNestFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -15,8 +17,6 @@ import ru.bclib.util.BlocksHelper;
 import ru.bclib.world.features.DefaultFeature;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class SilkMothNestFeature extends DefaultFeature {
 	private static final MutableBlockPos POS = new MutableBlockPos();
 

src/main/java/ru/betterend/world/features/SingleInvertedScatterFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
@@ -9,8 +11,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.util.BlocksHelper;
 
-import java.util.Random;
-
 public class SingleInvertedScatterFeature extends InvertedScatterFeature {
 	private final Block block;
 	

src/main/java/ru/betterend/world/features/SinglePlantFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Block;
@@ -9,8 +11,6 @@ import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 
-import java.util.Random;
-
 public class SinglePlantFeature extends ScatterFeature {
 	private final Block plant;
 	private final boolean rawHeightmap;

src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Block;
@@ -7,8 +9,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.bclib.util.BlocksHelper;
 
-import java.util.Random;
-
 public class UnderwaterPlantFeature extends UnderwaterPlantScatter {
 	private final Block plant;
 	

src/main/java/ru/betterend/world/features/VineFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Block;
@@ -9,8 +11,6 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.BlocksHelper;
 
-import java.util.Random;
-
 public class VineFeature extends InvertedScatterFeature {
 	private final Block vineBlock;
 	private final int maxLength;

src/main/java/ru/betterend/world/features/WallPlantFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
@@ -10,8 +12,6 @@ import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndWallPlantBlock;
 
-import java.util.Random;
-
 public class WallPlantFeature extends WallScatterFeature {
 	private final Block block;
 	

src/main/java/ru/betterend/world/features/bushes/LargeAmaranitaFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features.bushes;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -15,8 +17,6 @@ import ru.bclib.util.MHelper;
 import ru.bclib.world.features.DefaultFeature;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Random;
-
 public class LargeAmaranitaFeature extends DefaultFeature {
 	@Override
 	public boolean place(WorldGenLevel world, ChunkGenerator chunkGenerator, Random random, BlockPos pos,

src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java

@@ -1,6 +1,11 @@
 package ru.betterend.world.features.bushes;
 
+import java.util.List;
+import java.util.Random;
+import java.util.function.Function;
+
 import com.google.common.collect.Lists;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -26,10 +31,6 @@ import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-import java.util.Random;
-import java.util.function.Function;
-
 public class TenaneaBushFeature extends DefaultFeature {
 	private static final Function<BlockState, Boolean> REPLACE;
 	private static final Direction[] DIRECTIONS = Direction.values();

src/main/java/ru/betterend/world/features/terrain/StalactiteFeature.java

@@ -1,5 +1,7 @@
 package ru.betterend.world.features.terrain;
 
+import java.util.Random;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.util.Mth;
@@ -14,8 +16,6 @@ import ru.bclib.blocks.StalactiteBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.world.features.DefaultFeature;
 
-import java.util.Random;
-
 public class StalactiteFeature extends DefaultFeature {
 	private final boolean ceiling;
 	private final Block[] ground;

src/main/java/ru/betterend/world/features/terrain/SulphurHillFeature.java

@@ -14,7 +14,6 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
 import ru.bclib.world.features.DefaultFeature;
-import ru.betterend.blocks.EndBlockProperties;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 

src/main/java/ru/betterend/world/features/trees/GiganticAmaranitaFeature.java

@@ -1,6 +1,11 @@
 package ru.betterend.world.features.trees;
 
+import java.util.List;
+import java.util.Random;
+import java.util.function.Function;
+
 import com.mojang.math.Vector3f;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -22,10 +27,6 @@ import ru.bclib.util.SplineHelper;
 import ru.bclib.world.features.DefaultFeature;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.List;
-import java.util.Random;
-import java.util.function.Function;
-
 public class GiganticAmaranitaFeature extends DefaultFeature {
 	private static final Function<BlockState, Boolean> REPLACE;
 	private static final Function<BlockState, Boolean> IGNORE;