From 6c24233cfebf27b40b4e5e1d99dfd03e57e83599 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Wed, 5 Mar 2025 11:34:15 +0100 Subject: [PATCH] fix: wrong ingredients and text for apprentice ritual satchel --- src/generated/resources/assets/occultism/lang/en_us.json | 2 +- .../recipes/ritual/ritual/craft_ritual_satchel_t1.json | 2 +- .../data/occultism/recipe/ritual/craft_ritual_satchel_t1.json | 2 +- .../com/klikli_dev/occultism/datagen/lang/ENUSProvider.java | 2 +- .../klikli_dev/occultism/datagen/recipe/RitualRecipes.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index 75ae9be5c..f93343585 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -1553,7 +1553,7 @@ "item.occultism.ritual_dummy.craft_research_fragment_dust": "Ritual: Craft Research Fragment Dust", "item.occultism.ritual_dummy.craft_research_fragment_dust.tooltip": "A Foliot will infuse experience in the emerald dust.", "item.occultism.ritual_dummy.craft_ritual_satchel_t1": "Ritual: Craft Apprentice Ritual Satchel", - "item.occultism.ritual_dummy.craft_ritual_satchel_t1.tooltip": "Binds a Djinni into a satchel to build pentacles step-by-step for the summoner.", + "item.occultism.ritual_dummy.craft_ritual_satchel_t1.tooltip": "Binds a Foliot into a satchel to build pentacles step-by-step for the summoner.", "item.occultism.ritual_dummy.craft_ritual_satchel_t2": "Ritual: Craft Artisanal Ritual Satchel", "item.occultism.ritual_dummy.craft_ritual_satchel_t2.tooltip": "Binds an Afrit into a satchel to build pentacles all at once for the summoner.", "item.occultism.ritual_dummy.craft_satchel": "Ritual: Craft Surprisingly Substantial Satchel", diff --git a/src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t1.json b/src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t1.json index a02080c3d..cb7b15d6e 100644 --- a/src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t1.json +++ b/src/generated/resources/data/occultism/advancement/recipes/ritual/ritual/craft_ritual_satchel_t1.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "occultism:book_of_binding_foliot" + "items": "occultism:book_of_binding_bound_foliot" } ] }, diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_ritual_satchel_t1.json b/src/generated/resources/data/occultism/recipe/ritual/craft_ritual_satchel_t1.json index e143c8bbe..c4439b95f 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/craft_ritual_satchel_t1.json +++ b/src/generated/resources/data/occultism/recipe/ritual/craft_ritual_satchel_t1.json @@ -1,7 +1,7 @@ { "type": "occultism:ritual", "activation_item": { - "item": "occultism:book_of_binding_foliot" + "item": "occultism:book_of_binding_bound_foliot" }, "duration": 150, "ingredients": [ diff --git a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java index 30bc8cd58..184f4013e 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/lang/ENUSProvider.java @@ -3126,7 +3126,7 @@ private void addRitualDummies() { this.add(OccultismItems.RITUAL_DUMMY_POSSESS_IESNIUM_GOLEM.get(), "Ritual: Summon Iesnium Golem"); this.addTooltip(OccultismItems.RITUAL_DUMMY_POSSESS_IESNIUM_GOLEM.get(), "Summons the strong and invulnerable iesnium golem to defend a region."); this.add(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1.get(), "Ritual: Craft Apprentice Ritual Satchel"); - this.addTooltip(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1.get(), "Binds a Djinni into a satchel to build pentacles step-by-step for the summoner."); + this.addTooltip(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1.get(), "Binds a Foliot into a satchel to build pentacles step-by-step for the summoner."); this.add(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T2.get(), "Ritual: Craft Artisanal Ritual Satchel"); this.addTooltip(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T2.get(), "Binds an Afrit into a satchel to build pentacles all at once for the summoner."); 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 ae7f6a7ad..8a858eb79 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 @@ -1163,7 +1163,7 @@ private static void craftingRituals(RecipeOutput recipeOutput) { Ingredient.of(OccultismTags.Items.SILVER_INGOT)) .unlockedBy("has_bound_djinni", has(OccultismItems.BOOK_OF_BINDING_BOUND_DJINNI.get())) .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual/craft_infused_pickaxe")); - RitualRecipeBuilder.ritualRecipeBuilder(Ingredient.of(OccultismItems.BOOK_OF_BINDING_FOLIOT.get()), + RitualRecipeBuilder.ritualRecipeBuilder(Ingredient.of(OccultismItems.BOOK_OF_BINDING_BOUND_FOLIOT.get()), new ItemStack(OccultismItems.RITUAL_SATCHEL_T1.get()), makeRitualDummy(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1.get()), 150, @@ -1177,7 +1177,7 @@ private static void craftingRituals(RecipeOutput recipeOutput) { Ingredient.of(Tags.Items.LEATHERS), Ingredient.of(Tags.Items.STRINGS), Ingredient.of(OccultismTags.Items.SILVER_INGOT)) - .unlockedBy("has_bound_foliot", has(OccultismItems.BOOK_OF_BINDING_FOLIOT.get())) + .unlockedBy("has_bound_foliot", has(OccultismItems.BOOK_OF_BINDING_BOUND_FOLIOT.get())) .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual/craft_ritual_satchel_t1")); RitualRecipeBuilder.ritualRecipeBuilder(Ingredient.of(OccultismItems.BOOK_OF_BINDING_BOUND_DJINNI.get()), new ItemStack(OccultismItems.SOUL_GEM_ITEM.get()),