diff --git a/Better-Leaves-(Programmer-Art)-9.1.zip b/Better-Leaves-(Programmer-Art)-9.1.zip new file mode 100644 index 0000000..cb845f5 Binary files /dev/null and b/Better-Leaves-(Programmer-Art)-9.1.zip differ diff --git a/Better-Leaves-9.1.zip b/Better-Leaves-9.1.zip index cfdb28b..1b6b608 100644 Binary files a/Better-Leaves-9.1.zip and b/Better-Leaves-9.1.zip differ diff --git a/assets/environmental/blockstates/hanging_willow_leaves.json b/assets/environmental/blockstates/hanging_willow_leaves.json deleted file mode 100644 index a8018a1..0000000 --- a/assets/environmental/blockstates/hanging_willow_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "environmental:block/hanging_willow_leaves1" - }, - { - "model": "environmental:block/hanging_willow_leaves1", - "y": 90 - }, - { - "model": "environmental:block/hanging_willow_leaves1", - "y": 180 - }, - { - "model": "environmental:block/hanging_willow_leaves1", - "y": 270 - }, - { - "model": "environmental:block/hanging_willow_leaves2" - }, - { - "model": "environmental:block/hanging_willow_leaves2", - "y": 90 - }, - { - "model": "environmental:block/hanging_willow_leaves2", - "y": 180 - }, - { - "model": "environmental:block/hanging_willow_leaves2", - "y": 270 - }, - { - "model": "environmental:block/hanging_willow_leaves3" - }, - { - "model": "environmental:block/hanging_willow_leaves3", - "y": 90 - }, - { - "model": "environmental:block/hanging_willow_leaves3", - "y": 180 - }, - { - "model": "environmental:block/hanging_willow_leaves3", - "y": 270 - }, - { - "model": "environmental:block/hanging_willow_leaves4" - }, - { - "model": "environmental:block/hanging_willow_leaves4", - "y": 90 - }, - { - "model": "environmental:block/hanging_willow_leaves4", - "y": 180 - }, - { - "model": "environmental:block/hanging_willow_leaves4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/environmental/models/block/hanging_willow_leaves.json b/assets/environmental/models/block/hanging_willow_leaves.json deleted file mode 100644 index 36777f0..0000000 --- a/assets/environmental/models/block/hanging_willow_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "environmental:block/hanging_willow_leaves" - } -} \ No newline at end of file diff --git a/assets/environmental/models/block/hanging_willow_leaves1.json b/assets/environmental/models/block/hanging_willow_leaves1.json deleted file mode 100644 index 5bb1f58..0000000 --- a/assets/environmental/models/block/hanging_willow_leaves1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "environmental:block/hanging_willow_leaves" - } -} \ No newline at end of file diff --git a/assets/environmental/models/block/hanging_willow_leaves2.json b/assets/environmental/models/block/hanging_willow_leaves2.json deleted file mode 100644 index 2f385de..0000000 --- a/assets/environmental/models/block/hanging_willow_leaves2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "environmental:block/hanging_willow_leaves" - } -} \ No newline at end of file diff --git a/assets/environmental/models/block/hanging_willow_leaves3.json b/assets/environmental/models/block/hanging_willow_leaves3.json deleted file mode 100644 index b86a565..0000000 --- a/assets/environmental/models/block/hanging_willow_leaves3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "environmental:block/hanging_willow_leaves" - } -} \ No newline at end of file diff --git a/assets/environmental/models/block/hanging_willow_leaves4.json b/assets/environmental/models/block/hanging_willow_leaves4.json deleted file mode 100644 index 0a10ff9..0000000 --- a/assets/environmental/models/block/hanging_willow_leaves4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "environmental:block/hanging_willow_leaves" - } -} \ No newline at end of file diff --git a/assets/environmental/textures/block/TODO b/assets/environmental/textures/block/TODO new file mode 100644 index 0000000..e69de29 diff --git a/assets/environmental/textures/block/hanging_willow_leaves.png b/assets/environmental/textures/block/hanging_willow_leaves.png deleted file mode 100644 index 1e7fd46..0000000 Binary files a/assets/environmental/textures/block/hanging_willow_leaves.png and /dev/null differ diff --git a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_0.json b/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_0.json deleted file mode 100644 index 5a40dbe..0000000 --- a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_0.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_01" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_01", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_01", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_01", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_02" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_02", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_02", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_02", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_03" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_03", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_03", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_03", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_04" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_04", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_04", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_04", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_1.json b/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_1.json deleted file mode 100644 index ba18008..0000000 --- a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_1.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_11" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_11", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_11", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_11", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_12" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_12", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_12", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_12", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_13" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_13", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_13", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_13", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_14" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_14", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_14", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_14", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_2.json b/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_2.json deleted file mode 100644 index dd88d15..0000000 --- a/assets/regions_unexplored/blockstates/apple_oak_leaves_stage_2.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_21" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_21", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_21", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_21", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_22" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_22", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_22", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_22", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_23" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_23", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_23", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_23", - "y": 270 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_24" - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_24", - "y": 90 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_24", - "y": 180 - }, - { - "model": "regions_unexplored:block/apple_oak_leaves_stage_24", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/bamboo_log_leaves.json b/assets/regions_unexplored/blockstates/bamboo_log_leaves.json deleted file mode 100644 index 7c53100..0000000 --- a/assets/regions_unexplored/blockstates/bamboo_log_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/bamboo_log_leaves1" - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves1", - "y": 90 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves1", - "y": 180 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves1", - "y": 270 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves2" - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves2", - "y": 90 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves2", - "y": 180 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves2", - "y": 270 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves3" - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves3", - "y": 90 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves3", - "y": 180 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves3", - "y": 270 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves4" - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves4", - "y": 90 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves4", - "y": 180 - }, - { - "model": "regions_unexplored:block/bamboo_log_leaves4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/flowering_leaves_flower.json b/assets/regions_unexplored/blockstates/flowering_leaves_flower.json deleted file mode 100644 index ed77f8d..0000000 --- a/assets/regions_unexplored/blockstates/flowering_leaves_flower.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/flowering_leaves_flower1" - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower1", - "y": 90 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower1", - "y": 180 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower1", - "y": 270 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower2" - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower2", - "y": 90 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower2", - "y": 180 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower2", - "y": 270 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower3" - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower3", - "y": 90 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower3", - "y": 180 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower3", - "y": 270 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower4" - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower4", - "y": 90 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower4", - "y": 180 - }, - { - "model": "regions_unexplored:block/flowering_leaves_flower4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/joshua_leaves_bottom.json b/assets/regions_unexplored/blockstates/joshua_leaves_bottom.json deleted file mode 100644 index ba86237..0000000 --- a/assets/regions_unexplored/blockstates/joshua_leaves_bottom.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/joshua_leaves_bottom1" - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom1", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom1", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom1", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom2" - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom2", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom2", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom2", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom3" - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom3", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom3", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom3", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom4" - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom4", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom4", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_bottom4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/joshua_leaves_top.json b/assets/regions_unexplored/blockstates/joshua_leaves_top.json deleted file mode 100644 index 9d3c6c7..0000000 --- a/assets/regions_unexplored/blockstates/joshua_leaves_top.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/joshua_leaves_top1" - }, - { - "model": "regions_unexplored:block/joshua_leaves_top1", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top1", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top1", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top2" - }, - { - "model": "regions_unexplored:block/joshua_leaves_top2", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top2", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top2", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top3" - }, - { - "model": "regions_unexplored:block/joshua_leaves_top3", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top3", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top3", - "y": 270 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top4" - }, - { - "model": "regions_unexplored:block/joshua_leaves_top4", - "y": 90 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top4", - "y": 180 - }, - { - "model": "regions_unexplored:block/joshua_leaves_top4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/palm_leaves_side.json b/assets/regions_unexplored/blockstates/palm_leaves_side.json deleted file mode 100644 index b343bef..0000000 --- a/assets/regions_unexplored/blockstates/palm_leaves_side.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/palm_leaves_side1" - }, - { - "model": "regions_unexplored:block/palm_leaves_side1", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_side1", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_side1", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_side2" - }, - { - "model": "regions_unexplored:block/palm_leaves_side2", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_side2", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_side2", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_side3" - }, - { - "model": "regions_unexplored:block/palm_leaves_side3", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_side3", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_side3", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_side4" - }, - { - "model": "regions_unexplored:block/palm_leaves_side4", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_side4", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_side4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/blockstates/palm_leaves_top.json b/assets/regions_unexplored/blockstates/palm_leaves_top.json deleted file mode 100644 index 7e4bb9f..0000000 --- a/assets/regions_unexplored/blockstates/palm_leaves_top.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "regions_unexplored:block/palm_leaves_top1" - }, - { - "model": "regions_unexplored:block/palm_leaves_top1", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_top1", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_top1", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_top2" - }, - { - "model": "regions_unexplored:block/palm_leaves_top2", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_top2", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_top2", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_top3" - }, - { - "model": "regions_unexplored:block/palm_leaves_top3", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_top3", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_top3", - "y": 270 - }, - { - "model": "regions_unexplored:block/palm_leaves_top4" - }, - { - "model": "regions_unexplored:block/palm_leaves_top4", - "y": 90 - }, - { - "model": "regions_unexplored:block/palm_leaves_top4", - "y": 180 - }, - { - "model": "regions_unexplored:block/palm_leaves_top4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_0.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_0.json deleted file mode 100644 index 467485e..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_0" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_01.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_01.json deleted file mode 100644 index a8589bd..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_01.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_0" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_02.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_02.json deleted file mode 100644 index ad11bb1..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_02.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_0" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_03.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_03.json deleted file mode 100644 index 44894a6..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_03.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_0" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_04.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_04.json deleted file mode 100644 index c60b56c..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_04.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_0" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_1.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_1.json deleted file mode 100644 index 5d0dd53..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_1" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_11.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_11.json deleted file mode 100644 index 8d5d27d..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_11.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_1" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_12.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_12.json deleted file mode 100644 index 7b4fd5c..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_12.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_1" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_13.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_13.json deleted file mode 100644 index 84decc2..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_13.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_1" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_14.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_14.json deleted file mode 100644 index e658475..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_14.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_1" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_2.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_2.json deleted file mode 100644 index 38fd694..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_2" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_21.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_21.json deleted file mode 100644 index 6e6428e..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_21.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_2" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_22.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_22.json deleted file mode 100644 index a5ce83f..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_22.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_2" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_23.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_23.json deleted file mode 100644 index 5e0c27c..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_23.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_2" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_24.json b/assets/regions_unexplored/models/block/apple_oak_leaves_stage_24.json deleted file mode 100644 index 2f5ad79..0000000 --- a/assets/regions_unexplored/models/block/apple_oak_leaves_stage_24.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/apple_oak_leaves_stage_2" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/bamboo_log_leaves.json b/assets/regions_unexplored/models/block/bamboo_log_leaves.json deleted file mode 100644 index 7a1e8da..0000000 --- a/assets/regions_unexplored/models/block/bamboo_log_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/bamboo_log_leaves" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/bamboo_log_leaves1.json b/assets/regions_unexplored/models/block/bamboo_log_leaves1.json deleted file mode 100644 index 8f7db16..0000000 --- a/assets/regions_unexplored/models/block/bamboo_log_leaves1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/bamboo_log_leaves" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/bamboo_log_leaves2.json b/assets/regions_unexplored/models/block/bamboo_log_leaves2.json deleted file mode 100644 index c981b90..0000000 --- a/assets/regions_unexplored/models/block/bamboo_log_leaves2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/bamboo_log_leaves" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/bamboo_log_leaves3.json b/assets/regions_unexplored/models/block/bamboo_log_leaves3.json deleted file mode 100644 index 833eb5f..0000000 --- a/assets/regions_unexplored/models/block/bamboo_log_leaves3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/bamboo_log_leaves" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/bamboo_log_leaves4.json b/assets/regions_unexplored/models/block/bamboo_log_leaves4.json deleted file mode 100644 index 415a7d4..0000000 --- a/assets/regions_unexplored/models/block/bamboo_log_leaves4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/bamboo_log_leaves" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/flowering_leaves_flower.json b/assets/regions_unexplored/models/block/flowering_leaves_flower.json deleted file mode 100644 index 1cc3ad0..0000000 --- a/assets/regions_unexplored/models/block/flowering_leaves_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/flowering_leaves_flower" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/flowering_leaves_flower1.json b/assets/regions_unexplored/models/block/flowering_leaves_flower1.json deleted file mode 100644 index 59875a5..0000000 --- a/assets/regions_unexplored/models/block/flowering_leaves_flower1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/flowering_leaves_flower" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/flowering_leaves_flower2.json b/assets/regions_unexplored/models/block/flowering_leaves_flower2.json deleted file mode 100644 index 804e383..0000000 --- a/assets/regions_unexplored/models/block/flowering_leaves_flower2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/flowering_leaves_flower" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/flowering_leaves_flower3.json b/assets/regions_unexplored/models/block/flowering_leaves_flower3.json deleted file mode 100644 index 6242f35..0000000 --- a/assets/regions_unexplored/models/block/flowering_leaves_flower3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/flowering_leaves_flower" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/flowering_leaves_flower4.json b/assets/regions_unexplored/models/block/flowering_leaves_flower4.json deleted file mode 100644 index 87f5457..0000000 --- a/assets/regions_unexplored/models/block/flowering_leaves_flower4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/flowering_leaves_flower" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_bottom.json b/assets/regions_unexplored/models/block/joshua_leaves_bottom.json deleted file mode 100644 index 641099d..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_bottom" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_bottom1.json b/assets/regions_unexplored/models/block/joshua_leaves_bottom1.json deleted file mode 100644 index 4f7f212..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_bottom1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy1", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_bottom" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_bottom2.json b/assets/regions_unexplored/models/block/joshua_leaves_bottom2.json deleted file mode 100644 index ecab355..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_bottom2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy2", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_bottom" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_bottom3.json b/assets/regions_unexplored/models/block/joshua_leaves_bottom3.json deleted file mode 100644 index c34de67..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_bottom3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy3", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_bottom" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_bottom4.json b/assets/regions_unexplored/models/block/joshua_leaves_bottom4.json deleted file mode 100644 index 6301caa..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_bottom4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy4", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_bottom" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_top.json b/assets/regions_unexplored/models/block/joshua_leaves_top.json deleted file mode 100644 index 3760f84..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_top1.json b/assets/regions_unexplored/models/block/joshua_leaves_top1.json deleted file mode 100644 index 9e23a10..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_top1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy1", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_top2.json b/assets/regions_unexplored/models/block/joshua_leaves_top2.json deleted file mode 100644 index fb626d7..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_top2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy2", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_top3.json b/assets/regions_unexplored/models/block/joshua_leaves_top3.json deleted file mode 100644 index 46ccec9..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_top3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy3", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/joshua_leaves_top4.json b/assets/regions_unexplored/models/block/joshua_leaves_top4.json deleted file mode 100644 index 1a263dc..0000000 --- a/assets/regions_unexplored/models/block/joshua_leaves_top4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves_legacy4", - "textures": { - "all": "regions_unexplored:block/joshua_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_side.json b/assets/regions_unexplored/models/block/palm_leaves_side.json deleted file mode 100644 index db08bba..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/palm_leaves_side" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_side1.json b/assets/regions_unexplored/models/block/palm_leaves_side1.json deleted file mode 100644 index 8a85630..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_side1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/palm_leaves_side" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_side2.json b/assets/regions_unexplored/models/block/palm_leaves_side2.json deleted file mode 100644 index 9bdc0bf..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_side2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/palm_leaves_side" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_side3.json b/assets/regions_unexplored/models/block/palm_leaves_side3.json deleted file mode 100644 index 7705636..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_side3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/palm_leaves_side" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_side4.json b/assets/regions_unexplored/models/block/palm_leaves_side4.json deleted file mode 100644 index 717385d..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_side4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/palm_leaves_side" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_top.json b/assets/regions_unexplored/models/block/palm_leaves_top.json deleted file mode 100644 index c35530a..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "regions_unexplored:block/palm_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_top1.json b/assets/regions_unexplored/models/block/palm_leaves_top1.json deleted file mode 100644 index 0f09e05..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_top1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "regions_unexplored:block/palm_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_top2.json b/assets/regions_unexplored/models/block/palm_leaves_top2.json deleted file mode 100644 index dd2d278..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_top2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "regions_unexplored:block/palm_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_top3.json b/assets/regions_unexplored/models/block/palm_leaves_top3.json deleted file mode 100644 index 88a0ad2..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_top3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "regions_unexplored:block/palm_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/models/block/palm_leaves_top4.json b/assets/regions_unexplored/models/block/palm_leaves_top4.json deleted file mode 100644 index f40ab75..0000000 --- a/assets/regions_unexplored/models/block/palm_leaves_top4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "regions_unexplored:block/palm_leaves_top" - } -} \ No newline at end of file diff --git a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_0.png b/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_0.png deleted file mode 100644 index 15e01fa..0000000 Binary files a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_0.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_1.png b/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_1.png deleted file mode 100644 index b5adf13..0000000 Binary files a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_1.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_2.png b/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_2.png deleted file mode 100644 index 62b99f2..0000000 Binary files a/assets/regions_unexplored/textures/block/apple_oak_leaves_stage_2.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/bamboo_log_leaves.png b/assets/regions_unexplored/textures/block/bamboo_log_leaves.png deleted file mode 100644 index 5ebe896..0000000 Binary files a/assets/regions_unexplored/textures/block/bamboo_log_leaves.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/flowering_leaves_flower.png b/assets/regions_unexplored/textures/block/flowering_leaves_flower.png deleted file mode 100644 index 071214d..0000000 Binary files a/assets/regions_unexplored/textures/block/flowering_leaves_flower.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/palm_leaves_side.png b/assets/regions_unexplored/textures/block/palm_leaves_side.png deleted file mode 100644 index 8f5124f..0000000 Binary files a/assets/regions_unexplored/textures/block/palm_leaves_side.png and /dev/null differ diff --git a/assets/regions_unexplored/textures/block/palm_leaves_top.png b/assets/regions_unexplored/textures/block/palm_leaves_top.png deleted file mode 100644 index de17032..0000000 Binary files a/assets/regions_unexplored/textures/block/palm_leaves_top.png and /dev/null differ diff --git a/gen_pack.py b/gen_pack.py index 443eac1..a57401e 100644 --- a/gen_pack.py +++ b/gen_pack.py @@ -59,6 +59,7 @@ def autoGen(jsonData, args): if (os.path.exists("./assets")): shutil.rmtree("./assets") copy_tree("./base/assets/", "./assets/") filecount = 0 + if (args.programmer): unpackTexturepacks("./input/programmer_art") unpackTexturepacks() unpackMods() scanModsForTextures() @@ -95,7 +96,7 @@ def autoGen(jsonData, args): printOverride("Using legacy model as requested") # Generate texture - if not leaf.use_legacy_model: generateTexture(root, infile) + if not leaf.use_legacy_model: generateTexture(root, infile, args.programmer) # Set block id and apply overrides if leaf.getId() in block_id_overrides: @@ -147,6 +148,7 @@ def autoGen(jsonData, args): filecount += 1 # End of autoGen print() + if (args.programmer): cleanupTexturepacks("./input/programmer_art") cleanupTexturepacks() cleanupMods() printCyan("Processed {} leaf blocks".format(filecount)) @@ -177,8 +179,8 @@ def scanModsForTextures(): shutil.copyfile(os.path.join(root, infile), os.path.join(inputfolder, infile)) -def unpackTexturepacks(): - for root, dirs, files in os.walk("./input/texturepacks"): +def unpackTexturepacks(rootFolder="./input/texturepacks"): + for root, dirs, files in os.walk(rootFolder): for infile in files: if infile.endswith(".zip"): print("Unpacking texturepack: "+infile) @@ -186,26 +188,27 @@ def unpackTexturepacks(): zf.extractall(os.path.join(root, infile.replace(".zip", "_temp"))) zf.close() -def cleanupTexturepacks(): - for root, dirs, files in os.walk("./input/texturepacks"): +def cleanupTexturepacks(rootFolder="./input/texturepacks"): + for root, dirs, files in os.walk(rootFolder): for folder in dirs: if folder.endswith("_temp"): shutil.rmtree(os.path.join(root, folder)) -def scanPacksForTexture(baseRoot, baseInfile): - for root, dirs, files in os.walk("./input/texturepacks"): +def scanPacksForTexture(baseRoot, baseInfile, rootFolder="./input/texturepacks"): + for root, dirs, files in os.walk(rootFolder): for infile in files: if "assets" in root and "assets" in baseRoot: if infile.endswith(".png") and (len(root.split("/")) > 3) and (baseInfile == infile) and (root.split("assets")[1] == baseRoot.split("assets")[1]): - printCyan(" Using texture from: " + root.split("assets")[0].replace("./input/texturepacks/", "")) + printCyan(" Using texture from: " + root.split("assets")[0].replace(rootFolder, "")) return root; return baseRoot -def generateTexture(root, infile): +def generateTexture(root, infile, useProgrammerArt=False): outfolder = root.replace("assets", "").replace("input", "assets") os.makedirs(outfolder, exist_ok=True) root = scanPacksForTexture(root, infile) + if useProgrammerArt: root = scanPacksForTexture(root, infile, "./input/programmer_art") outfile = os.path.splitext(os.path.join(outfolder, infile))[0] + ".png" if infile != outfile: @@ -393,6 +396,7 @@ if __name__ == '__main__': parser.add_argument('version', type=str) parser.add_argument('edition', nargs="*", type=str, default="§cCustom Edition", help="Define your edition name") parser.add_argument('--legacy', '-l', action='store_true', help="Use legacy models (from 8.1) for all leaves") + parser.add_argument('--programmer', '-p', action='store_true', help="Use programmer art textures") args = parser.parse_args() print(f"Arguments: {args}") @@ -410,7 +414,7 @@ if __name__ == '__main__': writeMetadata(args) print() print("Zipping it up...") - makeZip(f"Better-Leaves-{args.version}.zip"); + makeZip(f"Better-Leaves-{args.version}.zip" if not args.programmer else f"Better-Leaves-(Programmer-Art)-{args.version}.zip"); print("Done!") print("--- Finished in %s seconds ---" % (round((time.perf_counter() - start_time)*1000)/1000)) \ No newline at end of file diff --git a/input/assets/twilightforest/textures/block/darkwood_leaves.png b/input/assets/twilightforest/textures/block/darkwood_leaves.png index 5b41d4a..55b00a2 100644 Binary files a/input/assets/twilightforest/textures/block/darkwood_leaves.png and b/input/assets/twilightforest/textures/block/darkwood_leaves.png differ diff --git a/input/programmer_art/TwilightForest_ProgrammerArt/assets/twilightforest/textures/block/darkwood_leaves.png b/input/programmer_art/TwilightForest_ProgrammerArt/assets/twilightforest/textures/block/darkwood_leaves.png new file mode 100644 index 0000000..5b41d4a Binary files /dev/null and b/input/programmer_art/TwilightForest_ProgrammerArt/assets/twilightforest/textures/block/darkwood_leaves.png differ diff --git a/input/programmer_art/programmer_art.zip b/input/programmer_art/programmer_art.zip new file mode 100644 index 0000000..c9f8ed4 Binary files /dev/null and b/input/programmer_art/programmer_art.zip differ diff --git a/input/texturepacks/TwilightJAPPAPack-1.20.3-1.1.0.zip b/input/texturepacks/TwilightJAPPAPack-1.20.3-1.1.0.zip deleted file mode 100644 index edaa131..0000000 Binary files a/input/texturepacks/TwilightJAPPAPack-1.20.3-1.1.0.zip and /dev/null differ