Removed MHelper and Color util

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

@@ -1,21 +1,23 @@
 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.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.basis.EndAnvilBlock;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.item.material.EndToolMaterial;
 import ru.betterend.registry.EndBlocks;
 
-import java.util.Map;
-import java.util.Optional;
-
 public class AeterniumAnvil extends EndAnvilBlock {
 	private static final IntegerProperty DESTRUCTION_LONG = BlockProperties.DESTRUCTION_LONG;
 	

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

@@ -15,11 +15,11 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class AncientEmeraldIceBlock extends BlockBase {
 	public AncientEmeraldIceBlock() {

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

@@ -19,12 +19,13 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.ColorUtil;
+import ru.bclib.util.MHelper;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndItems;
 import ru.betterend.registry.EndTags;
-import ru.betterend.util.MHelper;
 
 public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider {
 	public static final Vec3i[] COLORS;
@@ -60,14 +61,14 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 			int g = MHelper.floor(Mth.lerp(delta, color1.getY(), color2.getY()));
 			int b = MHelper.floor(Mth.lerp(delta, color1.getZ(), color2.getZ()));
 			
-			return MHelper.color(r, g, b);
+			return ColorUtil.color(r, g, b);
 		};
 	}
 
 	@Override
 	public ItemColor getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(COLORS[3].getX(), COLORS[3].getY(), COLORS[3].getZ());
+			return ColorUtil.color(COLORS[3].getX(), COLORS[3].getY(), COLORS[3].getZ());
 		};
 	}
 

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

@@ -7,12 +7,12 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 	@Override

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

@@ -10,11 +10,11 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.VineBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.util.MHelper;
 
 public class BulbVineBlock extends VineBlock {
 	public BulbVineBlock() {

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

@@ -3,13 +3,14 @@ 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.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
@@ -19,13 +20,12 @@ 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.betterend.blocks.basis.EndLanternBlock;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable, BlockModelProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(4, 4, 4, 12, 16, 12);

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

@@ -3,9 +3,9 @@ package ru.betterend.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
+import ru.bclib.util.ColorUtil;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider {
 	public BulbVineLanternColoredBlock(FabricBlockSettings settings) {
@@ -27,8 +27,8 @@ public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements
 		int b = (color & 255);
 		int g = ((color >> 8) & 255);
 		int r = ((color >> 16) & 255);
-		float[] hsv = MHelper.fromRGBtoHSB(r, g, b);
+		float[] hsv = ColorUtil.RGBtoHSB(r, g, b, new float[3]);
-		return MHelper.fromHSBtoRGB(hsv[0], hsv[1], hsv[1] > 0.2 ? 1 : hsv[2]);
+		return ColorUtil.HSBtoRGB(hsv[0], hsv[1], hsv[1] > 0.2 ? 1 : hsv[2]);
 	}
 	
 	@Override

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

@@ -4,6 +4,8 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Maps;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -12,7 +14,6 @@ import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
@@ -20,13 +21,12 @@ 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.betterend.blocks.basis.AttachedBlock;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class ChandelierBlock extends AttachedBlock implements IRenderTypeable, BlockModelProvider {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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

@@ -2,15 +2,13 @@ package ru.betterend.blocks;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.Random;
 
-import net.minecraft.client.renderer.block.model.BlockModel;
 import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
@@ -26,11 +24,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderTypeable, BlockModelProvider {
 	public EmeraldIceBlock() {

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

@@ -30,11 +30,11 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.UnderwaterPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.util.MHelper;
 
 public class EndLilyBlock extends UnderwaterPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;

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

@@ -17,9 +17,9 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class EndLotusFlowerBlock extends EndPlantBlock {
 	private static final VoxelShape SHAPE_OUTLINE = Block.box(2, 0, 2, 14, 14, 14);

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

@@ -14,11 +14,11 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.FallingBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import ru.betterend.util.MHelper;
+import ru.bclib.util.ColorUtil;
 
 public class EndstoneDustBlock extends FallingBlock {
 	@Environment(EnvType.CLIENT)
-	private static final int COLOR = MHelper.color(226, 239, 168);
+	private static final int COLOR = ColorUtil.color(226, 239, 168);
 	
 	public EndstoneDustBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.SAND)

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

@@ -13,11 +13,11 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Material;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 	public GlowingPillarSeedBlock() {

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

@@ -23,11 +23,12 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.ColorUtil;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class HelixTreeLeavesBlock extends BlockBase implements IColorProvider {
 	public static final IntegerProperty COLOR = BlockProperties.COLOR;
@@ -50,14 +51,14 @@ public class HelixTreeLeavesBlock extends BlockBase implements IColorProvider {
 	@Override
 	public BlockColor getProvider() {
 		return (state, world, pos, tintIndex) -> {
-			return MHelper.color(237, getGreen(state.getValue(COLOR)), 20);
+			return ColorUtil.color(237, getGreen(state.getValue(COLOR)), 20);
 		};
 	}
 
 	@Override
 	public ItemColor getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(237, getGreen(4), 20);
+			return ColorUtil.color(237, getGreen(4), 20);
 		};
 	}
 	

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

@@ -22,11 +22,11 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.HydraluxShape;
 import ru.betterend.blocks.basis.UnderwaterPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.util.MHelper;
 
 public class HydraluxBlock extends UnderwaterPlantBlock {
 	public static final EnumProperty<HydraluxShape> SHAPE = BlockProperties.HYDRALUX_SHAPE;

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

@@ -2,16 +2,17 @@ package ru.betterend.blocks;
 
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
 import 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.betterend.client.models.ModelsHelper;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.client.models.Patterns;
+import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.util.BlocksHelper;
 
 public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements IColorProvider {

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

@@ -7,11 +7,11 @@ import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.HydraluxShape;
 import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock {
 	@Override

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

@@ -3,6 +3,8 @@ 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.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -21,15 +23,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
+import ru.bclib.util.ColorUtil;
+import ru.bclib.util.MHelper;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.noise.OpenSimplexNoise;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
-import ru.betterend.util.MHelper;
 
 public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider, IColorProvider {
 	public static final IntegerProperty COLOR = BlockProperties.COLOR;
@@ -42,7 +44,7 @@ public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable,
 		super(FabricBlockSettings.copyOf(Blocks.SLIME_BLOCK));
 		colorStart = new Vec3i(r1, g1, b1);
 		colorEnd = new Vec3i(r2, g2, b2);
-		coloritem = MHelper.color((r1 + r2) >> 1, (g1 + g2) >> 1, (b1 + b2) >> 1);
+		coloritem = ColorUtil.color((r1 + r2) >> 1, (g1 + g2) >> 1, (b1 + b2) >> 1);
 	}
 	
 	@Override
@@ -86,7 +88,7 @@ public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable,
 			int r = Mth.floor(Mth.lerp(delta, colorStart.getX() / 255F, colorEnd.getX() / 255F) * 255F);
 			int g = Mth.floor(Mth.lerp(delta, colorStart.getY() / 255F, colorEnd.getY() / 255F) * 255F);
 			int b = Mth.floor(Mth.lerp(delta, colorStart.getZ() / 255F, colorEnd.getZ() / 255F) * 255F);
-			return MHelper.color(r, g, b);
+			return ColorUtil.color(r, g, b);
 		};
 	}
 

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

@@ -15,10 +15,10 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.PentaShape;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class LanceleafBlock extends EndPlantBlock {
 	public static final EnumProperty<PentaShape> SHAPE = BlockProperties.PENTA_SHAPE;

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

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

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

@@ -22,6 +22,7 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.LumecornShape;
 import ru.betterend.blocks.basis.BlockBaseNotFull;
 import ru.betterend.client.render.ERenderLayer;
@@ -29,7 +30,6 @@ import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 import ru.betterend.registry.EndTags;
-import ru.betterend.util.MHelper;
 
 public class LumecornBlock extends BlockBaseNotFull implements IRenderTypeable {
 	public static final EnumProperty<LumecornShape> SHAPE = EnumProperty.create("shape", LumecornShape.class);

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

@@ -19,9 +19,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class NeedlegrassBlock extends EndPlantBlock {
 	@Override

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

@@ -37,6 +37,7 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.BlockProperties.CactusBottom;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.BlockBaseNotFull;
@@ -45,7 +46,6 @@ import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class NeonCactusPlantBlock extends BlockBaseNotFull implements SimpleWaterloggedBlock, IRenderTypeable {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;

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

@@ -35,6 +35,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 ru.bclib.util.ColorUtil;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.client.render.ERenderLayer;
@@ -44,7 +45,6 @@ import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class RespawnObeliskBlock extends BlockBase implements IColorProvider, IRenderTypeable {
 	private static final VoxelShape VOXEL_SHAPE_BOTTOM = Block.box(1, 0, 1, 15, 16, 15);
@@ -152,7 +152,7 @@ public class RespawnObeliskBlock extends BlockBase implements IColorProvider, IR
 	@Override
 	public ItemColor getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(255, 255, 255);
+			return ColorUtil.color(255, 255, 255);
 		};
 	}
 

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

@@ -29,12 +29,12 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class SilkMothHiveBlock extends BlockBase {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;

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

@@ -39,6 +39,7 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.entity.SilkMothEntity;
@@ -46,7 +47,6 @@ import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class SilkMothNestBlock extends BlockBase implements IRenderTypeable {
 	public static final BooleanProperty ACTIVE = BlockProperties.ACTIVE;

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

@@ -34,12 +34,12 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.AttachedBlock;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.util.MHelper;
 
 public class SulphurCrystalBlock extends AttachedBlock implements IRenderTypeable, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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

@@ -12,10 +12,11 @@ import net.minecraft.util.Mth;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import ru.bclib.util.ColorUtil;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.VineBlock;
 import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.registry.EndParticles;
-import ru.betterend.util.MHelper;
 
 public class TenaneaFlowersBlock extends VineBlock implements IColorProvider {
 	public static final Vec3i[] COLORS;
@@ -41,16 +42,16 @@ public class TenaneaFlowersBlock extends VineBlock implements IColorProvider {
 			int r = MHelper.floor(Mth.lerp(delta, color1.getX(), color2.getX()));
 			int g = MHelper.floor(Mth.lerp(delta, color1.getY(), color2.getY()));
 			int b = MHelper.floor(Mth.lerp(delta, color1.getZ(), color2.getZ()));
-			float[] hsb = MHelper.fromRGBtoHSB(r, g, b);
+			float[] hsb = ColorUtil.RGBtoHSB(r, g, b, new float[3]);
 			
-			return MHelper.fromHSBtoRGB(hsb[0], MHelper.max(0.5F, hsb[1]), hsb[2]);
+			return ColorUtil.HSBtoRGB(hsb[0], MHelper.max(0.5F, hsb[1]), hsb[2]);
 		};
 	}
 
 	@Override
 	public ItemColor getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(255, 255, 255);
+			return ColorUtil.color(255, 255, 255);
 		};
 	}
 	

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

@@ -2,7 +2,6 @@ package ru.betterend.blocks;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import com.google.common.collect.Lists;
 
@@ -12,7 +11,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -24,13 +22,12 @@ 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 ru.bclib.util.MHelper;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.noise.OpenSimplexNoise;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTypeable, BlockModelProvider {
 	public static final IntegerProperty COLOR = BlockProperties.COLOR;

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

@@ -2,17 +2,14 @@ package ru.betterend.blocks.basis;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class BlockBase extends Block implements BlockModelProvider {
 	public BlockBase(Properties settings) {

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

@@ -5,12 +5,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Maps;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.AnvilBlock;
@@ -21,7 +22,6 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;

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

@@ -5,13 +5,14 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.stats.Stats;
@@ -30,7 +31,6 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.BlockHitResult;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.entities.EBarrelBlockEntity;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;

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

@@ -4,9 +4,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -16,7 +17,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 

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

@@ -1,5 +1,12 @@
 package ru.betterend.blocks.basis;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -11,16 +18,10 @@ import net.minecraft.world.level.block.ButtonBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.AttachFace;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public abstract class EndButtonBlock extends ButtonBlock implements BlockModelProvider {
 
 	private final Block parent;

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

@@ -5,11 +5,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
@@ -17,12 +18,11 @@ import net.minecraft.world.level.block.ChainBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndChainBlock extends ChainBlock implements BlockModelProvider, IRenderTypeable {
 	public EndChainBlock(MaterialColor color) {

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

@@ -3,6 +3,8 @@ package ru.betterend.blocks.basis;
 import java.util.List;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.Registry;
@@ -14,7 +16,6 @@ import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -5,17 +5,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.ModelsHelper.MultiPartBuilder;

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

@@ -5,16 +5,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CraftingTableBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -28,8 +28,8 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class EndCropBlock extends EndPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14);

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

@@ -5,12 +5,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.item.ItemStack;
@@ -20,12 +21,11 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.DoorHingeSide;
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockModelProvider {
 	public EndDoorBlock(Block source) {

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

@@ -1,5 +1,12 @@
 package ru.betterend.blocks.basis;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -11,17 +18,11 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FenceBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.ModelsHelper.MultiPartBuilder;
 import ru.betterend.client.models.Patterns;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public class EndFenceBlock extends FenceBlock implements BlockModelProvider {
 	private final Block parent;
 	

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

@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -11,7 +13,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
@@ -25,13 +26,12 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.entities.EFurnaceBlockEntity;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndFurnaceBlock extends FurnaceBlock implements BlockModelProvider, IRenderTypeable {
 	public EndFurnaceBlock(Block source) {

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -15,7 +17,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FenceGateBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -3,12 +3,13 @@ package ru.betterend.blocks.basis;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
@@ -28,12 +29,11 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.util.BlocksHelper;
 
 public class EndLadderBlock extends BlockBaseNotFull implements IRenderTypeable, BlockModelProvider {

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

@@ -1,5 +1,7 @@
 package ru.betterend.blocks.basis;
 
+import java.util.Map;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
@@ -23,8 +25,6 @@ import net.minecraft.world.level.material.Fluids;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.client.models.ModelsHelper;
 
-import java.util.Map;
-
 public class EndLanternBlock extends BlockBaseNotFull implements SimpleWaterloggedBlock, LiquidBlockContainer {
 	public static final BooleanProperty IS_FLOOR = BlockProperties.IS_FLOOR;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

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

@@ -2,14 +2,12 @@ package ru.betterend.blocks.basis;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 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.renderer.block.model.BlockModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -21,11 +19,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.MHelper;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
-import ru.betterend.util.MHelper;
 
 public class EndLeavesBlock extends LeavesBlock implements BlockModelProvider, IRenderTypeable {
 	private final Block sapling;

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 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;
@@ -19,12 +21,11 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.IronBarsBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndMetalPaneBlock extends IronBarsBlock implements BlockModelProvider, IRenderTypeable {
 	public EndMetalPaneBlock(Block source) {

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

@@ -19,8 +19,8 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.util.MHelper;
 import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.util.MHelper;
 
 public class EndOreBlock extends OreBlock implements BlockModelProvider {
 	private final Item dropItem;

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

@@ -5,13 +5,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Maps;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -24,7 +25,6 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 

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

@@ -5,17 +5,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -15,7 +17,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.PressurePlateBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -2,7 +2,8 @@ package ru.betterend.blocks.basis;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
@@ -39,12 +40,10 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.entities.ESignBlockEntity;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.interfaces.ISpetialItem;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.util.BlocksHelper;
 
 public class EndSignBlock extends SignBlock implements BlockModelProvider, ISpetialItem {

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -17,7 +19,6 @@ import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -18,7 +20,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Half;
 import net.minecraft.world.level.block.state.properties.StairsShape;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -1,24 +1,9 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.StoneButtonBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndStoneButtonBlock extends EndButtonBlock {
 

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

@@ -1,6 +1,12 @@
 package ru.betterend.blocks.basis;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.Maps;
 
@@ -10,7 +16,6 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -33,9 +38,7 @@ import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.BlockSounds;
-import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 

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

@@ -1,12 +1,17 @@
 package ru.betterend.blocks.basis;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -14,12 +19,11 @@ import net.minecraft.world.level.block.TrapDoorBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Half;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndTrapdoorBlock extends TrapDoorBlock implements IRenderTypeable, BlockModelProvider {
 	public EndTrapdoorBlock(Block source) {

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -17,7 +19,6 @@ import net.minecraft.world.level.block.WallBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WallSide;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -15,7 +17,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.WeightedPressurePlateBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;

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

@@ -1,21 +1,9 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.WoodButtonBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 
 public class EndWoodenButtonBlock extends EndButtonBlock {
 

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
@@ -26,12 +28,11 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
+import ru.betterend.client.models.BlockModelProvider;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.BlockModelProvider;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndTags;
 
 public abstract class FeatureSaplingBlock extends SaplingBlock implements IRenderTypeable, BlockModelProvider {

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

@@ -23,9 +23,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.util.MHelper;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.util.MHelper;
 
 public class FurBlock extends AttachedBlock implements IRenderTypeable {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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

@@ -6,13 +6,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import net.minecraft.client.renderer.block.model.BlockModel;
-import net.minecraft.client.resources.model.UnbakedModel;
 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.renderer.block.model.BlockModel;
+import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;

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

@@ -1,15 +1,11 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Optional;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.core.Registry;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.Patterns;
 
 public class SimpleLeavesBlock extends BlockBaseNotFull implements IRenderTypeable {
 	public SimpleLeavesBlock(MaterialColor color) {

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

@@ -1,5 +1,10 @@
 package ru.betterend.blocks.basis;
 
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -7,7 +12,6 @@ import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.LivingEntity;
@@ -31,15 +35,11 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.client.models.ModelsHelper;
+import ru.betterend.client.models.Patterns;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Map;
-import java.util.Optional;
 
 public class StalactiteBlock extends BlockBaseNotFull implements SimpleWaterloggedBlock, LiquidBlockContainer, IRenderTypeable {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

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

@@ -2,12 +2,13 @@ package ru.betterend.blocks.basis;
 
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
 import net.minecraft.core.Vec3i;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
@@ -16,12 +17,12 @@ 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.util.ColorUtil;
+import ru.bclib.util.MHelper;
 import ru.betterend.blocks.AuroraCrystalBlock;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.interfaces.IColorProvider;
 import ru.betterend.client.models.Patterns;
-import ru.betterend.util.MHelper;
+import ru.betterend.interfaces.IColorProvider;
 
 public class StoneLanternBlock extends EndLanternBlock implements IColorProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(3, 1, 3, 13, 16, 13);
@@ -49,14 +50,14 @@ public class StoneLanternBlock extends EndLanternBlock implements IColorProvider
 			int g = MHelper.floor(Mth.lerp(delta, color1.getY(), color2.getY()));
 			int b = MHelper.floor(Mth.lerp(delta, color1.getZ(), color2.getZ()));
 			
-			return MHelper.color(r, g, b);
+			return ColorUtil.color(r, g, b);
 		};
 	}
 
 	@Override
 	public ItemColor getItemProvider() {
 		return (stack, tintIndex) -> {
-			return MHelper.color(COLORS[3].getX(), COLORS[3].getY(), COLORS[3].getZ());
+			return ColorUtil.color(COLORS[3].getX(), COLORS[3].getY(), COLORS[3].getZ());
 		};
 	}
 	

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

@@ -5,10 +5,11 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import com.mojang.math.Transformation;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.renderer.block.model.MultiVariant;
 import net.minecraft.client.renderer.block.model.Variant;
@@ -16,7 +17,6 @@ import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
@@ -32,7 +32,6 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.phys.BlockHitResult;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.client.models.ModelsHelper;

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

@@ -3,20 +3,22 @@ package ru.betterend.client;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.Registry;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.world.entity.player.Player;
 import ru.betterend.BetterEnd;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.events.ItemTooltipCallback;
 import ru.betterend.interfaces.IRenderTypeable;
 import ru.betterend.interfaces.MultiModelItem;
 import ru.betterend.item.CrystaliteArmor;
-import ru.betterend.registry.*;
+import ru.betterend.registry.EndBlockEntityRenders;
+import ru.betterend.registry.EndEntitiesRenders;
+import ru.betterend.registry.EndModelProviders;
+import ru.betterend.registry.EndParticles;
+import ru.betterend.registry.EndScreens;
 import ru.betterend.util.TranslationHelper;
 
 public class BetterEndClient implements ClientModInitializer {

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

@@ -1,17 +1,18 @@
 package ru.betterend.client.models;
 
+import static net.minecraft.client.resources.model.ModelBakery.MISSING_MODEL_LOCATION;
+
 import java.util.Map;
 import java.util.Optional;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.BetterEnd;
 
-import static net.minecraft.client.resources.model.ModelBakery.MISSING_MODEL_LOCATION;
-
 public interface BlockModelProvider extends ItemModelProvider {
 	default @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Optional<String> pattern = Patterns.createBlockSimple(resourceLocation.getPath());

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

@@ -3,8 +3,6 @@ package ru.betterend.client.models;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 
-import java.util.Optional;
-
 public interface ItemModelProvider {
 	default BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return ModelsHelper.createItemModel(resourceLocation.getPath());

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

@@ -1,7 +1,12 @@
 package ru.betterend.client.models;
 
-import com.google.common.collect.*;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.google.common.collect.Lists;
 import com.mojang.math.Transformation;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.block.model.BlockModel;
@@ -17,10 +22,6 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-
 @Environment(EnvType.CLIENT)
 public class ModelsHelper {
 	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")

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

@@ -10,10 +10,10 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.core.Vec3i;
 import net.minecraft.util.Mth;
+import ru.bclib.util.ColorUtil;
+import ru.bclib.util.MHelper;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.AuroraCrystalBlock;
-import ru.betterend.util.ColorUtil;
-import ru.betterend.util.MHelper;
 
 public class EternalCrystalRenderer {
 	private static final RenderType RENDER_LAYER;
@@ -54,7 +54,7 @@ public class EternalCrystalRenderer {
 		int g = MHelper.floor(Mth.lerp(delta, color1.getY(), color2.getY()));
 		int b = MHelper.floor(Mth.lerp(delta, color1.getZ(), color2.getZ()));
 		
-		return ColorUtil.toFloatArray(MHelper.color(r, g, b));
+		return ColorUtil.toFloatArray(ColorUtil.color(r, g, b));
 	}
 	
 	static {

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

@@ -33,10 +33,10 @@ import net.minecraft.world.level.levelgen.Heightmap.Types;
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.level.pathfinder.Path;
 import net.minecraft.world.phys.Vec3;
+import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndSounds;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class DragonflyEntity extends Animal implements FlyingAnimal {
 	public DragonflyEntity(EntityType<DragonflyEntity> entityType, Level world) {

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

@@ -38,10 +38,10 @@ import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.AABB;
+import ru.bclib.util.MHelper;
 import ru.betterend.interfaces.ISlime;
 import ru.betterend.registry.EndBiomes;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 import ru.betterend.world.biome.EndBiome;
 
 public class EndSlimeEntity extends Slime {

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

@@ -26,8 +26,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerLevelAccessor;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
+import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndSounds;
-import ru.betterend.util.MHelper;
 
 public class ShadowWalkerEntity extends Monster {
 	public ShadowWalkerEntity(EntityType<ShadowWalkerEntity> entityType, Level world) {

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

@@ -46,13 +46,13 @@ 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 ru.bclib.util.MHelper;
 import ru.betterend.BetterEnd;
 import ru.betterend.blocks.BlockProperties;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 public class SilkMothEntity extends Animal implements FlyingAnimal {
 	private BlockPos hivePos;

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

@@ -7,8 +7,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.model.ListModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.RenderType;
+import ru.bclib.util.MHelper;
 import ru.betterend.entity.EndSlimeEntity;
-import ru.betterend.util.MHelper;
 
 public class EndSlimeEntityModel<T extends EndSlimeEntity> extends ListModel<T> {
 	private final ModelPart flower;

src/main/java/ru/betterend/events/ItemTooltipCallback.java

@@ -1,5 +1,7 @@
 package ru.betterend.events;
 
+import java.util.List;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.event.Event;
@@ -9,8 +11,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 
-import java.util.List;
-
 @Environment(EnvType.CLIENT)
 public interface ItemTooltipCallback {
 	/**

src/main/java/ru/betterend/integration/FlamboyantRefabricatedIntegration.java

@@ -6,10 +6,10 @@ import java.util.Map;
 import com.google.common.collect.Maps;
 
 import net.minecraft.world.level.ItemLike;
+import ru.bclib.util.ColorUtil;
 import ru.betterend.blocks.HydraluxPetalColoredBlock;
 import ru.betterend.blocks.complex.ColoredMaterial;
 import ru.betterend.registry.EndBlocks;
-import ru.betterend.util.MHelper;
 
 public class FlamboyantRefabricatedIntegration extends ModIntegration {
 	public FlamboyantRefabricatedIntegration() {
@@ -18,24 +18,8 @@ public class FlamboyantRefabricatedIntegration extends ModIntegration {
 
 	@Override
 	public void register() {
-		/*Class<?> fDyeColor = getClass("com.github.EltrutCo.flamboyant.items.FDyeColor");
-		Object[] values = getStaticFieldValue(fDyeColor, "VALUES");
-		
-		if (values == null) {
-			return;
-		}*/
-		
 		Map<Integer, String> colors = Maps.newHashMap();
 		Map<Integer, ItemLike> dyes = Maps.newHashMap();
-		/*for (Object val: values) {
-			Integer color = (Integer) getFieldValue(fDyeColor, "signColor", val);
-			String name = (String) getFieldValue(fDyeColor, "name", val);
-			if (color != null && name != null) {
-				colors.put(color, name);
-				System.out.println(name + " " + color + " " + new Color(color));
-				dyes.put(color, getItem(name + "_dye"));
-			}
-		}*/
 		
 		addColor("fead1d", "amber", colors, dyes);
 		addColor("bd9a5f", "beige", colors, dyes);
@@ -58,7 +42,7 @@ public class FlamboyantRefabricatedIntegration extends ModIntegration {
 	}
 	
 	private void addColor(String hex, String name, Map<Integer, String> colors, Map<Integer, ItemLike> dyes) {
-		int color = MHelper.color(hex);
+		int color = ColorUtil.color(hex);
 		colors.put(color, name);
 		dyes.put(color, getItem(name + "_dye"));
 		

src/main/java/ru/betterend/integration/byg/features/BigEtherTreeFeature.java

@@ -12,9 +12,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
+import ru.bclib.util.MHelper;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
-import ru.betterend.util.MHelper;
 import ru.betterend.util.SplineHelper;
 import ru.betterend.util.sdf.SDF;
 import ru.betterend.world.features.DefaultFeature;

src/main/java/ru/betterend/integration/byg/features/GreatNightshadeTreeFeature.java

@@ -17,10 +17,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
+import ru.bclib.util.MHelper;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 import ru.betterend.util.SplineHelper;
 import ru.betterend.util.sdf.PosInfo;
 import ru.betterend.util.sdf.SDF;

src/main/java/ru/betterend/integration/byg/features/NightshadeRedwoodTreeFeature.java

@@ -17,10 +17,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
+import ru.bclib.util.MHelper;
 import ru.betterend.integration.Integrations;
 import ru.betterend.registry.EndTags;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 import ru.betterend.util.SplineHelper;
 import ru.betterend.util.sdf.PosInfo;
 import ru.betterend.util.sdf.SDF;

src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java

@@ -16,10 +16,10 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.AABB;
+import ru.bclib.util.MHelper;
 import ru.betterend.integration.Integrations;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndTags;
-import ru.betterend.util.MHelper;
 import ru.betterend.util.SplineHelper;
 import ru.betterend.util.sdf.SDF;
 import ru.betterend.util.sdf.operator.SDFDisplacement;

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

@@ -1,28 +1,14 @@
 package ru.betterend.item;
 
-import java.util.List;
-
-import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
-import org.jetbrains.annotations.Nullable;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import ru.betterend.effects.EndStatusEffects;
 import ru.betterend.item.material.EndArmorMaterial;
-import ru.betterend.registry.EndItems;
 
 public class CrystaliteArmor extends EndArmorItem {
 

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

@@ -1,28 +1,24 @@
 package ru.betterend.item;
 
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.effects.EndStatusEffects;
 import ru.betterend.interfaces.MobEffectApplier;
 import ru.betterend.registry.EndItems;
 
-import java.util.List;
-
 public class CrystaliteBoots extends CrystaliteArmor implements MobEffectApplier {
 
 	public CrystaliteBoots() {

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

@@ -1,28 +1,24 @@
 package ru.betterend.item;
 
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
 import ru.betterend.effects.EndStatusEffects;
 import ru.betterend.interfaces.MobEffectApplier;
 import ru.betterend.registry.EndItems;
 
-import java.util.List;
-
 public class CrystaliteChestplate extends CrystaliteArmor implements MobEffectApplier {
 
 	public CrystaliteChestplate() {

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

@@ -5,11 +5,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndItems;
 
-import java.util.Optional;
-
 public class EnchantedPetalItem extends ModelProviderItem {
 	public EnchantedPetalItem() {
 		super(EndItems.makeItemSettings().rarity(Rarity.RARE).stacksTo(16));

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

@@ -1,5 +1,7 @@
 package ru.betterend.item;
 
+import java.util.UUID;
+
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
@@ -10,10 +12,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
 import ru.betterend.client.models.ItemModelProvider;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
-import java.util.UUID;
 
 public class EndArmorItem extends ArmorItem implements ItemModelProvider {
 

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

@@ -4,11 +4,8 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.FishBucketItem;
 import net.minecraft.world.level.material.Fluids;
 import ru.betterend.client.models.ItemModelProvider;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndItems;
 
-import java.util.Optional;
-
 public class EndBucketItem extends FishBucketItem implements ItemModelProvider {
 	public EndBucketItem(EntityType<?> type) {
 		super(type, Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));

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

@@ -3,9 +3,6 @@ package ru.betterend.item;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.RecordItem;
 import ru.betterend.client.models.ItemModelProvider;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndDiscItem extends RecordItem implements ItemModelProvider {
 	public EndDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {

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

@@ -1,5 +1,7 @@
 package ru.betterend.item;
 
+import java.util.Optional;
+
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;
@@ -8,8 +10,6 @@ import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
 import ru.betterend.client.models.Patterns;
 
-import java.util.Optional;
-
 public class EndSpawnEggItem extends SpawnEggItem implements ItemModelProvider {
 	public EndSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Properties settings) {
 		super(type, primaryColor, secondaryColor, settings);

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

@@ -5,9 +5,6 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class ModelProviderItem extends Item implements ItemModelProvider {
 	public ModelProviderItem(Properties settings) {

src/main/java/ru/betterend/item/tool/EndAxeItem.java

@@ -13,9 +13,6 @@ import net.minecraft.world.item.Tier;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndAxeItem extends AxeItem implements DynamicAttributeTool, ItemModelProvider {
 	public EndAxeItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {

src/main/java/ru/betterend/item/tool/EndHammerItem.java

@@ -1,6 +1,5 @@
 package ru.betterend.item.tool;
 
-import java.util.Optional;
 import java.util.UUID;
 
 import com.google.common.collect.ImmutableMultimap;
@@ -31,7 +30,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndTags;
 
 public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, ItemModelProvider {

src/main/java/ru/betterend/item/tool/EndHoeItem.java

@@ -6,9 +6,6 @@ import net.minecraft.world.item.HoeItem;
 import net.minecraft.world.item.Tier;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndHoeItem extends HoeItem implements ItemModelProvider {
 	public EndHoeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {

src/main/java/ru/betterend/item/tool/EndPickaxeItem.java

@@ -16,9 +16,6 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, ItemModelProvider {
 	public EndPickaxeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {

src/main/java/ru/betterend/item/tool/EndShovelItem.java

@@ -15,9 +15,6 @@ import net.minecraft.world.item.Tier;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndShovelItem extends ShovelItem implements DynamicAttributeTool, ItemModelProvider {
 	public EndShovelItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {

src/main/java/ru/betterend/item/tool/EndSwordItem.java

@@ -7,9 +7,6 @@ import net.minecraft.world.item.SwordItem;
 import net.minecraft.world.item.Tier;
 import ru.betterend.client.models.ItemModelProvider;
 import ru.betterend.client.models.ModelsHelper;
-import ru.betterend.client.models.Patterns;
-
-import java.util.Optional;
 
 public class EndSwordItem extends SwordItem implements DynamicAttributeTool, ItemModelProvider {
 	public EndSwordItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {

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

@@ -14,15 +14,15 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockAndTintGetter;
+import ru.bclib.util.ColorUtil;
 import ru.betterend.client.ClientOptions;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.BlocksHelper;
-import ru.betterend.util.MHelper;
 
 @Mixin(BiomeColors.class)
 public class BiomeColorsMixin {
-	private static final int POISON_COLOR = MHelper.color(92, 160, 78);
+	private static final int POISON_COLOR = ColorUtil.color(92, 160, 78);
-	private static final int STREAM_COLOR = MHelper.color(105, 213, 244);
+	private static final int STREAM_COLOR = ColorUtil.color(105, 213, 244);
 	private static final Point[] OFFSETS;
 	private static final boolean HAS_SODIUM;
 	

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

@@ -1,17 +1,18 @@
 package ru.betterend.mixin.client;
 
+import java.util.List;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ru.betterend.events.ItemTooltipCallback;
 
-import java.util.List;
-
 @Mixin(ItemStack.class)
 public class ItemStackMixin {
 	@Inject(method = "getTooltipLines", at = @At("RETURN"))