diff --git a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java index f012b118..91bac180 100644 --- a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java +++ b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java @@ -9,6 +9,7 @@ public class FurnaceRecipes { public static void register() { FurnaceRecipe.make("end_lily_leaf_dried", EndItems.END_LILY_LEAF, EndItems.END_LILY_LEAF_DRIED).build(); FurnaceRecipe.make("end_glass", EndBlocks.ENDSTONE_DUST, Blocks.GLASS).build(); - FurnaceRecipe.make("end_glass", EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED).build(); + FurnaceRecipe.make("end_berry", EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED).build(); + FurnaceRecipe.make("end_fish", EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED).build(); } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index aa32952f..8d2109ae 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -5,7 +5,7 @@ "biome.betterend.dust_wastelands": "Dust Wastelands", "biome.betterend.chorus_forest": "Chorus Forest", "biome.betterend.megalake": "Megalake", - "biome.betterend.crystal_mountains": "Crystal Mountains", + "biome.betterend.crystal_mountains": "Crystal Mountains", "entity.betterend.dragonfly": "Dragonfly", "item.betterend.spawn_egg_dragonfly": "Dragonfly Spawn Egg", @@ -198,79 +198,79 @@ "block.betterend.cave_grass": "Cave Grass", "block.betterend.cave_bush": "Cave Bush", - "block.betterend.cave_moss_path": "Cave Moss Path", - "block.betterend.crystal_moss": "Crystal Moss", - "block.betterend.crystal_moss_path": "Crystal Moss Path", - "block.betterend.pythadendron_leaves": "Pythadendron Leaves", - "item.betterend.spawn_egg_end_fish": "End Fish Spawn Egg", + "block.betterend.cave_moss_path": "Cave Moss Path", + "block.betterend.crystal_moss": "Crystal Moss", + "block.betterend.crystal_moss_path": "Crystal Moss Path", + "block.betterend.pythadendron_leaves": "Pythadendron Leaves", + "item.betterend.spawn_egg_end_fish": "End Fish Spawn Egg", "block.betterend.crystal_grass": "Crystal Grass", "block.betterend.flavolite_runed": "Runed Flavolite", "block.betterend.end_portal_block": "End Portal", - "block.betterend.eternal_pedestal": "Eternal Pedestal", + "block.betterend.eternal_pedestal": "Eternal Pedestal", "block.betterend.flavolite_runed_eternal": "Eternal Runed Flavolite", - "item.betterend.eternal_crystal": "Eternal Crystal", + "item.betterend.eternal_crystal": "Eternal Crystal", - "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", + "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", - "block.betterend.lacugrove_leaves": "Lacugrove Leaves", - "block.betterend.lacugrove_sapling": "Lacugrove Sapling", + "block.betterend.lacugrove_leaves": "Lacugrove Leaves", + "block.betterend.lacugrove_sapling": "Lacugrove Sapling", - "biome.betterend.megalake_grove": "Megalake Grove", - "biome.betterend.painted_mountains": "Painted Mountains", + "biome.betterend.megalake_grove": "Megalake Grove", + "biome.betterend.painted_mountains": "Painted Mountains", - "block.betterend.dragon_tree_bark": "Dragon Tree Bark", - "block.betterend.dragon_tree_barrel": "Dragon Tree Barrel", - "block.betterend.dragon_tree_button": "Dragon Tree Button", - "block.betterend.dragon_tree_chest": "Dragon Tree Chest", - "block.betterend.dragon_tree_crafting_table": "Dragon Tree Crafting Table", - "block.betterend.dragon_tree_door": "Dragon Tree Door", - "block.betterend.dragon_tree_fence": "Dragon Tree Fence", - "block.betterend.dragon_tree_gate": "Dragon Tree Gate", - "block.betterend.dragon_tree_ladder": "Dragon Tree Ladder", - "block.betterend.dragon_tree_log": "Dragon Tree Log", - "block.betterend.dragon_tree_planks": "Dragon Tree Planks", - "block.betterend.dragon_tree_plate": "Dragon Tree Plate", - "block.betterend.dragon_tree_sign": "Dragon Tree Sign", - "block.betterend.dragon_tree_slab": "Dragon Tree Slab", - "block.betterend.dragon_tree_stairs": "Dragon Tree Stairs", - "block.betterend.dragon_tree_stripped_bark": "Dragon Tree Stripped Bark", - "block.betterend.dragon_tree_stripped_log": "Dragon Tree Stripped Log", - "block.betterend.dragon_tree_trapdoor": "Dragon Tree Trapdoor", + "block.betterend.dragon_tree_bark": "Dragon Tree Bark", + "block.betterend.dragon_tree_barrel": "Dragon Tree Barrel", + "block.betterend.dragon_tree_button": "Dragon Tree Button", + "block.betterend.dragon_tree_chest": "Dragon Tree Chest", + "block.betterend.dragon_tree_crafting_table": "Dragon Tree Crafting Table", + "block.betterend.dragon_tree_door": "Dragon Tree Door", + "block.betterend.dragon_tree_fence": "Dragon Tree Fence", + "block.betterend.dragon_tree_gate": "Dragon Tree Gate", + "block.betterend.dragon_tree_ladder": "Dragon Tree Ladder", + "block.betterend.dragon_tree_log": "Dragon Tree Log", + "block.betterend.dragon_tree_planks": "Dragon Tree Planks", + "block.betterend.dragon_tree_plate": "Dragon Tree Plate", + "block.betterend.dragon_tree_sign": "Dragon Tree Sign", + "block.betterend.dragon_tree_slab": "Dragon Tree Slab", + "block.betterend.dragon_tree_stairs": "Dragon Tree Stairs", + "block.betterend.dragon_tree_stripped_bark": "Dragon Tree Stripped Bark", + "block.betterend.dragon_tree_stripped_log": "Dragon Tree Stripped Log", + "block.betterend.dragon_tree_trapdoor": "Dragon Tree Trapdoor", "biome.betterend.shadow_forest": "Shadow Forest", - "block.betterend.dragon_tree_leaves": "Dragon Tree Leaves", - "block.betterend.dragon_tree_sapling": "Dragon Tree Sapling", - "block.betterend.shadow_grass": "Shadow Grass", - "block.betterend.shadow_grass_path": "Shadow Grass Path", - "block.betterend.shadow_plant": "Shadow Plant", + "block.betterend.dragon_tree_leaves": "Dragon Tree Leaves", + "block.betterend.dragon_tree_sapling": "Dragon Tree Sapling", + "block.betterend.shadow_grass": "Shadow Grass", + "block.betterend.shadow_grass_path": "Shadow Grass Path", + "block.betterend.shadow_plant": "Shadow Plant", - "block.betterend.dragon_tree_bookshelf": "Dragon Tree Bookshelf", - "block.betterend.end_lotus_bookshelf": "End Lotus Bookshelf", - "block.betterend.lacugrove_bookshelf": "Lacugrove Bookshelf", - "block.betterend.mossy_glowshroom_bookshelf": "Mossy Glowshroom Bookshelf", - "block.betterend.pythadendron_bookshelf": "Pythadendron Bookshelf", + "block.betterend.dragon_tree_bookshelf": "Dragon Tree Bookshelf", + "block.betterend.end_lotus_bookshelf": "End Lotus Bookshelf", + "block.betterend.lacugrove_bookshelf": "Lacugrove Bookshelf", + "block.betterend.mossy_glowshroom_bookshelf": "Mossy Glowshroom Bookshelf", + "block.betterend.pythadendron_bookshelf": "Pythadendron Bookshelf", - "block.betterend.murkweed": "Murkweed", - "block.betterend.needlegrass": "Needlegrass", - "block.betterend.twisted_vine": "Twisted Vine", + "block.betterend.murkweed": "Murkweed", + "block.betterend.needlegrass": "Needlegrass", + "block.betterend.twisted_vine": "Twisted Vine", "block.betterend.shadow_berry": "Shadow Berry Seeds", "item.betterend.shadow_berry_cooked": "Shadow Berry Cooked", @@ -278,22 +278,26 @@ "block.betterend.purple_polypore": "Purple Polypore", "block.betterend.cyan_moss": "Cyan Moss", - "block.betterend.tail_moss": "Tail Moss", + "block.betterend.tail_moss": "Tail Moss", - "block.betterend.flavolite_lantern": "Flavolite Lantern", - "block.betterend.end_stone_lantern": "End Stone Lantern", - "block.betterend.violecite_lantern": "Violecite Lantern", + "block.betterend.flavolite_lantern": "Flavolite Lantern", + "block.betterend.end_stone_lantern": "End Stone Lantern", + "block.betterend.violecite_lantern": "Violecite Lantern", - "biome.betterend.dragonfly": "Dragonfly", - "biome.betterend.end_fish": "End Fish", - "biome.betterend.end_slime": "End Slime", - "biome.betterend.shadow_walker": "Shadow Walker", - "item.betterend.spawn_egg_shadow_walker": "Shadow Walker Spawn Egg", + "biome.betterend.dragonfly": "Dragonfly", + "biome.betterend.end_fish": "End Fish", + "biome.betterend.end_slime": "End Slime", + "biome.betterend.shadow_walker": "Shadow Walker", + "item.betterend.spawn_egg_shadow_walker": "Shadow Walker Spawn Egg", - "block.betterend.andesite_lantern": "Andesite Lantern", - "block.betterend.blackstone_lantern": "Blackstone Lantern", - "block.betterend.diorite_lantern": "Diorite Lantern", - "block.betterend.granite_lantern": "Granite Lantern", - "block.betterend.purpur_lantern": "Purpur Lantern", - "block.betterend.quartz_lantern": "Quartz Lantern" + "block.betterend.andesite_lantern": "Andesite Lantern", + "block.betterend.blackstone_lantern": "Blackstone Lantern", + "block.betterend.diorite_lantern": "Diorite Lantern", + "block.betterend.granite_lantern": "Granite Lantern", + "block.betterend.purpur_lantern": "Purpur Lantern", + "block.betterend.quartz_lantern": "Quartz Lantern", + + "item.betterend.bucket_end_fish": "End Fish Bucket", + "item.betterend.end_fish_cooked": "Cooked End Fish", + "item.betterend.end_fish_raw": "End Fish" } \ 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 9cd4da2e..2642ac97 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -10,15 +10,15 @@ "entity.betterend.dragonfly": "Стрекоза", "item.betterend.spawn_egg_dragonfly": "Яйцо призыва стрекозы", - "entity.betterend.end_slime": "Слизень края", - "item.betterend.spawn_egg_end_slime": "Яйцо призыва слизня края", + "entity.betterend.end_slime": "Слизень Края", + "item.betterend.spawn_egg_end_slime": "Яйцо призыва слизня Края", - "block.betterend.end_mycelium": "Мицелий края", - "block.betterend.end_moss": "Мох края", + "block.betterend.end_mycelium": "Мицелий Края", + "block.betterend.end_moss": "Мох Края", "block.betterend.endstone_dust": "Эндерняковая пыль", - "block.betterend.end_mycelium_path": "Тропа из мицелия края", - "block.betterend.end_moss_path": "Тропа из мха края", + "block.betterend.end_mycelium_path": "Тропа из мицелия Края", + "block.betterend.end_moss_path": "Тропа из мха Края", "block.betterend.ender_ore": "Руда Края", "block.betterend.terminite_block": "Блок Терминита", @@ -170,29 +170,29 @@ "block.betterend.quartz_pedestal": "Пьедестал из кварца", "block.betterend.infusion_pedestal": "Пьедестал Наполнения", - "block.betterend.end_lotus_seed": "Семя лотоса края", - "block.betterend.end_lotus_stem": "Стебель лотоса края", - "block.betterend.end_lotus_leaf": "Лист лотоса края", - "block.betterend.end_lotus_flower": "Цветок лотоса края", + "block.betterend.end_lotus_seed": "Семя лотоса Края", + "block.betterend.end_lotus_stem": "Стебель лотоса Края", + "block.betterend.end_lotus_leaf": "Лист лотоса Края", + "block.betterend.end_lotus_flower": "Цветок лотоса Края", - "block.betterend.end_lotus_bark": "Кора лотоса края", - "block.betterend.end_lotus_barrel": "Бочка из лотоса края", - "block.betterend.end_lotus_button": "Кнопка из лотоса края", - "block.betterend.end_lotus_chest": "Сундук из лотоса края", - "block.betterend.end_lotus_crafting_table": "Верстак из лотоса края", - "block.betterend.end_lotus_door": "Дверь из лотоса края", - "block.betterend.end_lotus_fence": "Забор из лотоса края", - "block.betterend.end_lotus_gate": "Калитка из лотоса края", - "block.betterend.end_lotus_ladder": "Лестница из лотоса края", - "block.betterend.end_lotus_log": "Бревно лотоса края", - "block.betterend.end_lotus_planks": "Доски лотоса края", - "block.betterend.end_lotus_plate": "Нажимная плита из лотоса края", - "block.betterend.end_lotus_sign": "Ьабличка из лотоса края", - "block.betterend.end_lotus_slab": "Плита из лотоса края", - "block.betterend.end_lotus_stairs": "Ступени из лотоса края", - "block.betterend.end_lotus_stripped_bark": "Обтёсанная кора лотоса края", - "block.betterend.end_lotus_stripped_log": "Обтёсанное бревно лотоса края", - "block.betterend.end_lotus_trapdoor": "Люк из лотоса края", + "block.betterend.end_lotus_bark": "Кора лотоса Края", + "block.betterend.end_lotus_barrel": "Бочка из лотоса Края", + "block.betterend.end_lotus_button": "Кнопка из лотоса Края", + "block.betterend.end_lotus_chest": "Сундук из лотоса Края", + "block.betterend.end_lotus_crafting_table": "Верстак из лотоса Края", + "block.betterend.end_lotus_door": "Дверь из лотоса Края", + "block.betterend.end_lotus_fence": "Забор из лотоса Края", + "block.betterend.end_lotus_gate": "Калитка из лотоса Края", + "block.betterend.end_lotus_ladder": "Лестница из лотоса Края", + "block.betterend.end_lotus_log": "Бревно лотоса Края", + "block.betterend.end_lotus_planks": "Доски лотоса Края", + "block.betterend.end_lotus_plate": "Нажимная плита из лотоса Края", + "block.betterend.end_lotus_sign": "Ьабличка из лотоса Края", + "block.betterend.end_lotus_slab": "Плита из лотоса Края", + "block.betterend.end_lotus_stairs": "Ступени из лотоса Края", + "block.betterend.end_lotus_stripped_bark": "Обтёсанная кора лотоса Края", + "block.betterend.end_lotus_stripped_log": "Обтёсанное бревно лотоса Края", + "block.betterend.end_lotus_trapdoor": "Люк из лотоса Края", "block.betterend.cave_moss": "Пещерный мох", "block.betterend.cave_grass": "Пещерная трава", @@ -265,7 +265,7 @@ "block.betterend.shadow_plant": "Теневое растение", "block.betterend.dragon_tree_bookshelf": "Книжные полки из драконова древа", - "block.betterend.end_lotus_bookshelf": "Книжные полки из лотоса края", + "block.betterend.end_lotus_bookshelf": "Книжные полки из лотоса Края", "block.betterend.lacugrove_bookshelf": "Книжные полки из оземангра", "block.betterend.mossy_glowshroom_bookshelf": "Книжные полки из мшистого светогриба", "block.betterend.pythadendron_bookshelf": "Книжные полки из пифадендрона", @@ -283,12 +283,12 @@ "block.betterend.tail_moss": "Хвостовидный мох", "block.betterend.flavolite_lantern": "Флаволитовый фонарь", - "block.betterend.end_stone_lantern": "Фонарь из камня края", + "block.betterend.end_stone_lantern": "Фонарь из камня Края", "block.betterend.violecite_lantern": "Виолецитовый фонарь", "biome.betterend.dragonfly": "Стрекоза", - "biome.betterend.end_fish": "Рыба края", - "biome.betterend.end_slime": "Слизень края", + "biome.betterend.end_fish": "Рыба Края", + "biome.betterend.end_slime": "Слизень Края", "biome.betterend.shadow_walker": "Теневой ходок", "item.betterend.spawn_egg_shadow_walker": "Яйцо призыва теневого ходока", @@ -297,5 +297,9 @@ "block.betterend.diorite_lantern": "Диоритовый фонарь", "block.betterend.granite_lantern": "Гранитный фонарь", "block.betterend.purpur_lantern": "Пурпуровый фонарь", - "block.betterend.quartz_lantern": "Кварцевый фонарь" + "block.betterend.quartz_lantern": "Кварцевый фонарь", + + "item.betterend.bucket_end_fish": "Ведро с рыбой Края", + "item.betterend.end_fish_cooked": "Приготовленная рыба Края", + "item.betterend.end_fish_raw": "Рыба Края" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/bucket_end_fish.json b/src/main/resources/assets/betterend/models/item/bucket_end_fish.json new file mode 100644 index 00000000..456f7496 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bucket_end_fish.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/bucket_end_fish" + } +} diff --git a/src/main/resources/assets/betterend/models/item/end_fish_cooked.json b/src/main/resources/assets/betterend/models/item/end_fish_cooked.json new file mode 100644 index 00000000..2766fa5e --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/end_fish_cooked.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/end_fish_cooked" + } +} diff --git a/src/main/resources/assets/betterend/models/item/end_fish_raw.json b/src/main/resources/assets/betterend/models/item/end_fish_raw.json new file mode 100644 index 00000000..be102442 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/end_fish_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/end_fish" + } +} diff --git a/src/main/resources/assets/betterend/textures/item/end_fish_cooked.png b/src/main/resources/assets/betterend/textures/item/end_fish_cooked.png new file mode 100644 index 00000000..87ecdb6d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/end_fish_cooked.png differ