Skip to content

Commit 83149e7

Browse files
committed
fix recipes/data gen target
1 parent f0bc402 commit 83149e7

File tree

10 files changed

+70
-74
lines changed

10 files changed

+70
-74
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [2.0.1] - 2024-07-24
4+
5+
### Fixed
6+
7+
- Fixed Recipes
8+
39
## [2.0.0] - 2024-07-22
410

511
Ported to NeoForge 1.21
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"type": "ars_nouveau:imbuement",
3+
"input": {
4+
"item": "occultism:silver_ingot"
5+
},
6+
"output": {
7+
"count": 1,
8+
"id": "minecraft:gold_ingot"
9+
},
10+
"pedestalItems": [
11+
{
12+
"item": "ars_nouveau:manipulation_essence"
13+
},
14+
{
15+
"item": "ars_nouveau:magebloom"
16+
},
17+
{
18+
"item": "occultism:spirit_attuned_gem"
19+
}
20+
],
21+
"source": 2000
22+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"type": "ars_nouveau:imbuement",
3+
"input": {
4+
"item": "minecraft:gold_ingot"
5+
},
6+
"output": {
7+
"count": 1,
8+
"id": "occultism:silver_ingot"
9+
},
10+
"pedestalItems": [
11+
{
12+
"item": "ars_nouveau:manipulation_essence"
13+
},
14+
{
15+
"item": "occultism:demons_dream_essence"
16+
},
17+
{
18+
"item": "occultism:spirit_attuned_gem"
19+
}
20+
],
21+
"source": 2000
22+
}

src/generated/resources/data/ars_ocultas/recipes/spirit_attuned_gem.json renamed to src/generated/resources/data/ars_ocultas/recipe/spirit_attuned_gem.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"type": "ars_nouveau:enchanting_apparatus",
33
"keepNbtOfReagent": false,
4-
"output": {
5-
"item": "occultism:spirit_attuned_gem"
6-
},
74
"pedestalItems": [
85
{
96
"item": "ars_nouveau:conjuration_essence"
@@ -12,13 +9,15 @@
129
"item": "ars_nouveau:manipulation_essence"
1310
},
1411
{
15-
"item": "occultism:datura"
16-
}
17-
],
18-
"reagent": [
19-
{
20-
"item": "ars_nouveau:source_gem"
12+
"item": "occultism:demons_dream_essence"
2113
}
2214
],
15+
"reagent": {
16+
"item": "ars_nouveau:source_gem"
17+
},
18+
"result": {
19+
"count": 1,
20+
"id": "occultism:spirit_attuned_gem"
21+
},
2322
"sourceCost": 500
2423
}

src/generated/resources/data/ars_ocultas/recipes/imbuement_gold_transmute.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/generated/resources/data/ars_ocultas/recipes/imbuement_silver_transmute.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main/java/com/mystchonky/arsocultas/datagen/DataProvider.java renamed to src/main/java/com/mystchonky/arsocultas/data/DataProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.mystchonky.arsocultas.datagen;
1+
package com.mystchonky.arsocultas.data;
22

33
import com.mystchonky.arsocultas.ArsOcultas;
4-
import com.mystchonky.arsocultas.datagen.recipe.EnchantingAppProvider;
5-
import com.mystchonky.arsocultas.datagen.recipe.ImbuementProvider;
4+
import com.mystchonky.arsocultas.data.recipe.EnchantingAppProvider;
5+
import com.mystchonky.arsocultas.data.recipe.ImbuementProvider;
66
import net.minecraft.data.PackOutput;
77
import net.neoforged.bus.api.SubscribeEvent;
88
import net.neoforged.fml.common.EventBusSubscriber;

src/main/java/com/mystchonky/arsocultas/datagen/LanguageProvider.java renamed to src/main/java/com/mystchonky/arsocultas/data/LanguageProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mystchonky.arsocultas.datagen;
1+
package com.mystchonky.arsocultas.data;
22

33

44
import com.mystchonky.arsocultas.ArsOcultas;

src/main/java/com/mystchonky/arsocultas/datagen/recipe/EnchantingAppProvider.java renamed to src/main/java/com/mystchonky/arsocultas/data/recipe/EnchantingAppProvider.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.mystchonky.arsocultas.datagen.recipe;
1+
package com.mystchonky.arsocultas.data.recipe;
22

33
import com.hollingsworth.arsnouveau.common.crafting.recipes.EnchantingApparatusRecipe;
44
import com.hollingsworth.arsnouveau.common.datagen.ApparatusRecipeBuilder;
55
import com.hollingsworth.arsnouveau.common.datagen.ApparatusRecipeProvider;
66
import com.hollingsworth.arsnouveau.setup.registry.ItemsRegistry;
77
import com.klikli_dev.occultism.registry.OccultismItems;
8-
import com.mystchonky.arsocultas.datagen.DataProvider;
8+
import com.mystchonky.arsocultas.data.DataProvider;
99
import net.minecraft.data.CachedOutput;
1010
import net.minecraft.data.DataGenerator;
1111

@@ -19,13 +19,12 @@ public EnchantingAppProvider(DataGenerator generatorIn) {
1919

2020
@Override
2121
public void collectJsons(CachedOutput pOutput) {
22-
//example of an apparatus recipe
2322
recipes.add(builder()
2423
.withReagent(ItemsRegistry.SOURCE_GEM)
2524
.withPedestalItem(1, ItemsRegistry.CONJURATION_ESSENCE)
2625
.withPedestalItem(1, ItemsRegistry.MANIPULATION_ESSENCE)
27-
.withPedestalItem(1, OccultismItems.DATURA)
28-
.withResult(OccultismItems.DEMONS_DREAM_ESSENCE)
26+
.withPedestalItem(1, OccultismItems.DEMONS_DREAM_ESSENCE)
27+
.withResult(OccultismItems.SPIRIT_ATTUNED_GEM)
2928
.withSourceCost(500)
3029
.build()
3130
);
@@ -40,7 +39,7 @@ public void collectJsons(CachedOutput pOutput) {
4039
}
4140

4241
protected static Path getRecipePath(Path pathIn, String str) {
43-
return pathIn.resolve("data/" + DataProvider.root + "/recipes/" + str + ".json");
42+
return pathIn.resolve("data/" + DataProvider.root + "/recipe/" + str + ".json");
4443
}
4544

4645
@Override

src/main/java/com/mystchonky/arsocultas/datagen/recipe/ImbuementProvider.java renamed to src/main/java/com/mystchonky/arsocultas/data/recipe/ImbuementProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.mystchonky.arsocultas.datagen.recipe;
1+
package com.mystchonky.arsocultas.data.recipe;
22

33
import com.hollingsworth.arsnouveau.common.crafting.recipes.ImbuementRecipe;
44
import com.hollingsworth.arsnouveau.common.datagen.ImbuementRecipeProvider;
55
import com.hollingsworth.arsnouveau.setup.registry.ItemsRegistry;
66
import com.klikli_dev.occultism.registry.OccultismItems;
7-
import com.mystchonky.arsocultas.datagen.DataProvider;
7+
import com.mystchonky.arsocultas.data.DataProvider;
88
import net.minecraft.core.HolderLookup;
99
import net.minecraft.data.CachedOutput;
1010
import net.minecraft.data.DataGenerator;
@@ -57,7 +57,7 @@ public void collectJsons(CachedOutput pOutput) {
5757
}
5858

5959
protected Path getRecipePath(Path pathIn, String str) {
60-
return pathIn.resolve("data/" + DataProvider.root + "/recipes/" + str + ".json");
60+
return pathIn.resolve("data/" + DataProvider.root + "/recipe/" + str + ".json");
6161
}
6262

6363
@Override

0 commit comments

Comments
 (0)