diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 0b8f1df0..a826dbf1 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -49,7 +49,7 @@ public class MetalMaterial { public final Block block; public final Block tile; public final Block bars; - public final Block plate; + public final Block pressurePlate; public final Block door; public final Block trapdoor; public final Block anvil; @@ -78,6 +78,7 @@ public class MetalMaterial { public final Item hoe; public final Item hammer; + public final Item forgedPlate; public final Item helmet; public final Item chestplate; public final Item leggings; @@ -113,7 +114,7 @@ public class MetalMaterial { anvil = EndBlocks.registerBlock(name + "_anvil", new EndAnvilBlock(block.defaultMaterialColor(), level)); bars = EndBlocks.registerBlock(name + "_bars", new EndMetalPaneBlock(block)); chain = EndBlocks.registerBlock(name + "_chain", new EndChainBlock(block.defaultMaterialColor())); - plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block)); + pressurePlate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block)); chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(block)); bulb_lantern = EndBlocks.registerBlock(name + "_bulb_lantern", new BulbVineLanternBlock(lanternProperties)); @@ -136,6 +137,7 @@ public class MetalMaterial { hoe = EndItems.registerTool(name + "_hoe", new EndHoeItem(material, -3, 0.0F, itemSettings)); hammer = EndItems.registerTool(name + "_hammer", new EndHammerItem(material, 5.0F, -3.2F, 0.3D, itemSettings)); + forgedPlate = EndItems.registerItem(name + "_forged_plate"); helmet = EndItems.registerItem(name + "_helmet", new EndArmorItem(armor, EquipmentSlot.HEAD, itemSettings)); chestplate = EndItems.registerItem(name + "_chestplate", new EndArmorItem(armor, EquipmentSlot.CHEST, itemSettings)); leggings = EndItems.registerItem(name + "_leggings", new EndArmorItem(armor, EquipmentSlot.LEGS, itemSettings)); @@ -154,7 +156,7 @@ public class MetalMaterial { // Block recipes GridRecipe.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', block).setGroup("end_metal_tiles").build(); GridRecipe.make(name + "_bars", bars).setOutputCount(16).setShape("###", "###").addMaterial('#', ingot).setGroup("end_metal_bars").build(); - GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build(); + GridRecipe.make(name + "_pressure_plate", pressurePlate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build(); GridRecipe.make(name + "_door", door).setOutputCount(3).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build(); GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build(); GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block, tile).setGroup("end_metal_stairs").build(); @@ -182,6 +184,7 @@ public class MetalMaterial { AnvilRecipe.Builder.create(name + "_axe_head").setInput(ingot).setInputCount(3).setOutput(axeHead).setAnvilLevel(level).setToolLevel(level).setDamage(level).build(); AnvilRecipe.Builder.create(name + "_hoe_head").setInput(ingot).setInputCount(2).setOutput(hoeHead).setAnvilLevel(level).setToolLevel(level).setDamage(level).build(); AnvilRecipe.Builder.create(name + "_sword_blade").setInput(ingot).setOutput(swordBlade).setAnvilLevel(level).setToolLevel(level).setDamage(level).build(); + AnvilRecipe.Builder.create(name + "_forged_plate").setInput(ingot).setOutput(forgedPlate).setAnvilLevel(level).setToolLevel(level).setDamage(level).build(); // Tools from parts SmithingTableRecipe.create(name + "_hammer").setResult(hammer).setBase(block).setAddition(Items.STICK).build(); @@ -193,10 +196,10 @@ public class MetalMaterial { SmithingTableRecipe.create(name + "_shovel").setResult(shovel).setBase(shovelHead).setAddition(Items.STICK).build(); // Armor crafting - GridRecipe.make(name + "_helmet", helmet).setShape("###", "# #").addMaterial('#', ingot).setGroup("end_metal_helmets").build(); - GridRecipe.make(name + "_chestplate", chestplate).setShape("# #", "###", "###").addMaterial('#', ingot).setGroup("end_metal_chestplates").build(); - GridRecipe.make(name + "_leggings", leggings).setShape("###", "# #", "# #").addMaterial('#', ingot).setGroup("end_metal_leggings").build(); - GridRecipe.make(name + "_boots", boots).setShape("# #", "# #").addMaterial('#', ingot).setGroup("end_metal_boots").build(); + GridRecipe.make(name + "_helmet", helmet).setShape("###", "# #").addMaterial('#', forgedPlate).setGroup("end_metal_helmets").build(); + GridRecipe.make(name + "_chestplate", chestplate).setShape("# #", "###", "###").addMaterial('#', forgedPlate).setGroup("end_metal_chestplates").build(); + GridRecipe.make(name + "_leggings", leggings).setShape("###", "# #", "# #").addMaterial('#', forgedPlate).setGroup("end_metal_leggings").build(); + GridRecipe.make(name + "_boots", boots).setShape("# #", "# #").addMaterial('#', forgedPlate).setGroup("end_metal_boots").build(); TagHelper.addTag(BlockTags.ANVIL, anvil); TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, block); diff --git a/src/main/java/ru/betterend/recipe/AnvilRecipes.java b/src/main/java/ru/betterend/recipe/AnvilRecipes.java index 0e110e83..c6c09ead 100644 --- a/src/main/java/ru/betterend/recipe/AnvilRecipes.java +++ b/src/main/java/ru/betterend/recipe/AnvilRecipes.java @@ -63,5 +63,12 @@ public class AnvilRecipes { .setToolLevel(4) .setDamage(6) .build(); + AnvilRecipe.Builder.create("aeternium_forged_plate") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_FORGED_PLATE) + .setAnvilLevel(anvilLevel) + .setToolLevel(4) + .setDamage(6) + .build(); } } diff --git a/src/main/java/ru/betterend/recipe/SmithingRecipes.java b/src/main/java/ru/betterend/recipe/SmithingRecipes.java index 4f1117c2..6222e4a3 100644 --- a/src/main/java/ru/betterend/recipe/SmithingRecipes.java +++ b/src/main/java/ru/betterend/recipe/SmithingRecipes.java @@ -54,22 +54,22 @@ public class SmithingRecipes { SmithingTableRecipe.create("aeternium_helmet") .setResult(EndItems.AETERNIUM_HELMET) .setBase(EndBlocks.TERMINITE.helmet) - .setAddition(EndItems.AETERNIUM_INGOT) + .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); SmithingTableRecipe.create("aeternium_chestplate") .setResult(EndItems.AETERNIUM_CHESTPLATE) .setBase(EndBlocks.TERMINITE.chestplate) - .setAddition(EndItems.AETERNIUM_INGOT) + .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); SmithingTableRecipe.create("aeternium_leggings") .setResult(EndItems.AETERNIUM_LEGGINGS) .setBase(EndBlocks.TERMINITE.leggings) - .setAddition(EndItems.AETERNIUM_INGOT) + .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); SmithingTableRecipe.create("aeternium_boots") .setResult(EndItems.AETERNIUM_BOOTS) .setBase(EndBlocks.TERMINITE.boots) - .setAddition(EndItems.AETERNIUM_INGOT) + .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); SmithingTableRecipe.create("thallasium_anvil_updrade") @@ -80,7 +80,7 @@ public class SmithingRecipes { SmithingTableRecipe.create("terminite_anvil_updrade") .setResult(EndBlocks.AETERNIUM_ANVIL) .setBase(EndBlocks.TERMINITE.anvil) - .setAddition(EndBlocks.AETERNIUM_BLOCK) + .setAddition(EndItems.AETERNIUM_INGOT) .build(); SmithingTableRecipe.create("armored_elytra") diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index d174a18d..c87199a1 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -61,6 +61,7 @@ public class EndItems { public final static Item ENDER_DUST = registerItem("ender_dust"); public final static Item ENDER_SHARD = registerItem("ender_shard"); public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot"); + public final static Item AETERNIUM_FORGED_PLATE = registerItem("aeternium_forged_plate"); public final static Item END_LILY_LEAF = registerItem("end_lily_leaf"); public final static Item END_LILY_LEAF_DRIED = registerItem("end_lily_leaf_dried"); public final static Item CRYSTAL_SHARDS = registerItem("crystal_shards"); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index a573c1da..f655f026 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -856,5 +856,8 @@ "block.betterend.neon_cactus_slab": "Neon Cactus Slab", "block.betterend.neon_cactus_stairs": "Neon Cactus Stairs", "biome.betterend.jade_cave": "Jade Cave", - "item.betterend.blossom_berry_jelly": "Blossom Berry Jelly" + "item.betterend.blossom_berry_jelly": "Blossom Berry Jelly", + "item.betterend.aeternium_forged_plate": "Aeternium Forged Plate", + "item.betterend.terminite_forged_plate": "Terminite Forged Plate", + "item.betterend.thallasium_forged_plate": "Thallasium Forged Plate" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 0deedfee..76a94f8a 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -875,5 +875,8 @@ "block.betterend.neon_cactus_slab": "Плита из неонового кактуса", "block.betterend.neon_cactus_stairs": "Ступени из неонового кактуса", "biome.betterend.jade_cave": "Нефритовая пещера", - "item.betterend.blossom_berry_jelly": "Желе из цветущей ягоды" + "item.betterend.blossom_berry_jelly": "Желе из цветущей ягоды", + "item.betterend.aeternium_forged_plate": "Этериевая кованная пластина", + "item.betterend.terminite_forged_plate": "Терминитовая кованная пластина", + "item.betterend.thallasium_forged_plate": "Талласиевая кованная пластина" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_forged_plate.png b/src/main/resources/assets/betterend/textures/item/aeternium_forged_plate.png new file mode 100644 index 00000000..3ffd9a9a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_forged_plate.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_forged_plate.png b/src/main/resources/assets/betterend/textures/item/terminite_forged_plate.png new file mode 100644 index 00000000..5b203bbe Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/terminite_forged_plate.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_forged_plate.png b/src/main/resources/assets/betterend/textures/item/thallasium_forged_plate.png new file mode 100644 index 00000000..2be7008f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_forged_plate.png differ