compat: Enderscape

.gitignore

@@ -1,2 +1,3 @@
 /.alt
 *__pycache__
+Better-Leaves-*.zip

assets/betterend/blockstates/cave_bush.json

@@ -0,0 +1,246 @@
+{
+    "variants": {
+        "": [
+            {
+                "model": "betterend:block/cave_bush_leaves_11"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_11",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_11",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_11",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_12"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_12",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_12",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_12",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_13"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_13",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_13",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_13",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_14"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_14",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_14",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_14",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_21"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_21",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_21",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_21",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_22"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_22",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_22",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_22",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_23"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_23",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_23",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_23",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_24"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_24",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_24",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_24",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_31"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_31",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_31",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_31",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_32"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_32",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_32",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_32",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_33"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_33",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_33",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_33",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_34"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_34",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_34",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_34",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_41"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_41",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_41",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_41",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_42"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_42",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_42",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_42",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_43"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_43",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_43",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_43",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_44"
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_44",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_44",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/cave_bush_leaves_44",
+                "y": 270
+            }
+        ]
+    }
+}

assets/betterend/blockstates/lucernia_leaves.json

@@ -0,0 +1,246 @@
+{
+    "variants": {
+        "": [
+            {
+                "model": "betterend:block/lucernia_leaves_11"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_11",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_11",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_11",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_12"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_12",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_12",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_12",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_13"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_13",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_13",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_13",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_14"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_14",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_14",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_14",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_21"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_21",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_21",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_21",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_22"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_22",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_22",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_22",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_23"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_23",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_23",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_23",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_24"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_24",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_24",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_24",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_31"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_31",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_31",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_31",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_32"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_32",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_32",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_32",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_33"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_33",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_33",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_33",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_34"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_34",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_34",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_34",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_41"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_41",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_41",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_41",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_42"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_42",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_42",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_42",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_43"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_43",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_43",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_43",
+                "y": 270
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_44"
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_44",
+                "y": 90
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_44",
+                "y": 180
+            },
+            {
+                "model": "betterend:block/lucernia_leaves_44",
+                "y": 270
+            }
+        ]
+    }
+}

assets/betterend/models/block/cave_bush_leaves_1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_11.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_12.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_13.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_14.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_2"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_21.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_2"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_22.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_2"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_23.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_2"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_24.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_2"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_3.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_3"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_31.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_3"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_32.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_3"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_33.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_3"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_34.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_3"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_4.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_4"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_41.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_4"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_42.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_4"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_43.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_4"
+    }
+}

assets/betterend/models/block/cave_bush_leaves_44.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_4"
+    }
+}

assets/betterend/models/block/lucernia_leaves_1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterend/models/block/lucernia_leaves_11.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterend/models/block/lucernia_leaves_12.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterend/models/block/lucernia_leaves_13.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterend/models/block/lucernia_leaves_14.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterend/models/block/lucernia_leaves_2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_2"
+    }
+}

assets/betterend/models/block/lucernia_leaves_21.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_2"
+    }
+}

assets/betterend/models/block/lucernia_leaves_22.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_2"
+    }
+}

assets/betterend/models/block/lucernia_leaves_23.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_2"
+    }
+}

assets/betterend/models/block/lucernia_leaves_24.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_2"
+    }
+}

assets/betterend/models/block/lucernia_leaves_3.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_3"
+    }
+}

assets/betterend/models/block/lucernia_leaves_31.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_3"
+    }
+}

assets/betterend/models/block/lucernia_leaves_32.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_3"
+    }
+}

assets/betterend/models/block/lucernia_leaves_33.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_3"
+    }
+}

assets/betterend/models/block/lucernia_leaves_34.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_3"
+    }
+}

assets/betterend/models/block/lucernia_leaves_4.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_4"
+    }
+}

assets/betterend/models/block/lucernia_leaves_41.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_4"
+    }
+}

assets/betterend/models/block/lucernia_leaves_42.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_4"
+    }
+}

assets/betterend/models/block/lucernia_leaves_43.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_4"
+    }
+}

assets/betterend/models/block/lucernia_leaves_44.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_4"
+    }
+}

assets/betterend/models/item/cave_bush.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/cave_bush_leaves_1"
+    }
+}

assets/betterend/models/item/lucernia_leaves.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "betterend:block/lucernia_leaves_1"
+    }
+}

assets/betterleaves/models/block/leaves3.json

@@ -22,9 +22,9 @@
 			}
 		},
 		{
-			"from": [-6.98223, -6, 8.99264],
+			"from": [-6.98223, -7, 8.99264],
-			"to": [25.01777, 22, 8.99264],
+			"to": [25.01777, 21, 8.99264],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [9.01041, 8, 9]},
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [9.01041, 7, 9]},
 			"faces": {
 				"north": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0}

assets/betterleaves/models/block/leaves4.json

@@ -31,9 +31,9 @@
 			}
 		},
 		{
-			"from": [-7.98223, -6, 8.00736],
+			"from": [-7.98223, -5, 8.00736],
-			"to": [24.01777, 22, 8.00736],
+			"to": [24.01777, 23, 8.00736],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8.01041, 8, 8]},
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [8.01041, 9, 8]},
 			"faces": {
 				"north": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0}

assets/enderscape/blockstates/veiled_leaves.json

@@ -0,0 +1,66 @@
+{
+    "variants": {
+        "": [
+            {
+                "model": "enderscape:block/veiled_leaves1"
+            },
+            {
+                "model": "enderscape:block/veiled_leaves1",
+                "y": 90
+            },
+            {
+                "model": "enderscape:block/veiled_leaves1",
+                "y": 180
+            },
+            {
+                "model": "enderscape:block/veiled_leaves1",
+                "y": 270
+            },
+            {
+                "model": "enderscape:block/veiled_leaves2"
+            },
+            {
+                "model": "enderscape:block/veiled_leaves2",
+                "y": 90
+            },
+            {
+                "model": "enderscape:block/veiled_leaves2",
+                "y": 180
+            },
+            {
+                "model": "enderscape:block/veiled_leaves2",
+                "y": 270
+            },
+            {
+                "model": "enderscape:block/veiled_leaves3"
+            },
+            {
+                "model": "enderscape:block/veiled_leaves3",
+                "y": 90
+            },
+            {
+                "model": "enderscape:block/veiled_leaves3",
+                "y": 180
+            },
+            {
+                "model": "enderscape:block/veiled_leaves3",
+                "y": 270
+            },
+            {
+                "model": "enderscape:block/veiled_leaves4"
+            },
+            {
+                "model": "enderscape:block/veiled_leaves4",
+                "y": 90
+            },
+            {
+                "model": "enderscape:block/veiled_leaves4",
+                "y": 180
+            },
+            {
+                "model": "enderscape:block/veiled_leaves4",
+                "y": 270
+            }
+        ]
+    }
+}

assets/enderscape/models/block/veiled_leaves.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves",
+    "textures": {
+        "all": "enderscape:block/veiled_leaves"
+    }
+}

assets/enderscape/models/block/veiled_leaves1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves1",
+    "textures": {
+        "all": "enderscape:block/veiled_leaves"
+    }
+}

assets/enderscape/models/block/veiled_leaves2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves2",
+    "textures": {
+        "all": "enderscape:block/veiled_leaves"
+    }
+}

assets/enderscape/models/block/veiled_leaves3.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves3",
+    "textures": {
+        "all": "enderscape:block/veiled_leaves"
+    }
+}

assets/enderscape/models/block/veiled_leaves4.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterleaves:block/leaves4",
+    "textures": {
+        "all": "enderscape:block/veiled_leaves"
+    }
+}

base/assets/betterleaves/models/block/leaves3.json

@@ -22,9 +22,9 @@
 			}
 		},
 		{
-			"from": [-6.98223, -6, 8.99264],
+			"from": [-6.98223, -7, 8.99264],
-			"to": [25.01777, 22, 8.99264],
+			"to": [25.01777, 21, 8.99264],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [9.01041, 8, 9]},
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [9.01041, 7, 9]},
 			"faces": {
 				"north": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0}

base/assets/betterleaves/models/block/leaves4.json

@@ -31,9 +31,9 @@
 			}
 		},
 		{
-			"from": [-7.98223, -6, 8.00736],
+			"from": [-7.98223, -5, 8.00736],
-			"to": [24.01777, 22, 8.00736],
+			"to": [24.01777, 23, 8.00736],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [8.01041, 8, 8]},
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [8.01041, 9, 8]},
 			"faces": {
 				"north": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0},
 				"south": {"uv": [0, 1, 16, 15], "texture": "#all", "tintindex": 0}

gen_pack.py

@@ -10,7 +10,7 @@ import time
 
 # Local imports
 from src.generator import autoGen
-from src.download_helper import downloadFromModrinth
+from src.download_helper import downloadPack
 from src.zip_utils import makeZip
 import src.json_utils
 
@@ -43,7 +43,7 @@ if __name__ == '__main__':
     print("https://github.com/TeamMidnightDust/BetterLeavesLite")
     print()
     if args.minify: src.json_utils.minify = True
-    if args.download != None: downloadFromModrinth(args.download)
+    if args.download != None: downloadPack(args.download)
 
     # Loads overrides from the json file
     f = open('./input/overrides.json')

input/assets/betterend/textures/block/cave_bush_leaves_1.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:cave_bush",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/cave_bush_leaves_2.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:cave_bush",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/cave_bush_leaves_3.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:cave_bush",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/cave_bush_leaves_4.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:cave_bush",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/lucernia_leaves_1.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:lucernia_leaves",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/lucernia_leaves_2.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:lucernia_leaves",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/lucernia_leaves_3.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:lucernia_leaves",
+        "state": ""
+    }
+}

input/assets/betterend/textures/block/lucernia_leaves_4.betterleaves.json

@@ -0,0 +1,6 @@
+{
+    "blockStateData": {
+        "block": "betterend:lucernia_leaves",
+        "state": ""
+    }
+}

input/assets/enderscape/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 bunten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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.

input/overrides.json

@@ -72,6 +72,8 @@
         "betterend:dragon_tree_leaves",
         "betterend:pythadendron_leaves",
         "betterend:shadow_berry_leaves",
+        "betterend:lucernia_leaves_1",
+        "betterend:cave_bush_leaves_1",
         "ars_elemental:yellow_archwood_leaves"
     ],
     "blockStateCopies": {

src/download_helper.py

@@ -1,18 +1,28 @@
 from os import path
 from tqdm import tqdm
 import requests
+import re
+
+def downloadPack(input: str):
+    if re.search("(http://*)|(https://*)", input) != None and input.endswith(".zip"):
+        downloadZip(input)
+    else:
+        downloadFromModrinth(input)
 
 def downloadFromModrinth(project_slug):
     response = requests.get(f'https://api.modrinth.com/v2/project/{project_slug}/version')
     latestFile = response.json()[0]['files'][0]
     latestFileURL = latestFile['url']
     if len(latestFileURL) < 1: raise Exception(f'Could not get the latest version URL for {project_slug}')
+    downloadZip(latestFileURL, file_name=latestFile['filename'], pack_name=project_slug)
 
-    download_stream = requests.get(latestFileURL, stream=True)
+def downloadZip(url, file_name="", pack_name=""):
-    file_name = latestFile['filename']
+    download_stream = requests.get(url, stream=True)
+    if file_name == "": file_name = url.split("/")[-1]
+    if pack_name == "": pack_name = url
     file_path = 'input/texturepacks'
 
-    print(f'Downloading texturepack: {project_slug} (Latest version: {file_name})')
+    print(f'Downloading texturepack: {pack_name} (Latest version: {file_name})')
     location = path.join(file_path, file_name)
     total = int(download_stream.headers.get('content-length', 0))
     with open(location, "wb") as handle, tqdm(

src/model_generator.py

@@ -64,6 +64,6 @@ def generateItemModel(leaf):
         # Create models folder if it doesn't exist already
         os.makedirs("assets/{}/models/item/".format(mod_namespace), exist_ok=True)
 
-        item_model_file = f"assets/{mod_namespace}/models/item/{block_name}.json"
+        item_model_file = f"assets/{mod_namespace}/models/item/{block_name}.json" if (leaf.blockstate_data == None) else f"assets/{leaf.blockstate_data.namespace}/models/item/{leaf.blockstate_data.block_name}.json"
         with open(item_model_file, "w") as f:
             dumpJson(item_model_data, f)