From 83149e723f7201aa5ae53e7b78a97efa3f1391d4 Mon Sep 17 00:00:00 2001 From: Darshan Phaldesai Date: Wed, 24 Jul 2024 13:00:14 +0530 Subject: [PATCH] fix recipes/data gen target --- CHANGELOG.md | 6 +++++ .../ars_ocultas/recipe/gold_transmute.json | 22 ++++++++++++++++ .../ars_ocultas/recipe/silver_transmute.json | 22 ++++++++++++++++ .../spirit_attuned_gem.json | 17 ++++++------ .../recipes/imbuement_gold_transmute.json | 26 ------------------- .../recipes/imbuement_silver_transmute.json | 26 ------------------- .../{datagen => data}/DataProvider.java | 6 ++--- .../{datagen => data}/LanguageProvider.java | 2 +- .../recipe/EnchantingAppProvider.java | 11 ++++---- .../recipe/ImbuementProvider.java | 6 ++--- 10 files changed, 70 insertions(+), 74 deletions(-) create mode 100644 src/generated/resources/data/ars_ocultas/recipe/gold_transmute.json create mode 100644 src/generated/resources/data/ars_ocultas/recipe/silver_transmute.json rename src/generated/resources/data/ars_ocultas/{recipes => recipe}/spirit_attuned_gem.json (60%) delete mode 100644 src/generated/resources/data/ars_ocultas/recipes/imbuement_gold_transmute.json delete mode 100644 src/generated/resources/data/ars_ocultas/recipes/imbuement_silver_transmute.json rename src/main/java/com/mystchonky/arsocultas/{datagen => data}/DataProvider.java (82%) rename src/main/java/com/mystchonky/arsocultas/{datagen => data}/LanguageProvider.java (91%) rename src/main/java/com/mystchonky/arsocultas/{datagen => data}/recipe/EnchantingAppProvider.java (84%) rename src/main/java/com/mystchonky/arsocultas/{datagen => data}/recipe/ImbuementProvider.java (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index aced8f2..b8cf7da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [2.0.1] - 2024-07-24 + +### Fixed + +- Fixed Recipes + ## [2.0.0] - 2024-07-22 Ported to NeoForge 1.21 diff --git a/src/generated/resources/data/ars_ocultas/recipe/gold_transmute.json b/src/generated/resources/data/ars_ocultas/recipe/gold_transmute.json new file mode 100644 index 0000000..c2e5d53 --- /dev/null +++ b/src/generated/resources/data/ars_ocultas/recipe/gold_transmute.json @@ -0,0 +1,22 @@ +{ + "type": "ars_nouveau:imbuement", + "input": { + "item": "occultism:silver_ingot" + }, + "output": { + "count": 1, + "id": "minecraft:gold_ingot" + }, + "pedestalItems": [ + { + "item": "ars_nouveau:manipulation_essence" + }, + { + "item": "ars_nouveau:magebloom" + }, + { + "item": "occultism:spirit_attuned_gem" + } + ], + "source": 2000 +} \ No newline at end of file diff --git a/src/generated/resources/data/ars_ocultas/recipe/silver_transmute.json b/src/generated/resources/data/ars_ocultas/recipe/silver_transmute.json new file mode 100644 index 0000000..a310173 --- /dev/null +++ b/src/generated/resources/data/ars_ocultas/recipe/silver_transmute.json @@ -0,0 +1,22 @@ +{ + "type": "ars_nouveau:imbuement", + "input": { + "item": "minecraft:gold_ingot" + }, + "output": { + "count": 1, + "id": "occultism:silver_ingot" + }, + "pedestalItems": [ + { + "item": "ars_nouveau:manipulation_essence" + }, + { + "item": "occultism:demons_dream_essence" + }, + { + "item": "occultism:spirit_attuned_gem" + } + ], + "source": 2000 +} \ No newline at end of file diff --git a/src/generated/resources/data/ars_ocultas/recipes/spirit_attuned_gem.json b/src/generated/resources/data/ars_ocultas/recipe/spirit_attuned_gem.json similarity index 60% rename from src/generated/resources/data/ars_ocultas/recipes/spirit_attuned_gem.json rename to src/generated/resources/data/ars_ocultas/recipe/spirit_attuned_gem.json index 08b423a..b048b5f 100644 --- a/src/generated/resources/data/ars_ocultas/recipes/spirit_attuned_gem.json +++ b/src/generated/resources/data/ars_ocultas/recipe/spirit_attuned_gem.json @@ -1,9 +1,6 @@ { "type": "ars_nouveau:enchanting_apparatus", "keepNbtOfReagent": false, - "output": { - "item": "occultism:spirit_attuned_gem" - }, "pedestalItems": [ { "item": "ars_nouveau:conjuration_essence" @@ -12,13 +9,15 @@ "item": "ars_nouveau:manipulation_essence" }, { - "item": "occultism:datura" - } - ], - "reagent": [ - { - "item": "ars_nouveau:source_gem" + "item": "occultism:demons_dream_essence" } ], + "reagent": { + "item": "ars_nouveau:source_gem" + }, + "result": { + "count": 1, + "id": "occultism:spirit_attuned_gem" + }, "sourceCost": 500 } \ No newline at end of file diff --git a/src/generated/resources/data/ars_ocultas/recipes/imbuement_gold_transmute.json b/src/generated/resources/data/ars_ocultas/recipes/imbuement_gold_transmute.json deleted file mode 100644 index b9be33e..0000000 --- a/src/generated/resources/data/ars_ocultas/recipes/imbuement_gold_transmute.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "ars_nouveau:imbuement", - "count": 1, - "input": { - "item": "occultism:silver_ingot" - }, - "output": "minecraft:gold_ingot", - "pedestalItems": [ - { - "item": { - "item": "ars_nouveau:manipulation_essence" - } - }, - { - "item": { - "item": "ars_nouveau:magebloom" - } - }, - { - "item": { - "item": "occultism:spirit_attuned_gem" - } - } - ], - "source": 2000 -} \ No newline at end of file diff --git a/src/generated/resources/data/ars_ocultas/recipes/imbuement_silver_transmute.json b/src/generated/resources/data/ars_ocultas/recipes/imbuement_silver_transmute.json deleted file mode 100644 index a90d260..0000000 --- a/src/generated/resources/data/ars_ocultas/recipes/imbuement_silver_transmute.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "ars_nouveau:imbuement", - "count": 1, - "input": { - "item": "minecraft:gold_ingot" - }, - "output": "occultism:silver_ingot", - "pedestalItems": [ - { - "item": { - "item": "ars_nouveau:manipulation_essence" - } - }, - { - "item": { - "item": "occultism:datura" - } - }, - { - "item": { - "item": "occultism:spirit_attuned_gem" - } - } - ], - "source": 2000 -} \ No newline at end of file diff --git a/src/main/java/com/mystchonky/arsocultas/datagen/DataProvider.java b/src/main/java/com/mystchonky/arsocultas/data/DataProvider.java similarity index 82% rename from src/main/java/com/mystchonky/arsocultas/datagen/DataProvider.java rename to src/main/java/com/mystchonky/arsocultas/data/DataProvider.java index 0d96d03..ab37903 100644 --- a/src/main/java/com/mystchonky/arsocultas/datagen/DataProvider.java +++ b/src/main/java/com/mystchonky/arsocultas/data/DataProvider.java @@ -1,8 +1,8 @@ -package com.mystchonky.arsocultas.datagen; +package com.mystchonky.arsocultas.data; import com.mystchonky.arsocultas.ArsOcultas; -import com.mystchonky.arsocultas.datagen.recipe.EnchantingAppProvider; -import com.mystchonky.arsocultas.datagen.recipe.ImbuementProvider; +import com.mystchonky.arsocultas.data.recipe.EnchantingAppProvider; +import com.mystchonky.arsocultas.data.recipe.ImbuementProvider; import net.minecraft.data.PackOutput; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; diff --git a/src/main/java/com/mystchonky/arsocultas/datagen/LanguageProvider.java b/src/main/java/com/mystchonky/arsocultas/data/LanguageProvider.java similarity index 91% rename from src/main/java/com/mystchonky/arsocultas/datagen/LanguageProvider.java rename to src/main/java/com/mystchonky/arsocultas/data/LanguageProvider.java index ca4d420..9b514a3 100644 --- a/src/main/java/com/mystchonky/arsocultas/datagen/LanguageProvider.java +++ b/src/main/java/com/mystchonky/arsocultas/data/LanguageProvider.java @@ -1,4 +1,4 @@ -package com.mystchonky.arsocultas.datagen; +package com.mystchonky.arsocultas.data; import com.mystchonky.arsocultas.ArsOcultas; diff --git a/src/main/java/com/mystchonky/arsocultas/datagen/recipe/EnchantingAppProvider.java b/src/main/java/com/mystchonky/arsocultas/data/recipe/EnchantingAppProvider.java similarity index 84% rename from src/main/java/com/mystchonky/arsocultas/datagen/recipe/EnchantingAppProvider.java rename to src/main/java/com/mystchonky/arsocultas/data/recipe/EnchantingAppProvider.java index d2535fe..dc2d59d 100644 --- a/src/main/java/com/mystchonky/arsocultas/datagen/recipe/EnchantingAppProvider.java +++ b/src/main/java/com/mystchonky/arsocultas/data/recipe/EnchantingAppProvider.java @@ -1,11 +1,11 @@ -package com.mystchonky.arsocultas.datagen.recipe; +package com.mystchonky.arsocultas.data.recipe; import com.hollingsworth.arsnouveau.common.crafting.recipes.EnchantingApparatusRecipe; import com.hollingsworth.arsnouveau.common.datagen.ApparatusRecipeBuilder; import com.hollingsworth.arsnouveau.common.datagen.ApparatusRecipeProvider; import com.hollingsworth.arsnouveau.setup.registry.ItemsRegistry; import com.klikli_dev.occultism.registry.OccultismItems; -import com.mystchonky.arsocultas.datagen.DataProvider; +import com.mystchonky.arsocultas.data.DataProvider; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; @@ -19,13 +19,12 @@ public EnchantingAppProvider(DataGenerator generatorIn) { @Override public void collectJsons(CachedOutput pOutput) { - //example of an apparatus recipe recipes.add(builder() .withReagent(ItemsRegistry.SOURCE_GEM) .withPedestalItem(1, ItemsRegistry.CONJURATION_ESSENCE) .withPedestalItem(1, ItemsRegistry.MANIPULATION_ESSENCE) - .withPedestalItem(1, OccultismItems.DATURA) - .withResult(OccultismItems.DEMONS_DREAM_ESSENCE) + .withPedestalItem(1, OccultismItems.DEMONS_DREAM_ESSENCE) + .withResult(OccultismItems.SPIRIT_ATTUNED_GEM) .withSourceCost(500) .build() ); @@ -40,7 +39,7 @@ public void collectJsons(CachedOutput pOutput) { } protected static Path getRecipePath(Path pathIn, String str) { - return pathIn.resolve("data/" + DataProvider.root + "/recipes/" + str + ".json"); + return pathIn.resolve("data/" + DataProvider.root + "/recipe/" + str + ".json"); } @Override diff --git a/src/main/java/com/mystchonky/arsocultas/datagen/recipe/ImbuementProvider.java b/src/main/java/com/mystchonky/arsocultas/data/recipe/ImbuementProvider.java similarity index 95% rename from src/main/java/com/mystchonky/arsocultas/datagen/recipe/ImbuementProvider.java rename to src/main/java/com/mystchonky/arsocultas/data/recipe/ImbuementProvider.java index 81c6616..03d8fcc 100644 --- a/src/main/java/com/mystchonky/arsocultas/datagen/recipe/ImbuementProvider.java +++ b/src/main/java/com/mystchonky/arsocultas/data/recipe/ImbuementProvider.java @@ -1,10 +1,10 @@ -package com.mystchonky.arsocultas.datagen.recipe; +package com.mystchonky.arsocultas.data.recipe; import com.hollingsworth.arsnouveau.common.crafting.recipes.ImbuementRecipe; import com.hollingsworth.arsnouveau.common.datagen.ImbuementRecipeProvider; import com.hollingsworth.arsnouveau.setup.registry.ItemsRegistry; import com.klikli_dev.occultism.registry.OccultismItems; -import com.mystchonky.arsocultas.datagen.DataProvider; +import com.mystchonky.arsocultas.data.DataProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; @@ -57,7 +57,7 @@ public void collectJsons(CachedOutput pOutput) { } protected Path getRecipePath(Path pathIn, String str) { - return pathIn.resolve("data/" + DataProvider.root + "/recipes/" + str + ".json"); + return pathIn.resolve("data/" + DataProvider.root + "/recipe/" + str + ".json"); } @Override