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 c0a54ea99..b995243df 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 @@ -272,9 +272,17 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(MItems.BATTERY_CAPACITOR) .buildEnergetic(consumer) + // лампа MatteryRecipe(MItems.LABORATORY_LAMP) .row(MItemTags.IRON_PLATES, MItemTags.HARDENED_GLASS_PANES_COLORLESS, MItemTags.IRON_PLATES) .row(MItems.MIRROR, Items.GLOWSTONE, MItems.MIRROR) .row(MItemTags.TRITANIUM_PLATES, Tags.Items.DUSTS_REDSTONE, MItemTags.TRITANIUM_PLATES) .build(consumer) + + // апгрейд на сетку крафта + MatteryRecipe(MItems.EXOSUIT_CRAFTING_UPGRADE) + .row(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT) + .row(MItemTags.CRAFTING_TABLES, MItems.QUANTUM_TRANSCEIVER, MItemTags.CRAFTING_TABLES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.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 41e1060a8..249e3bb51 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 @@ -6,6 +6,7 @@ import net.minecraft.world.effect.MobEffects import net.minecraft.world.item.BlockItem import net.minecraft.world.item.Items import net.minecraft.world.item.Tiers +import net.minecraft.world.level.block.Blocks import ru.dbotthepony.mc.otm.registry.MBlockTags import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags @@ -38,6 +39,9 @@ fun addTags(tagsProvider: TagsProvider) { MBlocks.STORAGE_CABLE ) + tagsProvider.items.appender(MItemTags.CRAFTING_TABLES).add(Items.CRAFTING_TABLE) + tagsProvider.blocks.appender(MBlockTags.CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE) + tagsProvider.items.appender(MItemTags.MINECART_CARGO_CRATES).add(MItems.CARGO_CRATE_MINECARTS.values) tagsProvider.items.forge("hardened_glass").add(MRegistry.INDUSTRIAL_GLASS.allItems.values) 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 aa72e61f4..1b49ad6fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt @@ -21,6 +21,8 @@ object MItemTags { val MINECART_CARGO_CRATES: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "minecart_cargo_crates")) val INDUSTRIAL_GLASS: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass")) + val CRAFTING_TABLES: TagKey = ItemTags.create(ResourceLocation("forge", "crafting_tables")) + val BASIC_CIRCUIT: TagKey = ItemTags.create(ResourceLocation("forge", "circuits/basic")) val ADVANCED_CIRCUIT: TagKey = ItemTags.create(ResourceLocation("forge", "circuits/advanced")) @@ -75,6 +77,8 @@ object MBlockTags { val CARGO_CRATES: TagKey = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "cargo_crates")) val INDUSTRIAL_GLASS: TagKey = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass")) + val CRAFTING_TABLES: TagKey = BlockTags.create(ResourceLocation("forge", "crafting_tables")) + val HARDENED_GLASS_PANES: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes")) val HARDENED_GLASS_PANES_BLACK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/black")) val HARDENED_GLASS_PANES_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/blue"))