diff --git a/Better-Leaves-Lite-1.0.zip b/Better-Leaves-Lite-1.0.zip index 5e5eb21..7035d76 100644 Binary files a/Better-Leaves-Lite-1.0.zip and b/Better-Leaves-Lite-1.0.zip differ diff --git a/assets/palegarden/blockstates/pale_leaves.json b/assets/palegarden/blockstates/pale_leaves.json new file mode 100644 index 0000000..5c9413a --- /dev/null +++ b/assets/palegarden/blockstates/pale_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "palegarden:block/pale_leaves1" + }, + { + "model": "palegarden:block/pale_leaves1", + "y": 90 + }, + { + "model": "palegarden:block/pale_leaves1", + "y": 180 + }, + { + "model": "palegarden:block/pale_leaves1", + "y": 270 + }, + { + "model": "palegarden:block/pale_leaves2" + }, + { + "model": "palegarden:block/pale_leaves2", + "y": 90 + }, + { + "model": "palegarden:block/pale_leaves2", + "y": 180 + }, + { + "model": "palegarden:block/pale_leaves2", + "y": 270 + }, + { + "model": "palegarden:block/pale_leaves3" + }, + { + "model": "palegarden:block/pale_leaves3", + "y": 90 + }, + { + "model": "palegarden:block/pale_leaves3", + "y": 180 + }, + { + "model": "palegarden:block/pale_leaves3", + "y": 270 + }, + { + "model": "palegarden:block/pale_leaves4" + }, + { + "model": "palegarden:block/pale_leaves4", + "y": 90 + }, + { + "model": "palegarden:block/pale_leaves4", + "y": 180 + }, + { + "model": "palegarden:block/pale_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/palegarden/blockstates/pale_oak_leaves.json b/assets/palegarden/blockstates/pale_oak_leaves.json deleted file mode 100644 index 12638a7..0000000 --- a/assets/palegarden/blockstates/pale_oak_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "palegarden:block/pale_oak_leaves1" - }, - { - "model": "palegarden:block/pale_oak_leaves1", - "y": 90 - }, - { - "model": "palegarden:block/pale_oak_leaves1", - "y": 180 - }, - { - "model": "palegarden:block/pale_oak_leaves1", - "y": 270 - }, - { - "model": "palegarden:block/pale_oak_leaves2" - }, - { - "model": "palegarden:block/pale_oak_leaves2", - "y": 90 - }, - { - "model": "palegarden:block/pale_oak_leaves2", - "y": 180 - }, - { - "model": "palegarden:block/pale_oak_leaves2", - "y": 270 - }, - { - "model": "palegarden:block/pale_oak_leaves3" - }, - { - "model": "palegarden:block/pale_oak_leaves3", - "y": 90 - }, - { - "model": "palegarden:block/pale_oak_leaves3", - "y": 180 - }, - { - "model": "palegarden:block/pale_oak_leaves3", - "y": 270 - }, - { - "model": "palegarden:block/pale_oak_leaves4" - }, - { - "model": "palegarden:block/pale_oak_leaves4", - "y": 90 - }, - { - "model": "palegarden:block/pale_oak_leaves4", - "y": 180 - }, - { - "model": "palegarden:block/pale_oak_leaves4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/palegarden/models/block/pale_oak_leaves4.json b/assets/palegarden/models/block/pale_leaves1.json similarity index 59% rename from assets/palegarden/models/block/pale_oak_leaves4.json rename to assets/palegarden/models/block/pale_leaves1.json index 20b1f84..f0e51f0 100644 --- a/assets/palegarden/models/block/pale_oak_leaves4.json +++ b/assets/palegarden/models/block/pale_leaves1.json @@ -1,5 +1,5 @@ { - "parent": "betterleaves:block/leaves_notint4", + "parent": "betterleaves:block/leaves1", "textures": { "all": "palegarden:block/pale_oak_leaves" } diff --git a/assets/palegarden/models/block/pale_oak_leaves1.json b/assets/palegarden/models/block/pale_leaves2.json similarity index 59% rename from assets/palegarden/models/block/pale_oak_leaves1.json rename to assets/palegarden/models/block/pale_leaves2.json index b089290..27d1010 100644 --- a/assets/palegarden/models/block/pale_oak_leaves1.json +++ b/assets/palegarden/models/block/pale_leaves2.json @@ -1,5 +1,5 @@ { - "parent": "betterleaves:block/leaves_notint1", + "parent": "betterleaves:block/leaves2", "textures": { "all": "palegarden:block/pale_oak_leaves" } diff --git a/assets/palegarden/models/block/pale_oak_leaves2.json b/assets/palegarden/models/block/pale_leaves3.json similarity index 59% rename from assets/palegarden/models/block/pale_oak_leaves2.json rename to assets/palegarden/models/block/pale_leaves3.json index 3054cf1..c5d4945 100644 --- a/assets/palegarden/models/block/pale_oak_leaves2.json +++ b/assets/palegarden/models/block/pale_leaves3.json @@ -1,5 +1,5 @@ { - "parent": "betterleaves:block/leaves_notint2", + "parent": "betterleaves:block/leaves3", "textures": { "all": "palegarden:block/pale_oak_leaves" } diff --git a/assets/palegarden/models/block/pale_oak_leaves3.json b/assets/palegarden/models/block/pale_leaves4.json similarity index 59% rename from assets/palegarden/models/block/pale_oak_leaves3.json rename to assets/palegarden/models/block/pale_leaves4.json index 640e27a..fe118be 100644 --- a/assets/palegarden/models/block/pale_oak_leaves3.json +++ b/assets/palegarden/models/block/pale_leaves4.json @@ -1,5 +1,5 @@ { - "parent": "betterleaves:block/leaves_notint3", + "parent": "betterleaves:block/leaves4", "textures": { "all": "palegarden:block/pale_oak_leaves" } diff --git a/assets/palegarden/models/item/pale_leaves.json b/assets/palegarden/models/item/pale_leaves.json new file mode 100644 index 0000000..cfa0e36 --- /dev/null +++ b/assets/palegarden/models/item/pale_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "palegarden:block/pale_leaves1" +} \ No newline at end of file diff --git a/assets/palegarden/models/item/pale_oak_leaves.json b/assets/palegarden/models/item/pale_oak_leaves.json deleted file mode 100644 index 911776c..0000000 --- a/assets/palegarden/models/item/pale_oak_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "palegarden:block/pale_oak_leaves1" -} \ No newline at end of file diff --git a/input/overrides.json b/input/overrides.json index 13cd677..7a12cc4 100644 --- a/input/overrides.json +++ b/input/overrides.json @@ -21,7 +21,8 @@ }, "blockIds": { "terrestria:japanese_maple_leaves_dark": "terrestria:dark_japanese_maple_leaves", - "terrestria:japanese_maple_leaves_green": "terrestria:japanese_maple_shrub_leaves" + "terrestria:japanese_maple_leaves_green": "terrestria:japanese_maple_shrub_leaves", + "palegarden:pale_oak_leaves": "palegarden:pale_leaves" }, "dynamicTreesNamespaces": { "minecraft": "dynamictrees",