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 509e9e9f6..2fdb8f2f2 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 @@ -323,7 +323,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { // апгрейд на сетку крафта MatteryRecipe(MItems.ExopackUpgrades.CRAFTING_UPGRADE, category = RecipeCategory.TOOLS) .row(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT) - .row(MItemTags.CRAFTING_TABLES, MItems.QUANTUM_TRANSCEIVER, MItemTags.CRAFTING_TABLES) + .row(MItemTags.WORKBENCHES, MItems.QUANTUM_TRANSCEIVER, MItemTags.WORKBENCHES) .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) .build(consumer) @@ -447,7 +447,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { MatteryRecipe(MItems.PAINTER, category = machinesCategory) .row(Items.BRUSH, Items.BUCKET, Items.BUCKET) .row(MItemTags.IRON_PLATES, Items.BUCKET, MItemTags.IRON_PLATES) - .row(MItemTags.IRON_PLATES, MItemTags.CRAFTING_TABLES, MItemTags.IRON_PLATES) + .row(MItemTags.IRON_PLATES, MItemTags.WORKBENCHES, MItemTags.IRON_PLATES) .unlockedBy(Tags.Items.DYES) .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 1c1011e0f..9adeb0a23 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 @@ -51,8 +51,8 @@ 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.WORKBENCHES).add(Items.CRAFTING_TABLE) + tagsProvider.blocks.Appender(MBlockTags.WORKBENCHES).add(Blocks.CRAFTING_TABLE) tagsProvider.items.Appender(MItemTags.MINECART_CARGO_CRATES).add(MItems.CARGO_CRATE_MINECARTS.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 e138f4b19..fa873f3e5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt @@ -27,7 +27,7 @@ object MItemTags { val INDUSTRIAL_GLASS: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass")) val UPGRADES: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "upgrades")) - val CRAFTING_TABLES: TagKey = ItemTags.create(ResourceLocation("forge", "crafting_tables")) + val WORKBENCHES: TagKey = ItemTags.create(ResourceLocation("forge", "workbenches")) val BASIC_CIRCUIT: TagKey = ItemTags.create(ResourceLocation("forge", "circuits/basic")) val ADVANCED_CIRCUIT: TagKey = ItemTags.create(ResourceLocation("forge", "circuits/advanced")) @@ -85,7 +85,7 @@ 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 WORKBENCHES: TagKey = BlockTags.create(ResourceLocation("forge", "workbenches")) val REQUIRES_TRITANIUM_TOOL: TagKey = BlockTags.create(ResourceLocation("minecraft", "requires_tritanium_tool"))