diff --git a/Better-Leaves-9.1.zip b/Better-Leaves-9.1.zip index 10d9a42..d133af9 100644 Binary files a/Better-Leaves-9.1.zip and b/Better-Leaves-9.1.zip differ diff --git a/assets/immersive_weathering/blockstates/acacia_leaf_pile.json b/assets/immersive_weathering/blockstates/acacia_leaf_pile.json new file mode 100644 index 0000000..b06acfc --- /dev/null +++ b/assets/immersive_weathering/blockstates/acacia_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..6f878ad --- /dev/null +++ b/assets/immersive_weathering/blockstates/azalea_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..e637424 --- /dev/null +++ b/assets/immersive_weathering/blockstates/birch_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..5a74bb0 --- /dev/null +++ b/assets/immersive_weathering/blockstates/cherry_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..80ce5c7 --- /dev/null +++ b/assets/immersive_weathering/blockstates/dark_oak_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..e9c25cf --- /dev/null +++ b/assets/immersive_weathering/blockstates/flowering_azalea_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..6485bd3 --- /dev/null +++ b/assets/immersive_weathering/blockstates/jungle_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..67eafac --- /dev/null +++ b/assets/immersive_weathering/blockstates/mangrove_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..6ed21c9 --- /dev/null +++ b/assets/immersive_weathering/blockstates/oak_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..aaffd90 --- /dev/null +++ b/assets/immersive_weathering/blockstates/pale_oak_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..bb4072d --- /dev/null +++ b/assets/immersive_weathering/blockstates/spruce_leaf_pile.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..529e052 --- /dev/null +++ b/assets/immersive_weathering/models/block/acacia_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..71a15b6 --- /dev/null +++ b/assets/immersive_weathering/models/block/azalea_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..d5846e5 --- /dev/null +++ b/assets/immersive_weathering/models/block/birch_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..edb1594 --- /dev/null +++ b/assets/immersive_weathering/models/block/cherry_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..03b49f8 --- /dev/null +++ b/assets/immersive_weathering/models/block/dark_oak_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..ab412fa --- /dev/null +++ b/assets/immersive_weathering/models/block/flowering_azalea_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..fa886ca --- /dev/null +++ b/assets/immersive_weathering/models/block/jungle_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..fe8e633 --- /dev/null +++ b/assets/immersive_weathering/models/block/mangrove_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..44b8097 --- /dev/null +++ b/assets/immersive_weathering/models/block/oak_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..efb8672 --- /dev/null +++ b/assets/immersive_weathering/models/block/pale_oak_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 0000000..5ee6aad --- /dev/null +++ b/assets/immersive_weathering/models/block/spruce_leaf_pile.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaf_carpet", + "textures": { + "wool": "minecraft:block/spruce_leaves" + } +} \ No newline at end of file diff --git a/assets/quark/blockstates/pale_oak_leaf_carpet.json b/assets/quark/blockstates/pale_oak_leaf_carpet.json new file mode 100644 index 0000000..37f24e8 --- /dev/null +++ b/assets/quark/blockstates/pale_oak_leaf_carpet.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "quark:block/pale_oak_leaf_carpet" + }, + { + "model": "quark:block/pale_oak_leaf_carpet", + "y": 90 + }, + { + "model": "quark:block/pale_oak_leaf_carpet", + "y": 180 + }, + { + "model": "quark:block/pale_oak_leaf_carpet", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/quark/models/block/pale_oak_leaf_carpet.json b/assets/quark/models/block/pale_oak_leaf_carpet.json new file mode 100644 index 0000000..efb8672 --- /dev/null +++ b/assets/quark/models/block/pale_oak_leaf_carpet.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaf_carpet", + "textures": { + "wool": "minecraft:block/pale_oak_leaves" + } +} \ No newline at end of file diff --git a/input/overrides.json b/input/overrides.json index cb94169..10d8dd9 100644 --- a/input/overrides.json +++ b/input/overrides.json @@ -6,16 +6,17 @@ "palegarden:pale_oak_leaves" ], "leavesWithCarpet": { - "minecraft:oak_leaves": "quark:oak_leaf_carpet", - "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:oak_leaves": ["quark:oak_leaf_carpet", "immersive_weathering:oak_leaf_pile"], + "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"], "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",