From 8093d314d7c9733b24aac01ed56cead5c8855e93 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 10 Apr 2023 02:28:56 +0600 Subject: [PATCH] b --- .../mc/otm/datagen/lang/English.kt | 4 +++ .../mc/otm/datagen/lang/Russian.kt | 4 +++ .../datagen/recipes/CraftingTableRecipes.kt | 35 +++++++++++-------- .../dbotthepony/mc/otm/datagen/tags/Tags.kt | 2 ++ .../ru/dbotthepony/mc/otm/registry/Tags.kt | 1 + 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index 771ba8869..83bbc2a50 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -377,6 +377,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.FLUID_TANK, "named", "Fluid Tank (%s)") add(MBlocks.ENGINE, "Ship Engine") + add(MBlocks.ENGINE, "desc", "Unfortunately, it doesn't seem functional anymore.") add(MBlocks.HOLO_SIGN, "Holo Sign") add(MBlocks.TRITANIUM_INGOT_BLOCK, "Tritanium Plating Block") @@ -397,6 +398,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.CARBON_FIBRE_BLOCK, "Carbon Fibre Block") add(MBlocks.METAL_JUNK, "Metal Junk Block") + add(MBlocks.METAL_JUNK, "desc", "Useless junk, or is it?") add(MBlocks.METAL_MESH, "Metal Mesh") add(MBlocks.TRITANIUM_STRIPED_BLOCK, "Tritanium Striped Block") @@ -524,6 +526,8 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR_COMPOUND, "Mirror Compound") add(MItems.MIRROR, "Mirror") add(MItems.MIRROR, "description", "I can clearly see my own reflection in this mirror") + add(MItems.REINFORCED_TRITANIUM_PLATE, "Reinforced Tritanium Plate") + add(MItems.REINFORCED_TRITANIUM_PLATE, "description", "An armor plate, reinforced to withstand great kinetic forces") add(MItems.GRAVITATIONAL_DISRUPTOR, "Gravitational Disruptor") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index 77ccaab54..02c856631 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -384,6 +384,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.FLUID_TANK, "named", "Жидкостный бак (%s)") add(MBlocks.ENGINE, "Двигатель корабля") + add(MBlocks.ENGINE, "desc", "К сожалению, он больше не выглядит рабочим.") add(MBlocks.HOLO_SIGN, "Голографическая табличка") add(MBlocks.TRITANIUM_INGOT_BLOCK, "Блок слитков тритана") @@ -405,6 +406,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.CARBON_FIBRE_BLOCK, "Блок углеродных трубок") add(MBlocks.METAL_MESH, "Блок металлической сетки") add(MBlocks.METAL_JUNK, "Металлический хлам") + add(MBlocks.METAL_JUNK, "desc", "Бесполезный хлам, или нет?") add(MBlocks.TRITANIUM_STRIPED_BLOCK, "Тритановый блок с полоской") add(MBlocks.TRITANIUM_STRIPED_STAIRS, "Тритановые ступеньки с полоской") @@ -531,6 +533,8 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR_COMPOUND, "Набор выплавки зеркала") add(MItems.MIRROR, "Зеркало") add(MItems.MIRROR, "description", "Я могу очень отчётливо видеть своё отражение в этом зеркале") + add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина") + add(MItems.REINFORCED_TRITANIUM_PLATE, "description", "Бронированная пластина, усиленная что бы выдержать большие кинетические силы") add(MItems.GRAVITATIONAL_DISRUPTOR, "Антигравитационный маяк") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 795954f11..ef446bcd3 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -169,31 +169,38 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(Tags.Items.GLASS_PANES_COLORLESS) .build(consumer) + MatteryRecipe(MItems.REINFORCED_TRITANIUM_PLATE, category = RecipeCategory.MISC) + .rowB(MItems.CARBON_MESH) + .row(MItems.CARBON_MESH, MItemTags.TRITANIUM_PLATES, MItems.CARBON_MESH) + .rowB(MItems.CARBON_MESH) + .unlockedBy(MItemTags.TRITANIUM_PLATES) + .build(consumer) + // броня MatteryRecipe(MItems.TRITANIUM_HELMET, category = RecipeCategory.COMBAT) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, Items.LEATHER_HELMET, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_HELMET, MItemTags.REINFORCED_TRITANIUM_PLATES) + .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_PANTS, category = RecipeCategory.COMBAT) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, Items.LEATHER_LEGGINGS, MItemTags.TRITANIUM_PLATES) - .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_LEGGINGS, MItemTags.REINFORCED_TRITANIUM_PLATES) + .rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_CHESTPLATE, category = RecipeCategory.COMBAT) - .row(MItemTags.TRITANIUM_PLATES, Items.LEATHER_CHESTPLATE, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_CHESTPLATE, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_BOOTS, category = RecipeCategory.COMBAT) - .row(MItemTags.TRITANIUM_PLATES, Items.LEATHER_BOOTS, MItemTags.TRITANIUM_PLATES) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_BOOTS, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) // простые батарейки diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index 6dcc91e5f..0d51173e7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -24,6 +24,8 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.plates.add("iron", MItems.IRON_PLATE) tagsProvider.plates.add("gold", MItems.GOLD_PLATE) + tagsProvider.items.forge("reinforced_tritanium").add(MItems.REINFORCED_TRITANIUM_PLATE) + tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK) tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt index 433e40e59..a294d403f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt @@ -17,6 +17,7 @@ object MItemTags { val NUGGETS: TagKey = ItemTags.create(ResourceLocation("forge", "nuggets")) val TRITANIUM_INGOTS_STORAGE: TagKey = ItemTags.create(ResourceLocation("forge", "storage_blocks/tritanium")) val TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) + val REINFORCED_TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "reinforced_tritanium")) val TRITANIUM_DUSTS: TagKey = ItemTags.create(ResourceLocation("forge", "dusts/tritanium")) val IRON_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/iron")) val GOLD_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/gold"))