fix recipes/data gen target

dphaldes · Jul 24, 2024 · 83149e7 · 83149e7
1 parent f0bc402
commit 83149e7
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 74 deletions.
diff --git 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
@@ -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
+}
diff --git a/src/generated/resources/data/ars_ocultas/recipe/silver_transmute.json 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
+}
diff --git a/...s_ocultas/recipes/spirit_attuned_gem.json → ...rs_ocultas/recipe/spirit_attuned_gem.json b/...s_ocultas/recipes/spirit_attuned_gem.json → ...rs_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
 }
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
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
diff --git a/...onky/arsocultas/datagen/DataProvider.java → ...tchonky/arsocultas/data/DataProvider.java b/...onky/arsocultas/datagen/DataProvider.java → ...tchonky/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/.../arsocultas/datagen/LanguageProvider.java → ...nky/arsocultas/data/LanguageProvider.java b/.../arsocultas/datagen/LanguageProvider.java → ...nky/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/...datagen/recipe/EnchantingAppProvider.java → ...as/data/recipe/EnchantingAppProvider.java b/...datagen/recipe/EnchantingAppProvider.java → ...as/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/...tas/datagen/recipe/ImbuementProvider.java → ...cultas/data/recipe/ImbuementProvider.java b/...tas/datagen/recipe/ImbuementProvider.java → ...cultas/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