Merge pull request #2 from ItsMaddieNow/model-fix

🐛 Use Regular Cross Model For 1x Flowers
ItsMaddieNow · Oct 19, 2023 · 22d1aa1 · 22d1aa1
2 parents a664781 + 5a507e2
commit 22d1aa1
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/java/io/github/ItsMaddieNow/building_tweaks/flowers/ResourcePack.java b/src/main/java/io/github/ItsMaddieNow/building_tweaks/flowers/ResourcePack.java
@@ -13,6 +13,7 @@
 
 import java.util.stream.IntStream;
 
+import static java.lang.Math.min;
 import static net.devtech.arrp.json.loot.JLootTable.*;
 
 public class ResourcePack {
@@ -53,6 +54,7 @@ public static void resourceGen(Identifier id){
 			path = path.substring(0,path.length()-6);
 		}
 		// Create models for each blockstate
+		RESOURCE_PACK.addModel(JModel.model("minecraft:block/cross").textures(JModel.textures().var("cross", namespace + ":block/" + path)), new Identifier(namespace, "block/" + path + "_base"));
 		RESOURCE_PACK.addModel(JModel.model("minecraft:block/crossx1").textures(JModel.textures().var("cross", namespace + ":block/" + path)), new Identifier(namespace, "block/" + path + "x1"));
 		RESOURCE_PACK.addModel(JModel.model("minecraft:block/crossx2").textures(JModel.textures().var("cross", namespace + ":block/" + path)), new Identifier(namespace, "block/" + path + "x2"));
 		RESOURCE_PACK.addModel(JModel.model("minecraft:block/crossx3").textures(JModel.textures().var("cross", namespace + ":block/" + path)), new Identifier(namespace, "block/" + path + "x3"));
@@ -63,12 +65,19 @@ public static void resourceGen(Identifier id){
 			new Identifier(namespace, "block/" + path + "x3"),
 			new Identifier(namespace, "block/" + path + "x2"),
 			new Identifier(namespace, "block/" + path + "x1")
-
 		};
 		JState state = JState.state();
+		for(int j = 0; j <= 3; j++){
+			state.add(new JMultipart().when(
+				new JWhen().add(new JWhen.StateBuilder()
+					.add("flowers", new String[]{"1"})
+					.add("facing",DIRECTIONS[j])
+				)).addModel(new JBlockModel(new Identifier(namespace, "block/" + path + "_base")).y(j*90))
+			);
+		}
 		for(int i = 3; i >= 0; i--){
-			String[] conditions = new String[i+1];
-            IntStream.rangeClosed(0, i).forEach(j -> conditions[j] = Integer.toString(4-j));
+			String[] conditions = new String[min(i+1,3)];
+            IntStream.rangeClosed(0, conditions.length-1).forEach(j -> conditions[j] = Integer.toString(4-j));
 			for(int j = 0; j <= 3; j++){
 				state.add(new JMultipart().when(
 					new JWhen().add(new JWhen.StateBuilder()