diff --git a/Better-Leaves-9.2.zip b/Better-Leaves-9.2.zip index 04d4510..8bdcf91 100644 Binary files a/Better-Leaves-9.2.zip and b/Better-Leaves-9.2.zip differ diff --git a/assets/immersive_weathering/blockstates/acacia_leaf_pile.json b/assets/immersive_weathering/blockstates/acacia_leaf_pile.json deleted file mode 100644 index b06acfc..0000000 --- a/assets/immersive_weathering/blockstates/acacia_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/acacia_leaf_pile" - }, - { - "model": "immersive_weathering:block/acacia_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/acacia_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/acacia_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/azalea_leaf_pile.json b/assets/immersive_weathering/blockstates/azalea_leaf_pile.json deleted file mode 100644 index 6f878ad..0000000 --- a/assets/immersive_weathering/blockstates/azalea_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/azalea_leaf_pile" - }, - { - "model": "immersive_weathering:block/azalea_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/azalea_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/azalea_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/birch_leaf_pile.json b/assets/immersive_weathering/blockstates/birch_leaf_pile.json deleted file mode 100644 index e637424..0000000 --- a/assets/immersive_weathering/blockstates/birch_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/birch_leaf_pile" - }, - { - "model": "immersive_weathering:block/birch_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/birch_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/birch_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/cherry_leaf_pile.json b/assets/immersive_weathering/blockstates/cherry_leaf_pile.json deleted file mode 100644 index 5a74bb0..0000000 --- a/assets/immersive_weathering/blockstates/cherry_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/cherry_leaf_pile" - }, - { - "model": "immersive_weathering:block/cherry_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/cherry_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/cherry_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/dark_oak_leaf_pile.json b/assets/immersive_weathering/blockstates/dark_oak_leaf_pile.json deleted file mode 100644 index 80ce5c7..0000000 --- a/assets/immersive_weathering/blockstates/dark_oak_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/dark_oak_leaf_pile" - }, - { - "model": "immersive_weathering:block/dark_oak_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/dark_oak_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/dark_oak_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/flowering_azalea_leaf_pile.json b/assets/immersive_weathering/blockstates/flowering_azalea_leaf_pile.json deleted file mode 100644 index e9c25cf..0000000 --- a/assets/immersive_weathering/blockstates/flowering_azalea_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/flowering_azalea_leaf_pile" - }, - { - "model": "immersive_weathering:block/flowering_azalea_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/flowering_azalea_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/flowering_azalea_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/jungle_leaf_pile.json b/assets/immersive_weathering/blockstates/jungle_leaf_pile.json deleted file mode 100644 index 6485bd3..0000000 --- a/assets/immersive_weathering/blockstates/jungle_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/jungle_leaf_pile" - }, - { - "model": "immersive_weathering:block/jungle_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/jungle_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/jungle_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/mangrove_leaf_pile.json b/assets/immersive_weathering/blockstates/mangrove_leaf_pile.json deleted file mode 100644 index 67eafac..0000000 --- a/assets/immersive_weathering/blockstates/mangrove_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/mangrove_leaf_pile" - }, - { - "model": "immersive_weathering:block/mangrove_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/mangrove_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/mangrove_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/oak_leaf_pile.json b/assets/immersive_weathering/blockstates/oak_leaf_pile.json deleted file mode 100644 index 6ed21c9..0000000 --- a/assets/immersive_weathering/blockstates/oak_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/oak_leaf_pile" - }, - { - "model": "immersive_weathering:block/oak_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/oak_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/oak_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/pale_oak_leaf_pile.json b/assets/immersive_weathering/blockstates/pale_oak_leaf_pile.json deleted file mode 100644 index aaffd90..0000000 --- a/assets/immersive_weathering/blockstates/pale_oak_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/pale_oak_leaf_pile" - }, - { - "model": "immersive_weathering:block/pale_oak_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/pale_oak_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/pale_oak_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/blockstates/spruce_leaf_pile.json b/assets/immersive_weathering/blockstates/spruce_leaf_pile.json deleted file mode 100644 index bb4072d..0000000 --- a/assets/immersive_weathering/blockstates/spruce_leaf_pile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "immersive_weathering:block/spruce_leaf_pile" - }, - { - "model": "immersive_weathering:block/spruce_leaf_pile", - "y": 90 - }, - { - "model": "immersive_weathering:block/spruce_leaf_pile", - "y": 180 - }, - { - "model": "immersive_weathering:block/spruce_leaf_pile", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/acacia_leaf_pile.json b/assets/immersive_weathering/models/block/acacia_leaf_pile.json deleted file mode 100644 index 529e052..0000000 --- a/assets/immersive_weathering/models/block/acacia_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/acacia_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/azalea_leaf_pile.json b/assets/immersive_weathering/models/block/azalea_leaf_pile.json deleted file mode 100644 index 71a15b6..0000000 --- a/assets/immersive_weathering/models/block/azalea_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet_notint", - "textures": { - "wool": "minecraft:block/azalea_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/birch_leaf_pile.json b/assets/immersive_weathering/models/block/birch_leaf_pile.json deleted file mode 100644 index d5846e5..0000000 --- a/assets/immersive_weathering/models/block/birch_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/birch_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/cherry_leaf_pile.json b/assets/immersive_weathering/models/block/cherry_leaf_pile.json deleted file mode 100644 index edb1594..0000000 --- a/assets/immersive_weathering/models/block/cherry_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/cherry_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/dark_oak_leaf_pile.json b/assets/immersive_weathering/models/block/dark_oak_leaf_pile.json deleted file mode 100644 index 03b49f8..0000000 --- a/assets/immersive_weathering/models/block/dark_oak_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/dark_oak_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/flowering_azalea_leaf_pile.json b/assets/immersive_weathering/models/block/flowering_azalea_leaf_pile.json deleted file mode 100644 index ab412fa..0000000 --- a/assets/immersive_weathering/models/block/flowering_azalea_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet_notint", - "textures": { - "wool": "minecraft:block/flowering_azalea_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/jungle_leaf_pile.json b/assets/immersive_weathering/models/block/jungle_leaf_pile.json deleted file mode 100644 index fa886ca..0000000 --- a/assets/immersive_weathering/models/block/jungle_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/jungle_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/mangrove_leaf_pile.json b/assets/immersive_weathering/models/block/mangrove_leaf_pile.json deleted file mode 100644 index fe8e633..0000000 --- a/assets/immersive_weathering/models/block/mangrove_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/mangrove_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/oak_leaf_pile.json b/assets/immersive_weathering/models/block/oak_leaf_pile.json deleted file mode 100644 index 44b8097..0000000 --- a/assets/immersive_weathering/models/block/oak_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/oak_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/pale_oak_leaf_pile.json b/assets/immersive_weathering/models/block/pale_oak_leaf_pile.json deleted file mode 100644 index efb8672..0000000 --- a/assets/immersive_weathering/models/block/pale_oak_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/pale_oak_leaves" - } -} \ No newline at end of file diff --git a/assets/immersive_weathering/models/block/spruce_leaf_pile.json b/assets/immersive_weathering/models/block/spruce_leaf_pile.json deleted file mode 100644 index 5ee6aad..0000000 --- a/assets/immersive_weathering/models/block/spruce_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaf_carpet", - "textures": { - "wool": "minecraft:block/spruce_leaves" - } -} \ No newline at end of file diff --git a/input/overrides.json b/input/overrides.json index 8d67143..7abae4c 100644 --- a/input/overrides.json +++ b/input/overrides.json @@ -6,17 +6,17 @@ "palegarden:pale_oak_leaves" ], "leavesWithCarpet": { - "minecraft:oak_leaves": ["quark:oak_leaf_carpet", "immersive_weathering:oak_leaf_pile", "twilightforest:fallen_leaves"], - "minecraft:birch_leaves": ["quark:birch_leaf_carpet", "immersive_weathering:birch_leaf_pile"], - "minecraft:spruce_leaves": ["quark:spruce_leaf_carpet", "immersive_weathering:spruce_leaf_pile"], - "minecraft:jungle_leaves": ["quark:jungle_leaf_carpet", "immersive_weathering:jungle_leaf_pile"], - "minecraft:acacia_leaves": ["quark:acacia_leaf_carpet", "immersive_weathering:acacia_leaf_pile"], - "minecraft:dark_oak_leaves": ["quark:dark_oak_leaf_carpet", "immersive_weathering:dark_oak_leaf_pile"], - "minecraft:mangrove_leaves": ["quark:mangrove_leaf_carpet", "immersive_weathering:mangrove_leaf_pile"], - "minecraft:cherry_leaves": ["quark:cherry_leaf_carpet", "immersive_weathering:cherry_leaf_pile"], - "minecraft:azalea_leaves": ["quark:azalea_leaf_carpet", "immersive_weathering:azalea_leaf_pile"], - "minecraft:flowering_azalea_leaves": ["quark:flowering_azalea_leaf_carpet", "immersive_weathering:flowering_azalea_leaf_pile"], - "minecraft:pale_oak_leaves": ["quark:pale_oak_leaf_carpet", "immersive_weathering:pale_oak_leaf_pile"], + "minecraft:oak_leaves": ["quark:oak_leaf_carpet", "twilightforest:fallen_leaves"], + "minecraft:birch_leaves": ["quark:birch_leaf_carpet"], + "minecraft:spruce_leaves": ["quark:spruce_leaf_carpet"], + "minecraft:jungle_leaves": ["quark:jungle_leaf_carpet"], + "minecraft:acacia_leaves": ["quark:acacia_leaf_carpet"], + "minecraft:dark_oak_leaves": ["quark:dark_oak_leaf_carpet"], + "minecraft:mangrove_leaves": ["quark:mangrove_leaf_carpet"], + "minecraft:cherry_leaves": ["quark:cherry_leaf_carpet"], + "minecraft:azalea_leaves": ["quark:azalea_leaf_carpet"], + "minecraft:flowering_azalea_leaves": ["quark:flowering_azalea_leaf_carpet"], + "minecraft:pale_oak_leaves": ["quark:pale_oak_leaf_carpet"], "quark:ancient_leaves": "quark:ancient_leaf_carpet", "quark:blue_blossom_leaves": "quark:blue_blossom_leaf_carpet", "quark:lavender_blossom_leaves": "quark:lavender_blossom_leaf_carpet",