From b1783343bc9243ef5401c6737f41df1da4c9bc2b Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 10 Feb 2025 13:53:36 +0700 Subject: [PATCH] Greatly improve upgrade recipes --- .../datagen/recipes/MachineUpgradeRecipes.kt | 81 ++++++++++++++----- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt index f6d9604ca..7fe23d3df 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MachineUpgradeRecipes.kt @@ -1,13 +1,34 @@ package ru.dbotthepony.mc.otm.datagen.recipes import net.minecraft.data.recipes.RecipeOutput +import net.minecraft.world.item.Item import net.minecraft.world.item.Items import net.neoforged.neoforge.common.Tags import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.game.MItems +private fun makeNormalRecipe(element: Item, result: Item): MatteryRecipe { + return MatteryRecipe(result, 1) + .row(MItemTags.COPPER_WIRES, Items.REDSTONE, MItemTags.COPPER_WIRES) + .row(MItemTags.CARBON_PLATES, element, MItemTags.CARBON_PLATES) + .rowB(MItems.ELECTRIC_PARTS) + .unlockedBy(MItemTags.IRON_PLATES) + .unlockedBy(MItems.ELECTRIC_PARTS) + .unlockedBy(element) +} + +private fun makeAdvancedRecipe(element: Item, result: Item): MatteryRecipe { + return MatteryRecipe(result, 1) + .row(MItemTags.GOLD_WIRES, Items.REDSTONE, MItemTags.GOLD_WIRES) + .row(MItemTags.TRITANIUM_PLATES, element, MItemTags.TRITANIUM_PLATES) + .row(MItems.ELECTRIC_PARTS, Items.REDSTONE, MItems.ELECTRIC_PARTS) + .unlockedBy(MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItems.ELECTRIC_PARTS) + .unlockedBy(element) +} + fun addMachineUpgradeRecipes(consumer: RecipeOutput) { - MatteryRecipe(MItems.MachineUpgrades.Basic.BLANK, 4) + MatteryRecipe(MItems.MachineUpgrades.Basic.BLANK) .rowB(Items.REDSTONE) .rowAC(MItemTags.IRON_PLATES, MItemTags.IRON_PLATES) .rowB(MItems.ELECTRIC_PARTS) @@ -15,27 +36,43 @@ fun addMachineUpgradeRecipes(consumer: RecipeOutput) { .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer) - MatteryRecipe(MItems.MachineUpgrades.Normal.BLANK, 4) - .row(MItemTags.COPPER_WIRES, Items.REDSTONE, MItemTags.COPPER_WIRES) - .row(MItemTags.IRON_PLATES, Items.REDSTONE, MItemTags.IRON_PLATES) - .rowB(MItems.ELECTRIC_PARTS) - .unlockedBy(MItemTags.IRON_PLATES) - .unlockedBy(MItems.ELECTRIC_PARTS) + makeNormalRecipe(MItems.MachineUpgrades.Basic.BLANK, MItems.MachineUpgrades.Normal.BLANK) .build(consumer) - MatteryRecipe(MItems.MachineUpgrades.Advanced.BLANK, 4) - .row(MItemTags.GOLD_WIRES, Items.REDSTONE, MItemTags.GOLD_WIRES) - .row(MItemTags.TRITANIUM_PLATES, MItemTags.COPPER_WIRES, MItemTags.TRITANIUM_PLATES) - .row(MItems.ELECTRIC_PARTS, Items.REDSTONE, MItems.ELECTRIC_PARTS) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .unlockedBy(MItems.ELECTRIC_PARTS) + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.BLANK, MItems.MachineUpgrades.Advanced.BLANK) .build(consumer) + makeNormalRecipe(MItems.MachineUpgrades.Basic.SPEED, MItems.MachineUpgrades.Normal.SPEED) + .build(consumer, "upgrade") + makeNormalRecipe(MItems.MachineUpgrades.Basic.ENERGY_CONSUMPTION, MItems.MachineUpgrades.Normal.ENERGY_CONSUMPTION) + .build(consumer, "upgrade") + makeNormalRecipe(MItems.MachineUpgrades.Basic.FAILSAFE, MItems.MachineUpgrades.Normal.FAILSAFE) + .build(consumer, "upgrade") + makeNormalRecipe(MItems.MachineUpgrades.Basic.ENERGY_STORAGE, MItems.MachineUpgrades.Normal.ENERGY_STORAGE) + .build(consumer, "upgrade") + makeNormalRecipe(MItems.MachineUpgrades.Basic.MATTER_STORAGE, MItems.MachineUpgrades.Normal.MATTER_STORAGE) + .build(consumer, "upgrade") + makeNormalRecipe(MItems.MachineUpgrades.Basic.PROCESSING_ITEMS, MItems.MachineUpgrades.Normal.PROCESSING_ITEMS) + .build(consumer, "upgrade") + + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.SPEED, MItems.MachineUpgrades.Advanced.SPEED) + .build(consumer, "upgrade") + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.ENERGY_CONSUMPTION, MItems.MachineUpgrades.Advanced.ENERGY_CONSUMPTION) + .build(consumer, "upgrade") + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.FAILSAFE, MItems.MachineUpgrades.Advanced.FAILSAFE) + .build(consumer, "upgrade") + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.ENERGY_STORAGE, MItems.MachineUpgrades.Advanced.ENERGY_STORAGE) + .build(consumer, "upgrade") + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.MATTER_STORAGE, MItems.MachineUpgrades.Advanced.MATTER_STORAGE) + .build(consumer, "upgrade") + makeAdvancedRecipe(MItems.MachineUpgrades.Normal.PROCESSING_ITEMS, MItems.MachineUpgrades.Advanced.PROCESSING_ITEMS) + .build(consumer, "upgrade") + for (tier in MItems.MachineUpgrades.CRAFTABLE_TIERS) { MatteryRecipe(tier.SPEED, 1) .rowB(Items.REDSTONE) .row(Items.SUGAR, MItemTags.COPPER_WIRES, Items.SUGAR) - .rowB(tier.BLANK) + .row(MItems.MECHANICAL_PARTS, tier.BLANK, MItems.MECHANICAL_PARTS) .unlockedBy(tier.BLANK) .unlockedBy(MItemTags.COPPER_WIRES) .build(consumer) @@ -43,7 +80,7 @@ fun addMachineUpgradeRecipes(consumer: RecipeOutput) { MatteryRecipe(tier.ENERGY_CONSUMPTION, 1) .rowB(Items.REDSTONE) .row(MItemTags.COPPER_WIRES, MItemTags.GOLD_WIRES, MItemTags.COPPER_WIRES) - .rowB(tier.BLANK) + .row(MItems.ELECTRIC_PARTS, tier.BLANK, MItems.ELECTRIC_PARTS) .unlockedBy(tier.BLANK) .unlockedBy(MItemTags.GOLD_WIRES) .build(consumer) @@ -51,7 +88,7 @@ fun addMachineUpgradeRecipes(consumer: RecipeOutput) { MatteryRecipe(tier.FAILSAFE, 1) .rowB(MItems.ELECTRIC_PARTS) .row(MItemTags.COPPER_WIRES, MItems.QUANTUM_TRANSCEIVER, MItemTags.COPPER_WIRES) - .rowB(tier.BLANK) + .row(Tags.Items.DUSTS_GLOWSTONE, tier.BLANK, Tags.Items.DUSTS_GLOWSTONE) .unlockedBy(tier.BLANK) .unlockedBy(MItems.QUANTUM_TRANSCEIVER) .build(consumer) @@ -59,23 +96,23 @@ fun addMachineUpgradeRecipes(consumer: RecipeOutput) { MatteryRecipe(tier.ENERGY_STORAGE, 1) .rowB(Items.REDSTONE) .row(Items.REDSTONE, MItems.ENERGY_BUS, Items.REDSTONE) - .rowB(tier.BLANK) + .row(MItems.ELECTRIC_PARTS, tier.BLANK, MItems.ELECTRIC_PARTS) .unlockedBy(tier.BLANK) .unlockedBy(MItems.ENERGY_BUS) .build(consumer) MatteryRecipe(tier.MATTER_STORAGE, 1) - .rowB(Tags.Items.GLASS_BLOCKS) - .row(Tags.Items.GLASS_BLOCKS, MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GLASS_BLOCKS) - .rowB(tier.BLANK) + .rowB(MItemTags.HARDENED_GLASS) + .row(MItemTags.HARDENED_GLASS, MItems.MATTER_CAPACITOR_PARTS, MItemTags.HARDENED_GLASS) + .row(MItems.MATTER_CAPACITOR_PARTS, tier.BLANK, MItems.MATTER_CAPACITOR_PARTS) .unlockedBy(tier.BLANK) .unlockedBy(MItems.MATTER_CAPACITOR_PARTS) .build(consumer) MatteryRecipe(tier.PROCESSING_ITEMS, 1) - .rowB(MItems.ELECTRIC_PARTS) + .rowB(MItems.MECHANICAL_PARTS) .row(MItems.ELECTROMAGNET, MItemTags.TRITANIUM_PLATES, MItems.ELECTROMAGNET) - .rowB(tier.BLANK) + .row(Tags.Items.ENDER_PEARLS, tier.BLANK, Tags.Items.ENDER_PEARLS) .unlockedBy(tier.BLANK) .unlockedBy(MItems.ELECTROMAGNET) .build(consumer)