diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt index 8d2e69aff..c988bd6ae 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.datagen.recipes -import net.minecraft.data.recipes.RecipeCategory import net.minecraft.tags.ItemTags import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags @@ -8,14 +7,14 @@ import ru.dbotthepony.mc.otm.registry.MItems fun addComponentRecipes(consumer: RecipeOutput) { // Обычный рецепт - MatteryRecipe(MItems.BASIC_CONTROL_CIRCUIT, count = 3, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BASIC_CONTROL_CIRCUIT, count = 3) .row(MItemTags.COPPER_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.COPPER_WIRES) .row(MItems.CIRCUIT_PLATING, MItems.CIRCUIT_PLATING, MItems.CIRCUIT_PLATING) .unlockedBy(MItemTags.COPPER_WIRES) .build(consumer) // ручной рецепт - MatteryRecipe(MItems.BASIC_CONTROL_CIRCUIT, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BASIC_CONTROL_CIRCUIT) .rowB(Tags.Items.DUSTS_REDSTONE) .rowB(MItemTags.COPPER_WIRES) .rowB(ItemTags.WOODEN_SLABS) @@ -23,14 +22,14 @@ fun addComponentRecipes(consumer: RecipeOutput) { .unlockedBy(Tags.Items.DUSTS_REDSTONE) .build(consumer, "alt") - MatteryRecipe(MItems.ADVANCED_CONTROL_CIRCUIT, count = 3, category = RecipeCategory.MISC) + MatteryRecipe(MItems.ADVANCED_CONTROL_CIRCUIT, count = 3) .row(MItemTags.COPPER_WIRES, Tags.Items.GEMS_QUARTZ, MItemTags.COPPER_WIRES) .row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES) .row(MItems.CIRCUIT_PLATING, MItems.CIRCUIT_PLATING, MItems.CIRCUIT_PLATING) .unlockedBy(MItemTags.GOLD_WIRES) .build(consumer) - MatteryRecipe(MItems.MACHINE_FRAME, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MACHINE_FRAME) .row(MItemTags.HARDENED_GLASS, MItemTags.BASIC_CIRCUIT, MItemTags.HARDENED_GLASS) .row(MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES, MItems.ELECTRIC_PARTS) .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) @@ -39,21 +38,21 @@ fun addComponentRecipes(consumer: RecipeOutput) { .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer) - MatteryRecipe(MItems.GOLD_WIRING, count = 8, category = RecipeCategory.MISC) + MatteryRecipe(MItems.GOLD_WIRING, count = 8) .rowB(Tags.Items.INGOTS_GOLD) .row(Tags.Items.INGOTS_GOLD, Tags.Items.RODS_WOODEN, Tags.Items.INGOTS_GOLD) .rowB(Tags.Items.INGOTS_GOLD) .unlockedBy(Tags.Items.INGOTS_GOLD) .build(consumer) - MatteryRecipe(MItems.COPPER_WIRING, count = 8, category = RecipeCategory.MISC) + MatteryRecipe(MItems.COPPER_WIRING, count = 8) .rowB(Tags.Items.INGOTS_COPPER) .row(Tags.Items.INGOTS_COPPER, Tags.Items.RODS_WOODEN, Tags.Items.INGOTS_COPPER) .rowB(Tags.Items.INGOTS_COPPER) .unlockedBy(Tags.Items.INGOTS_COPPER) .build(consumer) - MatteryRecipe(MItems.ENERGY_BUS, count = 2, category = RecipeCategory.MISC) + MatteryRecipe(MItems.ENERGY_BUS, count = 2) .rowAB(Tags.Items.DUSTS_REDSTONE, MItems.ELECTRIC_PARTS) .row(MItemTags.COPPER_WIRES, MItemTags.COPPER_WIRES, MItemTags.COPPER_WIRES) .rowBC(MItems.ELECTRIC_PARTS, Tags.Items.DUSTS_REDSTONE) @@ -62,28 +61,28 @@ fun addComponentRecipes(consumer: RecipeOutput) { .unlockedBy(Tags.Items.DUSTS_REDSTONE) .build(consumer) - MatteryRecipe(MItems.MATTER_IO_PORT, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_IO_PORT) .rowB(MItems.MATTER_CABLE) .row(MItemTags.TRITANIUM_PLATES, MItemTags.BASIC_CIRCUIT, MItemTags.TRITANIUM_PLATES) .rowB(MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) - MatteryRecipe(MItems.MATTER_TRANSFORM_MATRIX, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_TRANSFORM_MATRIX) .row(Tags.Items.ENDER_PEARLS, MItems.MATTER_CABLE, Tags.Items.ENDER_PEARLS) .row(MItemTags.TRITANIUM_PLATES, MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES) .rowB(MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) - MatteryRecipe(MItems.MATTER_CAPACITOR_PARTS, count = 3, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_CAPACITOR_PARTS, count = 3) .row(MItemTags.IRON_PLATES, MItemTags.HARDENED_GLASS_PANES, MItemTags.IRON_PLATES) .row(MItemTags.TRITANIUM_PLATES, MItemTags.HARDENED_GLASS_PANES, MItemTags.TRITANIUM_PLATES) .rowB(MItemTags.HARDENED_GLASS_PANES) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) - MatteryRecipe(MItems.ELECTRIC_PARTS, count = 4, category = RecipeCategory.MISC) + MatteryRecipe(MItems.ELECTRIC_PARTS, count = 4) .row(Tags.Items.DUSTS_REDSTONE, MItemTags.COPPER_WIRES, Tags.Items.DUSTS_REDSTONE) .row(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD) .row(Tags.Items.DUSTS_REDSTONE, MItemTags.COPPER_WIRES, Tags.Items.DUSTS_REDSTONE) 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 867fc1c5a..e9b593254 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 @@ -74,7 +74,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer, "plate_press_migration/${color?.name?.lowercase() ?: "default"}") } - MatteryRecipe(MBlocks.CHEMICAL_GENERATOR[null]!!, category = machinesCategory) + MatteryRecipe(MBlocks.CHEMICAL_GENERATOR[null]!!) .rowB(MItems.ENERGY_BUS) .row(MItemTags.TRITANIUM_INGOTS, MItemTags.FURNACES, MItemTags.TRITANIUM_INGOTS) .rowAC(MItems.ELECTRIC_PARTS, MItems.ELECTRIC_PARTS) @@ -371,7 +371,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) } - MatteryRecipe(MItems.MATTER_SCANNER[null]!!, category = machinesCategory) + MatteryRecipe(MItems.MATTER_SCANNER[null]!!) .row(MItems.MIRROR, MItems.MATTER_TRANSFORM_MATRIX, MItems.MIRROR) .row(MItemTags.HARDENED_GLASS_COLORLESS, MItems.MACHINE_FRAME, MItemTags.HARDENED_GLASS_COLORLESS) .row(MItems.MATTER_CABLE, MItemTags.ADVANCED_CIRCUIT, MItems.MATTER_CABLE) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt index 9cecbf222..75cc02415 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.datagen.recipes -import net.minecraft.data.recipes.RecipeCategory import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe import ru.dbotthepony.mc.otm.registry.MItemTags @@ -8,14 +7,14 @@ import ru.dbotthepony.mc.otm.registry.MItems fun addStorageItemRecipes(consumer: RecipeOutput) { // простые батарейки - MatteryRecipe(MItems.BATTERY_CRUDE, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BATTERY_CRUDE) .rowB(Tags.Items.DUSTS_REDSTONE) .rowB(Tags.Items.CROPS_POTATO) .rowB(Tags.Items.INGOTS_IRON) .unlockedBy(Tags.Items.CROPS_POTATO) .build(consumer) - MatteryRecipe(MItems.BATTERY_BASIC, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BATTERY_BASIC) .rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .rowB(MItems.ELECTRIC_PARTS) .rowB(MItemTags.IRON_PLATES) @@ -23,7 +22,7 @@ fun addStorageItemRecipes(consumer: RecipeOutput) { .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer) - MatteryRecipe(MItems.BATTERY_NORMAL, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BATTERY_NORMAL) .setUpgradeSource(MItems.BATTERY_BASIC) .addUpgradeOps(UpgradeRecipe.All) .rowB(MItems.ELECTRIC_PARTS) @@ -31,7 +30,7 @@ fun addStorageItemRecipes(consumer: RecipeOutput) { .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .build(consumer) - MatteryRecipe(MItems.BATTERY_DENSE, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BATTERY_DENSE) .setUpgradeSource(MItems.BATTERY_NORMAL) .addUpgradeOps(UpgradeRecipe.All) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) @@ -39,7 +38,7 @@ fun addStorageItemRecipes(consumer: RecipeOutput) { .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .build(consumer) - MatteryRecipe(MItems.BATTERY_CAPACITOR, category = RecipeCategory.MISC) + MatteryRecipe(MItems.BATTERY_CAPACITOR) .setUpgradeSource(MItems.BATTERY_NORMAL) .addUpgradeOps(UpgradeRecipe.All) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) @@ -48,12 +47,12 @@ fun addStorageItemRecipes(consumer: RecipeOutput) { .build(consumer) // накопители материи - MatteryRecipe(MItems.MATTER_CAPACITOR_BASIC, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_CAPACITOR_BASIC) .row(MItemTags.IRON_PLATES, MItems.MATTER_CAPACITOR_PARTS, MItemTags.HARDENED_GLASS) .unlockedBy(MItems.MATTER_CAPACITOR_PARTS) .build(consumer) - MatteryRecipe(MItems.MATTER_CAPACITOR_NORMAL, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_CAPACITOR_NORMAL) .setUpgradeSource(MItems.MATTER_CAPACITOR_BASIC) .addUpgradeOps(UpgradeRecipe.All) .rowB(MItems.MATTER_CAPACITOR_PARTS) @@ -62,7 +61,7 @@ fun addStorageItemRecipes(consumer: RecipeOutput) { .unlockedBy(MItems.MATTER_CAPACITOR_BASIC) .build(consumer) - MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE, category = RecipeCategory.MISC) + MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE) .setUpgradeSource(MItems.MATTER_CAPACITOR_NORMAL) .addUpgradeOps(UpgradeRecipe.All) .row(MItems.MATTER_CAPACITOR_PARTS, MItemTags.HARDENED_GLASS, MItems.MATTER_CAPACITOR_PARTS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt index f5ff56fa8..8025e2121 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt @@ -1,54 +1,53 @@ package ru.dbotthepony.mc.otm.datagen.recipes -import net.minecraft.data.recipes.RecipeCategory import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.MItems fun addToolsRecipes(consumer: RecipeOutput) { - MatteryRecipe(MItems.ENERGY_SWORD, category = RecipeCategory.COMBAT) + MatteryRecipe(MItems.ENERGY_SWORD) .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) .row(MItems.BATTERY_CAPACITOR, MItems.TRITANIUM_SWORD, MItemTags.ADVANCED_CIRCUIT) .unlockedBy(MItems.BATTERY_CAPACITOR) .buildEnergetic(consumer) - MatteryRecipe(MItems.TRITANIUM_SWORD, category = RecipeCategory.COMBAT) + MatteryRecipe(MItems.TRITANIUM_SWORD) .rowB(MItemTags.TRITANIUM_INGOTS) .rowB(MItemTags.TRITANIUM_INGOTS) .rowB(Tags.Items.RODS_WOODEN) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer) - MatteryRecipe(MItems.TRITANIUM_SHOVEL, category = RecipeCategory.TOOLS) + MatteryRecipe(MItems.TRITANIUM_SHOVEL) .rowB(MItemTags.TRITANIUM_INGOTS) .rowB(Tags.Items.RODS_WOODEN) .rowB(Tags.Items.RODS_WOODEN) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer) - MatteryRecipe(MItems.TRITANIUM_PICKAXE, category = RecipeCategory.TOOLS) + MatteryRecipe(MItems.TRITANIUM_PICKAXE) .row(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) .rowB(Tags.Items.RODS_WOODEN) .rowB(Tags.Items.RODS_WOODEN) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer) - MatteryRecipe(MItems.TRITANIUM_AXE, category = RecipeCategory.TOOLS) + MatteryRecipe(MItems.TRITANIUM_AXE) .rowAB(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) .rowAB(MItemTags.TRITANIUM_INGOTS, Tags.Items.RODS_WOODEN) .rowB(Tags.Items.RODS_WOODEN) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer) - MatteryRecipe(MItems.TRITANIUM_AXE, category = RecipeCategory.TOOLS) + MatteryRecipe(MItems.TRITANIUM_AXE) .rowBC(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) .rowBC(Tags.Items.RODS_WOODEN, MItemTags.TRITANIUM_INGOTS) .rowB(Tags.Items.RODS_WOODEN) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer, "alt") - MatteryRecipe(MItems.TRITANIUM_HOE, category = RecipeCategory.TOOLS) + MatteryRecipe(MItems.TRITANIUM_HOE) .rowBC(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) .rowB(Tags.Items.RODS_WOODEN) .rowB(Tags.Items.RODS_WOODEN)