diff --git a/src/main/resources/assets/betterend/blockstates/lumecorn.json b/src/main/resources/assets/betterend/blockstates/lumecorn.json index d78ebe45..ab9cf754 100644 --- a/src/main/resources/assets/betterend/blockstates/lumecorn.json +++ b/src/main/resources/assets/betterend/blockstates/lumecorn.json @@ -3,8 +3,8 @@ "shape=light1": { "model": "betterend:block/lumecorn_light_1" }, "shape=light2": { "model": "betterend:block/lumecorn_light_2" }, "shape=light3": { "model": "betterend:block/lumecorn_light_3" }, - "shape=middle": { "model": "betterend:block/lumecon_middle_big" }, - "shape=bottom_big": { "model": "betterend:block/lumecorn_bottom_big" }, - "shape=bottom_small": { "model": "betterend:block/lumecorn_bottom_small" } + "shape=middle": { "model": "betterend:block/lumecorn_middle" }, + "shape=bottom_big": { "model": "betterend:block/lumecorn_roots_big" }, + "shape=bottom_small": { "model": "betterend:block/lumecorn_roots_small" } } } diff --git a/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json b/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json index bba3fb7d..f2157010 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json +++ b/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json @@ -4,6 +4,18 @@ { "sprite": "betterend:block/lumecorn_light_1", "material": "betterend:glow_inc" + }, + { + "sprite": "betterend:block/lumecorn_leaf_2", + "material": "betterend:waving_floor" + }, + { + "sprite": "betterend:block/lumecorn_leaf_1", + "material": "betterend:waving_floor" + }, + { + "sprite": "betterend:block/lumecorn_big_petal", + "material": "betterend:waving" } ] } diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_middle.json b/src/main/resources/assets/betterend/models/block/lumecorn_middle.json new file mode 100644 index 00000000..e44c70df --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_middle.json @@ -0,0 +1,133 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/lumecorn_stem", + "texture": "betterend:block/lumecorn_stem", + "leaf_2": "betterend:block/lumecorn_leaf_2", + "leaf_1": "betterend:block/lumecorn_leaf_1", + "big_petal": "betterend:block/lumecorn_big_petal" + }, + "elements": [ + { + "__comment": "PlaneY4", + "from": [ 11, 16, 0 ], + "to": [ 27, 16.001, 16 ], + "rotation": { "origin": [ 11, 16, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 90 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 11, 16, 0 ], + "to": [ 19, 16.001, 16 ], + "rotation": { "origin": [ 11, 16, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 90 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -11, 15.999, 0 ], + "to": [ 5, 16, 16 ], + "rotation": { "origin": [ 5, 16, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -3, 15.999, 0 ], + "to": [ 5, 16, 16 ], + "rotation": { "origin": [ 5, 16, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 270 }, + "up": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1", "rotation": 270 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 16, 11 ], + "to": [ 16, 16.001, 27 ], + "rotation": { "origin": [ 0, 16, 11 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 16, 11 ], + "to": [ 16, 16.001, 19 ], + "rotation": { "origin": [ 0, 16, 11 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1" }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 180 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 15.999, -11 ], + "to": [ 16, 16, 5 ], + "rotation": { "origin": [ 0, 16, 5 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2" } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 15.999, -3 ], + "to": [ 16, 16, 5 ], + "rotation": { "origin": [ 0, 16, 5 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 180 }, + "up": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1" } + } + }, + { + "__comment": "PlaneY14", + "from": [ 8, 16, -7.5 ], + "to": [ 30, 16.001, 14.5 ], + "rotation": { "origin": [ 8, 16, -7.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 11, 11 ], "texture": "#big_petal" }, + "up": { "uv": [ 0, 0, 11, 11 ], "texture": "#big_petal" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 16, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 16, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_roots_big.json b/src/main/resources/assets/betterend/models/block/lumecorn_roots_big.json new file mode 100644 index 00000000..376d26f1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_roots_big.json @@ -0,0 +1,32 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/lumecorn_roots", + "texture": "betterend:block/lumecorn_roots", + "roots": "betterend:block/lumecorn_roots" + }, + "elements": [ + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 16, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 16, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_roots_small.json b/src/main/resources/assets/betterend/models/block/lumecorn_roots_small.json new file mode 100644 index 00000000..2e152863 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_roots_small.json @@ -0,0 +1,133 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/lumecorn_roots", + "texture": "betterend:block/lumecorn_roots", + "leaf_2": "betterend:block/lumecorn_leaf_2", + "leaf_1": "betterend:block/lumecorn_leaf_1", + "big_petal": "betterend:block/lumecorn_big_petal" + }, + "elements": [ + { + "__comment": "PlaneY4", + "from": [ 11, 16, 0 ], + "to": [ 27, 16.001, 16 ], + "rotation": { "origin": [ 11, 16, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 90 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 11, 16, 0 ], + "to": [ 19, 16.001, 16 ], + "rotation": { "origin": [ 11, 16, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 90 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -11, 15.999, 0 ], + "to": [ 5, 16, 16 ], + "rotation": { "origin": [ 5, 16, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -3, 15.999, 0 ], + "to": [ 5, 16, 16 ], + "rotation": { "origin": [ 5, 16, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 270 }, + "up": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1", "rotation": 270 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 16, 11 ], + "to": [ 16, 16.001, 27 ], + "rotation": { "origin": [ 0, 16, 11 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 16, 11 ], + "to": [ 16, 16.001, 19 ], + "rotation": { "origin": [ 0, 16, 11 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1" }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 180 } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 15.999, -11 ], + "to": [ 16, 16, 5 ], + "rotation": { "origin": [ 0, 16, 5 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf_2", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaf_2" } + } + }, + { + "__comment": "PlaneY17", + "from": [ 0, 15.999, -3 ], + "to": [ 16, 16, 5 ], + "rotation": { "origin": [ 0, 16, 5 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#leaf_1", "rotation": 180 }, + "up": { "uv": [ 16, 8, 0, 16 ], "texture": "#leaf_1" } + } + }, + { + "__comment": "PlaneY14", + "from": [ 8, 16, -7.5 ], + "to": [ 30, 16.001, 14.5 ], + "rotation": { "origin": [ 8, 16, -7.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 11, 11 ], "texture": "#big_petal" }, + "up": { "uv": [ 0, 0, 11, 11 ], "texture": "#big_petal" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 16, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 16, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_bark.png b/src/main/resources/assets/betterend/textures/block/lumecorn_bark.png deleted file mode 100644 index fa71da05..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_bark.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_big_petal.png b/src/main/resources/assets/betterend/textures/block/lumecorn_big_petal.png new file mode 100644 index 00000000..c5327ee1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_big_petal.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_1.png b/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_1.png index 7488b67d..5a1a5355 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_1.png and b/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_2.png b/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_2.png index 9ab93d96..74d8e57e 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_2.png and b/src/main/resources/assets/betterend/textures/block/lumecorn_leaf_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_2.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_2.png deleted file mode 100644 index 5f95e9dd..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_light_2.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_3.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_3.png deleted file mode 100644 index 6415a37a..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_light_3.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_roots.png b/src/main/resources/assets/betterend/textures/block/lumecorn_roots.png index 56434d06..f8680a6a 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lumecorn_roots.png and b/src/main/resources/assets/betterend/textures/block/lumecorn_roots.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_stem.png b/src/main/resources/assets/betterend/textures/block/lumecorn_stem.png new file mode 100644 index 00000000..56d7e386 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_stem.png differ