From 89ea492c61403bb4e1312ed1086e0f05b3c8657b Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 29 Oct 2020 16:42:42 +0300 Subject: [PATCH] Translation strings --- .../blocks/complex/StoneMaterial.java | 4 +- .../ru/betterend/recipe/CraftingRecipes.java | 45 +++++++------------ .../assets/betterend/lang/en_us.json | 8 ++++ .../assets/betterend/lang/ru_ru.json | 8 ++++ 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index 953a9e1c..5d057cd1 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -14,6 +14,7 @@ import ru.betterend.blocks.basis.BlockStairs; import ru.betterend.blocks.basis.BlockStoneButton; import ru.betterend.blocks.basis.BlockStonePressurePlate; import ru.betterend.blocks.basis.BlockWall; +import ru.betterend.recipe.CraftingRecipes; import ru.betterend.recipe.builders.GridRecipe; import ru.betterend.registry.EndBlocks; import ru.betterend.util.TagHelper; @@ -60,7 +61,6 @@ public class StoneMaterial { GridRecipe.make(name + "_polished", polished).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build(); GridRecipe.make(name + "_tiles", tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', polished).setGroup("end_small_tile").build(); GridRecipe.make(name + "_pillar", pillar).setShape("#", "#").addMaterial('#', slab).setGroup("end_pillar").build(); - GridRecipe.make(name + "_pedestal", pedestal).setOutputCount(2).setShape("S", "#", "S").addMaterial('S', slab).addMaterial('#', pillar).setGroup("end_pedestal").build(); GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', stone).setGroup("end_stone_stairs").build(); GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', stone).setGroup("end_stone_slabs").build(); @@ -73,6 +73,8 @@ public class StoneMaterial { GridRecipe.make(name + "_button", button).setList("#").addMaterial('#', stone).setGroup("end_stone_buttons").build(); GridRecipe.make(name + "_pressure_plate", pressure_plate).setShape("##").addMaterial('#', stone).setGroup("end_stone_plates").build(); + CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); + // Item Tags // TagHelper.addTag(ItemTags.SLABS, slab, brick_slab); TagHelper.addTag(ItemTags.STONE_BRICKS, bricks); diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index b028c83d..fdc9bf44 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -1,5 +1,6 @@ package ru.betterend.recipe; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.Items; @@ -26,36 +27,11 @@ public class CraftingRecipes { .addMaterial('V', Items.BUCKET) .build(); - GridRecipe.make("andesite_pedestal", EndBlocks.ANDESITE_PEDESTAL) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', Blocks.POLISHED_ANDESITE_SLAB) - .addMaterial('#', Blocks.POLISHED_ANDESITE) - .setOutputCount(2) - .build(); - GridRecipe.make("diorite_pedestal", EndBlocks.DIORITE_PEDESTAL) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', Blocks.POLISHED_DIORITE_SLAB) - .addMaterial('#', Blocks.POLISHED_DIORITE) - .setOutputCount(2) - .build(); - GridRecipe.make("granite_pedestal", EndBlocks.GRANITE_PEDESTAL) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', Blocks.POLISHED_GRANITE_SLAB) - .addMaterial('#', Blocks.POLISHED_GRANITE) - .setOutputCount(2) - .build(); - GridRecipe.make("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', Blocks.QUARTZ_SLAB) - .addMaterial('#', Blocks.QUARTZ_PILLAR) - .setOutputCount(2) - .build(); - GridRecipe.make("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', Blocks.PURPUR_SLAB) - .addMaterial('#', Blocks.PURPUR_PILLAR) - .setOutputCount(2) - .build(); + registerPedestal("andesite_pedestal", EndBlocks.ANDESITE_PEDESTAL, Blocks.POLISHED_ANDESITE_SLAB, Blocks.POLISHED_ANDESITE); + registerPedestal("diorite_pedestal", EndBlocks.DIORITE_PEDESTAL, Blocks.POLISHED_DIORITE_SLAB, Blocks.POLISHED_DIORITE); + registerPedestal("granite_pedestal", EndBlocks.GRANITE_PEDESTAL, Blocks.POLISHED_GRANITE_SLAB, Blocks.POLISHED_GRANITE); + registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR); + registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR); String material = "terminite"; GridRecipe.make(material + "_block", EndBlocks.TERMINITE_BLOCK) @@ -116,6 +92,15 @@ public class CraftingRecipes { GridRecipe.make("aurora_block", EndBlocks.AURORA_CRYSTAL).setShape("##", "##").addMaterial('#', EndItems.CRYSTAL_SHARDS).build(); } + public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { + GridRecipe.make(name, pedestal) + .setShape(new String[] { "S", "#", "S" }) + .addMaterial('S', slab) + .addMaterial('#', pillar) + .setOutputCount(2) + .build(); + } + private static void registerHelmet(String name, Item material, Item result) { GridRecipe.make(name + "_helmet", result) .setShape(new String[] { "III", "I I" }) diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 840c7a5e..9f83426a 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -145,6 +145,7 @@ "block.betterend.violecite_stairs": "Violecite Stairs", "block.betterend.violecite_polished": "Polished Violecite", "block.betterend.violecite_wall": "Violecite Wall", + "block.betterend.violecite_pedestal": "Violecite Pedestal", "block.betterend.flavolite": "Flavolite", "block.betterend.flavolite_bricks": "Flavolite Bricks", @@ -159,6 +160,13 @@ "block.betterend.flavolite_stairs": "Flavolite Stairs", "block.betterend.flavolite_polished": "Polished Flavolite", "block.betterend.flavolite_wall": "Flavolite Wall", + "block.betterend.flavolite_pedestal": "Flavolite Pedestal", + + "block.betterend.andesite_pedestal": "Andesite Pedestal", + "block.betterend.diorite_pedestal": "Diorite Pedestal", + "block.betterend.granite_pedestal": "Granite Pedestal", + "block.betterend.purpur_pedestal": "Purpur Pedestal", + "block.betterend.quartz_pedestal": "Quartz Pedestal", "block.betterend.end_lotus_seed": "End Lotus Seed", "block.betterend.end_lotus_stem": "End Lotus Stem", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index ceb26fbf..402cfdd3 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -145,6 +145,7 @@ "block.betterend.violecite_stairs": "Виолецитовые ступени", "block.betterend.violecite_tile": "Полированный Виолецит", "block.betterend.violecite_wall": "Виолецитовая стена", + "block.betterend.violecite_pedestal": "Виолецитовый пьедестал", "block.betterend.flavolite": "Флаволит", "block.betterend.flavolite_bricks": "Флаволитовые кирпичи", @@ -159,6 +160,13 @@ "block.betterend.flavolite_stairs": "Флаволитовые ступени", "block.betterend.flavolite_polished": "Полированный Флаволит", "block.betterend.flavolite_wall": "Флаволитовая стена", + "block.betterend.flavolite_pedestal": "Флаволитовый пьедестал", + + "block.betterend.andesite_pedestal": "Пьедестал из андезита", + "block.betterend.diorite_pedestal": "Пьедестал из диорита", + "block.betterend.granite_pedestal": "Пьедестал из гранита", + "block.betterend.purpur_pedestal": "Пьедестал из пурпура", + "block.betterend.quartz_pedestal": "Пьедестал из кварца", "block.betterend.end_lotus_seed": "Семя лотоса края", "block.betterend.end_lotus_stem": "Стебель лотоса края",