[Feature] Support for Fabric Launcher 15.x (#322, #318, quiqueck/BCLib#136, quiqueck/BCLib#137, quiqueck/BCLib#138)

Merge pull request #109 from OpenBagTwo/breedable-moths

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,86 @@
+name: Report a Bug
+description: File a bug report
+title: "[Bug] "
+labels: [ "bug" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a Bug in BetterEnd!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Versions
+  - type: input
+    id: bn_version
+    attributes:
+      label: BetterEnd
+      description: What version of BetterEnd are you running?
+      placeholder: 2.0.x
+    validations:
+      required: true
+  - type: input
+    id: bclib_version
+    attributes:
+      label: BCLib
+      description: What version of BCLib are you running?
+      placeholder: 2.0.x
+    validations:
+      required: true
+  - type: input
+    id: fabric_api_version
+    attributes:
+      label: Fabric API
+      description: What version of Fabric API is installed
+      placeholder: 0.5x.x
+    validations:
+      required: false
+  - type: input
+    id: fabric_loader_version
+    attributes:
+      label: Fabric Loader
+      description: What version of Fabric Loader do you use
+      placeholder: 0.14.x
+    validations:
+      required: false
+  - type: dropdown
+    id: mc_version
+    attributes:
+      label: Minecraft
+      description: What version of Minecraft is installed?
+      options:
+        - 1.19.3
+        - 1.19.2
+        - 1.19.1
+        - 1.19
+        - 1.18.2
+        - 1.18.1
+        - 1.18
+        - Older
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Additional Information
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: other_mods
+    attributes:
+      label: Other Mods
+      description: If you can, please supply a list of installed Mods (besides BetterEnd and BCLib). This information may already be included in the log above.
+      render: shell

.github/ISSUE_TEMPLATE/SUGGEST_FROM.yml

@@ -0,0 +1,18 @@
+name: Suggest a Feature or Change
+description: Have a new Idea, then suggest a Feature here.
+title: "[Suggestion] "
+labels: ["suggestion"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest a new Feature for BCLib. We appreciate your time!
+  - type: textarea
+    id: describe
+    attributes:
+      label: Description
+      description: Tell us your idea
+      placeholder: 
+      value: 
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.gitignore

@@ -27,5 +27,11 @@ bin/
 # fabric
 
 run/
+run-client/
+run-server/
 output/
-*.log
+*.getBlock("log")
+Convert.class
+ModelPart.class
+libs/
+/src/main/generated/.cache/

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);
+    }
+}

LICENSE

@@ -19,3 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+___________________________
+Some of our Assets (see LICENSE.ASSETS for a Listing) is licensed under CC BY-NC-SA 4.0
+See https://creativecommons.org/licenses/by-nc-sa/4.0/ for Details.

LICENSE.ASSETS

@@ -0,0 +1,9 @@
+Some of our Assets (see List below) is licensed under CC BY-NC-SA 4.0
+See https://creativecommons.org/licenses/by-nc-sa/4.0/ for Details.
+
+Please use the Attribution "Team BetterX".
+
+The following Files are distributed under this License:
+ * src/main/resources/assets/betterend/textures/gui/infusion.png
+ * src/main/resources/assets/betterend/icon_updater.png
+ * src/main/resources/assets/betterend/lang/de_de.json

README.md

@@ -1,17 +1,19 @@
-[![](https://jitpack.io/v/paulevsGitch/BetterEnd.svg)](https://jitpack.io/#paulevsGitch/BetterEnd)
+[![](https://jitpack.io/v/quiqueck/BetterEnd.svg)](https://jitpack.io/#quiqueck/BetterEnd)
+
 # Better End
-Better End Mod for Fabric, MC 1.16.4
+
+Better End Mod for Fabric, MC 1.19
 
 Importing:
+
 * Clone repo
 * Edit gradle.properties if necessary
-* Run command line in folder: gradlew genSources eclipse (or Another-IDE-Name)
+* Run command line in folder: gradlew genSources idea (or eclipse)
 * 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,114 +1,154 @@
 buildscript {
-	dependencies {
+    dependencies {
-		classpath 'org.kohsuke:github-api:1.114'
+        classpath 'org.kohsuke:github-api:1.114'
-	}
+    }
 }
 
 plugins {
-	id 'idea'
+    id 'fabric-loom' version "${loom_version}"
-	id 'eclipse'
+    id 'maven-publish'
-	id 'fabric-loom' version '0.7-SNAPSHOT'
+    id "com.modrinth.minotaur" version "2.+"
-	id 'maven-publish'
+    id "com.matthewprenger.cursegradle" version "1.4.0"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
+def local_bclib = findProject(':BCLib') != null
 
 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' }
+    maven { url 'https://maven.terraformersmc.com/releases' }
+    maven { url = "https://maven.terraformersmc.com/" }
+    maven { url "https://maven.ladysnake.org/releases" }
+    maven { url = "https://dvs1.progwml6.com/files/maven/" }
+    maven { url = "https://modmaven.dev" }
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+            }
+        }
+        filter {
+            includeGroup "maven.modrinth"
+        }
+    }
+    flatDir {
+        dirs 'libs'
+    }
+}
+
+loom {
+    accessWidenerPath = file("src/main/resources/betterend.accesswidener")
+    interfaceInjection {
+        // When enabled injected interfaces from dependecies will be applied.
+        enableDependencyInterfaceInjection = true
+    }
+    runs {
+        // This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient"
+        datagenClient {
+            inherit client
+            name "Data Generation"
+            vmArg "-Dfabric-api.datagen"
+            vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
+            vmArg "-Dfabric-api.datagen.strict-validation"
+            vmArg "-Dfabric-api.datagen.modid=betterend"
+
+            runDir "build/datagen"
+        }
+    }
+}
+
+sourceSets {
+    main {
+        // Add the datagenned files into the jar.
+        resources {
+            srcDirs += [
+                    'src/main/generated'
+            ]
+        }
+    }
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings minecraft.officialMojangMappings()
+    mappings loom.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 "com.github.paulevsGitch:BCLib:${project.bclib_version}"
 
-	useOptional "me.shedaniel:RoughlyEnoughItems:${project.rei_version}"
+    modApi "vazkii.patchouli:Patchouli:${project.patchouli_version}"
-	useOptional "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}"
+    println "Using local BCLib: ${local_bclib}"
-	//useOptional "grondag:canvas-mc116:${project.canvas_version}"
+    if (local_bclib) {
-}
+        implementation(project(path: ":BCLib", configuration: 'dev'))
+    } else {
+        modImplementation "maven.modrinth:BCLib:${project.bclib_version}"
+    }
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
 
-def useOptional(String dep) {
+    //needed for trinkets, otherwise BetterEnd would require users to install trinkets
-	dependencies.modRuntime (dep) {
+    modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}"
-		exclude group: "net.fabricmc.fabric-api"
+    modCompileOnly "dev.emi:trinkets:${project.trinkets_version}"
-		exclude group: "net.fabricmc"
+    modCompileOnly "dev.emi:emi-fabric:${emi_version}:api"
-		if (!dep.contains("me.shedaniel")) {
+    modLocalRuntime "dev.emi:emi-fabric:${emi_version}"
-			exclude group: "me.shedaniel"
-		}
-	}
-	dependencies.modCompileOnly (dep) {
-		exclude group: "net.fabricmc.fabric-api"
-		exclude group: "net.fabricmc"
-		if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
-		}
-	}
-}
-
-def useApi(String dep) {
-	dependencies.modApi (dep) {
-		exclude group: "net.fabricmc.fabric-api"
-		exclude group: "net.fabricmc"
-		if (!dep.contains("me.shedaniel")) {
-			exclude group: "me.shedaniel"
-		}
-	}
 }
 
 processResources {
-	inputs.property "version", project.version
+    println "Version: ${project.version}"
-	duplicatesStrategy = 'WARN'
+    inputs.property "version", project.version
-
+    filesMatching("fabric.mod.json") {
-	from(sourceSets.main.resources.srcDirs) {
+        expand "version": project.version
-		include "fabric.mod.json"
+    }
-		expand "version": project.version
-	}
 }
 
 // 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"
+    it.options.release = 17
 }
 
 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
+}
+
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-	from "LICENSE"
+    from "LICENSE"
+    from "LICENSE.ASSETS"
 }
 
 artifacts {
-	archives sourcesJar
+    archives sourcesJar
-	archives javadocJar
+    archives javadocJar
 }
 
 def env = System.getenv()
@@ -117,42 +157,231 @@ 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("quiqueck/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/quiqueck/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
-//publishing {
+publishing {
-//	publications {
+    publications {
-//		mavenJava(MavenPublication) {
+        mavenJava(MavenPublication) {
-//			artifact(remapJar) {
+            artifact(remapJar) {
-//				builtBy remapJar
+                builtBy remapJar
-//			}
+            }
-//			artifact(sourcesJar) {
+            artifact(sourcesJar) {
-//				builtBy remapSourcesJar
+                builtBy remapSourcesJar
-//			}
+            }
-//		}
+        }
-//	}
+    }
-//
+
-//	// select the repositories you want to publish to
+    // select the repositories you want to publish to
-//	repositories {
+    repositories {
-//		// uncomment to publish to the local maven
+        // uncomment to publish to the local maven
-//		// mavenLocal()
+        // mavenLocal()
-//	}
+    }
-//}
+}
+
+//from https://lowcarbrob.medium.com/android-pro-tip-generating-your-apps-changelog-from-git-inside-build-gradle-19a07533eec4
+String generateChangelog() {
+    println "Assembeling Changelog ..."
+    def lastTag = "git describe --tags --abbrev=0".execute().text.trim()
+    //def gitLogCmd = "git log $lastTag..HEAD --oneline --no-merges --pretty=format:\"%s\"".execute().text.trim()
+    def gitLogCmd = "git log $lastTag..HEAD --oneline --pretty=format:\"%s\"".execute().text.trim()
+
+    def features = ""
+    def fixes = ""
+    def changes = ""
+    gitLogCmd.eachLine { gitLine ->
+        def line = gitLine.substring(1, gitLine.length() - 1)
+        if (line.trim().startsWith("[")) {
+            def sline = line.split("]", 2)
+            if (sline.length == 2) {
+                def type = sline[0].trim().toLowerCase().substring(1)
+                def comment = sline[1].trim()
+
+                //filter issue links
+                if (comment.contains("(")) {
+                    def cline = comment.split("\\(", 2)
+                    if (cline.length == 2 && cline[1].contains("#")) {
+                        comment = cline[0].trim()
+                    }
+                }
+
+                if (type == "fix" || type == "fixes" || type == "fixed") {
+                    fixes += "- $comment \n"
+                } else if (type == "feature" || type == "features") {
+                    features += "- $comment \n"
+                } else if (type == "change" || type == "changes" || type == "changed") {
+                    changes += "- $comment \n"
+                } else {
+                    println "Unknown Type: $type ($line)"
+                }
+            }
+        }
+
+    }
+    def changelog = ""
+    if (!features.isEmpty()) {
+        changelog += "#### Features\n"
+        changelog += features.trim()
+        changelog += "\n\n"
+    }
+    if (!changes.isEmpty()) {
+        changelog += "#### Changes\n"
+        changelog += changes.trim()
+        changelog += "\n\n"
+    }
+    if (!fixes.isEmpty()) {
+        changelog += "#### Fixes\n"
+        changelog += fixes.trim()
+        changelog += "\n\n"
+    }
+
+    println "Changelog since $lastTag:\n$changelog"
+    return changelog
+}
+
+task changelog() {
+    doLast {
+        new File(projectDir, "CHANGES.md").text = generateChangelog()
+    }
+}
+
+modrinth {
+    def changes = new File(projectDir, "CHANGES.md")
+    if (changes.exists()) {
+        changes = changes.getText('UTF-8')
+    } else {
+        changes = ""
+    }
+    def modrinth_token = new File(projectDir, "../MODRINTH_TOKEN")
+    if (modrinth_token.exists()) {
+        modrinth_token = modrinth_token.text
+    } else {
+        modrinth_token = ""
+    }
+    def slurper = new groovy.json.JsonSlurper()
+    token = modrinth_token
+    projectId = project.modrinth_id
+    versionNumber = project.mod_version
+    versionType = project.release_channel
+    uploadFile = remapJar
+    gameVersions = slurper.parseText(project.modrinth_versions)
+    loaders = ["fabric"]
+    changelog = changes
+    dependencies {
+        required.project "fabric-api"
+        required.project "bclib"
+        optional.project "emi"
+        optional.project "rei"
+        optional.project "trinkets"
+        optional.project "patchouli"
+    }
+    debugMode = false
+}
+
+curseforge {
+    def slurper = new groovy.json.JsonSlurper()
+    apiKey = new File(projectDir, "../CURSEFORGE_TOKEN")
+    if (apiKey.exists()) {
+        apiKey = apiKey.text
+    } else {
+        apiKey = ""
+    }
+
+    def changes = new File(projectDir, "CHANGES.md")
+    if (changes.exists()) {
+        changes = changes.getText('UTF-8')
+    } else {
+        changes = ""
+    }
+
+    project {
+        id = '413596'
+        changelogType = 'markdown'
+        changelog = changes
+        releaseType = project.release_channel
+        def versions = slurper.parseText(project.modrinth_versions);
+        def latestVersion = ''
+        for (v in versions) {
+            addGameVersion v
+            latestVersion = "[$v]"
+        }
+        addGameVersion 'Fabric'
+        addGameVersion 'Java 17'
+        relations {
+            requiredDependency 'fabric-api'
+            requiredDependency 'bclib'
+            optionalDependency 'emi'
+            optionalDependency 'roughly-enough-items'
+            optionalDependency 'patchouli'
+            optionalDependency 'trinkets'
+        }
+        mainArtifact(remapJar) {
+            displayName = "$project.modrinth_id-$project.version $latestVersion"
+        }
+        afterEvaluate {
+            mainArtifact(remapJar.outputs)
+        }
+    }
+
+    options {
+        debug = false
+        forgeGradleIntegration = false
+    }
+}
+
+
+
+task nextVersion() {
+    doLast {
+        def inputFile = new File('modrinth.json')
+        def gameVersions = java.net.URLEncoder.encode(project.modrinth_versions, "UTF-8")
+        new URL("https://api.modrinth.com/v2/project/${project.modrinth_base_name}/version?&game_versions=${gameVersions}").withInputStream { i -> inputFile.withOutputStream { it << i } }
+
+        def json = new groovy.json.JsonSlurper().parseText(inputFile.text)
+        def version = json[0].version_number
+
+        //increment patch version
+        def indexedVersionList = version.split(/\./).toList().withIndex()
+        indexedVersionList = indexedVersionList.collect { num, idx -> num.toInteger() }
+        indexedVersionList[2] = indexedVersionList[2].value + 1
+        def updatedVersion = indexedVersionList.join(".")
+
+        println "\n\n"
+        println "------------- CURRENT VERSION -------------"
+        println "Last Published Version: " + version
+        println "         Game Versions: " + json[0].game_versions
+        println "                Status: " + json[0].status
+        println "              Featured: " + json[0].featured
+        println "            Downloaded: " + json[0].downloads
+        println "\n"
+        println "-------------- NEXT VERSION ---------------"
+        println "Next Version: " + updatedVersion
+        println "\n\n"
+
+        def propertiesFile = new File("gradle.properties")
+        def newContents = propertiesFile.text.replaceFirst("mod_version=\\d+.\\d+.\\d+", "mod_version=${updatedVersion}")
+        propertiesFile.text = newContents
+
+        def fabricFile = new File("src/main/resources/fabric.mod.json")
+        newContents = fabricFile.text.replaceFirst('"version": ".+"', "\"version\": \"${updatedVersion}\"")
+        fabricFile.text = newContents
+    }
+}

gradle.properties

@@ -1,21 +1,27 @@
-# Done to increase the memory available to gradle.
+# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx2G
-
+# Fabric Properties
-# Fabric Properties
+# check these on https://fabricmc.net/versions.html
-# check these on https://fabricmc.net/use
+minecraft_version=1.19.3
-minecraft_version=1.16.5
+loader_version=0.15.3
-yarn_mappings=6
+fabric_version=0.76.1+1.19.3
-loader_version=0.11.3
+#Loom
-
+loom_version=1.0-SNAPSHOT
-# Mod Properties
+#Modrinth
-mod_version = 0.9.8-pre
+modrinth_versions=["1.19.3"]
-maven_group = ru.betterend
+modrinth_base_name=betterend
-archives_base_name = better-end
+#`release`, `beta` or `alpha`
-
+release_channel=beta
-# Dependencies
+modrinth_id=betterend
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+# Mod Properties
-patchouli_version = 50-FABRIC
+mod_version=3.1.4
-fabric_version = 0.32.9+1.16
+maven_group=org.betterx.betterend
-canvas_version = 1.0.+
+archives_base_name=better-end
-bclib_version = 0.1.38
+# Dependencies
-rei_version = 5.8.10
+# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+patchouli_version=1.19.3-78-FABRIC
+bclib_version=2.2.5
+rei_version=10.0.578
+emi_version=1.0.29+1.19.3
+trinkets_version=3.5.1
+cca_version=5.1.0

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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 17.0.1-tem
+  - sdk use java 17.0.1-tem

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"
 }

settings.gradle

@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
@@ -7,3 +8,39 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+// #### Custom Settings ####
+
+//Change the next line to disable local BCLib loading
+def allowLocalLibUse = true
+
+//When true, the local BCLib is also used in commandline builds
+def allowLocalLibInConsoleMode = false
+
+//The path were to look for the local BCLib
+def BCLibPath = '../BCLib'
+
+
+// #### Logic ####
+def isIDE = properties.containsKey('android.injected.invoked.from.ide') 
+            || (System.getenv("XPC_SERVICE_NAME") ?: "").contains("intellij")
+            || (System.getenv("XPC_SERVICE_NAME") ?: "").contains(".idea") 
+            || System.getenv("IDEA_INITIAL_DIRECTORY") != null
+
+println "IntelliJ: ${isIDE}"
+
+def BCLibFolder = new File( BCLibPath )
+if( allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode)  && BCLibFolder.exists() ) {
+    println "Using local BCLib from '${BCLibFolder}' in IntelliJ"
+    println "If you do not want to load the local version of BClib"
+    println "either rename the Folder containing BCLib to something"
+    println "else, or set 'allowLocalLibUse' in settings.gradle"
+    println "to false."
+    println ""
+    println "If you receive version-errors when launching minecraft"
+    println "in IntelliJ, make sure you have set up gradle instead"
+    println "of IntelliJ to compile and run."
+
+    include ':BCLib'
+    project(":BCLib").projectDir = BCLibFolder
+    project(':BCLib').buildFileName = './bclib-composit.gradle'    
+} 

src/main/generated/data/betterend/advancements/all_elytras.json

@@ -0,0 +1,68 @@
+{
+  "parent": "betterend:root",
+  "criteria": {
+    "armored": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:elytra_armored"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "crystalite": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:elytra_crystalite"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "vanilla": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:elytra"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.all_elytras.description"
+    },
+    "frame": "goal",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:elytra_crystalite",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.all_elytras.title"
+    }
+  },
+  "requirements": [
+    [
+      "vanilla"
+    ],
+    [
+      "crystalite"
+    ],
+    [
+      "armored"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/all_the_biomes.json

@@ -0,0 +1,558 @@
+{
+  "parent": "betterend:enter_end",
+  "criteria": {
+    "bclib:the_blue": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "bclib:the_blue"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "bclib:the_gray": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "bclib:the_gray"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "bclib:the_yellow": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "bclib:the_yellow"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:amber_land": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:amber_land"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:blossoming_spires": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:blossoming_spires"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:chorus_forest": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:chorus_forest"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:crystal_mountains": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:crystal_mountains"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:dragon_graveyards": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:dragon_graveyards"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:dry_shrubland": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:dry_shrubland"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:dust_wastelands": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:dust_wastelands"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:empty_aurora_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:empty_aurora_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:empty_end_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:empty_end_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:empty_smaragdant_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:empty_smaragdant_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:foggy_mushroomland": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:foggy_mushroomland"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:glowing_grasslands": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:glowing_grasslands"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:ice_starfield": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:ice_starfield"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:jade_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:jade_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:lantern_woods": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:lantern_woods"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:lush_aurora_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:lush_aurora_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:lush_smaragdant_cave": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:lush_smaragdant_cave"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:megalake": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:megalake"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:megalake_grove": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:megalake_grove"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:neon_oasis": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:neon_oasis"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:painted_mountains": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:painted_mountains"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:shadow_forest": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:shadow_forest"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:sulphur_springs": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:sulphur_springs"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:umbra_valley": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:umbra_valley"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
+    "betterend:umbrella_jungle": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "biome": "betterend:umbrella_jungle"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.all_the_biomes.description"
+    },
+    "frame": "challenge",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_boots",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.all_the_biomes.title"
+    }
+  },
+  "requirements": [
+    [
+      "betterend:amber_land"
+    ],
+    [
+      "betterend:megalake_grove"
+    ],
+    [
+      "betterend:empty_aurora_cave"
+    ],
+    [
+      "betterend:neon_oasis"
+    ],
+    [
+      "betterend:dry_shrubland"
+    ],
+    [
+      "betterend:sulphur_springs"
+    ],
+    [
+      "betterend:foggy_mushroomland"
+    ],
+    [
+      "betterend:megalake"
+    ],
+    [
+      "betterend:jade_cave"
+    ],
+    [
+      "betterend:crystal_mountains"
+    ],
+    [
+      "betterend:lantern_woods"
+    ],
+    [
+      "betterend:blossoming_spires"
+    ],
+    [
+      "betterend:chorus_forest"
+    ],
+    [
+      "bclib:the_gray"
+    ],
+    [
+      "betterend:empty_smaragdant_cave"
+    ],
+    [
+      "bclib:the_blue"
+    ],
+    [
+      "betterend:lush_smaragdant_cave"
+    ],
+    [
+      "betterend:painted_mountains"
+    ],
+    [
+      "betterend:umbrella_jungle"
+    ],
+    [
+      "betterend:dust_wastelands"
+    ],
+    [
+      "betterend:ice_starfield"
+    ],
+    [
+      "betterend:umbra_valley"
+    ],
+    [
+      "betterend:glowing_grasslands"
+    ],
+    [
+      "bclib:the_yellow"
+    ],
+    [
+      "betterend:shadow_forest"
+    ],
+    [
+      "betterend:empty_end_cave"
+    ],
+    [
+      "betterend:lush_aurora_cave"
+    ],
+    [
+      "betterend:dragon_graveyards"
+    ]
+  ],
+  "rewards": {
+    "experience": 500
+  }
+}

src/main/generated/data/betterend/advancements/enter_end.json

@@ -0,0 +1,31 @@
+{
+  "parent": "betterend:root",
+  "criteria": {
+    "entered_end": {
+      "conditions": {
+        "to": "minecraft:the_end"
+      },
+      "trigger": "minecraft:changed_dimension"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.enter_end.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:cave_moss"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.enter_end.title"
+    }
+  },
+  "requirements": [
+    [
+      "entered_end"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/infusion.json

@@ -0,0 +1,37 @@
+{
+  "parent": "betterend:root",
+  "criteria": {
+    "infusion_pedestal": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:infusion_pedestal"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.infusion.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:infusion_pedestal"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.infusion.title"
+    }
+  },
+  "requirements": [
+    [
+      "infusion_pedestal"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/infusion_finished.json

@@ -0,0 +1,29 @@
+{
+  "parent": "betterend:infusion",
+  "criteria": {
+    "finished": {
+      "conditions": {},
+      "trigger": "betterend:infusion_finished"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.infusion_finished.description"
+    },
+    "frame": "goal",
+    "hidden": false,
+    "icon": {
+      "item": "minecraft:ender_eye"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.infusion_finished.title"
+    }
+  },
+  "requirements": [
+    [
+      "finished"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/portal.json

@@ -0,0 +1,41 @@
+{
+  "parent": "betterend:root",
+  "criteria": {
+    "eternal_portal": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "structure": "betterend:eternal_portal"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.portal.description"
+    },
+    "frame": "goal",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:eternal_pedestal"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.portal.title"
+    }
+  },
+  "requirements": [
+    [
+      "eternal_portal"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/portal_on.json

@@ -0,0 +1,29 @@
+{
+  "parent": "betterend:portal",
+  "criteria": {
+    "turn_on": {
+      "conditions": {},
+      "trigger": "betterend:portal_on"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.portal_on.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:eternal_crystal"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.portal_on.title"
+    }
+  },
+  "requirements": [
+    [
+      "turn_on"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/portal_travel.json

@@ -0,0 +1,29 @@
+{
+  "parent": "betterend:portal_on",
+  "criteria": {
+    "travel": {
+      "conditions": {},
+      "trigger": "betterend:portal_travel"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.portal_travel.description"
+    },
+    "frame": "challenge",
+    "hidden": false,
+    "icon": {
+      "item": "minecraft:grass_block"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.portal_travel.title"
+    }
+  },
+  "requirements": [
+    [
+      "travel"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_axe.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_axe_head": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_axe_head"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_axe.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_axe",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_axe.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_axe_head",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_axe"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_block.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_597_aeternium_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_block.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_block"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_block.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_597_aeternium_ingot",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_block"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_block_to_ingot.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_598_aeternium_block": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_block"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_block_to_ingot"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_block_to_ingot.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_ingot"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_block_to_ingot.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_598_aeternium_block",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_block_to_ingot"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_boots.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_terminite_boots": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:terminite_boots"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_forged_plate": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_forged_plate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_boots"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_boots.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_boots",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_boots.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_terminite_boots",
+      "has_1_aeternium_forged_plate",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_boots"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_chestplate.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_terminite_chestplate": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:terminite_chestplate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_forged_plate": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_forged_plate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_chestplate.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_chestplate",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_chestplate.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_terminite_chestplate",
+      "has_1_aeternium_forged_plate",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_chestplate"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_hammer.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_hammer_head": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_hammer_head"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_hammer"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_hammer.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_hammer",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_hammer.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_hammer_head",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_hammer"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_helmet.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_terminite_helmet": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:terminite_helmet"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_forged_plate": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_forged_plate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_helmet.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_helmet",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_helmet.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_terminite_helmet",
+      "has_1_aeternium_forged_plate",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_helmet"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_hoe.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_hoe_head": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_hoe_head"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_hoe.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_hoe",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_hoe.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_hoe_head",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_hoe"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_leggings.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_terminite_leggings": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:terminite_leggings"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_forged_plate": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_forged_plate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_leggings"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_leggings.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_leggings",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_leggings.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_terminite_leggings",
+      "has_1_aeternium_forged_plate",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_leggings"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_pickaxe.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_pickaxe_head": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_pickaxe_head"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_pickaxe.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_pickaxe",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_pickaxe.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_pickaxe_head",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_pickaxe"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_shovel.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_shovel_head": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_shovel_head"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_shovel.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_shovel",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_shovel.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_shovel_head",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_shovel"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_sword.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_aeternium_sword_blade": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_sword_blade"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_sword_handle": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_sword_handle"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_sword.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_sword",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_sword.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_aeternium_sword_blade",
+      "has_1_aeternium_sword_handle",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_sword"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aeternium_sword_handle.json

@@ -0,0 +1,62 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_terminite_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:terminite_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_leather_wrapped_stick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:leather_wrapped_stick"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aeternium_sword_handle"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_sword_handle.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aeternium_sword_handle"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aeternium_sword_handle.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_terminite_ingot",
+      "has_1_leather_wrapped_stick",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aeternium_sword_handle"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/amber_block.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_625_amber_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:amber_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:amber_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/amber_block.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:amber_block"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/amber_block.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_625_amber_gem",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:amber_block"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/amber_gem.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_624_raw_amber": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:raw_amber"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:amber_gem"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/amber_gem.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:amber_gem"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/amber_gem.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_624_raw_amber",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:amber_gem"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/amber_gem_block.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_626_amber_block": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:amber_block"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:amber_gem_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/amber_gem_block.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:amber_gem"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/amber_gem_block.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_626_amber_block",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:amber_gem_block"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/ancient_emerald_ice.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_660_dense_emerald_ice": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:dense_emerald_ice"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:ancient_emerald_ice"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/ancient_emerald_ice.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:ancient_emerald_ice"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/ancient_emerald_ice.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_660_dense_emerald_ice",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:ancient_emerald_ice"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/andesite_lantern.json

@@ -0,0 +1,62 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_612_crystal_shards": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:crystal_shards"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_613_andesite_slab": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:andesite_slab"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:andesite_lantern"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/andesite_lantern.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:andesite_lantern"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/andesite_lantern.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_612_crystal_shards",
+      "has_613_andesite_slab",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:andesite_lantern"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/andesite_pedestal.json

@@ -0,0 +1,62 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_584_polished_andesite_slab": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_andesite_slab"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_585_polished_andesite": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_andesite"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:andesite_pedestal"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/andesite_pedestal.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:andesite_pedestal"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/andesite_pedestal.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_584_polished_andesite_slab",
+      "has_585_polished_andesite",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:andesite_pedestal"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/armored_elytra.json

@@ -0,0 +1,63 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_elytra": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:elytra"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_1_aeternium_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:aeternium_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:armored_elytra"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/armored_elytra.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:elytra_armored",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/armored_elytra.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_elytra",
+      "has_1_aeternium_ingot",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:armored_elytra"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/aurora_block.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_605_crystal_shards": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:crystal_shards"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:aurora_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/aurora_block.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:aurora_crystal"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/aurora_block.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_605_crystal_shards",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:aurora_block"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/azure_jadestone_brick_slab_stonecutting.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_azure_jadestone": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:azure_jadestone"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:azure_jadestone_brick_slab_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_slab_stonecutting.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:azure_jadestone_bricks_slab"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_slab_stonecutting.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_azure_jadestone",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:azure_jadestone_brick_slab_stonecutting"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/azure_jadestone_brick_slabs_from_azure_jadestone_brick_stonecutting.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_azure_jadestone_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:azure_jadestone_bricks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:azure_jadestone_brick_slabs_from_azure_jadestone_brick_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_slabs_from_azure_jadestone_brick_stonecutting.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:azure_jadestone_bricks_slab"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_slabs_from_azure_jadestone_brick_stonecutting.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_azure_jadestone_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:azure_jadestone_brick_slabs_from_azure_jadestone_brick_stonecutting"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/azure_jadestone_brick_stair_from_azure_jadestone_brick_stonecutting.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_azure_jadestone_bricks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:azure_jadestone_bricks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:azure_jadestone_brick_stair_from_azure_jadestone_brick_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_stair_from_azure_jadestone_brick_stonecutting.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:azure_jadestone_bricks_stairs"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_stair_from_azure_jadestone_brick_stonecutting.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_azure_jadestone_bricks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:azure_jadestone_brick_stair_from_azure_jadestone_brick_stonecutting"
+    ]
+  }
+}

src/main/generated/data/betterend/advancements/recipes/decorations/azure_jadestone_brick_stair_stonecutting.json

@@ -0,0 +1,49 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_0_azure_jadestone": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "betterend:azure_jadestone"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "betterend:azure_jadestone_brick_stair_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "description": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_stair_stonecutting.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:azure_jadestone_bricks_stairs"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.betterend.recipes/decorations/azure_jadestone_brick_stair_stonecutting.title"
+    }
+  },
+  "requirements": [
+    [
+      "has_0_azure_jadestone",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "betterend:azure_jadestone_brick_stair_stonecutting"
+    ]
+  }
+}