diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 20e84e1d1..71851784c 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -558,6 +558,9 @@ object DataGen { addChestLootTables(lootTableProvider) recipeProvider.exec { _, consumer -> + addToolsRecipes(consumer) + addComponentRecipes(consumer) + addStorageItemRecipes(consumer) addCraftingTableRecipes(consumer) addBlastingRecipes(consumer) addDecorativesRecipes(recipeProvider, consumer) 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 new file mode 100644 index 000000000..391ce59bc --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt @@ -0,0 +1,92 @@ +package ru.dbotthepony.mc.otm.datagen.recipes + +import net.minecraft.data.recipes.RecipeCategory +import net.minecraft.data.recipes.RecipeOutput +import net.minecraft.tags.ItemTags +import net.minecraftforge.common.Tags +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems + +fun addComponentRecipes(consumer: RecipeOutput) { + // Обычный рецепт + MatteryRecipe(MItems.BASIC_CONTROL_CIRCUIT, count = 3, category = RecipeCategory.MISC) + .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) + .rowB(Tags.Items.DUSTS_REDSTONE) + .rowB(MItemTags.COPPER_WIRES) + .rowB(ItemTags.WOODEN_SLABS) + .unlockedBy(MItemTags.COPPER_WIRES) + .unlockedBy(Tags.Items.DUSTS_REDSTONE) + .build(consumer, "alt") + + MatteryRecipe(MItems.ADVANCED_CONTROL_CIRCUIT, count = 3, category = RecipeCategory.MISC) + .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) + .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) + .unlockedBy(MItemTags.BASIC_CIRCUIT) + .unlockedBy(MItemTags.HARDENED_GLASS) + .unlockedBy(MItems.ELECTRIC_PARTS) + .build(consumer) + + MatteryRecipe(MItems.GOLD_WIRING, count = 8, category = RecipeCategory.MISC) + .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) + .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) + .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) + .unlockedBy(MItems.ELECTRIC_PARTS) + .unlockedBy(MItemTags.COPPER_WIRES) + .unlockedBy(Tags.Items.DUSTS_REDSTONE) + .build(consumer) + + MatteryRecipe(MItems.MATTER_IO_PORT, category = RecipeCategory.MISC) + .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) + .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) + .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) + .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) + .build(consumer) +} 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 205110756..92fb725fb 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 @@ -58,12 +58,11 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .unlockedBy(MItems.HOLO_SIGN) .save(consumer, modLocation("holo_sign_reset")) - MatteryRecipe(MBlocks.PLATE_PRESS[null]!!, category = machinesCategory) - .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) - .row(MItemTags.TRITANIUM_INGOTS, Items.BLAST_FURNACE, MItemTags.TRITANIUM_INGOTS) - .row(MItemTags.PISTONS, MItemTags.TRITANIUM_INGOTS, MItemTags.PISTONS) - .unlockedBy(MItemTags.TRITANIUM_INGOTS) - .unlockedBy(MItems.ELECTRIC_PARTS) + MatteryRecipe(MBlocks.ENERGY_COUNTER[null]!!, category = machinesCategory) + .row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.BASIC_CIRCUIT, Tags.Items.DUSTS_GLOWSTONE, MItemTags.HARDENED_GLASS_PANES_COLORLESS) + .row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItems.ENERGY_BUS) .build(consumer) MatteryRecipe(MBlocks.PLATE_PRESS[null]!!, category = machinesCategory) @@ -71,7 +70,16 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .rowB(MItems.MACHINE_FRAME) .unlockedBy(MItemTags.TRITANIUM_INGOTS) .unlockedBy(MItems.ELECTRIC_PARTS) - .build(consumer, "advanced") + .unlockedBy(MItems.MACHINE_FRAME) + .build(consumer) + + MatteryRecipe(MBlocks.CHEMICAL_GENERATOR[null]!!, category = machinesCategory) + .rowB(MItems.ENERGY_BUS) + .row(MItemTags.TRITANIUM_INGOTS, MItemTags.FURNACES, MItemTags.TRITANIUM_INGOTS) + .rowAC(MItems.ELECTRIC_PARTS, MItems.ELECTRIC_PARTS) + .unlockedBy(MItemTags.FURNACES) + .unlockedBy(MItems.ENERGY_BUS) + .build(consumer) for ((color, press) in MBlocks.PLATE_PRESS) { MatteryRecipe(MBlocks.TWIN_PLATE_PRESS[color]!!, category = machinesCategory) @@ -283,47 +291,9 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .unlockedBy(MItemTags.TRITANIUM_INGOTS) .build(consumer) - // простые батарейки - MatteryRecipe(MItems.BATTERY_CRUDE, category = RecipeCategory.MISC) - .rowB(Tags.Items.DUSTS_REDSTONE) - .rowB(Tags.Items.CROPS_POTATO) - .rowB(Tags.Items.INGOTS_IRON) - .build(consumer) - - MatteryRecipe(MItems.BATTERY_BASIC, category = RecipeCategory.MISC) - .rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) - .rowB(MItems.ELECTRIC_PARTS) - .rowB(MItemTags.IRON_PLATES) - .build(consumer) - - MatteryRecipe(MItems.BATTERY_NORMAL, category = RecipeCategory.MISC) - .rowB(MItems.ELECTRIC_PARTS) - .row(MItemTags.COPPER_WIRES, MItemTags.IRON_PLATES, MItemTags.COPPER_WIRES) - .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) - .build(consumer) - - MatteryRecipe(MItems.BATTERY_DENSE, category = RecipeCategory.MISC) - .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) - .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) - .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) - .build(consumer) - - MatteryRecipe(MItems.BATTERY_CAPACITOR, category = RecipeCategory.MISC) - .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) - .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) - .row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES) - .build(consumer) - - // накопители материи - MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE, category = RecipeCategory.MISC) - .row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GLASS, MItems.MATTER_CAPACITOR_PARTS) - .row(MItemTags.TRITANIUM_PLATES, Tags.Items.ENDER_PEARLS, MItemTags.TRITANIUM_PLATES) - .rowAC(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_DIAMOND) - .build(consumer) - // станция андроида MatteryRecipe(MItems.ANDROID_STATION[null]!!, category = machinesCategory) - .row(MItems.ELECTRIC_PARTS, MItemTags.ADVANCED_CIRCUIT, MItems.ELECTRIC_PARTS) + .row(MItems.ELECTRIC_PARTS, MItems.QUANTUM_TRANSCEIVER, MItems.ELECTRIC_PARTS) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) .row(MItemTags.TRITANIUM_PLATES, MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES) .build(consumer) @@ -335,14 +305,6 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) .build(consumer) - // Энерго меч - MatteryRecipe(MItems.ENERGY_SWORD, category = RecipeCategory.COMBAT) - .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) - .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) - .row(MItems.BATTERY_CAPACITOR, MItems.TRITANIUM_SWORD, MItemTags.ADVANCED_CIRCUIT) - .unlockedBy(MItems.BATTERY_CAPACITOR) - .buildEnergetic(consumer) - // апгрейд на сетку крафта MatteryRecipe(MItems.ExopackUpgrades.CRAFTING_UPGRADE, category = RecipeCategory.TOOLS) .row(MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT, MItemTags.ADVANCED_CIRCUIT) @@ -419,6 +381,12 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) } + MatteryRecipe(MItems.MATTER_SCANNER[null]!!, category = machinesCategory) + .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) + .build(consumer) + MatteryRecipe(MItems.FLUID_CAPSULE, category = RecipeCategory.TOOLS, count = 8) .row(MItemTags.TRITANIUM_NUGGETS, MItemTags.TRITANIUM_NUGGETS, MItemTags.TRITANIUM_NUGGETS) .rowB(MItemTags.HARDENED_GLASS_PANES) 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 new file mode 100644 index 000000000..2b393dc78 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/StorageItemRecipes.kt @@ -0,0 +1,74 @@ +package ru.dbotthepony.mc.otm.datagen.recipes + +import net.minecraft.data.recipes.RecipeCategory +import net.minecraft.data.recipes.RecipeOutput +import net.minecraftforge.common.Tags +import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems + +fun addStorageItemRecipes(consumer: RecipeOutput) { + // простые батарейки + MatteryRecipe(MItems.BATTERY_CRUDE, category = RecipeCategory.MISC) + .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) + .rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) + .rowB(MItems.ELECTRIC_PARTS) + .rowB(MItemTags.IRON_PLATES) + .unlockedBy(Tags.Items.DUSTS_REDSTONE) + .unlockedBy(MItems.ELECTRIC_PARTS) + .build(consumer) + + MatteryRecipe(MItems.BATTERY_NORMAL, category = RecipeCategory.MISC) + .setUpgradeSource(MItems.BATTERY_BASIC) + .addUpgradeOps(UpgradeRecipe.All) + .rowB(MItems.ELECTRIC_PARTS) + .row(MItemTags.COPPER_WIRES, MItems.BATTERY_BASIC, MItemTags.COPPER_WIRES) + .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) + .build(consumer) + + MatteryRecipe(MItems.BATTERY_DENSE, category = RecipeCategory.MISC) + .setUpgradeSource(MItems.BATTERY_NORMAL) + .addUpgradeOps(UpgradeRecipe.All) + .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) + .row(MItemTags.GOLD_WIRES, MItems.BATTERY_NORMAL, MItemTags.GOLD_WIRES) + .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) + .build(consumer) + + MatteryRecipe(MItems.BATTERY_CAPACITOR, category = RecipeCategory.MISC) + .setUpgradeSource(MItems.BATTERY_NORMAL) + .addUpgradeOps(UpgradeRecipe.All) + .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) + .row(MItemTags.GOLD_WIRES, MItems.BATTERY_NORMAL, MItemTags.GOLD_WIRES) + .row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES) + .build(consumer) + + // накопители материи + MatteryRecipe(MItems.MATTER_CAPACITOR_BASIC, category = RecipeCategory.MISC) + .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) + .setUpgradeSource(MItems.MATTER_CAPACITOR_BASIC) + .addUpgradeOps(UpgradeRecipe.All) + .rowB(MItems.MATTER_CAPACITOR_PARTS) + .row(MItemTags.TRITANIUM_PLATES, MItems.MATTER_CAPACITOR_BASIC, MItemTags.TRITANIUM_PLATES) + .rowB(Tags.Items.GEMS_DIAMOND) + .unlockedBy(MItems.MATTER_CAPACITOR_BASIC) + .build(consumer) + + MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE, category = RecipeCategory.MISC) + .setUpgradeSource(MItems.MATTER_CAPACITOR_NORMAL) + .addUpgradeOps(UpgradeRecipe.All) + .row(MItems.MATTER_CAPACITOR_PARTS, MItemTags.HARDENED_GLASS, MItems.MATTER_CAPACITOR_PARTS) + .row(MItemTags.TRITANIUM_PLATES, MItems.MATTER_CAPACITOR_NORMAL, MItemTags.TRITANIUM_PLATES) + .rowAC(Tags.Items.ENDER_PEARLS, Tags.Items.ENDER_PEARLS) + .unlockedBy(MItems.MATTER_CAPACITOR_NORMAL) + .build(consumer) +} 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 new file mode 100644 index 000000000..1ef382d59 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ToolsRecipes.kt @@ -0,0 +1,58 @@ +package ru.dbotthepony.mc.otm.datagen.recipes + +import net.minecraft.data.recipes.RecipeCategory +import net.minecraft.data.recipes.RecipeOutput +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) + .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) + .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) + .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) + .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) + .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) + .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) + .rowBC(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) + .rowB(Tags.Items.RODS_WOODEN) + .rowB(Tags.Items.RODS_WOODEN) + .unlockedBy(MItemTags.TRITANIUM_INGOTS) + .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 fd1615e8e..2872dfa19 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 @@ -55,6 +55,7 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES).add(Items.CRAFTING_TABLE) tagsProvider.items.Appender(MItemTags.WORKBENCHES).add(Items.CRAFTING_TABLE) tagsProvider.items.Appender(MItemTags.WORKBENCH).add(Items.CRAFTING_TABLE) + tagsProvider.items.Appender(MItemTags.FURNACES).add(Items.FURNACE) tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE) tagsProvider.blocks.Appender(MBlockTags.WORKBENCHES).add(Blocks.CRAFTING_TABLE) tagsProvider.blocks.Appender(MBlockTags.WORKBENCH).add(Blocks.CRAFTING_TABLE) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt index 2bc71c21a..aa6c8cbc4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt @@ -14,7 +14,7 @@ object ItemsConfig : AbstractConfig("items") { val BASIC = batteryValues(MNames.BATTERY_BASIC, Decimal(400_000), Decimal(600)) val NORMAL = batteryValues(MNames.BATTERY_NORMAL, Decimal(2_000_000), Decimal(1_000)) val DENSE = batteryValues(MNames.BATTERY_DENSE, Decimal(10_000_000), Decimal(2_000)) - val CAPACITOR = batteryValues(MNames.BATTERY_CAPACITOR, Decimal(500_000), Decimal(50_000)) + val CAPACITOR = batteryValues(MNames.BATTERY_CAPACITOR, Decimal(2_000_000), Decimal(50_000)) val QUANTUM_BATTERY = conciseValues(MNames.QUANTUM_BATTERY, Decimal(40_000_000), Decimal(10_000)) val QUANTUM_CAPACITOR = conciseValues(MNames.QUANTUM_CAPACITOR, Decimal(1_000_000), Decimal(200_000)) @@ -36,7 +36,7 @@ object ItemsConfig : AbstractConfig("items") { object Capacitors { val BASIC by builder.defineDecimal(MNames.MATTER_CAPACITOR_BASIC, Decimal(2_500), minimum = Decimal.ONE_TENTH) val NORMAL by builder.defineDecimal(MNames.MATTER_CAPACITOR_NORMAL, Decimal(10_000), minimum = Decimal.ONE_TENTH) - val DENSE by builder.defineDecimal(MNames.MATTER_CAPACITOR_DENSE, Decimal(25_000), minimum = Decimal.ONE_TENTH) + val DENSE by builder.defineDecimal(MNames.MATTER_CAPACITOR_DENSE, Decimal(40_000), minimum = Decimal.ONE_TENTH) } init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt index c5f969c7a..ea8bddc0d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt @@ -31,6 +31,7 @@ import ru.dbotthepony.mc.otm.core.util.readBinaryJson import ru.dbotthepony.mc.otm.core.util.writeBinaryJson import ru.dbotthepony.mc.otm.core.collect.stream import ru.dbotthepony.mc.otm.data.Codec2RecipeSerializer +import ru.dbotthepony.mc.otm.data.SingletonCodec import java.util.stream.Stream class UpgradeRecipe( @@ -95,14 +96,19 @@ class UpgradeRecipe( Codec.STRING.fieldOf("path").forGetter(Direct::path) ).apply(it, ::Direct) } - }, INDIRECT { + }, + INDIRECT { override val codec: Codec = RecordCodecBuilder.create { it.group( Codec.STRING.fieldOf("source").forGetter(Indirect::pathSource), Codec.STRING.fieldOf("destination").forGetter(Indirect::pathDestination), ).apply(it, ::Indirect) } - }; + }, + ALL { + override val codec: Codec by lazy { SingletonCodec(All) } + }, + ; override fun getSerializedName(): String { return name.lowercase() @@ -188,6 +194,17 @@ class UpgradeRecipe( } } + object All : Op() { + override val type: OpType + get() = OpType.ALL + + override fun apply(source: CompoundTag, destination: CompoundTag) { + source.allKeys.forEach { + destination[it] = source[it]!! + } + } + } + val copyPaths: ImmutableList = copyPaths.collect(ImmutableList.toImmutableList()) override fun assemble(pInv: CraftingContainer, registryAccess: RegistryAccess): ItemStack { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt new file mode 100644 index 000000000..57b04b64b --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt @@ -0,0 +1,59 @@ +package ru.dbotthepony.mc.otm.registry + +import net.minecraft.resources.ResourceLocation +import net.minecraft.tags.BlockTags +import net.minecraft.tags.TagKey +import net.minecraft.world.level.block.Block +import ru.dbotthepony.mc.otm.OverdriveThatMatters + +@Suppress("unused") +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 WORKBENCH: TagKey = BlockTags.create(ResourceLocation("forge", "workbench")) + + val REQUIRES_TRITANIUM_TOOL: TagKey = BlockTags.create(ResourceLocation("minecraft", "requires_tritanium_tool")) + + 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")) + val HARDENED_GLASS_PANES_BROWN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/brown")) + val HARDENED_GLASS_PANES_COLORLESS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/colorless")) + val HARDENED_GLASS_PANES_CYAN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/cyan")) + val HARDENED_GLASS_PANES_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/gray")) + val HARDENED_GLASS_PANES_GREEN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/green")) + val HARDENED_GLASS_PANES_LIGHT_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/light_blue")) + val HARDENED_GLASS_PANES_LIGHT_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/light_gray")) + val HARDENED_GLASS_PANES_LIME: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/lime")) + val HARDENED_GLASS_PANES_MAGENTA: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/magenta")) + val HARDENED_GLASS_PANES_ORANGE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/orange")) + val HARDENED_GLASS_PANES_PINK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/pink")) + val HARDENED_GLASS_PANES_PURPLE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/purple")) + val HARDENED_GLASS_PANES_RED: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/red")) + val HARDENED_GLASS_PANES_WHITE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/white")) + val HARDENED_GLASS_PANES_YELLOW: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/yellow")) + + val HARDENED_GLASS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass")) + val HARDENED_GLASS_BLACK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/black")) + val HARDENED_GLASS_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/blue")) + val HARDENED_GLASS_BROWN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/brown")) + val HARDENED_GLASS_COLORLESS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/colorless")) + val HARDENED_GLASS_CYAN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/cyan")) + val HARDENED_GLASS_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/gray")) + val HARDENED_GLASS_GREEN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/green")) + val HARDENED_GLASS_LIGHT_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/light_blue")) + val HARDENED_GLASS_LIGHT_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/light_gray")) + val HARDENED_GLASS_LIME: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/lime")) + val HARDENED_GLASS_MAGENTA: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/magenta")) + val HARDENED_GLASS_ORANGE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/orange")) + val HARDENED_GLASS_PINK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/pink")) + val HARDENED_GLASS_PURPLE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/purple")) + val HARDENED_GLASS_RED: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/red")) + val HARDENED_GLASS_WHITE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/white")) + val HARDENED_GLASS_YELLOW: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/yellow")) + + val MACHINES: TagKey = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "machines")) +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt similarity index 58% rename from src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt index 86a49364c..cf19f67a7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt @@ -1,11 +1,9 @@ package ru.dbotthepony.mc.otm.registry import net.minecraft.resources.ResourceLocation -import net.minecraft.tags.BlockTags import net.minecraft.tags.ItemTags import net.minecraft.tags.TagKey import net.minecraft.world.item.Item -import net.minecraft.world.level.block.Block import ru.dbotthepony.mc.otm.OverdriveThatMatters @Suppress("unused") @@ -38,6 +36,7 @@ object MItemTags { val GOLD_WIRES: TagKey = ItemTags.create(ResourceLocation("forge", "wires/gold")) val PISTONS: TagKey = ItemTags.create(ResourceLocation("forge", "pistons")) + val FURNACES: TagKey = ItemTags.create(ResourceLocation("forge", "furnaces")) val TOOLS_HAMMERS: TagKey = ItemTags.create(ResourceLocation("forge", "tools/hammers")) @@ -82,54 +81,3 @@ object MItemTags { val MACHINES: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "machines")) } -@Suppress("unused") -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 WORKBENCH: TagKey = BlockTags.create(ResourceLocation("forge", "workbench")) - - val REQUIRES_TRITANIUM_TOOL: TagKey = BlockTags.create(ResourceLocation("minecraft", "requires_tritanium_tool")) - - 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")) - val HARDENED_GLASS_PANES_BROWN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/brown")) - val HARDENED_GLASS_PANES_COLORLESS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/colorless")) - val HARDENED_GLASS_PANES_CYAN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/cyan")) - val HARDENED_GLASS_PANES_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/gray")) - val HARDENED_GLASS_PANES_GREEN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/green")) - val HARDENED_GLASS_PANES_LIGHT_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/light_blue")) - val HARDENED_GLASS_PANES_LIGHT_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/light_gray")) - val HARDENED_GLASS_PANES_LIME: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/lime")) - val HARDENED_GLASS_PANES_MAGENTA: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/magenta")) - val HARDENED_GLASS_PANES_ORANGE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/orange")) - val HARDENED_GLASS_PANES_PINK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/pink")) - val HARDENED_GLASS_PANES_PURPLE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/purple")) - val HARDENED_GLASS_PANES_RED: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/red")) - val HARDENED_GLASS_PANES_WHITE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/white")) - val HARDENED_GLASS_PANES_YELLOW: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass_panes/yellow")) - - val HARDENED_GLASS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass")) - val HARDENED_GLASS_BLACK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/black")) - val HARDENED_GLASS_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/blue")) - val HARDENED_GLASS_BROWN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/brown")) - val HARDENED_GLASS_COLORLESS: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/colorless")) - val HARDENED_GLASS_CYAN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/cyan")) - val HARDENED_GLASS_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/gray")) - val HARDENED_GLASS_GREEN: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/green")) - val HARDENED_GLASS_LIGHT_BLUE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/light_blue")) - val HARDENED_GLASS_LIGHT_GRAY: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/light_gray")) - val HARDENED_GLASS_LIME: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/lime")) - val HARDENED_GLASS_MAGENTA: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/magenta")) - val HARDENED_GLASS_ORANGE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/orange")) - val HARDENED_GLASS_PINK: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/pink")) - val HARDENED_GLASS_PURPLE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/purple")) - val HARDENED_GLASS_RED: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/red")) - val HARDENED_GLASS_WHITE: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/white")) - val HARDENED_GLASS_YELLOW: TagKey = BlockTags.create(ResourceLocation("forge", "hardened_glass/yellow")) - - val MACHINES: TagKey = BlockTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "machines")) -} diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/advanced_control_circuit.json b/src/main/resources/data/overdrive_that_matters/recipes/components/advanced_control_circuit.json deleted file mode 100644 index a4aa2b39b..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/advanced_control_circuit.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "R R", - "GCG", - "PPP" - ], - - "key": { - "C": { - "tag": "forge:wires/copper" - }, - - "R": { - "tag": "forge:dusts/redstone" - }, - - "G": { - "tag": "forge:wires/gold" - }, - - "P": { - "item": "overdrive_that_matters:circuit_plating" - } - }, - - "result": { - "item": "overdrive_that_matters:advanced_control_circuit", - "count": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/basic_control_circuit.json b/src/main/resources/data/overdrive_that_matters/recipes/components/basic_control_circuit.json deleted file mode 100644 index d01f51295..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/basic_control_circuit.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "CRC", - "PPP" - ], - - "key": { - "C": { - "tag": "forge:wires/copper" - }, - - "R": { - "tag": "forge:dusts/redstone" - }, - - "P": { - "item": "overdrive_that_matters:circuit_plating" - } - }, - - "result": { - "item": "overdrive_that_matters:basic_control_circuit", - "count": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json deleted file mode 100644 index e2e685ca6..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " # ", - "#@#", - " # " - ], - - "key": { - "#": { - "tag": "forge:ingots/copper" - }, - - "@": { - "tag": "forge:rods/wooden" - } - }, - - "result": { - "item": "overdrive_that_matters:copper_wiring", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/electric_parts.json b/src/main/resources/data/overdrive_that_matters/recipes/components/electric_parts.json deleted file mode 100644 index 389dc23f3..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/electric_parts.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "RCR", - "GIG", - "RCR" - ], - - "key": { - "R": { - "tag": "forge:dusts/redstone" - }, - - "I": { - "tag": "forge:ingots/iron" - }, - - "G": { - "tag": "forge:nuggets/gold" - }, - - "C": { - "tag": "forge:wires/copper" - } - }, - - "result": { - "item": "overdrive_that_matters:electric_parts", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/energy_bus.json b/src/main/resources/data/overdrive_that_matters/recipes/components/energy_bus.json deleted file mode 100644 index a2d567555..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/energy_bus.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " R ", - "CPC", - " R " - ], - - "key": { - "R": { - "tag": "forge:dusts/redstone" - }, - - "P": { - "item": "overdrive_that_matters:electric_parts" - }, - - "C": { - "tag": "forge:wires/copper" - } - }, - - "result": { - "item": "overdrive_that_matters:energy_bus", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json b/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json deleted file mode 100644 index d6f0ca235..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " # ", - "#@#", - " # " - ], - - "key": { - "#": { - "tag": "forge:ingots/gold" - }, - - "@": { - "tag": "forge:rods/wooden" - } - }, - - "result": { - "item": "overdrive_that_matters:gold_wiring", - "count": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/machine_frame.json b/src/main/resources/data/overdrive_that_matters/recipes/components/machine_frame.json deleted file mode 100644 index 962530355..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/machine_frame.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "BGB", - "PEP", - "TET" - ], - - "key": { - "G": { - "tag": "forge:glass" - }, - - "B": { - "item": "overdrive_that_matters:energy_bus" - }, - - "E": { - "item": "overdrive_that_matters:electric_parts" - }, - - "P": { - "tag": "forge:plates/iron" - }, - - "T": { - "tag": "forge:plates/tritanium" - } - }, - - "result": { - "item": "overdrive_that_matters:machine_frame", - "count": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_capacitor_parts.json b/src/main/resources/data/overdrive_that_matters/recipes/components/matter_capacitor_parts.json deleted file mode 100644 index 3b655e42b..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_capacitor_parts.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "IGI", - "PGP", - " G " - ], - - "key": { - "P": { - "tag": "forge:plates/tritanium" - }, - - "I": { - "tag": "forge:plates/iron" - }, - - "G": { - "tag": "forge:glass" - } - }, - - "result": { - "item": "overdrive_that_matters:matter_capacitor_parts", - "count": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_io_port.json b/src/main/resources/data/overdrive_that_matters/recipes/components/matter_io_port.json deleted file mode 100644 index 826fb794e..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_io_port.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " # ", - "L@L", - " # " - ], - - "key": { - "#": { - "item": "overdrive_that_matters:matter_cable" - }, - - "@": { - "tag": "forge:circuits/basic" - }, - - "L": { - "tag": "forge:plates/tritanium" - } - }, - - "result": { - "item": "overdrive_that_matters:matter_io_port", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_transform_matrix.json b/src/main/resources/data/overdrive_that_matters/recipes/components/matter_transform_matrix.json deleted file mode 100644 index 12e1f0bf3..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/matter_transform_matrix.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " C ", - "PEP", - " M " - ], - - "key": { - "M": { - "item": "overdrive_that_matters:matter_cable" - }, - - "C": { - "tag": "forge:circuits/advanced" - }, - - "E": { - "tag": "forge:ender_pearls" - }, - - "P": { - "tag": "forge:plates/tritanium" - } - }, - - "result": { - "item": "overdrive_that_matters:matter_transform_matrix", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_basic.json b/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_basic.json deleted file mode 100644 index c9312e371..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_basic.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "IPG" - ], - - "key": { - "I": { - "tag": "forge:plates/iron" - }, - - "G": { - "tag": "forge:glass" - }, - - "P": { - "item": "overdrive_that_matters:matter_capacitor_parts" - } - }, - - "result": { - "item": "overdrive_that_matters:matter_capacitor_basic", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_normal.json b/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_normal.json deleted file mode 100644 index c53a87220..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/matter_capacitor_normal.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " G ", - "IPI", - " D " - ], - - "key": { - "I": { - "tag": "forge:plates/tritanium" - }, - - "D": { - "tag": "forge:gems/diamond" - }, - - "G": { - "tag": "forge:glass" - }, - - "P": { - "item": "overdrive_that_matters:matter_capacitor_parts" - } - }, - - "result": { - "item": "overdrive_that_matters:matter_capacitor_normal", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json deleted file mode 100644 index 993ec9a4e..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "II ", - "IS ", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_axe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json deleted file mode 100644 index fb348002b..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " II", - " SI", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_axe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json deleted file mode 100644 index c08f497a0..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "II ", - " S ", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_hoe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json deleted file mode 100644 index eb3d9d7a0..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "III", - " S ", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_pickaxe", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json deleted file mode 100644 index d6084d99b..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " I ", - " S ", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_shovel", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json deleted file mode 100644 index fa0a58b97..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " I ", - " I ", - " S " - ], - - "key": { - "S": {"tag": "forge:rods/wooden"}, - "I": {"tag": "forge:ingots/tritanium"} - }, - - "result": { - "item": "overdrive_that_matters:tritanium_sword", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json deleted file mode 100644 index 97f69538a..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - " B ", - "IFI", - "E E" - ], - - "key": { - "F": {"item": "minecraft:furnace"}, - "I": {"tag": "forge:ingots/iron"}, - "E": {"item": "overdrive_that_matters:electric_parts"}, - "B": {"item": "overdrive_that_matters:energy_bus"} - }, - - "result": { - "item": "overdrive_that_matters:chemical_generator", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json deleted file mode 100644 index 3cb6bbdf3..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "PIP", - "CSg", - "PIP" - ], - - "key": { - "I": {"item": "overdrive_that_matters:energy_bus"}, - "S": {"tag": "forge:dusts/glowstone"}, - "g": {"tag": "forge:glass_panes"}, - "C": {"tag": "forge:circuits/basic"}, - "P": {"tag": "forge:plates/iron"} - }, - - "result": { - "item": "overdrive_that_matters:energy_counter", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json deleted file mode 100644 index b624900ca..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - - "pattern": [ - "CMC", - "TFT", - "-I-" - ], - - "key": { - "M": {"item": "overdrive_that_matters:matter_transform_matrix"}, - "F": {"item": "overdrive_that_matters:machine_frame"}, - "-": {"item": "overdrive_that_matters:matter_cable"}, - "T": {"tag": "forge:plates/iron"}, - "C": {"tag": "forge:circuits/basic"}, - "I": {"tag": "forge:circuits/advanced"} - }, - - "result": { - "item": "overdrive_that_matters:matter_scanner", - "count": 1 - } -} \ No newline at end of file