diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 30836c94..79be2d5e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -85,7 +85,7 @@ public class EndBlocks { public static final Block END_LOTUS_FLOWER = registerBlockNI("end_lotus_flower", new BlockEndLotusFlower()); public static final WoodenMaterial END_LOTUS = new WoodenMaterial("end_lotus", MaterialColor.LIGHT_BLUE, MaterialColor.CYAN); - public static final WoodenMaterial LACUGROVE = new WoodenMaterial("lacugrove", MaterialColor.BROWN, MaterialColor.GREEN); + public static final WoodenMaterial LACUGROVE = new WoodenMaterial("lacugrove", MaterialColor.BROWN, MaterialColor.YELLOW); // Small Plants // public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss()); diff --git a/src/main/resources/assets/betterend/blockstates/lacugrove_log.json b/src/main/resources/assets/betterend/blockstates/lacugrove_log.json new file mode 100644 index 00000000..50a3a7c1 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lacugrove_log.json @@ -0,0 +1,22 @@ +{ + "variants": { + "axis=x": [ + { "model": "betterend:block/lacugrove_log", "x": 90, "y": 90 }, + { "model": "betterend:block/lacugrove_log_2", "x": 90, "y": 90 }, + { "model": "betterend:block/lacugrove_log_3", "x": 90, "y": 90 }, + { "model": "betterend:block/lacugrove_log_4", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/lacugrove_log" }, + { "model": "betterend:block/lacugrove_log_2" }, + { "model": "betterend:block/lacugrove_log_3" }, + { "model": "betterend:block/lacugrove_log_4" } + ], + "axis=z": [ + { "model": "betterend:block/lacugrove_log", "x": 90 }, + { "model": "betterend:block/lacugrove_log_2", "x": 90 }, + { "model": "betterend:block/lacugrove_log_3", "x": 90 }, + { "model": "betterend:block/lacugrove_log_4", "x": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 376bb162..8cb7b596 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -200,5 +200,24 @@ "block.betterend.crystal_grass": "Crystal Grass", "biome.betterend.crystal_mountains": "Crystal Mountains", - "block.betterend.eternal_pedestal": "Eternal Pedestal" + "block.betterend.eternal_pedestal": "Eternal Pedestal", + + "block.betterend.lacugrove_bark": "Lacugrove Bark", + "block.betterend.lacugrove_barrel": "Lacugrove Barrel", + "block.betterend.lacugrove_button": "Lacugrove Button", + "block.betterend.lacugrove_chest": "Lacugrove Chest", + "block.betterend.lacugrove_crafting_table": "Lacugrove Crafting Table", + "block.betterend.lacugrove_door": "Lacugrove Door", + "block.betterend.lacugrove_fence": "Lacugrove Fence", + "block.betterend.lacugrove_gate": "Lacugrove Gate", + "block.betterend.lacugrove_ladder": "Lacugrove Ladder", + "block.betterend.lacugrove_log": "Lacugrove Log", + "block.betterend.lacugrove_planks": "Lacugrove Planks", + "block.betterend.lacugrove_plate": "Lacugrove Plate", + "block.betterend.lacugrove_sign": "Lacugrove Sign", + "block.betterend.lacugrove_slab": "Lacugrove Slab", + "block.betterend.lacugrove_stairs": "Lacugrove Stairs", + "block.betterend.lacugrove_stripped_bark": "Lacugrove Stripped Bark", + "block.betterend.lacugrove_stripped_log": "Lacugrove Stripped Log", + "block.betterend.lacugrove_trapdoor": "Lacugrove Trapdoor" } \ 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 88a36b0e..9538b113 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -202,5 +202,24 @@ "block.betterend.crystal_grass": "Кристальная трава", "biome.betterend.crystal_mountains": "Клисталлические горы", - "block.betterend.eternal_pedestal": "Вечный пьедестал" + "block.betterend.eternal_pedestal": "Вечный пьедестал", + + "block.betterend.lacugrove_bark": "Кора оземангра", + "block.betterend.lacugrove_barrel": "Бочка", + "block.betterend.lacugrove_button": "Кнопка", + "block.betterend.lacugrove_chest": "Сундук", + "block.betterend.lacugrove_crafting_table": "Верстак", + "block.betterend.lacugrove_door": "Дверь", + "block.betterend.lacugrove_fence": "Забор", + "block.betterend.lacugrove_gate": "Калитка", + "block.betterend.lacugrove_ladder": "Лестница", + "block.betterend.lacugrove_log": "Бревно", + "block.betterend.lacugrove_planks": "Доски", + "block.betterend.lacugrove_plate": "Плита", + "block.betterend.lacugrove_sign": "Табличка", + "block.betterend.lacugrove_slab": "Плита", + "block.betterend.lacugrove_stairs": "Ступени", + "block.betterend.lacugrove_stripped_bark": "Обтёсанная кора", + "block.betterend.lacugrove_stripped_log": "Обтёсанное бревно", + "block.betterend.lacugrove_trapdoor": "Люк" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lacugrove_log.json b/src/main/resources/assets/betterend/models/block/lacugrove_log.json new file mode 100644 index 00000000..fe11acd8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lacugrove_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lacugrove_log_top", + "east": "betterend:block/lacugrove_log_side", + "north": "betterend:block/lacugrove_log_side", + "particle": "betterend:block/lacugrove_log_side", + "south": "betterend:block/lacugrove_log_side", + "up": "betterend:block/lacugrove_log_top", + "west": "betterend:block/lacugrove_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lacugrove_log_2.json b/src/main/resources/assets/betterend/models/block/lacugrove_log_2.json new file mode 100644 index 00000000..a815925a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lacugrove_log_2.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lacugrove_log_top", + "east": "betterend:block/lacugrove_log_side_2", + "north": "betterend:block/lacugrove_log_side_2", + "particle": "betterend:block/lacugrove_log_side_2", + "south": "betterend:block/lacugrove_log_side_2", + "up": "betterend:block/lacugrove_log_top", + "west": "betterend:block/lacugrove_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lacugrove_log_3.json b/src/main/resources/assets/betterend/models/block/lacugrove_log_3.json new file mode 100644 index 00000000..8ebf4d43 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lacugrove_log_3.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lacugrove_log_top", + "east": "betterend:block/lacugrove_log_side_3", + "north": "betterend:block/lacugrove_log_side_3", + "particle": "betterend:block/lacugrove_log_side_3", + "south": "betterend:block/lacugrove_log_side_3", + "up": "betterend:block/lacugrove_log_top", + "west": "betterend:block/lacugrove_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lacugrove_log_4.json b/src/main/resources/assets/betterend/models/block/lacugrove_log_4.json new file mode 100644 index 00000000..360b46f8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lacugrove_log_4.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lacugrove_log_top", + "east": "betterend:block/lacugrove_log_side_4", + "north": "betterend:block/lacugrove_log_side_4", + "particle": "betterend:block/lacugrove_log_side_4", + "south": "betterend:block/lacugrove_log_side_4", + "up": "betterend:block/lacugrove_log_top", + "west": "betterend:block/lacugrove_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_3.png b/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_3.png new file mode 100644 index 00000000..ec881a49 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_4.png b/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_4.png new file mode 100644 index 00000000..4eb75723 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_log_top.png b/src/main/resources/assets/betterend/textures/block/lacugrove_log_top.png new file mode 100644 index 00000000..4b63528d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_planks.png b/src/main/resources/assets/betterend/textures/block/lacugrove_planks.png new file mode 100644 index 00000000..2800e451 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_side.png new file mode 100644 index 00000000..5d7d8dba Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_top.png b/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_top.png new file mode 100644 index 00000000..6f60c1ec Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_stripped_log_top.png differ