From 43974153ff8a4201342b93738203973e69ce1bef Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sun, 28 Jul 2024 18:25:28 +0200 Subject: [PATCH] fix: summon djinni pentacle not used (uses afrit instead) Closes #1174 --- .../recipe/ritual/summon_demonic_husband.json | 2 +- .../recipe/ritual/summon_demonic_wife.json | 2 +- .../ritual/summon_djinni_clear_weather.json | 2 +- .../recipe/ritual/summon_djinni_crusher.json | 2 +- .../recipe/ritual/summon_djinni_day_time.json | 2 +- .../ritual/summon_djinni_manage_machine.json | 2 +- .../recipe/ritual/summon_djinni_night_time.json | 2 +- .../occultism/datagen/recipe/RitualRecipes.java | 15 ++++++++------- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_husband.json b/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_husband.json index 7bb7c794d..5828308bf 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_husband.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_husband.json @@ -29,7 +29,7 @@ "item": "minecraft:glass_bottle" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "components": { "minecraft:item_name": "{\"translate\":\"item.occultism.ritual_dummy.summon_demonic_husband\"}", diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_wife.json b/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_wife.json index fc23ae054..2ad417dd5 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_wife.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_demonic_wife.json @@ -29,7 +29,7 @@ "item": "minecraft:glass_bottle" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "components": { "minecraft:item_name": "{\"translate\":\"item.occultism.ritual_dummy.summon_demonic_wife\"}", diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_clear_weather.json b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_clear_weather.json index bf18338a7..550db586c 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_clear_weather.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_clear_weather.json @@ -19,7 +19,7 @@ "tag": "c:crops/wheat" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "count": 1, "id": "occultism:jei_dummy/none" diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_crusher.json b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_crusher.json index 3f5dfdad9..052ba18d5 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_crusher.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_crusher.json @@ -19,7 +19,7 @@ "tag": "c:dusts/silver" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "count": 1, "id": "occultism:jei_dummy/none" diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_day_time.json b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_day_time.json index 2401b8ab3..d132d7082 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_day_time.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_day_time.json @@ -19,7 +19,7 @@ "tag": "c:dyes/yellow" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "count": 1, "id": "occultism:jei_dummy/none" diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_manage_machine.json b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_manage_machine.json index 5d5537679..03f1bcb90 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_manage_machine.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_manage_machine.json @@ -19,7 +19,7 @@ "item": "minecraft:furnace" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "count": 1, "id": "occultism:book_of_calling_djinni_manage_machine" diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_night_time.json b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_night_time.json index c4bc30f62..2af9a5857 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_night_time.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_djinni_night_time.json @@ -19,7 +19,7 @@ "tag": "c:dyes/black" } ], - "pentacle_id": "occultism:summon_afrit", + "pentacle_id": "occultism:summon_djinni", "result": { "count": 1, "id": "occultism:jei_dummy/none" diff --git a/src/main/java/com/klikli_dev/occultism/datagen/recipe/RitualRecipes.java b/src/main/java/com/klikli_dev/occultism/datagen/recipe/RitualRecipes.java index e3c5ded7d..9a6d0feec 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/recipe/RitualRecipes.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/recipe/RitualRecipes.java @@ -32,6 +32,7 @@ public abstract class RitualRecipes extends RecipeProvider { private static final ResourceLocation RITUAL_SUMMON_JOB = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "summon_spirit_with_job"); private static final ResourceLocation RITUAL_RESURRECT_FAMILIAR = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "resurrect_familiar"); private static final ResourceLocation PENTACLE_SUMMON_FOLIOT = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "summon_foliot"); + private static final ResourceLocation PENTACLE_SUMMON_DJINNI = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "summon_djinni"); private static final ResourceLocation PENTACLE_SUMMON_AFRIT = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "summon_afrit"); private static final ResourceLocation PENTACLE_SUMMON_WILD_AFRIT = ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "summon_wild_afrit"); @@ -150,7 +151,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_demonic_husband")), 60, OccultismRituals.SUMMON_TAMED.getId(), - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(Tags.Items.INGOTS_GOLD), Ingredient.of(Tags.Items.GEMS_EMERALD), Ingredient.of(Tags.Items.GUNPOWDERS), @@ -169,7 +170,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_demonic_wife")), 60, OccultismRituals.SUMMON_TAMED.getId(), - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(Tags.Items.INGOTS_GOLD), Ingredient.of(Tags.Items.GEMS_DIAMOND), Ingredient.of(Tags.Items.GUNPOWDERS), @@ -188,7 +189,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_djinni_clear_weather")), 60, RITUAL_SUMMON_JOB, - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(Tags.Items.CROPS_BEETROOT), Ingredient.of(Tags.Items.CROPS_CARROT), Ingredient.of(Tags.Items.CROPS_POTATO), @@ -204,7 +205,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_djinni_crusher")), 90, RITUAL_SUMMON_JOB, - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(OccultismTags.Items.IRON_DUST), Ingredient.of(OccultismTags.Items.GOLD_DUST), Ingredient.of(OccultismTags.Items.COPPER_DUST), @@ -220,7 +221,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_djinni_day_time")), 60, RITUAL_SUMMON_JOB, - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(Items.TORCH), Ingredient.of(ItemTags.SAPLINGS), Ingredient.of(Items.WHEAT), @@ -236,7 +237,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_djinni_manage_machine")), 60, RITUAL_SUMMON_JOB, - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(Tags.Items.STORAGE_BLOCKS_COAL), Ingredient.of(Tags.Items.INGOTS_GOLD), Ingredient.of(Tags.Items.INGOTS_IRON), @@ -252,7 +253,7 @@ private static void summonRituals(RecipeOutput recipeOutput) { makeRitualDummy(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual_dummy/summon_djinni_night_time")), 60, RITUAL_SUMMON_JOB, - PENTACLE_SUMMON_AFRIT, + PENTACLE_SUMMON_DJINNI, Ingredient.of(ItemTags.BEDS), Ingredient.of(Items.ROTTEN_FLESH), Ingredient.of(Tags.Items.BONES),