Migrating to BCLib (WIP)

gradle.properties

@@ -17,5 +17,5 @@ archives_base_name = better-end
 patchouli_version = 50-FABRIC
 fabric_version = 0.32.9+1.16
 canvas_version = 1.0.+
-bclib_version = 0.1.26
+bclib_version = 0.1.28
 rei_version = 5.8.10

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

@@ -12,6 +12,7 @@ import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.client.models.ModelsHelper;
 import ru.betterend.blocks.basis.EndAnvilBlock;
 import ru.betterend.client.models.Patterns;
@@ -30,6 +31,15 @@ public class AeterniumAnvil extends EndAnvilBlock {
 		return DESTRUCTION_LONG;
 	}
 
+	@Override
+	public IntegerProperty getDurability() {
+		if (durability == null) {
+			this.maxDamage = 8;
+			this.durability = IntegerProperty.create("durability", 0, maxDamage);
+		}
+		return durability;
+	}
+
 	@Override
 	public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
 		String name = blockId.getPath();

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

@@ -9,9 +9,9 @@ import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class AeterniumBlock extends BlockBase {
+public class AeterniumBlock extends BaseBlock {
 
 	public AeterniumBlock() {
 		super(FabricBlockSettings.of(Material.METAL, MaterialColor.COLOR_GRAY)

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

@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class AmaranitaCapBlock extends BlockBase {
+public class AmaranitaCapBlock extends BaseBlock {
 	public AmaranitaCapBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sound(SoundType.WOOD));
 	}

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

@@ -4,11 +4,11 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class AmaranitaHymenophoreBlock extends BlockBase implements IRenderTypeable {
+public class AmaranitaHymenophoreBlock extends BaseBlock implements IRenderTypeable {
 	public AmaranitaHymenophoreBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sound(SoundType.WOOD));
 	}

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

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.EndPillarBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
 
-public class AmaranitaStemBlock extends EndPillarBlock {
+public class AmaranitaStemBlock extends BaseRotatedPillarBlock {
 	public AmaranitaStemBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).materialColor(MaterialColor.COLOR_LIGHT_GREEN));
 	}

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

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class AmberBlock extends BlockBase {
+public class AmberBlock extends BaseBlock {
 	public AmberBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).materialColor(MaterialColor.COLOR_YELLOW));
 	}

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

@@ -1,9 +1,5 @@
 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;
@@ -15,13 +11,17 @@ import net.minecraft.world.level.block.Blocks;
 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.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
-public class AncientEmeraldIceBlock extends BlockBase {
+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/BlueVineBlock.java

@@ -4,12 +4,12 @@ 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.betterend.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.UpDownPlantBlock;
-import ru.betterend.blocks.basis.UpDownPlantBlock;
+import ru.bclib.blocks.BlockProperties;
 import ru.betterend.registry.EndBlocks;
 
 public class BlueVineBlock extends UpDownPlantBlock {
-	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
+	public static final EnumProperty<BlockProperties.TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	
 	@Override
 	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> stateManager) {

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

@@ -13,10 +13,11 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Material;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BlockProperties;
 import ru.betterend.registry.EndBlocks;
 
-public class BlueVineLanternBlock extends BlockBase {
+public class BlueVineLanternBlock extends BaseBlock {
 	public static final BooleanProperty NATURAL = BlockProperties.NATURAL;
 	
 	public BlueVineLanternBlock() {

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
@@ -9,11 +7,13 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+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) {
@@ -22,11 +22,11 @@ public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 		if (h < height + 1) {
 			return;
 		}
-		BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.BOTTOM));
+		BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, BlockProperties.TripleShape.BOTTOM));
 		for (int i = 1; i < height; i++) {
-			BlocksHelper.setWithoutUpdate(world, pos.above(i), EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.MIDDLE));
+			BlocksHelper.setWithoutUpdate(world, pos.above(i), EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, BlockProperties.TripleShape.MIDDLE));
 		}
-		BlocksHelper.setWithoutUpdate(world, pos.above(height), EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP));
+		BlocksHelper.setWithoutUpdate(world, pos.above(height), EndBlocks.BLUE_VINE.defaultBlockState().setValue(BlockProperties.TRIPLE_SHAPE, BlockProperties.TripleShape.TOP));
 		placeLantern(world, pos.above(height + 1));
 	}
 	

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

@@ -1,10 +1,6 @@
 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;
@@ -18,6 +14,9 @@ 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,9 +1,5 @@
 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;
@@ -20,11 +16,15 @@ 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BlockProperties;
 import ru.betterend.registry.EndBlocks;
 
-public class BrimstoneBlock extends BlockBase {
+import java.util.Random;
+
+public class BrimstoneBlock extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 	
 	public BrimstoneBlock() {

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

@@ -1,7 +1,5 @@
 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,9 +15,12 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.betterend.blocks.basis.UnderwaterPlantBlock;
+import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
+
+import java.util.Random;
+
+public class BubbleCoralBlock extends EndUnderwaterPlantBlock {
 
-public class BubbleCoralBlock extends UnderwaterPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 14, 16);
 	
 	public BubbleCoralBlock() {

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

@@ -1,22 +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.util.MHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
-import ru.betterend.blocks.basis.VineBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class BulbVineBlock extends VineBlock {
+import java.util.List;
+
+public class BulbVineBlock extends BaseVineBlock {
 	public BulbVineBlock() {
 		super(15, true);
 	}

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

@@ -1,19 +1,21 @@
 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.TripleShape;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+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
 	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
 		BlockState up = world.getBlockState(pos.above());

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

@@ -1,8 +1,5 @@
 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;
@@ -16,12 +13,16 @@ 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.betterend.blocks.basis.BlockBaseNotFull;
+import ru.bclib.blocks.BaseBlockNotFull;
+import ru.bclib.blocks.BlockProperties;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-public class CavePumpkinBlock extends BlockBaseNotFull implements IRenderTypeable {
+import java.util.Collections;
+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;
@@ -42,6 +43,7 @@ public class CavePumpkinBlock extends BlockBaseNotFull 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,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -14,9 +12,12 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 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.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,13 +1,6 @@
 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;
@@ -21,14 +14,19 @@ 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.betterend.blocks.basis.AttachedBlock;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class ChandelierBlock extends AttachedBlock implements IRenderTypeable, BlockModelProvider {
+import java.util.EnumMap;
+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/CharcoalBlock.java

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.world.level.block.Blocks;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class CharcoalBlock extends BlockBase {
+public class CharcoalBlock extends BaseBlock {
 	public CharcoalBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.COAL_BLOCK));
 		FuelRegistry.INSTANCE.add(this, 16000);

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

@@ -5,9 +5,10 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluids;
-import ru.betterend.blocks.basis.UnderwaterPlantBlock;
+import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
+
+public class CharniaBlock extends EndUnderwaterPlantBlock {
 
-public class CharniaBlock extends UnderwaterPlantBlock {
 	@Override
 	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
 		return canSupportCenter(world, pos.below(), Direction.UP) && world.getFluidState(pos).getType() == Fluids.WATER;

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

@@ -1,8 +1,5 @@
 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;
@@ -11,11 +8,14 @@ import net.minecraft.world.level.block.Blocks;
 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class DenseEmeraldIceBlock extends BlockBase implements IRenderTypeable {
+import java.util.Collections;
+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/DenseSnowBlock.java

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class DenseSnowBlock extends BlockBase {
+public class DenseSnowBlock extends BaseBlock {
 	public DenseSnowBlock() {
 		super(FabricBlockSettings.of(Material.SNOW).strength(0.2F).sound(SoundType.SNOW));
 	}

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

@@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -6,61 +6,14 @@ import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import ru.betterend.registry.EndPortals;
 
-public class BlockProperties {
+public class EndBlockProperties {
 	public static final EnumProperty<HydraluxShape> HYDRALUX_SHAPE = EnumProperty.create("shape", HydraluxShape.class);
 	public static final EnumProperty<PedestalState> PEDESTAL_STATE = EnumProperty.create("state", PedestalState.class);
 	public static final EnumProperty<CactusBottom> CACTUS_BOTTOM = EnumProperty.create("bottom", CactusBottom.class);
-	public static final EnumProperty<TripleShape> TRIPLE_SHAPE = EnumProperty.create("shape", TripleShape.class);
-	public static final EnumProperty<PentaShape> PENTA_SHAPE = EnumProperty.create("shape", PentaShape.class);
 	
-	public static final BooleanProperty TRANSITION = BooleanProperty.create("transition");
-	public static final BooleanProperty HAS_LIGHT = BooleanProperty.create("has_light");
 	public static final BooleanProperty HAS_ITEM = BooleanProperty.create("has_item");
-	public static final BooleanProperty IS_FLOOR = BooleanProperty.create("is_floor");
-	public static final BooleanProperty NATURAL = BooleanProperty.create("natural");
-	public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
-	public static final BooleanProperty SMALL = BooleanProperty.create("small");
 	
-	public static final IntegerProperty DESTRUCTION_LONG = IntegerProperty.create("destruction", 0, 8);
-	public static final IntegerProperty DESTRUCTION = IntegerProperty.create("destruction", 0, 2);
-	public static final IntegerProperty ROTATION = IntegerProperty.create("rotation", 0, 3);
-	public static final IntegerProperty FULLNESS = IntegerProperty.create("fullness", 0, 3);
-	public static final IntegerProperty COLOR = IntegerProperty.create("color", 0, 7);
 	public static final IntegerProperty PORTAL = IntegerProperty.create("portal", 0, EndPortals.getCount());
-	public static final IntegerProperty SIZE = IntegerProperty.create("size", 0, 7);
-	public static final IntegerProperty AGE = IntegerProperty.create("age", 0, 3);
-	
-	public enum TripleShape implements StringRepresentable {
-		TOP("top", 0),
-		MIDDLE("middle", 1),
-		BOTTOM("bottom", 2);
-		
-		private final String name;
-		private final int index;
-		
-		TripleShape(String name, int index) {
-			this.name = name;
-			this.index = index;
-		}
-
-		@Override
-		public String getSerializedName() {
-			return name;
-		}
-		
-		@Override
-		public String toString() {
-			return name;
-		}
-		
-		public int getIndex() {
-			return index;
-		}
-		
-		public static TripleShape fromIndex(int index) {
-			return index > 1 ? BOTTOM : index == 1 ? MIDDLE : TOP;
-		}
-	}
 	
 	public enum PedestalState implements StringRepresentable {
 		PEDESTAL_TOP("pedestal_top"),
@@ -118,30 +71,6 @@ public class BlockProperties {
 		}
 	}
 	
-	public enum PentaShape implements StringRepresentable {
-		BOTTOM("bottom"),
-		PRE_BOTTOM("pre_bottom"),
-		MIDDLE("middle"),
-		PRE_TOP("pre_top"),
-		TOP("top");
-		
-		private final String name;
-		
-		PentaShape(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public String getSerializedName() {
-			return name;
-		}
-		
-		@Override
-		public String toString() {
-			return name;
-		}
-	}
-	
 	public enum LumecornShape implements StringRepresentable {
 		LIGHT_TOP("light_top", 15),
 		LIGHT_TOP_MIDDLE("light_top_middle", 15),

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

@@ -1,11 +1,6 @@
 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;
@@ -30,13 +25,18 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.blocks.BlockProperties;
+import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
-import ru.betterend.blocks.basis.UnderwaterPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class EndLilyBlock extends UnderwaterPlantBlock {
+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);
 	private static final VoxelShape SHAPE_TOP = Block.box(2, 0, 2, 14, 6, 14);

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

@@ -1,15 +1,17 @@
 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;
 import net.minecraft.world.level.material.Fluids;
+import ru.bclib.api.TagAPI;
+import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
-import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class EndLilySeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {
@@ -31,4 +33,9 @@ public class EndLilySeedBlock extends UnderwaterPlantWithAgeBlock {
 		}
 		return world.isEmptyBlock(up);
 	}
+
+	@Override
+	protected boolean isTerrain(BlockState state) {
+		return state.is(TagAPI.END_GROUND);
+	}
 }

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

@@ -1,9 +1,6 @@
 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;
@@ -21,6 +18,8 @@ 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

@@ -20,14 +20,16 @@ import net.minecraft.world.level.material.Material;
 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.betterend.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.BlockProperties;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-public class EndLotusLeafBlock extends BlockBaseNotFull implements IRenderTypeable {
+@SuppressWarnings("deprecation")
+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,18 +1,19 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluids;
+import ru.bclib.api.TagAPI;
+import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
-import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {
@@ -115,4 +116,9 @@ public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 		}
 		return count == 9;
 	}
+
+	@Override
+	protected boolean isTerrain(BlockState state) {
+		return state.is(TagAPI.END_GROUND);
+	}
 }

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

@@ -1,9 +1,6 @@
 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;
@@ -11,11 +8,7 @@ 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.Block;
+import net.minecraft.world.level.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;
@@ -25,13 +18,17 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.shapes.CollisionContext;
 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.util.BlocksHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class EndLotusStemBlock extends BlockBase implements SimpleWaterloggedBlock, IRenderTypeable {
+import java.util.Map;
+
+@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");
@@ -55,7 +52,7 @@ public class EndLotusStemBlock extends BlockBase implements SimpleWaterloggedBlo
 	
 	@Override
 	public FluidState getFluidState(BlockState state) {
-		return (Boolean) state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
+		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}
 
 	@Override
@@ -77,7 +74,7 @@ public class EndLotusStemBlock extends BlockBase implements SimpleWaterloggedBlo
 
 	@Override
 	public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) {
-		if ((Boolean) state.getValue(WATERLOGGED)) {
+		if (state.getValue(WATERLOGGED)) {
 			world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
 		}
 		return state;

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

@@ -41,7 +41,7 @@ import ru.betterend.registry.EndPortals;
 import ru.betterend.rituals.EternalRitual;
 
 public class EndPortalBlock extends NetherPortalBlock implements IRenderTypeable, IColorProvider {
-	public static final IntegerProperty PORTAL = BlockProperties.PORTAL;
+	public static final IntegerProperty PORTAL = EndBlockProperties.PORTAL;
 
 	public EndPortalBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).resistance(Blocks.BEDROCK.getExplosionResistance()).luminance(15));

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

@@ -1,13 +0,0 @@
-package ru.betterend.blocks;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
-
-public class EndStoneBlock extends BlockBase {
-	public EndStoneBlock(MaterialColor color) {
-		super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color).sound(SoundType.STONE));
-	}
-}

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

@@ -1,10 +1,6 @@
 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;
@@ -21,12 +17,7 @@ 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.Block;
+import net.minecraft.world.level.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;
@@ -38,9 +29,13 @@ 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 net.minecraft.world.phys.BlockHitResult;
-import ru.betterend.blocks.basis.BaseBlockWithEntity;
+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;
@@ -117,12 +112,12 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 
 	@Override
 	public BlockState rotate(BlockState state, Rotation rotation) {
-		return (BlockState)state.setValue(FACING, rotation.rotate((Direction)state.getValue(FACING)));
+		return state.setValue(FACING, rotation.rotate(state.getValue(FACING)));
 	}
 
 	@Override
 	public BlockState mirror(BlockState state, Mirror mirror) {
-		return state.rotate(mirror.getRotation((Direction)state.getValue(FACING)));
+		return state.rotate(mirror.getRotation(state.getValue(FACING)));
 	}
 
 	@Override
@@ -140,7 +135,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 			   world.playLocalSound(x, y, z, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false);
 			}
 
-			Direction direction = (Direction)state.getValue(FACING);
+			Direction direction = state.getValue(FACING);
 			Direction.Axis axis = direction.getAxis();
 			double defOffset = random.nextDouble() * 0.6D - 0.3D;
 			double offX = axis == Direction.Axis.X ? direction.getStepX() * 0.52D : defOffset;

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

@@ -9,9 +9,9 @@ import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class EnderBlock extends BlockBase {
+public class EnderBlock extends BaseBlock {
 
 	public EnderBlock() {
 		super(FabricBlockSettings.of(Material.STONE, MaterialColor.WARPED_WART_BLOCK)

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

@@ -30,7 +30,7 @@ import ru.betterend.rituals.EternalRitual;
 
 @SuppressWarnings("deprecation")
 public class EternalPedestal extends PedestalBlock {
-	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
+	public static final BooleanProperty ACTIVATED = EndBlockProperties.ACTIVE;
 	
 	public EternalPedestal() {
 		super(EndBlocks.FLAVOLITE_RUNED_ETERNAL);
@@ -104,8 +104,8 @@ public class EternalPedestal extends PedestalBlock {
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		if (state.is(this)) {
-			BlockProperties.PedestalState currentState = state.getValue(BlockProperties.PEDESTAL_STATE);
+			EndBlockProperties.PedestalState currentState = state.getValue(EndBlockProperties.PEDESTAL_STATE);
-			if (currentState.equals(BlockProperties.PedestalState.BOTTOM) || currentState.equals(BlockProperties.PedestalState.PILLAR)) {
+			if (currentState.equals(EndBlockProperties.PedestalState.BOTTOM) || currentState.equals(EndBlockProperties.PedestalState.PILLAR)) {
 				return Lists.newArrayList();
 			}
 		}

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

@@ -1,9 +1,9 @@
 package ru.betterend.blocks;
 
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import ru.betterend.blocks.basis.VineBlock;
+import ru.bclib.blocks.BaseVineBlock;
 
-public class FilaluxBlock extends VineBlock {
+public class FilaluxBlock extends BaseVineBlock {
 	public FilaluxBlock() {
 		super(15, true);
 	}

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

@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class FilaluxLanternBlock extends BlockBase {
+public class FilaluxLanternBlock extends BaseBlock {
 	public FilaluxLanternBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).luminance(15).sound(SoundType.WOOD));
 	}

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

@@ -1,9 +1,6 @@
 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;
@@ -15,11 +12,13 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.betterend.blocks.basis.AttachedBlock;
+import ru.bclib.blocks.BaseAttachedBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class FilaluxWingsBlock extends AttachedBlock implements IRenderTypeable {
+import java.util.EnumMap;
+
+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/GlowingHymenophoreBlock.java

@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 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.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class GlowingHymenophoreBlock extends BlockBase {
+public class GlowingHymenophoreBlock extends BaseBlock {
 	public GlowingHymenophoreBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).luminance(15).sound(SoundType.WART_BLOCK));
 	}

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

@@ -14,11 +14,11 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 import ru.betterend.registry.EndBlocks;
 
-public class GlowingPillarLuminophorBlock extends BlockBase {
+public class GlowingPillarLuminophorBlock extends BaseBlock {
-	public static final BooleanProperty NATURAL = BlockProperties.NATURAL;
+	public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL;
 	
 	public GlowingPillarLuminophorBlock() {
 		super(FabricBlockSettings.of(Material.LEAVES)

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

@@ -9,8 +9,9 @@ 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.betterend.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.BlockProperties;
-import ru.betterend.blocks.basis.UpDownPlantBlock;
+import ru.bclib.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.UpDownPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
 public class GlowingPillarRootsBlock extends UpDownPlantBlock {

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

@@ -1,7 +1,5 @@
 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;
@@ -13,13 +11,17 @@ 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.TripleShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+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() {
 		super(FabricBlockSettings.of(Material.PLANT)
 				.breakByTool(FabricToolTags.SHEARS)
@@ -42,14 +44,12 @@ public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 		BlockState roots = EndBlocks.GLOWING_PILLAR_ROOTS.defaultBlockState();
 		if (height < 2) {
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.MIDDLE));
-			mut.move(Direction.UP);
+		} else {
-		}
-		else {
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.BOTTOM));
 			mut.move(Direction.UP);
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP));
-			mut.move(Direction.UP);
 		}
+		mut.move(Direction.UP);
 		BlocksHelper.setWithUpdate(world, mut, EndBlocks.GLOWING_PILLAR_LUMINOPHOR.defaultBlockState().setValue(BlueVineLanternBlock.NATURAL, true));
 		for (Direction dir: BlocksHelper.DIRECTIONS) {
 			pos = mut.relative(dir);

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

@@ -1,10 +1,6 @@
 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;
@@ -23,15 +19,18 @@ 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.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.blocks.BaseBlock;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
-public class HelixTreeLeavesBlock extends BlockBase implements IColorProvider {
+import java.util.Collections;
-	public static final IntegerProperty COLOR = BlockProperties.COLOR;
+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);
 	
 	public HelixTreeLeavesBlock() {

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

@@ -1,7 +1,7 @@
 package ru.betterend.blocks;
 
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndFeatures;
 
 public class HelixTreeSaplingBlock extends FeatureSaplingBlock {

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

@@ -1,11 +1,6 @@
 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;
@@ -22,14 +17,20 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.api.TagAPI;
+import ru.bclib.blocks.UnderwaterPlantBlock;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.HydraluxShape;
+import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
-import ru.betterend.blocks.basis.UnderwaterPlantBlock;
 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 = BlockProperties.HYDRALUX_SHAPE;
+
+	public static final EnumProperty<HydraluxShape> SHAPE = EndBlockProperties.HYDRALUX_SHAPE;
 	
 	public HydraluxBlock() {
 		super(FabricBlockSettings.of(Material.WATER_PLANT)
@@ -60,6 +61,11 @@ public class HydraluxBlock extends UnderwaterPlantBlock {
 		}
 	}
 
+	@Override
+	protected boolean isTerrain(BlockState state) {
+		return state.is(TagAPI.END_GROUND);
+	}
+
 	@Override
 	public boolean isValidBonemealTarget(BlockGetter world, BlockPos pos, BlockState state, boolean isClient) {
 		return false;

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

@@ -8,9 +8,9 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class HydraluxPetalBlock extends BlockBase {
+public class HydraluxPetalBlock extends BaseBlock {
 	public HydraluxPetalBlock() {
 		this(FabricBlockSettings.of(Material.PLANT)
 				.breakByTool(FabricToolTags.AXES)

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

@@ -1,19 +1,20 @@
 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;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.HydraluxShape;
+import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
-import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock {
+
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {
 		int h = MHelper.randRange(4, 8, random);
@@ -28,18 +29,18 @@ public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock {
 		
 		mut.setY(pos.getY());
 		BlockState state = EndBlocks.HYDRALUX.defaultBlockState();
-		BlocksHelper.setWithoutUpdate(world, pos, state.setValue(BlockProperties.HYDRALUX_SHAPE, HydraluxShape.ROOTS));
+		BlocksHelper.setWithoutUpdate(world, pos, state.setValue(EndBlockProperties.HYDRALUX_SHAPE, HydraluxShape.ROOTS));
 		for (int i = 1; i < h - 2; i++) {
 			mut.setY(pos.getY() + i);
-			BlocksHelper.setWithoutUpdate(world, mut, state.setValue(BlockProperties.HYDRALUX_SHAPE, HydraluxShape.VINE));
+			BlocksHelper.setWithoutUpdate(world, mut, state.setValue(EndBlockProperties.HYDRALUX_SHAPE, HydraluxShape.VINE));
 		}
 		
 		mut.setY(mut.getY() + 1);
 		boolean big = random.nextBoolean();
-		BlocksHelper.setWithoutUpdate(world, mut, state.setValue(BlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_BOTTOM : HydraluxShape.FLOWER_SMALL_BOTTOM));
+		BlocksHelper.setWithoutUpdate(world, mut, state.setValue(EndBlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_BOTTOM : HydraluxShape.FLOWER_SMALL_BOTTOM));
 		
 		mut.setY(mut.getY() + 1);
-		BlocksHelper.setWithoutUpdate(world, mut, state.setValue(BlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_TOP : HydraluxShape.FLOWER_SMALL_TOP));
+		BlocksHelper.setWithoutUpdate(world, mut, state.setValue(EndBlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_TOP : HydraluxShape.FLOWER_SMALL_TOP));
 	}
 	
 	@Override

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

@@ -1,9 +1,5 @@
 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;
@@ -19,12 +15,7 @@ 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.Block;
+import net.minecraft.world.level.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;
@@ -36,13 +27,18 @@ 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;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.blocks.entities.BlockEntityHydrothermalVent;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
-public class HydrothermalVentBlock extends BlockBaseNotFull implements EntityBlock, LiquidBlockContainer, SimpleWaterloggedBlock {
+import java.util.Random;
+
+@SuppressWarnings("deprecation")
+public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlock, LiquidBlockContainer, SimpleWaterloggedBlock {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 	private static final VoxelShape SHAPE = Block.box(1, 1, 1, 15, 16, 15);
@@ -102,7 +98,7 @@ public class HydrothermalVentBlock extends BlockBaseNotFull implements EntityBlo
 	
 	@Override
 	public FluidState getFluidState(BlockState state) {
-		return (Boolean) state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
+		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}
 
 	@Override

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

@@ -34,7 +34,7 @@ import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.noise.OpenSimplexNoise;
 
 public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider, IColorProvider {
-	public static final IntegerProperty COLOR = BlockProperties.COLOR;
+	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	private final Vec3i colorStart;
 	private final Vec3i colorEnd;

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

@@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -1,8 +1,5 @@
 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;
@@ -15,12 +12,17 @@ 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.PentaShape;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.PentaShape;
+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;
 	public static final IntegerProperty ROTATION = BlockProperties.ROTATION;
 	

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

@@ -8,9 +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.PentaShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.PentaShape;
+import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 

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

@@ -17,7 +17,8 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.BlockProperties;
+import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 

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

@@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -1,8 +1,5 @@
 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;
@@ -23,15 +20,19 @@ import net.minecraft.world.level.storage.loot.LootContext;
 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.util.MHelper;
-import ru.betterend.blocks.BlockProperties.LumecornShape;
+import ru.betterend.blocks.EndBlockProperties.LumecornShape;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class LumecornBlock extends BlockBaseNotFull implements IRenderTypeable {
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("deprecation")
+public class LumecornBlock extends BaseBlockNotFull implements IRenderTypeable {
 	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,7 +1,5 @@
 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;
@@ -10,7 +8,10 @@ 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
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {
 		EndFeatures.LUMECORN.getFeature().place(world, null, random, pos, null);

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

@@ -1,9 +1,6 @@
 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;
@@ -19,12 +16,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
+import ru.bclib.blocks.BaseBlockNotFull;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-public class MengerSpongeBlock extends BlockBaseNotFull implements IRenderTypeable {
+import java.util.Queue;
+
+@SuppressWarnings("deprecation")
+public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTypeable {
 	public MengerSpongeBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.SPONGE).noOcclusion());
 	}
@@ -46,18 +46,15 @@ public class MengerSpongeBlock extends BlockBaseNotFull implements IRenderTypeab
 
 	private boolean absorbWater(LevelAccessor world, BlockPos pos) {
 		Queue<Tuple<BlockPos, Integer>> queue = Lists.newLinkedList();
-		queue.add(new Tuple<BlockPos, Integer>(pos, 0));
+		queue.add(new Tuple<>(pos, 0));
 		int i = 0;
 
 		while (!queue.isEmpty()) {
 			Tuple<BlockPos, Integer> pair = queue.poll();
-			BlockPos blockPos = (BlockPos) pair.getA();
+			BlockPos blockPos = pair.getA();
-			int j = (Integer) pair.getB();
+			int j = pair.getB();
-			Direction[] var8 = Direction.values();
-			int var9 = var8.length;
 
-			for (int var10 = 0; var10 < var9; ++var10) {
+			for (Direction direction : Direction.values()) {
-				Direction direction = var8[var10];
 				BlockPos blockPos2 = blockPos.relative(direction);
 				BlockState blockState = world.getBlockState(blockPos2);
 				FluidState fluidState = world.getFluidState(blockPos2);
@@ -66,23 +63,21 @@ public class MengerSpongeBlock extends BlockBaseNotFull implements IRenderTypeab
 					if (blockState.getBlock() instanceof BucketPickup && ((BucketPickup) blockState.getBlock()).takeLiquid(world, blockPos2, blockState) != Fluids.EMPTY) {
 						++i;
 						if (j < 6) {
-							queue.add(new Tuple<BlockPos, Integer>(blockPos2, j + 1));
+							queue.add(new Tuple<>(blockPos2, j + 1));
 						}
-					}
+					} else if (blockState.getBlock() instanceof LiquidBlock) {
-					else if (blockState.getBlock() instanceof LiquidBlock) {
 						world.setBlock(blockPos2, Blocks.AIR.defaultBlockState(), 3);
 						++i;
 						if (j < 6) {
-							queue.add(new Tuple<BlockPos, Integer>(blockPos2, j + 1));
+							queue.add(new Tuple<>(blockPos2, j + 1));
 						}
-					}
+					} else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
-					else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
 						BlockEntity blockEntity = blockState.getBlock().isEntityBlock() ? world.getBlockEntity(blockPos2) : null;
 						dropResources(blockState, world, blockPos2, blockEntity);
 						world.setBlock(blockPos2, Blocks.AIR.defaultBlockState(), 3);
 						++i;
 						if (j < 6) {
-							queue.add(new Tuple<BlockPos, Integer>(blockPos2, j + 1));
+							queue.add(new Tuple<>(blockPos2, j + 1));
 						}
 					}
 				}

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

@@ -1,7 +1,5 @@
 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;
@@ -19,13 +17,16 @@ import net.minecraft.world.level.block.Blocks;
 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.util.BlocksHelper;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-public class MengerSpongeWetBlock extends BlockBaseNotFull implements IRenderTypeable {
+import java.util.Random;
+
+@SuppressWarnings("deprecation")
+public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTypeable {
 	public MengerSpongeWetBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE).noOcclusion());
 	}
@@ -35,7 +36,7 @@ public class MengerSpongeWetBlock extends BlockBaseNotFull implements IRenderTyp
 		if (world.dimensionType().ultraWarm()) {
 			world.setBlock(pos, EndBlocks.MENGER_SPONGE.defaultBlockState(), 3);
 			world.levelEvent(2009, pos, 0);
-			world.playSound((Player) null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 1.0F, (1.0F + world.getRandom().nextFloat() * 0.2F) * 0.7F);
+			world.playSound(null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 1.0F, (1.0F + world.getRandom().nextFloat() * 0.2F) * 0.7F);
 		}
 	}
 
@@ -47,9 +48,9 @@ public class MengerSpongeWetBlock extends BlockBaseNotFull implements IRenderTyp
 			BlockPos blockPos = pos.relative(direction);
 			BlockState blockState = world.getBlockState(blockPos);
 			if (!state.canOcclude() || !blockState.isFaceSturdy(world, blockPos, direction.getOpposite())) {
-				double x = (double) pos.getX();
+				double x = pos.getX();
-				double y = (double) pos.getY();
+				double y = pos.getY();
-				double z = (double) pos.getZ();
+				double z = pos.getZ();
 				if (direction == Direction.DOWN) {
 					y -= 0.05;
 					x += random.nextDouble();

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

@@ -2,9 +2,9 @@ package ru.betterend.blocks;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.Blocks;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class MissingTileBlock extends BlockBase {
+public class MissingTileBlock extends BaseBlock {
 	public MissingTileBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.END_STONE));
 	}

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

@@ -1,9 +1,5 @@
 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;
@@ -18,10 +14,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import ru.betterend.blocks.basis.EndPillarBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
 import ru.betterend.registry.EndBlocks;
 
-public class MossyDragonBoneBlock extends EndPillarBlock {
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@SuppressWarnings("deprecation")
+public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 	public MossyDragonBoneBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.BONE_BLOCK).hardness(0.5F).randomTicks());
 	}

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

@@ -9,11 +9,11 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Material;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 import ru.betterend.registry.EndBlocks;
 
-public class MossyGlowshroomCapBlock extends BlockBase {
+public class MossyGlowshroomCapBlock extends BaseBlock {
-	public static final BooleanProperty TRANSITION = BlockProperties.TRANSITION;
+	public static final BooleanProperty TRANSITION = EndBlockProperties.TRANSITION;
 	
 	public MossyGlowshroomCapBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sound(SoundType.WOOD));

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

@@ -4,11 +4,12 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
 public class MossyGlowshroomSaplingBlock extends FeatureSaplingBlock {
+
 	public MossyGlowshroomSaplingBlock() {
 		super(7);
 	}

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

@@ -1,9 +1,5 @@
 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;
@@ -18,9 +14,13 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LayerLightEngine;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class MossyObsidian extends BlockBase {
+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/NeonCactusBlock.java

@@ -2,9 +2,9 @@ package ru.betterend.blocks;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.Blocks;
-import ru.betterend.blocks.basis.EndPillarBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
 
-public class NeonCactusBlock extends EndPillarBlock {
+public class NeonCactusBlock extends BaseRotatedPillarBlock {
 	public NeonCactusBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.CACTUS).luminance(15));
 	}

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

@@ -1,12 +1,7 @@
 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;
@@ -16,16 +11,8 @@ 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.BlockGetter;
+import net.minecraft.world.level.*;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.*;
-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;
@@ -38,18 +25,24 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
 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.TripleShape;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.BlockProperties.CactusBottom;
+import ru.betterend.blocks.EndBlockProperties.CactusBottom;
-import ru.betterend.blocks.BlockProperties.TripleShape;
+import ru.bclib.blocks.BlockProperties;
-import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 
-public class NeonCactusPlantBlock extends BlockBaseNotFull implements SimpleWaterloggedBlock, IRenderTypeable {
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
+@SuppressWarnings("deprecation")
+public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, IRenderTypeable {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
-	public static final EnumProperty<CactusBottom> CACTUS_BOTTOM = BlockProperties.CACTUS_BOTTOM;
+	public static final EnumProperty<CactusBottom> CACTUS_BOTTOM = EndBlockProperties.CACTUS_BOTTOM;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	public static final DirectionProperty FACING = BlockStateProperties.FACING;
 	
@@ -102,13 +95,13 @@ public class NeonCactusPlantBlock extends BlockBaseNotFull implements SimpleWate
 	
 	@Override
 	public FluidState getFluidState(BlockState state) {
-		return (Boolean) state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
+		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}
 	
 	@Override
 	public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) {
 		world.getBlockTicks().scheduleTick(pos, this, 2);
-		if ((Boolean) state.getValue(WATERLOGGED)) {
+		if (state.getValue(WATERLOGGED)) {
 			world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
 		}
 		Direction dir = state.getValue(FACING);

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

@@ -1,7 +1,5 @@
 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,9 +15,11 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.betterend.blocks.basis.UnderwaterPlantBlock;
+import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 
-public class PondAnemoneBlock extends UnderwaterPlantBlock {
+import java.util.Random;
+
+public class PondAnemoneBlock extends EndUnderwaterPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14);
 	
 	public PondAnemoneBlock() {

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

@@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -1,11 +1,6 @@
 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;
@@ -35,10 +30,12 @@ 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.util.BlocksHelper;
 import ru.bclib.util.ColorUtil;
-import ru.betterend.blocks.BlockProperties.TripleShape;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.interfaces.IRenderTypeable;
@@ -46,7 +43,9 @@ import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class RespawnObeliskBlock extends BlockBase implements IColorProvider, IRenderTypeable {
+import java.util.List;
+
+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,9 +1,6 @@
 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;
@@ -13,11 +10,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.EndBlocks;
 
-public class RunedFlavolite extends BlockBase {
+import java.util.List;
+
+public class RunedFlavolite extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 
 	public RunedFlavolite(boolean unbreakable) {

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

@@ -6,11 +6,11 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.betterend.blocks.basis.EndCropBlock;
+import ru.bclib.blocks.BaseCropBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class ShadowBerryBlock extends EndCropBlock {
+public class ShadowBerryBlock extends BaseCropBlock {
 	private static final VoxelShape SHAPE = Block.box(1, 0, 1, 15, 8, 15);
 	
 	public ShadowBerryBlock() {

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

@@ -1,7 +1,5 @@
 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;
@@ -29,16 +27,18 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
+import ru.bclib.blocks.BaseBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
-public class SilkMothHiveBlock extends BlockBase {
+import java.util.Random;
+
+public class SilkMothHiveBlock extends BaseBlock {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
-	public static final IntegerProperty FULLNESS = BlockProperties.FULLNESS;
+	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;
 	
 	public SilkMothHiveBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByHand(true).hardness(0.5F).resistance(0.1F).sound(SoundType.WOOL).noOcclusion().randomTicks());

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

@@ -1,9 +1,5 @@
 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;
@@ -21,11 +17,7 @@ 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.Block;
+import net.minecraft.world.level.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;
@@ -39,19 +31,23 @@ import net.minecraft.world.phys.BlockHitResult;
 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.util.BlocksHelper;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.basis.BlockBase;
 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;
 
-public class SilkMothNestBlock extends BlockBase implements IRenderTypeable {
+import java.util.Collections;
-	public static final BooleanProperty ACTIVE = BlockProperties.ACTIVE;
+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 = BlockProperties.FULLNESS;
+	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;
 	private static final VoxelShape TOP = box(6, 0, 6, 10, 16, 10);
 	private static final VoxelShape BOTTOM = box(0, 0, 0, 16, 16, 16);
 	

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

@@ -1,12 +1,7 @@
 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;
@@ -30,13 +25,17 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 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.util.BlocksHelper;
-import ru.betterend.blocks.basis.AttachedBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndFeatures;
 
-public class SmallJellyshroomBlock extends AttachedBlock implements IRenderTypeable, BonemealableBlock {
+import java.util.EnumMap;
+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() {
@@ -48,6 +47,7 @@ public class SmallJellyshroomBlock extends AttachedBlock implements IRenderTypea
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
 		return BOUNDING_SHAPES.get(state.getValue(FACING));
 	}

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

@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 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.betterend.blocks.basis.EndPillarBlock;
+import ru.bclib.blocks.BaseRotatedPillarBlock;
 
-public class SmaragdantCrystalBlock extends EndPillarBlock {
+public class SmaragdantCrystalBlock extends BaseRotatedPillarBlock {
 	public SmaragdantCrystalBlock() {
 		super(FabricBlockSettings.of(Material.GLASS)
 				.breakByTool(FabricToolTags.PICKAXES)

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

@@ -1,9 +1,6 @@
 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;
@@ -20,19 +17,18 @@ 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.Fluid;
+import net.minecraft.world.level.material.*;
-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.betterend.blocks.basis.AttachedBlock;
+import ru.bclib.blocks.BaseAttachedBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 
-public class SmaragdantCrystalShardBlock extends AttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
+import java.util.EnumMap;
+
+@SuppressWarnings("deprecation")
+public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 	
@@ -91,7 +87,7 @@ public class SmaragdantCrystalShardBlock extends AttachedBlock implements IRende
 	
 	@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 world.getBlockState(blockPos).isFaceSturdy(world, blockPos, direction);
 	}

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

@@ -1,12 +1,7 @@
 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;
@@ -25,23 +20,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.Fluid;
+import net.minecraft.world.level.material.*;
-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.util.MHelper;
-import ru.betterend.blocks.basis.AttachedBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class SulphurCrystalBlock extends AttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+
+@SuppressWarnings("deprecation")
+public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTypeable, 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;
@@ -105,7 +101,7 @@ public class SulphurCrystalBlock extends AttachedBlock implements IRenderTypeabl
 	
 	@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 world.getBlockState(blockPos).is(EndBlocks.BRIMSTONE);
 	}

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

@@ -1,7 +1,5 @@
 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;
@@ -12,13 +10,15 @@ import net.minecraft.util.Mth;
 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.util.ColorUtil;
 import ru.bclib.util.MHelper;
-import ru.betterend.blocks.basis.VineBlock;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.registry.EndParticles;
 
-public class TenaneaFlowersBlock extends VineBlock implements IColorProvider {
+import java.util.Random;
+
+public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider {
 	public static final Vec3i[] COLORS;
 	
 	public TenaneaFlowersBlock() {
@@ -50,9 +50,7 @@ public class TenaneaFlowersBlock extends VineBlock implements IColorProvider {
 
 	@Override
 	public ItemColor getItemProvider() {
-		return (stack, tintIndex) -> {
+		return (stack, tintIndex) -> ColorUtil.color(255, 255, 255);
-			return ColorUtil.color(255, 255, 255);
-		};
 	}
 	
 	@Override

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

@@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import ru.betterend.blocks.basis.BlockBase;
+import ru.bclib.blocks.BaseBlock;
 
-public class TerminiteBlock extends BlockBase {
+public class TerminiteBlock extends BaseBlock {
 	public TerminiteBlock() {
 		super(FabricBlockSettings.of(Material.METAL, MaterialColor.WARPED_WART_BLOCK)
 				.hardness(7F)

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -9,11 +7,13 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.basis.DoublePlantBlock;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class TwistedUmbrellaMossBlock extends EndPlantBlock {
 	public TwistedUmbrellaMossBlock() {
 		super(11);
@@ -42,8 +42,8 @@ public class TwistedUmbrellaMossBlock extends EndPlantBlock {
     @Override
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
     	int rot = world.random.nextInt(4);
-		BlockState bs = EndBlocks.TWISTED_UMBRELLA_MOSS_TALL.defaultBlockState().setValue(DoublePlantBlock.ROTATION, rot);
+		BlockState bs = EndBlocks.TWISTED_UMBRELLA_MOSS_TALL.defaultBlockState().setValue(BaseDoublePlantBlock.ROTATION, rot);
 		BlocksHelper.setWithoutUpdate(world, pos, bs);
-		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(DoublePlantBlock.TOP, true));
+		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true));
 	}
 }

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

@@ -1,16 +1,16 @@
 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;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
-import ru.betterend.blocks.basis.DoublePlantBlock;
+import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-public class TwistedUmbrellaMossTallBlock extends DoublePlantBlock {
+import java.util.Random;
+
+public class TwistedUmbrellaMossTallBlock extends BaseDoublePlantBlock {
 	public TwistedUmbrellaMossTallBlock() {
 		super(12);
 	}

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -9,11 +7,13 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.basis.DoublePlantBlock;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class UmbrellaMossBlock extends EndPlantBlock {
 	public UmbrellaMossBlock() {
 		super(11);
@@ -42,8 +42,8 @@ public class UmbrellaMossBlock extends EndPlantBlock {
     @Override
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
     	int rot = world.random.nextInt(4);
-		BlockState bs = EndBlocks.UMBRELLA_MOSS_TALL.defaultBlockState().setValue(DoublePlantBlock.ROTATION, rot);
+		BlockState bs = EndBlocks.UMBRELLA_MOSS_TALL.defaultBlockState().setValue(BaseDoublePlantBlock.ROTATION, rot);
 		BlocksHelper.setWithoutUpdate(world, pos, bs);
-		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(DoublePlantBlock.TOP, true));
+		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true));
 	}
 }

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

@@ -1,16 +1,16 @@
 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;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
-import ru.betterend.blocks.basis.DoublePlantBlock;
+import ru.bclib.blocks.BaseDoublePlantBlock;
 import ru.betterend.registry.EndBlocks;
 
-public class UmbrellaMossTallBlock extends DoublePlantBlock {
+import java.util.Random;
+
+public class UmbrellaMossTallBlock extends BaseDoublePlantBlock {
 	public UmbrellaMossTallBlock() {
 		super(12);
 	}

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

@@ -17,12 +17,13 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.phys.BlockHitResult;
+import ru.bclib.blocks.BaseBlock;
+import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
-public class UmbrellaTreeClusterBlock extends BlockBase {
+public class UmbrellaTreeClusterBlock extends BaseBlock {
 	public static final BooleanProperty NATURAL = BlockProperties.NATURAL;
 	
 	public UmbrellaTreeClusterBlock() {

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

@@ -1,7 +1,5 @@
 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;
@@ -11,12 +9,14 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.MaterialColor;
+import ru.bclib.blocks.BaseBlock;
 import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.EndBlocks;
 
-public class UmbrellaTreeClusterEmptyBlock extends BlockBase {
+import java.util.Random;
-	public static final BooleanProperty NATURAL = BlockProperties.NATURAL;
+
+public class UmbrellaTreeClusterEmptyBlock extends BaseBlock {
+	public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL;
 	
 	public UmbrellaTreeClusterEmptyBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK)

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

@@ -30,7 +30,7 @@ import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
 public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider {
-	public static final IntegerProperty COLOR = BlockProperties.COLOR;
+	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	
 	public UmbrellaTreeMembraneBlock() {

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

@@ -4,8 +4,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import ru.betterend.blocks.basis.FeatureSaplingBlock;
+import ru.bclib.blocks.FeatureSaplingBlock;
-import ru.betterend.client.render.ERenderLayer;
+import ru.bclib.client.render.ERenderLayer;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 

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

@@ -1,76 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LevelReader;
-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.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.DirectionProperty;
-import ru.bclib.util.BlocksHelper;
-
-public abstract class AttachedBlock extends BlockBaseNotFull {
-	public static final DirectionProperty FACING = BlockStateProperties.FACING;
-	
-	public AttachedBlock(Properties settings) {
-		super(settings);
-		this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.UP));
-	}
-	
-	@Override
-	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> stateManager) {
-		stateManager.add(FACING);
-	}
-	
-	@Override
-	public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-		BlockState blockState = this.defaultBlockState();
-		LevelReader worldView = ctx.getLevel();
-		BlockPos blockPos = ctx.getClickedPos();
-		Direction[] directions = ctx.getNearestLookingDirections();
-		for (int i = 0; i < directions.length; ++i) {
-			Direction direction = directions[i];
-			Direction direction2 = direction.getOpposite();
-			blockState = (BlockState) blockState.setValue(FACING, direction2);
-			if (blockState.canSurvive(worldView, blockPos)) {
-				return blockState;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
-		Direction direction = (Direction) state.getValue(FACING);
-		BlockPos blockPos = pos.relative(direction.getOpposite());
-		return canSupportCenter(world, blockPos, direction) || world.getBlockState(blockPos).is(BlockTags.LEAVES);
-	}
-
-	@Override
-	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-		if (!canSurvive(state, world, pos)) {
-			return Blocks.AIR.defaultBlockState();
-		}
-		else {
-			return state;
-		}
-	}
-
-	
-	@Override
-	public BlockState rotate(BlockState state, Rotation rotation) {
-		return BlocksHelper.rotateHorizontal(state, rotation, FACING);
-	}
-
-	@Override
-	public BlockState mirror(BlockState state, Mirror mirror) {
-		return BlocksHelper.mirrorHorizontal(state, mirror, FACING);
-	}
-}

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

@@ -1,24 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Optional;
-
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import ru.betterend.client.models.Patterns;
-
-public class BarkBlock extends EndPillarBlock {
-	public BarkBlock(Properties settings) {
-		super(settings);
-	}
-
-	@Override
-	protected Optional<String> createBlockPattern(ResourceLocation blockId) {
-		blockId = Registry.BLOCK.getKey(this);
-		return Patterns.createJson(Patterns.BLOCK_BASE, getName(blockId), blockId.getPath());
-	}
-
-	private String getName(ResourceLocation blockId) {
-		String name = blockId.getPath();
-		return name.replace("_bark", "_log_side");
-	}
-}

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

@@ -1,27 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.BaseEntityBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
-
-public class BaseBlockWithEntity extends BaseEntityBlock {
-	public BaseBlockWithEntity(Properties settings) {
-		super(settings);
-	}
-
-	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
-		return null;
-	}
-	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-}

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

@@ -1,28 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
-import ru.bclib.client.models.BlockModelProvider;
-
-public class BlockBase extends Block implements BlockModelProvider {
-	public BlockBase(Properties settings) {
-		super(settings);
-	}
-
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-
-	@Override
-	public BlockModel getItemModel(ResourceLocation blockId) {
-		return getBlockModel(blockId, defaultBlockState());
-	}
-}

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

@@ -1,25 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class BlockBaseNotFull extends BlockBase {
-
-	public BlockBaseNotFull(Properties settings) {
-		super(settings);
-	}
-
-	public boolean canSuffocate(BlockState state, BlockGetter view, BlockPos pos) {
-		return false;
-	}
-
-	public boolean isSimpleFullBlock(BlockState state, BlockGetter view, BlockPos pos) {
-		return false;
-	}
-
-	public boolean allowsSpawning(BlockState state, BlockGetter view, BlockPos pos, EntityType<?> type) {
-		return false;
-	}
-}

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

@@ -1,153 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.List;
-import java.util.Random;
-
-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.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.item.enchantment.Enchantments;
-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.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.BonemealableBlock;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.block.state.properties.IntegerProperty;
-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 net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import ru.bclib.api.TagAPI;
-import ru.bclib.util.BlocksHelper;
-import ru.betterend.blocks.BlockProperties;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
-
-public class DoublePlantBlock extends BlockBaseNotFull implements IRenderTypeable, BonemealableBlock {
-	private static final VoxelShape SHAPE = Block.box(4, 2, 4, 12, 16, 12);
-	public static final IntegerProperty ROTATION = BlockProperties.ROTATION;
-	public static final BooleanProperty TOP = BooleanProperty.create("top");
-	
-	public DoublePlantBlock() {
-		super(FabricBlockSettings.of(Material.PLANT)
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.WET_GRASS)
-				.noCollission());
-		this.registerDefaultState(this.stateDefinition.any().setValue(TOP, false));
-	}
-	
-	public DoublePlantBlock(int light) {
-		super(FabricBlockSettings.of(Material.PLANT)
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.WET_GRASS)
-				.lightLevel((state) -> state.getValue(TOP) ? light : 0)
-				.noCollission());
-		this.registerDefaultState(this.stateDefinition.any().setValue(TOP, false));
-	}
-	
-	@Override
-	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> stateManager) {
-		stateManager.add(TOP, ROTATION);
-	}
-
-	@Override
-	public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
-		Vec3 vec3d = state.getOffset(view, pos);
-		return SHAPE.move(vec3d.x, vec3d.y, vec3d.z);
-	}
-
-	@Override
-	public BlockBehaviour.OffsetType getOffsetType() {
-		return BlockBehaviour.OffsetType.XZ;
-	}
-
-	@Override
-	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
-		BlockState down = world.getBlockState(pos.below());
-		BlockState up = world.getBlockState(pos.above());
-		return state.getValue(TOP) ? down.getBlock() == this : isTerrain(down) && (up.getMaterial().isReplaceable());
-	}
-	
-	public boolean canStayAt(BlockState state, LevelReader world, BlockPos pos) {
-		BlockState down = world.getBlockState(pos.below());
-		BlockState up = world.getBlockState(pos.above());
-		return state.getValue(TOP) ? down.getBlock() == this : isTerrain(down) && (up.getBlock() == this);
-	}
-
-	protected boolean isTerrain(BlockState state) {
-		return state.is(TagAPI.END_GROUND);
-	}
-	
-	@Override
-	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-		if (!canStayAt(state, world, pos)) {
-			return Blocks.AIR.defaultBlockState();
-		}
-		else {
-			return state;
-		}
-	}
-	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		if (state.getValue(TOP)) {
-			return Lists.newArrayList();
-		}
-		
-		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
-			return Lists.newArrayList(new ItemStack(this));
-		}
-		else {
-			return Lists.newArrayList();
-		}
-	}
-	
-	@Override
-	public ERenderLayer getRenderLayer() {
-		return ERenderLayer.CUTOUT;
-	}
-
-	@Override
-	public boolean isValidBonemealTarget(BlockGetter world, BlockPos pos, BlockState state, boolean isClient) {
-		return true;
-	}
-
-	@Override
-	public boolean isBonemealSuccess(Level world, Random random, BlockPos pos, BlockState state) {
-		return true;
-	}
-
-	@Override
-	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
-		ItemEntity item = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, new ItemStack(this));
-		world.addFreshEntity(item);
-	}
-	
-	@Override
-	public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-		int rot = world.random.nextInt(4);
-		BlockState bs = this.defaultBlockState().setValue(ROTATION, rot);
-		BlocksHelper.setWithoutUpdate(world, pos, bs);
-		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(TOP, true));
-	}
-}

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

@@ -1,18 +1,84 @@
 package ru.betterend.blocks.basis;
 
+import net.minecraft.world.level.block.AnvilBlock;
+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.IntegerProperty;
+import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.material.MaterialColor;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.bclib.blocks.BaseAnvilBlock;
 
 public class EndAnvilBlock extends BaseAnvilBlock {
 
 	protected final int level;
+	protected IntegerProperty durability;
+	protected int maxDamage;
 	
 	public EndAnvilBlock(MaterialColor color, int level) {
 		super(color);
 		this.level = level;
 	}
 
+	public int getDurability(BlockState blockState) {
+		Block anvilBlock = blockState.getBlock();
+		if (anvilBlock instanceof EndAnvilBlock) {
+			blockState.getValue(durability);
+		}
+		return 0;
+	}
+
+	public IntegerProperty getDurability() {
+		if (durability == null) {
+			this.maxDamage = 5;
+			this.durability = IntegerProperty.create("durability", 0, maxDamage);
+		}
+		return durability;
+	}
+
+	public int getMaxDamage() {
+		return maxDamage;
+	}
+
+	@Override
+	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+		super.createBlockStateDefinition(builder);
+		builder.add(getDurability());
+	}
+	
 	public int getCraftingLevel() {
 		return level;
 	}
+
+	public static BlockState applyDamage(BlockState blockState) {
+		Block anvilBlock = blockState.getBlock();
+		if (anvilBlock instanceof EndAnvilBlock) {
+			EndAnvilBlock endAnvilBlock = (EndAnvilBlock) anvilBlock;
+			IntegerProperty durability = endAnvilBlock.getDurability();
+			int damage = blockState.getValue(durability) + 1;
+			if (damage <= endAnvilBlock.getMaxDamage()) {
+				return blockState.setValue(durability, damage);
+			}
+			blockState = blockState.setValue(durability, 0);
+		}
+		return getDamagedState(blockState);
+	}
+
+	private static BlockState getDamagedState(BlockState fallingState) {
+		Block anvilBlock = fallingState.getBlock();
+		if (anvilBlock instanceof EndAnvilBlock) {
+			IntegerProperty destructionProperty = ((EndAnvilBlock) anvilBlock).getDestructionProperty();
+			int destruction = fallingState.getValue(destructionProperty) + 1;
+			if (destructionProperty.getPossibleValues().contains(destruction)) {
+				try {
+					return fallingState.setValue(destructionProperty, destruction);
+				} catch (Exception ex) {
+					return null;
+				}
+			}
+			return null;
+		}
+		return AnvilBlock.damage(fallingState);
+	}
 }

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

@@ -1,10 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import net.minecraft.world.level.block.Block;
-import ru.bclib.blocks.BaseBarrelBlock;
-
-public class EndBarrelBlock extends BaseBarrelBlock {
-	public EndBarrelBlock(Block source) {
-		super(source);
-	}
-}

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

@@ -1,41 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.phys.BlockHitResult;
-
-public class EndBlockStripableLogLog extends EndPillarBlock {
-	private final Block striped;
-	
-	public EndBlockStripableLogLog(MaterialColor color, Block striped) {
-		super(FabricBlockSettings.copyOf(striped).materialColor(color));
-		this.striped = striped;
-	}
-	
-	@Override
-	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-		if (player.getMainHandItem().getItem().is(FabricToolTags.AXES)) {
-			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);
-				if (player != null && !player.isCreative()) {
-					player.getMainHandItem().hurt(1, world.random, (ServerPlayer) player);
-				}
-			}
-			return InteractionResult.SUCCESS;
-		}
-		return InteractionResult.FAIL;
-	}
-}

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

@@ -1,51 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
-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.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.item.enchantment.Enchantments;
-import net.minecraft.world.level.block.Block;
-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.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-public class EndBookshelfBlock extends BlockBase {
-	public EndBookshelfBlock(Block source) {
-		super(FabricBlockSettings.copyOf(source));
-	}
-	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.isCorrectToolForDrops(state)) {
-			int silk = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool);
-			if (silk > 0) {
-				return Collections.singletonList(new ItemStack(this));
-			}
-		}
-		return Collections.singletonList(new ItemStack(Items.BOOK, 3));
-	}
-
-	@Override
-	public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-		Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_BOOKSHELF,
-				getName(blockId), blockId.getPath());
-		return ModelsHelper.fromPattern(pattern);
-	}
-
-	private String getName(ResourceLocation blockId) {
-		String name = blockId.getPath();
-		return name.replace("_bookshelf", "");
-	}
-}

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

@@ -1,79 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.client.resources.model.BlockModelRotation;
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ButtonBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.AttachFace;
-import net.minecraft.world.level.storage.loot.LootContext;
-import ru.bclib.client.models.BlockModelProvider;
-import ru.bclib.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-public abstract class EndButtonBlock extends ButtonBlock implements BlockModelProvider {
-
-	private final Block parent;
-
-	protected EndButtonBlock(Block parent, Properties properties, boolean sensitive) {
-		super(sensitive, properties);
-		this.parent = parent;
-	}
-
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-
-	@Override
-	public BlockModel getItemModel(ResourceLocation blockId) {
-		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
-		Optional<String> pattern = Patterns.createJson(Patterns.ITEM_BUTTON, parentId.getPath(), blockId.getPath());
-		return ModelsHelper.fromPattern(pattern);
-	}
-
-	@Override
-	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
-		ResourceLocation blockId = Registry.BLOCK.getKey(this);
-		ResourceLocation parentId = Registry.BLOCK.getKey(parent);
-		Optional<String> pattern = blockState.getValue(POWERED) ?
-				Patterns.createJson(Patterns.BLOCK_BUTTON_PRESSED, parentId.getPath(), blockId.getPath()) :
-				Patterns.createJson(Patterns.BLOCK_BUTTON, parentId.getPath(), blockId.getPath());
-		return ModelsHelper.fromPattern(pattern);
-	}
-
-	@Override
-	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
-		String powered = blockState.getValue(POWERED) ? "_powered" : "";
-		ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(), "block/" + stateId.getPath() + powered);
-		registerBlockModel(stateId, modelId, blockState, modelCache);
-		AttachFace face = blockState.getValue(FACE);
-		boolean isCeiling = face == AttachFace.CEILING;
-		int x = 0, y = 0;
-		switch (face) {
-			case CEILING: x = 180; break;
-			case WALL: x = 90; break;
-			default: break;
-		}
-		switch (blockState.getValue(FACING)) {
-			case NORTH: if (isCeiling) { y = 180; } break;
-			case EAST: y = isCeiling ? 270 : 90; break;
-			case SOUTH: if(!isCeiling) { y = 180; } break;
-			case WEST: y = isCeiling ? 90 : 270; break;
-			default: break;
-		}
-		BlockModelRotation rotation = BlockModelRotation.by(x, y);
-		return ModelsHelper.createMultiVariant(modelId, rotation.getRotation(), face == AttachFace.WALL);
-	}
-}

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

@@ -1,62 +0,0 @@
-package ru.betterend.blocks.basis;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.ChainBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.level.storage.loot.LootContext;
-import ru.bclib.client.models.BlockModelProvider;
-import ru.bclib.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-import ru.betterend.client.render.ERenderLayer;
-import ru.betterend.interfaces.IRenderTypeable;
-
-public class EndChainBlock extends ChainBlock implements BlockModelProvider, IRenderTypeable {
-	public EndChainBlock(MaterialColor color) {
-		super(FabricBlockSettings.copyOf(Blocks.CHAIN).materialColor(color));
-	}
-	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-
-	@Override
-	public BlockModel getItemModel(ResourceLocation blockId) {
-		return ModelsHelper.createItemModel(blockId);
-	}
-
-	@Override
-	public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
-		String name = blockId.getPath();
-		Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_CHAIN, name, name);
-		return ModelsHelper.fromPattern(pattern);
-	}
-
-	@Override
-	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
-		Direction.Axis axis = blockState.getValue(AXIS);
-		ResourceLocation modelId = new ResourceLocation(stateId.getNamespace(),
-				"block/" + stateId.getPath());
-		registerBlockModel(stateId, modelId, blockState, modelCache);
-		return ModelsHelper.createRotatedModel(modelId, axis);
-	}
-
-	@Override
-	public ERenderLayer getRenderLayer() {
-		return ERenderLayer.CUTOUT;
-	}
-}