Skip to content

Commit

Permalink
feat: make lumberjack use (only) stable otherworld sapling to avoid c…
Browse files Browse the repository at this point in the history
…onfusions with recipe

recipe renderer in jei and modonomicon show the unstable otherworld sapling as oak sapling, which is hard to fix.
Due to stable and unstable rotating in the recipe ingredient tag preview players get the impression that they can use two oak saplings instead of one oak + one otherworld.
Now we just show the stable otherworld -> no more confusion.
Players, however, now need to summon the trader first .. which is ok!
  • Loading branch information
klikli-dev committed Jan 1, 2024
1 parent 5b0adc3 commit 088acec
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/generated/resources/assets/occultism/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,8 @@
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.intro.text": "The lumberjack will harvest trees in it's working area. If a deposit location is set it will collect the dropped items into the specified chest, and re-plant saplings.\n",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.intro.title": "Foliot Lumberjack",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.name": "Summon Foliot Lumberjack",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.prerequisites.text": "Summoning the lumberjack requires a [Stable Otherworld Sapling](item://occultism:otherworld_sapling). You can obtain it by summoning an [Otherworld Sapling Trader][Books of Calling](entry://summoning_rituals/summon_otherworld_sapling_trader).\n",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.prerequisites.title": "Prerequisites",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.usage.text": "Use the book of calling to set the work area and deposit location of the lumberjack.\n\\\n\\\nSee [Books of Calling](entry://getting_started/books_of_calling) for more information.\n",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.usage.title": "Usage",
"book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.usage2.text": "The spirit might pause for a few minutes after clearing his work area, even if trees have regrown since. This is a performance-saving measure and not a bug, he will continue on his own.\n\\\n\\\nSet the work area again to make him continue work immediately.\n",
Expand Down Expand Up @@ -1149,7 +1151,7 @@
"jei.occultism.ingredient.otherstone.description": "Primarily found in Otherworld Groves. Only visible while the status §6Third Eye§r is active. See §6Dictionary of Spirits§r for more information.",
"jei.occultism.ingredient.otherworld_leaves.description": "Primarily found in Otherworld Groves. Only visible while the status §6Third Eye§r is active. See §6Dictionary of Spirits§r for more information.",
"jei.occultism.ingredient.otherworld_log.description": "Primarily found in Otherworld Groves. Only visible while the status §6Third Eye§r is active. See §6Dictionary of Spirits§r for more information.",
"jei.occultism.ingredient.otherworld_sapling.description": "Primarily found in Otherworld Groves. Only visible while the status §6Third Eye§r is active. See §6Dictionary of Spirits§r for more information.",
"jei.occultism.ingredient.otherworld_sapling.description": "Can be obtained from a Otherworld Sapling Trader. Can be seen and harvested without §6Third Eye§r. See §6Dictionary of Spirits§r for information on how to summon the trader.",
"jei.occultism.ingredient.otherworld_sapling_natural.description": "Primarily found in Otherworld Groves. Only visible while the status §6Third Eye§r is active. See §6Dictionary of Spirits§r for more information.",
"jei.occultism.ingredient.spawn_egg.familiar_goat.description": "The Goat Familiar can be obtained by feeding a Golden Apple to a Chimera Familiar. See §6Dictionary§r §6of§r §6Spirits§r for more information.",
"jei.occultism.ingredient.spawn_egg.familiar_shub_niggurath.description": "The Shub Niggurath Familiar can be obtained by bringing a Goat Familiar to a Forest Biome and clicking the Goat first with any Black Dye, then Flint and then an Eye of Ender. See §6Dictionary§r §6of§r §6Spirits§r for more information.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"title": "book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.intro.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.prerequisites.text",
"title": "book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.prerequisites.title",
"use_markdown_in_title": false
},
{
"type": "occultism:ritual_recipe",
"anchor": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3508,6 +3508,19 @@ private BookEntryModel makeSummonLumberjackEntry(CategoryEntryMap entryMap, char
The lumberjack will harvest trees in it's working area. If a deposit location is set it will collect the dropped items into the specified chest, and re-plant saplings.
""");

this.context().page("prerequisites");
var prerequisites = BookTextPageModel.builder()
.withTitle(this.context().pageTitle())
.withText(this.context().pageText())
.build();
this.lang.add(this.context().pageTitle(), "Prerequisites");
this.lang.add(this.context().pageText(),
"""
Summoning the lumberjack requires a [Stable Otherworld Sapling](item://occultism:otherworld_sapling). You can obtain it by summoning an [Otherworld Sapling Trader][Books of Calling](entry://summoning_rituals/summon_otherworld_sapling_trader).
"""
);


this.context().page("ritual");
var ritual = BookRitualRecipePageModel.builder()
.withRecipeId1(this.modLoc("ritual/summon_foliot_lumberjack"))
Expand Down Expand Up @@ -3559,6 +3572,7 @@ private BookEntryModel makeSummonLumberjackEntry(CategoryEntryMap entryMap, char
.withLocation(entryMap.get(icon))
.withPages(
intro,
prerequisites,
ritual,
bookOfCalling,
usage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2751,7 +2751,7 @@ private void addJeiTranslations() {
this.add("jei.occultism.ingredient.tallow.description", "Kill animals, such as \u00a72pigs\u00a7r, \u00a72cows\u00a7r, \u00a72sheep\u00a7r, \u00a72horses\u00a7r and \u00a72lamas\u00a7r with the Butcher Knife to obtain tallow.");
this.add("jei.occultism.ingredient.otherstone.description", "Primarily found in Otherworld Groves. Only visible while the status \u00a76Third Eye\u00a7r is active. See \u00a76Dictionary of Spirits\u00a7r for more information.");
this.add("jei.occultism.ingredient.otherworld_log.description", "Primarily found in Otherworld Groves. Only visible while the status \u00a76Third Eye\u00a7r is active. See \u00a76Dictionary of Spirits\u00a7r for more information.");
this.add("jei.occultism.ingredient.otherworld_sapling.description", "Primarily found in Otherworld Groves. Only visible while the status \u00a76Third Eye\u00a7r is active. See \u00a76Dictionary of Spirits\u00a7r for more information.");
this.add("jei.occultism.ingredient.otherworld_sapling.description", "Can be obtained from a Otherworld Sapling Trader. Can be seen and harvested without \u00a76Third Eye\u00a7r. See \u00a76Dictionary of Spirits\u00a7r for information on how to summon the trader.");
this.add("jei.occultism.ingredient.otherworld_sapling_natural.description", "Primarily found in Otherworld Groves. Only visible while the status \u00a76Third Eye\u00a7r is active. See \u00a76Dictionary of Spirits\u00a7r for more information.");
this.add("jei.occultism.ingredient.otherworld_leaves.description", "Primarily found in Otherworld Groves. Only visible while the status \u00a76Third Eye\u00a7r is active. See \u00a76Dictionary of Spirits\u00a7r for more information.");
this.add("jei.occultism.ingredient.iesnium_ore.description", "Found in the nether. Only visible while the status \u00a76Third\u00a7r \u00a76Eye\u00a7r is active. See \u00a76Dictionary\u00a7r \u00a76of\u00a7r \u00a76Spirits\u00a7r for more information.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"ingredients": [
{
"tag": "occultism:saplings/otherworld"
"item": "occultism:otherworld_sapling"
},
{
"item": "minecraft:oak_sapling"
Expand Down

0 comments on commit 088acec

Please sign in to comment.