Merge pull request #229 from paulevsGitch/1.17

Update to 1.17.1

.gitignore

@@ -29,3 +29,5 @@ bin/
 run/
 output/
 *.log
+Convert.class
+ModelPart.class

Convert.java

@@ -0,0 +1,180 @@
+
+class ModelPart {
+    static java.util.ArrayList<ModelPart> parts = new java.util.ArrayList<>(20);
+    final String name;
+    ModelPart parent = null;
+    boolean mirror = false;
+
+    float x=0, y=0, z=0, rx=0, ry=0, rz=0;
+    int u=0, v=0;
+    float bx=0,by=0,bz=0,ba=0,bb=0,bc=0;
+    float scale = 1;
+    static int wd = 64;
+    static int hg = 32;
+
+
+    boolean hadBox = false;
+    ModelPart(Convert c, String name){
+        this(c, 0, 0, name);
+        
+    }
+
+    ModelPart(Convert c, int u, int v, String name){
+        this.name = name;
+        this.u = u;
+        this.v = v;
+        parts.add(this);
+    }
+
+    ModelPart(int wd, int hg, int u, int v, String name){
+        this.name = name;
+        this.u = u;
+        this.v = v;
+        ModelPart.wd = wd;
+        ModelPart.hg = hg;
+        parts.add(this);
+    }
+
+    ModelPart setPos(float x, float y, float z){
+        this.x=x;
+        this.y=y;
+        this.z=z;
+        return this;
+    }
+
+    ModelPart setRotationAngle(float x, float y, float z){
+        this.rx=x;
+        this.ry=y;
+        this.rz=z;
+        return this;
+    }
+
+    ModelPart addChild(ModelPart p){
+        p.parent = this;
+        return this;
+    }
+
+    ModelPart texOffs(int u, int v){
+        this.u=u;
+        this.v=v;
+        return this;
+    }
+    ModelPart addBox(float x, float y, float z, float a, float b, float c){
+        return addBox(x, y, z, a, b, c, 1);
+    }
+
+    ModelPart addBox(float x, float y, float z, float a, float b, float c, float _d){
+        bx=x;
+        by=y;
+        bz=z;
+        ba=a;
+        bb=b;
+        bc=c;
+        scale = _d;
+        hadBox = true;
+        return this;
+    }
+    ModelPart addBox(float x, float y, float z, float a, float b, float c, float _d, boolean mirror){
+        this.mirror = mirror;
+        bx=x;
+        by=y;
+        bz=z;
+        ba=a;
+        bb=b;
+        bc=c;
+        hadBox = true;
+        return this;
+    }
+
+    public String toString(){
+        String s = "";
+        String pName = parent==null?"modelPartData":parent.name;
+        if (scale!=1){
+            s += "CubeDeformation deformation_"+name+" = new CubeDeformation("+scale+"f);\n";
+        }
+        s += "PartDefinition " + name + " = ";        
+        s +=  pName+".addOrReplaceChild(\""+name+"\", CubeListBuilder.create()\n";
+        if (this.mirror) s+= ".mirror()\n";  
+        s+= ".texOffs("+u+", "+v+")";                              
+        if (this.hadBox) {
+            s+= "\n";
+            if (scale!=1)
+                s+= ".addBox("+bx+"f, "+by+"f, "+bz+"f, "+ba+"f, "+bb+"f, "+bc+"f, deformation_"+name+"),\n";
+            else
+                s+= ".addBox("+bx+"f, "+by+"f, "+bz+"f, "+ba+"f, "+bb+"f, "+bc+"f),\n";
+        } else {
+            s+= ",\n";
+        }
+        
+        if (x==0 && y==0 && z==0 && rx==0 && ry==0 && rz==0){
+            s+= "PartPose.ZERO";
+        } else if (rx==0 && ry==0 && rz==0){
+            s+= "PartPose.offset("+x+"f, "+y+"f, "+z+"f)";
+        } else {
+            s+= "PartPose.offsetAndRotation("+x+"f, "+y+"f, "+z+"f, \n"+rx+"f, "+ry+"f, "+rz+"f)";
+        }
+        s +=");";
+
+        return s;
+    }
+
+    public static void print(){
+        System.out.println("public static LayerDefinition getTexturedModelData() {");
+        System.out.println("    MeshDefinition modelData = new MeshDefinition();");
+        System.out.println("    PartDefinition modelPartData = modelData.getRoot();");
+        for(ModelPart p : parts){
+            System.out.println(p);
+            System.out.println();
+        }
+        System.out.println("return LayerDefinition.create(modelData, "+wd+", "+hg+");");
+	    System.out.println("}");
+
+        System.out.println();
+        System.out.println();
+
+        for(ModelPart p : parts){
+            String pName = p.parent==null?"modelPart":p.parent.name;
+            System.out.println(p.name +" = "+pName+".getChild(\""+p.name+"\");");
+        }
+    }
+}
+public class Convert {
+    public static void main(String[] args){
+        new Convert().c();
+
+        ModelPart.print();
+    }
+    void setRotationAngle(ModelPart p, float x, float y, float z){
+        p.setRotationAngle(x, y, z);
+    }
+    public void c (){
+        float scale = 1;
+        ModelPart partC = new ModelPart(64, 64, 0, 19, "partC");
+		partC.addBox(1.0F, 0.0F, 1.0F, 14.0F, 9.0F, 14.0F, 0.0F);
+		ModelPart partA = new ModelPart(64, 64, 0, 0,"partA");
+		partA.addBox(1.0F, 0.0F, 0.0F, 14.0F, 5.0F, 14.0F, 0.0F);
+		partA.y = 9.0F;
+		partA.z = 1.0F;
+		ModelPart partB = new ModelPart(64, 64, 0, 0, "partB");
+		partB.addBox(7.0F, -1.0F, 15.0F, 2.0F, 4.0F, 1.0F, 0.0F);
+		partB.y = 8.0F;
+		ModelPart partRightC = new ModelPart(64, 64, 0, 19, "partRightC");
+		partRightC.addBox(1.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F);
+		ModelPart partRightA = new ModelPart(64, 64, 0, 0, "partRightA");
+		partRightA.addBox(1.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F);
+		partRightA.y = 9.0F;
+		partRightA.z = 1.0F;
+		ModelPart partRightB = new ModelPart(64, 64, 0, 0, "partRightB");
+		partRightB.addBox(15.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F);
+		partRightB.y = 8.0F;
+		ModelPart partLeftC = new ModelPart(64, 64, 0, 19, "partLeftC");
+		partLeftC.addBox(0.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F);
+		ModelPart partLeftA = new ModelPart(64, 64, 0, 0, "partLeftA");
+		partLeftA.addBox(0.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F);
+		partLeftA.y = 9.0F;
+		partLeftA.z = 1.0F;
+		ModelPart partLeftB = new ModelPart(64, 64, 0, 0, "partLeftB");
+		partLeftB.addBox(0.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F);
+		partLeftB.y = 8.0F;
+    }
+}

README.md

@@ -1,6 +1,6 @@
 [![](https://jitpack.io/v/paulevsGitch/BetterEnd.svg)](https://jitpack.io/#paulevsGitch/BetterEnd)
 # Better End
-Better End Mod for Fabric, MC 1.16.4
+Better End Mod for Fabric, MC 1.17.1
 
 Importing:
 * Clone repo

build.gradle

@@ -7,12 +7,12 @@ buildscript {
 plugins {
 	id 'idea'
 	id 'eclipse'
-	id 'fabric-loom' version '0.7-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -20,7 +20,6 @@ group = project.maven_group
 
 repositories {
     maven { url "https://maven.dblsaiko.net/" }    
-    maven { url "https://server.bbkr.space:8081/artifactory/libs-release/" }
 	maven { url "https://maven.fabricmc.net/" }
 	maven { url 'https://maven.blamejared.com' }
 	maven { url "https://maven.shedaniel.me/" }
@@ -33,11 +32,11 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	useApi "vazkii.patchouli:Patchouli:1.16.4-${project.patchouli_version}"
+	useApi "vazkii.patchouli:Patchouli:1.17-${project.patchouli_version}"
 	useApi "com.github.paulevsGitch:BCLib:${project.bclib_version}"
 
-	useOptional "me.shedaniel:RoughlyEnoughItems:${project.rei_version}"
+	useOptional "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
-	useOptional "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}"
+	useOptional "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
 	//useOptional "grondag:canvas-mc116:${project.canvas_version}"
 }
 
@@ -73,7 +72,7 @@ def useApi(String dep) {
 
 processResources {
 	inputs.property "version", project.version
-	duplicatesStrategy = 'EXCLUDE'
+	duplicatesStrategy = 'WARN'
 
 	from(sourceSets.main.resources.srcDirs) {
 		include "fabric.mod.json"

gradle.properties

@@ -3,19 +3,19 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.16.5
+minecraft_version= 1.17.1
-yarn_mappings=6
+yarn_mappings= 6
-loader_version=0.11.3
+loader_version= 0.11.6
 
 # Mod Properties
-mod_version = 0.9.8.5-pre
+mod_version = 0.10.1-pre
 maven_group = ru.betterend
 archives_base_name = better-end
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-patchouli_version = 53-FABRIC
+patchouli_version = 55-FABRIC-SNAPSHOT
-fabric_version = 0.36.0+1.16
+fabric_version = 0.36.1+1.17
-bclib_version = 0.1.44
+bclib_version = 0.2.0
-rei_version = 5.12.248
+rei_version = 6.0.262-alpha
 canvas_version = 1.0.+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -2,27 +2,31 @@ package ru.betterend.api;
 
 public interface BetterEndPlugin {
 	/**
-	 *  Alloying recipes registration.
+	 * Alloying recipes registration.
-	 *  See AlloyingRecipe.Builder for details.
+	 * See AlloyingRecipe.Builder for details.
 	 */
-	default void registerAlloyingRecipes() {}
+	default void registerAlloyingRecipes() {
+	}
 
 	/**
-	 *  Smithing recipes registration.
+	 * Smithing recipes registration.
-	 *  See AnvilSmithingRecipe.Builder for details.
+	 * See AnvilSmithingRecipe.Builder for details.
 	 */
-	default void registerSmithingRecipes() {}
+	default void registerSmithingRecipes() {
+	}
 
 	/**
-	 *  Additional biomes registration.
+	 * Additional biomes registration.
-	 *  See BiomeRegistry.registerBiome for details.
+	 * See BiomeRegistry.registerBiome for details.
 	 */
-	default void registerEndBiomes() {}
+	default void registerEndBiomes() {
+	}
 
 	/**
-	 *  Register other mod stuff, for example, EndHammers.
+	 * Register other mod stuff, for example, EndHammers.
 	 */
-	default void registerOthers() {}
+	default void registerOthers() {
+	}
 
 
 	public static void register(BetterEndPlugin plugin) {

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

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

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.color.block.BlockColor;
@@ -20,13 +17,15 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import ru.bclib.api.TagAPI;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IColorProvider;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndItems;
-import ru.betterend.registry.EndTags;
+
+import java.util.List;
 
 public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyped, IColorProvider {
 	public static final Vec3i[] COLORS;
@@ -36,7 +35,7 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 	public AuroraCrystalBlock() {
 		super(FabricBlockSettings.of(Material.GLASS)
 				.breakByTool(FabricToolTags.PICKAXES)
-				.breakByTool(EndTags.HAMMERS)
+				.breakByTool(TagAPI.HAMMERS)
 				.hardness(1F)
 				.resistance(1F)
 				.luminance(15)
@@ -50,7 +49,8 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 		return (state, world, pos, tintIndex) -> {
 			if (pos == null) {
 				pos = BlockPos.ZERO;
-			};
+			}
+			;
 
 			long i = (long) pos.getX() + (long) pos.getY() + (long) pos.getZ();
 			double delta = i * 0.1;
@@ -99,7 +99,8 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 					return Lists.newArrayList(new ItemStack(EndItems.CRYSTAL_SHARDS, max));
 				}
 				count = MHelper.randRange(min, max, MHelper.RANDOM);
-			} else {
+			}
+			else {
 				count = MHelper.randRange(MIN_DROP, MAX_DROP, MHelper.RANDOM);
 			}
 			return Lists.newArrayList(new ItemStack(EndItems.CRYSTAL_SHARDS, count));
@@ -108,11 +109,11 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 	}
 
 	static {
-		COLORS = new Vec3i[] {
+		COLORS = new Vec3i[]{
-			new Vec3i(247,  77, 161),
+				new Vec3i(247, 77, 161),
-			new Vec3i(120, 184, 255),
+				new Vec3i(120, 184, 255),
-			new Vec3i(120, 255, 168),
+				new Vec3i(120, 255, 168),
-			new Vec3i(243,  58, 255)
+				new Vec3i(243, 58, 255)
 		};
 	}
 }

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.WorldGenLevel;
@@ -14,6 +12,8 @@ import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.blocks.basis.FurBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 	@Override
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {
@@ -32,7 +32,7 @@ public class BlueVineSeedBlock extends EndPlantWithAgeBlock {
 
 	private void placeLantern(WorldGenLevel world, BlockPos pos) {
 		BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.BLUE_VINE_LANTERN.defaultBlockState().setValue(BlueVineLanternBlock.NATURAL, true));
-		for (Direction dir: BlocksHelper.HORIZONTAL) {
+		for (Direction dir : BlocksHelper.HORIZONTAL) {
 			BlockPos p = pos.relative(dir);
 			if (world.isEmptyBlock(p)) {
 				BlocksHelper.setWithoutUpdate(world, p, EndBlocks.BLUE_VINE_FUR.defaultBlockState().setValue(FurBlock.FACING, dir));

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

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

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
-import org.jetbrains.annotations.Nullable;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
@@ -20,11 +16,14 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.MaterialColor;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class BrimstoneBlock extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 
@@ -67,7 +66,7 @@ public class BrimstoneBlock extends BaseBlock {
 	@Override
 	public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
 		boolean deactivate = true;
-		for (Direction dir: BlocksHelper.DIRECTIONS) {
+		for (Direction dir : BlocksHelper.DIRECTIONS) {
 			if (world.getFluidState(pos.relative(dir)).getType().equals(Fluids.WATER)) {
 				deactivate = false;
 				break;

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

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

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
@@ -16,6 +13,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+
 public class BulbVineBlock extends BaseVineBlock {
 	public BulbVineBlock() {
 		super(15, true);

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

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

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

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

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
@@ -22,6 +19,9 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTyped {
 	public static final BooleanProperty SMALL = BlockProperties.SMALL;
 	private static final VoxelShape SHAPE_SMALL;
@@ -58,7 +58,7 @@ public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTyped {
 		VoxelShape top = Block.box(5, 15, 5, 11, 16, 11);
 		SHAPE_BIG = Shapes.or(lantern, cap, top);
 
-		lantern = Block.box(1, 7, 1, 15, 13, 15);
+		lantern = Block.box(5, 7, 5, 11, 13, 11);
 		cap = Block.box(4, 12, 4, 12, 15, 12);
 		top = Block.box(6, 15, 6, 10, 16, 10);
 		SHAPE_SMALL = Shapes.or(lantern, cap, top);

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
@@ -18,6 +16,8 @@ import ru.bclib.blocks.BlockProperties;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class CavePumpkinVineBlock extends EndPlantWithAgeBlock {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 16, 12);
 
@@ -45,7 +45,8 @@ public class CavePumpkinVineBlock extends EndPlantWithAgeBlock {
 	}
 
 	@Override
-	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {}
+	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {
+	}
 
 	@Override
 	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {

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

@@ -1,13 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Maps;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -23,6 +16,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
@@ -30,6 +24,10 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.client.models.Patterns;
 
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+
 public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped, BlockModelProvider {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -15,6 +12,9 @@ import ru.bclib.blocks.BaseBlock;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.Collections;
+import java.util.List;
+
 public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTyped {
 	public DenseEmeraldIceBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.PACKED_ICE));

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
@@ -14,6 +12,8 @@ import ru.bclib.blocks.UnderwaterPlantWithAgeBlock;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 	@Override
 	public void grow(WorldGenLevel world, Random random, BlockPos pos) {
@@ -92,10 +92,10 @@ public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 		MutableBlockPos p = new MutableBlockPos();
 		BlockState leaf = EndBlocks.END_LOTUS_LEAF.defaultBlockState();
 		BlocksHelper.setWithoutUpdate(world, pos, leaf.setValue(EndLotusLeafBlock.SHAPE, TripleShape.BOTTOM));
-		for (Direction move: BlocksHelper.HORIZONTAL) {
+		for (Direction move : BlocksHelper.HORIZONTAL) {
 			BlocksHelper.setWithoutUpdate(world, p.set(pos).move(move), leaf.setValue(EndLotusLeafBlock.HORIZONTAL_FACING, move).setValue(EndLotusLeafBlock.SHAPE, TripleShape.MIDDLE));
 		}
-		for (int i = 0; i < 4; i ++) {
+		for (int i = 0; i < 4; i++) {
 			Direction d1 = BlocksHelper.HORIZONTAL[i];
 			Direction d2 = BlocksHelper.HORIZONTAL[(i + 1) & 3];
 			BlocksHelper.setWithoutUpdate(world, p.set(pos).move(d1).move(d2), leaf.setValue(EndLotusLeafBlock.HORIZONTAL_FACING, d1).setValue(EndLotusLeafBlock.SHAPE, TripleShape.TOP));
@@ -106,12 +106,12 @@ public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock {
 		MutableBlockPos p = new MutableBlockPos();
 		p.setY(pos.getY());
 		int count = 0;
-		for (int x = -1; x < 2; x ++) {
+		for (int x = -1; x < 2; x++) {
 			p.setX(pos.getX() + x);
-			for (int z = -1; z < 2; z ++) {
+			for (int z = -1; z < 2; z++) {
 				p.setZ(pos.getZ() + z);
 				if (world.isEmptyBlock(p) && !world.getFluidState(p.below()).isEmpty())
-					count ++;
+					count++;
 			}
 		}
 		return count == 9;

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.Map;
-
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -32,6 +29,8 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 
+import java.util.Map;
+
 public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, IRenderTyped {
 	public static final EnumProperty<Direction> FACING = BlockStateProperties.FACING;
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;

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

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

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

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

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

@@ -1,10 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-import java.util.Random;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -19,7 +15,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.HorizontalDirectionalBlock;
@@ -28,6 +23,8 @@ import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -38,8 +35,13 @@ import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlockWithEntity;
 import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
+import ru.betterend.registry.EndBlockEntities;
+
+import java.util.List;
+import java.util.Random;
 
 public class EndStoneSmelter extends BaseBlockWithEntity {
 	public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;
@@ -48,19 +50,19 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 
 	public EndStoneSmelter() {
 		super(FabricBlockSettings.of(Material.STONE, MaterialColor.COLOR_GRAY)
+				.luminance(state -> state.getValue(LIT) ? 15 : 0)
 				.hardness(4F)
 				.resistance(100F)
 				.requiresCorrectToolForDrops()
 				.sound(SoundType.STONE));
-		registerDefaultState(this.stateDefinition.any()
+		registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(LIT, false));
-											  .setValue(FACING, Direction.NORTH)
-											  .setValue(LIT, false));
 	}
 
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
 		if (world.isClientSide) {
 			return InteractionResult.SUCCESS;
-		} else {
+		}
+		else {
 			this.openScreen(world, pos, player);
 			return InteractionResult.CONSUME;
 		}
@@ -79,8 +81,8 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new EndStoneSmelterBlockEntity();
+		return new EndStoneSmelterBlockEntity(blockPos, blockState);
 	}
 
 	@Override
@@ -137,7 +139,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 			double y = pos.getY();
 			double z = pos.getZ() + 0.5D;
 			if (random.nextDouble() < 0.1D) {
-			   world.playLocalSound(x, y, z, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false);
+				world.playLocalSound(x, y, z, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false);
 			}
 
 			Direction direction = state.getValue(FACING);
@@ -149,4 +151,11 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 			world.addParticle(ParticleTypes.SMOKE, x + offX, y + offY, z + offZ, 0.0D, 0.0D, 0.0D);
 		}
 	}
+
+
+	@Override
+	@Nullable
+	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
+		return level.isClientSide() ? null : createTickerHelper(blockEntityType, EndBlockEntities.END_STONE_SMELTER, EndStoneSmelterBlockEntity::tick);
+	}
 }

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -16,6 +13,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import ru.bclib.util.ColorUtil;
 
+import java.util.Collections;
+import java.util.List;
+
 public class EndstoneDustBlock extends FallingBlock {
 	@Environment(EnvType.CLIENT)
 	private static final int COLOR = ColorUtil.color(226, 239, 168);

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

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

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

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

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -21,6 +18,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.interfaces.ISpetialItem;
 import ru.betterend.blocks.basis.EndPlantBlock;
 
+import java.util.List;
+
 public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 1, 16);
 

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

@@ -19,12 +19,12 @@ public class GlowingMossBlock extends EndPlantBlock {
 	}
 
 	@Environment(EnvType.CLIENT)
-    public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
+	public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
-       return true;
+		return true;
-    }
+	}
 
-    @Environment(EnvType.CLIENT)
+	@Environment(EnvType.CLIENT)
-    public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
+	public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
-       return 1F;
+		return 1F;
-    }
+	}
 }

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -20,6 +18,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 
 	public GlowingPillarSeedBlock() {
@@ -44,14 +44,15 @@ public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock {
 		BlockState roots = EndBlocks.GLOWING_PILLAR_ROOTS.defaultBlockState();
 		if (height < 2) {
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.MIDDLE));
-		} else {
+		}
+		else {
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.BOTTOM));
 			mut.move(Direction.UP);
 			BlocksHelper.setWithUpdate(world, mut, roots.setValue(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP));
 		}
 		mut.move(Direction.UP);
 		BlocksHelper.setWithUpdate(world, mut, EndBlocks.GLOWING_PILLAR_LUMINOPHOR.defaultBlockState().setValue(BlueVineLanternBlock.NATURAL, true));
-		for (Direction dir: BlocksHelper.DIRECTIONS) {
+		for (Direction dir : BlocksHelper.DIRECTIONS) {
 			pos = mut.relative(dir);
 			if (world.isEmptyBlock(pos)) {
 				BlocksHelper.setWithUpdate(world, pos, EndBlocks.GLOWING_PILLAR_LEAVES.defaultBlockState().setValue(BlockStateProperties.FACING, dir));

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

@@ -1,10 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.color.block.BlockColor;
@@ -30,6 +26,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
@@ -79,7 +78,7 @@ public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider {
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null) {
-			if (tool.getItem().is(FabricToolTags.SHEARS) || tool.isCorrectToolForDrops(state) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+			if (tool.is(FabricToolTags.SHEARS) || tool.isCorrectToolForDrops(state) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 				return Collections.singletonList(new ItemStack(this));
 			}
 			int fortune = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, tool);

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

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

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

@@ -6,6 +6,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.bclib.blocks.BaseBlock;
@@ -26,5 +27,6 @@ public class HydraluxPetalBlock extends BaseBlock {
 	}
 
 	@Override
-	public void fallOn(Level world, BlockPos pos, Entity entity, float distance) {}
+	public void fallOn(Level level, BlockState blockState, BlockPos blockPos, Entity entity, float f) {
+	}
 }

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

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

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

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

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
-import org.jetbrains.annotations.Nullable;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -26,6 +22,8 @@ import net.minecraft.world.level.block.LiquidBlockContainer;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -36,6 +34,7 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
@@ -43,6 +42,8 @@ import ru.betterend.blocks.entities.BlockEntityHydrothermalVent;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlock, LiquidBlockContainer, SimpleWaterloggedBlock {
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
@@ -108,8 +109,8 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
-		return new BlockEntityHydrothermalVent();
+		return new BlockEntityHydrothermalVent(pos, state);
 	}
 
 	@Override
@@ -124,23 +125,24 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo
 	@Override
 	public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
 		if (world instanceof ServerLevel && state.getValue(WATERLOGGED) && world.getBlockState(pos.above()).is(Blocks.WATER)) {
-			tick(state,(ServerLevel) world, pos, world.random);
+			tick(state, (ServerLevel) world, pos, world.random);
 		}
 	}
 
 	@Environment(EnvType.CLIENT)
 	public void animateTick(BlockState state, Level world, BlockPos pos, Random random) {
+		super.animateTick(state, world, pos, random);
 		if (!state.getValue(ACTIVATED) && random.nextBoolean()) {
-			super.animateTick(state, world, pos, random);
 			double x = pos.getX() + random.nextDouble();
 			double y = pos.getY() + 0.9 + random.nextDouble() * 0.3;
 			double z = pos.getZ() + random.nextDouble();
-			if (state.getValue(WATERLOGGED)) {
+			world.addParticle(ParticleTypes.LARGE_SMOKE, x, y, z, 0, 0, 0);
-				world.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0);
-			}
-			else {
-				world.addParticle(ParticleTypes.SMOKE, x, y, z, 0, 0, 0);
-			}
 		}
 	}
+
+	@Nullable
+	@Override
+	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
+		return BlockEntityHydrothermalVent::tick;
+	}
 }

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

@@ -6,12 +6,16 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.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.PedestalBlock;
 import ru.betterend.blocks.entities.InfusionPedestalEntity;
+import ru.betterend.blocks.entities.PedestalBlockEntity;
 import ru.betterend.rituals.InfusionRitual;
 
 @SuppressWarnings("deprecation")
@@ -35,7 +39,8 @@ public class InfusionPedestal extends PedestalBlock {
 					ritual.configure();
 				}
 				pedestal.getRitual().checkRecipe();
-			} else {
+			}
+			else {
 				InfusionRitual ritual = new InfusionRitual(pedestal, world, pos);
 				pedestal.linkRitual(ritual);
 				ritual.checkRecipe();
@@ -44,8 +49,8 @@ public class InfusionPedestal extends PedestalBlock {
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new InfusionPedestalEntity();
+		return new InfusionPedestalEntity(blockPos, blockState);
 	}
 
 	@Override
@@ -57,7 +62,7 @@ public class InfusionPedestal extends PedestalBlock {
 	@Deprecated
 	public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
 		if (state.is(this)) {
-			switch(state.getValue(STATE)) {
+			switch (state.getValue(STATE)) {
 				case PEDESTAL_TOP: {
 					return SHAPE_PEDESTAL_TOP;
 				}
@@ -72,6 +77,12 @@ public class InfusionPedestal extends PedestalBlock {
 		return super.getShape(state, world, pos, context);
 	}
 
+	@Override
+	@Nullable
+	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
+		return InfusionPedestalEntity::tickEnity;
+	}
+
 	static {
 		VoxelShape basinUp = Block.box(2, 3, 2, 14, 4, 14);
 		VoxelShape basinDown = Block.box(0, 0, 0, 16, 3, 16);

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

@@ -1,12 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -25,6 +19,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.storage.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
@@ -35,6 +30,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.noise.OpenSimplexNoise;
 
+import java.util.List;
+import java.util.Optional;
+
 public class JellyshroomCapBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider, IColorProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.ItemStack;
@@ -21,6 +18,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class LanceleafBlock extends EndPlantBlock {
 
 	public static final EnumProperty<PentaShape> SHAPE = BlockProperties.PENTA_SHAPE;

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

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

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -22,6 +20,8 @@ import ru.bclib.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class LargeAmaranitaBlock extends EndPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	private static final VoxelShape SHAPE_BOTTOM = Block.box(4, 0, 4, 12, 14, 12);

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

@@ -1,8 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -31,6 +28,9 @@ import ru.betterend.blocks.EndBlockProperties.LumecornShape;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+
 @SuppressWarnings("deprecation")
 public class LumecornBlock extends BaseBlockNotFull implements IRenderTyped {
 	public static final EnumProperty<LumecornShape> SHAPE = EnumProperty.create("shape", LumecornShape.class);

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

@@ -1,20 +1,21 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import ru.betterend.blocks.basis.EndPlantWithAgeBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
+import java.util.Random;
+
 public class LumecornSeedBlock extends EndPlantWithAgeBlock {
 
 	@Override
 	public void growAdult(WorldGenLevel world, Random random, BlockPos pos) {
-		EndFeatures.LUMECORN.getFeature().place(world, null, random, pos, null);
+		EndFeatures.LUMECORN.getFeature().place(new FeaturePlaceContext<>(world, null, random, pos, null));
 	}
 
 	@Override

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.Queue;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -17,13 +14,14 @@ import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Queue;
+
 @SuppressWarnings("deprecation")
 public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeBlock() {
@@ -61,19 +59,21 @@ public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped
 				FluidState fluidState = world.getFluidState(blockPos2);
 				Material material = blockState.getMaterial();
 				if (fluidState.is(FluidTags.WATER)) {
-					if (blockState.getBlock() instanceof BucketPickup && ((BucketPickup) blockState.getBlock()).takeLiquid(world, blockPos2, blockState) != Fluids.EMPTY) {
+					if (blockState.getBlock() instanceof BucketPickup && !((BucketPickup) blockState.getBlock()).pickupBlock(world, blockPos2, blockState).isEmpty()) {
 						++i;
 						if (j < 6) {
 							queue.add(new Tuple<>(blockPos2, j + 1));
 						}
-					} else if (blockState.getBlock() instanceof LiquidBlock) {
+					}
+					else if (blockState.getBlock() instanceof LiquidBlock) {
 						world.setBlock(blockPos2, Blocks.AIR.defaultBlockState(), 3);
 						++i;
 						if (j < 6) {
 							queue.add(new Tuple<>(blockPos2, j + 1));
 						}
-					} else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
+					}
-						BlockEntity blockEntity = blockState.getBlock().isEntityBlock() ? world.getBlockEntity(blockPos2) : null;
+					else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
+						BlockEntity blockEntity = blockState.hasBlockEntity() ? world.getBlockEntity(blockPos2) : null;
 						dropResources(blockState, world, blockPos2, blockEntity);
 						world.setBlock(blockPos2, Blocks.AIR.defaultBlockState(), 3);
 						++i;

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -25,6 +23,8 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTyped {
 	public MengerSpongeWetBlock() {

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -21,6 +17,10 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseRotatedPillarBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 	public MossyDragonBoneBlock() {
@@ -45,15 +45,17 @@ public class MossyDragonBoneBlock extends BaseRotatedPillarBlock {
 
 	@Override
 	public boolean canSurvive(BlockState state, LevelReader worldView, BlockPos pos) {
-	      BlockPos blockPos = pos.above();
+		BlockPos blockPos = pos.above();
-	      BlockState blockState = worldView.getBlockState(blockPos);
+		BlockState blockState = worldView.getBlockState(blockPos);
-	      if (blockState.is(Blocks.SNOW) && blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
+		if (blockState.is(Blocks.SNOW) && blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
-	         return true;
+			return true;
-	      } else if (blockState.getFluidState().getAmount() == 8) {
+		}
-	         return false;
+		else if (blockState.getFluidState().getAmount() == 8) {
-	      } else {
+			return false;
-	         int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
+		}
-	         return i < 5;
+		else {
-	      }
+			int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
-	   }
+			return i < 5;
+		}
+	}
 }

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -20,6 +16,10 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.blocks.BaseBlock;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class MossyObsidian extends BaseBlock {
 	public MossyObsidian() {
 		super(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).hardness(3).randomTicks());
@@ -42,15 +42,17 @@ public class MossyObsidian extends BaseBlock {
 	}
 
 	public boolean canSurvive(BlockState state, LevelReader worldView, BlockPos pos) {
-	      BlockPos blockPos = pos.above();
+		BlockPos blockPos = pos.above();
-	      BlockState blockState = worldView.getBlockState(blockPos);
+		BlockState blockState = worldView.getBlockState(blockPos);
-	      if (blockState.is(Blocks.SNOW) && (Integer)blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
+		if (blockState.is(Blocks.SNOW) && (Integer) blockState.getValue(SnowLayerBlock.LAYERS) == 1) {
-	         return true;
+			return true;
-	      } else if (blockState.getFluidState().getAmount() == 8) {
+		}
-	         return false;
+		else if (blockState.getFluidState().getAmount() == 8) {
-	      } else {
+			return false;
-	         int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
+		}
-	         return i < 5;
+		else {
-	      }
+			int i = LayerLightEngine.getLightBlockInto(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getLightBlock(worldView, blockPos));
-	   }
+			return i < 5;
+		}
+	}
 }

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -17,6 +15,8 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class MurkweedBlock extends EndPlantBlock {
 	@Override
 	@Environment(EnvType.CLIENT)

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
@@ -23,6 +20,8 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.List;
+
 public class NeedlegrassBlock extends EndPlantBlock {
 	@Override
 	public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
@@ -34,7 +33,7 @@ public class NeedlegrassBlock extends EndPlantBlock {
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && tool.is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {

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

@@ -1,12 +1,7 @@
 package ru.betterend.blocks;
 
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Random;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
@@ -48,6 +43,10 @@ import ru.bclib.util.MHelper;
 import ru.betterend.blocks.EndBlockProperties.CactusBottom;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 @SuppressWarnings("deprecation")
 public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWaterloggedBlock, IRenderTyped {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
@@ -273,7 +272,7 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate
 		while (iterState.is(this) && startDir.getAxis().isVertical()) {
 			startDir = iterState.getValue(FACING);
 			if (lastDir == null) {
-				for (Direction side: BlocksHelper.HORIZONTAL) {
+				for (Direction side : BlocksHelper.HORIZONTAL) {
 					BlockState sideState = world.getBlockState(iterPos.relative(side));
 					if (sideState.is(this)) {
 						Direction sideDir = sideState.getValue(FACING);
@@ -319,7 +318,7 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate
 				break;
 			}
 			dir = state.getValue(FACING).getOpposite();
-			length ++;
+			length++;
 		}
 		return length;
 	}
@@ -338,7 +337,7 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate
 			if (dir.getStepY() != 0) {
 				break;
 			}
-			count ++;
+			count++;
 		}
 		return count;
 	}
@@ -375,25 +374,25 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate
 		SMALL_SHAPES.put(Axis.Y, Block.box(4, 0, 4, 12, 16, 12));
 		SMALL_SHAPES.put(Axis.Z, Block.box(4, 4, 0, 12, 12, 16));
 
-		BIG_SHAPES_OPEN.put(Direction.UP,    Block.box(2, 0, 2, 14, 14, 14));
+		BIG_SHAPES_OPEN.put(Direction.UP, Block.box(2, 0, 2, 14, 14, 14));
-		BIG_SHAPES_OPEN.put(Direction.DOWN,  Block.box(2, 2, 2, 14, 16, 14));
+		BIG_SHAPES_OPEN.put(Direction.DOWN, Block.box(2, 2, 2, 14, 16, 14));
 		BIG_SHAPES_OPEN.put(Direction.NORTH, Block.box(2, 2, 2, 14, 14, 16));
 		BIG_SHAPES_OPEN.put(Direction.SOUTH, Block.box(2, 2, 0, 14, 14, 14));
-		BIG_SHAPES_OPEN.put(Direction.WEST,  Block.box(2, 2, 2, 16, 14, 14));
+		BIG_SHAPES_OPEN.put(Direction.WEST, Block.box(2, 2, 2, 16, 14, 14));
-		BIG_SHAPES_OPEN.put(Direction.EAST,  Block.box(0, 2, 2, 14, 14, 14));
+		BIG_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 2, 2, 14, 14, 14));
 
-		MEDIUM_SHAPES_OPEN.put(Direction.UP,    Block.box(3, 0, 3, 13, 13, 13));
+		MEDIUM_SHAPES_OPEN.put(Direction.UP, Block.box(3, 0, 3, 13, 13, 13));
-		MEDIUM_SHAPES_OPEN.put(Direction.DOWN,  Block.box(3, 3, 3, 13, 16, 13));
+		MEDIUM_SHAPES_OPEN.put(Direction.DOWN, Block.box(3, 3, 3, 13, 16, 13));
 		MEDIUM_SHAPES_OPEN.put(Direction.NORTH, Block.box(3, 3, 3, 13, 13, 16));
 		MEDIUM_SHAPES_OPEN.put(Direction.SOUTH, Block.box(3, 3, 0, 13, 13, 13));
-		MEDIUM_SHAPES_OPEN.put(Direction.WEST,  Block.box(3, 3, 3, 16, 13, 13));
+		MEDIUM_SHAPES_OPEN.put(Direction.WEST, Block.box(3, 3, 3, 16, 13, 13));
-		MEDIUM_SHAPES_OPEN.put(Direction.EAST,  Block.box(0, 3, 3, 13, 13, 13));
+		MEDIUM_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 3, 3, 13, 13, 13));
 
-		SMALL_SHAPES_OPEN.put(Direction.UP,    Block.box(4, 0, 4, 12, 12, 12));
+		SMALL_SHAPES_OPEN.put(Direction.UP, Block.box(4, 0, 4, 12, 12, 12));
-		SMALL_SHAPES_OPEN.put(Direction.DOWN,  Block.box(4, 4, 4, 12, 16, 12));
+		SMALL_SHAPES_OPEN.put(Direction.DOWN, Block.box(4, 4, 4, 12, 16, 12));
 		SMALL_SHAPES_OPEN.put(Direction.NORTH, Block.box(4, 4, 4, 12, 12, 16));
 		SMALL_SHAPES_OPEN.put(Direction.SOUTH, Block.box(4, 4, 0, 12, 12, 12));
-		SMALL_SHAPES_OPEN.put(Direction.WEST,  Block.box(4, 4, 4, 16, 12, 12));
+		SMALL_SHAPES_OPEN.put(Direction.WEST, Block.box(4, 4, 4, 16, 12, 12));
-		SMALL_SHAPES_OPEN.put(Direction.EAST,  Block.box(0, 4, 4, 12, 12, 12));
+		SMALL_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 4, 4, 12, 12, 12));
 	}
 }

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

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

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

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

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

@@ -1,11 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
@@ -35,6 +30,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.blocks.BlockProperties.TripleShape;
@@ -47,6 +43,8 @@ import ru.betterend.particle.InfusionParticleType;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.List;
+
 public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IRenderTyped {
 	private static final VoxelShape VOXEL_SHAPE_BOTTOM = Block.box(1, 0, 1, 15, 16, 15);
 	private static final VoxelShape VOXEL_SHAPE_MIDDLE_TOP = Block.box(2, 0, 2, 14, 16, 14);
@@ -193,10 +191,10 @@ public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IR
 				((ServerLevel) world).sendParticles(particle, px, py1, pz, 20, 0.14, 0.5, 0.14, 0.1);
 				((ServerLevel) world).sendParticles(particle, px, py2, pz, 20, 0.14, 0.3, 0.14, 0.1);
 			}
-            world.playSound(null, px, py, py, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1F, 1F);
+			world.playSound(null, px, py, py, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1F, 1F);
-            if (!player.isCreative()) {
+			if (!player.isCreative()) {
-            	itemStack.shrink(6);
+				itemStack.shrink(6);
-            }
+			}
 		}
 		return player.isCreative() ? InteractionResult.PASS : InteractionResult.sidedSuccess(world.isClientSide);
 	}

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Explosion;
@@ -18,17 +15,19 @@ import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.List;
+
 public class RunedFlavolite extends BaseBlock {
 	public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 
 	public RunedFlavolite(boolean unbreakable) {
 		super(FabricBlockSettings.copyOf(EndBlocks.FLAVOLITE.polished)
-			.strength(
+				.strength(
-				unbreakable ? -1 : 1,
+						unbreakable ? -1 : 1,
-				unbreakable ? Blocks.BEDROCK.getExplosionResistance() : Blocks.OBSIDIAN.getExplosionResistance()
+						unbreakable ? Blocks.BEDROCK.getExplosionResistance() : Blocks.OBSIDIAN.getExplosionResistance()
-			).luminance(state -> {
+				).luminance(state -> {
-			return state.getValue(ACTIVATED) ? 8 : 0;
+					return state.getValue(ACTIVATED) ? 8 : 0;
-		}));
+				}));
 		this.registerDefaultState(stateDefinition.any().setValue(ACTIVATED, false));
 	}
 

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -11,6 +9,8 @@ import net.minecraft.world.level.material.MaterialColor;
 import ru.betterend.blocks.basis.EndTerrainBlock;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 public class ShadowGrassBlock extends EndTerrainBlock {
 	public ShadowGrassBlock() {
 		super(MaterialColor.COLOR_BLACK);

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -36,6 +34,8 @@ import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
+import java.util.Random;
+
 public class SilkMothHiveBlock extends BaseBlock {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final IntegerProperty FULLNESS = EndBlockProperties.FULLNESS;
@@ -73,7 +73,9 @@ public class SilkMothHiveBlock extends BaseBlock {
 		if (!world.getBlockState(spawn).isAir()) {
 			return;
 		}
-		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { return true; }).size();
+		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> {
+			return true;
+		}).size();
 		if (count > 6) {
 			return;
 		}
@@ -89,7 +91,7 @@ public class SilkMothHiveBlock extends BaseBlock {
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
 		if (hand == InteractionHand.MAIN_HAND) {
 			ItemStack stack = player.getMainHandItem();
-			if (stack.getItem().is(FabricToolTags.SHEARS) && state.getValue(FULLNESS) == 3) {
+			if (stack.is(FabricToolTags.SHEARS) && state.getValue(FULLNESS) == 3) {
 				BlocksHelper.setWithUpdate(world, pos, state.setValue(FULLNESS, 0));
 				Direction dir = state.getValue(FACING);
 				double px = pos.getX() + dir.getStepX() + 0.5;

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -48,6 +44,10 @@ import ru.betterend.entity.SilkMothEntity;
 import ru.betterend.registry.EndEntities;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
 public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
 	public static final BooleanProperty ACTIVE = EndBlockProperties.ACTIVE;
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
@@ -134,7 +134,9 @@ public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
 		if (!world.getBlockState(spawn).isAir()) {
 			return;
 		}
-		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { return true; }).size();
+		int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> {
+			return true;
+		}).size();
 		if (count > 6) {
 			return;
 		}
@@ -150,7 +152,7 @@ public class SilkMothNestBlock extends BaseBlock implements IRenderTyped {
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
 		if (hand == InteractionHand.MAIN_HAND) {
 			ItemStack stack = player.getMainHandItem();
-			if (stack.getItem().is(FabricToolTags.SHEARS) && state.getValue(ACTIVE) && state.getValue(FULLNESS) == 3) {
+			if (stack.is(FabricToolTags.SHEARS) && state.getValue(ACTIVE) && state.getValue(FULLNESS) == 3) {
 				BlocksHelper.setWithUpdate(world, pos, state.setValue(FULLNESS, 0));
 				Direction dir = state.getValue(FACING);
 				double px = pos.getX() + dir.getStepX() + 0.5;

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BlockGetter;
@@ -9,6 +7,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -17,6 +16,8 @@ import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
+import java.util.Random;
+
 public class SmallAmaranitaBlock extends EndPlantBlock {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 10, 12);
 
@@ -29,7 +30,7 @@ public class SmallAmaranitaBlock extends EndPlantBlock {
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
 		BlockPos bigPos = growBig(world, pos);
 		if (bigPos != null) {
-			if (EndFeatures.GIGANTIC_AMARANITA.getFeature().place(world, null, random, bigPos, null)) {
+			if (EndFeatures.GIGANTIC_AMARANITA.getFeature().place(new FeaturePlaceContext<>(world, null, random, bigPos, null))) {
 				replaceMushroom(world, bigPos);
 				replaceMushroom(world, bigPos.south());
 				replaceMushroom(world, bigPos.east());
@@ -37,7 +38,7 @@ public class SmallAmaranitaBlock extends EndPlantBlock {
 			}
 			return;
 		}
-		EndFeatures.LARGE_AMARANITA.getFeature().place(world, null, random, pos, null);
+		EndFeatures.LARGE_AMARANITA.getFeature().place(new FeaturePlaceContext<>(world, null, random, pos, null));
 	}
 
 	@Override

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

@@ -1,12 +1,7 @@
 package ru.betterend.blocks;
 
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Random;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -23,6 +18,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.BonemealableBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
@@ -36,6 +32,10 @@ import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndFeatures;
 
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Random;
+
 public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderTyped, BonemealableBlock {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 
@@ -56,7 +56,7 @@ public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderT
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && tool.is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else {
@@ -99,6 +99,6 @@ public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderT
 	@Override
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
 		BlocksHelper.setWithUpdate(world, pos, Blocks.AIR);
-		EndFeatures.JELLYSHROOM.getFeature().place(world, null, random, pos, null);
+		EndFeatures.JELLYSHROOM.getFeature().place(new FeaturePlaceContext<>(world, null, random, pos, null));
 	}
 }

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

@@ -1,9 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.EnumMap;
-
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -32,6 +29,8 @@ import ru.bclib.blocks.BaseAttachedBlock;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 
+import java.util.EnumMap;
+
 @SuppressWarnings("deprecation")
 public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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

@@ -1,12 +1,7 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -41,6 +36,10 @@ import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
 
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+
 @SuppressWarnings("deprecation")
 public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTyped, SimpleWaterloggedBlock, LiquidBlockContainer {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.color.block.BlockColor;
@@ -18,6 +16,8 @@ import ru.bclib.util.ColorUtil;
 import ru.bclib.util.MHelper;
 import ru.betterend.registry.EndParticles;
 
+import java.util.Random;
+
 public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider {
 	public static final Vec3i[] COLORS;
 
@@ -30,7 +30,8 @@ public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider
 		return (state, world, pos, tintIndex) -> {
 			if (pos == null) {
 				pos = BlockPos.ZERO;
-			};
+			}
+			;
 			long i = (MHelper.getRandom(pos.getX(), pos.getZ()) & 63) + pos.getY();
 			double delta = i * 0.1;
 			int index = MHelper.floor(delta);
@@ -72,11 +73,11 @@ public class TenaneaFlowersBlock extends BaseVineBlock implements IColorProvider
 	}
 
 	static {
-		COLORS = new Vec3i[] {
+		COLORS = new Vec3i[]{
-			new Vec3i(250, 111, 222),
+				new Vec3i(250, 111, 222),
-			new Vec3i(167, 89, 255),
+				new Vec3i(167, 89, 255),
-			new Vec3i(120, 207, 239),
+				new Vec3i(120, 207, 239),
-			new Vec3i(255, 87, 182)
+				new Vec3i(255, 87, 182)
 		};
 	}
 }

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

@@ -14,7 +14,7 @@ public class TerrainPlantBlock extends EndPlantBlock {
 
 	@Override
 	protected boolean isTerrain(BlockState state) {
-		for (Block block: ground) {
+		for (Block block : ground) {
 			if (state.is(block)) {
 				return true;
 			}

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -14,6 +12,8 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class TwistedUmbrellaMossBlock extends EndPlantBlock {
 	public TwistedUmbrellaMossBlock() {
 		super(11);
@@ -25,23 +25,23 @@ public class TwistedUmbrellaMossBlock extends EndPlantBlock {
 	}
 
 	@Environment(EnvType.CLIENT)
-    public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
+	public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
-       return true;
+		return true;
-    }
+	}
 
-    @Environment(EnvType.CLIENT)
+	@Environment(EnvType.CLIENT)
-    public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
+	public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
-       return 1F;
+		return 1F;
-    }
+	}
 
-    @Override
+	@Override
 	public boolean isBonemealSuccess(Level world, Random random, BlockPos pos, BlockState state) {
 		return world.isEmptyBlock(pos.above());
 	}
 
-    @Override
+	@Override
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
-    	int rot = world.random.nextInt(4);
+		int rot = world.random.nextInt(4);
 		BlockState bs = EndBlocks.TWISTED_UMBRELLA_MOSS_TALL.defaultBlockState().setValue(BaseDoublePlantBlock.ROTATION, rot);
 		BlocksHelper.setWithoutUpdate(world, pos, bs);
 		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true));

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

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

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.core.BlockPos;
@@ -14,6 +12,8 @@ import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.basis.EndPlantBlock;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Random;
+
 public class UmbrellaMossBlock extends EndPlantBlock {
 	public UmbrellaMossBlock() {
 		super(11);
@@ -25,23 +25,23 @@ public class UmbrellaMossBlock extends EndPlantBlock {
 	}
 
 	@Environment(EnvType.CLIENT)
-    public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
+	public boolean hasEmissiveLighting(BlockGetter world, BlockPos pos) {
-       return true;
+		return true;
-    }
+	}
 
-    @Environment(EnvType.CLIENT)
+	@Environment(EnvType.CLIENT)
-    public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
+	public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) {
-       return 1F;
+		return 1F;
-    }
+	}
 
-    @Override
+	@Override
 	public boolean isBonemealSuccess(Level world, Random random, BlockPos pos, BlockState state) {
 		return world.isEmptyBlock(pos.above());
 	}
 
-    @Override
+	@Override
 	public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) {
-    	int rot = world.random.nextInt(4);
+		int rot = world.random.nextInt(4);
 		BlockState bs = EndBlocks.UMBRELLA_MOSS_TALL.defaultBlockState().setValue(BaseDoublePlantBlock.ROTATION, rot);
 		BlocksHelper.setWithoutUpdate(world, pos, bs);
 		BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true));

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

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

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

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

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

@@ -1,10 +1,6 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -29,6 +25,9 @@ import ru.bclib.util.MHelper;
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Collections;
+import java.util.List;
+
 public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTyped, BlockModelProvider {
 	public static final IntegerProperty COLOR = EndBlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);

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

@@ -1,7 +1,5 @@
 package ru.betterend.blocks;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -9,9 +7,12 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
@@ -32,15 +33,18 @@ import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Optional;
+import java.util.Random;
+
 public class VentBubbleColumnBlock extends Block implements BucketPickup, LiquidBlockContainer {
 	public VentBubbleColumnBlock() {
 		super(FabricBlockSettings.of(Material.BUBBLE_COLUMN).noOcclusion().noCollission().noDrops());
 	}
 
 	@Override
-	public Fluid takeLiquid(LevelAccessor world, BlockPos pos, BlockState state) {
+	public ItemStack pickupBlock(LevelAccessor world, BlockPos pos, BlockState state) {
 		world.setBlock(pos, Blocks.AIR.defaultBlockState(), 11);
-		return Fluids.WATER;
+		return new ItemStack(Items.WATER_BUCKET);
 	}
 
 	@Override
@@ -120,4 +124,10 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid
 	public FluidState getFluidState(BlockState state) {
 		return Fluids.WATER.getSource(false);
 	}
+
+
+	@Override
+	public Optional<SoundEvent> getPickupSound() {
+		return Fluids.WATER.getPickupSound();
+	}
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,7 @@
 package ru.betterend.blocks.basis;
 
-import java.util.EnumMap;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.core.BlockPos;
@@ -28,6 +24,9 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.util.MHelper;
 
+import java.util.EnumMap;
+import java.util.List;
+
 public class FurBlock extends BaseAttachedBlock implements IRenderTyped {
 	private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
 	private final ItemLike drop;
@@ -62,7 +61,7 @@ public class FurBlock extends BaseAttachedBlock implements IRenderTyped {
 	@Override
 	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
-		if (tool != null && tool.getItem().is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
+		if (tool != null && tool.is(FabricToolTags.SHEARS) || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Lists.newArrayList(new ItemStack(this));
 		}
 		else if (dropChance < 1 || MHelper.RANDOM.nextInt(dropChance) == 0) {

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

@@ -1,15 +1,6 @@
 package ru.betterend.blocks.basis;
 
-import java.awt.Point;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Lists;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -32,6 +23,8 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -42,18 +35,27 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.client.models.ModelsHelper;
 import ru.betterend.blocks.EndBlockProperties;
 import ru.betterend.blocks.EndBlockProperties.PedestalState;
 import ru.betterend.blocks.InfusionPedestal;
+import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
 import ru.betterend.blocks.entities.InfusionPedestalEntity;
 import ru.betterend.blocks.entities.PedestalBlockEntity;
 import ru.betterend.client.models.Patterns;
+import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.rituals.InfusionRitual;
 
+import java.awt.Point;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 @SuppressWarnings({"deprecation"})
 public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	public final static EnumProperty<PedestalState> STATE = EndBlockProperties.PEDESTAL_STATE;
@@ -68,10 +70,9 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	private static final VoxelShape SHAPE_BOTTOM;
 
 	/**
-	 * 
 	 * Register new Pedestal block with Better End mod id.
 	 *
-	 * @param name pedestal name
+	 * @param name   pedestal name
 	 * @param source source block
 	 * @return new Pedestal block with Better End id.
 	 */
@@ -80,10 +81,9 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	}
 
 	/**
-	 * 
 	 * Register new Pedestal block with specified mod id.
 	 *
-	 * @param id pedestal id
+	 * @param id     pedestal id
 	 * @param source source block
 	 * @return new Pedestal block with specified id.
 	 */
@@ -123,7 +123,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 				pedestal.setItem(0, itemStack);
 				checkRitual(world, pos);
 				return InteractionResult.SUCCESS;
-			} else {
+			}
+			else {
 				ItemStack itemStack = pedestal.getItem(0);
 				if (player.addItem(itemStack)) {
 					pedestal.removeItemNoUpdate(0);
@@ -139,7 +140,7 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	@Override
 	public void destroy(LevelAccessor levelAccessor, BlockPos blockPos, BlockState blockState) {
 		MutableBlockPos posMutable = new MutableBlockPos();
-		for (Point point: InfusionRitual.getMap()) {
+		for (Point point : InfusionRitual.getMap()) {
 			posMutable.set(blockPos).move(point.x, 0, point.y);
 			BlockState state = levelAccessor.getBlockState(posMutable);
 			if (state.getBlock() instanceof InfusionPedestal) {
@@ -157,7 +158,7 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 
 	public void checkRitual(Level world, BlockPos pos) {
 		MutableBlockPos posMutable = new MutableBlockPos();
-		for (Point point: InfusionRitual.getMap()) {
+		for (Point point : InfusionRitual.getMap()) {
 			posMutable.set(pos).move(point.x, 0, point.y);
 			BlockState state = world.getBlockState(posMutable);
 			if (state.getBlock() instanceof InfusionPedestal) {
@@ -179,13 +180,17 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		boolean hasPedestalUnder = downState.getBlock() instanceof PedestalBlock;
 		if (!hasPedestalOver && hasPedestalUnder && upSideSolid) {
 			return defaultBlockState().setValue(STATE, PedestalState.COLUMN_TOP);
-		} else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
+		}
+		else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
 			return defaultBlockState().setValue(STATE, PedestalState.COLUMN);
-		} else if (hasPedestalUnder && hasPedestalOver) {
+		}
+		else if (hasPedestalUnder && hasPedestalOver) {
 			return defaultBlockState().setValue(STATE, PedestalState.PILLAR);
-		} else if (hasPedestalUnder) {
+		}
+		else if (hasPedestalUnder) {
 			return defaultBlockState().setValue(STATE, PedestalState.PEDESTAL_TOP);
-		} else if (hasPedestalOver) {
+		}
+		else if (hasPedestalOver) {
 			return defaultBlockState().setValue(STATE, PedestalState.BOTTOM);
 		}
 		return defaultBlockState();
@@ -213,21 +218,27 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		if (direction == Direction.UP) {
 			upSideSolid = newState.isFaceSturdy(world, posFrom, Direction.DOWN) || newState.is(BlockTags.WALLS);
 			hasPedestalOver = newState.getBlock() instanceof PedestalBlock;
-		} else {
+		}
+		else {
 			hasPedestalUnder = newState.getBlock() instanceof PedestalBlock;
 		}
 		BlockState updatedState;
 		if (!hasPedestalOver && hasPedestalUnder && upSideSolid) {
 			updatedState = state.setValue(STATE, PedestalState.COLUMN_TOP);
-		} else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
+		}
+		else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) {
 			updatedState = state.setValue(STATE, PedestalState.COLUMN);
-		} else if (hasPedestalUnder && hasPedestalOver) {
+		}
+		else if (hasPedestalUnder && hasPedestalOver) {
 			updatedState = state.setValue(STATE, PedestalState.PILLAR);
-		} else if (hasPedestalUnder) {
+		}
+		else if (hasPedestalUnder) {
 			updatedState = state.setValue(STATE, PedestalState.PEDESTAL_TOP);
-		} else if (hasPedestalOver) {
+		}
+		else if (hasPedestalOver) {
 			updatedState = state.setValue(STATE, PedestalState.BOTTOM);
-		} else {
+		}
+		else {
 			updatedState = state.setValue(STATE, PedestalState.DEFAULT);
 		}
 		if (!isPlaceable(updatedState)) {
@@ -248,7 +259,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 						drop.add(pedestal.getItem(0));
 					}
 				}
-			} else {
+			}
+			else {
 				return drop;
 			}
 		}
@@ -270,18 +282,23 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		BlockState state = world.getBlockState(pos);
 		if (!state.is(this)) {
 			dropStoredStack(blockEntity, stack, pos);
-		} else if (state.getValue(STATE).equals(PedestalState.PILLAR)) {
+		}
+		else if (state.getValue(STATE).equals(PedestalState.PILLAR)) {
 			moveStoredStack(blockEntity, world, stack, pos.above());
-		} else if (!isPlaceable(state)) {
+		}
+		else if (!isPlaceable(state)) {
 			dropStoredStack(blockEntity, stack, pos);
-		} else if (blockEntity instanceof PedestalBlockEntity) {
+		}
+		else if (blockEntity instanceof PedestalBlockEntity) {
 			PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity;
 			if (pedestal.isEmpty()) {
 				pedestal.setItem(0, stack);
-			} else {
+			}
+			else {
 				dropStoredStack(blockEntity, stack, pos);
 			}
-		} else {
+		}
+		else {
 			dropStoredStack(blockEntity, stack, pos);
 		}
 	}
@@ -301,7 +318,7 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		if (world.getBlockState(pos.above()).isAir()) {
 			return pos.above();
 		}
-		for(int i = 2; i < Direction.values().length; i++) {
+		for (int i = 2; i < Direction.values().length; i++) {
 			dropPos = pos.relative(Direction.from3DDataValue(i));
 			if (world.getBlockState(dropPos).isAir()) {
 				return dropPos.immutable();
@@ -314,14 +331,14 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		if (!state.is(this)) return false;
 		PedestalState currentState = state.getValue(STATE);
 		return currentState == PedestalState.DEFAULT ||
-			   currentState == PedestalState.PEDESTAL_TOP;
+				currentState == PedestalState.PEDESTAL_TOP;
 	}
 
 	@Override
 	@Deprecated
 	public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
 		if (state.is(this)) {
-			switch(state.getValue(STATE)) {
+			switch (state.getValue(STATE)) {
 				case BOTTOM: {
 					return SHAPE_BOTTOM;
 				}
@@ -351,8 +368,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 	}
 
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new PedestalBlockEntity();
+		return new PedestalBlockEntity(blockPos, blockState);
 	}
 
 	public boolean hasUniqueEntity() {
@@ -399,7 +416,8 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 			case PILLAR:
 				pattern = Patterns.createJson(Patterns.BLOCK_PEDESTAL_PILLAR, textures);
 				break;
-			default: break;
+			default:
+				break;
 		}
 		return ModelsHelper.fromPattern(pattern);
 	}
@@ -419,8 +437,9 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		String name = blockId.getPath();
 		return new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
+
 			{
-				put("%mod%", blockId.getNamespace() );
+				put("%mod%", blockId.getNamespace());
 				put("%top%", name + "_top");
 				put("%base%", name + "_base");
 				put("%pillar%", name + "_pillar");
@@ -447,4 +466,10 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
 		SHAPE_COLUMN = Shapes.or(basin, SHAPE_PILLAR, columnTop);
 		SHAPE_BOTTOM = Shapes.or(basin, SHAPE_PILLAR);
 	}
+
+	@Override
+	@Nullable
+	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
+		return level.isClientSide() ? PedestalBlockEntity::tick : null;
+	}
 }

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

@@ -1,9 +1,5 @@
 package ru.betterend.blocks.basis;
 
-import java.util.Optional;
-
-import org.jetbrains.annotations.Nullable;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -17,11 +13,14 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.IColorProvider;
 import ru.betterend.client.models.Patterns;
 import ru.betterend.registry.EndBlocks;
 
+import java.util.Optional;
+
 public class StoneLanternBlock extends EndLanternBlock implements IColorProvider {
 	private static final VoxelShape SHAPE_CEIL = Block.box(3, 1, 3, 13, 16, 13);
 	private static final VoxelShape SHAPE_FLOOR = Block.box(3, 0, 3, 13, 15, 13);

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

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

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

@@ -3,6 +3,7 @@ package ru.betterend.blocks.complex;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.Tag;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ArmorMaterial;
 import net.minecraft.world.item.Item;
@@ -14,10 +15,12 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MaterialColor;
+import ru.bclib.api.TagAPI;
 import ru.bclib.blocks.BaseBlock;
 import ru.bclib.blocks.BaseChainBlock;
 import ru.bclib.blocks.BaseDoorBlock;
 import ru.bclib.blocks.BaseMetalBarsBlock;
+import ru.bclib.blocks.BaseOreBlock;
 import ru.bclib.blocks.BaseSlabBlock;
 import ru.bclib.blocks.BaseStairsBlock;
 import ru.bclib.blocks.BaseTrapdoorBlock;
@@ -25,7 +28,6 @@ import ru.bclib.blocks.WoodenPressurePlateBlock;
 import ru.bclib.items.ModelProviderItem;
 import ru.bclib.items.tool.BaseAxeItem;
 import ru.bclib.items.tool.BaseHoeItem;
-import ru.bclib.items.tool.BasePickaxeItem;
 import ru.bclib.items.tool.BaseShovelItem;
 import ru.bclib.items.tool.BaseSwordItem;
 import ru.bclib.recipes.FurnaceRecipe;
@@ -41,11 +43,11 @@ import ru.betterend.config.Configs;
 import ru.betterend.item.EndAnvilItem;
 import ru.betterend.item.EndArmorItem;
 import ru.betterend.item.tool.EndHammerItem;
+import ru.betterend.item.tool.EndPickaxe;
 import ru.betterend.recipe.builders.AlloyingRecipe;
 import ru.betterend.recipe.builders.AnvilRecipe;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndItems;
-import ru.betterend.registry.EndTags;
 
 public class MetalMaterial {
 	public final Block ore;
@@ -66,6 +68,7 @@ public class MetalMaterial {
 	public final Block anvilBlock;
 	public final Item anvilItem;
 
+	public final Item rawOre;
 	public final Item nugget;
 	public final Item ingot;
 
@@ -89,6 +92,8 @@ public class MetalMaterial {
 	public final Item leggings;
 	public final Item boots;
 
+	public final Tag.Named<Item> alloyingOre;
+
 	public static MetalMaterial makeNormal(String name, MaterialColor color, Tier material, ArmorMaterial armor) {
 		return new MetalMaterial(name, true, FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(color), EndItems.makeEndItemSettings(), material, armor);
 	}
@@ -109,7 +114,13 @@ public class MetalMaterial {
 		BlockBehaviour.Properties lanternProperties = FabricBlockSettings.copyOf(settings).hardness(1).resistance(1).luminance(15).sound(SoundType.LANTERN);
 		final int level = material.getLevel();
 
-		ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseBlock(FabricBlockSettings.copyOf(Blocks.END_STONE))) : null;
+		rawOre = hasOre ? EndItems.registerEndItem(name + "_raw", new ModelProviderItem(itemSettings)) : null;
+		ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(rawOre, 1, 3, 1)) : null;
+		alloyingOre = hasOre ? TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_alloying") : null;
+		if (hasOre) {
+			TagHelper.addTag(alloyingOre, ore, rawOre);
+		}
+
 		block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings));
 		tile = EndBlocks.registerBlock(name + "_tile", new BaseBlock(settings));
 		stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(tile));
@@ -136,7 +147,7 @@ public class MetalMaterial {
 
 		shovel = EndItems.registerEndTool(name + "_shovel", new BaseShovelItem(material, 1.5F, -3.0F, itemSettings));
 		sword = EndItems.registerEndTool(name + "_sword", new BaseSwordItem(material, 3, -2.4F, itemSettings));
-		pickaxe = EndItems.registerEndTool(name + "_pickaxe", new BasePickaxeItem(material, 1, -2.8F, itemSettings));
+		pickaxe = EndItems.registerEndTool(name + "_pickaxe", new EndPickaxe(material, 1, -2.8F, itemSettings));
 		axe = EndItems.registerEndTool(name + "_axe", new BaseAxeItem(material, 6.0F, -3.0F, itemSettings));
 		hoe = EndItems.registerEndTool(name + "_hoe", new BaseHoeItem(material, -3, 0.0F, itemSettings));
 		hammer = EndItems.registerEndTool(name + "_hammer", new EndHammerItem(material, 5.0F, -3.2F, 0.3D, itemSettings));
@@ -151,8 +162,9 @@ public class MetalMaterial {
 		anvilItem = EndItems.registerEndItem(name + "_anvil_item", new EndAnvilItem(anvilBlock));
 
 		if (hasOre) {
-			FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_ingot_furnace", ore, ingot).checkConfig(Configs.RECIPE_CONFIG).setGroup("end_ingot").buildWithBlasting();
+			FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_ingot_furnace_ore", ore, ingot).checkConfig(Configs.RECIPE_CONFIG).setGroup("end_ingot").buildWithBlasting();
-			AlloyingRecipe.Builder.create(name + "_ingot_alloy").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build();
+			FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_ingot_furnace_raw", rawOre, ingot).checkConfig(Configs.RECIPE_CONFIG).setGroup("end_ingot").buildWithBlasting();
+			AlloyingRecipe.Builder.create(name + "_ingot_alloy").setInput(alloyingOre, alloyingOre).setOutput(ingot, 3).setExpiriense(2.1F).build();
 		}
 
 		// Basic recipes
@@ -212,6 +224,7 @@ public class MetalMaterial {
 		TagHelper.addTag(BlockTags.ANVIL, anvilBlock);
 		TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, block);
 		TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, ingot);
-		TagHelper.addTag(EndTags.DRAGON_IMMUNE, ore, bars);
+		TagHelper.addTag(TagAPI.DRAGON_IMMUNE, ore, bars);
+		TagHelper.addTag(TagAPI.HAMMERS, hammer);
 	}
 }

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

@@ -1,7 +1,6 @@
 package ru.betterend.blocks.entities;
 
-import java.util.List;
+import net.minecraft.core.BlockPos;
-
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
@@ -9,8 +8,8 @@ import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.TickableBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
@@ -20,48 +19,54 @@ import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndParticles;
 
-public class BlockEntityHydrothermalVent extends BlockEntity implements TickableBlockEntity {
+import java.util.List;
 
+public class BlockEntityHydrothermalVent extends BlockEntity {
 	private final static Vec3 POSITIVE_Y = new Vec3(0.0f, 1.0f, 0.0f);
+	private static final MutableBlockPos POS = new MutableBlockPos();
 
-	public BlockEntityHydrothermalVent() {
+	public BlockEntityHydrothermalVent(BlockPos blockPos, BlockState blockState) {
-		super(EndBlockEntities.HYDROTHERMAL_VENT);
+		super(EndBlockEntities.HYDROTHERMAL_VENT, blockPos, blockState);
 	}
 
-	@Override
+	public static <T extends BlockEntity> void tick(Level level, BlockPos worldPosition, BlockState state, T uncastedEntity) {
-	public void tick() {
+		if (level != null && uncastedEntity instanceof BlockEntityHydrothermalVent && state.is(EndBlocks.HYDROTHERMAL_VENT)) {
-		if (level != null) {
+			BlockEntityHydrothermalVent blockEntity = (BlockEntityHydrothermalVent) uncastedEntity;
-			BlockState state = getBlockState();
+			if (level.isClientSide()) {
-			if (state.is(EndBlocks.HYDROTHERMAL_VENT)) {
+				clientTick(level, worldPosition, state, blockEntity);
-				boolean active = state.getValue(HydrothermalVentBlock.ACTIVATED);
+			}
-				if (active && level.random.nextInt(20) == 0) {
+			//else {
-					double x = worldPosition.getX() + level.random.nextDouble();
+				serverTick(level, worldPosition, state, blockEntity);
-					double y = worldPosition.getY() + 0.9 + level.random.nextDouble() * 0.3;
+			//}
-					double z = worldPosition.getZ() + level.random.nextDouble();
+		}
-					if (state.getValue(HydrothermalVentBlock.WATERLOGGED)) {
+	}
-						level.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0);
+
-					} else {
+	private static void clientTick(Level level, BlockPos worldPosition, BlockState state, BlockEntityHydrothermalVent blockEntity) {
-						level.addParticle(ParticleTypes.BUBBLE, x, y, z, 0, 0, 0);
+		boolean active = state.getValue(HydrothermalVentBlock.ACTIVATED);
-					}
+		if (active && level.random.nextInt(20) == 0 && state.getValue(HydrothermalVentBlock.WATERLOGGED)) {
-				}
+			double x = worldPosition.getX() + level.random.nextDouble();
-				MutableBlockPos mutable = worldPosition.mutable().move(Direction.UP);
+			double y = worldPosition.getY() + 0.9 + level.random.nextDouble() * 0.3;
-				int height = active ? 85 : 25;
+			double z = worldPosition.getZ() + level.random.nextDouble();
-				AABB box = new AABB(mutable.offset(-1, 0, -1), mutable.offset(1, height, 1));
+			level.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0);
-				List<LivingEntity> entities = level.getEntitiesOfClass(LivingEntity.class, box);
+		}
-				if (entities.size() > 0) {
+	}
-					while (mutable.getY() < box.maxY) {
+
-						BlockState blockState = level.getBlockState(mutable);
+	private static void serverTick(Level level, BlockPos worldPosition, BlockState state, BlockEntityHydrothermalVent blockEntity) {
-						if (blockState.isSolidRender(level, mutable)) break;
+		boolean active = state.getValue(HydrothermalVentBlock.ACTIVATED);
-						if (blockState.isAir()) {
+		POS.set(worldPosition).move(Direction.UP);
-							double mult = active ? 3.0 : 5.0;
+		int height = active ? 85 : 25;
-							float force = (float) ((1.0 - (mutable.getY() / box.maxY)) / mult);
+		AABB box = new AABB(POS.offset(-1, 0, -1), POS.offset(1, height, 1));
-							entities.stream().filter(entity -> (int) entity.getY() == mutable.getY() &&
+		List<LivingEntity> entities = level.getEntitiesOfClass(LivingEntity.class, box);
-									hasElytra(entity) && entity.isFallFlying())
+		if (entities.size() > 0) {
-									.forEach(entity -> entity.moveRelative(force, POSITIVE_Y));
+			while (POS.getY() < box.maxY) {
-						}
+				BlockState blockState = level.getBlockState(POS);
-						mutable.move(Direction.UP);
+				if (blockState.isSolidRender(level, POS)) break;
-					}
+				if (blockState.isAir()) {
+					double mult = active ? 3.0 : 5.0;
+					float force = (float) ((1.0 - (POS.getY() / box.maxY)) / mult);
+					entities.stream().filter(entity -> (int) entity.getY() == POS.getY() && blockEntity.hasElytra(entity) && entity.isFallFlying()).forEach(entity -> entity.moveRelative(force, POSITIVE_Y));
 				}
+				POS.move(Direction.UP);
 			}
 		}
 	}

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

@@ -1,15 +1,11 @@
 package ru.betterend.blocks.entities;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
@@ -37,7 +33,6 @@ import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
-import net.minecraft.world.level.block.entity.TickableBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import ru.betterend.BetterEnd;
@@ -46,11 +41,15 @@ import ru.betterend.client.gui.EndStoneSmelterScreenHandler;
 import ru.betterend.recipe.builders.AlloyingRecipe;
 import ru.betterend.registry.EndBlockEntities;
 
-public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity implements WorldlyContainer, RecipeHolder, StackedContentsCompatible, TickableBlockEntity {
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
-	private static final int[] TOP_SLOTS = new int[] { 0, 1 };
+public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity implements WorldlyContainer, RecipeHolder, StackedContentsCompatible {
-	private static final int[] BOTTOM_SLOTS = new int[] { 2, 3 };
+
-	private static final int[] SIDE_SLOTS = new int[] { 1, 2 };
+	private static final int[] TOP_SLOTS = new int[]{0, 1};
+	private static final int[] BOTTOM_SLOTS = new int[]{2, 3};
+	private static final int[] SIDE_SLOTS = new int[]{1, 2};
 	private static final Map<Item, Integer> AVAILABLE_FUELS = Maps.newHashMap();
 
 	private final Object2IntOpenHashMap<ResourceLocation> recipesUsed;
@@ -62,46 +61,46 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 	private int burnTime;
 	private int fuelTime;
 
-	public EndStoneSmelterBlockEntity() {
+	public EndStoneSmelterBlockEntity(BlockPos blockPos, BlockState blockState) {
-		super(EndBlockEntities.END_STONE_SMELTER);
+		super(EndBlockEntities.END_STONE_SMELTER, blockPos, blockState);
 		this.inventory = NonNullList.withSize(4, ItemStack.EMPTY);
 		this.recipesUsed = new Object2IntOpenHashMap<>();
-		 this.propertyDelegate = new ContainerData() {
+		this.propertyDelegate = new ContainerData() {
-		 	public int get(int index) {
+			public int get(int index) {
-		 		switch(index) {
+				switch (index) {
-			 		case 0:
+					case 0:
-			 			return EndStoneSmelterBlockEntity.this.burnTime;
+						return EndStoneSmelterBlockEntity.this.burnTime;
-			 		case 1:
+					case 1:
-			 			return EndStoneSmelterBlockEntity.this.fuelTime;
+						return EndStoneSmelterBlockEntity.this.fuelTime;
-			 		case 2:
+					case 2:
-			 			return EndStoneSmelterBlockEntity.this.smeltTime;
+						return EndStoneSmelterBlockEntity.this.smeltTime;
-			 		case 3:
+					case 3:
-			 			return EndStoneSmelterBlockEntity.this.smeltTimeTotal;
+						return EndStoneSmelterBlockEntity.this.smeltTimeTotal;
-			 		default:
+					default:
-			 			return 0;
+						return 0;
-		 		}
+				}
-		 	}
+			}
 
-		 	public void set(int index, int value) {
+			public void set(int index, int value) {
-		 		switch(index) {
+				switch (index) {
-			 		case 0:
+					case 0:
-			 			EndStoneSmelterBlockEntity.this.burnTime = value;
+						EndStoneSmelterBlockEntity.this.burnTime = value;
-			 			break;
+						break;
-			 		case 1:
+					case 1:
-			 			EndStoneSmelterBlockEntity.this.fuelTime = value;
+						EndStoneSmelterBlockEntity.this.fuelTime = value;
-			 			break;
+						break;
-			 		case 2:
+					case 2:
-			 			EndStoneSmelterBlockEntity.this.smeltTime = value;
+						EndStoneSmelterBlockEntity.this.smeltTime = value;
-			 			break;
+						break;
-			 		case 3:
+					case 3:
-			 			EndStoneSmelterBlockEntity.this.smeltTimeTotal = value;
+						EndStoneSmelterBlockEntity.this.smeltTimeTotal = value;
-		 		}
+				}
-		 	}
+			}
 
-		 	public int getCount() {
+			public int getCount() {
-		 		return 4;
+				return 4;
-		 	}
+			}
-		 };
+		};
 	}
 
 	private boolean isBurning() {
@@ -122,7 +121,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				return true;
 			}
 			itemStack = iterator.next();
-		} while (itemStack.isEmpty());
+		}
+		while (itemStack.isEmpty());
 
 		return false;
 	}
@@ -163,7 +163,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				.map(AlloyingRecipe::getSmeltTime).orElse(0);
 		if (smeltTime == 0) {
 			smeltTime = level.getRecipeManager().getRecipeFor(RecipeType.BLASTING, this, level)
-				.map(BlastingRecipe::getCookingTime).orElse(200);
+					.map(BlastingRecipe::getCookingTime).orElse(200);
 			smeltTime /= 1.5;
 		}
 		return smeltTime;
@@ -178,7 +178,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 				if (recipe instanceof AlloyingRecipe) {
 					AlloyingRecipe alloying = (AlloyingRecipe) recipe;
 					dropExperience(player.level, player.position(), entry.getIntValue(), alloying.getExperience());
-				} else {
+				}
+				else {
 					BlastingRecipe blasting = (BlastingRecipe) recipe;
 					dropExperience(player.level, player.position(), entry.getIntValue(), blasting.getExperience());
 				}
@@ -195,7 +196,7 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 			expTotal++;
 		}
 
-		while(expTotal > 0) {
+		while (expTotal > 0) {
 			int expVal = ExperienceOrb.getExperienceValue(expTotal);
 			expTotal -= expVal;
 			world.addFreshEntity(new ExperienceOrb(world, vec3d.x, vec3d.y, vec3d.z, expVal));
@@ -225,61 +226,62 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		return new EndStoneSmelterScreenHandler(syncId, playerInventory, this, propertyDelegate);
 	}
 
-	@Override
+	public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, EndStoneSmelterBlockEntity blockEntity) {
-	public void tick() {
+		if (tickLevel == null) return;
-		if (level == null) return;
 
-		boolean initialBurning = isBurning();
+		boolean initialBurning = blockEntity.isBurning();
 		if (initialBurning) {
-			burnTime--;
+			blockEntity.burnTime--;
 		}
 
 		boolean burning = initialBurning;
-		if (!level.isClientSide) {
+		if (!tickLevel.isClientSide) {
-			ItemStack fuel = inventory.get(2);
+			ItemStack fuel = blockEntity.inventory.get(2);
-			if (!burning && (fuel.isEmpty() || inventory.get(0).isEmpty() && inventory.get(1).isEmpty())) {
+			if (!burning && (fuel.isEmpty() || blockEntity.inventory.get(0).isEmpty() && blockEntity.inventory.get(1).isEmpty())) {
-				if (smeltTime > 0) {
+				if (blockEntity.smeltTime > 0) {
-					smeltTime = Mth.clamp(smeltTime - 2, 0, smeltTimeTotal);
+					blockEntity.smeltTime = Mth.clamp(blockEntity.smeltTime - 2, 0, blockEntity.smeltTimeTotal);
 				}
-			} else {
+			}
-				Recipe<?> recipe = level.getRecipeManager().getRecipeFor(AlloyingRecipe.TYPE, this, level).orElse(null);
+			else {
+				Recipe<?> recipe = tickLevel.getRecipeManager().getRecipeFor(AlloyingRecipe.TYPE, blockEntity, tickLevel).orElse(null);
 				if (recipe == null) {
-					recipe = level.getRecipeManager().getRecipeFor(RecipeType.BLASTING, this, level).orElse(null);
+					recipe = tickLevel.getRecipeManager().getRecipeFor(RecipeType.BLASTING, blockEntity, tickLevel).orElse(null);
 				}
-				boolean accepted = canAcceptRecipeOutput(recipe);
+				boolean accepted = blockEntity.canAcceptRecipeOutput(recipe);
 				if (!burning && accepted) {
-					burnTime = getFuelTime(fuel);
+					blockEntity.burnTime = blockEntity.getFuelTime(fuel);
-					fuelTime = burnTime;
+					blockEntity.fuelTime = blockEntity.burnTime;
-					burning = isBurning();
+					burning = blockEntity.isBurning();
 					if (burning) {
 						if (!fuel.isEmpty()) {
 							Item item = fuel.getItem();
 							fuel.shrink(1);
 							if (fuel.isEmpty()) {
 								Item remainFuel = item.getCraftingRemainingItem();
-								inventory.set(2, remainFuel == null ? ItemStack.EMPTY : new ItemStack(remainFuel));
+								blockEntity.inventory.set(2, remainFuel == null ? ItemStack.EMPTY : new ItemStack(remainFuel));
 							}
 						}
-						setChanged();
+						blockEntity.setChanged();
 					}
 				}
 
 				if (burning && accepted) {
-					smeltTime++;
+					blockEntity.smeltTime++;
-					if (smeltTime == smeltTimeTotal) {
+					if (blockEntity.smeltTime == blockEntity.smeltTimeTotal) {
-						smeltTime = 0;
+						blockEntity.smeltTime = 0;
-						smeltTimeTotal = getSmeltTime();
+						blockEntity.smeltTimeTotal = blockEntity.getSmeltTime();
-						craftRecipe(recipe);
+						blockEntity.craftRecipe(recipe);
-						setChanged();
+						blockEntity.setChanged();
 					}
-				} else {
+				}
-					smeltTime = 0;
+				else {
+					blockEntity.smeltTime = 0;
 				}
 			}
-			burning = isBurning();
+			burning = blockEntity.isBurning();
 			if (initialBurning != burning) {
-				level.setBlock(worldPosition, level.getBlockState(worldPosition).setValue(EndStoneSmelter.LIT, burning), 3);
+				tickLevel.setBlock(tickPos, tickState.setValue(EndStoneSmelter.LIT, burning), 3);
-				setChanged();
+				blockEntity.setChanged();
 			}
 		}
 	}
@@ -290,7 +292,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		if (recipe instanceof AlloyingRecipe) {
 			validInput = !inventory.get(0).isEmpty() &&
 					!inventory.get(1).isEmpty();
-		} else {
+		}
+		else {
 			validInput = !inventory.get(0).isEmpty() ||
 					!inventory.get(1).isEmpty();
 		}
@@ -323,7 +326,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		ItemStack output = inventory.get(3);
 		if (output.isEmpty()) {
 			inventory.set(3, result.copy());
-		} else if (output.getItem() == result.getItem()) {
+		}
+		else if (output.getItem() == result.getItem()) {
 			output.grow(result.getCount());
 		}
 
@@ -335,10 +339,12 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 		if (recipe instanceof AlloyingRecipe) {
 			inventory.get(0).shrink(1);
 			inventory.get(1).shrink(1);
-		} else {
+		}
+		else {
 			if (!inventory.get(0).isEmpty()) {
 				inventory.get(0).shrink(1);
-			} else {
+			}
+			else {
 				inventory.get(1).shrink(1);
 			}
 		}
@@ -395,8 +401,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 	}
 
 	@Override
-	public void load(BlockState state, CompoundTag tag) {
+	public void load(CompoundTag tag) {
-		super.load(state, tag);
+		super.load(tag);
 		inventory = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY);
 		ContainerHelper.loadAllItems(tag, inventory);
 		burnTime = tag.getShort("BurnTime");
@@ -427,7 +433,8 @@ public class EndStoneSmelterBlockEntity extends BaseContainerBlockEntity impleme
 	public boolean canPlaceItem(int slot, ItemStack stack) {
 		if (slot == 3) {
 			return false;
-		} else if (slot != 2) {
+		}
+		else if (slot != 2) {
 			return true;
 		}
 		ItemStack itemStack = this.inventory.get(2);

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

@@ -3,14 +3,15 @@ package ru.betterend.blocks.entities;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.rituals.EternalRitual;
 
 public class EternalPedestalEntity extends PedestalBlockEntity {
 	private EternalRitual linkedRitual;
 
-	public EternalPedestalEntity() {
+	public EternalPedestalEntity(BlockPos blockPos, BlockState blockState) {
-		super(EndBlockEntities.ETERNAL_PEDESTAL);
+		super(EndBlockEntities.ETERNAL_PEDESTAL, blockPos, blockState);
 	}
 
 	public boolean hasRitual() {
@@ -26,10 +27,10 @@ public class EternalPedestalEntity extends PedestalBlockEntity {
 	}
 
 	@Override
-	public void setLevelAndPosition(Level world, BlockPos pos) {
+	public void setLevel(Level level) {
-		super.setLevelAndPosition(world, pos);
+		super.setLevel(level);
 		if (hasRitual()) {
-			linkedRitual.setWorld(world);
+			linkedRitual.setWorld(level);
 		}
 	}
 

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

@@ -3,6 +3,8 @@ package ru.betterend.blocks.entities;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.rituals.InfusionRitual;
 
@@ -10,17 +12,18 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
 
 	private InfusionRitual linkedRitual;
 
-	public InfusionPedestalEntity() {
+	public InfusionPedestalEntity(BlockPos blockPos, BlockState blockState) {
-		super(EndBlockEntities.INFUSION_PEDESTAL);
+		super(EndBlockEntities.INFUSION_PEDESTAL, blockPos, blockState);
 	}
 
 	@Override
-	public void setLevelAndPosition(Level world, BlockPos pos) {
+	public void setLevel(Level world) {
-		super.setLevelAndPosition(world, pos);
+		super.setLevel(world);
 		if (hasRitual()) {
-			linkedRitual.setLocation(world, pos);
+			linkedRitual.setLocation(world, this.getBlockPos());
-		} else {
+		}
-			linkRitual(new InfusionRitual(this, world, pos));
+		else {
+			linkRitual(new InfusionRitual(this, world, this.getBlockPos()));
 		}
 	}
 
@@ -36,14 +39,6 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
 		return linkedRitual != null;
 	}
 
-	@Override
-	public void tick() {
-		if (hasRitual()) {
-			linkedRitual.tick();
-		}
-		super.tick();
-	}
-
 	@Override
 	public CompoundTag save(CompoundTag tag) {
 		if (hasRitual()) {
@@ -60,4 +55,14 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
 			linkedRitual.fromTag(tag.getCompound("ritual"));
 		}
 	}
+
+	public static <T extends BlockEntity> void tickEnity(Level level, BlockPos blockPos, BlockState blockState, T uncastedEntity) {
+		if (uncastedEntity instanceof InfusionPedestalEntity) {
+			InfusionPedestalEntity blockEntity = (InfusionPedestalEntity) uncastedEntity;
+			if (blockEntity.hasRitual()) {
+				blockEntity.linkedRitual.tick();
+			}
+			PedestalBlockEntity.tick(level, blockPos, blockState, blockEntity);
+		}
+	}
 }

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

@@ -1,30 +1,31 @@
 package ru.betterend.blocks.entities;
 
 import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
+import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.TickableBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import ru.betterend.blocks.basis.PedestalBlock;
 import ru.betterend.registry.EndBlockEntities;
 import ru.betterend.registry.EndItems;
 
-public class PedestalBlockEntity extends BlockEntity implements Container, TickableBlockEntity, BlockEntityClientSerializable {
+public class PedestalBlockEntity extends BlockEntity implements Container, BlockEntityClientSerializable {
 	private ItemStack activeItem = ItemStack.EMPTY;
 
 	private final int maxAge = 314;
 	private int age;
 
-	public PedestalBlockEntity() {
+	public PedestalBlockEntity(BlockPos blockPos, BlockState blockState) {
-		super(EndBlockEntities.PEDESTAL);
+		this(EndBlockEntities.PEDESTAL, blockPos, blockState);
 	}
 
-	public PedestalBlockEntity(BlockEntityType<?> type) {
+	public PedestalBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
-		super(type);
+		super(blockEntityType, blockPos, blockState);
 	}
 
 	public int getAge() {
@@ -87,7 +88,8 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Ticka
 				BlockState trueState = state.setValue(PedestalBlock.HAS_ITEM, !isEmpty());
 				if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) {
 					trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, true);
-				} else {
+				}
+				else {
 					trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, false);
 				}
 				level.setBlockAndUpdate(worldPosition, trueState);
@@ -103,8 +105,8 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Ticka
 	}
 
 	@Override
-	public void load(BlockState state, CompoundTag tag) {
+	public void load(CompoundTag tag) {
-		super.load(state, tag);
+		super.load(tag);
 		fromTag(tag);
 	}
 
@@ -131,12 +133,15 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Ticka
 		}
 	}
 
-	@Override
+	public static <T extends BlockEntity> void tick(Level level, BlockPos blockPos, BlockState blockState, T uncastedEntity) {
-	public void tick() {
+		clientTick(level, blockPos, blockState, (PedestalBlockEntity) uncastedEntity);
-		if (!isEmpty()) {
+	}
-			age++;
+
-			if (age > maxAge) {
+	private static void clientTick(Level tickLevel, BlockPos tickPos, BlockState tickState, PedestalBlockEntity blockEntity) {
-				age = 0;
+		if (!blockEntity.isEmpty()) {
+			blockEntity.age++;
+			if (blockEntity.age > blockEntity.maxAge) {
+				blockEntity.age = 0;
 			}
 		}
 	}

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

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

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

@@ -1,12 +1,7 @@
 package ru.betterend.client.gui;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.GuiComponent;
@@ -20,6 +15,10 @@ import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.Recipe;
 import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 @Environment(EnvType.CLIENT)
 public class EndStoneSmelterRecipeBookScreen extends BlastingRecipeBookComponent {
 	private Iterator<Item> fuelIterator;
@@ -49,7 +48,7 @@ public class EndStoneSmelterRecipeBookScreen extends BlastingRecipeBookComponent
 		this.ghostRecipe.addIngredient(Ingredient.of(result), (slots.get(3)).x, (slots.get(3)).y);
 		NonNullList<Ingredient> inputs = recipe.getIngredients();
 		Iterator<Ingredient> iterator = inputs.iterator();
-		for(int i = 0; i < 2; i++) {
+		for (int i = 0; i < 2; i++) {
 			if (!iterator.hasNext()) {
 				return;
 			}
@@ -79,7 +78,8 @@ public class EndStoneSmelterRecipeBookScreen extends BlastingRecipeBookComponent
 			int slotX = this.fuelSlot.x + x;
 			int slotY = this.fuelSlot.y + y;
 			GuiComponent.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822018048);
-			this.minecraft.getItemRenderer().renderAndDecorateItem(minecraft.player, this.getFuel().getDefaultInstance(), slotX, slotY);
+			//TODO: test k=0
+			this.minecraft.getItemRenderer().renderAndDecorateItem(minecraft.player, this.getFuel().getDefaultInstance(), slotX, slotY, 0);
 			RenderSystem.depthFunc(516);
 			GuiComponent.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583);
 			RenderSystem.depthFunc(515);

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

@@ -2,7 +2,6 @@ package ru.betterend.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.components.ImageButton;
@@ -32,21 +31,22 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 
 	public void init() {
 		super.init();
+		//TODO: test in 1.17
 		narrow = width < 379;
 		recipeBook.init(width, height, minecraft, narrow, menu);
-		leftPos = recipeBook.updateScreenPosition(narrow, width, imageWidth);
+		leftPos = recipeBook.updateScreenPosition(width, imageWidth);
-		addButton(new ImageButton(leftPos + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> {
+		addRenderableWidget(new ImageButton(leftPos + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> {
-			recipeBook.initVisuals(narrow);
+			recipeBook.initVisuals();
 			recipeBook.toggleVisibility();
-			leftPos = recipeBook.updateScreenPosition(narrow, width, imageWidth);
+			leftPos = recipeBook.updateScreenPosition(width, imageWidth);
 			((ImageButton) buttonWidget).setPosition(leftPos + 20, height / 2 - 49);
 		}));
 		titleLabelX = (imageWidth - font.width(title)) / 2;
 	}
 
 	@Override
-	public void tick() {
+	public void containerTick() {
-		super.tick();
+		super.containerTick();
 		recipeBook.tick();
 	}
 
@@ -56,7 +56,8 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 		if (recipeBook.isVisible() && narrow) {
 			renderBg(matrices, delta, mouseX, mouseY);
 			recipeBook.render(matrices, mouseX, mouseY, delta);
-		} else {
+		}
+		else {
 			recipeBook.render(matrices, mouseX, mouseY, delta);
 			super.render(matrices, mouseX, mouseY, delta);
 			recipeBook.renderGhostRecipe(matrices, leftPos, topPos, true, delta);
@@ -69,7 +70,8 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 	public boolean mouseClicked(double mouseX, double mouseY, int button) {
 		if (this.recipeBook.mouseClicked(mouseX, mouseY, button)) {
 			return true;
-		} else {
+		}
+		else {
 			return narrow && recipeBook.isVisible() || super.mouseClicked(mouseX, mouseY, button);
 		}
 	}
@@ -109,8 +111,10 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 	@Override
 	protected void renderBg(PoseStack matrices, float delta, int mouseX, int mouseY) {
 		if (minecraft == null) return;
-		RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+		//TODO: verify
-		minecraft.getTextureManager().bind(BACKGROUND_TEXTURE);
+		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+		RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE);
+		//minecraft.getTextureManager().bind(BACKGROUND_TEXTURE);
 		blit(matrices, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 		int progress;
 		if (menu.isBurning()) {

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

@@ -50,12 +50,12 @@ public class EndStoneSmelterScreenHandler extends RecipeBookMenu<Container> {
 		addSlot(new SmelterFuelSlot(this, inventory, 2, 56, 53));
 		addSlot(new SmelterOutputSlot(playerInventory.player, inventory, 3, 129, 35));
 
-		for(int i = 0; i < 3; ++i) {
+		for (int i = 0; i < 3; ++i) {
-			for(int j = 0; j < 9; ++j) {
+			for (int j = 0; j < 9; ++j) {
 				addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
 			}
 		}
-		for(int i = 0; i < 9; ++i) {
+		for (int i = 0; i < 9; ++i) {
 			addSlot(new Slot(playerInventory, i, 8 + i * 18, 142));
 		}
 	}
@@ -107,6 +107,11 @@ public class EndStoneSmelterScreenHandler extends RecipeBookMenu<Container> {
 		return RecipeBookType.BLAST_FURNACE;
 	}
 
+	@Override
+	public boolean shouldMoveToInventory(int i) {
+		return i != this.getResultSlotIndex();
+	}
+
 	@Override
 	public boolean stillValid(Player player) {
 		return inventory.stillValid(player);
@@ -132,29 +137,35 @@ public class EndStoneSmelterScreenHandler extends RecipeBookMenu<Container> {
 				return ItemStack.EMPTY;
 			}
 			slot.onQuickCraft(slotStack, itemStack);
-		} else if (index != 2 && index != 1 && index != 0) {
+		}
+		else if (index != 2 && index != 1 && index != 0) {
 			if (isSmeltable(slotStack)) {
 				if (!moveItemStackTo(slotStack, 0, 2, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (isFuel(slotStack)) {
+			}
+			else if (isFuel(slotStack)) {
 				if (!moveItemStackTo(slotStack, 2, 3, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (index < 31) {
+			}
+			else if (index < 31) {
 				if (!moveItemStackTo(slotStack, 31, 40, false)) {
 					return ItemStack.EMPTY;
 				}
-			} else if (index < 40 && !moveItemStackTo(slotStack, 4, 31, false)) {
+			}
+			else if (index < 40 && !moveItemStackTo(slotStack, 4, 31, false)) {
 				return ItemStack.EMPTY;
 			}
-		} else if (!moveItemStackTo(slotStack, 4, 40, false)) {
+		}
+		else if (!moveItemStackTo(slotStack, 4, 40, false)) {
 			return ItemStack.EMPTY;
 		}
 
 		if (slotStack.isEmpty()) {
 			slot.set(ItemStack.EMPTY);
-		} else {
+		}
+		else {
 			slot.setChanged();
 		}
 

src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java

@@ -28,10 +28,9 @@ public class SmelterOutputSlot extends Slot {
 		return super.remove(amount);
 	}
 
-	public ItemStack onTake(Player player, ItemStack stack) {
+	public void onTake(Player player, ItemStack stack) {
 		this.checkTakeAchievements(stack);
 		super.onTake(player, stack);
-		return stack;
 	}
 
 	protected void onQuickCraft(ItemStack stack, int amount) {

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

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

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

@@ -2,8 +2,8 @@ package ru.betterend.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-
 import net.minecraft.client.model.EntityModel;
+import net.minecraft.client.model.geom.EntityModelSet;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -18,12 +18,14 @@ import net.minecraft.world.entity.player.PlayerModelPart;
 import net.minecraft.world.item.ItemStack;
 import ru.betterend.interfaces.FallFlyingItem;
 import ru.betterend.item.model.ArmoredElytraModel;
+import ru.betterend.registry.EndEntitiesRenders;
 
 public class ArmoredElytraLayer<T extends LivingEntity, M extends EntityModel<T>> extends ElytraLayer<T, M> {
-	private final ArmoredElytraModel<T> elytraModel = new ArmoredElytraModel<>();
+	private final ArmoredElytraModel<T> elytraModel;
 
-	public ArmoredElytraLayer(RenderLayerParent<T, M> renderLayerParent) {
+	public ArmoredElytraLayer(RenderLayerParent<T, M> renderLayerParent, EntityModelSet entityModelSet) {
-		super(renderLayerParent);
+		super(renderLayerParent, entityModelSet);
+		elytraModel = new ArmoredElytraModel<>(entityModelSet.bakeLayer(EndEntitiesRenders.ARMORED_ELYTRA));
 	}
 
 	public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
@@ -34,7 +36,8 @@ public class ArmoredElytraLayer<T extends LivingEntity, M extends EntityModel<T>
 				AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) livingEntity;
 				if (abstractClientPlayer.isElytraLoaded() && abstractClientPlayer.getElytraTextureLocation() != null) {
 					wingsTexture = abstractClientPlayer.getElytraTextureLocation();
-				} else if (abstractClientPlayer.isCapeLoaded() && abstractClientPlayer.getCloakTextureLocation() != null && abstractClientPlayer.isModelPartShown(PlayerModelPart.CAPE)) {
+				}
+				else if (abstractClientPlayer.isCapeLoaded() && abstractClientPlayer.getCloakTextureLocation() != null && abstractClientPlayer.isModelPartShown(PlayerModelPart.CAPE)) {
 					wingsTexture = abstractClientPlayer.getCloakTextureLocation();
 				}
 			}

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

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

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

@@ -4,8 +4,12 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
-
 import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.PartPose;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
@@ -42,13 +46,29 @@ public class EndCrystalRenderer {
 		matrices.popPose();
 	}
 
+	public static LayerDefinition getTexturedModelData() {
+		MeshDefinition modelData = new MeshDefinition();
+		PartDefinition modelPartData = modelData.getRoot();
+		modelPartData.addOrReplaceChild("FRAME", CubeListBuilder.create()
+						.texOffs(0, 0)
+						.addBox(-4.0f, -4.0f, -4.0f, 8.0f, 8.0f, 8.0f),
+				PartPose.ZERO);
+
+		modelPartData.addOrReplaceChild("CORE", CubeListBuilder.create()
+						.texOffs(32, 0)
+						.addBox(-4.0f, -4.0f, -4.0f, 8.0f, 8.0f, 8.0f),
+				PartPose.ZERO);
+
+		return LayerDefinition.create(modelData, 64, 32);
+	}
+
 	static {
 		END_CRYSTAL = RenderType.entityCutoutNoCull(CRYSTAL_TEXTURE);
 		RenderType.entitySmoothCutout(CRYSTAL_BEAM_TEXTURE);
 		SINE_45_DEGREES = (float) Math.sin(0.7853981633974483D);
-		FRAME = new ModelPart(64, 32, 0, 0);
+
-		FRAME.addBox(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
+		ModelPart root = getTexturedModelData().bakeRoot();
-		CORE = new ModelPart(64, 32, 32, 0);
+		FRAME = root.getChild("FRAME");
-		CORE.addBox(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
+		CORE = root.getChild("CORE");
 	}
 }