From 4d9cc1e06db7cc43d6d1ce78b715dd713b870e46 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sun, 21 Jan 2024 07:23:21 +0100 Subject: [PATCH] chore: mention that a demonic partner is not a familiar --- .../resources/assets/occultism/lang/en_us.json | 2 ++ .../familiar_rituals/demonic_partner.json | 8 ++++++++ .../possession_rituals/possess_hoglin.json | 1 + .../possession_rituals/possess_warden.json | 1 + .../familiarrituals/DemonicPartnerEntry.java | 16 ++++++++++++++++ 5 files changed, 28 insertions(+) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index ea21bb5c6..50f9b140f 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -163,6 +163,8 @@ "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.title": "Demonic Partner", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.text": "Demons, of course, deal in contracts, and what better contract than a marriage contract?\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.title": "Demonic Partner", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.text": "The Demonic Partner Chapter is part of the Familiar Category of this book because of the similarities, however a Partner is obviously not a familiar.\n\\\n\\\nAs such, they also cannot be stored in a [](item://occultism:familiar_ring). You can, however, use a [](item://occultism:soul_gem) as for any other being.\n", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.title": "Not a Familiar", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.husband.title": "Demonic Husband", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.name": "Demonic Partner", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.wife.title": "Demonic Wife", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json index d83603b6c..00a6788b1 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json @@ -46,6 +46,14 @@ "title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.title", "use_markdown_in_title": false }, + { + "type": "modonomicon:text", + "anchor": "", + "show_title_separator": true, + "text": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.text", + "title": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.title", + "use_markdown_in_title": false + }, { "type": "modonomicon:entity", "anchor": "", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_hoglin.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_hoglin.json index 41e12256e..9e3a95742 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_hoglin.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_hoglin.json @@ -48,6 +48,7 @@ "line_reversed": false } ], + "show_when_any_parent_unlocked": false, "x": 4, "y": 1 } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_warden.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_warden.json index 47ecb0291..5667feb5e 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_warden.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_warden.json @@ -48,6 +48,7 @@ "line_reversed": false } ], + "show_when_any_parent_unlocked": false, "x": 4, "y": -1 } \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/DemonicPartnerEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/DemonicPartnerEntry.java index 40e56fc96..81e9e87d8 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/DemonicPartnerEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/familiarrituals/DemonicPartnerEntry.java @@ -7,6 +7,7 @@ import com.klikli_dev.modonomicon.api.datagen.book.page.BookEntityPageModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel; import com.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePageModel; +import com.klikli_dev.occultism.registry.OccultismItems; import com.mojang.datafixers.util.Pair; public class DemonicPartnerEntry extends EntryProvider { @@ -68,6 +69,21 @@ protected void generatePages() { Right-Click with a potion to get the effect for a significantly longer time. """); + this.page("familiar", () -> BookTextPageModel.builder() + .withTitle(this.context().pageTitle()) + .withText(this.context().pageText()) + .build()); + this.pageTitle("Not a Familiar"); + this.pageText(""" + The Demonic Partner Chapter is part of the Familiar Category of this book because of the similarities, however a Partner is obviously not a familiar. + \\ + \\ + As such, they also cannot be stored in a {0}. You can, however, use a {1} as for any other being. + """, + this.itemLink(OccultismItems.FAMILIAR_RING.get()), + this.itemLink(OccultismItems.SOUL_GEM_ITEM.get()) + ); + this.page("wife", () -> BookEntityPageModel.builder() .withEntityId("occultism:demonic_wife") .withEntityName(this.context().pageTitle())