diff --git a/Better-Leaves-9.1.zip b/Better-Leaves-9.1.zip index 27c5070..6c4da7a 100644 Binary files a/Better-Leaves-9.1.zip and b/Better-Leaves-9.1.zip differ diff --git a/assets/minecraft/models/block/leaves_regular.json b/assets/minecraft/models/block/leaves_regular.json new file mode 100644 index 0000000..722173f --- /dev/null +++ b/assets/minecraft/models/block/leaves_regular.json @@ -0,0 +1,18 @@ +{ "parent": "block/block", + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "east" } + } + } + ] +} diff --git a/assets/twilightforest/blockstates/beanstalk_leaves.json b/assets/twilightforest/blockstates/beanstalk_leaves.json new file mode 100644 index 0000000..8578b75 --- /dev/null +++ b/assets/twilightforest/blockstates/beanstalk_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/acacia_leaves1" + }, + { + "model": "minecraft:block/acacia_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/acacia_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/acacia_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/acacia_leaves2" + }, + { + "model": "minecraft:block/acacia_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/acacia_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/acacia_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/acacia_leaves3" + }, + { + "model": "minecraft:block/acacia_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/acacia_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/acacia_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/acacia_leaves4" + }, + { + "model": "minecraft:block/acacia_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/acacia_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/acacia_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/canopy_leaves.json b/assets/twilightforest/blockstates/canopy_leaves.json new file mode 100644 index 0000000..70b8355 --- /dev/null +++ b/assets/twilightforest/blockstates/canopy_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/spruce_leaves1" + }, + { + "model": "minecraft:block/spruce_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/spruce_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/spruce_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/spruce_leaves2" + }, + { + "model": "minecraft:block/spruce_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/spruce_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/spruce_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/spruce_leaves3" + }, + { + "model": "minecraft:block/spruce_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/spruce_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/spruce_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/spruce_leaves4" + }, + { + "model": "minecraft:block/spruce_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/spruce_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/spruce_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/darkwood_leaves.json b/assets/twilightforest/blockstates/darkwood_leaves.json deleted file mode 100644 index 5a227ca..0000000 --- a/assets/twilightforest/blockstates/darkwood_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "twilightforest:block/darkwood_leaves1" - }, - { - "model": "twilightforest:block/darkwood_leaves1", - "y": 90 - }, - { - "model": "twilightforest:block/darkwood_leaves1", - "y": 180 - }, - { - "model": "twilightforest:block/darkwood_leaves1", - "y": 270 - }, - { - "model": "twilightforest:block/darkwood_leaves2" - }, - { - "model": "twilightforest:block/darkwood_leaves2", - "y": 90 - }, - { - "model": "twilightforest:block/darkwood_leaves2", - "y": 180 - }, - { - "model": "twilightforest:block/darkwood_leaves2", - "y": 270 - }, - { - "model": "twilightforest:block/darkwood_leaves3" - }, - { - "model": "twilightforest:block/darkwood_leaves3", - "y": 90 - }, - { - "model": "twilightforest:block/darkwood_leaves3", - "y": 180 - }, - { - "model": "twilightforest:block/darkwood_leaves3", - "y": 270 - }, - { - "model": "twilightforest:block/darkwood_leaves4" - }, - { - "model": "twilightforest:block/darkwood_leaves4", - "y": 90 - }, - { - "model": "twilightforest:block/darkwood_leaves4", - "y": 180 - }, - { - "model": "twilightforest:block/darkwood_leaves4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/fallen_leaves.json b/assets/twilightforest/blockstates/fallen_leaves.json new file mode 100644 index 0000000..df0a1e3 --- /dev/null +++ b/assets/twilightforest/blockstates/fallen_leaves.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "twilightforest:block/fallen_leaves" + }, + { + "model": "twilightforest:block/fallen_leaves", + "y": 90 + }, + { + "model": "twilightforest:block/fallen_leaves", + "y": 180 + }, + { + "model": "twilightforest:block/fallen_leaves", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/mangrove_leaves.json b/assets/twilightforest/blockstates/mangrove_leaves.json new file mode 100644 index 0000000..28f5a7c --- /dev/null +++ b/assets/twilightforest/blockstates/mangrove_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/birch_leaves1" + }, + { + "model": "minecraft:block/birch_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/birch_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/birch_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/birch_leaves2" + }, + { + "model": "minecraft:block/birch_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/birch_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/birch_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/birch_leaves3" + }, + { + "model": "minecraft:block/birch_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/birch_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/birch_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/birch_leaves4" + }, + { + "model": "minecraft:block/birch_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/birch_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/birch_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/rainbow_oak_leaves.json b/assets/twilightforest/blockstates/rainbow_oak_leaves.json new file mode 100644 index 0000000..b946965 --- /dev/null +++ b/assets/twilightforest/blockstates/rainbow_oak_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/oak_leaves1" + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves2" + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves3" + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves4" + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/thorn_leaves.json b/assets/twilightforest/blockstates/thorn_leaves.json new file mode 100644 index 0000000..b946965 --- /dev/null +++ b/assets/twilightforest/blockstates/thorn_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/oak_leaves1" + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves2" + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves3" + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves4" + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/blockstates/twilight_oak_leaves.json b/assets/twilightforest/blockstates/twilight_oak_leaves.json new file mode 100644 index 0000000..b946965 --- /dev/null +++ b/assets/twilightforest/blockstates/twilight_oak_leaves.json @@ -0,0 +1,66 @@ +{ + "variants": { + "": [ + { + "model": "minecraft:block/oak_leaves1" + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves1", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves2" + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves2", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves3" + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves3", + "y": 270 + }, + { + "model": "minecraft:block/oak_leaves4" + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 90 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 180 + }, + { + "model": "minecraft:block/oak_leaves4", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/block/dark_leaves.json b/assets/twilightforest/models/block/dark_leaves.json new file mode 100644 index 0000000..de69d0a --- /dev/null +++ b/assets/twilightforest/models/block/dark_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves_regular", + "textures": { + "all": "twilightforest:block/darkwood_leaves" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/block/darkwood_leaves.json b/assets/twilightforest/models/block/darkwood_leaves.json deleted file mode 100644 index 0b6e0d0..0000000 --- a/assets/twilightforest/models/block/darkwood_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "twilightforest:block/darkwood_leaves" - } -} \ No newline at end of file diff --git a/assets/twilightforest/models/block/darkwood_leaves1.json b/assets/twilightforest/models/block/darkwood_leaves1.json deleted file mode 100644 index 7dc9896..0000000 --- a/assets/twilightforest/models/block/darkwood_leaves1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "twilightforest:block/darkwood_leaves" - } -} \ No newline at end of file diff --git a/assets/twilightforest/models/block/darkwood_leaves2.json b/assets/twilightforest/models/block/darkwood_leaves2.json deleted file mode 100644 index 330cb98..0000000 --- a/assets/twilightforest/models/block/darkwood_leaves2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "twilightforest:block/darkwood_leaves" - } -} \ No newline at end of file diff --git a/assets/twilightforest/models/block/darkwood_leaves3.json b/assets/twilightforest/models/block/darkwood_leaves3.json deleted file mode 100644 index ad9b844..0000000 --- a/assets/twilightforest/models/block/darkwood_leaves3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "twilightforest:block/darkwood_leaves" - } -} \ No newline at end of file diff --git a/assets/twilightforest/models/block/darkwood_leaves4.json b/assets/twilightforest/models/block/darkwood_leaves4.json deleted file mode 100644 index 8f4cc76..0000000 --- a/assets/twilightforest/models/block/darkwood_leaves4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "twilightforest:block/darkwood_leaves" - } -} \ No newline at end of file diff --git a/assets/twilightforest/models/block/fallen_leaves.json b/assets/twilightforest/models/block/fallen_leaves.json new file mode 100644 index 0000000..44b8097 --- /dev/null +++ b/assets/twilightforest/models/block/fallen_leaves.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/twilightforest/models/block/giant_leaves.json b/assets/twilightforest/models/block/giant_leaves.json new file mode 100644 index 0000000..a534d24 --- /dev/null +++ b/assets/twilightforest/models/block/giant_leaves.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/block", + "loader": "twilightforest:giant_block", + "parent_block": "minecraft:oak_leaves", + "render_type": "minecraft:cutout_mipped", + "textures": { + "all": "twilightforest:block/oak_leaves_regular", + "particle": "twilightforest:block/oak_leaves_regular" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/block/hardened_dark_leaves.json b/assets/twilightforest/models/block/hardened_dark_leaves.json new file mode 100644 index 0000000..de69d0a --- /dev/null +++ b/assets/twilightforest/models/block/hardened_dark_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves_regular", + "textures": { + "all": "twilightforest:block/darkwood_leaves" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/beanstalk_leaves.json b/assets/twilightforest/models/item/beanstalk_leaves.json new file mode 100644 index 0000000..fb261a3 --- /dev/null +++ b/assets/twilightforest/models/item/beanstalk_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/azalea_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/canopy_leaves.json b/assets/twilightforest/models/item/canopy_leaves.json new file mode 100644 index 0000000..888c457 --- /dev/null +++ b/assets/twilightforest/models/item/canopy_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/spruce_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/fallen_leaves.json b/assets/twilightforest/models/item/fallen_leaves.json new file mode 100644 index 0000000..00e5590 --- /dev/null +++ b/assets/twilightforest/models/item/fallen_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "twilightforest:block/oak_leaves_regular" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/giant_leaves.json b/assets/twilightforest/models/item/giant_leaves.json new file mode 100644 index 0000000..2e9bd2f --- /dev/null +++ b/assets/twilightforest/models/item/giant_leaves.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/oak_leaves", + "base": { + "parent": "twilightforest:item/giant_block_base", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } + }, + "loader": "neoforge:separate_transforms", + "perspectives": { + "gui": { + "parent": "twilightforest:item/giant_block_gui", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } + } + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/giant_leaves_base.json b/assets/twilightforest/models/item/giant_leaves_base.json new file mode 100644 index 0000000..f73ecbb --- /dev/null +++ b/assets/twilightforest/models/item/giant_leaves_base.json @@ -0,0 +1,7 @@ +{ + "parent": "twilightforest:item/giant_block_base", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/giant_leaves_gui.json b/assets/twilightforest/models/item/giant_leaves_gui.json new file mode 100644 index 0000000..05e64f7 --- /dev/null +++ b/assets/twilightforest/models/item/giant_leaves_gui.json @@ -0,0 +1,7 @@ +{ + "parent": "twilightforest:item/giant_block_gui", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/mangrove_leaves.json b/assets/twilightforest/models/item/mangrove_leaves.json new file mode 100644 index 0000000..756ca21 --- /dev/null +++ b/assets/twilightforest/models/item/mangrove_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/birch_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/mining_leaves.json b/assets/twilightforest/models/item/mining_leaves.json new file mode 100644 index 0000000..c44707c --- /dev/null +++ b/assets/twilightforest/models/item/mining_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/mining_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/rainbow_oak_leaves.json b/assets/twilightforest/models/item/rainbow_oak_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/assets/twilightforest/models/item/rainbow_oak_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/sorting_leaves.json b/assets/twilightforest/models/item/sorting_leaves.json new file mode 100644 index 0000000..5def1ba --- /dev/null +++ b/assets/twilightforest/models/item/sorting_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/sorting_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/thorn_leaves.json b/assets/twilightforest/models/item/thorn_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/assets/twilightforest/models/item/thorn_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/time_leaves.json b/assets/twilightforest/models/item/time_leaves.json new file mode 100644 index 0000000..e99e2cb --- /dev/null +++ b/assets/twilightforest/models/item/time_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/time_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/transformation_leaves.json b/assets/twilightforest/models/item/transformation_leaves.json new file mode 100644 index 0000000..e4d68be --- /dev/null +++ b/assets/twilightforest/models/item/transformation_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/transformation_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/models/item/twilight_oak_leaves.json b/assets/twilightforest/models/item/twilight_oak_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/assets/twilightforest/models/item/twilight_oak_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/assets/twilightforest/textures/block/darkwood_leaves.png b/assets/twilightforest/textures/block/darkwood_leaves.png deleted file mode 100644 index 7c7b42f..0000000 Binary files a/assets/twilightforest/textures/block/darkwood_leaves.png and /dev/null differ diff --git a/assets/twilightforest/textures/block/oak_leaves_regular.png b/assets/twilightforest/textures/block/oak_leaves_regular.png new file mode 100644 index 0000000..0f1793d Binary files /dev/null and b/assets/twilightforest/textures/block/oak_leaves_regular.png differ diff --git a/base/assets/minecraft/models/block/leaves_regular.json b/base/assets/minecraft/models/block/leaves_regular.json new file mode 100644 index 0000000..722173f --- /dev/null +++ b/base/assets/minecraft/models/block/leaves_regular.json @@ -0,0 +1,18 @@ +{ "parent": "block/block", + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "east" } + } + } + ] +} diff --git a/base/assets/twilightforest/models/block/dark_leaves.json b/base/assets/twilightforest/models/block/dark_leaves.json new file mode 100644 index 0000000..de69d0a --- /dev/null +++ b/base/assets/twilightforest/models/block/dark_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves_regular", + "textures": { + "all": "twilightforest:block/darkwood_leaves" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/block/giant_leaves.json b/base/assets/twilightforest/models/block/giant_leaves.json new file mode 100644 index 0000000..a534d24 --- /dev/null +++ b/base/assets/twilightforest/models/block/giant_leaves.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/block", + "loader": "twilightforest:giant_block", + "parent_block": "minecraft:oak_leaves", + "render_type": "minecraft:cutout_mipped", + "textures": { + "all": "twilightforest:block/oak_leaves_regular", + "particle": "twilightforest:block/oak_leaves_regular" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/block/hardened_dark_leaves.json b/base/assets/twilightforest/models/block/hardened_dark_leaves.json new file mode 100644 index 0000000..de69d0a --- /dev/null +++ b/base/assets/twilightforest/models/block/hardened_dark_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves_regular", + "textures": { + "all": "twilightforest:block/darkwood_leaves" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/beanstalk_leaves.json b/base/assets/twilightforest/models/item/beanstalk_leaves.json new file mode 100644 index 0000000..fb261a3 --- /dev/null +++ b/base/assets/twilightforest/models/item/beanstalk_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/azalea_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/canopy_leaves.json b/base/assets/twilightforest/models/item/canopy_leaves.json new file mode 100644 index 0000000..888c457 --- /dev/null +++ b/base/assets/twilightforest/models/item/canopy_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/spruce_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/fallen_leaves.json b/base/assets/twilightforest/models/item/fallen_leaves.json new file mode 100644 index 0000000..00e5590 --- /dev/null +++ b/base/assets/twilightforest/models/item/fallen_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "twilightforest:block/oak_leaves_regular" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/giant_leaves.json b/base/assets/twilightforest/models/item/giant_leaves.json new file mode 100644 index 0000000..2e9bd2f --- /dev/null +++ b/base/assets/twilightforest/models/item/giant_leaves.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/oak_leaves", + "base": { + "parent": "twilightforest:item/giant_block_base", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } + }, + "loader": "neoforge:separate_transforms", + "perspectives": { + "gui": { + "parent": "twilightforest:item/giant_block_gui", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } + } + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/giant_leaves_base.json b/base/assets/twilightforest/models/item/giant_leaves_base.json new file mode 100644 index 0000000..f73ecbb --- /dev/null +++ b/base/assets/twilightforest/models/item/giant_leaves_base.json @@ -0,0 +1,7 @@ +{ + "parent": "twilightforest:item/giant_block_base", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/giant_leaves_gui.json b/base/assets/twilightforest/models/item/giant_leaves_gui.json new file mode 100644 index 0000000..05e64f7 --- /dev/null +++ b/base/assets/twilightforest/models/item/giant_leaves_gui.json @@ -0,0 +1,7 @@ +{ + "parent": "twilightforest:item/giant_block_gui", + "textures": { + "all": "minecraft:block/oak_leaves", + "top": "minecraft:block/oak_leaves" + } +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/mangrove_leaves.json b/base/assets/twilightforest/models/item/mangrove_leaves.json new file mode 100644 index 0000000..756ca21 --- /dev/null +++ b/base/assets/twilightforest/models/item/mangrove_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/birch_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/mining_leaves.json b/base/assets/twilightforest/models/item/mining_leaves.json new file mode 100644 index 0000000..c44707c --- /dev/null +++ b/base/assets/twilightforest/models/item/mining_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/mining_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/rainbow_oak_leaves.json b/base/assets/twilightforest/models/item/rainbow_oak_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/base/assets/twilightforest/models/item/rainbow_oak_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/sorting_leaves.json b/base/assets/twilightforest/models/item/sorting_leaves.json new file mode 100644 index 0000000..5def1ba --- /dev/null +++ b/base/assets/twilightforest/models/item/sorting_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/sorting_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/thorn_leaves.json b/base/assets/twilightforest/models/item/thorn_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/base/assets/twilightforest/models/item/thorn_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/time_leaves.json b/base/assets/twilightforest/models/item/time_leaves.json new file mode 100644 index 0000000..e99e2cb --- /dev/null +++ b/base/assets/twilightforest/models/item/time_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/time_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/transformation_leaves.json b/base/assets/twilightforest/models/item/transformation_leaves.json new file mode 100644 index 0000000..e4d68be --- /dev/null +++ b/base/assets/twilightforest/models/item/transformation_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "twilightforest:block/transformation_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/models/item/twilight_oak_leaves.json b/base/assets/twilightforest/models/item/twilight_oak_leaves.json new file mode 100644 index 0000000..9e317a0 --- /dev/null +++ b/base/assets/twilightforest/models/item/twilight_oak_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/oak_leaves" +} \ No newline at end of file diff --git a/base/assets/twilightforest/textures/block/oak_leaves_regular.png b/base/assets/twilightforest/textures/block/oak_leaves_regular.png new file mode 100644 index 0000000..0f1793d Binary files /dev/null and b/base/assets/twilightforest/textures/block/oak_leaves_regular.png differ diff --git a/gen_pack.py b/gen_pack.py index 05af0a1..27e0251 100644 --- a/gen_pack.py +++ b/gen_pack.py @@ -55,6 +55,7 @@ def autoGen(jsonData, args): leaves_with_carpet = jsonData["leavesWithCarpet"] dynamictrees_namespaces = jsonData["dynamicTreesNamespaces"] generate_itemmodels_overrides = jsonData["generateItemModels"] + block_state_copies = jsonData["blockStateCopies"] print("Generating assets...") if (os.path.exists("./assets")): shutil.rmtree("./assets") copy_tree("./base/assets/", "./assets/") @@ -134,7 +135,7 @@ def autoGen(jsonData, args): printOverride("Also generating item model") # Generate blockstates & models - generateBlockstate(leaf) + generateBlockstate(leaf, block_state_copies) generateBlockModels(leaf) generateItemModel(leaf) @@ -238,7 +239,7 @@ def generateTexture(root, infile, useProgrammerArt=False): print("Error while generating texture for '%s'" % infile) -def generateBlockstate(leaf): +def generateBlockstate(leaf, block_state_copies): mod_namespace = leaf.getId().split(":")[0] block_name = leaf.getId().split(":")[1] @@ -269,6 +270,22 @@ def generateBlockstate(leaf): with open(dyntrees_block_state_file, "w") as f: json.dump(block_state_data, f, indent=4) + # Additional block state copies + if (leaf.getId()) in block_state_copies: + block_state_copy_ids = block_state_copies[leaf.getId()] + if not isinstance(block_state_copy_ids, list): block_state_copy_ids = [block_state_copy_ids] # In case only one blockstate is provided (as a string), turn it into a list + for block_state_copy_id in block_state_copy_ids: + block_state_copy_namespace = block_state_copy_id.split(":")[0] + block_state_copy_name = block_state_copy_id.split(":")[1] + + block_state_copy_file = f"assets/{block_state_copy_namespace}/blockstates/{block_state_copy_name}.json" + os.makedirs("assets/{}/blockstates/".format(block_state_copy_namespace), exist_ok=True) + + # Write blockstate file + with open(block_state_copy_file, "w") as f: + json.dump(block_state_data, f, indent=4) + printOverride(f"Writing blockstate copy: {block_state_copy_id}") + def generateBlockModels(leaf): mod_namespace = leaf.getId().split(":")[0] diff --git a/input/assets/twilightforest/textures/block/darkwood_leaves.png b/input/assets/twilightforest/textures/block/darkwood_leaves.png deleted file mode 100644 index 55b00a2..0000000 Binary files a/input/assets/twilightforest/textures/block/darkwood_leaves.png and /dev/null differ diff --git a/input/overrides.json b/input/overrides.json index 10d8dd9..aa6d0c9 100644 --- a/input/overrides.json +++ b/input/overrides.json @@ -6,7 +6,7 @@ "palegarden:pale_oak_leaves" ], "leavesWithCarpet": { - "minecraft:oak_leaves": ["quark:oak_leaf_carpet", "immersive_weathering:oak_leaf_pile"], + "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"], @@ -71,5 +71,11 @@ "betterend:dragon_tree_leaves", "betterend:pythadendron_leaves", "betterend:shadow_berry_leaves" - ] + ], + "blockStateCopies": { + "minecraft:oak_leaves": ["twilightforest:twilight_oak_leaves", "twilightforest:rainbow_oak_leaves", "twilightforest:thorn_leaves"], + "minecraft:birch_leaves": "twilightforest:mangrove_leaves", + "minecraft:spruce_leaves": "twilightforest:canopy_leaves", + "minecraft:acacia_leaves": "twilightforest:beanstalk_leaves" + } } \ No newline at end of file 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 deleted file mode 100644 index 5b41d4a..0000000 Binary files a/input/programmer_art/TwilightForest_ProgrammerArt/assets/twilightforest/textures/block/darkwood_leaves.png and /dev/null differ