From a775170c927538a26a3aca18afc0b575e8923539 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Thu, 29 Sep 2022 02:16:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=91=D0=98=D0=92=D0=90=D0=A2=D0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 2 ++ .../mc/otm/datagen/recipes/OreRecipes.kt | 18 +++++++++++++ .../mc/otm/datagen/tags/TagsProvider.kt | 25 ++++++++++++------- .../ru/dbotthepony/mc/otm/registry/Tags.kt | 2 ++ .../recipes/blasting/tritanium_ingot.json | 9 ------- .../recipes/blocks/raw_tritanium_block.json | 18 ++++++------- .../blocks/raw_tritanium_block_inv.json | 2 +- .../recipes/smelting/tritanium_ingot.json | 9 ------- 8 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/OreRecipes.kt delete mode 100644 src/main/resources/data/overdrive_that_matters/recipes/blasting/tritanium_ingot.json delete mode 100644 src/main/resources/data/overdrive_that_matters/recipes/smelting/tritanium_ingot.json 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 34a26f3ab..370f4a17c 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -36,6 +36,7 @@ import ru.dbotthepony.mc.otm.datagen.recipes.addCraftingTableRecipes import ru.dbotthepony.mc.otm.datagen.recipes.addDecorativesRecipes import ru.dbotthepony.mc.otm.datagen.recipes.addPlatePressRecipes import ru.dbotthepony.mc.otm.datagen.recipes.addShapelessRecipes +import ru.dbotthepony.mc.otm.datagen.recipes.addOreSmeltingRecipes import ru.dbotthepony.mc.otm.datagen.tags.TagsProvider import ru.dbotthepony.mc.otm.datagen.tags.addTags import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock @@ -274,6 +275,7 @@ object DataGen { addBlastingRecipes(consumer) addDecorativesRecipes(recipeProvider, consumer) addShapelessRecipes(consumer) + addOreSmeltingRecipes(consumer) } addPlatePressRecipes(recipeProvider) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/OreRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/OreRecipes.kt new file mode 100644 index 000000000..596388913 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/OreRecipes.kt @@ -0,0 +1,18 @@ +package ru.dbotthepony.mc.otm.datagen.recipes + +import net.minecraft.data.recipes.FinishedRecipe +import net.minecraft.data.recipes.SimpleCookingRecipeBuilder +import net.minecraft.resources.ResourceLocation +import net.minecraft.world.item.crafting.Ingredient +import ru.dbotthepony.mc.otm.OverdriveThatMatters +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems +import java.util.function.Consumer + +fun addOreSmeltingRecipes(consumer: Consumer) { + SimpleCookingRecipeBuilder.blasting(Ingredient.of(MItemTags.TRITANIUM_ORES), MItems.TRITANIUM_INGOT, 1f, 100).unlockedBy(MItemTags.TRITANIUM_ORES).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "smelting/tritanium_ingot_from_ore_block")) + SimpleCookingRecipeBuilder.smelting(Ingredient.of(MItemTags.TRITANIUM_ORES), MItems.TRITANIUM_INGOT, 1f, 200).unlockedBy(MItemTags.TRITANIUM_ORES).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "blasting/tritanium_ingot_from_ore_block")) + + SimpleCookingRecipeBuilder.blasting(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), MItems.TRITANIUM_INGOT, 1f, 100).unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "smelting/tritanium_ingot_from_raw_ore")) + SimpleCookingRecipeBuilder.smelting(Ingredient.of(MItemTags.TRITANIUM_ORE_CLUMPS), MItems.TRITANIUM_INGOT, 1f, 200).unlockedBy(MItemTags.TRITANIUM_ORE_CLUMPS).save(consumer, ResourceLocation(OverdriveThatMatters.MOD_ID, "blasting/tritanium_ingot_from_raw_ore")) +} \ No newline at end of file diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt index 7bfa33b21..2e4c79fc8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt @@ -192,22 +192,29 @@ class TagsProvider( val i = TagKey.create(Registry.ITEM_REGISTRY, forgeKey) items.getSet(i).add(block.asItem()) + itemOres.add(block.asItem()) blocks.getSet(b).add(block) + blockOres.add(block) return this } fun clump(key: String, clump: Item): TagsProvider { - itemOres.add(key, clump) - rawOres.add(key, clump) + rawMaterials.add(key, clump) + rawMaterials.add(clump) return this } fun clump(key: String, clump: Item, rawBlock: Block): TagsProvider { - itemOres.add(key, clump) - rawOres.add(key, clump) - rawBlocksAsItem.add(key, rawBlock.asItem()) - rawBlocksAsBlock.add(key, rawBlock) + val rawKey = "raw_$key" + + rawMaterials.add(key, clump) + rawMaterials.add(clump) + storageBlocksAsItem.add(rawKey, rawBlock.asItem()) + storageBlocksAsItem.add(rawBlock.asItem()) + storageBlocksAsBlock.add(rawKey, rawBlock) + storageBlocksAsBlock.add(rawBlock) + return this } @@ -216,9 +223,9 @@ class TagsProvider( val itemOres = items.forge("ores") val blockOres = blocks.forge("ores") val plates = items.forge("plates") - val rawBlocksAsItem = items.forge("raw_blocks") - val rawBlocksAsBlock = blocks.forge("raw_blocks") - val rawOres = items.forge("raw_ores") + val storageBlocksAsItem = items.forge("storage_blocks") + val storageBlocksAsBlock = blocks.forge("storage_blocks") + val rawMaterials = items.forge("raw_materials") val wires = items.forge("wires") val gameEvents = Delegate(Registry.GAME_EVENT) 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 b64eb2005..89304e052 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/Tags.kt @@ -10,6 +10,8 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters @Suppress("unused") object MItemTags { + val TRITANIUM_ORES: TagKey = ItemTags.create(ResourceLocation("forge", "ores/tritanium")) + val TRITANIUM_ORE_CLUMPS: TagKey = ItemTags.create(ResourceLocation("forge", "raw_materials/tritanium")) val TRITANIUM_INGOTS: TagKey = ItemTags.create(ResourceLocation("forge", "ingots/tritanium")) val TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) val IRON_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/iron")) diff --git a/src/main/resources/data/overdrive_that_matters/recipes/blasting/tritanium_ingot.json b/src/main/resources/data/overdrive_that_matters/recipes/blasting/tritanium_ingot.json deleted file mode 100644 index e21685efc..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/blasting/tritanium_ingot.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "tag": "forge:ores/tritanium" - }, - "result": "overdrive_that_matters:tritanium_ingot", - "experience": 1, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block.json b/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block.json index b66ab4826..7cdf1f68a 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block.json @@ -3,31 +3,31 @@ "ingredients": [ { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" }, { - "tag": "forge:raw_ores/tritanium" + "tag": "forge:raw_materials/tritanium" } ], diff --git a/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block_inv.json b/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block_inv.json index 2623ea093..d6a7a3d54 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block_inv.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/blocks/raw_tritanium_block_inv.json @@ -3,7 +3,7 @@ "ingredients": [ { - "tag": "forge:raw_blocks/tritanium" + "tag": "forge:storage_blocks/raw_tritanium" } ], diff --git a/src/main/resources/data/overdrive_that_matters/recipes/smelting/tritanium_ingot.json b/src/main/resources/data/overdrive_that_matters/recipes/smelting/tritanium_ingot.json deleted file mode 100644 index e48000519..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/smelting/tritanium_ingot.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:ores/tritanium" - }, - "result": "overdrive_that_matters:tritanium_ingot", - "experience": 1, - "cookingtime": 200 -} \ No newline at end of file