From ccfc3adce01ef6ac2240807ceae93a9661f45415 Mon Sep 17 00:00:00 2001 From: Frank Bauer Date: Fri, 9 Jul 2021 11:16:20 +0200 Subject: [PATCH 1/2] Latest REI --- Convert.java | 34 +++++++--------------------------- gradle.properties | 2 +- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/Convert.java b/Convert.java index 3de64d73..e06ec11c 100644 --- a/Convert.java +++ b/Convert.java @@ -149,32 +149,12 @@ public class Convert { } public void c (){ float scale = 1; - ModelPart partC = new ModelPart(64, 64, 0, 19, "partC"); - partC.addBox(1.0F, 0.0F, 1.0F, 14.0F, 9.0F, 14.0F, 0.0F); - ModelPart partA = new ModelPart(64, 64, 0, 0,"partA"); - partA.addBox(1.0F, 0.0F, 0.0F, 14.0F, 5.0F, 14.0F, 0.0F); - partA.y = 9.0F; - partA.z = 1.0F; - ModelPart partB = new ModelPart(64, 64, 0, 0, "partB"); - partB.addBox(7.0F, -1.0F, 15.0F, 2.0F, 4.0F, 1.0F, 0.0F); - partB.y = 8.0F; - ModelPart partRightC = new ModelPart(64, 64, 0, 19, "partRightC"); - partRightC.addBox(1.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F); - ModelPart partRightA = new ModelPart(64, 64, 0, 0, "partRightA"); - partRightA.addBox(1.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F); - partRightA.y = 9.0F; - partRightA.z = 1.0F; - ModelPart partRightB = new ModelPart(64, 64, 0, 0, "partRightB"); - partRightB.addBox(15.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F); - partRightB.y = 8.0F; - ModelPart partLeftC = new ModelPart(64, 64, 0, 19, "partLeftC"); - partLeftC.addBox(0.0F, 0.0F, 1.0F, 15.0F, 9.0F, 14.0F, 0.0F); - ModelPart partLeftA = new ModelPart(64, 64, 0, 0, "partLeftA"); - partLeftA.addBox(0.0F, 0.0F, 0.0F, 15.0F, 5.0F, 14.0F, 0.0F); - partLeftA.y = 9.0F; - partLeftA.z = 1.0F; - ModelPart partLeftB = new ModelPart(64, 64, 0, 0, "partLeftB"); - partLeftB.addBox(0.0F, -1.0F, 15.0F, 1.0F, 4.0F, 1.0F, 0.0F); - partLeftB.y = 8.0F; + 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); } } diff --git a/gradle.properties b/gradle.properties index 9e25e84c..83215295 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ archives_base_name = better-end patchouli_version = 55-FABRIC-SNAPSHOT fabric_version = 0.36.1+1.17 bclib_version = 0.2.0 -rei_version = 6.0.262-alpha +rei_version = 6.0.264-alpha canvas_version = 1.0.+ From fbdb4559c10606157f4aa2e55b9a7ede50ff60d5 Mon Sep 17 00:00:00 2001 From: Frank Bauer Date: Wed, 14 Jul 2021 12:10:19 +0200 Subject: [PATCH 2/2] Mine sand using shovel --- gradle.properties | 2 +- src/main/java/ru/betterend/registry/EndTags.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 509aedca..f8981ac2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ archives_base_name=better-end # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api patchouli_version = 55-FABRIC-SNAPSHOT fabric_version = 0.36.1+1.17 -bclib_version = 0.2.0 +bclib_version = 0.2.2 rei_version = 6.0.264-alpha canvas_version = 1.0.+ diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index 27b6d08a..a961aa12 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -63,7 +63,7 @@ public class EndTags { TagHelper.addTag(TagAPI.MINEABLE_HOE, block); } else if (material.equals(Material.SAND)) { - TagHelper.addTag(TagAPI.MINEABLE_HOE, block); + TagHelper.addTag(TagAPI.MINEABLE_SHOVEL, block); } if (block instanceof EndTerrainBlock) {