diff --git a/Better-Leaves-9.2.zip b/Better-Leaves-9.2.zip index a99f94c..ef674a6 100644 Binary files a/Better-Leaves-9.2.zip and b/Better-Leaves-9.2.zip differ diff --git a/assets/betterleaves/models/block/leaves1.json b/assets/betterleaves/models/block/leaves1.json index ab5d540..dd15776 100644 --- a/assets/betterleaves/models/block/leaves1.json +++ b/assets/betterleaves/models/block/leaves1.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/betterleaves/models/block/leaves2.json b/assets/betterleaves/models/block/leaves2.json index debe721..c3f7a2d 100644 --- a/assets/betterleaves/models/block/leaves2.json +++ b/assets/betterleaves/models/block/leaves2.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/betterleaves/models/block/leaves3.json b/assets/betterleaves/models/block/leaves3.json index 33a77be..21de282 100644 --- a/assets/betterleaves/models/block/leaves3.json +++ b/assets/betterleaves/models/block/leaves3.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/betterleaves/models/block/leaves4.json b/assets/betterleaves/models/block/leaves4.json index fb02d96..a3791d2 100644 --- a/assets/betterleaves/models/block/leaves4.json +++ b/assets/betterleaves/models/block/leaves4.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/chipped/models/block/frosted_acacia_leaves1.json b/assets/chipped/models/block/frosted_acacia_leaves1.json index 0b0fc72..60f5999 100644 --- a/assets/chipped/models/block/frosted_acacia_leaves1.json +++ b/assets/chipped/models/block/frosted_acacia_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/acacia_leaves/frosted_acacia_leaves" + "all": "chipped:block/acacia_leaves/frosted_acacia_leaves", + "top": "chipped:block/acacia_leaves/frosted_acacia_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_acacia_leaves2.json b/assets/chipped/models/block/frosted_acacia_leaves2.json index 8975f6a..79d22d5 100644 --- a/assets/chipped/models/block/frosted_acacia_leaves2.json +++ b/assets/chipped/models/block/frosted_acacia_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/acacia_leaves/frosted_acacia_leaves" + "all": "chipped:block/acacia_leaves/frosted_acacia_leaves", + "top": "chipped:block/acacia_leaves/frosted_acacia_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_acacia_leaves3.json b/assets/chipped/models/block/frosted_acacia_leaves3.json index 024a922..f2b047b 100644 --- a/assets/chipped/models/block/frosted_acacia_leaves3.json +++ b/assets/chipped/models/block/frosted_acacia_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/acacia_leaves/frosted_acacia_leaves" + "all": "chipped:block/acacia_leaves/frosted_acacia_leaves", + "top": "chipped:block/acacia_leaves/frosted_acacia_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_acacia_leaves4.json b/assets/chipped/models/block/frosted_acacia_leaves4.json index 9357325..b284fda 100644 --- a/assets/chipped/models/block/frosted_acacia_leaves4.json +++ b/assets/chipped/models/block/frosted_acacia_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/acacia_leaves/frosted_acacia_leaves" + "all": "chipped:block/acacia_leaves/frosted_acacia_leaves", + "top": "chipped:block/acacia_leaves/frosted_acacia_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_birch_leaves1.json b/assets/chipped/models/block/frosted_birch_leaves1.json index fcc540a..921083c 100644 --- a/assets/chipped/models/block/frosted_birch_leaves1.json +++ b/assets/chipped/models/block/frosted_birch_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/birch_leaves/frosted_birch_leaves" + "all": "chipped:block/birch_leaves/frosted_birch_leaves", + "top": "chipped:block/birch_leaves/frosted_birch_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_birch_leaves2.json b/assets/chipped/models/block/frosted_birch_leaves2.json index 11d39ec..dfc7355 100644 --- a/assets/chipped/models/block/frosted_birch_leaves2.json +++ b/assets/chipped/models/block/frosted_birch_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/birch_leaves/frosted_birch_leaves" + "all": "chipped:block/birch_leaves/frosted_birch_leaves", + "top": "chipped:block/birch_leaves/frosted_birch_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_birch_leaves3.json b/assets/chipped/models/block/frosted_birch_leaves3.json index 268fb99..cab0db5 100644 --- a/assets/chipped/models/block/frosted_birch_leaves3.json +++ b/assets/chipped/models/block/frosted_birch_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/birch_leaves/frosted_birch_leaves" + "all": "chipped:block/birch_leaves/frosted_birch_leaves", + "top": "chipped:block/birch_leaves/frosted_birch_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_birch_leaves4.json b/assets/chipped/models/block/frosted_birch_leaves4.json index fb5236e..e2c4eb3 100644 --- a/assets/chipped/models/block/frosted_birch_leaves4.json +++ b/assets/chipped/models/block/frosted_birch_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/birch_leaves/frosted_birch_leaves" + "all": "chipped:block/birch_leaves/frosted_birch_leaves", + "top": "chipped:block/birch_leaves/frosted_birch_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_dark_oak_leaves1.json b/assets/chipped/models/block/frosted_dark_oak_leaves1.json index 353c31a..517fc9c 100644 --- a/assets/chipped/models/block/frosted_dark_oak_leaves1.json +++ b/assets/chipped/models/block/frosted_dark_oak_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves" + "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves", + "top": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_dark_oak_leaves2.json b/assets/chipped/models/block/frosted_dark_oak_leaves2.json index 2fc168a..1413efd 100644 --- a/assets/chipped/models/block/frosted_dark_oak_leaves2.json +++ b/assets/chipped/models/block/frosted_dark_oak_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves" + "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves", + "top": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_dark_oak_leaves3.json b/assets/chipped/models/block/frosted_dark_oak_leaves3.json index 5134254..1052bf1 100644 --- a/assets/chipped/models/block/frosted_dark_oak_leaves3.json +++ b/assets/chipped/models/block/frosted_dark_oak_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves" + "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves", + "top": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_dark_oak_leaves4.json b/assets/chipped/models/block/frosted_dark_oak_leaves4.json index e75c26c..192f14f 100644 --- a/assets/chipped/models/block/frosted_dark_oak_leaves4.json +++ b/assets/chipped/models/block/frosted_dark_oak_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves" + "all": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves", + "top": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_jungle_leaves1.json b/assets/chipped/models/block/frosted_jungle_leaves1.json index 9624fa3..bc75cc3 100644 --- a/assets/chipped/models/block/frosted_jungle_leaves1.json +++ b/assets/chipped/models/block/frosted_jungle_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/jungle_leaves/frosted_jungle_leaves" + "all": "chipped:block/jungle_leaves/frosted_jungle_leaves", + "top": "chipped:block/jungle_leaves/frosted_jungle_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_jungle_leaves2.json b/assets/chipped/models/block/frosted_jungle_leaves2.json index 2ff017b..77ca83b 100644 --- a/assets/chipped/models/block/frosted_jungle_leaves2.json +++ b/assets/chipped/models/block/frosted_jungle_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/jungle_leaves/frosted_jungle_leaves" + "all": "chipped:block/jungle_leaves/frosted_jungle_leaves", + "top": "chipped:block/jungle_leaves/frosted_jungle_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_jungle_leaves3.json b/assets/chipped/models/block/frosted_jungle_leaves3.json index 07499ed..82c4c55 100644 --- a/assets/chipped/models/block/frosted_jungle_leaves3.json +++ b/assets/chipped/models/block/frosted_jungle_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/jungle_leaves/frosted_jungle_leaves" + "all": "chipped:block/jungle_leaves/frosted_jungle_leaves", + "top": "chipped:block/jungle_leaves/frosted_jungle_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_jungle_leaves4.json b/assets/chipped/models/block/frosted_jungle_leaves4.json index 42278d3..c3ad255 100644 --- a/assets/chipped/models/block/frosted_jungle_leaves4.json +++ b/assets/chipped/models/block/frosted_jungle_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/jungle_leaves/frosted_jungle_leaves" + "all": "chipped:block/jungle_leaves/frosted_jungle_leaves", + "top": "chipped:block/jungle_leaves/frosted_jungle_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_oak_leaves1.json b/assets/chipped/models/block/frosted_oak_leaves1.json index 21378fa..2ab0d65 100644 --- a/assets/chipped/models/block/frosted_oak_leaves1.json +++ b/assets/chipped/models/block/frosted_oak_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/oak_leaves/frosted_oak_leaves" + "all": "chipped:block/oak_leaves/frosted_oak_leaves", + "top": "chipped:block/oak_leaves/frosted_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_oak_leaves2.json b/assets/chipped/models/block/frosted_oak_leaves2.json index 1479b82..8c9f624 100644 --- a/assets/chipped/models/block/frosted_oak_leaves2.json +++ b/assets/chipped/models/block/frosted_oak_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/oak_leaves/frosted_oak_leaves" + "all": "chipped:block/oak_leaves/frosted_oak_leaves", + "top": "chipped:block/oak_leaves/frosted_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_oak_leaves3.json b/assets/chipped/models/block/frosted_oak_leaves3.json index 1d46bdf..4e8040a 100644 --- a/assets/chipped/models/block/frosted_oak_leaves3.json +++ b/assets/chipped/models/block/frosted_oak_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/oak_leaves/frosted_oak_leaves" + "all": "chipped:block/oak_leaves/frosted_oak_leaves", + "top": "chipped:block/oak_leaves/frosted_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_oak_leaves4.json b/assets/chipped/models/block/frosted_oak_leaves4.json index ff4ddb4..0c4b3e6 100644 --- a/assets/chipped/models/block/frosted_oak_leaves4.json +++ b/assets/chipped/models/block/frosted_oak_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/oak_leaves/frosted_oak_leaves" + "all": "chipped:block/oak_leaves/frosted_oak_leaves", + "top": "chipped:block/oak_leaves/frosted_oak_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_spruce_leaves1.json b/assets/chipped/models/block/frosted_spruce_leaves1.json index 9312bf1..0067e69 100644 --- a/assets/chipped/models/block/frosted_spruce_leaves1.json +++ b/assets/chipped/models/block/frosted_spruce_leaves1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "chipped:block/spruce_leaves/frosted_spruce_leaves" + "all": "chipped:block/spruce_leaves/frosted_spruce_leaves", + "top": "chipped:block/spruce_leaves/frosted_spruce_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_spruce_leaves2.json b/assets/chipped/models/block/frosted_spruce_leaves2.json index f561329..c8757f6 100644 --- a/assets/chipped/models/block/frosted_spruce_leaves2.json +++ b/assets/chipped/models/block/frosted_spruce_leaves2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "chipped:block/spruce_leaves/frosted_spruce_leaves" + "all": "chipped:block/spruce_leaves/frosted_spruce_leaves", + "top": "chipped:block/spruce_leaves/frosted_spruce_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_spruce_leaves3.json b/assets/chipped/models/block/frosted_spruce_leaves3.json index b9f77c3..f8f4b3f 100644 --- a/assets/chipped/models/block/frosted_spruce_leaves3.json +++ b/assets/chipped/models/block/frosted_spruce_leaves3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "chipped:block/spruce_leaves/frosted_spruce_leaves" + "all": "chipped:block/spruce_leaves/frosted_spruce_leaves", + "top": "chipped:block/spruce_leaves/frosted_spruce_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/models/block/frosted_spruce_leaves4.json b/assets/chipped/models/block/frosted_spruce_leaves4.json index 4538daa..4e1a4c2 100644 --- a/assets/chipped/models/block/frosted_spruce_leaves4.json +++ b/assets/chipped/models/block/frosted_spruce_leaves4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "chipped:block/spruce_leaves/frosted_spruce_leaves" + "all": "chipped:block/spruce_leaves/frosted_spruce_leaves", + "top": "chipped:block/spruce_leaves/frosted_spruce_leaves_top", + "bottom": "#top" } } \ No newline at end of file diff --git a/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.png b/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.png index d26f918..2a89a22 100644 Binary files a/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.png and b/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.png differ diff --git a/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.png b/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.png index 1712dae..7361bd4 100644 Binary files a/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.png and b/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.png differ diff --git a/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.png b/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.png index d37699f..37a3779 100644 Binary files a/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.png and b/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.png differ diff --git a/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.png b/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.png index b8314fc..c0e022b 100644 Binary files a/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.png and b/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.png differ diff --git a/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.png b/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.png index fca4b54..b2e0dc2 100644 Binary files a/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.png and b/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.png differ diff --git a/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.png b/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.png index 124bb3d..4ce34a8 100644 Binary files a/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.png and b/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.png differ diff --git a/assets/eternal_starlight/blockstates/jinglestem_leaves.json b/assets/eternal_starlight/blockstates/jinglestem_leaves.json deleted file mode 100644 index 22eefde..0000000 --- a/assets/eternal_starlight/blockstates/jinglestem_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "eternal_starlight:block/jinglestem_leaves1" - }, - { - "model": "eternal_starlight:block/jinglestem_leaves1", - "y": 90 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves1", - "y": 180 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves1", - "y": 270 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves2" - }, - { - "model": "eternal_starlight:block/jinglestem_leaves2", - "y": 90 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves2", - "y": 180 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves2", - "y": 270 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves3" - }, - { - "model": "eternal_starlight:block/jinglestem_leaves3", - "y": 90 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves3", - "y": 180 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves3", - "y": 270 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves4" - }, - { - "model": "eternal_starlight:block/jinglestem_leaves4", - "y": 90 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves4", - "y": 180 - }, - { - "model": "eternal_starlight:block/jinglestem_leaves4", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/jinglestem_leaves.json b/assets/eternal_starlight/models/block/jinglestem_leaves.json deleted file mode 100644 index 7cf38cd..0000000 --- a/assets/eternal_starlight/models/block/jinglestem_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves", - "textures": { - "all": "eternal_starlight:block/jinglestem_leaves" - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/jinglestem_leaves1.json b/assets/eternal_starlight/models/block/jinglestem_leaves1.json deleted file mode 100644 index a942dbc..0000000 --- a/assets/eternal_starlight/models/block/jinglestem_leaves1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves1", - "textures": { - "all": "eternal_starlight:block/jinglestem_leaves" - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/jinglestem_leaves2.json b/assets/eternal_starlight/models/block/jinglestem_leaves2.json deleted file mode 100644 index 470c14e..0000000 --- a/assets/eternal_starlight/models/block/jinglestem_leaves2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves2", - "textures": { - "all": "eternal_starlight:block/jinglestem_leaves" - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/jinglestem_leaves3.json b/assets/eternal_starlight/models/block/jinglestem_leaves3.json deleted file mode 100644 index d0fac89..0000000 --- a/assets/eternal_starlight/models/block/jinglestem_leaves3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves3", - "textures": { - "all": "eternal_starlight:block/jinglestem_leaves" - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/jinglestem_leaves4.json b/assets/eternal_starlight/models/block/jinglestem_leaves4.json deleted file mode 100644 index 1621fd5..0000000 --- a/assets/eternal_starlight/models/block/jinglestem_leaves4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterleaves:block/leaves4", - "textures": { - "all": "eternal_starlight:block/jinglestem_leaves" - } -} \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/northland_leaves_snowy1.json b/assets/eternal_starlight/models/block/northland_leaves_snowy1.json index db99010..7edb3b6 100644 --- a/assets/eternal_starlight/models/block/northland_leaves_snowy1.json +++ b/assets/eternal_starlight/models/block/northland_leaves_snowy1.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves1", "textures": { - "all": "eternal_starlight:block/northland_leaves_snowy" + "all": "eternal_starlight:block/northland_leaves_snowy", + "top": "minecraft:block/snow", + "bottom": "eternal_starlight:block/northland_leaves" } } \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/northland_leaves_snowy2.json b/assets/eternal_starlight/models/block/northland_leaves_snowy2.json index 783d3de..1b16af4 100644 --- a/assets/eternal_starlight/models/block/northland_leaves_snowy2.json +++ b/assets/eternal_starlight/models/block/northland_leaves_snowy2.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves2", "textures": { - "all": "eternal_starlight:block/northland_leaves_snowy" + "all": "eternal_starlight:block/northland_leaves_snowy", + "top": "minecraft:block/snow", + "bottom": "eternal_starlight:block/northland_leaves" } } \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/northland_leaves_snowy3.json b/assets/eternal_starlight/models/block/northland_leaves_snowy3.json index a8574ef..e0b7954 100644 --- a/assets/eternal_starlight/models/block/northland_leaves_snowy3.json +++ b/assets/eternal_starlight/models/block/northland_leaves_snowy3.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves3", "textures": { - "all": "eternal_starlight:block/northland_leaves_snowy" + "all": "eternal_starlight:block/northland_leaves_snowy", + "top": "minecraft:block/snow", + "bottom": "eternal_starlight:block/northland_leaves" } } \ No newline at end of file diff --git a/assets/eternal_starlight/models/block/northland_leaves_snowy4.json b/assets/eternal_starlight/models/block/northland_leaves_snowy4.json index 5b2d91f..8dec1e8 100644 --- a/assets/eternal_starlight/models/block/northland_leaves_snowy4.json +++ b/assets/eternal_starlight/models/block/northland_leaves_snowy4.json @@ -1,6 +1,8 @@ { "parent": "betterleaves:block/leaves4", "textures": { - "all": "eternal_starlight:block/northland_leaves_snowy" + "all": "eternal_starlight:block/northland_leaves_snowy", + "top": "minecraft:block/snow", + "bottom": "eternal_starlight:block/northland_leaves" } } \ No newline at end of file diff --git a/assets/eternal_starlight/textures/block/jinglestem_leaves.png b/assets/eternal_starlight/textures/block/jinglestem_leaves.png deleted file mode 100644 index dba0e1d..0000000 Binary files a/assets/eternal_starlight/textures/block/jinglestem_leaves.png and /dev/null differ diff --git a/base/assets/betterleaves/models/block/leaves1.json b/base/assets/betterleaves/models/block/leaves1.json index ab5d540..dd15776 100644 --- a/base/assets/betterleaves/models/block/leaves1.json +++ b/base/assets/betterleaves/models/block/leaves1.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/base/assets/betterleaves/models/block/leaves2.json b/base/assets/betterleaves/models/block/leaves2.json index debe721..c3f7a2d 100644 --- a/base/assets/betterleaves/models/block/leaves2.json +++ b/base/assets/betterleaves/models/block/leaves2.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/base/assets/betterleaves/models/block/leaves3.json b/base/assets/betterleaves/models/block/leaves3.json index 33a77be..21de282 100644 --- a/base/assets/betterleaves/models/block/leaves3.json +++ b/base/assets/betterleaves/models/block/leaves3.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/base/assets/betterleaves/models/block/leaves4.json b/base/assets/betterleaves/models/block/leaves4.json index fb02d96..a3791d2 100644 --- a/base/assets/betterleaves/models/block/leaves4.json +++ b/base/assets/betterleaves/models/block/leaves4.json @@ -4,6 +4,8 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { + "top": "#all", + "bottom": "#all", "particle": "#all" }, "elements": [ @@ -15,8 +17,8 @@ "east": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "east", "tintindex": 0}, "south": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "south", "tintindex": 0}, "west": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "west", "tintindex": 0}, - "up": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "up", "tintindex": 0}, - "down": {"uv": [4, 4, 12, 12], "texture": "#all", "cullface": "down", "tintindex": 0} + "up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up", "tintindex": 0}, + "down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down", "tintindex": 0} } }, { @@ -38,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/gen_pack.py b/gen_pack.py index 17f9252..05674e7 100644 --- a/gen_pack.py +++ b/gen_pack.py @@ -49,6 +49,7 @@ class LeafBlock: texture_id_override = None dynamictrees_namespace = None blockstate_data = None + sprite_overrides = None def getId(self): if (self.block_id_override != None): return self.block_id_override return self.namespace+":"+self.block_name @@ -160,8 +161,11 @@ def autoGen(jsonData, args): # Check for blockstate data if infile.replace(".png", ".betterleaves.json") in files: with open(os.path.join(root, infile.replace(".png", ".betterleaves.json")), "r") as f: - if "blockStateData" in json.load(f): + jsonFile = json.load(f) + if "blockStateData" in jsonFile: leaf.blockstate_data = BlockStateData.fromFile(leaf, root, infile.replace(".png", ".betterleaves.json")) + if "spriteOverrides" in jsonFile: + leaf.sprite_overrides = jsonFile["spriteOverrides"] # Generate blockstates & models generateBlockstate(leaf, block_state_copies) @@ -258,7 +262,7 @@ def generateTexture(root, infile, useProgrammerArt=False): textureFile = value.split(":")[1] + ".png" if "/" in textureFile: textureRoot += textureFile.rsplit("/")[0] - textureFile = textureFile.rsplit("/")[1] + textureFile = textureFile[len(textureFile.rsplit("/")[0])+1:] # The rest of the string, starting behind the first '/' textureRoot = scanPacksForTexture(textureRoot, textureFile) if useProgrammerArt: root = scanPacksForTexture(textureRoot, textureFile, "./input/programmer_art") textureMap[key] = os.path.join(textureRoot, textureFile) @@ -381,6 +385,11 @@ def generateBlockModels(leaf): if (leaf.overlay_texture_id != ""): block_model_data["textures"]["overlay"] = leaf.overlay_texture_id + # Add additional textures + if (leaf.sprite_overrides): + for key in leaf.sprite_overrides: + block_model_data["textures"][key] = leaf.sprite_overrides[key]; + # Write block model file with open(block_model_file, "w") as f: dumpJson(block_model_data, f) diff --git a/input/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.betterleaves.json b/input/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.betterleaves.json new file mode 100644 index 0000000..2fddcfa --- /dev/null +++ b/input/assets/chipped/textures/block/acacia_leaves/frosted_acacia_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/acacia_leaves/frosted_acacia_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/acacia_leaves/frosted_acacia_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.betterleaves.json b/input/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.betterleaves.json new file mode 100644 index 0000000..de41575 --- /dev/null +++ b/input/assets/chipped/textures/block/birch_leaves/frosted_birch_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/birch_leaves/frosted_birch_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/birch_leaves/frosted_birch_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.betterleaves.json b/input/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.betterleaves.json new file mode 100644 index 0000000..e5e9525 --- /dev/null +++ b/input/assets/chipped/textures/block/dark_oak_leaves/frosted_dark_oak_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/dark_oak_leaves/frosted_dark_oak_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.betterleaves.json b/input/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.betterleaves.json new file mode 100644 index 0000000..d882471 --- /dev/null +++ b/input/assets/chipped/textures/block/jungle_leaves/frosted_jungle_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/jungle_leaves/frosted_jungle_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/jungle_leaves/frosted_jungle_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.betterleaves.json b/input/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.betterleaves.json new file mode 100644 index 0000000..eb40a70 --- /dev/null +++ b/input/assets/chipped/textures/block/oak_leaves/frosted_oak_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/oak_leaves/frosted_oak_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/oak_leaves/frosted_oak_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.betterleaves.json b/input/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.betterleaves.json new file mode 100644 index 0000000..6b02d99 --- /dev/null +++ b/input/assets/chipped/textures/block/spruce_leaves/frosted_spruce_leaves.betterleaves.json @@ -0,0 +1,9 @@ +{ + "textureStitching": { + "1-3": "chipped:block/spruce_leaves/frosted_spruce_leaves_top" + }, + "spriteOverrides": { + "top": "chipped:block/spruce_leaves/frosted_spruce_leaves_top", + "bottom": "#top" + } +} diff --git a/input/assets/eternal_starlight/textures/block/northland_leaves_snowy.betterleaves.json b/input/assets/eternal_starlight/textures/block/northland_leaves_snowy.betterleaves.json index 8681f12..61429ad 100644 --- a/input/assets/eternal_starlight/textures/block/northland_leaves_snowy.betterleaves.json +++ b/input/assets/eternal_starlight/textures/block/northland_leaves_snowy.betterleaves.json @@ -6,5 +6,9 @@ "textureStitching": { "1-3": "minecraft:block/snow", "7-9": "eternal_starlight:block/northland_leaves" + }, + "spriteOverrides": { + "top": "minecraft:block/snow", + "bottom": "eternal_starlight:block/northland_leaves" } }