From 5c0e157b025a47855ff89361a63d02448c07082f Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sun, 1 Jan 2023 20:03:05 +0100 Subject: [PATCH] chore: update in game docs for new rod behaviour --- .../assets/occultism/lang/en_us.json | 1 + .../getting_started/divination_rod.json | 8 +++++++ .../datagen/OccultismBookProvider.java | 22 +++++++++++++++++-- .../occultism/datagen/lang/ENUSProvider.java | 9 ++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index fced2c227..6d4e6adae 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -292,6 +292,7 @@ "book.occultism.dictionary_of_spirits.getting_started.divination_rod.how_to_use.text": "[#](ad03fc)Shift-right-click[#]() a block to attune the rod to the corresponding Otherworld block.\n- [](item://minecraft:andesite): [](item://occultism:otherstone)\n- [](item://minecraft:oak_wood): [](item://occultism:otherworld_log)\n- [](item://minecraft:oak_leaves): [](item://occultism:otherworld_leaves)\n- [](item://minecraft:netherrack): [](item://occultism:iesnium_ore)\n\nThen [#](ad03fc)right-click[#]() and hold until the rod animation finishes.", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.how_to_use.title": "Use of the Rod", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.how_to_use2.text": "After the animation finishes, the closest **found block will be highlighted\nwith white lines and can be seen through other blocks**.\nAdditionally you can watch the crystals for hints: a white crystal indicates no target blocks found,\na fully purple block means the found block is nearby. Mixes between white and purple show\nthat the target is rather far away.", + "book.occultism.dictionary_of_spirits.getting_started.divination_rod.how_to_use3.text": "[#](ad03fc)Right-clicking[#]() without holding after a successful search will show the last found target block again.\n\\\n\\\nIf the mod *\"Theurgy\"* is installed the rod will not highlight the target block, but instead send a particle effect in the direction of the target block.\n", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.intro.text": "To make it easier to get started, the materials obtained by divination now also have crafting recipes.\n**If you want the full experience, skip the following recipe page and move on to the\n[divination instructions](entry://occultism:dictionary_of_spirits/getting_started/divination_rod@divination_instructions).**\n", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.intro.title": "Divination", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.name": "Divination Rod", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/divination_rod.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/divination_rod.json index 1b55bd6b1..737429bbd 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/divination_rod.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/divination_rod.json @@ -80,6 +80,14 @@ "title": "", "use_markdown_in_title": false }, + { + "type": "modonomicon:text", + "anchor": "", + "show_title_separator": true, + "text": "book.occultism.dictionary_of_spirits.getting_started.divination_rod.how_to_use3.text", + "title": "", + "use_markdown_in_title": false + }, { "type": "modonomicon:image", "anchor": "", diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java b/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java index 8b9c6a5f2..4cfbf2747 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java +++ b/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java @@ -499,6 +499,10 @@ private BookEntryModel.Builder makeDivinationRodEntry(BookLangHelper helper, Ent .withText(helper.pageText()) .build(); + helper.page("how_to_use3"); + var howToUse3 = BookTextPageModel.builder() + .withText(helper.pageText()) + .build(); helper.page("divination_rod_screenshots"); var divinationRodScreenshots = BookImagePageModel.builder() @@ -537,8 +541,22 @@ private BookEntryModel.Builder makeDivinationRodEntry(BookLangHelper helper, Ent .withDescription(helper.entryDescription()) .withIcon(OccultismItems.DIVINATION_ROD.getId().toString()) .withLocation(entryHelper.get(icon)) - .withPages(intro, otherstoneRecipe, otherworldSaplingNaturalRecipe, divinationRod, spiritAttunedGemRecipe, divinationRodRecipe, aboutDivinationRod, - howToUse, howToUse2, divinationRodScreenshots, otherworldGroves, otherworldGroves2, otherworldTrees, otherworldTrees2); + .withPages( + intro, + otherstoneRecipe, + otherworldSaplingNaturalRecipe, + divinationRod, + spiritAttunedGemRecipe, + divinationRodRecipe, + aboutDivinationRod, + howToUse, + howToUse2, + howToUse3, + divinationRodScreenshots, + otherworldGroves, + otherworldGroves2, + otherworldTrees, + otherworldTrees2); } private BookEntryModel.Builder makeTheurgyDivinationRodsEntry(BookLangHelper helper, EntryLocationHelper entryHelper, char icon) { diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/lang/ENUSProvider.java b/src/main/java/com/github/klikli_dev/occultism/datagen/lang/ENUSProvider.java index 49554e4f1..eb35fb58b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/github/klikli_dev/occultism/datagen/lang/ENUSProvider.java @@ -934,6 +934,15 @@ private void addGettingStartedCategory(BookLangHelper helper) { a fully purple block means the found block is nearby. Mixes between white and purple show that the target is rather far away."""); + helper.page("how_to_use3"); + this.add(helper.pageText(), + """ + [#](%1$s)Right-clicking[#]() without holding after a successful search will show the last found target block again. + \\ + \\ + If the mod *"Theurgy"* is installed the rod will not highlight the target block, but instead send a particle effect in the direction of the target block. + """.formatted(COLOR_PURPLE)); + helper.page("divination_rod_screenshots"); this.add(helper.pageText(), """