Code style changes, entities fixes

src/main/java/ru/betterend/api/BetterEndPlugin.java

@@ -5,24 +5,28 @@ public interface BetterEndPlugin {
 	 * Alloying recipes registration.
 	 * See AlloyingRecipe.Builder for details.
 	 */
-	default void registerAlloyingRecipes() {}
+	default void registerAlloyingRecipes() {
+	}
 
 	/**
 	 * Smithing recipes registration.
 	 * See AnvilSmithingRecipe.Builder for details.
 	 */
-	default void registerSmithingRecipes() {}
+	default void registerSmithingRecipes() {
+	}
 
 	/**
 	 * Additional biomes registration.
 	 * See BiomeRegistry.registerBiome for details.
 	 */
-	default void registerEndBiomes() {}
+	default void registerEndBiomes() {
+	}
 
 	/**
 	 * Register other mod stuff, for example, EndHammers.
 	 */
-	default void registerOthers() {}
+	default void registerOthers() {
+	}
 
 
 	public static void register(BetterEndPlugin plugin) {

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;
@@ -21,6 +17,10 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class AncientEmeraldIceBlock extends BaseBlock {
 	public AncientEmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.BLUE_ICE).randomTicks());

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

@@ -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.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.color.block.BlockColor;
@@ -27,7 +24,8 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndItems;
-import ru.betterend.registry.EndTags;
+
+import java.util.List;
 
 public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyped, IColorProvider {
 	public static final Vec3i[] COLORS;
@@ -51,7 +49,8 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 		return (state, world, pos, tintIndex) -> {
 			if (pos == null) {
 				pos = BlockPos.ZERO;
-			};
+			}
+			;
 
 			long i = (long) pos.getX() + (long) pos.getY() + (long) pos.getZ();
 			double delta = i * 0.1;
@@ -100,7 +99,8 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 					return Lists.newArrayList(new ItemStack(EndItems.CRYSTAL_SHARDS, max));
 				}
 				count = MHelper.randRange(min, max, MHelper.RANDOM);
-			} else {
+			}
+			else {
 				count = MHelper.randRange(MIN_DROP, MAX_DROP, MHelper.RANDOM);
 			}
 			return Lists.newArrayList(new ItemStack(EndItems.CRYSTAL_SHARDS, count));

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;
@@ -14,6 +12,8 @@ import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 	@Override
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {

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

@@ -1,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,14 @@ 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.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class BrimstoneBlock extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 

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

@@ -1,9 +1,6 @@
 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;
@@ -16,6 +13,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+
 public class BulbVineBlock extends BaseVineBlock {
 	public BulbVineBlock() {
 		super(15, true);

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

@@ -1,12 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Maps;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -22,6 +16,7 @@ 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.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
@@ -29,6 +24,9 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.blocks.basis.EndLanternBlock;
 import ru.betterend.client.models.Patterns;
 
+import java.util.Map;
+import java.util.Optional;
+
 public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTyped, BlockModelProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(4, 4, 4, 12, 16, 12);
 	private static final VoxelShape SHAPE_FLOOR = Block.box(4, 0, 4, 12, 12, 12);

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.LevelReader;
@@ -14,6 +12,8 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class BulbVineSeedBlock extends EndPlantWithAgeBlock {
 
 	@Override

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

@@ -1,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;
@@ -22,6 +19,9 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTyped {
 	public static final BooleanProperty SMALL = BlockProperties.SMALL;
 	private static final VoxelShape SHAPE_SMALL;

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;
@@ -18,6 +16,8 @@ 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);
 
@@ -45,7 +45,8 @@ public class CavePumpkinVineBlock extends EndPlantWithAgeBlock {
 	}
 
 	@Override
-	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {}
+	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {
+	}
 
 	@Override
 	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {

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.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -23,6 +16,7 @@ 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;
@@ -30,6 +24,10 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.client.models.Patterns;
 
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+
 public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped, BlockModelProvider {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 

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;
@@ -15,6 +12,9 @@ import ru.bclib.blocks.BaseBlock;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.Collections;
+import java.util.List;
+
 public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTyped {
 	public DenseEmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.PACKED_ICE));

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

@@ -1,11 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-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;
@@ -26,10 +20,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderTyped, BlockModelProvider {
 	public EmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.ICE));

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;
@@ -37,6 +32,10 @@ import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class EndLilyBlock extends EndUnderwaterPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape SHAPE_BOTTOM = Block.box(4, 0, 4, 12, 16, 12);

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

@@ -1,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.BlockState;
@@ -12,6 +10,8 @@ import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class EndLilySeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {

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

@@ -1,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/EndLotusSeedBlock.java

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

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

@@ -1,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;
@@ -32,6 +29,8 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 
+import java.util.Map;
+
 public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, IRenderTyped {
 	public static final EnumProperty<Direction> FACING = BlockStateProperties.FACING;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

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

@@ -1,14 +1,14 @@
 package ru.betterend.blocks;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.basis.PedestalBlock;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class EndPedestal extends PedestalBlock {
 
 	public EndPedestal(Block parent) {
@@ -21,6 +21,7 @@ public class EndPedestal extends PedestalBlock {
 		String name = blockId.getPath();
 		return new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
+
 			{
 				put("%mod%", BetterEnd.MOD_ID);
 				put("%top%", name + "_polished");

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -40,6 +36,10 @@ import ru.betterend.registry.EndParticles;
 import ru.betterend.registry.EndPortals;
 import ru.betterend.rituals.EternalRitual;
 
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+
 public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, IColorProvider {
 	public static final IntegerProperty PORTAL = EndBlockProperties.PORTAL;
 
@@ -66,7 +66,8 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 		int k = random.nextInt(2) * 2 - 1;
 		if (!world.getBlockState(pos.west()).is(this) && !world.getBlockState(pos.east()).is(this)) {
 			x = pos.getX() + 0.5D + 0.25D * k;
-		} else {
+		}
+		else {
 			z = pos.getZ() + 0.5D + 0.25D * k;
 		}
 
@@ -74,7 +75,8 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 	}
 
 	@Override
-	public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {}
+	public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
+	}
 
 	@Override
 	public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) {
@@ -95,7 +97,8 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 		if (entity instanceof ServerPlayer && ((ServerPlayer) entity).isCreative()) {
 			((ServerPlayer) entity).teleportTo(destination, exitPos.getX() + 0.5, exitPos.getY(),
 					exitPos.getZ() + 0.5, entity.getYRot(), entity.getXRot());
-		} else {
+		}
+		else {
 			((TeleportingEntity) entity).be_setExitPos(exitPos);
 			Optional<Entity> teleported = Optional.ofNullable(entity.changeDimension(destination));
 			teleported.ifPresent(Entity::setPortalCooldown);
@@ -159,11 +162,14 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 		BlockState down = world.getBlockState(pos.below());
 		if (down.is(this)) {
 			return findCenter(world, pos.move(Direction.DOWN), axis, step);
-		} else if (right.is(this) && left.is(this)) {
+		}
+		else if (right.is(this) && left.is(this)) {
 			return pos;
-		} else if (right.is(this)) {
+		}
+		else if (right.is(this)) {
 			return findCenter(world, pos.move(rightDir), axis, ++step);
-		} else if (left.is(this)) {
+		}
+		else if (left.is(this)) {
 			return findCenter(world, pos.move(leftDir), axis, ++step);
 		}
 		return pos;

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

@@ -16,7 +16,12 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -56,7 +61,8 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
 		if (world.isClientSide) {
 			return InteractionResult.SUCCESS;
-		} else {
+		}
+		else {
 			this.openScreen(world, pos, player);
 			return InteractionResult.CONSUME;
 		}

src/main/java/ru/betterend/blocks/EndstoneDustBlock.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;
@@ -16,6 +13,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import ru.bclib.util.ColorUtil;
 
+import java.util.Collections;
+import java.util.List;
+
 public class EndstoneDustBlock extends FallingBlock {
 	@Environment(EnvType.CLIENT)
 	private static final int COLOR = ColorUtil.color(226, 239, 168);

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -28,6 +25,8 @@ import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndPortals;
 import ru.betterend.rituals.EternalRitual;
 
+import java.util.List;
+
 public class EternalPedestal extends PedestalBlock {
 	public static final BooleanProperty ACTIVATED = EndBlockProperties.ACTIVE;
 
@@ -50,21 +49,24 @@ public class EternalPedestal extends PedestalBlock {
 						int portalId;
 						if (targetWorld != null) {
 							portalId = EndPortals.getPortalIdByWorld(targetWorld);
-						} else {
+						}
+						else {
 							portalId = EndPortals.getPortalIdByWorld(EndPortals.OVERWORLD_ID);
 						}
 						ritual.disablePortal(portalId);
 					}
 				}
 				world.setBlockAndUpdate(pos, updatedState.setValue(ACTIVATED, false).setValue(HAS_LIGHT, false));
-			} else {
+			}
+			else {
 				ItemStack itemStack = pedestal.getItem(0);
 				ResourceLocation id = Registry.ITEM.getKey(itemStack.getItem());
 				if (EndPortals.isAvailableItem(id)) {
 					world.setBlockAndUpdate(pos, updatedState.setValue(ACTIVATED, true).setValue(HAS_LIGHT, true));
 					if (pedestal.hasRitual()) {
 						pedestal.getRitual().checkStructure();
-					} else {
+					}
+					else {
 						EternalRitual ritual = new EternalRitual(world, pos);
 						ritual.checkStructure();
 					}

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;
@@ -19,6 +16,8 @@ import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.EnumMap;
+
 public class FilaluxWingsBlock extends BaseAttachedBlock implements IRenderTyped {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 

src/main/java/ru/betterend/blocks/FlamaeaBlock.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.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -21,6 +18,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.interfaces.ISpetialItem;
 import ru.betterend.blocks.basis.EndPlantBlock;
 
+import java.util.List;
+
 public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 1, 16);
 

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;
@@ -20,6 +18,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 
 	public GlowingPillarSeedBlock() {
@@ -44,7 +44,8 @@ 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));
-		} 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));

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;
@@ -30,6 +26,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

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

@@ -1,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;
@@ -29,6 +24,10 @@ import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class HydraluxBlock extends UnderwaterPlantBlock {
 
 	public static final EnumProperty<HydraluxShape> SHAPE = EndBlockProperties.HYDRALUX_SHAPE;

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

@@ -27,5 +27,6 @@ public class HydraluxPetalBlock extends BaseBlock {
 	}
 
 	@Override
-	public void fallOn(Level level, BlockState blockState, BlockPos blockPos, Entity entity, float f)  {}
+	public void fallOn(Level level, BlockState blockState, BlockPos blockPos, Entity entity, float f) {
+	}
 }

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Optional;
-
-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;
@@ -12,11 +8,14 @@ import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.client.models.Patterns;
 
+import java.util.Optional;
+
 public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements IColorProvider {
 	public HydraluxPetalColoredBlock(FabricBlockSettings settings) {
 		super(settings);

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

@@ -1,7 +1,5 @@
 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;
@@ -13,6 +11,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.HydraluxShape;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock {
 
 	@Override

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

@@ -1,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;
@@ -36,6 +32,7 @@ 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;
@@ -43,6 +40,8 @@ import ru.betterend.blocks.entities.BlockEntityHydrothermalVent;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlock, LiquidBlockContainer, SimpleWaterloggedBlock {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

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

@@ -35,7 +35,8 @@ public class InfusionPedestal extends PedestalBlock {
 					ritual.configure();
 				}
 				pedestal.getRitual().checkRecipe();
-			} else {
+			}
+			else {
 				InfusionRitual ritual = new InfusionRitual(pedestal, world, pos);
 				pedestal.linkRitual(ritual);
 				ritual.checkRecipe();

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

@@ -1,12 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 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;
@@ -25,6 +19,7 @@ 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.storage.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
@@ -35,6 +30,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.noise.OpenSimplexNoise;
 
+import java.util.List;
+import java.util.Optional;
+
 public class JellyshroomCapBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider, IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

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;
@@ -21,6 +18,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class LanceleafBlock extends EndPlantBlock {
 
 	public static final EnumProperty<PentaShape> SHAPE = BlockProperties.PENTA_SHAPE;

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -15,6 +13,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class LanceleafSeedBlock extends EndPlantWithAgeBlock {
 	@Override
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {

src/main/java/ru/betterend/blocks/LargeAmaranitaBlock.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;
@@ -22,6 +20,8 @@ import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class LargeAmaranitaBlock extends EndPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape SHAPE_BOTTOM = Block.box(4, 0, 4, 12, 14, 12);

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;
@@ -31,6 +28,9 @@ import ru.betterend.blocks.EndBlockProperties.LumecornShape;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+
 @SuppressWarnings("deprecation")
 public class LumecornBlock extends BaseBlockNotFull implements IRenderTyped {
 	public static final EnumProperty<LumecornShape> SHAPE = EnumProperty.create("shape", LumecornShape.class);

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;
@@ -11,6 +9,8 @@ import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
+import java.util.Random;
+
 public class LumecornSeedBlock extends EndPlantWithAgeBlock {
 
 	@Override

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

@@ -1,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;
@@ -17,13 +14,14 @@ import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 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.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Queue;
+
 @SuppressWarnings("deprecation")
 public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeBlock() {
@@ -66,13 +64,15 @@ public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped
 						if (j < 6) {
 							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<>(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.hasBlockEntity() ? world.getBlockEntity(blockPos2) : null;
 						dropResources(blockState, world, blockPos2, blockEntity);
 						world.setBlock(blockPos2, Blocks.AIR.defaultBlockState(), 3);

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;
@@ -25,6 +23,8 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeWetBlock() {

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;
@@ -21,6 +17,10 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseRotatedPillarBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 	public MossyDragonBoneBlock() {
@@ -49,9 +49,11 @@ public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 		BlockState blockState = worldView.getBlockState(blockPos);
 		if (blockState.is(Blocks.SNOW) && blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
 			return true;
-	      } else if (blockState.getFluidState().getAmount() == 8) {
+		}
+		else if (blockState.getFluidState().getAmount() == 8) {
 			return false;
-	      } else {
+		}
+		else {
 			int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
 			return i < 5;
 		}

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;
@@ -20,6 +16,10 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseBlock;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class MossyObsidian extends BaseBlock {
 	public MossyObsidian() {
 		super(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).hardness(3).randomTicks());
@@ -46,9 +46,11 @@ public class MossyObsidian extends BaseBlock {
 		BlockState blockState = worldView.getBlockState(blockPos);
 		if (blockState.is(Blocks.SNOW) && (Integer) blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
 			return true;
-	      } else if (blockState.getFluidState().getAmount() == 8) {
+		}
+		else if (blockState.getFluidState().getAmount() == 8) {
 			return false;
-	      } else {
+		}
+		else {
 			int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
 			return i < 5;
 		}

src/main/java/ru/betterend/blocks/MurkweedBlock.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;
@@ -17,6 +15,8 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class MurkweedBlock extends EndPlantBlock {
 	@Override
 	@Environment(EnvType.CLIENT)

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
@@ -23,6 +20,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.List;
+
 public class NeedlegrassBlock extends EndPlantBlock {
 	@Override
 	public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {

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;
@@ -48,6 +43,10 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.CactusBottom;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, IRenderTyped {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;

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

@@ -1,13 +1,13 @@
 package ru.betterend.blocks;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import ru.betterend.blocks.basis.PedestalBlock;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class PedestalVanilla extends PedestalBlock {
 
 	public PedestalVanilla(Block parent) {
@@ -20,6 +20,7 @@ public class PedestalVanilla extends PedestalBlock {
 		String name = blockId.getPath().replace("_block", "");
 		return new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
+
 			{
 				put("%mod%", blockId.getNamespace());
 				put("%top%", "polished_" + name);

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;
@@ -19,6 +17,8 @@ import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.betterend.blocks.basis.EndUnderwaterPlantBlock;
 
+import java.util.Random;
+
 public class PondAnemoneBlock extends EndUnderwaterPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14);
 

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

@@ -1,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,6 +30,7 @@ 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;
@@ -47,6 +43,8 @@ import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+
 public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IRenderTyped {
 	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;
@@ -18,6 +15,8 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.List;
+
 public class RunedFlavolite extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 

src/main/java/ru/betterend/blocks/ShadowGrassBlock.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;
@@ -11,6 +9,8 @@ import net.minecraft.world.level.material.MaterialColor;
 import ru.betterend.blocks.basis.EndTerrainBlock;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 public class ShadowGrassBlock extends EndTerrainBlock {
 	public ShadowGrassBlock() {
 		super(MaterialColor.COLOR_BLACK);

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;
@@ -36,6 +34,8 @@ import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
+import java.util.Random;
+
 public class SilkMothHiveBlock extends BaseBlock {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;
@@ -73,7 +73,9 @@ public class SilkMothHiveBlock extends BaseBlock {
 		if (!world.getBlockState(spawn).isAir()) {
 			return;
 		}
-		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { return true; }).size();
+		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> {
+			return true;
+		}).size();
 		if (count > 6) {
 			return;
 		}

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;
@@ -48,6 +44,10 @@ import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
 	public static final BooleanProperty ACTIVE = EndBlockProperties.ACTIVE;
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
@@ -134,7 +134,9 @@ public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
 		if (!world.getBlockState(spawn).isAir()) {
 			return;
 		}
-		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { return true; }).size();
+		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> {
+			return true;
+		}).size();
 		if (count > 6) {
 			return;
 		}

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;
@@ -37,6 +32,10 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndFeatures;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderTyped, BonemealableBlock {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 

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;
@@ -32,6 +29,8 @@ import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.EnumMap;
+
 @SuppressWarnings("deprecation")
 public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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;
@@ -41,6 +36,10 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+
 @SuppressWarnings("deprecation")
 public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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;
@@ -18,6 +16,8 @@ import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider {
 	public static final Vec3i[] COLORS;
 
@@ -30,7 +30,8 @@ public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider
 		return (state, world, pos, tintIndex) -> {
 			if (pos == null) {
 				pos = BlockPos.ZERO;
-			};
+			}
+			;
 			long i = (MHelper.getRandom(pos.getX(), pos.getZ()) & 63) + pos.getY();
 			double delta = i * 0.1;
 			int index = MHelper.floor(delta);

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;
@@ -14,6 +12,8 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class TwistedUmbrellaMossBlock extends EndPlantBlock {
 	public TwistedUmbrellaMossBlock() {
 		super(11);

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

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

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

@@ -1,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;
@@ -14,6 +12,8 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class UmbrellaMossBlock extends EndPlantBlock {
 	public UmbrellaMossBlock() {
 		super(11);

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

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

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

@@ -1,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;
@@ -15,6 +13,8 @@ import ru.bclib.blocks.BaseBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class UmbrellaTreeClusterEmptyBlock extends BaseBlock {
 	public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL;
 

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

@@ -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.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -29,6 +25,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Optional;
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -36,6 +33,9 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Optional;
+import java.util.Random;
+
 public class VentBubbleColumnBlock extends Block implements BucketPickup, LiquidBlockContainer {
 	public VentBubbleColumnBlock() {
 		super(FabricBlockSettings.of(Material.BUBBLE_COLUMN).noOcclusion().noCollission().noDrops());
@@ -126,7 +126,6 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid
 	}
 
 
-
 	@Override
 	public Optional<SoundEvent> getPickupSound() {
 		return Fluids.WATER.getPickupSound();

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks.basis;
 
-import java.util.List;
-import java.util.Objects;
-
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -17,6 +14,9 @@ import ru.bclib.blocks.BaseAnvilBlock;
 import ru.betterend.blocks.complex.MetalMaterial;
 import ru.betterend.item.EndAnvilItem;
 
+import java.util.List;
+import java.util.Objects;
+
 public class EndAnvilBlock extends BaseAnvilBlock {
 
 	protected final int level;
@@ -109,7 +109,8 @@ public class EndAnvilBlock extends BaseAnvilBlock {
 			if (destructionProperty.getPossibleValues().contains(destruction)) {
 				try {
 					return fallingState.setValue(destructionProperty, destruction);
-				} catch (Exception ex) {
+				}
+				catch (Exception ex) {
 					return null;
 				}
 			}

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Map;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -28,6 +26,8 @@ import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.client.models.ModelsHelper;
 
+import java.util.Map;
+
 @SuppressWarnings("deprecation")
 public class EndLanternBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, LiquidBlockContainer {
 	public static final BooleanProperty IS_FLOOR = BlockProperties.IS_FLOOR;

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

@@ -6,7 +6,8 @@ import ru.bclib.blocks.BasePlantWithAgeBlock;
 
 public abstract class EndPlantWithAgeBlock extends BasePlantWithAgeBlock {
 
-	public EndPlantWithAgeBlock() {}
+	public EndPlantWithAgeBlock() {
+	}
 
 	public EndPlantWithAgeBlock(Properties settings) {
 		super(settings);

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

@@ -6,7 +6,8 @@ import ru.bclib.blocks.UnderwaterPlantBlock;
 
 public class EndUnderwaterPlantBlock extends UnderwaterPlantBlock {
 
-	public EndUnderwaterPlantBlock() {}
+	public EndUnderwaterPlantBlock() {
+	}
 
 	public EndUnderwaterPlantBlock(int light) {
 		super(light);

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

@@ -6,7 +6,8 @@ import ru.bclib.blocks.BaseUnderwaterWallPlantBlock;
 
 public class EndUnderwaterWallPlantBlock extends BaseUnderwaterWallPlantBlock {
 
-	public EndUnderwaterWallPlantBlock() {}
+	public EndUnderwaterWallPlantBlock() {
+	}
 
 	public EndUnderwaterWallPlantBlock(int light) {
 		super(light);

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

@@ -5,7 +5,8 @@ import ru.bclib.api.TagAPI;
 import ru.bclib.blocks.BaseWallPlantBlock;
 
 public class EndWallPlantBlock extends BaseWallPlantBlock {
-	public EndWallPlantBlock() {}
+	public EndWallPlantBlock() {
+	}
 
 	public EndWallPlantBlock(int light) {
 		super(light);

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

@@ -1,11 +1,7 @@
 package ru.betterend.blocks.basis;
 
-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;
@@ -28,6 +24,9 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
 
+import java.util.EnumMap;
+import java.util.List;
+
 public class FurBlock extends BaseAttachedBlock implements IRenderTyped {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	private final ItemLike drop;

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

@@ -1,17 +1,6 @@
 package ru.betterend.blocks.basis;
 
-import java.awt.Point;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import net.minecraft.world.level.block.entity.BlockEntityTicker;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.jetbrains.annotations.Nullable;
-
 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;
@@ -34,6 +23,8 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -44,6 +35,7 @@ import net.minecraft.world.phys.BlockHitResult;
 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.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.client.models.ModelsHelper;
@@ -57,6 +49,12 @@ import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.rituals.InfusionRitual;
 
+import java.awt.Point;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 @SuppressWarnings({"deprecation"})
 public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	public final static EnumProperty<PedestalState> STATE = EndBlockProperties.PEDESTAL_STATE;
@@ -71,7 +69,6 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	private static final VoxelShape SHAPE_BOTTOM;
 
 	/**
-	 * 
 	 * Register new Pedestal block with Better End mod id.
 	 *
 	 * @param name   pedestal name
@@ -83,7 +80,6 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	}
 
 	/**
-	 * 
 	 * Register new Pedestal block with specified mod id.
 	 *
 	 * @param id     pedestal id
@@ -126,7 +122,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 				pedestal.setItem(0, itemStack);
 				checkRitual(world, pos);
 				return InteractionResult.SUCCESS;
-			} else {
+			}
+			else {
 				ItemStack itemStack = pedestal.getItem(0);
 				if (player.addItem(itemStack)) {
 					pedestal.removeItemNoUpdate(0);
@@ -182,13 +179,17 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		boolean hasPedestalUnder = downState.getBlock() instanceof PedestalBlock;
 		if (!hasPedestalOver && hasPedestalUnder && upSideSolid) {
 			return defaultBlockState().setValue(STATE, PedestalState.COLUMN_TOP);
-		} else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
+		}
+		else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
 			return defaultBlockState().setValue(STATE, PedestalState.COLUMN);
-		} else if (hasPedestalUnder && hasPedestalOver) {
+		}
+		else if (hasPedestalUnder && hasPedestalOver) {
 			return defaultBlockState().setValue(STATE, PedestalState.PILLAR);
-		} else if (hasPedestalUnder) {
+		}
+		else if (hasPedestalUnder) {
 			return defaultBlockState().setValue(STATE, PedestalState.PEDESTAL_TOP);
-		} else if (hasPedestalOver) {
+		}
+		else if (hasPedestalOver) {
 			return defaultBlockState().setValue(STATE, PedestalState.BOTTOM);
 		}
 		return defaultBlockState();
@@ -216,21 +217,27 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		if (direction == Direction.UP) {
 			upSideSolid = newState.isFaceSturdy(world, posFrom, Direction.DOWN) || newState.is(BlockTags.WALLS);
 			hasPedestalOver = newState.getBlock() instanceof PedestalBlock;
-		} else {
+		}
+		else {
 			hasPedestalUnder = newState.getBlock() instanceof PedestalBlock;
 		}
 		BlockState updatedState;
 		if (!hasPedestalOver && hasPedestalUnder && upSideSolid) {
 			updatedState = state.setValue(STATE, PedestalState.COLUMN_TOP);
-		} else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
+		}
+		else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
 			updatedState = state.setValue(STATE, PedestalState.COLUMN);
-		} else if (hasPedestalUnder && hasPedestalOver) {
+		}
+		else if (hasPedestalUnder && hasPedestalOver) {
 			updatedState = state.setValue(STATE, PedestalState.PILLAR);
-		} else if (hasPedestalUnder) {
+		}
+		else if (hasPedestalUnder) {
 			updatedState = state.setValue(STATE, PedestalState.PEDESTAL_TOP);
-		} else if (hasPedestalOver) {
+		}
+		else if (hasPedestalOver) {
 			updatedState = state.setValue(STATE, PedestalState.BOTTOM);
-		} else {
+		}
+		else {
 			updatedState = state.setValue(STATE, PedestalState.DEFAULT);
 		}
 		if (!isPlaceable(updatedState)) {
@@ -251,7 +258,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 						drop.add(pedestal.getItem(0));
 					}
 				}
-			} else {
+			}
+			else {
 				return drop;
 			}
 		}
@@ -273,18 +281,23 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		BlockState state = world.getBlockState(pos);
 		if (!state.is(this)) {
 			dropStoredStack(blockEntity, stack, pos);
-		} else if (state.getValue(STATE).equals(PedestalState.PILLAR)) {
+		}
+		else if (state.getValue(STATE).equals(PedestalState.PILLAR)) {
 			moveStoredStack(blockEntity, world, stack, pos.above());
-		} else if (!isPlaceable(state)) {
+		}
+		else if (!isPlaceable(state)) {
 			dropStoredStack(blockEntity, stack, pos);
-		} else if (blockEntity instanceof PedestalBlockEntity) {
+		}
+		else if (blockEntity instanceof PedestalBlockEntity) {
 			PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity;
 			if (pedestal.isEmpty()) {
 				pedestal.setItem(0, stack);
-			} else {
+			}
+			else {
 				dropStoredStack(blockEntity, stack, pos);
 			}
-		} else {
+		}
+		else {
 			dropStoredStack(blockEntity, stack, pos);
 		}
 	}
@@ -402,7 +415,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 			case PILLAR:
 				pattern = Patterns.createJson(Patterns.BLOCK_PEDESTAL_PILLAR, textures);
 				break;
-			default: break;
+			default:
+				break;
 		}
 		return ModelsHelper.fromPattern(pattern);
 	}
@@ -422,6 +436,7 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		String name = blockId.getPath();
 		return new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
+
 			{
 				put("%mod%", blockId.getNamespace());
 				put("%top%", name + "_top");

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Optional;
-
-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;
@@ -17,11 +13,14 @@ 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 org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.IColorProvider;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Optional;
+
 public class StoneLanternBlock extends EndLanternBlock implements IColorProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(3, 1, 3, 13, 16, 13);
 	private static final VoxelShape SHAPE_FLOOR = Block.box(3, 0, 3, 13, 15, 13);

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

@@ -1,10 +1,6 @@
 package ru.betterend.blocks.complex;
 
-import java.util.Map;
-import java.util.function.Function;
-
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.Registry;
 import net.minecraft.world.item.DyeColor;
@@ -18,6 +14,9 @@ import ru.betterend.BetterEnd;
 import ru.betterend.config.Configs;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Map;
+import java.util.function.Function;
+
 public class ColoredMaterial {
 	private static final Map<Integer, ItemLike> DYES = Maps.newHashMap();
 	private static final Map<Integer, String> COLORS = Maps.newHashMap();

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

@@ -28,7 +28,6 @@ import ru.bclib.blocks.WoodenPressurePlateBlock;
 import ru.bclib.items.ModelProviderItem;
 import ru.bclib.items.tool.BaseAxeItem;
 import ru.bclib.items.tool.BaseHoeItem;
-import ru.bclib.items.tool.BasePickaxeItem;
 import ru.bclib.items.tool.BaseShovelItem;
 import ru.bclib.items.tool.BaseSwordItem;
 import ru.bclib.recipes.FurnaceRecipe;
@@ -49,7 +48,6 @@ import ru.betterend.recipe.builders.AlloyingRecipe;
 import ru.betterend.recipe.builders.AnvilRecipe;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.registry.EndTags;
 
 public class MetalMaterial {
 	public final Block ore;

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks.entities;
 
-import java.util.List;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -21,6 +19,8 @@ import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
+import java.util.List;
+
 public class BlockEntityHydrothermalVent extends BlockEntity {
 
 	private final static Vec3 POSITIVE_Y = new Vec3(0.0f, 1.0f, 0.0f);
@@ -39,7 +39,8 @@ public class BlockEntityHydrothermalVent extends BlockEntity {
 					double z = worldPosition.getZ() + level.random.nextDouble();
 					if (state.getValue(HydrothermalVentBlock.WATERLOGGED)) {
 						level.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0);
-					} else {
+					}
+					else {
 						level.addParticle(ParticleTypes.BUBBLE, x, y, z, 0, 0, 0);
 					}
 				}

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

@@ -121,7 +121,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				return true;
 			}
 			itemStack = iterator.next();
-		} while (itemStack.isEmpty());
+		}
+		while (itemStack.isEmpty());
 
 		return false;
 	}
@@ -177,7 +178,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				if (recipe instanceof AlloyingRecipe) {
 					AlloyingRecipe alloying = (AlloyingRecipe) recipe;
 					dropExperience(player.level, player.position(), entry.getIntValue(), alloying.getExperience());
-				} else {
+				}
+				else {
 					BlastingRecipe blasting = (BlastingRecipe) recipe;
 					dropExperience(player.level, player.position(), entry.getIntValue(), blasting.getExperience());
 				}
@@ -239,7 +241,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				if (blockEntity.smeltTime > 0) {
 					blockEntity.smeltTime = Mth.clamp(blockEntity.smeltTime - 2, 0, blockEntity.smeltTimeTotal);
 				}
-			} else {
+			}
+			else {
 				Recipe<?> recipe = tickLevel.getRecipeManager().getRecipeFor(AlloyingRecipe.TYPE, blockEntity, tickLevel).orElse(null);
 				if (recipe == null) {
 					recipe = tickLevel.getRecipeManager().getRecipeFor(RecipeType.BLASTING, blockEntity, tickLevel).orElse(null);
@@ -270,7 +273,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 						blockEntity.craftRecipe(recipe);
 						blockEntity.setChanged();
 					}
-				} else {
+				}
+				else {
 					blockEntity.smeltTime = 0;
 				}
 			}
@@ -288,7 +292,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		if (recipe instanceof AlloyingRecipe) {
 			validInput = !inventory.get(0).isEmpty() &&
 					!inventory.get(1).isEmpty();
-		} else {
+		}
+		else {
 			validInput = !inventory.get(0).isEmpty() ||
 					!inventory.get(1).isEmpty();
 		}
@@ -321,7 +326,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		ItemStack output = inventory.get(3);
 		if (output.isEmpty()) {
 			inventory.set(3, result.copy());
-		} else if (output.getItem() == result.getItem()) {
+		}
+		else if (output.getItem() == result.getItem()) {
 			output.grow(result.getCount());
 		}
 
@@ -333,10 +339,12 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		if (recipe instanceof AlloyingRecipe) {
 			inventory.get(0).shrink(1);
 			inventory.get(1).shrink(1);
-		} else {
+		}
+		else {
 			if (!inventory.get(0).isEmpty()) {
 				inventory.get(0).shrink(1);
-			} else {
+			}
+			else {
 				inventory.get(1).shrink(1);
 			}
 		}
@@ -425,7 +433,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 	public boolean canPlaceItem(int slot, ItemStack stack) {
 		if (slot == 3) {
 			return false;
-		} else if (slot != 2) {
+		}
+		else if (slot != 2) {
 			return true;
 		}
 		ItemStack itemStack = this.inventory.get(2);

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

@@ -20,7 +20,8 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
 		super.setLevel(world);
 		if (hasRitual()) {
 			linkedRitual.setLocation(world, this.getBlockPos());
-		} else {
+		}
+		else {
 			linkRitual(new InfusionRitual(this, world, this.getBlockPos()));
 		}
 	}
@@ -28,7 +29,8 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
 	public void setLevelAndPosition(Level world, BlockPos pos) {
 		if (hasRitual()) {
 			linkedRitual.setLocation(world, pos);
-		} else {
+		}
+		else {
 			linkRitual(new InfusionRitual(this, world, pos));
 		}
 	}

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

@@ -88,7 +88,8 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Block
 				BlockState trueState = state.setValue(PedestalBlock.HAS_ITEM, !isEmpty());
 				if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) {
 					trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, true);
-				} else {
+				}
+				else {
 					trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, false);
 				}
 				level.setBlockAndUpdate(worldPosition, trueState);

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

@@ -1,7 +1,5 @@
 package ru.betterend.client;
 
-import java.util.List;
-
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.minecraft.ChatFormatting;
@@ -30,6 +28,8 @@ import ru.betterend.registry.EndModelProviders;
 import ru.betterend.registry.EndParticles;
 import ru.betterend.registry.EndScreens;
 
+import java.util.List;
+
 public class BetterEndClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {

src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java

@@ -1,12 +1,7 @@
 package ru.betterend.client.gui;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.GuiComponent;
@@ -20,6 +15,10 @@ import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.Recipe;
 import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 @Environment(EnvType.CLIENT)
 public class EndStoneSmelterRecipeBookScreen extends BlastingRecipeBookComponent {
 	private Iterator<Item> fuelIterator;

src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java

@@ -2,7 +2,6 @@ package ru.betterend.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.components.ImageButton;
@@ -57,7 +56,8 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 		if (recipeBook.isVisible() && narrow) {
 			renderBg(matrices, delta, mouseX, mouseY);
 			recipeBook.render(matrices, mouseX, mouseY, delta);
-		} else {
+		}
+		else {
 			recipeBook.render(matrices, mouseX, mouseY, delta);
 			super.render(matrices, mouseX, mouseY, delta);
 			recipeBook.renderGhostRecipe(matrices, leftPos, topPos, true, delta);
@@ -70,7 +70,8 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 	public boolean mouseClicked(double mouseX, double mouseY, int button) {
 		if (this.recipeBook.mouseClicked(mouseX, mouseY, button)) {
 			return true;
-		} else {
+		}
+		else {
 			return narrow && recipeBook.isVisible() || super.mouseClicked(mouseX, mouseY, button);
 		}
 	}

src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java

@@ -137,29 +137,35 @@ public class EndStoneSmelterScreenHandler extends RecipeBookMenu<Container> {
 				return ItemStack.EMPTY;
 			}
 			slot.onQuickCraft(slotStack, itemStack);
-		} else if (index != 2 && index != 1 && index != 0) {
+		}
+		else if (index != 2 && index != 1 && index != 0) {
 			if (isSmeltable(slotStack)) {
 				if (!moveItemStackTo(slotStack, 0, 2, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (isFuel(slotStack)) {
+			}
+			else if (isFuel(slotStack)) {
 				if (!moveItemStackTo(slotStack, 2, 3, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (index < 31) {
+			}
+			else if (index < 31) {
 				if (!moveItemStackTo(slotStack, 31, 40, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (index < 40 && !moveItemStackTo(slotStack, 4, 31, false)) {
+			}
+			else if (index < 40 && !moveItemStackTo(slotStack, 4, 31, false)) {
 				return ItemStack.EMPTY;
 			}
-		} else if (!moveItemStackTo(slotStack, 4, 40, false)) {
+		}
+		else if (!moveItemStackTo(slotStack, 4, 40, false)) {
 			return ItemStack.EMPTY;
 		}
 
 		if (slotStack.isEmpty()) {
 			slot.set(ItemStack.EMPTY);
-		} else {
+		}
+		else {
 			slot.setChanged();
 		}
 

src/main/java/ru/betterend/client/models/Patterns.java

@@ -1,5 +1,11 @@
 package ru.betterend.client.models;
 
+import com.google.common.collect.Maps;
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
+import ru.betterend.BetterEnd;
+
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -10,13 +16,6 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Maps;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import ru.betterend.BetterEnd;
-
 public class Patterns {
 	//Block Models
 	public final static ResourceLocation BLOCK_EMPTY = BetterEnd.makeID("patterns/block/empty.json");
@@ -93,6 +92,7 @@ public class Patterns {
 	public static Optional<String> createBlockSimple(String name) {
 		return Patterns.createJson(Patterns.BLOCK_BASE, name, name);
 	}
+
 	public static Optional<String> createBlockPillar(String name) {
 		return Patterns.createJson(Patterns.BLOCK_PILLAR, name, name);
 	}
@@ -102,7 +102,8 @@ public class Patterns {
 			return buffer.lines().collect(Collectors.joining())
 					.replace("%parent%", parent)
 					.replace("%block%", block);
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			return null;
 		}
 	}
@@ -111,7 +112,8 @@ public class Patterns {
 		ResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
 		try (InputStream input = resourceManager.getResource(patternId).getInputStream()) {
 			return Optional.ofNullable(createJson(new InputStreamReader(input, StandardCharsets.UTF_8), parent, block));
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			return Optional.empty();
 		}
 	}
@@ -131,7 +133,8 @@ public class Patterns {
 				json = json.replace(texture.getKey(), texture.getValue());
 			}
 			return Optional.of(json);
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			return Optional.empty();
 		}
 	}

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

@@ -2,7 +2,6 @@ package ru.betterend.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.EntityModelSet;
 import net.minecraft.client.player.AbstractClientPlayer;
@@ -37,7 +36,8 @@ public class ArmoredElytraLayer<T extends LivingEntity, M extends EntityModel<T>
 				AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) livingEntity;
 				if (abstractClientPlayer.isElytraLoaded() && abstractClientPlayer.getElytraTextureLocation() != null) {
 					wingsTexture = abstractClientPlayer.getElytraTextureLocation();
-				} else if (abstractClientPlayer.isCapeLoaded() && abstractClientPlayer.getCloakTextureLocation() != null && abstractClientPlayer.isModelPartShown(PlayerModelPart.CAPE)) {
+				}
+				else if (abstractClientPlayer.isCapeLoaded() && abstractClientPlayer.getCloakTextureLocation() != null && abstractClientPlayer.isModelPartShown(PlayerModelPart.CAPE)) {
 					wingsTexture = abstractClientPlayer.getCloakTextureLocation();
 				}
 			}

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

@@ -5,7 +5,6 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix3f;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
-
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;

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

@@ -4,7 +4,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
-
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeListBuilder;

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

@@ -3,7 +3,6 @@ package ru.betterend.client.render;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Vector3f;
-
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeListBuilder;

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

@@ -2,16 +2,13 @@ package ru.betterend.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector3f;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransforms;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
-import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.BlockItem;
@@ -54,7 +51,8 @@ public class PedestalItemRenderer<T extends PedestalBlockEntity> implements Bloc
 		matrices.translate(0.5, pedestal.getHeight(state), 0.5);
 		if (activeItem.getItem() instanceof BlockItem) {
 			matrices.scale(1.5F, 1.5F, 1.5F);
-		} else {
+		}
+		else {
 			matrices.scale(1.25F, 1.25F, 1.25F);
 		}
 		int age = blockEntity.getAge();
@@ -68,9 +66,11 @@ public class PedestalItemRenderer<T extends PedestalBlockEntity> implements Bloc
 		}
 		if (activeItem.getItem() == Items.END_CRYSTAL) {
 			EndCrystalRenderer.render(age, blockEntity.getMaxAge(), tickDelta, matrices, vertexConsumers, light);
-		} else if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) {
+		}
+		else if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) {
 			EternalCrystalRenderer.render(age, tickDelta, matrices, vertexConsumers, light);
-		} else {
+		}
+		else {
 			float rotation = (age + tickDelta) / 25.0F + 6.0F;
 			matrices.mulPose(Vector3f.YP.rotation(rotation));
 			minecraft.getItemRenderer().render(activeItem, ItemTransforms.TransformType.GROUND, false, matrices, vertexConsumers, light, overlay, model);

src/main/java/ru/betterend/effects/EndEnchantments.java

@@ -12,5 +12,6 @@ public class EndEnchantments {
 		return Registry.register(Registry.ENCHANTMENT, BetterEnd.makeID(name), enchantment);
 	}
 
-	public static void register() {}
+	public static void register() {
+	}
 }

src/main/java/ru/betterend/entity/CubozoaEntity.java

@@ -1,8 +1,5 @@
 package ru.betterend.entity;
 
-import java.util.List;
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -35,6 +32,9 @@ import ru.bclib.api.BiomeAPI;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+import java.util.Random;
+
 public class CubozoaEntity extends AbstractSchoolingFish {
 	public static final int VARIANTS = 2;
 	private static final EntityDataAccessor<Byte> VARIANT = SynchedEntityData.defineId(CubozoaEntity.class, EntityDataSerializers.BYTE);

src/main/java/ru/betterend/entity/DragonflyEntity.java

@@ -1,13 +1,15 @@
 package ru.betterend.entity;
 
-import java.util.EnumSet;
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.AgeableMob;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.control.FlyingMoveControl;
@@ -36,6 +38,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndSounds;
 
+import java.util.EnumSet;
+import java.util.Random;
+
 public class DragonflyEntity extends Animal implements FlyingAnimal {
 	public DragonflyEntity(EntityType<DragonflyEntity> entityType, Level world) {
 		super(entityType, world);
@@ -158,7 +163,8 @@ public class DragonflyEntity extends Animal implements FlyingAnimal {
 						DragonflyEntity.this.navigation.moveTo(path, 1.0D);
 					}
 				}
-				catch (Exception e) {}
+				catch (Exception e) {
+				}
 			}
 			super.start();
 		}

src/main/java/ru/betterend/entity/EndFishEntity.java

@@ -1,8 +1,5 @@
 package ru.betterend.entity;
 
-import java.util.List;
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
@@ -30,6 +27,9 @@ import ru.bclib.api.BiomeAPI;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+import java.util.Random;
+
 public class EndFishEntity extends AbstractSchoolingFish {
 	public static final int VARIANTS_NORMAL = 5;
 	public static final int VARIANTS_SULPHUR = 3;
@@ -148,7 +148,9 @@ public class EndFishEntity extends AbstractSchoolingFish {
 
 	public static boolean canSpawn(EntityType<EndFishEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 		AABB box = new AABB(pos).inflate(16);
-		List<EndFishEntity> list = world.getEntitiesOfClass(EndFishEntity.class, box, (entity) -> { return true; });
+		List<EndFishEntity> list = world.getEntitiesOfClass(EndFishEntity.class, box, (entity) -> {
+			return true;
+		});
 		return list.size() < 9;
 	}
 

src/main/java/ru/betterend/entity/EndSlimeEntity.java

@@ -1,9 +1,5 @@
 package ru.betterend.entity;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.particles.ParticleOptions;
@@ -45,6 +41,10 @@ import ru.bclib.world.biomes.BCLBiome;
 import ru.betterend.interfaces.ISlime;
 import ru.betterend.registry.EndBiomes;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Random;
+
 public class EndSlimeEntity extends Slime {
 	private static final EntityDataAccessor<Byte> VARIANT = SynchedEntityData.defineId(EndSlimeEntity.class, EntityDataSerializers.BYTE);
 	private static final MutableBlockPos POS = new MutableBlockPos();
@@ -211,7 +211,9 @@ public class EndSlimeEntity extends Slime {
 
 	private static boolean notManyEntities(ServerLevelAccessor world, BlockPos pos, int radius, int maxCount) {
 		AABB box = new AABB(pos).inflate(radius);
-		List<EndSlimeEntity> list = world.getEntitiesOfClass(EndSlimeEntity.class, box, (entity) -> { return true; });
+		List<EndSlimeEntity> list = world.getEntitiesOfClass(EndSlimeEntity.class, box, (entity) -> {
+			return true;
+		});
 		return list.size() <= maxCount;
 	}
 

src/main/java/ru/betterend/entity/ShadowWalkerEntity.java

@@ -1,8 +1,5 @@
 package ru.betterend.entity;
 
-import java.util.List;
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvent;
@@ -29,6 +26,9 @@ import net.minecraft.world.phys.AABB;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndSounds;
 
+import java.util.List;
+import java.util.Random;
+
 public class ShadowWalkerEntity extends Monster {
 	public ShadowWalkerEntity(EntityType<ShadowWalkerEntity> entityType, Level world) {
 		super(entityType, world);
@@ -88,7 +88,8 @@ public class ShadowWalkerEntity extends Monster {
 	}
 
 	@Override
-	protected void playStepSound(BlockPos pos, BlockState state) {}
+	protected void playStepSound(BlockPos pos, BlockState state) {
+	}
 
 	@Override
 	protected float getSoundVolume() {
@@ -115,7 +116,9 @@ public class ShadowWalkerEntity extends Monster {
 	public static boolean canSpawn(EntityType<ShadowWalkerEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 		if (Monster.checkMonsterSpawnRules(type, world, spawnReason, pos, random)) {
 			AABB box = new AABB(pos).inflate(16);
-			List<ShadowWalkerEntity> entities = world.getEntitiesOfClass(ShadowWalkerEntity.class, box, (entity) -> { return true; });
+			List<ShadowWalkerEntity> entities = world.getEntitiesOfClass(ShadowWalkerEntity.class, box, (entity) -> {
+				return true;
+			});
 			return entities.size() < 6;
 		}
 		return false;

src/main/java/ru/betterend/entity/SilkMothEntity.java

@@ -1,14 +1,5 @@
 package ru.betterend.entity;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.world.entity.*;
-import net.minecraft.world.entity.ai.util.AirAndWaterRandomPos;
-import net.minecraft.world.entity.ai.util.HoverRandomPos;
-import org.jetbrains.annotations.Nullable;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
@@ -19,6 +10,12 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.AgeableMob;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.control.FlyingMoveControl;
@@ -29,7 +26,8 @@ import net.minecraft.world.entity.ai.goal.FollowParentGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import net.minecraft.world.entity.ai.util.RandomPos;
+import net.minecraft.world.entity.ai.util.AirAndWaterRandomPos;
+import net.minecraft.world.entity.ai.util.HoverRandomPos;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.entity.animal.FlyingAnimal;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -44,6 +42,7 @@ import net.minecraft.world.level.levelgen.Heightmap.Types;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
 import ru.betterend.BetterEnd;
@@ -52,6 +51,10 @@ import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Random;
+
 public class SilkMothEntity extends Animal implements FlyingAnimal {
 	private BlockPos hivePos;
 	private BlockPos entrance;
@@ -230,7 +233,8 @@ public class SilkMothEntity extends Animal implements FlyingAnimal {
 				try {
 					SilkMothEntity.this.navigation.moveTo(SilkMothEntity.this.navigation.createPath(new BlockPos(vec3d), 1), 1.0D);
 				}
-				catch (Exception e) {}
+				catch (Exception e) {
+				}
 			}
 		}
 
@@ -272,7 +276,8 @@ public class SilkMothEntity extends Animal implements FlyingAnimal {
 				SilkMothEntity.this.entrance = SilkMothEntity.this.hivePos.relative(state.getValue(BlockStateProperties.HORIZONTAL_FACING));
 				SilkMothEntity.this.navigation.moveTo(SilkMothEntity.this.navigation.createPath(entrance, 1), 1.0D);
 			}
-			catch (Exception e) {}
+			catch (Exception e) {
+			}
 		}
 
 		@Override

src/main/java/ru/betterend/entity/model/BlockBenchModel.java

@@ -1,13 +1,13 @@
 package ru.betterend.entity.model;
 
-import java.util.function.Function;
-
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 
+import java.util.function.Function;
+
 public abstract class BlockBenchModel<T extends Entity> extends EntityModel<T> {
 	public BlockBenchModel() {
 		super();

src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java

@@ -26,31 +26,25 @@ public class CubozoaEntityModel extends BlockBenchModel<CubozoaEntity> {
 		MeshDefinition modelData = new MeshDefinition();
 		PartDefinition modelPartData = modelData.getRoot();
 
-        PartDefinition bodyPart = modelPartData.addOrReplaceChild(PartNames.BODY, CubeListBuilder.create()
+		PartDefinition bodyPart = modelPartData.addOrReplaceChild(PartNames.BODY,
+				CubeListBuilder
+						.create()
 						.texOffs(0, 17)
-                .addBox(-2.0F, -12.5F, -2.0F, 4.0F, 4.0F, 4.0F), PartPose.offset(0.0F, 24.0F, 0.0F));
+						.addBox(-2.0F, -12.5F, -2.0F, 4.0F, 4.0F, 4.0F),
-		/*model = new ModelPart(this);
+				PartPose.offset(0.0F, 24.0F, 0.0F)
-		model.setPos(0.0F, 24.0F, 0.0F);
+		);
-		model.texOffs(0, 17).addBox(-2.0F, -12.5F, -2.0F, 4.0F, 4.0F, 4.0F, 0.0F);*/
 
 		bodyPart.addOrReplaceChild("main_cube_r1", CubeListBuilder.create()
 				.texOffs(0, 0)
 				.addBox(-5.0F, -7.0F, -5.0F, 10.0F, 7.0F, 10.0F), PartPose.offsetAndRotation(0.0F, -14.0F, 0.0F, 0.0F, 0.0F, -3.1416F));
 
-		/*main_cube_r1 = new ModelPart(this);
-		main_cube_r1.setPos(0.0F, -14.0F, 0.0F);
-		model.addChild(main_cube_r1);
-		setRotationAngle(main_cube_r1, 0.0F, 0.0F, -3.1416F);
-		main_cube_r1.texOffs(0, 0).addBox(-5.0F, -7.0F, -5.0F, 10.0F, 7.0F, 10.0F, 0.0F);*/
-        float[] angles = {0, (float)Math.PI/-2, (float)Math.PI, (float)Math.PI/2};
-
 		for (int i = 1; i <= TENTACLE_COUNT; i++) {
 			PartDefinition tentaclePart = bodyPart
 					.addOrReplaceChild("tentacle_center_" + i,
 							CubeListBuilder.create(),
 							PartPose.offsetAndRotation(
 									0.0F, 0.0F, 0.0F,
-                                    0.0F, -1.5708F, 0.0F
+									0.0F, i * 1.5708F, 0.0F
 							)
 					);
 
@@ -59,48 +53,7 @@ public class CubozoaEntityModel extends BlockBenchModel<CubozoaEntity> {
 							.addBox(-4.0F, 0.0F, 0.0F, 8.0F, 7.0F, 0.0F),
 					PartPose.offset(0.0F, -7.0F, 4.5F));
 		}
-        /*tentacle_center_1 = new ModelPart(this);
-		tentacle_center_1.setPos(0.0F, 0.0F, 0.0F);
-		model.addChild(tentacle_center_1);
 
-		tentacle_1 = new ModelPart(this);
-		tentacle_1.setPos(0.0F, -7.0F, 4.5F);
-		tentacle_center_1.addChild(tentacle_1);
-		tentacle_1.texOffs(16, 17).addBox(-4.0F, 0.0F, 0.0F, 8.0F, 7.0F, 0.0F, 0.0F);
-
-		tentacle_center_2 = new ModelPart(this);
-		tentacle_center_2.setPos(0.0F, 0.0F, 0.0F);
-		model.addChild(tentacle_center_2);
-		setRotationAngle(tentacle_center_2, 0.0F, -1.5708F, 0.0F);
-
-		tentacle_2 = new ModelPart(this);
-		tentacle_2.setPos(0.0F, -7.0F, 4.5F);
-		tentacle_center_2.addChild(tentacle_2);
-		tentacle_2.texOffs(16, 17).addBox(-4.0F, 0.0F, 0.0F, 8.0F, 7.0F, 0.0F, 0.0F);
-
-		tentacle_center_3 = new ModelPart(this);
-		tentacle_center_3.setPos(0.0F, 0.0F, 0.0F);
-		model.addChild(tentacle_center_3);
-		setRotationAngle(tentacle_center_3, 0.0F, 3.1416F, 0.0F);
-
-		tentacle_3 = new ModelPart(this);
-		tentacle_3.setPos(0.0F, -7.0F, 4.5F);
-		tentacle_center_3.addChild(tentacle_3);
-		tentacle_3.texOffs(16, 17).addBox(-4.0F, 0.0F, 0.0F, 8.0F, 7.0F, 0.0F, 0.0F);
-
-		tentacle_center_4 = new ModelPart(this);
-		tentacle_center_4.setPos(0.0F, 0.0F, 0.0F);
-		model.addChild(tentacle_center_4);
-		setRotationAngle(tentacle_center_4, 0.0F, 1.5708F, 0.0F);
-
-
-		tentacle_4 = new ModelPart(this);
-		tentacle_4.setPos(0.0F, -7.0F, 4.5F);
-		tentacle_center_4.addChild(tentacle_4);
-		tentacle_4.texOffs(16, 17).addBox(-4.0F, 0.0F, 0.0F, 8.0F, 7.0F, 0.0F, 0.0F);*/
-
-		/* texWidth = 48;
-		texHeight = 48; */
 		return LayerDefinition.create(modelData, 48, 48);
 	}
 

src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java

@@ -2,7 +2,6 @@ package ru.betterend.entity.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartNames;
 import net.minecraft.client.model.geom.PartPose;
@@ -29,115 +28,88 @@ public class DragonflyEntityModel extends BlockBenchModel<DragonflyEntity> {
 		MeshDefinition modelData = new MeshDefinition();
 		PartDefinition modelPartData = modelData.getRoot();
 
-        PartDefinition bodyPart = modelPartData.addOrReplaceChild(PartNames.BODY, CubeListBuilder.create()
+		PartDefinition bodyPart = modelPartData.addOrReplaceChild(PartNames.BODY,
+				CubeListBuilder
+						.create()
 						.texOffs(0, 0)
 						.addBox(-4.0F, -4.0F, 0.0F, 4.0F, 4.0F, 9.0F),
-                PartPose.offset(2.0F, 21.5F, -4.0F));
+				PartPose.offset(2.0F, 21.5F, -4.0F)
-		/*model = new ModelPart(this);
+		);
-		model.setPos(2.0F, 21.5F, -4.0F);
-		model.texOffs(0, 0).addBox(-4.0F, -4.0F, 0.0F, 4.0F, 4.0F, 9.0F, 0.0F);*/
 
-        bodyPart.addOrReplaceChild(PartNames.HEAD, CubeListBuilder.create()
+		bodyPart.addOrReplaceChild(PartNames.HEAD,
+				CubeListBuilder
+						.create()
 						.texOffs(17, 0)
 						.addBox(-1.5F, -1.5F, -2.5F, 3.0F, 3.0F, 3.0F),
-                PartPose.offsetAndRotation(-2.0F, -2.0F, 0.0F,
+				PartPose.offsetAndRotation(-2.0F, -2.0F, 0.0F, 0.3491F, 0.0F, 0.0F)
-                        0.3491F, 0.0F, 0.0F));
+		);
-		/*head = new ModelPart(this);
-		head.setPos(-2.0F, -2.0F, 0.0F);
-		model.addChild(head);
-		setRotationAngle(head, 0.3491F, 0.0F, 0.0F);
-		head.texOffs(17, 0).addBox(-1.5F, -1.5F, -2.5F, 3.0F, 3.0F, 3.0F, 0.0F);*/
 
-        PartDefinition tailPart = bodyPart.addOrReplaceChild(PartNames.TAIL, CubeListBuilder.create()
+		PartDefinition tailPart = bodyPart.addOrReplaceChild(PartNames.TAIL,
+				CubeListBuilder
+						.create()
 						.texOffs(26, 0)
 						.addBox(-1.5F, -1.5F, 0.0F, 3.0F, 3.0F, 7.0F),
-                PartPose.offset(-2.0F, -2.0F, 9.0F));
+				PartPose.offset(-2.0F, -2.0F, 9.0F)
-		/*
+		);
-		tail = new ModelPart(this);
-		tail.setPos(-2.0F, -2.0F, 9.0F);
-		model.addChild(tail);
-		tail.texOffs(26, 0).addBox(-1.5F, -1.5F, 0.0F, 3.0F, 3.0F, 7.0F, 0.0F);
-		 */
 
-        tailPart.addOrReplaceChild(PartNames.TAIL_FIN, CubeListBuilder.create()
+		tailPart.addOrReplaceChild(PartNames.TAIL_FIN,
+				CubeListBuilder
+						.create()
 						.texOffs(36, 0)
 						.addBox(-1.0F, -1.0F, 0.0F, 2.0F, 2.0F, 10.0F),
-                PartPose.offset(0.0F, 0.0F, 7.0F));
+				PartPose.offset(0.0F, 0.0F, 7.0F)
+		);
 
-		/*
+		bodyPart.addOrReplaceChild(PartNames.LEFT_WING,
-		tail_2 = new ModelPart(this);
+				CubeListBuilder
-		tail_2.setPos(0.0F, 0.0F, 7.0F);
+						.create()
-		tail.addChild(tail_2);
-		tail_2.texOffs(36, 0).addBox(-1.0F, -1.0F, 0.0F, 2.0F, 2.0F, 10.0F, 0.0F);
-		 */
-
-        bodyPart.addOrReplaceChild(PartNames.LEFT_WING, CubeListBuilder.create()
 						.texOffs(0, 13)
 						.addBox(-15.0F, 0.0F, -3.0F, 15.0F, 0.0F, 4.0F),
-                PartPose.offset(-2.0F, -4.0F, 4.0F));
+				PartPose.offset(-2.0F, -4.0F, 4.0F)
+		);
 
-		/*wing_1 = new ModelPart(this);
+		bodyPart.addOrReplaceChild(PartNames.RIGHT_WING,
-		wing_1.setPos(-2.0F, -4.0F, 4.0F);
+				CubeListBuilder
-		model.addChild(wing_1);
+						.create()
-		wing_1.texOffs(0, 13).addBox(-15.0F, 0.0F, -3.0F, 15.0F, 0.0F, 4.0F, 0.0F);*/
-
-        bodyPart.addOrReplaceChild(PartNames.RIGHT_WING, CubeListBuilder.create()
 						.mirror()
 						.texOffs(0, 13)
 						.addBox(0.0F, 0.0F, -3.0F, 15.0F, 0.0F, 4.0F),
-                PartPose.offset(-2.0F, -4.0F, 4.0F));
+				PartPose.offset(-2.0F, -4.0F, 4.0F)
-		/*wing_2 = new ModelPart(this);
+		);
-		wing_2.setPos(-2.0F, -4.0F, 4.0F);
-		model.addChild(wing_2);
-		wing_2.mirror = true;
-		wing_2.texOffs(0, 13).addBox(0.0F, 0.0F, -3.0F, 15.0F, 0.0F, 4.0F, 0.0F);*/
 
-        bodyPart.addOrReplaceChild(PartNames.LEFT_WING_BASE, CubeListBuilder.create()
+		bodyPart.addOrReplaceChild(PartNames.LEFT_WING_BASE,
+				CubeListBuilder
+						.create()
 						.texOffs(4, 17)
 						.addBox(-12.0F, 0.0F, -2.5F, 12.0F, 0.0F, 3.0F),
-                PartPose.offset(-2.0F, -4.0F, 8.0F));
+				PartPose.offset(-2.0F, -4.0F, 8.0F)
-		/*wing_3 = new ModelPart(this);
+		);
-		wing_3.setPos(-2.0F, -4.0F, 8.0F);
-		model.addChild(wing_3);
-		wing_3.texOffs(4, 17).addBox(-12.0F, 0.0F, -2.5F, 12.0F, 0.0F, 3.0F, 0.0F);*/
 
-        bodyPart.addOrReplaceChild(PartNames.RIGHT_WING_BASE, CubeListBuilder.create()
+		bodyPart.addOrReplaceChild(PartNames.RIGHT_WING_BASE,
+				CubeListBuilder
+						.create()
 						.mirror()
 						.texOffs(4, 17)
 						.addBox(0.0F, 0.0F, -2.5F, 12.0F, 0.0F, 3.0F),
-                PartPose.offset(-2.0F, -4.0F, 8.0F));
+				PartPose.offset(-2.0F, -4.0F, 8.0F)
-        /*wing_4 = new ModelPart(this);
+		);
-        wing_4.setPos(-2.0F, -4.0F, 8.0F);
-        model.addChild(wing_4);
-        wing_4.mirror = true;
-        wing_4.texOffs(4, 17).addBox(0.0F, 0.0F, -2.5F, 12.0F, 0.0F, 3.0F, 0.0F);*/
 
-        bodyPart.addOrReplaceChild(PartNames.LEFT_LEG, CubeListBuilder.create()
+		bodyPart.addOrReplaceChild(PartNames.LEFT_LEG,
+				CubeListBuilder
+						.create()
 						.texOffs(50, 1)
 						.addBox(0.0F, 0.0F, 0.0F, 0.0F, 3.0F, 6.0F),
-                PartPose.offsetAndRotation(-1.0F, 0.0F, 1.0F,
+				PartPose.offsetAndRotation(-1.0F, 0.0F, 1.0F, 0.0F, 0.0F, -0.5236F)
-                        0.0F, 0.0F, -0.5236F));
+		);
-        /*legs_1 = new ModelPart(this);
-        legs_1.setPos(-1.0F, 0.0F, 1.0F);
-        model.addChild(legs_1);
-        setRotationAngle(legs_1, 0.0F, 0.0F, -0.5236F);
-        legs_1.texOffs(50, 1).addBox(0.0F, 0.0F, 0.0F, 0.0F, 3.0F, 6.0F, 0.0F);*/
 
-        bodyPart.addOrReplaceChild(PartNames.RIGHT_LEG, CubeListBuilder.create()
+		bodyPart.addOrReplaceChild(PartNames.RIGHT_LEG,
+				CubeListBuilder
+						.create()
 						.texOffs(50, 1)
 						.addBox(0.0F, 0.0F, 0.0F, 0.0F, 3.0F, 6.0F),
-                PartPose.offsetAndRotation(-3.0F, 0.0F, 1.0F,
+				PartPose.offsetAndRotation(-3.0F, 0.0F, 1.0F, 0.0F, 0.0F, 0.5236F)
-                        0.0F, 0.0F, 0.5236F));
+		);
-        /*legs_2 = new ModelPart(this);
-        legs_2.setPos(-3.0F, 0.0F, 1.0F);
-        model.addChild(legs_2);
-        setRotationAngle(legs_2, 0.0F, 0.0F, 0.5236F);
-        legs_2.texOffs(50, 1).addBox(0.0F, 0.0F, 0.0F, 0.0F, 3.0F, 6.0F, 0.0F);*/
 
-		/*
-		texWidth = 64;
-		texHeight = 64;
-		 */
 		return LayerDefinition.create(modelData, 64, 64);
 	}
 
@@ -157,8 +129,7 @@ public class DragonflyEntityModel extends BlockBenchModel<DragonflyEntity> {
 	}
 
 	@Override
-    public void setupAnim(DragonflyEntity entity, float limbAngle, float limbDistance, float animationProgress,
+	public void setupAnim(DragonflyEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-                          float headYaw, float headPitch) {
 		float progress = animationProgress * 2F;
 
 		wing_1.zRot = 0.3491F + (float) Math.sin(progress) * 0.3491F;
@@ -175,8 +146,7 @@ public class DragonflyEntityModel extends BlockBenchModel<DragonflyEntity> {
 	}
 
 	@Override
-    public void renderToBuffer(PoseStack matrices, VertexConsumer vertices, int light, int overlay, float red,
+	public void renderToBuffer(PoseStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
-                               float green, float blue, float alpha) {
 		model.render(matrices, vertices, light, overlay);
 	}
 }