Mine sand using shovel

Pots update

.gitignore

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

Convert.java

@@ -0,0 +1,161 @@
+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 + "\");");
+		}
+	}
+}
+
+        ModelPart.print();
+    }
+    void setRotationAngle(ModelPart p, float x, float y, float z){
+        p.setRotationAngle(x, y, z);
+    }
+    public void c (){
+        float scale = 1;
+        ModelPart[] SHARDS = new ModelPart[4];
+        SHARDS[0] = new ModelPart(16, 16, 2, 4, "SHARDS[0]").addBox(-5.0F, 1.0F, -3.0F, 2.0F, 8.0F, 2.0F);
+		SHARDS[1] = new ModelPart(16, 16, 2, 4, "SHARDS[1]").addBox(3.0F, -1.0F, -1.0F, 2.0F, 8.0F, 2.0F);
+		SHARDS[2] = new ModelPart(16, 16, 2, 4, "SHARDS[2]").addBox(-1.0F, 0.0F, -5.0F, 2.0F, 4.0F, 2.0F);
+		SHARDS[3] = new ModelPart(16, 16, 2, 4, "SHARDS[3]").addBox(0.0F, 3.0F, 4.0F, 2.0F, 6.0F, 2.0F);
+		ModelPart CORE = new ModelPart(16, 16, 0, 0, "CORE");
+		CORE.addBox(-2.0F, -2.0F, -2.0F, 4.0F, 12.0F, 4.0F);
+    }
+}

README.md

@@ -1,17 +1,19 @@
 [![](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
 * Edit gradle.properties if necessary
 * Run command line in folder: gradlew genSources eclipse (or Another-IDE-Name)
 * Import project to IDE
 
 Building:
+
 * Clone repo
 * Run command line in folder: gradlew build
 * Mod .jar will be in ./build/libs
 
-Mappings:
-* https://modmuss50.me/fabric.html?&version=1.16.4

build.gradle

@@ -1,18 +1,18 @@
 buildscript {
-	dependencies {
+    dependencies {
-		classpath 'org.kohsuke:github-api:1.114'
+        classpath 'org.kohsuke:github-api:1.114'
-	}
+    }
 }
 
 plugins {
-	id 'idea'
+    id 'idea'
-	id 'eclipse'
+    id 'eclipse'
-	id 'fabric-loom' version '0.7-SNAPSHOT'
+    id 'fabric-loom' version '0.8-SNAPSHOT'
-	id 'maven-publish'
+    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,95 +20,101 @@ 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.fabricmc.net/" }
+    maven { url 'https://maven.blamejared.com' }
-	maven { url 'https://maven.blamejared.com' }
+    maven { url "https://maven.shedaniel.me/" }
-	maven { url "https://maven.shedaniel.me/" }
+    maven { url 'https://jitpack.io' }
-	maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings minecraft.officialMojangMappings()
+    mappings minecraft.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_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}"
+    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}"
+    //useOptional "grondag:canvas-mc116:${project.canvas_version}"
 }
 
 def useOptional(String dep) {
-	dependencies.modRuntime (dep) {
+    dependencies.modRuntime(dep) {
-		exclude group: "net.fabricmc.fabric-api"
+        exclude group: 'net.fabricmc.fabric-api'
-		exclude group: "net.fabricmc"
+        exclude group: 'net.fabricmc'
-		if (!dep.contains("me.shedaniel")) {
+        if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
+            exclude group: 'me.shedaniel.cloth'
-		}
+            exclude group: 'me.shedaniel'
-	}
+        }
-	dependencies.modCompileOnly (dep) {
+    }
-		exclude group: "net.fabricmc.fabric-api"
+    dependencies.modCompileOnly(dep) {
-		exclude group: "net.fabricmc"
+        exclude group: 'net.fabricmc.fabric-api'
-		if (!dep.contains("me.shedaniel")) {
+        exclude group: 'net.fabricmc'
-			exclude group: "me.shedaniel"
+        if (!dep.contains("me.shedaniel")) {
-		}
+            exclude group: 'me.shedaniel.cloth'
-	}
+            exclude group: 'me.shedaniel'
+        }
+    }
 }
 
 def useApi(String dep) {
-	dependencies.modApi (dep) {
+    dependencies.modApi(dep) {
-		exclude group: "net.fabricmc.fabric-api"
+        exclude group: 'net.fabricmc.fabric-api'
-		exclude group: "net.fabricmc"
+        exclude group: 'net.fabricmc'
-		if (!dep.contains("me.shedaniel")) {
+        if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
+            exclude group: 'me.shedaniel.cloth'
-		}
+            exclude group: 'me.shedaniel'
-	}
+        }
+    }
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property "version", project.version
-	duplicatesStrategy = 'WARN'
+    duplicatesStrategy = 'WARN'
 
-	from(sourceSets.main.resources.srcDirs) {
+    from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+        include "fabric.mod.json"
-		expand "version": project.version
+        expand "version": project.version
-	}
+    }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude "fabric.mod.json"
+    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
 tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+    options.encoding = "UTF-8"
 }
 
 javadoc {
-	options.tags = ["reason"]
+    options.tags = ["reason"]
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-	classifier = 'javadoc'
+    classifier = 'javadoc'
-	from javadoc.destinationDir
+    from javadoc.destinationDir
 }
 
 // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 // if it is present.
 // If you remove this task, sources will not be generated.
 task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = 'sources'
+    classifier = 'sources'
-	from sourceSets.main.allSource
+    from sourceSets.main.allSource
 }
 
 jar {
-	from "LICENSE"
+    from "LICENSE"
 }
 
 artifacts {
-	archives sourcesJar
+    archives sourcesJar
-	archives javadocJar
+    archives javadocJar
 }
 
 def env = System.getenv()
@@ -117,24 +123,24 @@ import org.kohsuke.github.GHReleaseBuilder
 import org.kohsuke.github.GitHub
 
 task release(dependsOn: [remapJar, sourcesJar, javadocJar]) {
-	onlyIf {
+    onlyIf {
-		env.GITHUB_TOKEN
+        env.GITHUB_TOKEN
-	}
+    }
 
-	doLast {
+    doLast {
-		def github = GitHub.connectUsingOAuth(env.GITHUB_TOKEN as String)
+        def github = GitHub.connectUsingOAuth(env.GITHUB_TOKEN as String)
-		def repository = github.getRepository("paulevsGitch/BetterEnd")
+        def repository = github.getRepository("paulevsGitch/BetterEnd")
 
-		def releaseBuilder = new GHReleaseBuilder(repository, version as String)
+        def releaseBuilder = new GHReleaseBuilder(repository, version as String)
-		releaseBuilder.name("${archivesBaseName}-${version}")
+        releaseBuilder.name("${archivesBaseName}-${version}")
-		releaseBuilder.body("A changelog can be found at https://github.com/paulevsGitch/BetterEnd/commits")
+        releaseBuilder.body("A changelog can be found at https://github.com/paulevsGitch/BetterEnd/commits")
-		releaseBuilder.commitish("master")
+        releaseBuilder.commitish("master")
 
-		def ghRelease = releaseBuilder.create()
+        def ghRelease = releaseBuilder.create()
-		ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"), "application/java-archive");
+        ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"), "application/java-archive");
-		ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}-sources.jar"), "application/java-archive");
+        ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}-sources.jar"), "application/java-archive");
-		ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}-javadoc.jar"), "application/java-archive");
+        ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}-javadoc.jar"), "application/java-archive");
-	}
+    }
 }
 
 // configure the maven publication

gradle.properties

@@ -1,21 +1,18 @@
 # Done to increase the memory available to gradle.
 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
-loader_version=0.11.3
+loader_version=0.11.6
-
 # Mod Properties
-mod_version = 0.9.8-pre
+mod_version=0.10.4-pre
-maven_group = ru.betterend
+maven_group=ru.betterend
-archives_base_name = better-end
+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 = 50-FABRIC
+patchouli_version = 55-FABRIC-SNAPSHOT
-fabric_version = 0.32.9+1.16
+fabric_version = 0.36.1+1.17
+bclib_version = 0.2.2
+rei_version = 6.0.264-alpha
 canvas_version = 1.0.+
-bclib_version = 0.1.38
-rei_version = 5.8.10

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

jitpack.yml

@@ -0,0 +1,6 @@
+# From https://github.com/jitpack/jitpack.io/issues/4506#issuecomment-864562270
+before_install:
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+  - sdk update
+  - sdk install java 16.0.1.hs-adpt
+  - sdk use java 16.0.1.hs-adpt

json/block/%name%.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/cube_all", 
+	"parent": "block/cube_all",
-    "textures": {
+	"textures": {
-        "all": "betterend:block/%name%"
+		"all": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_brick_half_slab.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/slab", 
+	"parent": "block/slab",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%_bricks", 
+		"bottom": "betterend:block/%name%_bricks",
-        "side": "betterend:block/%name%_bricks", 
+		"side": "betterend:block/%name%_bricks",
-        "top": "betterend:block/%name%_bricks"
+		"top": "betterend:block/%name%_bricks"
-    }
+	}
 }

json/block/%name%_brick_inner_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/inner_stairs", 
+	"parent": "block/inner_stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%_bricks", 
+		"bottom": "betterend:block/%name%_bricks",
-        "side": "betterend:block/%name%_bricks", 
+		"side": "betterend:block/%name%_bricks",
-        "top": "betterend:block/%name%_bricks"
+		"top": "betterend:block/%name%_bricks"
-    }
+	}
 }

json/block/%name%_brick_outer_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/outer_stairs", 
+	"parent": "block/outer_stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%_bricks", 
+		"bottom": "betterend:block/%name%_bricks",
-        "side": "betterend:block/%name%_bricks", 
+		"side": "betterend:block/%name%_bricks",
-        "top": "betterend:block/%name%_bricks"
+		"top": "betterend:block/%name%_bricks"
-    }
+	}
 }

json/block/%name%_brick_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/stairs", 
+	"parent": "block/stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%_bricks", 
+		"bottom": "betterend:block/%name%_bricks",
-        "side": "betterend:block/%name%_bricks", 
+		"side": "betterend:block/%name%_bricks",
-        "top": "betterend:block/%name%_bricks"
+		"top": "betterend:block/%name%_bricks"
-    }
+	}
 }

json/block/%name%_brick_wall_inventory.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/wall_inventory",
+	"parent": "minecraft:block/wall_inventory",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%_bricks"
+		"wall": "betterend:block/%name%_bricks"
-  }
+	}
 }

json/block/%name%_brick_wall_post.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_post",
+	"parent": "minecraft:block/template_wall_post",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%_bricks"
+		"wall": "betterend:block/%name%_bricks"
-  }
+	}
 }

json/block/%name%_brick_wall_side.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_side",
+	"parent": "minecraft:block/template_wall_side",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%_bricks"
+		"wall": "betterend:block/%name%_bricks"
-  }
+	}
 }

json/block/%name%_brick_wall_side_tall.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_side_tall",
+	"parent": "minecraft:block/template_wall_side_tall",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%_bricks"
+		"wall": "betterend:block/%name%_bricks"
-  }
+	}
 }

json/block/%name%_bricks.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/cube_all", 
+	"parent": "block/cube_all",
-    "textures": {
+	"textures": {
-        "all": "betterend:block/%name%_bricks"
+		"all": "betterend:block/%name%_bricks"
-    }
+	}
 }

json/block/%name%_button.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/button", 
+	"parent": "block/button",
-    "textures": {
+	"textures": {
-        "texture": "betterend:block/%name%"
+		"texture": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_button_inventory.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/button_inventory", 
+	"parent": "block/button_inventory",
-    "textures": {
+	"textures": {
-        "texture": "betterend:block/%name%"
+		"texture": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_button_pressed.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/button_pressed", 
+	"parent": "block/button_pressed",
-    "textures": {
+	"textures": {
-        "texture": "betterend:block/%name%"
+		"texture": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_half_slab.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/slab", 
+	"parent": "block/slab",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%", 
+		"bottom": "betterend:block/%name%",
-        "side": "betterend:block/%name%", 
+		"side": "betterend:block/%name%",
-        "top": "betterend:block/%name%"
+		"top": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_inner_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/inner_stairs", 
+	"parent": "block/inner_stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%", 
+		"bottom": "betterend:block/%name%",
-        "side": "betterend:block/%name%", 
+		"side": "betterend:block/%name%",
-        "top": "betterend:block/%name%"
+		"top": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_outer_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/outer_stairs", 
+	"parent": "block/outer_stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%", 
+		"bottom": "betterend:block/%name%",
-        "side": "betterend:block/%name%", 
+		"side": "betterend:block/%name%",
-        "top": "betterend:block/%name%"
+		"top": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_pressure_plate_down.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/pressure_plate_down", 
+	"parent": "block/pressure_plate_down",
-    "textures": {
+	"textures": {
-        "texture": "betterend:block/%name%"
+		"texture": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_pressure_plate_up.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/pressure_plate_up", 
+	"parent": "block/pressure_plate_up",
-    "textures": {
+	"textures": {
-        "texture": "betterend:block/%name%"
+		"texture": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_small_tiles.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/cube_all", 
+	"parent": "block/cube_all",
-    "textures": {
+	"textures": {
-        "all": "betterend:block/%name%_small_tiles"
+		"all": "betterend:block/%name%_small_tiles"
-    }
+	}
 }

json/block/%name%_stairs.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/stairs", 
+	"parent": "block/stairs",
-    "textures": {
+	"textures": {
-        "bottom": "betterend:block/%name%", 
+		"bottom": "betterend:block/%name%",
-        "side": "betterend:block/%name%", 
+		"side": "betterend:block/%name%",
-        "top": "betterend:block/%name%"
+		"top": "betterend:block/%name%"
-    }
+	}
 }

json/block/%name%_tile.json

@@ -1,6 +1,6 @@
 {
-    "parent": "block/cube_all", 
+	"parent": "block/cube_all",
-    "textures": {
+	"textures": {
-        "all": "betterend:block/%name%_tile"
+		"all": "betterend:block/%name%_tile"
-    }
+	}
 }

json/block/%name%_wall_inventory.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/wall_inventory",
+	"parent": "minecraft:block/wall_inventory",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%"
+		"wall": "betterend:block/%name%"
-  }
+	}
 }

json/block/%name%_wall_post.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_post",
+	"parent": "minecraft:block/template_wall_post",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%"
+		"wall": "betterend:block/%name%"
-  }
+	}
 }

json/block/%name%_wall_side.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_side",
+	"parent": "minecraft:block/template_wall_side",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%"
+		"wall": "betterend:block/%name%"
-  }
+	}
 }

json/block/%name%_wall_side_tall.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:block/template_wall_side_tall",
+	"parent": "minecraft:block/template_wall_side_tall",
-  "textures": {
+	"textures": {
-    "wall": "betterend:block/%name%"
+		"wall": "betterend:block/%name%"
-  }
+	}
 }

json/blockstates/%name%.json

@@ -1,7 +1,7 @@
 {
-    "variants": {
+	"variants": {
-        "": {
+		"": {
-            "model": "betterend:block/%name%"
+			"model": "betterend:block/%name%"
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_brick_slab.json

@@ -1,15 +1,15 @@
 {
-    "variants": {
+	"variants": {
-        "type=bottom": {
+		"type=bottom": {
-            "model": "betterend:block/%name%_brick_half_slab"
+			"model": "betterend:block/%name%_brick_half_slab"
-        }, 
+		},
-        "type=double": {
+		"type=double": {
-            "model": "betterend:block/%name%_bricks"
+			"model": "betterend:block/%name%_bricks"
-        }, 
+		},
-        "type=top": {
+		"type=top": {
-            "model": "betterend:block/%name%_brick_half_slab", 
+			"model": "betterend:block/%name%_brick_half_slab",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_brick_stairs.json

@@ -1,209 +1,209 @@
 {
-    "variants": {
+	"variants": {
-        "facing=east,half=bottom,shape=inner_left": {
+		"facing=east,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=east,half=bottom,shape=inner_right": {
+		"facing=east,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs"
+			"model": "betterend:block/%name%_brick_inner_stairs"
-        }, 
+		},
-        "facing=east,half=bottom,shape=outer_left": {
+		"facing=east,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=east,half=bottom,shape=outer_right": {
+		"facing=east,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs"
+			"model": "betterend:block/%name%_brick_outer_stairs"
-        }, 
+		},
-        "facing=east,half=bottom,shape=straight": {
+		"facing=east,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs"
+			"model": "betterend:block/%name%_brick_stairs"
-        }, 
+		},
-        "facing=east,half=top,shape=inner_left": {
+		"facing=east,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=east,half=top,shape=inner_right": {
+		"facing=east,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=east,half=top,shape=outer_left": {
+		"facing=east,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=east,half=top,shape=outer_right": {
+		"facing=east,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=east,half=top,shape=straight": {
+		"facing=east,half=top,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=inner_left": {
+		"facing=north,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=inner_right": {
+		"facing=north,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=bottom,shape=outer_left": {
+		"facing=north,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=outer_right": {
+		"facing=north,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=bottom,shape=straight": {
+		"facing=north,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=inner_left": {
+		"facing=north,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=inner_right": {
+		"facing=north,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=top,shape=outer_left": {
+		"facing=north,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=outer_right": {
+		"facing=north,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=top,shape=straight": {
+		"facing=north,half=top,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=south,half=bottom,shape=inner_left": {
+		"facing=south,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs"
+			"model": "betterend:block/%name%_brick_inner_stairs"
-        }, 
+		},
-        "facing=south,half=bottom,shape=inner_right": {
+		"facing=south,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=bottom,shape=outer_left": {
+		"facing=south,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs"
+			"model": "betterend:block/%name%_brick_outer_stairs"
-        }, 
+		},
-        "facing=south,half=bottom,shape=outer_right": {
+		"facing=south,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=bottom,shape=straight": {
+		"facing=south,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=inner_left": {
+		"facing=south,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=inner_right": {
+		"facing=south,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=south,half=top,shape=outer_left": {
+		"facing=south,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=outer_right": {
+		"facing=south,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=south,half=top,shape=straight": {
+		"facing=south,half=top,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=inner_left": {
+		"facing=west,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=inner_right": {
+		"facing=west,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=bottom,shape=outer_left": {
+		"facing=west,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=outer_right": {
+		"facing=west,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=bottom,shape=straight": {
+		"facing=west,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=inner_left": {
+		"facing=west,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=inner_right": {
+		"facing=west,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_brick_inner_stairs", 
+			"model": "betterend:block/%name%_brick_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=west,half=top,shape=outer_left": {
+		"facing=west,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=outer_right": {
+		"facing=west,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_brick_outer_stairs", 
+			"model": "betterend:block/%name%_brick_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=west,half=top,shape=straight": {
+		"facing=west,half=top,shape=straight": {
-            "model": "betterend:block/%name%_brick_stairs", 
+			"model": "betterend:block/%name%_brick_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_brick_wall.json

@@ -1,90 +1,90 @@
 {
-  "multipart": [
+	"multipart": [
-    {
+		{
-      "when": {
+			"when": {
-        "up": "true"
+				"up": "true"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_post"
+				"model": "betterend:block/%name%_brick_wall_post"
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "north": "low"
+				"north": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side",
+				"model": "betterend:block/%name%_brick_wall_side",
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "east": "low"
+				"east": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side",
+				"model": "betterend:block/%name%_brick_wall_side",
-        "y": 90,
+				"y": 90,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "south": "low"
+				"south": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side",
+				"model": "betterend:block/%name%_brick_wall_side",
-        "y": 180,
+				"y": 180,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "west": "low"
+				"west": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side",
+				"model": "betterend:block/%name%_brick_wall_side",
-        "y": 270,
+				"y": 270,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "north": "tall"
+				"north": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side_tall",
+				"model": "betterend:block/%name%_brick_wall_side_tall",
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "east": "tall"
+				"east": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side_tall",
+				"model": "betterend:block/%name%_brick_wall_side_tall",
-        "y": 90,
+				"y": 90,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "south": "tall"
+				"south": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side_tall",
+				"model": "betterend:block/%name%_brick_wall_side_tall",
-        "y": 180,
+				"y": 180,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "west": "tall"
+				"west": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_brick_wall_side_tall",
+				"model": "betterend:block/%name%_brick_wall_side_tall",
-        "y": 270,
+				"y": 270,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    }
+		}
-  ]
+	]
 }

json/blockstates/%name%_bricks.json

@@ -1,7 +1,7 @@
 {
-    "variants": {
+	"variants": {
-        "": {
+		"": {
-            "model": "betterend:block/%name%_bricks"
+			"model": "betterend:block/%name%_bricks"
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_button.json

@@ -1,118 +1,118 @@
 {
-    "variants": {
+	"variants": {
-        "face=ceiling,facing=east,powered=false": {
+		"face=ceiling,facing=east,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "face=ceiling,facing=east,powered=true": {
+		"face=ceiling,facing=east,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "face=ceiling,facing=north,powered=false": {
+		"face=ceiling,facing=north,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=ceiling,facing=north,powered=true": {
+		"face=ceiling,facing=north,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=ceiling,facing=south,powered=false": {
+		"face=ceiling,facing=south,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "face=ceiling,facing=south,powered=true": {
+		"face=ceiling,facing=south,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "face=ceiling,facing=west,powered=false": {
+		"face=ceiling,facing=west,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=ceiling,facing=west,powered=true": {
+		"face=ceiling,facing=west,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=floor,facing=east,powered=false": {
+		"face=floor,facing=east,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=floor,facing=east,powered=true": {
+		"face=floor,facing=east,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=floor,facing=north,powered=false": {
+		"face=floor,facing=north,powered=false": {
-            "model": "betterend:block/%name%_button"
+			"model": "betterend:block/%name%_button"
-        }, 
+		},
-        "face=floor,facing=north,powered=true": {
+		"face=floor,facing=north,powered=true": {
-            "model": "betterend:block/%name%_button_pressed"
+			"model": "betterend:block/%name%_button_pressed"
-        }, 
+		},
-        "face=floor,facing=south,powered=false": {
+		"face=floor,facing=south,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=floor,facing=south,powered=true": {
+		"face=floor,facing=south,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=floor,facing=west,powered=false": {
+		"face=floor,facing=west,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "face=floor,facing=west,powered=true": {
+		"face=floor,facing=west,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "face=wall,facing=east,powered=false": {
+		"face=wall,facing=east,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=wall,facing=east,powered=true": {
+		"face=wall,facing=east,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "face=wall,facing=north,powered=false": {
+		"face=wall,facing=north,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90
+			"x": 90
-        }, 
+		},
-        "face=wall,facing=north,powered=true": {
+		"face=wall,facing=north,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90
+			"x": 90
-        }, 
+		},
-        "face=wall,facing=south,powered=false": {
+		"face=wall,facing=south,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=wall,facing=south,powered=true": {
+		"face=wall,facing=south,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "face=wall,facing=west,powered=false": {
+		"face=wall,facing=west,powered=false": {
-            "model": "betterend:block/%name%_button", 
+			"model": "betterend:block/%name%_button",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "face=wall,facing=west,powered=true": {
+		"face=wall,facing=west,powered=true": {
-            "model": "betterend:block/%name%_button_pressed", 
+			"model": "betterend:block/%name%_button_pressed",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 90, 
+			"x": 90,
-            "y": 270
+			"y": 270
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_pillar.json

@@ -1,7 +1,16 @@
 {
-    "variants": {
+	"variants": {
-        "axis=x": { "model": "betterend:block/%name%_pillar", "x": 90, "y": 90 }, 
+		"axis=x": {
-        "axis=y": { "model": "betterend:block/%name%_pillar" }, 
+			"model": "betterend:block/%name%_pillar",
-        "axis=z": { "model": "betterend:block/%name%_pillar", "x": 90 }
+			"x": 90,
-    }
+			"y": 90
+		},
+		"axis=y": {
+			"model": "betterend:block/%name%_pillar"
+		},
+		"axis=z": {
+			"model": "betterend:block/%name%_pillar",
+			"x": 90
+		}
+	}
 }

json/blockstates/%name%_plate.json

@@ -1,10 +1,10 @@
 {
-    "variants": {
+	"variants": {
-        "powered=false": {
+		"powered=false": {
-            "model": "betterend:block/%name%_pressure_plate_up"
+			"model": "betterend:block/%name%_pressure_plate_up"
-        }, 
+		},
-        "powered=true": {
+		"powered=true": {
-            "model": "betterend:block/%name%_pressure_plate_down"
+			"model": "betterend:block/%name%_pressure_plate_down"
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_slab.json

@@ -1,15 +1,15 @@
 {
-    "variants": {
+	"variants": {
-        "type=bottom": {
+		"type=bottom": {
-            "model": "betterend:block/%name%_half_slab"
+			"model": "betterend:block/%name%_half_slab"
-        }, 
+		},
-        "type=double": {
+		"type=double": {
-            "model": "betterend:block/%name%"
+			"model": "betterend:block/%name%"
-        }, 
+		},
-        "type=top": {
+		"type=top": {
-            "model": "betterend:block/%name%_half_slab", 
+			"model": "betterend:block/%name%_half_slab",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_small_tiles.json

@@ -1,7 +1,7 @@
 {
-    "variants": {
+	"variants": {
-        "": {
+		"": {
-            "model": "betterend:block/%name%_small_tiles"
+			"model": "betterend:block/%name%_small_tiles"
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_stairs.json

@@ -1,209 +1,209 @@
 {
-    "variants": {
+	"variants": {
-        "facing=east,half=bottom,shape=inner_left": {
+		"facing=east,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=east,half=bottom,shape=inner_right": {
+		"facing=east,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs"
+			"model": "betterend:block/%name%_inner_stairs"
-        }, 
+		},
-        "facing=east,half=bottom,shape=outer_left": {
+		"facing=east,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=east,half=bottom,shape=outer_right": {
+		"facing=east,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs"
+			"model": "betterend:block/%name%_outer_stairs"
-        }, 
+		},
-        "facing=east,half=bottom,shape=straight": {
+		"facing=east,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_stairs"
+			"model": "betterend:block/%name%_stairs"
-        }, 
+		},
-        "facing=east,half=top,shape=inner_left": {
+		"facing=east,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=east,half=top,shape=inner_right": {
+		"facing=east,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=east,half=top,shape=outer_left": {
+		"facing=east,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=east,half=top,shape=outer_right": {
+		"facing=east,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=east,half=top,shape=straight": {
+		"facing=east,half=top,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=inner_left": {
+		"facing=north,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=inner_right": {
+		"facing=north,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=bottom,shape=outer_left": {
+		"facing=north,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=north,half=bottom,shape=outer_right": {
+		"facing=north,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=bottom,shape=straight": {
+		"facing=north,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=inner_left": {
+		"facing=north,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=inner_right": {
+		"facing=north,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=top,shape=outer_left": {
+		"facing=north,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=north,half=top,shape=outer_right": {
+		"facing=north,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180
+			"x": 180
-        }, 
+		},
-        "facing=north,half=top,shape=straight": {
+		"facing=north,half=top,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=south,half=bottom,shape=inner_left": {
+		"facing=south,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs"
+			"model": "betterend:block/%name%_inner_stairs"
-        }, 
+		},
-        "facing=south,half=bottom,shape=inner_right": {
+		"facing=south,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=bottom,shape=outer_left": {
+		"facing=south,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs"
+			"model": "betterend:block/%name%_outer_stairs"
-        }, 
+		},
-        "facing=south,half=bottom,shape=outer_right": {
+		"facing=south,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=bottom,shape=straight": {
+		"facing=south,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=inner_left": {
+		"facing=south,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=inner_right": {
+		"facing=south,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=south,half=top,shape=outer_left": {
+		"facing=south,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=south,half=top,shape=outer_right": {
+		"facing=south,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=south,half=top,shape=straight": {
+		"facing=south,half=top,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=inner_left": {
+		"facing=west,half=bottom,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=inner_right": {
+		"facing=west,half=bottom,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=bottom,shape=outer_left": {
+		"facing=west,half=bottom,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 90
+			"y": 90
-        }, 
+		},
-        "facing=west,half=bottom,shape=outer_right": {
+		"facing=west,half=bottom,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=bottom,shape=straight": {
+		"facing=west,half=bottom,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=inner_left": {
+		"facing=west,half=top,shape=inner_left": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=inner_right": {
+		"facing=west,half=top,shape=inner_right": {
-            "model": "betterend:block/%name%_inner_stairs", 
+			"model": "betterend:block/%name%_inner_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=west,half=top,shape=outer_left": {
+		"facing=west,half=top,shape=outer_left": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }, 
+		},
-        "facing=west,half=top,shape=outer_right": {
+		"facing=west,half=top,shape=outer_right": {
-            "model": "betterend:block/%name%_outer_stairs", 
+			"model": "betterend:block/%name%_outer_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 270
+			"y": 270
-        }, 
+		},
-        "facing=west,half=top,shape=straight": {
+		"facing=west,half=top,shape=straight": {
-            "model": "betterend:block/%name%_stairs", 
+			"model": "betterend:block/%name%_stairs",
-            "uvlock": true, 
+			"uvlock": true,
-            "x": 180, 
+			"x": 180,
-            "y": 180
+			"y": 180
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_tile.json

@@ -1,7 +1,7 @@
 {
-    "variants": {
+	"variants": {
-        "": {
+		"": {
-            "model": "betterend:block/%name%_tile"
+			"model": "betterend:block/%name%_tile"
-        }
+		}
-    }
+	}
 }

json/blockstates/%name%_wall.json

@@ -1,90 +1,90 @@
 {
-  "multipart": [
+	"multipart": [
-    {
+		{
-      "when": {
+			"when": {
-        "up": "true"
+				"up": "true"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_post"
+				"model": "betterend:block/%name%_wall_post"
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "north": "low"
+				"north": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side",
+				"model": "betterend:block/%name%_wall_side",
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "east": "low"
+				"east": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side",
+				"model": "betterend:block/%name%_wall_side",
-        "y": 90,
+				"y": 90,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "south": "low"
+				"south": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side",
+				"model": "betterend:block/%name%_wall_side",
-        "y": 180,
+				"y": 180,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "west": "low"
+				"west": "low"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side",
+				"model": "betterend:block/%name%_wall_side",
-        "y": 270,
+				"y": 270,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "north": "tall"
+				"north": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side_tall",
+				"model": "betterend:block/%name%_wall_side_tall",
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "east": "tall"
+				"east": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side_tall",
+				"model": "betterend:block/%name%_wall_side_tall",
-        "y": 90,
+				"y": 90,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "south": "tall"
+				"south": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side_tall",
+				"model": "betterend:block/%name%_wall_side_tall",
-        "y": 180,
+				"y": 180,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    },
+		},
-    {
+		{
-      "when": {
+			"when": {
-        "west": "tall"
+				"west": "tall"
-      },
+			},
-      "apply": {
+			"apply": {
-        "model": "betterend:block/%name%_wall_side_tall",
+				"model": "betterend:block/%name%_wall_side_tall",
-        "y": 270,
+				"y": 270,
-        "uvlock": true
+				"uvlock": true
-      }
+			}
-    }
+		}
-  ]
+	]
 }

json/item/%name%.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%"
+	"parent": "betterend:block/%name%"
 }

json/item/%name%_brick_slab.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_brick_half_slab"
+	"parent": "betterend:block/%name%_brick_half_slab"
 }

json/item/%name%_brick_stairs.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_brick_stairs"
+	"parent": "betterend:block/%name%_brick_stairs"
 }

json/item/%name%_brick_wall.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_brick_wall_inventory"
+	"parent": "betterend:block/%name%_brick_wall_inventory"
 }

json/item/%name%_bricks.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_bricks"
+	"parent": "betterend:block/%name%_bricks"
 }

json/item/%name%_button.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_button_inventory"
+	"parent": "betterend:block/%name%_button_inventory"
 }

json/item/%name%_pillar.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_pillar"
+	"parent": "betterend:block/%name%_pillar"
 }

json/item/%name%_plate.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_pressure_plate_up"
+	"parent": "betterend:block/%name%_pressure_plate_up"
 }

json/item/%name%_slab.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_half_slab"
+	"parent": "betterend:block/%name%_half_slab"
 }

json/item/%name%_small_tiles.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_small_tiles"
+	"parent": "betterend:block/%name%_small_tiles"
 }

json/item/%name%_stairs.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_stairs"
+	"parent": "betterend:block/%name%_stairs"
 }

json/item/%name%_tile.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_tile"
+	"parent": "betterend:block/%name%_tile"
 }

json/item/%name%_wall.json

@@ -1,3 +1,3 @@
 {
-    "parent": "betterend:block/%name%_wall_inventory"
+	"parent": "betterend:block/%name%_wall_inventory"
 }

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/AeterniumBlock.java

@@ -14,11 +14,7 @@ import ru.bclib.blocks.BaseBlock;
 public class AeterniumBlock extends BaseBlock {
 	
 	public AeterniumBlock() {
-		super(FabricBlockSettings.of(Material.METAL, MaterialColor.COLOR_GRAY)
+		super(FabricBlockSettings.of(Material.METAL, MaterialColor.COLOR_GRAY).hardness(65F).resistance(1200F).requiresCorrectToolForDrops().sound(SoundType.NETHERITE_BLOCK));
-				.hardness(65F)
-				.resistance(1200F)
-				.requiresCorrectToolForDrops()
-				.sound(SoundType.NETHERITE_BLOCK));
 	}
 	
 	@Environment(EnvType.CLIENT)

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;
@@ -34,15 +33,7 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 	private static final int MAX_DROP = 4;
 	
 	public AuroraCrystalBlock() {
-		super(FabricBlockSettings.of(Material.GLASS)
+		super(FabricBlockSettings.of(Material.GLASS).breakByTool(FabricToolTags.PICKAXES).breakByTool(TagAPI.HAMMERS).hardness(1F).resistance(1F).luminance(15).noOcclusion().isSuffocating((state, world, pos) -> false).sound(SoundType.GLASS));
-				.breakByTool(FabricToolTags.PICKAXES)
-				.breakByTool(EndTags.HAMMERS)
-				.hardness(1F)
-				.resistance(1F)
-				.luminance(15)
-				.noOcclusion()
-				.isSuffocating((state, world, pos) -> false)
-				.sound(SoundType.GLASS));
 	}
 	
 	@Override
@@ -50,7 +41,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 +91,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 +101,6 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp
 	}
 	
 	static {
-		COLORS = new Vec3i[] {
+		COLORS = new Vec3i[]{new Vec3i(247, 77, 161), new Vec3i(120, 184, 255), new Vec3i(120, 255, 168), new Vec3i(243, 58, 255)};
-			new Vec3i(247,  77, 161),
-			new Vec3i(120, 184, 255),
-			new Vec3i(120, 255, 168),
-			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;
@@ -88,10 +87,7 @@ public class BrimstoneBlock extends BaseBlock {
 					}
 				}
 				else if (sideState.getFluidState().getType() == Fluids.WATER) {
-					BlockState crystal = EndBlocks.SULPHUR_CRYSTAL.defaultBlockState()
+					BlockState crystal = EndBlocks.SULPHUR_CRYSTAL.defaultBlockState().setValue(SulphurCrystalBlock.FACING, dir).setValue(SulphurCrystalBlock.WATERLOGGED, true).setValue(SulphurCrystalBlock.AGE, 0);
-							.setValue(SulphurCrystalBlock.FACING, dir)
-							.setValue(SulphurCrystalBlock.WATERLOGGED, true)
-							.setValue(SulphurCrystalBlock.AGE, 0);
 					world.setBlockAndUpdate(side, crystal);
 				}
 			}

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,16 +17,14 @@ 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);
 	
 	public BubbleCoralBlock() {
-		super(FabricBlockSettings.of(Material.WATER_PLANT)
+		super(FabricBlockSettings.of(Material.WATER_PLANT).breakByTool(FabricToolTags.SHEARS).breakByHand(true).sound(SoundType.CORAL_BLOCK).noCollission());
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.CORAL_BLOCK)
-				.noCollission());
 	}
 	
 	@Override

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,8 @@
 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;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.client.renderer.block.model.BlockModel;
@@ -20,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;
@@ -27,19 +24,15 @@ 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);
 	
 	public BulbVineLanternBlock() {
-		this(FabricBlockSettings.of(Material.METAL)
+		this(FabricBlockSettings.of(Material.METAL).hardness(1).resistance(1).breakByTool(FabricToolTags.PICKAXES).materialColor(MaterialColor.COLOR_LIGHT_GRAY).luminance(15).requiresCorrectToolForDrops().sound(SoundType.LANTERN));
-				.hardness(1)
-				.resistance(1)
-				.breakByTool(FabricToolTags.PICKAXES)
-				.materialColor(MaterialColor.COLOR_LIGHT_GRAY)
-				.luminance(15)
-				.requiresCorrectToolForDrops()
-				.sound(SoundType.LANTERN));
 	}
 	
 	public BulbVineLanternBlock(Properties settings) {
@@ -57,13 +50,12 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Map<String, String> textures = Maps.newHashMap();
 		textures.put("%glow%", getGlowTexture());
 		textures.put("%metal%", getMetalTexture(resourceLocation));
-		Optional<String> pattern = blockState.getValue(IS_FLOOR) ?
+		Optional<String> pattern = blockState.getValue(IS_FLOOR) ? Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_FLOOR, textures) : Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_CEIL, textures);
-				Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_FLOOR, textures) :
-				Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_CEIL, textures);
 		return ModelsHelper.fromPattern(pattern);
 	}
 	

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,8 @@
 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;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
@@ -21,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;
@@ -28,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);
 	
@@ -46,11 +46,13 @@ public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped,
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {
 		return ModelsHelper.createItemModel(blockId);
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		Optional<String> pattern;
 		switch (blockState.getValue(FACING)) {
@@ -67,6 +69,7 @@ public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped,
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
 		String state = "_wall";
 		BlockModelRotation rotation = BlockModelRotation.X0_Y0;

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/DragonTreeSaplingBlock.java

@@ -2,13 +2,15 @@ package ru.betterend.blocks;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import ru.bclib.blocks.FeatureSaplingBlock;
+import ru.betterend.blocks.basis.PottableFeatureSapling;
 import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
-public class DragonTreeSaplingBlock extends FeatureSaplingBlock {
+public class DragonTreeSaplingBlock extends PottableFeatureSapling {
 	public DragonTreeSaplingBlock() {
 		super();
 	}
@@ -22,4 +24,9 @@ public class DragonTreeSaplingBlock extends FeatureSaplingBlock {
 	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
 		return world.getBlockState(pos.below()).is(EndBlocks.SHADOW_GRASS);
 	}
+	
+	@Override
+	public boolean canPlantOn(Block block) {
+		return block == EndBlocks.SHADOW_GRASS;
+	}
 }

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

@@ -1,11 +1,7 @@
 package ru.betterend.blocks;
 
-import java.util.Collections;
+import net.fabricmc.api.EnvType;
-import java.util.List;
+import net.fabricmc.api.Environment;
-import java.util.Random;
-
-import org.jetbrains.annotations.Nullable;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
@@ -24,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));
@@ -85,6 +86,7 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderType
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return getBlockModel(resourceLocation, defaultBlockState());
 	}

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

@@ -12,16 +12,14 @@ public class EndBlockProperties extends BlockProperties {
 	public static final EnumProperty<PedestalState> PEDESTAL_STATE = EnumProperty.create("state", PedestalState.class);
 	public static final EnumProperty<CactusBottom> CACTUS_BOTTOM = EnumProperty.create("bottom", CactusBottom.class);
 	
-	public static final BooleanProperty HAS_ITEM = BooleanProperty.create("has_item");
 	public static final IntegerProperty PORTAL = IntegerProperty.create("portal", 0, EndPortals.getCount());
+	public static final IntegerProperty PLANT_ID = IntegerProperty.create("plant_id", 0, 63);
+	public static final IntegerProperty SOIL_ID = IntegerProperty.create("soil_id", 0, 15);
+	public static final IntegerProperty POT_LIGHT = IntegerProperty.create("pot_light", 0, 3);
+	public static final BooleanProperty HAS_ITEM = BooleanProperty.create("has_item");
 	
 	public enum PedestalState implements StringRepresentable {
-		PEDESTAL_TOP("pedestal_top"),
+		PEDESTAL_TOP("pedestal_top"), COLUMN_TOP("column_top"), BOTTOM("bottom"), PILLAR("pillar"), COLUMN("column"), DEFAULT("default");
-		COLUMN_TOP("column_top"),
-		BOTTOM("bottom"),
-		PILLAR("pillar"),
-		COLUMN("column"),
-		DEFAULT("default");
 		
 		private final String name;
 		
@@ -41,12 +39,7 @@ public class EndBlockProperties extends BlockProperties {
 	}
 	
 	public enum HydraluxShape implements StringRepresentable {
-		FLOWER_BIG_BOTTOM("flower_big_bottom", true),
+		FLOWER_BIG_BOTTOM("flower_big_bottom", true), FLOWER_BIG_TOP("flower_big_top", true), FLOWER_SMALL_BOTTOM("flower_small_bottom", true), FLOWER_SMALL_TOP("flower_small_top", true), VINE("vine", false), ROOTS("roots", false);
-		FLOWER_BIG_TOP("flower_big_top", true),
-		FLOWER_SMALL_BOTTOM("flower_small_bottom", true),
-		FLOWER_SMALL_TOP("flower_small_top", true),
-		VINE("vine", false),
-		ROOTS("roots", false);
 		
 		private final String name;
 		private final boolean glow;
@@ -72,13 +65,7 @@ public class EndBlockProperties extends BlockProperties {
 	}
 	
 	public enum LumecornShape implements StringRepresentable {
-		LIGHT_TOP("light_top", 15),
+		LIGHT_TOP("light_top", 15), LIGHT_TOP_MIDDLE("light_top_middle", 15), LIGHT_MIDDLE("light_middle", 15), LIGHT_BOTTOM("light_bottom", 15), MIDDLE("middle", 0), BOTTOM_BIG("bottom_big", 0), BOTTOM_SMALL("bottom_small", 0);
-		LIGHT_TOP_MIDDLE("light_top_middle", 15),
-		LIGHT_MIDDLE("light_middle", 15),
-		LIGHT_BOTTOM("light_bottom", 15),
-		MIDDLE("middle", 0),
-		BOTTOM_BIG("bottom_big", 0),
-		BOTTOM_SMALL("bottom_small", 0);
 		
 		private final String name;
 		private final int light;
@@ -104,9 +91,7 @@ public class EndBlockProperties extends BlockProperties {
 	}
 	
 	public enum CactusBottom implements StringRepresentable {
-		EMPTY("empty"),
+		EMPTY("empty"), SAND("sand"), MOSS("moss");
-		SAND("sand"),
-		MOSS("moss");
 		
 		private final String name;
 		

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,18 +32,17 @@ 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);
 	private static final VoxelShape SHAPE_TOP = Block.box(2, 0, 2, 14, 6, 14);
 	
 	public EndLilyBlock() {
-		super(FabricBlockSettings.of(Material.WATER_PLANT)
+		super(FabricBlockSettings.of(Material.WATER_PLANT).breakByTool(FabricToolTags.SHEARS).breakByHand(true).sound(SoundType.WET_GRASS).lightLevel((state) -> state.getValue(SHAPE) == TripleShape.TOP ? 13 : 0).noCollission());
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.WET_GRASS)
-				.lightLevel((state) -> state.getValue(SHAPE) == TripleShape.TOP ? 13 : 0)
-				.noCollission());
 	}
 	
 	@Override

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,11 @@ 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())
+				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) {
@@ -93,9 +95,9 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 		BlockPos exitPos = findExitPos(currentWorld, destination, pos, entity);
 		if (exitPos == null) return;
 		if (entity instanceof ServerPlayer && ((ServerPlayer) entity).isCreative()) {
-			((ServerPlayer) entity).teleportTo(destination, exitPos.getX() + 0.5, exitPos.getY(),
+			((ServerPlayer) entity).teleportTo(destination, exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5, entity.getYRot(), entity.getXRot());
-					exitPos.getZ() + 0.5, entity.yRot, entity.xRot);
+		}
-		} else {
+		else {
 			((TeleportingEntity) entity).be_setExitPos(exitPos);
 			Optional<Entity> teleported = Optional.ofNullable(entity.changeDimension(destination));
 			teleported.ifPresent(Entity::setPortalCooldown);
@@ -103,8 +105,7 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 	}
 	
 	private boolean validate(Entity entity) {
-		return !entity.isPassenger() && !entity.isVehicle() &&
+		return !entity.isPassenger() && !entity.isVehicle() && entity.canChangeDimensions() && !entity.isOnPortalCooldown();
-				entity.canChangeDimensions() && !entity.isOnPortalCooldown();
 	}
 	
 	@Override
@@ -114,7 +115,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();
@@ -124,8 +125,7 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I
 		MutableBlockPos checkPos = basePos.mutable();
 		BlockState currentState = currentWorld.getBlockState(currentPos);
 		int radius = (EternalRitual.SEARCH_RADIUS >> 4) + 1;
-		checkPos = EternalRitual.findBlockPos(targetWorld, checkPos, radius, this, state -> state.is(this) &&
+		checkPos = EternalRitual.findBlockPos(targetWorld, checkPos, radius, this, state -> state.is(this) && state.getValue(PORTAL).equals(currentState.getValue(PORTAL)));
-				state.getValue(PORTAL).equals(currentState.getValue(PORTAL)));
 		if (checkPos != null) {
 			BlockState checkState = targetWorld.getBlockState(checkPos);
 			Axis axis = checkState.getValue(AXIS);
@@ -159,11 +159,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;
@@ -47,20 +49,15 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	public static final String ID = "end_stone_smelter";
 	
 	public EndStoneSmelter() {
-		super(FabricBlockSettings.of(Material.STONE, MaterialColor.COLOR_GRAY)
+		super(FabricBlockSettings.of(Material.STONE, MaterialColor.COLOR_GRAY).luminance(state -> state.getValue(LIT) ? 15 : 0).hardness(4F).resistance(100F).requiresCorrectToolForDrops().sound(SoundType.STONE));
-				.hardness(4F)
+		registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(LIT, false));
-				.resistance(100F)
-				.requiresCorrectToolForDrops()
-				.sound(SoundType.STONE));
-		this.registerDefaultState(this.stateDefinition.any()
-											  .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;
 		}
@@ -75,12 +72,12 @@ public class EndStoneSmelter extends BaseBlockWithEntity {
 	
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext ctx) {
-		return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
+		return defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getOpposite());
 	}
 	
 	@Override
-	public BlockEntity newBlockEntity(BlockGetter world) {
+	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-		return new EndStoneSmelterBlockEntity();
+		return new EndStoneSmelterBlockEntity(blockPos, blockState);
 	}
 	
 	@Override
@@ -137,7 +134,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 +146,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/EnderBlock.java

@@ -14,11 +14,7 @@ import ru.bclib.blocks.BaseBlock;
 public class EnderBlock extends BaseBlock {
 	
 	public EnderBlock() {
-		super(FabricBlockSettings.of(Material.STONE, MaterialColor.WARPED_WART_BLOCK)
+		super(FabricBlockSettings.of(Material.STONE, MaterialColor.WARPED_WART_BLOCK).hardness(5F).resistance(6F).requiresCorrectToolForDrops().sound(SoundType.STONE));
-				.hardness(5F)
-				.resistance(6F)
-				.requiresCorrectToolForDrops()
-				.sound(SoundType.STONE));
 	}
 	
 	@Environment(EnvType.CLIENT)

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,14 +13,15 @@ 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);
 	
 	public EndstoneDustBlock() {
-		super(FabricBlockSettings.copyOf(Blocks.SAND)
+		super(FabricBlockSettings.copyOf(Blocks.SAND).breakByTool(FabricToolTags.SHOVELS).materialColor(Blocks.END_STONE.defaultMaterialColor()));
-				.breakByTool(FabricToolTags.SHOVELS)
-				.materialColor(Blocks.END_STONE.defaultMaterialColor()));
 	}
 	
 	@Override

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;
@@ -18,17 +15,16 @@ import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.interfaces.ISpetialItem;
 import ru.betterend.blocks.basis.EndPlantBlock;
-import ru.betterend.interfaces.ISpetialItem;
+
+import java.util.List;
 
 public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 1, 16);
 	
 	public FlamaeaBlock() {
-		super(FabricBlockSettings.of(Material.PLANT)
+		super(FabricBlockSettings.of(Material.PLANT).breakByTool(FabricToolTags.SHEARS).breakByHand(true).sound(SoundType.WET_GRASS));
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.WET_GRASS));
 	}
 	
 	@Override
@@ -60,4 +56,9 @@ public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem {
 	public boolean canPlaceOnWater() {
 		return true;
 	}
+	
+	@Override
+	public boolean addToPot() {
+		return false;
+	}
 }

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

@@ -0,0 +1,391 @@
+package ru.betterend.blocks;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.mojang.math.Transformation;
+import com.mojang.math.Vector3f;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.fabricmc.fabric.mixin.object.builder.AbstractBlockAccessor;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.BlockModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.resources.model.UnbakedModel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SaplingBlock;
+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.Builder;
+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 ru.bclib.blocks.BaseBlockNotFull;
+import ru.bclib.client.models.BasePatterns;
+import ru.bclib.client.models.ModelsHelper;
+import ru.bclib.client.models.ModelsHelper.MultiPartBuilder;
+import ru.bclib.client.models.PatternsHelper;
+import ru.bclib.client.render.BCLRenderLayer;
+import ru.bclib.interfaces.IPostInit;
+import ru.bclib.interfaces.IRenderTyped;
+import ru.bclib.util.BlocksHelper;
+import ru.bclib.util.JsonFactory;
+import ru.betterend.BetterEnd;
+import ru.betterend.blocks.basis.PottableLeavesBlock;
+import ru.betterend.client.models.Patterns;
+import ru.betterend.config.Configs;
+import ru.betterend.interfaces.PottablePlant;
+import ru.betterend.interfaces.PottableTerrain;
+import ru.betterend.registry.EndBlocks;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class FlowerPotBlock extends BaseBlockNotFull implements IRenderTyped, IPostInit {
+	private static final IntegerProperty PLANT_ID = EndBlockProperties.PLANT_ID;
+	private static final IntegerProperty SOIL_ID = EndBlockProperties.SOIL_ID;
+	private static final IntegerProperty POT_LIGHT = EndBlockProperties.POT_LIGHT;
+	private static final VoxelShape SHAPE_EMPTY;
+	private static final VoxelShape SHAPE_FULL;
+	private static Block[] plants;
+	private static Block[] soils;
+	
+	public FlowerPotBlock(Block source) {
+		super(FabricBlockSettings.copyOf(source).luminance(state -> state.getValue(POT_LIGHT) * 5));
+		this.registerDefaultState(this.defaultBlockState().setValue(PLANT_ID, 0).setValue(SOIL_ID, 0).setValue(POT_LIGHT, 0));
+	}
+	
+	@Override
+	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+		super.createBlockStateDefinition(builder);
+		builder.add(PLANT_ID, SOIL_ID, POT_LIGHT);
+	}
+	
+	@Override
+	public List<ItemStack> getDrops(BlockState state, Builder builder) {
+		List<ItemStack> drop = Lists.newArrayList(new ItemStack(this));
+		int id = state.getValue(SOIL_ID) - 1;
+		if (id >= 0 && id < soils.length && soils[id] != null) {
+			drop.add(new ItemStack(soils[id]));
+		}
+		id = state.getValue(PLANT_ID) - 1;
+		if (id >= 0 && id < plants.length && plants[id] != null) {
+			drop.add(new ItemStack(plants[id]));
+		}
+		return drop;
+	}
+	
+	@Override
+	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
+		int plantID = state.getValue(PLANT_ID);
+		if (plantID < 1 || plantID > plants.length || plants[plantID - 1] == null) {
+			return state.getValue(POT_LIGHT) > 0 ? state.setValue(POT_LIGHT, 0) : state;
+		}
+		int light = plants[plantID - 1].defaultBlockState().getLightEmission() / 5;
+		if (state.getValue(POT_LIGHT) != light) {
+			state = state.setValue(POT_LIGHT, light);
+		}
+		return state;
+	}
+	
+	@Override
+	public void postInit() {
+		if (FlowerPotBlock.plants != null) {
+			return;
+		}
+		
+		Block[] plants = new Block[128];
+		Block[] soils = new Block[16];
+		
+		Map<String, Integer> reservedPlantsIDs = Maps.newHashMap();
+		Map<String, Integer> reservedSoilIDs = Maps.newHashMap();
+		
+		JsonObject obj = JsonFactory.getJsonObject(new File(FabricLoader.getInstance().getConfigDir().toFile(), BetterEnd.MOD_ID + "/blocks.json"));
+		if (obj.get("flower_pots") != null) {
+			JsonElement plantsObj = obj.get("flower_pots").getAsJsonObject().get("plants");
+			JsonElement soilsObj = obj.get("flower_pots").getAsJsonObject().get("soils");
+			if (plantsObj != null) {
+				plantsObj.getAsJsonObject().entrySet().forEach(entry -> {
+					String name = entry.getKey().substring(0, entry.getKey().indexOf(' '));
+					reservedPlantsIDs.put(name, entry.getValue().getAsInt());
+				});
+			}
+			if (soilsObj != null) {
+				soilsObj.getAsJsonObject().entrySet().forEach(entry -> {
+					String name = entry.getKey().substring(0, entry.getKey().indexOf(' '));
+					reservedSoilIDs.put(name, entry.getValue().getAsInt());
+				});
+			}
+		}
+		
+		EndBlocks.getModBlocks().forEach(block -> {
+			if (block instanceof PottablePlant && ((PottablePlant) block).addToPot()) {//&& canBeAdded(block)) {
+				processBlock(plants, block, "flower_pots.plants", reservedPlantsIDs);
+			}
+			else if (block instanceof PottableTerrain) {
+				processBlock(soils, block, "flower_pots.soils", reservedSoilIDs);
+			}
+		});
+		Configs.BLOCK_CONFIG.saveChanges();
+		
+		FlowerPotBlock.plants = new Block[maxNotNull(plants) + 1];
+		System.arraycopy(plants, 0, FlowerPotBlock.plants, 0, FlowerPotBlock.plants.length);
+		
+		FlowerPotBlock.soils = new Block[maxNotNull(soils) + 1];
+		System.arraycopy(soils, 0, FlowerPotBlock.soils, 0, FlowerPotBlock.soils.length);
+		
+		if (PLANT_ID.getValue(Integer.toString(FlowerPotBlock.plants.length)).isEmpty()) {
+			throw new RuntimeException("There are too much plant ID values!");
+		}
+		if (SOIL_ID.getValue(Integer.toString(FlowerPotBlock.soils.length)).isEmpty()) {
+			throw new RuntimeException("There are too much soil ID values!");
+		}
+	}
+	
+	private int maxNotNull(Block[] array) {
+		int max = 0;
+		for (int i = 0; i < array.length; i++) {
+			if (array[i] != null) {
+				max = i;
+			}
+		}
+		return max;
+	}
+	
+	private void processBlock(Block[] target, Block block, String path, Map<String, Integer> idMap) {
+		ResourceLocation location = Registry.BLOCK.getKey(block);
+		if (idMap.containsKey(location.getPath())) {
+			target[idMap.get(location.getPath())] = block;
+		}
+		else {
+			for (int i = 0; i < target.length; i++) {
+				if (!idMap.values().contains(i)) {
+					target[i] = block;
+					idMap.put(location.getPath(), i);
+					Configs.BLOCK_CONFIG.getInt(path, location.getPath(), i);
+					break;
+				}
+			}
+		}
+	}
+	
+	@Override
+	public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+		if (level.isClientSide) {
+			return InteractionResult.CONSUME;
+		}
+		ItemStack itemStack = player.getItemInHand(hand);
+		int soilID = state.getValue(SOIL_ID);
+		if (soilID == 0 || soilID > soils.length || soils[soilID - 1] == null) {
+			if (!(itemStack.getItem() instanceof BlockItem)) {
+				return InteractionResult.PASS;
+			}
+			Block block = ((BlockItem) itemStack.getItem()).getBlock();
+			for (int i = 0; i < soils.length; i++) {
+				if (block == soils[i]) {
+					BlocksHelper.setWithUpdate(level, pos, state.setValue(SOIL_ID, i + 1));
+					return InteractionResult.SUCCESS;
+				}
+			}
+			return InteractionResult.PASS;
+		}
+		
+		int plantID = state.getValue(PLANT_ID);
+		if (itemStack.isEmpty()) {
+			if (plantID > 0 && plantID <= plants.length && plants[plantID - 1] != null) {
+				BlocksHelper.setWithUpdate(level, pos, state.setValue(PLANT_ID, 0).setValue(POT_LIGHT, 0));
+				player.addItem(new ItemStack(plants[plantID - 1]));
+				return InteractionResult.SUCCESS;
+			}
+			if (soilID > 0 && soilID <= soils.length && soils[soilID - 1] != null) {
+				BlocksHelper.setWithUpdate(level, pos, state.setValue(SOIL_ID, 0));
+				player.addItem(new ItemStack(soils[soilID - 1]));
+			}
+			return InteractionResult.PASS;
+		}
+		if (!(itemStack.getItem() instanceof BlockItem)) {
+			return InteractionResult.PASS;
+		}
+		BlockItem item = (BlockItem) itemStack.getItem();
+		for (int i = 0; i < plants.length; i++) {
+			if (item.getBlock() == plants[i]) {
+				if (!((PottablePlant) plants[i]).canPlantOn(soils[soilID - 1])) {
+					return InteractionResult.PASS;
+				}
+				int light = plants[i].defaultBlockState().getLightEmission() / 5;
+				BlocksHelper.setWithUpdate(level, pos, state.setValue(PLANT_ID, i + 1).setValue(POT_LIGHT, light));
+				level.playLocalSound(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1, 1, false);
+				return InteractionResult.SUCCESS;
+			}
+		}
+		return InteractionResult.PASS;
+	}
+	
+	@Override
+	@Environment(EnvType.CLIENT)
+	public BlockModel getItemModel(ResourceLocation blockId) {
+		Optional<String> pattern = PatternsHelper.createJson(Patterns.BLOCK_FLOWER_POT, blockId);
+		return ModelsHelper.fromPattern(pattern);
+	}
+	
+	@Override
+	@Environment(EnvType.CLIENT)
+	public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {
+		MultiPartBuilder model = MultiPartBuilder.create(stateDefinition);
+		model.part(new ModelResourceLocation(stateId.getNamespace(), stateId.getPath(), "inventory")).add();
+		Transformation offset = new Transformation(new Vector3f(0, 7.5F / 16F, 0), null, null, null);
+		
+		for (int i = 0; i < plants.length; i++) {
+			if (plants[i] == null) {
+				continue;
+			}
+			
+			final int compareID = i + 1;
+			ResourceLocation modelPath = Registry.BLOCK.getKey(plants[i]);
+			ResourceLocation objSource = new ResourceLocation(modelPath.getNamespace(), "models/block/" + modelPath.getPath() + "_potted.json");
+			
+			if (Minecraft.getInstance().getResourceManager().hasResource(objSource)) {
+				objSource = new ResourceLocation(modelPath.getNamespace(), "block/" + modelPath.getPath() + "_potted");
+				model.part(objSource).setTransformation(offset).setCondition(state -> state.getValue(PLANT_ID) == compareID).add();
+				continue;
+			}
+			
+			else if (plants[i] instanceof SaplingBlock) {
+				ResourceLocation loc = Registry.BLOCK.getKey(plants[i]);
+				modelPath = new ResourceLocation(loc.getNamespace(), "block/" + loc.getPath() + "_potted");
+				Map<String, String> textures = Maps.newHashMap();
+				textures.put("%modid%", loc.getNamespace());
+				textures.put("%texture%", loc.getPath());
+				Optional<String> pattern = Patterns.createJson(BasePatterns.BLOCK_CROSS, textures);
+				UnbakedModel unbakedModel = ModelsHelper.fromPattern(pattern);
+				modelCache.put(modelPath, unbakedModel);
+				model.part(modelPath).setTransformation(offset).setCondition(state -> state.getValue(PLANT_ID) == compareID).add();
+				continue;
+			}
+			else if (plants[i] instanceof PottableLeavesBlock) {
+				ResourceLocation loc = Registry.BLOCK.getKey(plants[i]);
+				modelPath = new ResourceLocation(loc.getNamespace(), "block/" + loc.getPath() + "_potted");
+				Map<String, String> textures = Maps.newHashMap();
+				textures.put("%leaves%", loc.getPath().contains("lucernia") ? loc.getPath() + "_1" : loc.getPath());
+				textures.put("%stem%", loc.getPath().replace("_leaves", "_log_side"));
+				Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_POTTED_LEAVES, textures);
+				UnbakedModel unbakedModel = ModelsHelper.fromPattern(pattern);
+				modelCache.put(modelPath, unbakedModel);
+				model.part(modelPath).setTransformation(offset).setCondition(state -> state.getValue(PLANT_ID) == compareID).add();
+				continue;
+			}
+			
+			objSource = new ResourceLocation(modelPath.getNamespace(), "blockstates/" + modelPath.getPath() + ".json");
+			JsonObject obj = JsonFactory.getJsonObject(objSource);
+			if (obj != null) {
+				JsonElement variants = obj.get("variants");
+				JsonElement list = null;
+				String path = null;
+				
+				if (variants == null) {
+					continue;
+				}
+				
+				if (variants.isJsonArray()) {
+					list = variants.getAsJsonArray().get(0);
+				}
+				else if (variants.isJsonObject()) {
+					list = variants.getAsJsonObject().get(((PottablePlant) plants[i]).getPottedState());
+				}
+				
+				if (list == null) {
+					BetterEnd.LOGGER.warning("Incorrect json for pot plant " + objSource + ", no matching variants");
+					continue;
+				}
+				
+				if (list.isJsonArray()) {
+					path = list.getAsJsonArray().get(0).getAsJsonObject().get("model").getAsString();
+				}
+				else {
+					path = list.getAsJsonObject().get("model").getAsString();
+				}
+				
+				if (path == null) {
+					BetterEnd.LOGGER.warning("Incorrect json for pot plant " + objSource + ", no matching variants");
+					continue;
+				}
+				
+				model.part(new ResourceLocation(path)).setTransformation(offset).setCondition(state -> state.getValue(PLANT_ID) == compareID).add();
+			}
+			else {
+				for (ResourceLocation location: modelCache.keySet()) {
+					if (location.getPath().equals(modelPath.getPath())) {
+						model.part(location).setTransformation(offset).setCondition(state -> state.getValue(PLANT_ID) == compareID).add();
+						break;
+					}
+				}
+			}
+		}
+		
+		for (int i = 0; i < soils.length; i++) {
+			if (soils[i] == null) {
+				continue;
+			}
+			
+			ResourceLocation soilLoc = BetterEnd.makeID("flower_pot_soil_" + i);
+			if (!modelCache.containsKey(soilLoc)) {
+				String texture = Registry.BLOCK.getKey(soils[i]).getPath() + "_top";
+				if (texture.contains("rutiscus")) {
+					texture += "_1";
+				}
+				Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_FLOWER_POT_SOIL, texture);
+				UnbakedModel soil = ModelsHelper.fromPattern(pattern);
+				modelCache.put(soilLoc, soil);
+			}
+			final int compareID = i + 1;
+			model.part(soilLoc).setCondition(state -> state.getValue(SOIL_ID) == compareID).add();
+		}
+		
+		UnbakedModel result = model.build();
+		modelCache.put(stateId, result);
+		return result;
+	}
+	
+	@Override
+	public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
+		int id = state.getValue(PLANT_ID);
+		return id > 0 && id <= plants.length ? SHAPE_FULL : SHAPE_EMPTY;
+	}
+	
+	@Override
+	public VoxelShape getCollisionShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
+		return SHAPE_EMPTY;
+	}
+	
+	@Override
+	public BCLRenderLayer getRenderLayer() {
+		return BCLRenderLayer.CUTOUT;
+	}
+	
+	static {
+		SHAPE_EMPTY = Shapes.or(Block.box(4, 1, 4, 12, 8, 12), Block.box(5, 0, 5, 11, 1, 11));
+		SHAPE_FULL = Shapes.or(SHAPE_EMPTY, Block.box(3, 8, 3, 13, 16, 13));
+	}
+}

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/GlowingPillarLuminophorBlock.java

@@ -21,12 +21,7 @@ public class GlowingPillarLuminophorBlock extends BaseBlock {
 	public static final BooleanProperty NATURAL = EndBlockProperties.NATURAL;
 	
 	public GlowingPillarLuminophorBlock() {
-		super(FabricBlockSettings.of(Material.LEAVES)
+		super(FabricBlockSettings.of(Material.LEAVES).materialColor(MaterialColor.COLOR_ORANGE).breakByTool(FabricToolTags.SHEARS).strength(0.2F).luminance(15).sound(SoundType.GRASS));
-				.materialColor(MaterialColor.COLOR_ORANGE)
-				.breakByTool(FabricToolTags.SHEARS)
-				.strength(0.2F)
-				.luminance(15)
-				.sound(SoundType.GRASS));
 		this.registerDefaultState(this.stateDefinition.any().setValue(NATURAL, false));
 	}
 	

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,16 +18,12 @@ 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() {
-		super(FabricBlockSettings.of(Material.PLANT)
+		super(FabricBlockSettings.of(Material.PLANT).breakByTool(FabricToolTags.SHEARS).breakByHand(true).sound(SoundType.GRASS).lightLevel(state -> state.getValue(AGE) * 3 + 3).randomTicks().noCollission());
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.GRASS)
-				.lightLevel(state -> state.getValue(AGE) * 3 + 3)
-				.randomTicks()
-				.noCollission());
 	}
 	
 	@Override
@@ -44,14 +38,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,17 +26,15 @@ 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);
 	
 	public HelixTreeLeavesBlock() {
-		super(FabricBlockSettings.of(Material.LEAVES)
+		super(FabricBlockSettings.of(Material.LEAVES).materialColor(MaterialColor.COLOR_ORANGE).breakByTool(FabricToolTags.SHEARS).sound(SoundType.WART_BLOCK).sound(SoundType.GRASS).strength(0.2F));
-				.materialColor(MaterialColor.COLOR_ORANGE)
-				.breakByTool(FabricToolTags.SHEARS)
-				.sound(SoundType.WART_BLOCK)
-				.sound(SoundType.GRASS)
-				.strength(0.2F));
 	}
 	
 	@Override
@@ -79,7 +73,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/HelixTreeSaplingBlock.java

@@ -1,12 +1,28 @@
 package ru.betterend.blocks;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import ru.bclib.blocks.FeatureSaplingBlock;
+import ru.betterend.blocks.basis.PottableFeatureSapling;
+import ru.betterend.registry.EndBlocks;
 import ru.betterend.registry.EndFeatures;
 
-public class HelixTreeSaplingBlock extends FeatureSaplingBlock {
+public class HelixTreeSaplingBlock extends PottableFeatureSapling {
 	@Override
 	protected Feature<?> getFeature() {
 		return EndFeatures.HELIX_TREE.getFeature();
 	}
+	
+	@Override
+	public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
+		return world.getBlockState(pos.below()).is(EndBlocks.AMBER_MOSS);
+	}
+	
+	@Override
+	public boolean canPlantOn(Block block) {
+		return block == EndBlocks.AMBER_MOSS;
+	}
 }

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,17 +24,16 @@ 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;
 	
 	public HydraluxBlock() {
-		super(FabricBlockSettings.of(Material.WATER_PLANT)
+		super(FabricBlockSettings.of(Material.WATER_PLANT).breakByTool(FabricToolTags.SHEARS).breakByHand(true).sound(SoundType.WET_GRASS).lightLevel((state) -> state.getValue(SHAPE).hasGlow() ? 15 : 0).noCollission());
-				.breakByTool(FabricToolTags.SHEARS)
-				.breakByHand(true)
-				.sound(SoundType.WET_GRASS)
-				.lightLevel((state) -> state.getValue(SHAPE).hasGlow() ? 15 : 0)
-				.noCollission());
 	}
 	
 	@Override

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

@@ -6,19 +6,14 @@ 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;
 
 public class HydraluxPetalBlock extends BaseBlock {
 	public HydraluxPetalBlock() {
-		this(FabricBlockSettings.of(Material.PLANT)
+		this(FabricBlockSettings.of(Material.PLANT).breakByTool(FabricToolTags.AXES).breakByHand(true).hardness(1).resistance(1).materialColor(MaterialColor.PODZOL).sound(SoundType.WART_BLOCK));
-				.breakByTool(FabricToolTags.AXES)
-				.breakByHand(true)
-				.hardness(1)
-				.resistance(1)
-				.materialColor(MaterialColor.PODZOL)
-				.sound(SoundType.WART_BLOCK));
 	}
 	
 	public HydraluxPetalBlock(Properties settings) {
@@ -26,5 +21,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,20 +1,21 @@
 package ru.betterend.blocks;
 
-import java.util.Optional;
+import net.fabricmc.api.EnvType;
-
+import net.fabricmc.api.Environment;
-import org.jetbrains.annotations.Nullable;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
 import ru.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);
@@ -31,6 +32,7 @@ public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements ICo
 	}
 	
 	@Override
+	@Environment(EnvType.CLIENT)
 	public @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
 		String path = "betterend:block/block_petal_colored";
 		Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_PETAL_COLORED, path, path);

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,12 +34,14 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blocks.BaseBlockNotFull;
 import ru.bclib.blocks.BlockProperties;
 import ru.bclib.util.BlocksHelper;
 import ru.betterend.blocks.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 {
@@ -50,11 +50,7 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo
 	private static final VoxelShape SHAPE = Block.box(1, 1, 1, 15, 16, 15);
 	
 	public HydrothermalVentBlock() {
-		super(FabricBlockSettings.of(Material.STONE)
+		super(FabricBlockSettings.of(Material.STONE).breakByTool(FabricToolTags.PICKAXES).sound(SoundType.STONE).noCollission().requiresCorrectToolForDrops());
-				.breakByTool(FabricToolTags.PICKAXES)
-				.sound(SoundType.STONE)
-				.noCollission()
-				.requiresCorrectToolForDrops());
 		this.registerDefaultState(defaultBlockState().setValue(WATERLOGGED, true).setValue(ACTIVATED, false));
 	}
 	
@@ -108,8 +104,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 +120,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;
+	}
 }