diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 489690df..a76f17e5 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -122,6 +122,7 @@ public class EndBlocks { public static final Block TENANEA_SAPLING = registerBlock("tenanea_sapling", new BlockTenaneaSapling()); public static final Block TENANEA_LEAVES = registerBlock("tenanea_leaves", new BlockLeaves(TENANEA_SAPLING, MaterialColor.PINK)); + public static final Block TENANEA_FLOWERS = registerBlock("tenanea_flowers", new BlockVine(15)); public static final WoodenMaterial TENANEA = new WoodenMaterial("tenanea", MaterialColor.PINK, MaterialColor.PINK); // Small Plants // diff --git a/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json new file mode 100644 index 00000000..9e9347aa --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json @@ -0,0 +1,16 @@ +{ + "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" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 035f65a2..2735675d 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -331,5 +331,6 @@ "block.betterend.amber_block": "Amber Block", "block.betterend.amber_ore": "Amber Ore", "item.betterend.amber_gem": "Amber Gem", - "item.betterend.raw_amber": "Raw Amber" + "item.betterend.raw_amber": "Raw Amber", + "block.betterend.tenanea_flowers": "Tenanea Flowers" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 021fdef0..fcc3fcb8 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -333,5 +333,6 @@ "block.betterend.amber_block": "Блок янтаря", "block.betterend.amber_ore": "Янтарная руда", "item.betterend.amber_gem": "Огранённый янтарь", - "item.betterend.raw_amber": "Необработанный янтарь" + "item.betterend.raw_amber": "Необработанный янтарь", + "block.betterend.tenanea_flowers": "Цветы тенанеи" } \ No newline at end of file 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 new file mode 100644 index 00000000..e0bd69bc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "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 new file mode 100644 index 00000000..ce711252 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers_bottom" + } +} 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 new file mode 100644 index 00000000..487cf87e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "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 new file mode 100644 index 00000000..fd254807 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers" + } +} 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_top_1.json new file mode 100644 index 00000000..2cfede97 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/tenanea_flowers_top" + } +} 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_top_2.json new file mode 100644 index 00000000..6b4754e1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers_top" + } +} diff --git a/src/main/resources/assets/betterend/models/item/tenanea_flowers.json b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json new file mode 100644 index 00000000..19320d6c --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/tenanea_flowers_bottom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png new file mode 100644 index 00000000..5ce1df84 Binary files /dev/null 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 new file mode 100644 index 00000000..16334402 Binary files /dev/null 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_top.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_top.png new file mode 100644 index 00000000..50b0a533 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_top.png differ