diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index a8544312..dc9f5b05 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -72,6 +72,7 @@ public class EndBlocks { public static final Block CAVE_MOSS = registerBlock("cave_moss", new BlockTerrain(MaterialColor.PURPLE)); public static final Block CRYSTAL_MOSS = registerBlock("crystal_moss", new BlockTerrain(MaterialColor.PINK)); public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new BlockShadowGrass()); + public static final Block AMBER_GRASS = registerBlock("amber_grass", new BlockTerrain(MaterialColor.ORANGE)); // Roads // public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM)); @@ -80,6 +81,7 @@ public class EndBlocks { public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new BlockPath(CAVE_MOSS)); public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BlockPath(CRYSTAL_MOSS)); public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new BlockPath(SHADOW_GRASS)); + public static final Block AMBER_GRASS_PATH = registerBlock("amber_grass_path", new BlockPath(AMBER_GRASS)); // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); diff --git a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java index dedd8bfc..d44b2612 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java +++ b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java @@ -1,15 +1,19 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; +import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndFeatures; public class BiomeAmberLand extends EndBiome { public BiomeAmberLand() { super(new BiomeDefinition("amber_land") - .setFogColor(87, 26, 87) + .setFogColor(255, 184, 71) .setFogDensity(2.0F) .setPlantsColor(122, 45, 122) - .setSurface(EndBlocks.END_MOSS) + .setSurface(EndBlocks.AMBER_GRASS) + .addFeature(EndFeatures.END_LAKE_RARE) + .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); } } diff --git a/src/main/resources/assets/betterend/blockstates/amber_grass.json b/src/main/resources/assets/betterend/blockstates/amber_grass.json new file mode 100644 index 00000000..cba709e2 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amber_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/amber_grass" }, + { "model": "betterend:block/amber_grass", "y": 90 }, + { "model": "betterend:block/amber_grass", "y": 180 }, + { "model": "betterend:block/amber_grass", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/amber_grass_path.json b/src/main/resources/assets/betterend/blockstates/amber_grass_path.json new file mode 100644 index 00000000..eff86e57 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amber_grass_path.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/amber_grass_path" }, + { "model": "betterend:block/amber_grass_path", "y": 90 }, + { "model": "betterend:block/amber_grass_path", "y": 180 }, + { "model": "betterend:block/amber_grass_path", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 39458320..721085ea 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -300,5 +300,31 @@ "item.betterend.bucket_end_fish": "End Fish Bucket", "item.betterend.end_fish_cooked": "Cooked End Fish", - "item.betterend.end_fish_raw": "End Fish" + "item.betterend.end_fish_raw": "End Fish", + + "biome.betterend.amber_land": "Amber Land", + "biome.betterend.blossoming_spires": "Blossoming Spires", + "block.betterend.amber_grass": "Amber Grass", + "block.betterend.amber_grass_path": "Amber Grass Path", + "block.betterend.tenanea_bark": "Tenanea Bark", + "block.betterend.tenanea_barrel": "Tenanea Barrel", + "block.betterend.tenanea_bookshelf": "Tenanea Bookshelf", + "block.betterend.tenanea_button": "Tenanea Button", + "block.betterend.tenanea_chest": "Tenanea Chest", + "block.betterend.tenanea_crafting_table": "Tenanea Crafting Table", + "block.betterend.tenanea_door": "Tenanea Door", + "block.betterend.tenanea_fence": "Tenanea Fence", + "block.betterend.tenanea_gate": "Tenanea Gate", + "block.betterend.tenanea_ladder": "Tenanea Ladder", + "block.betterend.tenanea_leaves": "Tenanea Leaves", + "block.betterend.tenanea_log": "Tenanea Log", + "block.betterend.tenanea_planks": "Tenanea Planks", + "block.betterend.tenanea_plate": "Tenanea Plate", + "block.betterend.tenanea_sapling": "Tenanea Sapling", + "block.betterend.tenanea_sign": "Tenanea Sign", + "block.betterend.tenanea_slab": "Tenanea Slab", + "block.betterend.tenanea_stairs": "Tenanea Stairs", + "block.betterend.tenanea_stripped_bark": "Tenanea Stripped Bark", + "block.betterend.tenanea_stripped_log": "Tenanea Stripped Log", + "block.betterend.tenanea_trapdoor": "Tenanea 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 3bb2f8da..9f06a568 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -214,27 +214,27 @@ "block.betterend.flavolite_runed_eternal": "Вечный рунный флаволит", "item.betterend.eternal_crystal": "Кристалл Вечности", - "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": "Люк из оземангра", + "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": "Люк из озерного мангра", - "block.betterend.lacugrove_leaves": "Листья оземангра", - "block.betterend.lacugrove_sapling": "Саженец оземангра", + "block.betterend.lacugrove_leaves": "Листья озерного мангра", + "block.betterend.lacugrove_sapling": "Саженец озерного мангра", "biome.betterend.megalake_grove": "Мегаозёрная роща", "biome.betterend.painted_mountains": "Окрашенные горы", @@ -267,7 +267,7 @@ "block.betterend.dragon_tree_bookshelf": "Книжные полки из драконова древа", "block.betterend.end_lotus_bookshelf": "Книжные полки из лотоса Края", - "block.betterend.lacugrove_bookshelf": "Книжные полки из оземангра", + "block.betterend.lacugrove_bookshelf": "Книжные полки из озерного мангра", "block.betterend.mossy_glowshroom_bookshelf": "Книжные полки из мшистого светогриба", "block.betterend.pythadendron_bookshelf": "Книжные полки из пифадендрона", @@ -302,5 +302,31 @@ "item.betterend.bucket_end_fish": "Ведро с рыбой Края", "item.betterend.end_fish_cooked": "Приготовленная рыба Края", - "item.betterend.end_fish_raw": "Рыба Края" + "item.betterend.end_fish_raw": "Рыба Края", + + "biome.betterend.amber_land": "Янтарные земли", + "biome.betterend.blossoming_spires": "Цветущие пики", + "block.betterend.amber_grass": "Янтарная трава", + "block.betterend.amber_grass_path": "Тропа из янтарной травы", + "block.betterend.tenanea_bark": "Кора тенанеи", + "block.betterend.tenanea_barrel": "Бочка из тенанеи", + "block.betterend.tenanea_bookshelf": "Книжные полки из тенанеи", + "block.betterend.tenanea_button": "Кнопка из тенанеи", + "block.betterend.tenanea_chest": "Сундук из тенанеи", + "block.betterend.tenanea_crafting_table": "Верстак из тенанеи", + "block.betterend.tenanea_door": "Дверь из тенанеи", + "block.betterend.tenanea_fence": "Забор из тенанеи", + "block.betterend.tenanea_gate": "Калитка из тенанеи", + "block.betterend.tenanea_ladder": "Лестница из тенанеи", + "block.betterend.tenanea_leaves": "Листья тенанеи", + "block.betterend.tenanea_log": "Бревно тенанеи", + "block.betterend.tenanea_planks": "Доски тенанеи", + "block.betterend.tenanea_plate": "Нажимная плмта из тенанеи", + "block.betterend.tenanea_sapling": "Саженец тенанеи", + "block.betterend.tenanea_sign": "Табличка из тенанеи", + "block.betterend.tenanea_slab": "Плита из тенанеи", + "block.betterend.tenanea_stairs": "Ступени из тенанеи", + "block.betterend.tenanea_stripped_bark": "Обтёсанная кора тенанеи", + "block.betterend.tenanea_stripped_log": "Обтёсанное бревно тенанеи", + "block.betterend.tenanea_trapdoor": "Дверь из тенанеи" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_grass.json b/src/main/resources/assets/betterend/models/block/amber_grass.json new file mode 100644 index 00000000..f07bc3e5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "block/end_stone", + "east": "betterend:block/amber_grass_side", + "north": "betterend:block/amber_grass_side", + "particle": "betterend:block/amber_grass_side", + "south": "betterend:block/amber_grass_side", + "up": "betterend:block/amber_grass_top", + "west": "betterend:block/amber_grass_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_path.json b/src/main/resources/assets/betterend/models/block/amber_grass_path.json new file mode 100644 index 00000000..9d18071c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass_path.json @@ -0,0 +1,7 @@ +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/amber_grass_path_top", + "side": "betterend:block/amber_grass_side", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/models/item/amber_grass.json b/src/main/resources/assets/betterend/models/item/amber_grass.json new file mode 100644 index 00000000..a06dc96e --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amber_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/amber_grass" +} diff --git a/src/main/resources/assets/betterend/models/item/amber_grass_path.json b/src/main/resources/assets/betterend/models/item/amber_grass_path.json new file mode 100644 index 00000000..9e0ac1ac --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amber_grass_path.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/amber_grass_path" +} diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass_path_top.png b/src/main/resources/assets/betterend/textures/block/amber_grass_path_top.png new file mode 100644 index 00000000..b7a3c7ae Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_grass_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass_side.png b/src/main/resources/assets/betterend/textures/block/amber_grass_side.png new file mode 100644 index 00000000..b34c5fbd Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_grass_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass_top.png b/src/main/resources/assets/betterend/textures/block/amber_grass_top.png new file mode 100644 index 00000000..7bca3114 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amber_grass_top.png differ