From b031b33d410bb519f7ba1cec5f4764c3cf01d2a0 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Tue, 23 Jan 2024 15:27:28 +0100 Subject: [PATCH] feat: enable category buttons for sub-categories --- src/generated/resources/assets/occultism/lang/en_us.json | 1 + .../categories/crafting_rituals.json | 2 +- .../categories/familiar_rituals.json | 2 +- .../categories/possession_rituals.json | 2 +- .../books/dictionary_of_spirits/categories/spirits.json | 2 +- .../categories/summoning_rituals.json | 2 +- .../occultism/datagen/OccultismBookProvider.java | 9 +++++---- .../occultism/datagen/book/FamiliarRitualsCategory.java | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index 8b99dc2d7..fd0cbecee 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -626,6 +626,7 @@ "book.occultism.dictionary_of_spirits.spirits.name": "Spirits", "book.occultism.dictionary_of_spirits.spirits.overview.afrit.text": "Even more powerful than Djinni, Afrit are used for the creation of major artifacts and the possession of powerful beings.\n", "book.occultism.dictionary_of_spirits.spirits.overview.afrit.title": "Afrit", + "book.occultism.dictionary_of_spirits.spirits.overview.description": "An overview of the supernatural", "book.occultism.dictionary_of_spirits.spirits.overview.djinni.text": "The most commonly summoned class. There is a great variety of Djinni, differing both in intelligence and power. Djinni can be used for a variety of task, ranging from higher artifacts over possession of living beings to carrying out tasks in their Chosen Form.\n", "book.occultism.dictionary_of_spirits.spirits.overview.djinni.title": "Djinni", "book.occultism.dictionary_of_spirits.spirits.overview.foliot.text": "The lowest identified class of spirit. Equipped with some intelligence and a modicum of power they are most often used for manual labor or minor artifacts.\n", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/crafting_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/crafting_rituals.json index 91b65e27b..ee3a7c099 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/crafting_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/crafting_rituals.json @@ -10,6 +10,6 @@ "width": 16 }, "name": "book.occultism.dictionary_of_spirits.crafting_rituals.name", - "show_category_button": false, + "show_category_button": true, "sort_number": 7 } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/familiar_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/familiar_rituals.json index e66bd4ffe..2f8c42135 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/familiar_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/familiar_rituals.json @@ -10,6 +10,6 @@ "width": 16 }, "name": "book.occultism.dictionary_of_spirits.familiar_rituals.name", - "show_category_button": false, + "show_category_button": true, "sort_number": 8 } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/possession_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/possession_rituals.json index 8f5bb1819..5a3e8b9b9 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/possession_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/possession_rituals.json @@ -10,6 +10,6 @@ "width": 16 }, "name": "book.occultism.dictionary_of_spirits.possession_rituals.name", - "show_category_button": false, + "show_category_button": true, "sort_number": 6 } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/spirits.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/spirits.json index f2d7276a0..36bbeff3b 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/spirits.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/spirits.json @@ -10,6 +10,6 @@ "width": 16 }, "name": "book.occultism.dictionary_of_spirits.spirits.name", - "show_category_button": false, + "show_category_button": true, "sort_number": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/summoning_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/summoning_rituals.json index 198b74954..b820dae4c 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/summoning_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/summoning_rituals.json @@ -10,6 +10,6 @@ "width": 16 }, "name": "book.occultism.dictionary_of_spirits.summoning_rituals.name", - "show_category_button": false, + "show_category_button": true, "sort_number": 5 } \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java index b7950323e..96f9081fd 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java @@ -2073,7 +2073,7 @@ private BookCategoryModel makeSpiritsSubcategory() { return BookCategoryModel.create(this.modLoc(this.context().categoryId()), this.context().categoryName()) .withIcon(this.modLoc("textures/gui/book/spirits.png")) - .withShowCategoryButton(false) + .withShowCategoryButton(true) .withEntries( overview, returnToGettingStarted, @@ -2098,6 +2098,7 @@ private BookEntryModel makeReturnToGettingStartedEntry(CategoryEntryMap entryMap private BookEntryModel makeSpiritsOverviewEntry(CategoryEntryMap entryMap, char icon) { this.context().entry("overview"); this.lang().add(this.context().entryName(), "On Spirits"); + this.lang().add(this.context().entryDescription(), "An overview of the supernatural"); this.context().page("intro"); var intro = BookTextPageModel.builder() @@ -3362,7 +3363,7 @@ private BookCategoryModel makeSummoningRitualsSubcategory() { return BookCategoryModel.create(this.modLoc(this.context().categoryId()), this.context().categoryName()) .withIcon(this.modLoc("textures/gui/book/summoning.png")) - .withShowCategoryButton(false) + .withShowCategoryButton(true) .withEntries( overview, returnToRituals, @@ -4171,7 +4172,7 @@ private BookCategoryModel makeCraftingRitualsSubcategory() { return BookCategoryModel.create(this.modLoc(this.context().categoryId()), this.context().categoryName()) .withIcon(this.modLoc("textures/gui/book/infusion.png")) - .withShowCategoryButton(false) + .withShowCategoryButton(true) .withEntries( overview, returnToRituals, @@ -4787,7 +4788,7 @@ private BookCategoryModel makePossessionRitualsSubcategory() { return BookCategoryModel.create(this.modLoc(this.context().categoryId()), this.context().categoryName()) .withIcon(this.modLoc("textures/gui/book/possession.png")) - .withShowCategoryButton(false) + .withShowCategoryButton(true) .withEntries( overview, returnToRituals, diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java b/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java index c7c02ca3a..20c452676 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/FamiliarRitualsCategory.java @@ -111,7 +111,7 @@ protected BookCategoryModel generateCategory() { return BookCategoryModel.create(this.modLoc(this.context().categoryId()), this.context().categoryName()) .withIcon(this.modLoc("textures/gui/book/parrot.png")) - .withShowCategoryButton(false); + .withShowCategoryButton(true); } private BookEntryModel makeFamiliarsRitualsOverviewEntry(CategoryEntryMap entryMap, char icon) {