From 78453ad6baf1762f0abba84b0e6b6042c67799e2 Mon Sep 17 00:00:00 2001 From: alatyami Date: Sat, 11 Jul 2026 13:30:34 -0600 Subject: [PATCH] Fix grapevine stem z-fighting, closes #132 --- .../blockstates/purple_grape_vine.json | 11 ++++++++--- .../blockstates/purple_grape_vine_leaves.json | 5 ++++- .../blockstates/red_grape_vine.json | 11 ++++++++--- .../blockstates/red_grape_vine_leaves.json | 5 ++++- .../blockstates/white_grape_vine.json | 11 ++++++++--- .../blockstates/white_grape_vine_leaves.json | 5 ++++- .../block/grape_vine/grape_vine_leaves_trunk.json | 11 +---------- .../models/block/grape_vine/grape_vine_stage7.json | 4 ++-- 8 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine.json b/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine.json index 6331e84..3180a9c 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "age": "0|1|2|3" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -78,7 +81,8 @@ }, { "when": { - "up": "true" + "up": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -88,7 +92,8 @@ }, { "when": { - "down": "true" + "down": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -97,4 +102,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine_leaves.json b/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine_leaves.json index ce91e5d..3afaf9b 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine_leaves.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/purple_grape_vine_leaves.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "down": "false" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -72,4 +75,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine.json b/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine.json index 6331e84..3180a9c 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "age": "0|1|2|3" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -78,7 +81,8 @@ }, { "when": { - "up": "true" + "up": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -88,7 +92,8 @@ }, { "when": { - "down": "true" + "down": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -97,4 +102,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine_leaves.json b/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine_leaves.json index ce91e5d..3afaf9b 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine_leaves.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/red_grape_vine_leaves.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "down": "false" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -72,4 +75,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine.json b/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine.json index 6331e84..3180a9c 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "age": "0|1|2|3" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -78,7 +81,8 @@ }, { "when": { - "up": "true" + "up": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -88,7 +92,8 @@ }, { "when": { - "down": "true" + "down": "true", + "age": "0|1|2|3" }, "apply": { "model": "growthcraft:block/rope_linen_side", @@ -97,4 +102,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine_leaves.json b/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine_leaves.json index ce91e5d..3afaf9b 100644 --- a/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine_leaves.json +++ b/src/main/resources/assets/growthcraft_cellar/blockstates/white_grape_vine_leaves.json @@ -1,6 +1,9 @@ { "multipart": [ { + "when": { + "down": "false" + }, "apply": { "model": "growthcraft:block/rope_linen" } @@ -72,4 +75,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_leaves_trunk.json b/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_leaves_trunk.json index 2260e7d..94c0134 100644 --- a/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_leaves_trunk.json +++ b/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_leaves_trunk.json @@ -65,15 +65,6 @@ 4 ], "texture": "#0" - }, - "down": { - "uv": [ - 0, - 12, - 4, - 16 - ], - "texture": "#0" } } }, @@ -210,4 +201,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_stage7.json b/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_stage7.json index 49b89cf..75febf4 100644 --- a/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_stage7.json +++ b/src/main/resources/assets/growthcraft_cellar/models/block/grape_vine/grape_vine_stage7.json @@ -14,7 +14,7 @@ ], "to": [ 10.0, - 16.0, + 15.99, 10.0 ], "faces": { @@ -75,4 +75,4 @@ } } ] -} \ No newline at end of file +}