diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 08b1c75a6..a5ef25c53 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -56,6 +56,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.PILL_HUMANE) provider.generated(MItems.PILL_OBLIVION) provider.generated(MItems.PILL_HEAL) + provider.generated(MItems.PILL_NOT_NORMAL) provider.generated(MItems.NUTRIENT_PASTE) provider.generated(MItems.ESSENCE_DRIVE) 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 ff508b9cb..f472dd36e 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 @@ -73,6 +73,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.CARGO_CRATES.block, "Cargo Crate") add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal") add(MRegistry.STAR_CHAIR.block, "Star Chair") + add(MRegistry.STAR_CHAIR.block, "desc", "For extensive stargazing.") add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block") add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs") add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab") @@ -750,6 +751,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "I can clearly see my own reflection in this mirror") add(MItems.REINFORCED_TRITANIUM_PLATE, "Reinforced Tritanium Plate") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "An armor plate, reinforced to withstand great kinetic forces") + add(MItems.ARMOR_ASSEMBLY, "Armor assembly") add(MItems.CARBON_MESH, "Carbon Mesh") add(MItems.GRAVITATIONAL_DISRUPTOR, "Spacetime Equalizer") 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 4a059c766..48a589b7a 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 @@ -24,6 +24,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.TRITANIUM_BLOCK.getBlock(color), "$name тритановый блок") add(MRegistry.COMPUTER_TERMINAL.getBlock(color), "$name компьютерный терминал") add(MRegistry.STAR_CHAIR.getBlock(color), "$name звезданутый стул") + add(MRegistry.STAR_CHAIR.block, "desc", "Для длительного наблюдения за звёздами.") add(MRegistry.TRITANIUM_STAIRS.getBlock(color), "$name тритановые ступеньки") add(MRegistry.TRITANIUM_SLAB.getBlock(color), "$nameF тритановая плита") add(MRegistry.TRITANIUM_WALL.getBlock(color), "$nameF тритановая ограда") @@ -752,6 +753,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "Я могу очень отчётливо видеть своё отражение в этом зеркале") add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "Бронированная пластина, усиленная чтобы выдержать большие кинетические силы") + add(MItems.ARMOR_ASSEMBLY, "Стройка брони") add(MItems.CARBON_MESH, "Углеродная сетка") 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 fcdfced16..ca6258771 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 @@ -245,6 +245,13 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .rowB(MItemTags.CARBON_PLATES) .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) + MatteryRecipe(MItems.ARMOR_ASSEMBLY, category = RecipeCategory.MISC) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .row(MItemTags.IRON_PLATES, Items.DIAMOND, MItemTags.IRON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.IRON_PLATES) + .unlockedBy(MItemTags.CARBON_PLATES) + .build(consumer) MatteryRecipe(MItems.CARBON_FIBRE_BLOCK, category = RecipeCategory.BUILDING_BLOCKS) .rowAB(MItemTags.CARBON_PLATES, MItemTags.CARBON_PLATES) @@ -263,7 +270,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .setUpgradeSource(Items.LEATHER_HELMET) .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_HELMET, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) @@ -272,7 +279,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .setUpgradeSource(Items.LEATHER_LEGGINGS) .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, 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) @@ -283,7 +290,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) .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.MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) @@ -293,7 +300,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_BOOTS, MItemTags.REINFORCED_TRITANIUM_PLATES) - .rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 10c1b182f..37e8e3186 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -530,6 +530,7 @@ object MItems { val ADVANCED_CONTROL_CIRCUIT: Item by registry.register(MNames.ADVANCED_CONTROL_CIRCUIT) { Item(DEFAULT_PROPERTIES) } val MATTER_CAPACITOR_PARTS: Item by registry.register(MNames.MATTER_CAPACITOR_PARTS) { Item(DEFAULT_PROPERTIES) } val CARBON_MESH: Item by registry.register(MNames.CARBON_MESH) { Item(DEFAULT_PROPERTIES) } + val ARMOR_ASSEMBLY: Item by registry.register(MNames.ARMOR_ASSEMBLY) { Item(DEFAULT_PROPERTIES) } val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem(DEFAULT_PROPERTIES).addSimpleDescription() } val QUANTUM_TRANSCEIVER: Item by registry.register(MNames.QUANTUM_TRANSCEIVER) { Item(DEFAULT_PROPERTIES) } @@ -566,6 +567,7 @@ object MItems { ::MIRROR, ::CARBON_MESH, + ::ARMOR_ASSEMBLY, ::REINFORCED_TRITANIUM_PLATE, MachineUpgrades.Basic::BLANK, @@ -597,6 +599,7 @@ object MItems { ::MIRROR, ::CARBON_MESH, + ::ARMOR_ASSEMBLY, ::REINFORCED_TRITANIUM_PLATE, ) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 004adbe1d..1156f4c48 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -184,6 +184,7 @@ object MNames { const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix" const val CARBON_MESH = "carbon_mesh" + const val ARMOR_ASSEMBLY = "armor_assembly" const val REINFORCED_TRITANIUM_PLATE = "reinforced_tritanium_plate" const val QUANTUM_TRANSCEIVER = "quantum_transceiver" diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png new file mode 100644 index 000000000..76d98ee6a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/armor_assembly.png differ