From 3faed117c6a8e0d1138df26ee02a9904ce8c4cd4 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 5 Dec 2024 22:46:54 +0100 Subject: [PATCH] Fix palegarden support Why do people name their textures different from the block id... --- Better-Leaves-Lite-1.0.zip | Bin 451625 -> 451552 bytes .../palegarden/blockstates/pale_leaves.json | 66 ++++++++++++++++++ .../blockstates/pale_oak_leaves.json | 66 ------------------ ...ale_oak_leaves4.json => pale_leaves1.json} | 2 +- ...ale_oak_leaves1.json => pale_leaves2.json} | 2 +- ...ale_oak_leaves2.json => pale_leaves3.json} | 2 +- ...ale_oak_leaves3.json => pale_leaves4.json} | 2 +- .../palegarden/models/item/pale_leaves.json | 3 + .../models/item/pale_oak_leaves.json | 3 - input/overrides.json | 3 +- 10 files changed, 75 insertions(+), 74 deletions(-) create mode 100644 assets/palegarden/blockstates/pale_leaves.json delete mode 100644 assets/palegarden/blockstates/pale_oak_leaves.json rename assets/palegarden/models/block/{pale_oak_leaves4.json => pale_leaves1.json} (59%) rename assets/palegarden/models/block/{pale_oak_leaves1.json => pale_leaves2.json} (59%) rename assets/palegarden/models/block/{pale_oak_leaves2.json => pale_leaves3.json} (59%) rename assets/palegarden/models/block/{pale_oak_leaves3.json => pale_leaves4.json} (59%) create mode 100644 assets/palegarden/models/item/pale_leaves.json delete mode 100644 assets/palegarden/models/item/pale_oak_leaves.json diff --git a/Better-Leaves-Lite-1.0.zip b/Better-Leaves-Lite-1.0.zip index 5e5eb2127beeafb1dd5b26e92f6eeb99e951f857..7035d76303c8fdd4c3b3174d4ec69562ce72c40b 100644 GIT binary patch delta 28457 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 KbfG!sRsIiM=5n+E delta 28562 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 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",