diff --git a/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json index 9e9347aa..a04f6b79 100644 --- a/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json +++ b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json @@ -1,16 +1,7 @@ { "variants": { - "shape=top": [ - { "model": "betterend:block/tenanea_flowers_top_1" }, - { "model": "betterend:block/tenanea_flowers_top_2" } - ], - "shape=middle": [ - { "model": "betterend:block/tenanea_flowers_middle_1" }, - { "model": "betterend:block/tenanea_flowers_middle_2" } - ], - "shape=bottom": [ - { "model": "betterend:block/tenanea_flowers_bottom_1" }, - { "model": "betterend:block/tenanea_flowers_bottom_2" } - ] + "shape=top": { "model": "betterend:block/tenanea_flowers_middle" }, + "shape=middle": { "model": "betterend:block/tenanea_flowers_middle" }, + "shape=bottom": { "model": "betterend:block/tenanea_flowers_bottom" } } } diff --git a/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json b/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json index ff78dfb5..85e2efd1 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json +++ b/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json @@ -1,3 +1,14 @@ { - "defaultMaterial": "betterend:wave_glow_inc" -} + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/tenanea_flowers", + "material": "betterend:glow_all" + }, + { + "sprite": "betterend:block/tenanea_flowers_bottom", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom.json similarity index 58% rename from src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json rename to src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom.json index c74628dd..c26dda67 100644 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom.json @@ -1,8 +1,8 @@ { "textures": { - "texture": "betterend:block/tenanea_flowers_top", - "stem": "betterend:block/tenanea_flowers_top_stem", - "particle": "#texture" + "flowers": "betterend:block/tenanea_flowers_bottom", + "vine": "betterend:block/tenanea_flowers_stem_bottom", + "particle": "#flowers" }, "elements": [ { @@ -12,8 +12,8 @@ "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "tintindex": 0 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "tintindex": 0 } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 } } }, { @@ -23,8 +23,8 @@ "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "tintindex": 0 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "tintindex": 0 } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 } } }, { @@ -34,8 +34,8 @@ "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" } } }, { @@ -45,8 +45,8 @@ "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" } } } ] diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json deleted file mode 100644 index bde5c2bb..00000000 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/cross_no_distortion_tinted", - "textures": { - "texture": "betterend:block/tenanea_flowers_bottom" - } -} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json deleted file mode 100644 index c2d080db..00000000 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/cross_no_distortion_inverted_tinted", - "textures": { - "texture": "betterend:block/tenanea_flowers_bottom" - } -} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle.json similarity index 58% rename from src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json rename to src/main/resources/assets/betterend/models/block/tenanea_flowers_middle.json index 1999fc19..77c511aa 100644 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle.json @@ -1,8 +1,8 @@ { "textures": { - "texture": "betterend:block/tenanea_flowers_top", - "stem": "betterend:block/tenanea_flowers_top_stem", - "particle": "#texture" + "flowers": "betterend:block/tenanea_flowers", + "vine": "betterend:block/tenanea_flowers_stem", + "particle": "#flowers" }, "elements": [ { @@ -12,8 +12,8 @@ "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 } } }, { @@ -23,8 +23,8 @@ "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "tintindex": 0 } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flowers", "tintindex": 0 } } }, { @@ -34,8 +34,8 @@ "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" } } }, { @@ -45,8 +45,8 @@ "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" } + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine" } } } ] diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json deleted file mode 100644 index ef39aa4b..00000000 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/cross_no_distortion_tinted", - "textures": { - "texture": "betterend:block/tenanea_flowers" - } -} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json deleted file mode 100644 index 07d18bb0..00000000 --- a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/cross_no_distortion_inverted_tinted", - "textures": { - "texture": "betterend:block/tenanea_flowers" - } -} diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png b/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png index 2d67b177..efdecb02 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png and b/src/main/resources/assets/betterend/textures/block/cave_moss_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_top.png b/src/main/resources/assets/betterend/textures/block/cave_moss_top.png index 1d3698b2..335fa1cb 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_moss_top.png and b/src/main/resources/assets/betterend/textures/block/cave_moss_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png index e8a075de..b7bf2ef7 100644 Binary files a/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png and b/src/main/resources/assets/betterend/textures/block/dragon_tree_trapdoor.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png b/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png index 0aad4be7..b550c4db 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png and b/src/main/resources/assets/betterend/textures/block/flavolite_pillar_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png index fdcb63e7..a98bc902 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite_polished.png and b/src/main/resources/assets/betterend/textures/block/flavolite_polished.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png index 7140349a..1617fb07 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png index ff7b0016..441222c4 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/pink_moss_side.png b/src/main/resources/assets/betterend/textures/block/pink_moss_side.png index 51f56f33..61f41c33 100644 Binary files a/src/main/resources/assets/betterend/textures/block/pink_moss_side.png and b/src/main/resources/assets/betterend/textures/block/pink_moss_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png b/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png index 837015c2..3ae83134 100644 Binary files a/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png and b/src/main/resources/assets/betterend/textures/block/tenanea_door_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png index 9367bd9c..db355c90 100644 Binary files a/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png and b/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png index 9454e2d2..783673aa 100644 Binary files a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png and b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem.png new file mode 100644 index 00000000..a6132d47 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem_bottom.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem_bottom.png new file mode 100644 index 00000000..3afd63ec Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_stem_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/item/crystalite_helmet.png b/src/main/resources/assets/betterend/textures/item/crystalite_helmet.png index 48847652..a5aaf3e2 100644 Binary files a/src/main/resources/assets/betterend/textures/item/crystalite_helmet.png and b/src/main/resources/assets/betterend/textures/item/crystalite_helmet.png differ