diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index ee8647d36..70379505b 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -215,6 +215,8 @@ "book.occultism.dictionary_of_spirits.crafting_rituals.craft_budding_amethyst.spotlight.text": "Unlike other rituals, creating a [](item://minecraft:budding_amethyst) is a service provided by Wild Spirits and not bound any spirit to the final object. You sacrifice the items and the Wild Spirits uses his power to forge that item for you.\n", "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_matrix.name": "Dimensional Matrix", "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_matrix.spotlight.text": "The dimensional matrix is the entry point to a small dimension used for storing items. A [#](ad03fc)Djinni[#]() bound to the matrix keeps the dimension stable, often supported by additional spirits in storage stabilizers, to increase the dimension size.\n", + "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.config.text": " If you want to save your miners before they break, check \"Server Configuration > Items\". By setting the \"Save miners before breaking\" option to \"on\", a miner will go to the output of the dimensional mineshaft when it reaches 1 durability.\n", + "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.config.title": "Config", "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.description.text": "The dimensional mineshaft will discard any items it cannot store, so it is important to regularly empty the mineshaft, either manually, with hoppers or using a transporter spirit. Spirits in lamps can be **inserted** from the top, all other sides can be used to **extract** items.\n", "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.description.title": "Operation", "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.name": "Dimensional Mineshaft", @@ -448,6 +450,8 @@ "book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight2.text": "Multiple Demon's Dream fruits or seeds can be compressed into an essence that is much more potent. It *guarantees* the [#](ad03fc)Third Eye[#]() and provides it for a longer amount of time, but comes with a lot of (positive and negative) side effects.\n", "book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight3.text": "The essence can be purified in spirit fire (more on that later!) to obtain a version free from all negative side effects, while retaining the positive.\n", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.about_divination_rod.text": "The divination rod uses a spirit attuned gem attached to a wooden rod.\nThe gem resonates with the chosen material, and this movement is amplified by the wooden rod,\nallowing to detect nearby Otherworld materials. \n \n \nThe rod works by detecting resonance between real world and Otherworld materials.\nAttuned the rod to a real world material, and it will find the corresponding Otherworld block.\n", + "book.occultism.dictionary_of_spirits.getting_started.divination_rod.config.text": "An additional function of the Divination Rod is to locate any ore,\n however this is not a default function and needs to be enabled,\n as we recommend using the Theurgy mod for this type of divination.\n If you want to enable this feature directly in Occultism, check\n \"Server Configuration > Items\" and set \"Divination c:ores\" to \"on\".\n", + "book.occultism.dictionary_of_spirits.getting_started.divination_rod.config.title": "Extra Config", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.description": "Obtaining otherworld materials", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.divination_rod.text": "Otherworld materials play an important role in interacting with spirits.\nAs they are rare and not visible to the naked eye, finding them requires special tools.\nThe divination rod allows to find Otherworld materials based on their similarities to materials common to our world.\n", "book.occultism.dictionary_of_spirits.getting_started.divination_rod.divination_rod_screenshots.text": "White means nothing was found.\nThe more purple you see, the closer you are.\n", @@ -620,7 +624,7 @@ "book.occultism.dictionary_of_spirits.pentacles.brown_chalk.name": "The Cruelty Chalk", "book.occultism.dictionary_of_spirits.pentacles.brown_chalk.spotlight.text": "This chalk is known to be part of an \"Alignment Test.\" Anyone who possesses it is\n automatically classified as \"Evil.\" What kind of spirits will these glyphs attract?\n", "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.description": "Contact Eldritch", - "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.intro.text": "**Purpose:** Contact [#](AA00AA)Eldritch[#]()\\\n\\\nThis is a very strange pentacle that you dont understand for now.\n", + "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.intro.text": "**Purpose:** Contact [#](AA00AA)Eldritch[#]()\\\n\\\nThis is a very strange pentacle that you dont understand for now.\n\\\n\\\n**NOTE** Iron bar is not rendering in the world preview, just put one in the last brown pointed part.\n", "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.intro.title": "Ronazas Contact", "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.name": "Ronaza's Contact", "book.occultism.dictionary_of_spirits.pentacles.contact_eldritch_spirit.uses.text": "- [Eldritch Ancient Miner](entry://crafting_rituals/craft_ancient_miner)\n- [Reinforced Deepslate](entry://crafting_rituals/craft_reinforced_deepslate)\n", @@ -629,27 +633,27 @@ "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.intro.text": "**Purpose:** Contact [#](AA00AA)Wild Spirits[#]()\\\n\\\n**Osorins Unbound Calling** has a unique form, mixing different aspects obtained in each chalk\n and none of the common stabilizing paraphernalia. Therefore, the pentacle offers no protection\n to the occultist, but acts as an irresistible contact with the [#](AA00AA)Wild Spirits[#]().\n", "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.intro.title": "Osorins Unbound Calling", "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.name": "Osorin's Unbound Calling", - "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.uses.text": "- [Wither Skeleton Skull](entry://possession_rituals/wither_skull)\n- [Horde Husk](entry://possession_rituals/horde_husk)\n- [Horde Drowned](entry://possession_rituals/horde_drowned)\n- [Horde Creeper](entry://possession_rituals/horde_creeper)\n- [Horde Silverfish](entry://possession_rituals/horde_silverfish)\n- [Trial Key](entry://possession_rituals/possess_weak_breeze)\n- [Ominous Trial Key](entry://possession_rituals/possess_breeze)\n- [Heavy Core](entry://possession_rituals/possess_strong_breeze)\n- [Small Illager Invasion](entry://possession_rituals/horde_illager)\n- [Wild Armor Trim Smithing Template](entry://crafting_rituals/craft_wild_trim)\n- [Budding Amethyst](entry://crafting_rituals/craft_budding_amethyst)\n", + "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.uses.text": "- [Wither Skeleton Skull](entry://possession_rituals/wither_skull)\n- [Horde Husk](entry://possession_rituals/horde_husk)\n- [Horde Drowned](entry://possession_rituals/horde_drowned)\n- [Horde Creeper](entry://possession_rituals/horde_creeper)\n- [Horde Silverfish](entry://possession_rituals/horde_silverfish)\n- [Trial Key](entry://possession_rituals/possess_weak_breeze)\n- [Ominous Trial Key](entry://possession_rituals/possess_breeze)\n- [Heavy Core](entry://possession_rituals/possess_strong_breeze)\n- [Wild Illager Invasion](entry://possession_rituals/horde_illager)\n- [Wild Armor Trim Smithing Template](entry://crafting_rituals/craft_wild_trim)\n- [Budding Amethyst](entry://crafting_rituals/craft_budding_amethyst)\n", "book.occultism.dictionary_of_spirits.pentacles.contact_wild_spirit.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.description": "Afrit Infusing", + "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.description": "Afrit Infusion", "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.intro.text": "**Purpose:** Bind [#](AA00AA)Afrit[#]()\\\n\\\nFirst discovered by Grandmistress Sevira of Emberwoods, **Seviras Permanent Confinement** is used for\n binding [#](AA00AA)Afrit[#]() into objects. Due to the power of the spirits involved, this should be performed only by advanced summoners.\n\n", "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.intro.title": "Seviras Permanent Confinement", "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.name": "Sevira's Permanent Confinement", "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.uses.text": "- [Storage Stabilizer Tier 3](entry://crafting_rituals/craft_stabilizer_tier3)\n- [Afrit Deep Ore Miner](entry://crafting_rituals/craft_afrit_miner)\n- [Artisanal Ritual Satchel](entry://crafting_rituals/artisanal_ritual_satchel)\n- [Repair Items](entry://crafting_rituals/repair)\n", "book.occultism.dictionary_of_spirits.pentacles.craft_afrit.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.description": "Djinni Infusing", + "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.description": "Djinni Infusion", "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.intro.text": "**Purpose:** Bind [#](AA00AA)Djinni[#]()\\\n\\\n**Strigeors Higher Binding** is a pentacle for binding [#](AA00AA)Djinni[#]() into objects, should not be attempted by the\n novice summoner. Supported by skeleton skulls and stabilized by candles it is highly suitable for\n permanent infusions of objects with spirits.\n", "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.intro.title": "Strigeors Higher Binding", "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.name": "Strigeor's Higher Binding", "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.uses.text": "- [Infused Pickaxe](entry://crafting_rituals/craft_infused_pickaxe)\n- [Soul Gem](entry://crafting_rituals/craft_soul_gem)\n- [Familiar Ring](entry://crafting_rituals/craft_familiar_ring)\n- [Dimensional Matrix](entry://crafting_rituals/craft_dimensional_matrix)\n- [Storage Accessor](entry://crafting_rituals/craft_storage_remote)\n- [Storage Stabilizer Tier 2](entry://crafting_rituals/craft_stabilizer_tier2)\n- [Dimensional Mineshaft](entry://crafting_rituals/craft_dimensional_mineshaft)\n- [Djinni Ore Miner](entry://crafting_rituals/craft_djinni_miner)\n- [Apprentice Ritual Satchel](entry://crafting_rituals/apprentice_ritual_satchel)\n- [Repair Chalks](entry://crafting_rituals/repair)\n", "book.occultism.dictionary_of_spirits.pentacles.craft_djinni.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.description": "Foliot Infusing", + "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.description": "Foliot Infusion", "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.intro.text": "**Purpose:** Bind [#](AA00AA)Foliot[#]()\\\n\\\nAs a simple binding pentacle, **Eziveus Spectral Compulsion** is a common starting point for object\n infusion with lower spirits. The enchantment is made permanent by stabilizing candles.\n", "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.intro.title": "Eziveus Spectral Compulsion", "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.name": "Eziveus' Spectral Compulsion", "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.uses.text": "- [Infused Lenses](entry://crafting_rituals/craft_otherworld_goggles)\n- [Surprisingsly Substantial Satchel](entry://crafting_rituals/craft_satchel)\n- [Storage Actuator Base](entry://crafting_rituals/craft_storage_controller_base)\n- [Stable Wormhole](entry://crafting_rituals/craft_stable_wormhole)\n- [Storage Stabilizer Tier 1](entry://crafting_rituals/craft_stabilizer_tier1)\n- [Foliot Miner](entry://crafting_rituals/craft_foliot_miner)\n", "book.occultism.dictionary_of_spirits.pentacles.craft_foliot.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.craft_marid.description": "Marid Infusing", + "book.occultism.dictionary_of_spirits.pentacles.craft_marid.description": "Marid Infusion", "book.occultism.dictionary_of_spirits.pentacles.craft_marid.intro.text": "**Purpose:** Bind [#](AA00AA)Marid[#]()\\\n\\\n**Uphyxes Inverted Tower** is one of the few pentacles capable of binding [#](AA00AA)Marid[#]() into objects.\n Any rituals involving [#](AA00AA)Marid[#]() should be performed only by the most experienced summoners.\n", "book.occultism.dictionary_of_spirits.pentacles.craft_marid.intro.title": "Uphyxes Inverted Tower", "book.occultism.dictionary_of_spirits.pentacles.craft_marid.name": "Uphyxes Inverted Tower", @@ -659,12 +663,12 @@ "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.lore.text": "Almost lost to time, the cyan chalk brings ancient knowledge, often even forbidden.\n But who cares? After all, knowledge is knowledge, and the more, the better, right?\n", "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.lore.title": "In the Past", "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.name": "The Chalk From Ancients", - "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.recipe_impure.text": "Pulverize the [#](FF55FF)Echo Shard[#]() keeping their properties is a job that only the best crusher can do.\n", + "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.recipe_impure.text": "\"Pulverizing an [#](FF55FF)Echo Shard[#]() while retaining its properties is a job that only the best crushers can do.\n", "book.occultism.dictionary_of_spirits.pentacles.cyan_chalk.spotlight.text": "Despite the complexity of its manufacture, this chalk is dated as one of the oldest,\n perhaps even the oldest chalk ever recorded. And even after all this time,\n its uses are little known, but you can see just how stable it is.\n", "book.occultism.dictionary_of_spirits.pentacles.didactics.description": "Basic learning", "book.occultism.dictionary_of_spirits.pentacles.didactics.intro.text": " This category is a roadmap that guides you step by step, follow the unlocked entries.\\\n \\\n**Tip:** By default, to set up all pentacles, you need four 19x19 areas.\n", "book.occultism.dictionary_of_spirits.pentacles.didactics.intro.title": "About", - "book.occultism.dictionary_of_spirits.pentacles.didactics.name": "Reading this category", + "book.occultism.dictionary_of_spirits.pentacles.didactics.name": "Reading this Section", "book.occultism.dictionary_of_spirits.pentacles.didactics.table.text": "This category is organized as a table.\\\n Each line refers to a type of ritual.\\\n And each column represents a tier.\\\n By following the line you can just upgrade the pentacle you drew before,\n working like the previous and the new one.\n", "book.occultism.dictionary_of_spirits.pentacles.didactics.table.title": "Types and Tier", "book.occultism.dictionary_of_spirits.pentacles.gray_chalk.description": "Gray Chalk", @@ -675,13 +679,13 @@ "book.occultism.dictionary_of_spirits.pentacles.green_chalk.description": "Green Chalk", "book.occultism.dictionary_of_spirits.pentacles.green_chalk.lore.text": "The green chalk uses herbal concentrate to bring the energies of flora into the pentacles.\n", "book.occultism.dictionary_of_spirits.pentacles.green_chalk.lore.title": "Wildness", - "book.occultism.dictionary_of_spirits.pentacles.green_chalk.name": "The Nature Chalk, specifically The Flora Chalk", + "book.occultism.dictionary_of_spirits.pentacles.green_chalk.name": "The Plant Chalk", "book.occultism.dictionary_of_spirits.pentacles.green_chalk.spotlight.text": "This connection with nature makes the green chalk ideal for attracting wild spirits.\n", "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.description": "Light Blue Chalk", "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.lore.text": "The light blue chalk is made with such icy materials that its glyphs\n are inert and impart a natural stability to the pentacles.\n", - "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.lore.title": "Never Melt", - "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.name": "The Glaced Chalk", - "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.recipe_impure.text": "Crushing ice without melting it is a job a Foliot can't do, so you need a better crusher.\n", + "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.lore.title": "Never Melts", + "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.name": "The Glacial Chalk", + "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.recipe_impure.text": "Crushing ice without melting it is a job a Foliot can't do, so you'll need a better crusher.\n", "book.occultism.dictionary_of_spirits.pentacles.light_blue_chalk.spotlight.text": "Although it is basically made of ice, the magic present prevents it from melting.\n", "book.occultism.dictionary_of_spirits.pentacles.light_gray_chalk.description": "Light Gray Chalk", "book.occultism.dictionary_of_spirits.pentacles.light_gray_chalk.lore.text": "The light gray chalk uses mineral compounds to enhance the foundation of a pentacle.\n The foundation is an important property, often considered the stabilization of the \"core.\"\n", @@ -689,9 +693,9 @@ "book.occultism.dictionary_of_spirits.pentacles.light_gray_chalk.name": "Decent Foundation Chalk", "book.occultism.dictionary_of_spirits.pentacles.light_gray_chalk.spotlight.text": "Due to its relatively low cost and inherent magical properties, it is the most common\n foundation option among practitioners of occultism, capable of replacing white chalk\n in almost all pentacles.\n", "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.description": "Lime Chalk", - "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.lore.text": "The lime chalk attracts spirits beyond Folio.\n Anyone wishing to elevate the level of their rituals will need this chalk.\n", + "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.lore.text": "The lime chalk attracts greater spirits than Foliots.\n Anyone wishing to elevate the level of their rituals will need this chalk.\n", "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.lore.title": "Getting Experience", - "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.name": "First Tier Increase Chalk", + "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.name": "The Knowledge Chalk", "book.occultism.dictionary_of_spirits.pentacles.lime_chalk.spotlight.text": "Made with valuable gems infused with experiences, lime glyphs become especially\n interesting to demonstrate that yours skills have surpassed the basic level.\n", "book.occultism.dictionary_of_spirits.pentacles.magenta_chalk.description": "Magenta Chalk", "book.occultism.dictionary_of_spirits.pentacles.magenta_chalk.lore.text": "All the power of a dragon in a single chalk: this is the marvel of the purple chalk.\n The relationship between spirits and dragons is unclear, but there may definitely be connections.\n", @@ -702,7 +706,7 @@ "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.description": "Orange Chalk", "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.lore.text": "The orange chalk is a perfect bait for spirits of the Afrit class, who,\n although impressed by the lime chalk, can resist its call.\n", "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.lore.title": "Afrit Attractive", - "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.name": "The Little Hot Chalk", + "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.name": "The Tangy Chalk", "book.occultism.dictionary_of_spirits.pentacles.orange_chalk.spotlight.text": "Being a sweet and slightly warm chalk, it does not guarantee control over the invoked Afrit.\n Commanding an Afrit requires power directly related to its class of spirits and\n extreme stability in the pentacle.\n", "book.occultism.dictionary_of_spirits.pentacles.paraphernalia.candle.text": "Candles increase the stability of the pentacle, thus allowing a slowed essence decay of the summoned\n spirit, leading to a longer lifetime of the spirit, or possessed object or being.\n", "book.occultism.dictionary_of_spirits.pentacles.paraphernalia.crystal.text": "Crystals increase the stability of the pentacle, at levels that candles would not reach, allowing a performing more unstable rituals.\\\n\\\nCheck the recipes in next page.\n", @@ -727,13 +731,13 @@ "book.occultism.dictionary_of_spirits.pentacles.pink_chalk.lore.title": "It's Alive", "book.occultism.dictionary_of_spirits.pentacles.pink_chalk.name": "The Meat Chalk?", "book.occultism.dictionary_of_spirits.pentacles.pink_chalk.spotlight.text": "Some occultists have reported that the demonic flesh keeps the chalk alive,\n resulting in strange movements. However, this has never been officially\n documented or proven, remaining merely rumors that may or may not be true.\n", - "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.description": "Possessing Afrit", + "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.description": "Afrit Possession", "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.intro.text": "**Purpose:** [#](AA00AA)Afrit[#]() Possession\\\n\\\n**Abras Commanding Conjure** is a modified version in the possession geometry of [#](FF55FF)Abras Conjure[#]() that allows\n possessing entities, and thus summoning familiars.\n", "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.intro.title": "Abras Commanding Conjure", "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.name": "Abras' Commanding Conjure", "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.uses.text": "- [Guardian Familiar](entry://familiar_rituals/familiar_guardian)\n- [Possessed Shulker](entry://possession_rituals/possess_shulker)\n- [Possessed Elder Guardian](entry://possession_rituals/possess_elder_guardian)\n- [Possessed Hoglin](entry://possession_rituals/possess_hoglin)\n", "book.occultism.dictionary_of_spirits.pentacles.possess_afrit.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.description": "Possessing Djinni", + "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.description": "Djinni Possession", "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.intro.text": "**Purpose:** [#](AA00AA)Djinni[#]() Possession\\\n\\\n**Ihagans Enthrallment** forces [#](AA00AA)Djinni[#]() to possess a nearby Creature. This pentacle is very versatile\n for imprisonment, allowing you to summon more powerful Spirits and Creatures.\n", "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.intro.title": "Ihagans Enthrallment", "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.name": "Ihagan's Enthrallment", @@ -741,28 +745,28 @@ "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.uses.title": "Uses", "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.uses2.text": "- [Headless Ratman Familiar](entry://familiar_rituals/familiar_headless)\n- [Beholder Familiar](entry://familiar_rituals/familiar_beholder)\n- [Fairy Familiar](entry://familiar_rituals/familiar_fairy)\n- [Chimera Familiar](entry://familiar_rituals/familiar_chimera)\n- [Mummy Familiar](entry://familiar_rituals/familiar_mummy)\n", "book.occultism.dictionary_of_spirits.pentacles.possess_djinni.uses2.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.description": "Possessing Foliot", + "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.description": "Foliot Possession", "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.intro.text": "**Purpose:** [#](AA00AA)Foliot[#]() Possession\\\n\\\n**Hedyrins Lure** attracts [#](AA00AA)Foliot[#]() and forces them to possess a nearby Creature. This pentacle can\n perform basic possessions, bringing back only low-power Spirits and Possessed Creatures.\n", "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.intro.title": "Hedyrins Lure", "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.name": "Hedyrin's Lure", "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.uses.text": "- [Possessed Endermite](entry://possession_rituals/possess_endermite)\n- [Possessed Skeleton](entry://possession_rituals/possess_skeleton)\n- [Possessed Witch](entry://possession_rituals/possess_witch)\n- [Possessed Phantom](entry://possession_rituals/possess_phantom)\n- [Unbound Parrot](entry://possession_rituals/possess_unbound_parrot)\n- [Random Animal](entry://possession_rituals/possess_random_animal)\n- [Parrot Familiar](entry://familiar_rituals/familiar_parrot)\n- [Greedy Familiar](entry://familiar_rituals/familiar_greedy)\n- [Deer Familiar](entry://familiar_rituals/familiar_deer)\n- [Blacksmith Familiar](entry://familiar_rituals/familiar_blacksmith)\n- [Beaver Familiar](entry://familiar_rituals/familiar_beaver)\n", "book.occultism.dictionary_of_spirits.pentacles.possess_foliot.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.possess_marid.description": "Possessing Marid", + "book.occultism.dictionary_of_spirits.pentacles.possess_marid.description": "Marid Possession", "book.occultism.dictionary_of_spirits.pentacles.possess_marid.intro.text": "**Purpose:** [#](AA00AA)Marid[#]() Possession\\\n\\\n**Xeovrenth Adjure** is a powerful pentacle, allowing to possessing [#](AA00AA)Marid[#]() in extremely dangerous rituals.\n", "book.occultism.dictionary_of_spirits.pentacles.possess_marid.intro.title": "Xeovrenth Adjure", "book.occultism.dictionary_of_spirits.pentacles.possess_marid.name": "Xeovrenth Adjure", "book.occultism.dictionary_of_spirits.pentacles.possess_marid.uses.text": "- [Cruelty Essence](entry://possession_rituals/possess_goat)\n", "book.occultism.dictionary_of_spirits.pentacles.possess_marid.uses.title": "Uses", - "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.description": "Possessing Unbound Afrit", + "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.description": "Unbound Afrit Possession", "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.intro.text": "**Purpose:** [#](AA00AA)Unbound Afrit[#]() Possession\\\n\\\n**Abras Open Commanding Conjure** is a simplified version of [#](AA00AA)Abras Commanding Conjure[#](), allowing you to forces [#](AA00AA)Afrit[#]() to possess a nearby Creature without red chalk.\n Due to the very reduced power of the Pentacle its limited in use.\n", "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.intro.title": "Abras Open Commanding Conjure", "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.name": "Abras' Open Commanding Conjure", - "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.uses.text": "- [Possessed Pig](entry://possession_rituals/possess_zombie_piglin)\n", + "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.uses.text": "- [Possessed Zombified Piglin](entry://possession_rituals/possess_zombie_piglin)\n", "book.occultism.dictionary_of_spirits.pentacles.possess_unbound_afrit.uses.title": "Uses", "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.description": "Purple Chalk", "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.lore.text": "The purple chalk is extremely important for those wishing to perform infusions,\n serving as the main glyph in this type of ritual.\n", "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.lore.title": "Infusing", - "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.name": "The Chalk to Infusion", + "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.name": "The Chalk of Infusion", "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.recipe_impure.text": "You do not need to visit the [#](FF55FF)The End[#]() to obtain Endstone. You can summon a\n [Possessed Endermite](entry://possession_rituals/possess_endermite) which has a high chance to drop it.\n", "book.occultism.dictionary_of_spirits.pentacles.purple_chalk.spotlight.text": "Infusions are an extremely different type of ritual, as while summoning and possession\n bring living creatures into the world, infusion creates objects bound to spirits.\n", "book.occultism.dictionary_of_spirits.pentacles.red_chalk.description": "Red Chalk", @@ -821,7 +825,7 @@ "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.description": "Yellow Chalk", "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.lore.text": "The yellow chalk, also known as golden chalk, brings a sparkle to the eyes of those who\n engage in possessions, serving as the main glyph in this type of ritual.\n", "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.lore.title": "Possessing", - "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.name": "The Chalk to Possession", + "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.name": "The Chalk of Possession", "book.occultism.dictionary_of_spirits.pentacles.yellow_chalk.spotlight.text": "Possessions are a variation of summoning, caused by a transformation in geometry and\n the addition of yellow glyphs, allowing spirits to manifest in bodies (material prisons)\n different from their usual ones.\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_creeper.description.text": "Creeper summoned in this ritual are CHARGED and will drop 1-3 of these discs: [](item://minecraft:music_disc_13), [](item://minecraft:music_disc_cat), [](item://minecraft:music_disc_blocks), [](item://minecraft:music_disc_chirp), [](item://minecraft:music_disc_far), [](item://minecraft:music_disc_mall), [](item://minecraft:music_disc_mellohi), [](item://minecraft:music_disc_stal), [](item://minecraft:music_disc_strad), [](item://minecraft:music_disc_ward), [](item://minecraft:music_disc_11), [](item://minecraft:music_disc_wait).\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_creeper.entity.text": "**Drops**: Discs that the normal creeper drops when killed by Skeleton (See next page);\n", @@ -832,9 +836,9 @@ "book.occultism.dictionary_of_spirits.possession_rituals.horde_husk.description.text": "Husks summoned by this way can drop: [](item://minecraft:dune_armor_trim_smithing_template), [](item://minecraft:archer_pottery_sherd), [](item://minecraft:miner_pottery_sherd), [](item://minecraft:prize_pottery_sherd), [](item://minecraft:skull_pottery_sherd), [](item://minecraft:arms_up_pottery_sherd), [](item://minecraft:brewer_pottery_sherd).\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_husk.entity.text": "**Drops**: Items related to desert trials (See next page);\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_husk.name": "Wild Horde Husk", - "book.occultism.dictionary_of_spirits.possession_rituals.horde_illager.description.text": "Summon a possessed Evoker and his henchmen to get [](item://minecraft:totem_of_undying), [](item://minecraft:vex_armor_trim_smithing_template) and [](item://minecraft:sentry_armor_trim_smithing_template).\n", + "book.occultism.dictionary_of_spirits.possession_rituals.horde_illager.description.text": "Summon a Wild Evoker and his henchmen to get [](item://minecraft:totem_of_undying), [](item://minecraft:vex_armor_trim_smithing_template) and [](item://minecraft:sentry_armor_trim_smithing_template).\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_illager.entity.text": " **Drops**: [](item://minecraft:totem_of_undying)\n", - "book.occultism.dictionary_of_spirits.possession_rituals.horde_illager.name": "Mini Illager Invasion", + "book.occultism.dictionary_of_spirits.possession_rituals.horde_illager.name": "Wild Illager Invasion", "book.occultism.dictionary_of_spirits.possession_rituals.horde_silverfish.description.text": "Silverfish summoned by this way can drop: [](item://minecraft:music_disc_relic), [](item://minecraft:host_armor_trim_smithing_template), [](item://minecraft:raiser_armor_trim_smithing_template), [](item://minecraft:shaper_armor_trim_smithing_template), [](item://minecraft:wayfinder_armor_trim_smithing_template), [](item://minecraft:burn_pottery_sherd), [](item://minecraft:danger_pottery_sherd), [](item://minecraft:friend_pottery_sherd), [](item://minecraft:heart_pottery_sherd), [](item://minecraft:heartbreak_pottery_sherd), [](item://minecraft:howl_pottery_sherd), [](item://minecraft:sheaf_pottery_sherd).\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_silverfish.entity.text": "**Drops**: Items related to ruins trials (See next page);\n", "book.occultism.dictionary_of_spirits.possession_rituals.horde_silverfish.name": "Wild Horde Silverfish", @@ -845,7 +849,7 @@ "book.occultism.dictionary_of_spirits.possession_rituals.possess_bee.description.text": "In this ritual an [#](ad03fc)djinni[#]() will possess an [#](ad03fc)Bee[#](), Be careful,\n a bee invoked by this way does not lose its stinger, always poison the target,\n attacks faster and can summon other bees when it takes damage.\n This is the only known method to obtain [](item://occultism:cursed_honey), eating will grants\n a short regeneration buff.\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_bee.entity.text": " **Drops**: [](item://occultism:cursed_honey);\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_bee.name": "Possessed Bee", - "book.occultism.dictionary_of_spirits.possession_rituals.possess_breeze.description.text": "The Possessed Breeze has intrinsic Ominous Essence causing a drop of [](item://minecraft:ominous_trial_key). The [](item://minecraft:breeze_rod) form this enemy can survive after the battle and the extra loot is: [](item://minecraft:bolt_armor_trim_smithing_template), [](item://minecraft:guster_banner_pattern) and [](item://minecraft:music_disc_precipice).\n", + "book.occultism.dictionary_of_spirits.possession_rituals.possess_breeze.description.text": "The Wild Breeze has intrinsic Ominous Essence causing a drop of [](item://minecraft:ominous_trial_key). The [](item://minecraft:breeze_rod) form this enemy can survive after the battle and the extra loot is: [](item://minecraft:bolt_armor_trim_smithing_template), [](item://minecraft:guster_banner_pattern) and [](item://minecraft:music_disc_precipice).\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_breeze.entity.text": " **Drops**: 1x [](item://minecraft:ominous_trial_key) and can drop other things (See next page);\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_breeze.name": "In the chamber", "book.occultism.dictionary_of_spirits.possession_rituals.possess_elder_guardian.description.text": "In this ritual a [#](ad03fc)Elder Guardian[#]() is spawned using the life energy of a [#](ad03fc)Fish[#]() and immediately possessed by the summoned [#](ad03fc)Afrit[#](). The [#](ad03fc)Possessed Elder Guardian[#]() will always drop at least one [](item://minecraft:nautilus_shell), having a chance to drop [](item://minecraft:heart_of_the_sea) and a lot of things that normal Elder Guardian drops.\n", @@ -879,7 +883,7 @@ "book.occultism.dictionary_of_spirits.possession_rituals.possess_skeleton.description.text": "In this ritual an [#](ad03fc)Skeleton[#]() is spawned using the life energy of a [#](ad03fc)Chicken[#]() and possessed by a [#](ad03fc)Foliot[#](). The [#](ad03fc)Possessed Skeleton[#]() will be immune to daylight and always drop at least one [](item://minecraft:skeleton_skull) when killed.\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_skeleton.entity.text": "**Drops**: 1x [](item://minecraft:skeleton_skull)\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_skeleton.name": "Possessed Skeleton", - "book.occultism.dictionary_of_spirits.possession_rituals.possess_strong_breeze.description.text": "The Possessed Strong Breeze is 'Flow-Forged', granting a powerful version of the regular Breeze. This is the final target to obtain a [](item://minecraft:heavy_core) and as a bonus, you can get: [](item://minecraft:flow_armor_trim_smithing_template), [](item://minecraft:flow_banner_pattern), [](item://minecraft:flow_pottery_sherd) and [](item://minecraft:music_disc_creator).\n", + "book.occultism.dictionary_of_spirits.possession_rituals.possess_strong_breeze.description.text": "The Wild Strong Breeze is 'Flow-Forged', granting a powerful version of the regular Breeze. This is the final target to obtain a [](item://minecraft:heavy_core) and as a bonus, you can get: [](item://minecraft:flow_armor_trim_smithing_template), [](item://minecraft:flow_banner_pattern), [](item://minecraft:flow_pottery_sherd) and [](item://minecraft:music_disc_creator).\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_strong_breeze.entity.text": " **Drops**: 1x [](item://minecraft:heavy_core) and can drop other things (See next page);\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_strong_breeze.name": "Glorious Vault", "book.occultism.dictionary_of_spirits.possession_rituals.possess_unbound_otherworld_bird.description.text": "See [Drikwing Familiar](entry://familiar_rituals/familiar_otherworld_bird) for more information.\n", @@ -892,7 +896,7 @@ "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.description.text": "In this ritual a [#](ad03fc)Warden[#]() is spawned using the life energy of a [#](ad03fc)Axolotl[#]() and immediately possessed by the summoned [#](ad03fc)Djinni[#](). The [#](ad03fc)Possessed Warden[#]() will always drop at least six [](item://minecraft:echo_shard) when killed and as a chance to drop [](item://minecraft:disc_fragment_5), [](item://minecraft:music_disc_otherside), [](item://minecraft:silence_armor_trim_smithing_template), [](item://minecraft:ward_armor_trim_smithing_template). If you try to escape, this possessed Warden will go to the floor like a normal warden.\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.entity.text": "**Drops**: 6-9x [](item://minecraft:echo_shard)\nand items related to ancient city;\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.name": "Possessed Warden", - "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_breeze.description.text": "[](item://minecraft:breeze_rod) cannot be obtained from Possessed Weak Breeze rods due to their fragile nature, but this version of Breeze hides some treasures and has a chance to drop: [](item://minecraft:guster_pottery_sherd), [](item://minecraft:scrape_pottery_sherd), [](item://minecraft:music_disc_creator_music_box) and [](item://minecraft:ominous_bottle).\n", + "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_breeze.description.text": "[](item://minecraft:breeze_rod) cannot be obtained from Wild Weak Breeze rods due to their fragile nature, but this version of Breeze hides some treasures and has a chance to drop: [](item://minecraft:guster_pottery_sherd), [](item://minecraft:scrape_pottery_sherd), [](item://minecraft:music_disc_creator_music_box) and [](item://minecraft:ominous_bottle).\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_breeze.entity.text": " **Drops**: 1x [](item://minecraft:trial_key) and can drop other things (See next page);\n", "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_breeze.name": "The first key", "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_shulker.description.text": "In this ritual a [#](ad03fc)Shulker[#]() is spawned using the life energy of a [#](ad03fc)Cube Mob[#]() and immediately possessed by the summoned [#](ad03fc)Djinni[#](). The [#](ad03fc)Possessed Weak Shulker[#]() will always drop at least one [](item://minecraft:chorus_fruit) when killed and as a chance to drop [](item://minecraft:shulker_shell). You can use vanilla shulker multiplication to get normal shulkers with more chance to drop their shells.\n", @@ -907,7 +911,7 @@ "book.occultism.dictionary_of_spirits.possession_rituals.return_to_rituals.name": "Return to Rituals Category", "book.occultism.dictionary_of_spirits.possession_rituals.wither_skull.intro.text": "Besides venturing into nether dungeons, there is one more way to get these skulls. The legendary [#](ad03fc)Wild Hunt[#]() consists of [#](ad03fc)Greater Spirits[#]() taking the form of wither skeletons. While summoning the Wild Hunt is incredibly dangerous, it is the fastest way to get wither skeleton skulls.\n", "book.occultism.dictionary_of_spirits.possession_rituals.wither_skull.intro.title": "Wither Skeleton Skull", - "book.occultism.dictionary_of_spirits.possession_rituals.wither_skull.name": "Wither Skeleton Skull", + "book.occultism.dictionary_of_spirits.possession_rituals.wither_skull.name": "Wild Hunt", "book.occultism.dictionary_of_spirits.rituals.crafting_rituals.name": "Binding Rituals", "book.occultism.dictionary_of_spirits.rituals.familiar_rituals.name": "Familiar Rituals", "book.occultism.dictionary_of_spirits.rituals.item_use.intro.text": "Some rituals require the use of certain items to be performed. Use the item described on the ritual's page within **16 blocks** of the [](item://occultism:golden_sacrificial_bowl) to proceed with the ritual.\n\\\n\\\n**Important:** Before using the item, start the ritual. Grey particles indicate that the ritual is ready for the item use.\n", @@ -926,7 +930,7 @@ "book.occultism.dictionary_of_spirits.rituals.sacrifice.intro.title": "Sacrifices", "book.occultism.dictionary_of_spirits.rituals.sacrifice.name": "Sacrifices", "book.occultism.dictionary_of_spirits.rituals.summoning_rituals.name": "Summoning Rituals", - "book.occultism.dictionary_of_spirits.spirits.essence_decay.affected_spirits.text": "Only tier 1 spirits are affected by essence decay, by default. All higher tiers are immune and will not despawn. Modpacks may modify this behaviour.\n", + "book.occultism.dictionary_of_spirits.spirits.essence_decay.affected_spirits.text": "Only trader, time and weather spirits are affected by essence decay, by default. All others are immune and will not despawn. Modpacks may modify this behaviour.\n", "book.occultism.dictionary_of_spirits.spirits.essence_decay.affected_spirits.title": "Affected Spirits", "book.occultism.dictionary_of_spirits.spirits.essence_decay.countermeasures.text": "The summoner can slow or even stop essence decay by binding the spirit into an object, or summoning it into a living being. Additionally the pentacle used can influence the effects of essence decay to a degree.\n", "book.occultism.dictionary_of_spirits.spirits.essence_decay.countermeasures.title": "Countermeasures", @@ -1030,7 +1034,7 @@ "book.occultism.dictionary_of_spirits.summoning_rituals.marid_essence.intro.title": "Marid Essence", "book.occultism.dictionary_of_spirits.summoning_rituals.marid_essence.name": "Marid Essence", "book.occultism.dictionary_of_spirits.summoning_rituals.name": "Summoning Rituals", - "book.occultism.dictionary_of_spirits.summoning_rituals.overview.intro.text": "Summon rituals force spirits to enter this world in their chosen shape, leading to little restrictions on their power, but expose them to essence decay. Summoned spirits range from trade spirits that trade and convert items, to slave-like helpers for manual labour.\n", + "book.occultism.dictionary_of_spirits.summoning_rituals.overview.intro.text": "Summon rituals force spirits to enter this world in their chosen shape, leading to little restrictions on their power. Summoned spirits range from trade spirits that trade and convert items, to slave-like helpers for manual labour.\n", "book.occultism.dictionary_of_spirits.summoning_rituals.overview.intro.title": "Summoning Rituals", "book.occultism.dictionary_of_spirits.summoning_rituals.overview.name": "Summoning Rituals", "book.occultism.dictionary_of_spirits.summoning_rituals.return_to_rituals.name": "Return to Rituals Category", @@ -1048,13 +1052,13 @@ "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t1.intro.text": "The foliot crusher is the most basic crusher spirit.\n\\\n\\\nIt will crush **one** ore into **two** corresponding dusts.\n", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t1.intro.title": "Foliot Crusher", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t1.name": "Summon Foliot Crusher", - "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t2.intro.text": "The djinni crusher is resistant essence decay and faster and more efficient than the foliot crusher.\n\\\n\\\nIt will crush **one** ore into **three** corresponding dusts.\n", + "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t2.intro.text": "The djinni crusher is faster, more efficient and proficient than the foliot crusher.\nAllowing ice to be crushed without melting.\n\\\nIt will crush **one** ore into **three** corresponding dusts.\n", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t2.intro.title": "Djinni Crusher", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t2.name": "Summon Djinni Crusher", - "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t3.intro.text": "The afrit crusher is resistant to essence decay and faster and more efficient than the djinni crusher.\n\\\n\\\nIt will crush **one** ore into **four** corresponding dusts.\n", + "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t3.intro.text": "The afrit crusher is faster and more efficient than the djinni crusher.\n\\\n\\\nIt will crush **one** ore into **four** corresponding dusts.\n", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t3.intro.title": "Afrit Crusher", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t3.name": "Summon Afrit Crusher", - "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t4.intro.text": "The marid crusher is resistant to essence decay and faster and more efficient than the afrit crusher.\n\\\n\\\nIt will crush **one** ore into **six** corresponding dusts.\n", + "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t4.intro.text": "The marid crusher is faster, more efficient and proficient than the afrit crusher.\nAllowing crushing the echo shard while maintaining its properties.\n\\\nIt will crush **one** ore into **six** corresponding dusts.\n", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t4.intro.title": "Marid Crusher", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_crusher_t4.name": "Summon Marid Crusher", "book.occultism.dictionary_of_spirits.summoning_rituals.summon_lumberjack.book_of_calling.text": "If you lose the book of calling, you can craft a new one.\n[#](ad03fc)Shift-right-click[#]() the spirit with the crafted book to assign it.\n", @@ -1487,7 +1491,7 @@ "item.occultism.ritual_dummy.craft_storage_remote": "Ritual: Craft Storage Accessor", "item.occultism.ritual_dummy.craft_storage_remote.tooltip": "The Storage Accessor can be linked to a Storage Actuator to remotely access items.", "item.occultism.ritual_dummy.craft_witherite_dust": "Ritual: Craft Witherite Dust", - "item.occultism.ritual_dummy.craft_witherite_dust.tooltip": "A afrit will infuse wither essence in the netherite dust.", + "item.occultism.ritual_dummy.craft_witherite_dust.tooltip": "An afrit will infuse netherite dust with wither essence.", "item.occultism.ritual_dummy.custom_ritual_craft": "Custom Ritual Dummy", "item.occultism.ritual_dummy.custom_ritual_craft.tooltip": "Used for modpacks as a fallback for custom rituals that do not have their own ritual item.", "item.occultism.ritual_dummy.custom_ritual_misc": "Custom Ritual Dummy", @@ -1535,57 +1539,57 @@ "item.occultism.ritual_dummy.misc_wild_trim": "Ritual: Forge Wild Armor Trim Smithing Template", "item.occultism.ritual_dummy.misc_wild_trim.tooltip": "Wild Spirits will forge a Wild Armor Trim Smithing Template.", "item.occultism.ritual_dummy.possess_bee": "Ritual: Summon Possessed Bee", - "item.occultism.ritual_dummy.possess_bee.tooltip": "The possessed Bee will drop cursed honey.", + "item.occultism.ritual_dummy.possess_bee.tooltip": "The Possessed Bee will drop cursed honey.", "item.occultism.ritual_dummy.possess_elder_guardian": "Ritual: Summon Possessed Elder Guardian", - "item.occultism.ritual_dummy.possess_elder_guardian.tooltip": "The possessed elder guardian will drop at least one nautilus shell when killed, also can drop heart of the sea and the commom drops.", + "item.occultism.ritual_dummy.possess_elder_guardian.tooltip": "The Possessed Elder Guardian will drop at least one nautilus shell when killed, also can drop heart of the sea and the commom drops.", "item.occultism.ritual_dummy.possess_enderman": "Ritual: Summon Possessed Enderman", - "item.occultism.ritual_dummy.possess_enderman.tooltip": "The possessed Enderman will always drop at least one ender pearl when killed.", + "item.occultism.ritual_dummy.possess_enderman.tooltip": "The Possessed Enderman will always drop at least one ender pearl when killed.", "item.occultism.ritual_dummy.possess_endermite": "Ritual: Summon Possessed Endermite", - "item.occultism.ritual_dummy.possess_endermite.tooltip": "The possessed Endermite drops End Stone.", + "item.occultism.ritual_dummy.possess_endermite.tooltip": "The Possessed Endermite drops End Stone.", "item.occultism.ritual_dummy.possess_ghast": "Ritual: Summon Possessed Ghast", - "item.occultism.ritual_dummy.possess_ghast.tooltip": "The possessed Ghast will always drop at least one ghast tear when killed.", + "item.occultism.ritual_dummy.possess_ghast.tooltip": "The Possessed Ghast will always drop at least one ghast tear when killed.", "item.occultism.ritual_dummy.possess_goat": "Ritual: Summon Goat of Mercy", "item.occultism.ritual_dummy.possess_goat.tooltip": "The Goat of Mercy will drop the Cruelty Essence.", "item.occultism.ritual_dummy.possess_hoglin": "Ritual: Summon Possessed Hoglin", - "item.occultism.ritual_dummy.possess_hoglin.tooltip": "The possessed Hoglin has a chance to drop smithing template of netherite upgrade when killed.", + "item.occultism.ritual_dummy.possess_hoglin.tooltip": "The Possessed Hoglin has a chance to drop smithing template of netherite upgrade when killed.", "item.occultism.ritual_dummy.possess_phantom": "Ritual: Summon Possessed Phantom", - "item.occultism.ritual_dummy.possess_phantom.tooltip": "The possessed Phantom will always drop at least one phantom membrane when killed and is easy to trap.", + "item.occultism.ritual_dummy.possess_phantom.tooltip": "The Possessed Phantom will always drop at least one phantom membrane when killed and is easy to trap.", "item.occultism.ritual_dummy.possess_random_animal": "Ritual: Summon Random Animal", "item.occultism.ritual_dummy.possess_random_animal.tooltip": "Summons a random passive animal.", "item.occultism.ritual_dummy.possess_shulker": "Ritual: Summon Possessed Shulker", - "item.occultism.ritual_dummy.possess_shulker.tooltip": "The possessed Shulker will always drop at least one shulker shell when killed.", + "item.occultism.ritual_dummy.possess_shulker.tooltip": "The Possessed Shulker will always drop at least one shulker shell when killed.", "item.occultism.ritual_dummy.possess_skeleton": "Ritual: Summon Possessed Skeleton", - "item.occultism.ritual_dummy.possess_skeleton.tooltip": " The possessed Skeleton is immune to daylight and always drop at least one Skeleton Skull when killed.", + "item.occultism.ritual_dummy.possess_skeleton.tooltip": " The Possessed Skeleton is immune to daylight and always drop at least one Skeleton Skull when killed.", "item.occultism.ritual_dummy.possess_unbound_otherworld_bird": "Ritual: Possess Unbound Drikwing", "item.occultism.ritual_dummy.possess_unbound_otherworld_bird.tooltip": "Possess a Drikwing Familiar that can be tamed by anyone, not just the summoner.", "item.occultism.ritual_dummy.possess_unbound_parrot": "Ritual: Possess Unbound Parrot", "item.occultism.ritual_dummy.possess_unbound_parrot.tooltip": "Possess a Parrot that can be tamed by anyone, not just the summoner.", "item.occultism.ritual_dummy.possess_warden": "Ritual: Summon Possessed Warden", - "item.occultism.ritual_dummy.possess_warden.tooltip": "The possessed Warden will always drop at least six echo shard and can drop anothers ancient stuff (smithing templates and discs) when killed.", + "item.occultism.ritual_dummy.possess_warden.tooltip": "The Possessed Warden will always drop at least six echo shard and can drop anothers ancient stuff (smithing templates and discs) when killed.", "item.occultism.ritual_dummy.possess_weak_shulker": "Ritual: Summon Possessed Weak Shulker", - "item.occultism.ritual_dummy.possess_weak_shulker.tooltip": "The possessed Weak Shulker will drop at least one chorus fruit when killed and can drop shulker shell.", + "item.occultism.ritual_dummy.possess_weak_shulker.tooltip": "The Possessed Weak Shulker will drop at least one chorus fruit when killed and can drop shulker shell.", "item.occultism.ritual_dummy.possess_witch": "Ritual: Summon Possessed Witch", - "item.occultism.ritual_dummy.possess_witch.tooltip": "The possessed Witch will drop a special filled bottle.", - "item.occultism.ritual_dummy.possess_zombie_piglin": "Ritual: Summon Possessed Zombie Piglin", - "item.occultism.ritual_dummy.possess_zombie_piglin.tooltip": "The possessed Zombie Piglin will drop demonic meat.", + "item.occultism.ritual_dummy.possess_witch.tooltip": "The Possessed Witch will drop a special filled bottle.", + "item.occultism.ritual_dummy.possess_zombie_piglin": "Ritual: Summon Possessed Zombified Piglin", + "item.occultism.ritual_dummy.possess_zombie_piglin.tooltip": "The Possessed Zombified Piglin will drop demonic meat.", "item.occultism.ritual_dummy.repair_armors": "Ritual: Repair Armor", - "item.occultism.ritual_dummy.repair_armors.tooltip": "A afrit will repair your armor.", + "item.occultism.ritual_dummy.repair_armors.tooltip": "Fully repair armor by infusing it with an Afrit.", "item.occultism.ritual_dummy.repair_chalks": "Ritual: Repair Chalk", - "item.occultism.ritual_dummy.repair_chalks.tooltip": "A djinni will repair your chalk.", + "item.occultism.ritual_dummy.repair_chalks.tooltip": "Fully repair chalk by infusing it with a Djinni.", "item.occultism.ritual_dummy.repair_miners": "Ritual: Repair Miner", - "item.occultism.ritual_dummy.repair_miners.tooltip": "A afrit will extend your miner contract.", + "item.occultism.ritual_dummy.repair_miners.tooltip": "Extend a Miner's contract by striking a deal with an Afrit.", "item.occultism.ritual_dummy.repair_tools": "Ritual: Repair Tool", - "item.occultism.ritual_dummy.repair_tools.tooltip": "A afrit will repair your tool.", + "item.occultism.ritual_dummy.repair_tools.tooltip": "Fully repair a tool by infusing it with an Afrit.", "item.occultism.ritual_dummy.resurrect_allay": "Ritual: Purify Vex to Allay", - "item.occultism.ritual_dummy.resurrect_allay.tooltip": "Purify a Vex to a Allay on a resurrection process.", + "item.occultism.ritual_dummy.resurrect_allay.tooltip": "Purifies a Vex into an Allay.", "item.occultism.ritual_dummy.resurrect_familiar": "Ritual: Resurrect Familiar", "item.occultism.ritual_dummy.resurrect_familiar.tooltip": "Resurrects a Familiar from a Soul Shard.", "item.occultism.ritual_dummy.summon_afrit_crusher": "Ritual: Summon Afrit Crusher", - "item.occultism.ritual_dummy.summon_afrit_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher or lower tier crushers.", + "item.occultism.ritual_dummy.summon_afrit_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n§7§oNote: Some recipes may require higher or lower tier crushers.", "item.occultism.ritual_dummy.summon_afrit_rain_weather": "Ritual: Rainy Weather", - "item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip": "Summons an bound Afrit that creates rain.", + "item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip": "Summons an Afrit that creates rain.", "item.occultism.ritual_dummy.summon_afrit_thunder_weather": "Ritual: Thunderstorm", - "item.occultism.ritual_dummy.summon_afrit_thunder_weather.tooltip": "Summons an bound Afrit that creates a thunderstorm.", + "item.occultism.ritual_dummy.summon_afrit_thunder_weather.tooltip": "Summons an Afrit that creates a thunderstorm.", "item.occultism.ritual_dummy.summon_demonic_husband": "Ritual: Summon Demonic Husband", "item.occultism.ritual_dummy.summon_demonic_husband.tooltip": "Summons a Demonic Husband to support you: He will fight for you, help with cooking, and extend potion durations.", "item.occultism.ritual_dummy.summon_demonic_wife": "Ritual: Summon Demonic Wife", @@ -1593,7 +1597,7 @@ "item.occultism.ritual_dummy.summon_djinni_clear_weather": "Ritual: Clear Weather", "item.occultism.ritual_dummy.summon_djinni_clear_weather.tooltip": "Summons a Djinni that clears the weather.", "item.occultism.ritual_dummy.summon_djinni_crusher": "Ritual: Summon Djinni Crusher", - "item.occultism.ritual_dummy.summon_djinni_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher or lower tier crushers.", + "item.occultism.ritual_dummy.summon_djinni_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n§7§oNote: Some recipes may require higher or lower tier crushers.", "item.occultism.ritual_dummy.summon_djinni_day_time": "Ritual: Summoning of Dawn", "item.occultism.ritual_dummy.summon_djinni_day_time.tooltip": "Summons a Djinni that sets the time to high noon.", "item.occultism.ritual_dummy.summon_djinni_manage_machine": "Ritual: Summon Djinni Machine Operator", @@ -1613,29 +1617,29 @@ "item.occultism.ritual_dummy.summon_foliot_transport_items": "Ritual: Summon Foliot Transporter", "item.occultism.ritual_dummy.summon_foliot_transport_items.tooltip": "The transporter will move all items it can access from one inventory to another, including machines.", "item.occultism.ritual_dummy.summon_marid_crusher": "Ritual: Summon Marid Crusher", - "item.occultism.ritual_dummy.summon_marid_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher or lower tier crushers.", + "item.occultism.ritual_dummy.summon_marid_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n§7§oNote: Some recipes may require higher or lower tier crushers.", "item.occultism.ritual_dummy.summon_unbound_afrit": "Ritual: Summon Unbound Afrit", "item.occultism.ritual_dummy.summon_unbound_afrit.tooltip": "Summons an unbound Afrit that can be killed to obtain Afrit Essence", "item.occultism.ritual_dummy.summon_unbound_marid": "Ritual: Summon Unbound Marid", "item.occultism.ritual_dummy.summon_unbound_marid.tooltip": "Summons an unbound Marid that can be killed to obtain Marid Essence", - "item.occultism.ritual_dummy.wild_breeze": "Ritual: Summon Possessed Breeze", - "item.occultism.ritual_dummy.wild_breeze.tooltip": "The possessed Breeze will drop a Ominous Trial Key and trial chamber related items.", + "item.occultism.ritual_dummy.wild_breeze": "Ritual: Summon Wild Breeze", + "item.occultism.ritual_dummy.wild_breeze.tooltip": "The Wild Breeze will drop a Ominous Trial Key and trial chamber related items.", "item.occultism.ritual_dummy.wild_creeper": "Ritual: Summon The Wild Horde Creeper", "item.occultism.ritual_dummy.wild_creeper.tooltip": "The Wild Horde Creeper consists of a few charged Creepers that drop many disks.", "item.occultism.ritual_dummy.wild_drowned": "Ritual: Summon The Wild Horde Drowned", "item.occultism.ritual_dummy.wild_drowned.tooltip": "The Wild Horde Drowned consists of a few Drowneds that drop items related to ocean trails.", - "item.occultism.ritual_dummy.wild_horde_illager": "Ritual: Summon Possessed Evoker", - "item.occultism.ritual_dummy.wild_horde_illager.tooltip": "Summon a possessed Evoker and his henchmen.", + "item.occultism.ritual_dummy.wild_horde_illager": "Ritual: Summon Wild Illagers", + "item.occultism.ritual_dummy.wild_horde_illager.tooltip": "Summon a Wild Evoker and his henchmen.", "item.occultism.ritual_dummy.wild_hunt": "Ritual: Summon The Wild Hunt", "item.occultism.ritual_dummy.wild_hunt.tooltip": "The Wild Hunt consists of Wither Skeletons that as a big chance to drop Wither Skeleton Skulls, and their minions.", "item.occultism.ritual_dummy.wild_husk": "Ritual: Summon The Wild Horde Husk", "item.occultism.ritual_dummy.wild_husk.tooltip": "The Wild Horde Husk consists of a few Husks that drop items related to desert trails.", "item.occultism.ritual_dummy.wild_silverfish": "Ritual: Summon The Wild Horde Silverfish", "item.occultism.ritual_dummy.wild_silverfish.tooltip": "The Wild Horde Silverfish consists of a few Silverfishs that drop items related to ruins trails.", - "item.occultism.ritual_dummy.wild_strong_breeze": "Ritual: Summon Possessed Strong Breeze", - "item.occultism.ritual_dummy.wild_strong_breeze.tooltip": "The possessed Strong Breeze will drop a Heavy Core and trial chamber related items.", - "item.occultism.ritual_dummy.wild_weak_breeze": "Ritual: Summon Possessed Weak Breeze", - "item.occultism.ritual_dummy.wild_weak_breeze.tooltip": "The possessed Weak Breeze will drop a Trial Key and trial chamber related items.", + "item.occultism.ritual_dummy.wild_strong_breeze": "Ritual: Summon Wild Strong Breeze", + "item.occultism.ritual_dummy.wild_strong_breeze.tooltip": "The Wild Strong Breeze will drop a Heavy Core and trial chamber related items.", + "item.occultism.ritual_dummy.wild_weak_breeze": "Ritual: Summon Wild Weak Breeze", + "item.occultism.ritual_dummy.wild_weak_breeze.tooltip": "The Wild Weak Breeze will drop a Trial Key and trial chamber related items.", "item.occultism.ritual_satchel.no_preview_block_targeted": "You need to aim the ritual satchel at a preview block.", "item.occultism.ritual_satchel.no_preview_in_world": " You need to preview a pentacle using the Dictionary of Spirits.", "item.occultism.ritual_satchel.no_valid_item_in_satchel": "There is no valid item in the satchel for this previewed block.", @@ -1874,7 +1878,7 @@ "occultism.configuration.miner_marid_master": "Marid Master Miner", "occultism.configuration.misc": "Misc Settings", "occultism.configuration.orangeChalkGlyphColor": "Orange Chalk Glyph Color", - "occultism.configuration.pinkChalkGlyphColor": "PinkChalk Glyph Color", + "occultism.configuration.pinkChalkGlyphColor": "Pink Chalk Glyph Color", "occultism.configuration.possibleSpiritNames": "Possible Spirit Names", "occultism.configuration.purpleChalkGlyphColor": "Purple Chalk Glyph Color", "occultism.configuration.redChalkGlyphColor": "Red Chalk Glyph Color", @@ -2174,9 +2178,9 @@ "ritual.occultism.possess_witch.interrupted": "Summoning of possessed witch interrupted.", "ritual.occultism.possess_witch.started": "Started summoning possessed witch.", "ritual.occultism.possess_zombie_piglin.conditions": "Not all requirements for this ritual are met.", - "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombie piglin successfully.", - "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombie piglin interrupted.", - "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombie piglin.", + "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombified piglin successfully.", + "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombified piglin interrupted.", + "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombified piglin.", "ritual.occultism.repair_armors.conditions": "Not all requirements for this ritual are met.", "ritual.occultism.repair_armors.finished": "Successfully repaired armor.", "ritual.occultism.repair_armors.interrupted": "Armor repair interrupted.", @@ -2294,9 +2298,9 @@ "ritual.occultism.summon_foliot_transport_items.interrupted": "Summoning of foliot transporter interrupted.", "ritual.occultism.summon_foliot_transport_items.started": "Started summoning foliot transporter.", "ritual.occultism.summon_horde_illager.conditions": "Not all requirements for this ritual are met.", - "ritual.occultism.summon_horde_illager.finished": "Summoned the small illager invasion successfully.", - "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the small illager invasion interrupted.", - "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.", + "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.", + "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the wild illager invasion interrupted.", + "ritual.occultism.summon_horde_illager.started": "Started summoning the wild illager invasion.", "ritual.occultism.summon_marid_crusher.conditions": "Not all requirements for this ritual are met.", "ritual.occultism.summon_marid_crusher.finished": "Summoned marid ore crusher successfully.", "ritual.occultism.summon_marid_crusher.interrupted": "Summoning of marid ore crusher interrupted.", diff --git a/src/generated/resources/data/c/tags/item/foods.json b/src/generated/resources/data/c/tags/item/foods.json new file mode 100644 index 000000000..63d614f00 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/foods.json @@ -0,0 +1,10 @@ +{ + "values": [ + "occultism:datura", + "occultism:demons_dream_essence", + "occultism:otherworld_essence", + "occultism:beaver_nugget", + "occultism:cursed_honey", + "occultism:demonic_meat" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/meat.json b/src/generated/resources/data/minecraft/tags/item/meat.json new file mode 100644 index 000000000..6cb07a3b3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/meat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "occultism:demonic_meat" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_dragonyst_dust.json b/src/generated/resources/data/occultism/advancement/occultism/craft_dragonyst_dust.json new file mode 100644 index 000000000..aca2607d9 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_dragonyst_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_dragonyst_dust": { + "conditions": { + "ritual_id": "occultism:ritual/craft_dragonyst_dust" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_dragonyst_dust.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_dragonyst_dust.title" + } + }, + "requirements": [ + [ + "craft_dragonyst_dust" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_miner_ancient_eldritch.json b/src/generated/resources/data/occultism/advancement/occultism/craft_miner_ancient_eldritch.json new file mode 100644 index 000000000..497496c35 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_miner_ancient_eldritch.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_miner_ancient_eldritch": { + "conditions": { + "ritual_id": "occultism:ritual/craft_miner_ancient_eldritch" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_miner_ancient_eldritch.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_miner_ancient_eldritch.title" + } + }, + "requirements": [ + [ + "craft_miner_ancient_eldritch" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_nature_paste.json b/src/generated/resources/data/occultism/advancement/occultism/craft_nature_paste.json new file mode 100644 index 000000000..c07018a0e --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_nature_paste.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_nature_paste": { + "conditions": { + "ritual_id": "occultism:ritual/craft_nature_paste" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_nature_paste.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_nature_paste.title" + } + }, + "requirements": [ + [ + "craft_nature_paste" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_research_fragment_dust.json b/src/generated/resources/data/occultism/advancement/occultism/craft_research_fragment_dust.json new file mode 100644 index 000000000..c25f55753 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_research_fragment_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_research_fragment_dust": { + "conditions": { + "ritual_id": "occultism:ritual/craft_research_fragment_dust" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_research_fragment_dust.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_research_fragment_dust.title" + } + }, + "requirements": [ + [ + "craft_research_fragment_dust" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t1.json b/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t1.json new file mode 100644 index 000000000..c9e3a7c88 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t1.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_ritual_satchel_t1": { + "conditions": { + "ritual_id": "occultism:ritual/craft_ritual_satchel_t1" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_ritual_satchel_t1.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_ritual_satchel_t1.title" + } + }, + "requirements": [ + [ + "craft_ritual_satchel_t1" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t2.json b/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t2.json new file mode 100644 index 000000000..5124393c7 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_ritual_satchel_t2.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_ritual_satchel_t2": { + "conditions": { + "ritual_id": "occultism:ritual/craft_ritual_satchel_t2" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_ritual_satchel_t2.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_ritual_satchel_t2.title" + } + }, + "requirements": [ + [ + "craft_ritual_satchel_t2" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/craft_witherite_dust.json b/src/generated/resources/data/occultism/advancement/occultism/craft_witherite_dust.json new file mode 100644 index 000000000..f0e554a3f --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/craft_witherite_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "craft_witherite_dust": { + "conditions": { + "ritual_id": "occultism:ritual/craft_witherite_dust" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.craft_witherite_dust.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.craft_witherite_dust.title" + } + }, + "requirements": [ + [ + "craft_witherite_dust" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/misc_budding_amethyst.json b/src/generated/resources/data/occultism/advancement/occultism/misc_budding_amethyst.json new file mode 100644 index 000000000..7fac31fcc --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/misc_budding_amethyst.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "misc_budding_amethyst": { + "conditions": { + "ritual_id": "occultism:ritual/misc_budding_amethyst" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.misc_budding_amethyst.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.misc_budding_amethyst.title" + } + }, + "requirements": [ + [ + "misc_budding_amethyst" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/misc_reinforced_deepslate.json b/src/generated/resources/data/occultism/advancement/occultism/misc_reinforced_deepslate.json new file mode 100644 index 000000000..dfd583398 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/misc_reinforced_deepslate.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "misc_reinforced_deepslate": { + "conditions": { + "ritual_id": "occultism:ritual/misc_reinforced_deepslate" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.misc_reinforced_deepslate.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.misc_reinforced_deepslate.title" + } + }, + "requirements": [ + [ + "misc_reinforced_deepslate" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_wild_afrit.json b/src/generated/resources/data/occultism/advancement/occultism/misc_wild_trim.json similarity index 62% rename from src/generated/resources/data/occultism/advancement/occultism/summon_wild_afrit.json rename to src/generated/resources/data/occultism/advancement/occultism/misc_wild_trim.json index d6152270a..439d30844 100644 --- a/src/generated/resources/data/occultism/advancement/occultism/summon_wild_afrit.json +++ b/src/generated/resources/data/occultism/advancement/occultism/misc_wild_trim.json @@ -1,9 +1,9 @@ { "parent": "occultism:occultism/root", "criteria": { - "summon_wild_afrit": { + "misc_wild_trim": { "conditions": { - "ritual_id": "occultism:ritual/summon_wild_afrit" + "ritual_id": "occultism:ritual/misc_wild_trim" }, "trigger": "occultism:ritual" } @@ -11,7 +11,7 @@ "display": { "announce_to_chat": false, "description": { - "translate": "advancements.occultism.summon_wild_afrit.description" + "translate": "advancements.occultism.misc_wild_trim.description" }, "hidden": true, "icon": { @@ -20,12 +20,12 @@ }, "show_toast": false, "title": { - "translate": "advancements.occultism.summon_wild_afrit.title" + "translate": "advancements.occultism.misc_wild_trim.title" } }, "requirements": [ [ - "summon_wild_afrit" + "misc_wild_trim" ] ], "sends_telemetry_event": true diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_bee.json b/src/generated/resources/data/occultism/advancement/occultism/possess_bee.json new file mode 100644 index 000000000..328dc3bd5 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_bee.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_bee": { + "conditions": { + "ritual_id": "occultism:ritual/possess_bee" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_bee.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_bee.title" + } + }, + "requirements": [ + [ + "possess_bee" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_elder_guardian.json b/src/generated/resources/data/occultism/advancement/occultism/possess_elder_guardian.json new file mode 100644 index 000000000..551f24e0a --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_elder_guardian.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_elder_guardian": { + "conditions": { + "ritual_id": "occultism:ritual/possess_elder_guardian" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_elder_guardian.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_elder_guardian.title" + } + }, + "requirements": [ + [ + "possess_elder_guardian" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_goat.json b/src/generated/resources/data/occultism/advancement/occultism/possess_goat.json new file mode 100644 index 000000000..6bfea11bd --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_goat.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_goat": { + "conditions": { + "ritual_id": "occultism:ritual/possess_goat" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_goat.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_goat.title" + } + }, + "requirements": [ + [ + "possess_goat" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_hoglin.json b/src/generated/resources/data/occultism/advancement/occultism/possess_hoglin.json new file mode 100644 index 000000000..f6e7e1f90 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_hoglin.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_hoglin": { + "conditions": { + "ritual_id": "occultism:ritual/possess_hoglin" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_hoglin.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_hoglin.title" + } + }, + "requirements": [ + [ + "possess_hoglin" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_phantom.json b/src/generated/resources/data/occultism/advancement/occultism/possess_phantom.json new file mode 100644 index 000000000..8881da453 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_phantom.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_phantom": { + "conditions": { + "ritual_id": "occultism:ritual/possess_phantom" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_phantom.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_phantom.title" + } + }, + "requirements": [ + [ + "possess_phantom" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_random_animal.json b/src/generated/resources/data/occultism/advancement/occultism/possess_random_animal.json new file mode 100644 index 000000000..c3959ba7d --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_random_animal.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_random_animal": { + "conditions": { + "ritual_id": "occultism:ritual/possess_random_animal" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_random_animal.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_random_animal.title" + } + }, + "requirements": [ + [ + "possess_random_animal" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_shulker.json b/src/generated/resources/data/occultism/advancement/occultism/possess_shulker.json new file mode 100644 index 000000000..d4cb6a913 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_shulker.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_shulker": { + "conditions": { + "ritual_id": "occultism:ritual/possess_shulker" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_shulker.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_shulker.title" + } + }, + "requirements": [ + [ + "possess_shulker" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_otherworld_bird.json b/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_otherworld_bird.json new file mode 100644 index 000000000..81e3f0fad --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_otherworld_bird.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_unbound_otherworld_bird": { + "conditions": { + "ritual_id": "occultism:ritual/possess_unbound_otherworld_bird" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_unbound_otherworld_bird.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_unbound_otherworld_bird.title" + } + }, + "requirements": [ + [ + "possess_unbound_otherworld_bird" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_parrot.json b/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_parrot.json new file mode 100644 index 000000000..86c733c7f --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_unbound_parrot.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_unbound_parrot": { + "conditions": { + "ritual_id": "occultism:ritual/possess_unbound_parrot" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_unbound_parrot.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_unbound_parrot.title" + } + }, + "requirements": [ + [ + "possess_unbound_parrot" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_warden.json b/src/generated/resources/data/occultism/advancement/occultism/possess_warden.json new file mode 100644 index 000000000..3520ab4f2 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_warden.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_warden": { + "conditions": { + "ritual_id": "occultism:ritual/possess_warden" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_warden.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_warden.title" + } + }, + "requirements": [ + [ + "possess_warden" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_weak_shulker.json b/src/generated/resources/data/occultism/advancement/occultism/possess_weak_shulker.json new file mode 100644 index 000000000..593f32d14 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_weak_shulker.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_weak_shulker": { + "conditions": { + "ritual_id": "occultism:ritual/possess_weak_shulker" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_weak_shulker.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_weak_shulker.title" + } + }, + "requirements": [ + [ + "possess_weak_shulker" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_witch.json b/src/generated/resources/data/occultism/advancement/occultism/possess_witch.json new file mode 100644 index 000000000..0c8469c57 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_witch.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_witch": { + "conditions": { + "ritual_id": "occultism:ritual/possess_witch" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_witch.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_witch.title" + } + }, + "requirements": [ + [ + "possess_witch" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/possess_zombie_piglin.json b/src/generated/resources/data/occultism/advancement/occultism/possess_zombie_piglin.json new file mode 100644 index 000000000..0a8b2f04b --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/possess_zombie_piglin.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "possess_zombie_piglin": { + "conditions": { + "ritual_id": "occultism:ritual/possess_zombie_piglin" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.possess_zombie_piglin.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.possess_zombie_piglin.title" + } + }, + "requirements": [ + [ + "possess_zombie_piglin" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/repair_armors.json b/src/generated/resources/data/occultism/advancement/occultism/repair_armors.json new file mode 100644 index 000000000..9f63de06c --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/repair_armors.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "repair_armors": { + "conditions": { + "ritual_id": "occultism:ritual/repair_armors" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.repair_armors.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.repair_armors.title" + } + }, + "requirements": [ + [ + "repair_armors" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/repair_chalks.json b/src/generated/resources/data/occultism/advancement/occultism/repair_chalks.json new file mode 100644 index 000000000..86b5f479b --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/repair_chalks.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "repair_chalks": { + "conditions": { + "ritual_id": "occultism:ritual/repair_chalks" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.repair_chalks.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.repair_chalks.title" + } + }, + "requirements": [ + [ + "repair_chalks" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/repair_miners.json b/src/generated/resources/data/occultism/advancement/occultism/repair_miners.json new file mode 100644 index 000000000..fc43e3963 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/repair_miners.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "repair_miners": { + "conditions": { + "ritual_id": "occultism:ritual/repair_miners" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.repair_miners.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.repair_miners.title" + } + }, + "requirements": [ + [ + "repair_miners" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/repair_tools.json b/src/generated/resources/data/occultism/advancement/occultism/repair_tools.json new file mode 100644 index 000000000..2855db83b --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/repair_tools.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "repair_tools": { + "conditions": { + "ritual_id": "occultism:ritual/repair_tools" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.repair_tools.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.repair_tools.title" + } + }, + "requirements": [ + [ + "repair_tools" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/resurrect_allay.json b/src/generated/resources/data/occultism/advancement/occultism/resurrect_allay.json new file mode 100644 index 000000000..01d102e94 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/resurrect_allay.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "resurrect_allay": { + "conditions": { + "ritual_id": "occultism:ritual/resurrect_allay" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.resurrect_allay.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.resurrect_allay.title" + } + }, + "requirements": [ + [ + "resurrect_allay" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/resurrect_familiar.json b/src/generated/resources/data/occultism/advancement/occultism/resurrect_familiar.json new file mode 100644 index 000000000..101897b88 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/resurrect_familiar.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "resurrect_familiar": { + "conditions": { + "ritual_id": "occultism:ritual/resurrect_familiar" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.resurrect_familiar.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.resurrect_familiar.title" + } + }, + "requirements": [ + [ + "resurrect_familiar" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_husband.json b/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_husband.json new file mode 100644 index 000000000..450f249d8 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_husband.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "summon_demonic_husband": { + "conditions": { + "ritual_id": "occultism:ritual/summon_demonic_husband" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.summon_demonic_husband.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.summon_demonic_husband.title" + } + }, + "requirements": [ + [ + "summon_demonic_husband" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_wife.json b/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_wife.json new file mode 100644 index 000000000..2cf189ad1 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/summon_demonic_wife.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "summon_demonic_wife": { + "conditions": { + "ritual_id": "occultism:ritual/summon_demonic_wife" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.summon_demonic_wife.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.summon_demonic_wife.title" + } + }, + "requirements": [ + [ + "summon_demonic_wife" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_afrit.json b/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_afrit.json new file mode 100644 index 000000000..a5310e130 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_afrit.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "summon_unbound_afrit": { + "conditions": { + "ritual_id": "occultism:ritual/summon_unbound_afrit" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.summon_unbound_afrit.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.summon_unbound_afrit.title" + } + }, + "requirements": [ + [ + "summon_unbound_afrit" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_marid.json b/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_marid.json new file mode 100644 index 000000000..b422f6086 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/summon_unbound_marid.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "summon_unbound_marid": { + "conditions": { + "ritual_id": "occultism:ritual/summon_unbound_marid" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.summon_unbound_marid.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.summon_unbound_marid.title" + } + }, + "requirements": [ + [ + "summon_unbound_marid" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_breeze.json b/src/generated/resources/data/occultism/advancement/occultism/wild_breeze.json new file mode 100644 index 000000000..26057087d --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_breeze.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_breeze": { + "conditions": { + "ritual_id": "occultism:ritual/wild_breeze" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_breeze.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_breeze.title" + } + }, + "requirements": [ + [ + "wild_breeze" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_creeper.json b/src/generated/resources/data/occultism/advancement/occultism/wild_creeper.json new file mode 100644 index 000000000..5214ad3e4 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_creeper.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_creeper": { + "conditions": { + "ritual_id": "occultism:ritual/wild_creeper" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_creeper.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_creeper.title" + } + }, + "requirements": [ + [ + "wild_creeper" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_drowned.json b/src/generated/resources/data/occultism/advancement/occultism/wild_drowned.json new file mode 100644 index 000000000..89cdc570b --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_drowned.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_drowned": { + "conditions": { + "ritual_id": "occultism:ritual/wild_drowned" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_drowned.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_drowned.title" + } + }, + "requirements": [ + [ + "wild_drowned" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_horde_illager.json b/src/generated/resources/data/occultism/advancement/occultism/wild_horde_illager.json new file mode 100644 index 000000000..5126626de --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_horde_illager.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_horde_illager": { + "conditions": { + "ritual_id": "occultism:ritual/wild_horde_illager" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_horde_illager.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_horde_illager.title" + } + }, + "requirements": [ + [ + "wild_horde_illager" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_hunt.json b/src/generated/resources/data/occultism/advancement/occultism/wild_hunt.json new file mode 100644 index 000000000..c6d725bc7 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_hunt.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_hunt": { + "conditions": { + "ritual_id": "occultism:ritual/wild_hunt" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_hunt.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_hunt.title" + } + }, + "requirements": [ + [ + "wild_hunt" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_husk.json b/src/generated/resources/data/occultism/advancement/occultism/wild_husk.json new file mode 100644 index 000000000..ecdeef485 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_husk.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_husk": { + "conditions": { + "ritual_id": "occultism:ritual/wild_husk" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_husk.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_husk.title" + } + }, + "requirements": [ + [ + "wild_husk" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_silverfish.json b/src/generated/resources/data/occultism/advancement/occultism/wild_silverfish.json new file mode 100644 index 000000000..82e7159dc --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_silverfish.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_silverfish": { + "conditions": { + "ritual_id": "occultism:ritual/wild_silverfish" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_silverfish.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_silverfish.title" + } + }, + "requirements": [ + [ + "wild_silverfish" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/wild_strong_breeze.json b/src/generated/resources/data/occultism/advancement/occultism/wild_strong_breeze.json new file mode 100644 index 000000000..c7e9401f0 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_strong_breeze.json @@ -0,0 +1,32 @@ +{ + "parent": "occultism:occultism/root", + "criteria": { + "wild_strong_breeze": { + "conditions": { + "ritual_id": "occultism:ritual/wild_strong_breeze" + }, + "trigger": "occultism:ritual" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.occultism.wild_strong_breeze.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "occultism:jei_dummy/none" + }, + "show_toast": false, + "title": { + "translate": "advancements.occultism.wild_strong_breeze.title" + } + }, + "requirements": [ + [ + "wild_strong_breeze" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/occultism/summon_wild_hunt.json b/src/generated/resources/data/occultism/advancement/occultism/wild_weak_breeze.json similarity index 65% rename from src/generated/resources/data/occultism/advancement/occultism/summon_wild_hunt.json rename to src/generated/resources/data/occultism/advancement/occultism/wild_weak_breeze.json index ef1161db6..1029f5487 100644 --- a/src/generated/resources/data/occultism/advancement/occultism/summon_wild_hunt.json +++ b/src/generated/resources/data/occultism/advancement/occultism/wild_weak_breeze.json @@ -1,9 +1,9 @@ { "parent": "occultism:occultism/root", "criteria": { - "summon_wild_hunt": { + "wild_weak_breeze": { "conditions": { - "ritual_id": "occultism:ritual/summon_wild_hunt" + "ritual_id": "occultism:ritual/wild_weak_breeze" }, "trigger": "occultism:ritual" } @@ -11,7 +11,7 @@ "display": { "announce_to_chat": false, "description": { - "translate": "advancements.occultism.summon_wild_hunt.description" + "translate": "advancements.occultism.wild_weak_breeze.description" }, "hidden": true, "icon": { @@ -20,12 +20,12 @@ }, "show_toast": false, "title": { - "translate": "advancements.occultism.summon_wild_hunt.title" + "translate": "advancements.occultism.wild_weak_breeze.title" } }, "requirements": [ [ - "summon_wild_hunt" + "wild_weak_breeze" ] ], "sends_telemetry_event": true diff --git a/src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/bone_meal_from_bone.json b/src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/bone_meal_from_bone.json new file mode 100644 index 000000000..09cebd96f --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/bone_meal_from_bone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone": { + "conditions": { + "items": [ + { + "items": "#c:bones" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "occultism:crushing/bone_meal_from_bone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_bone" + ] + ], + "rewards": { + "recipes": [ + "occultism:crushing/bone_meal_from_bone" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminium.json b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/jade.json similarity index 83% rename from src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminium.json rename to src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/jade.json index fa6777e49..2bcf93cfa 100644 --- a/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminium.json +++ b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/jade.json @@ -11,7 +11,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "c:storage_blocks/raw_aluminium" + "tag": "c:storage_blocks/jade" } } ], @@ -29,7 +29,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "occultism:miner/eldritch/raw_aluminium" + "recipe": "occultism:miner/eldritch/jade" }, "trigger": "minecraft:recipe_unlocked" } @@ -42,7 +42,7 @@ ], "rewards": { "recipes": [ - "occultism:miner/eldritch/raw_aluminium" + "occultism:miner/eldritch/jade" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/onyx.json b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/onyx.json new file mode 100644 index 000000000..e023625a6 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/onyx.json @@ -0,0 +1,48 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/onyx" + } + } + ], + "parent": "minecraft:recipes/root", + "criteria": { + "has_miner": { + "conditions": { + "items": [ + { + "items": "occultism:magic_lamp_empty" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "occultism:miner/eldritch/onyx" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_miner" + ] + ], + "rewards": { + "recipes": [ + "occultism:miner/eldritch/onyx" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminum.json b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminum.json new file mode 100644 index 000000000..6a81eb02a --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_aluminum.json @@ -0,0 +1,48 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/raw_aluminum" + } + } + ], + "parent": "minecraft:recipes/root", + "criteria": { + "has_miner": { + "conditions": { + "items": [ + { + "items": "occultism:magic_lamp_empty" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "occultism:miner/eldritch/raw_aluminum" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_miner" + ] + ], + "rewards": { + "recipes": [ + "occultism:miner/eldritch/raw_aluminum" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_cobalt.json b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_cobalt.json new file mode 100644 index 000000000..1a7140231 --- /dev/null +++ b/src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/raw_cobalt.json @@ -0,0 +1,48 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/raw_cobalt" + } + } + ], + "parent": "minecraft:recipes/root", + "criteria": { + "has_miner": { + "conditions": { + "items": [ + { + "items": "occultism:magic_lamp_empty" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "occultism:miner/eldritch/raw_cobalt" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_miner" + ] + ], + "rewards": { + "recipes": [ + "occultism:miner/eldritch/raw_cobalt" + ] + } +} \ No newline at end of file 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 f8449dee5..a3e525d26 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 @@ -5,8 +5,8 @@ "background_texture_zoom_multiplier": 1.0, "background_width": 512, "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_foliot" }, "description": "", "display_mode": "node", 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 c2db3d1bf..ee04700d7 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 @@ -5,8 +5,8 @@ "background_texture_zoom_multiplier": 1.0, "background_width": 512, "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "", "display_mode": "node", 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 d54ff9fe9..33146c4b8 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 @@ -5,8 +5,8 @@ "background_texture_zoom_multiplier": 1.0, "background_width": 512, "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "", "display_mode": "node", 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 0e321bce3..c964b647b 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 @@ -5,8 +5,8 @@ "background_texture_zoom_multiplier": 1.0, "background_width": 512, "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/white" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/summon_foliot" }, "description": "", "display_mode": "node", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/crafting_rituals/craft_dimensional_mineshaft.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/crafting_rituals/craft_dimensional_mineshaft.json index f0222574d..64efb8277 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/crafting_rituals/craft_dimensional_mineshaft.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/crafting_rituals/craft_dimensional_mineshaft.json @@ -42,6 +42,17 @@ "text": "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.description.text", "title": "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.description.title", "use_markdown_in_title": false + }, + { + "type": "modonomicon:text", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "show_title_separator": true, + "text": "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.config.text", + "title": "book.occultism.dictionary_of_spirits.crafting_rituals.craft_dimensional_mineshaft.config.title", + "use_markdown_in_title": false } ], "parents": [ diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/crafting_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/crafting_rituals.json index 9ab08152d..e4c6fd728 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/crafting_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/crafting_rituals.json @@ -3,8 +3,8 @@ "background_v_index": 1, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_foliot" }, "description": "book.occultism.dictionary_of_spirits.getting_started.crafting_rituals.description", "hide_while_locked": false, 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 ca338d128..5107426e7 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 @@ -190,6 +190,17 @@ "text": "book.occultism.dictionary_of_spirits.getting_started.divination_rod.otherworld_trees_2.text", "title": "", "use_markdown_in_title": false + }, + { + "type": "modonomicon:text", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "show_title_separator": true, + "text": "book.occultism.dictionary_of_spirits.getting_started.divination_rod.config.text", + "title": "book.occultism.dictionary_of_spirits.getting_started.divination_rod.config.title", + "use_markdown_in_title": false } ], "parents": [ diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/familiar_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/familiar_rituals.json index fe2616494..46fbbb508 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/familiar_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/familiar_rituals.json @@ -3,8 +3,8 @@ "background_v_index": 1, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "book.occultism.dictionary_of_spirits.getting_started.familiar_rituals.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/infused_pickaxe.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/infused_pickaxe.json index 32aaed0b5..cca88656f 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/infused_pickaxe.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/infused_pickaxe.json @@ -2,6 +2,10 @@ "background_u_index": 0, "background_v_index": 0, "category": "getting_started", + "condition": { + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_djinni" + }, "description": "book.occultism.dictionary_of_spirits.getting_started.infused_pickaxe.description", "hide_while_locked": false, "icon": { diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/otherworld_goggles.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/otherworld_goggles.json index 28eb2c1e1..cca771d75 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/otherworld_goggles.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/otherworld_goggles.json @@ -3,8 +3,8 @@ "background_v_index": 0, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_foliot" }, "description": "book.occultism.dictionary_of_spirits.getting_started.otherworld_goggles.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/possession_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/possession_rituals.json index 37d1b059b..06237d7fd 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/possession_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/possession_rituals.json @@ -3,8 +3,8 @@ "background_v_index": 1, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "book.occultism.dictionary_of_spirits.getting_started.possession_rituals.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/ritual_satchels.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/ritual_satchels.json index 4e8d616a4..c100ae2ad 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/ritual_satchels.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/ritual_satchels.json @@ -3,8 +3,8 @@ "background_v_index": 0, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_djinni" }, "description": "book.occultism.dictionary_of_spirits.getting_started.ritual_satchels.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/storage.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/storage.json index 68a50ff53..37268d2a9 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/storage.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/storage.json @@ -4,8 +4,8 @@ "category": "getting_started", "category_to_open": "storage", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_djinni" }, "description": "book.occultism.dictionary_of_spirits.getting_started.storage.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/summoning_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/summoning_rituals.json index 6c7940bb3..20f4245e9 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/summoning_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/getting_started/summoning_rituals.json @@ -3,8 +3,8 @@ "background_v_index": 1, "category": "getting_started", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/white" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/summon_foliot" }, "description": "book.occultism.dictionary_of_spirits.getting_started.summoning_rituals.description", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/crafting_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/crafting_rituals.json index d955ffb61..e379ecc78 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/crafting_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/crafting_rituals.json @@ -4,8 +4,8 @@ "category": "rituals", "category_to_open": "crafting_rituals", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/purple" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/craft_foliot" }, "description": "", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/familiar_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/familiar_rituals.json index 8204b7907..10c867c45 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/familiar_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/familiar_rituals.json @@ -4,8 +4,8 @@ "category": "rituals", "category_to_open": "familiar_rituals", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/possession_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/possession_rituals.json index 521d87872..d64994a57 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/possession_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/possession_rituals.json @@ -4,8 +4,8 @@ "category": "rituals", "category_to_open": "possession_rituals", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/yellow" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/possess_foliot" }, "description": "", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/summoning_rituals.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/summoning_rituals.json index 9f5af0f1d..97ef3ed82 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/summoning_rituals.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/rituals/summoning_rituals.json @@ -4,8 +4,8 @@ "category": "rituals", "category_to_open": "summoning_rituals", "condition": { - "type": "modonomicon:advancement", - "advancement_id": "occultism:chalks/white" + "type": "modonomicon:entry_read", + "entry_id": "pentacles/summon_foliot" }, "description": "", "hide_while_locked": false, diff --git a/src/generated/resources/data/occultism/recipe/crushing/bone_meal_from_bone.json b/src/generated/resources/data/occultism/recipe/crushing/bone_meal_from_bone.json new file mode 100644 index 000000000..06ff61a40 --- /dev/null +++ b/src/generated/resources/data/occultism/recipe/crushing/bone_meal_from_bone.json @@ -0,0 +1,11 @@ +{ + "type": "occultism:crushing", + "ingredient": { + "tag": "c:bones" + }, + "result": { + "type": "occultism:item", + "count": 4, + "id": "minecraft:bone_meal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminium.json b/src/generated/resources/data/occultism/recipe/miner/eldritch/jade.json similarity index 83% rename from src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminium.json rename to src/generated/resources/data/occultism/recipe/miner/eldritch/jade.json index cc7d9609b..f3553bde5 100644 --- a/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminium.json +++ b/src/generated/resources/data/occultism/recipe/miner/eldritch/jade.json @@ -11,7 +11,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "c:storage_blocks/raw_aluminium" + "tag": "c:storage_blocks/jade" } } ], @@ -22,7 +22,7 @@ "result": { "type": "occultism:weighted_tag", "count": 1, - "tag": "c:storage_blocks/raw_aluminium", + "tag": "c:storage_blocks/jade", "weight": 90 } } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipe/miner/eldritch/onyx.json b/src/generated/resources/data/occultism/recipe/miner/eldritch/onyx.json new file mode 100644 index 000000000..7b9eb57bb --- /dev/null +++ b/src/generated/resources/data/occultism/recipe/miner/eldritch/onyx.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/onyx" + } + } + ], + "type": "occultism:miner", + "ingredient": { + "tag": "occultism:miners/eldritch" + }, + "result": { + "type": "occultism:weighted_tag", + "count": 1, + "tag": "c:storage_blocks/onyx", + "weight": 90 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminum.json b/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminum.json new file mode 100644 index 000000000..715dc6aa2 --- /dev/null +++ b/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_aluminum.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/raw_aluminum" + } + } + ], + "type": "occultism:miner", + "ingredient": { + "tag": "occultism:miners/eldritch" + }, + "result": { + "type": "occultism:weighted_tag", + "count": 1, + "tag": "c:storage_blocks/raw_aluminum", + "weight": 90 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_cobalt.json b/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_cobalt.json new file mode 100644 index 000000000..e8eed0a69 --- /dev/null +++ b/src/generated/resources/data/occultism/recipe/miner/eldritch/raw_cobalt.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "occultism:miners/eldritch" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:storage_blocks/raw_cobalt" + } + } + ], + "type": "occultism:miner", + "ingredient": { + "tag": "occultism:miners/eldritch" + }, + "result": { + "type": "occultism:weighted_tag", + "count": 1, + "tag": "c:storage_blocks/raw_cobalt", + "weight": 90 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_miner_marid_master.json b/src/generated/resources/data/occultism/recipe/ritual/craft_miner_marid_master.json index 2277d8b69..32fd411b4 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/craft_miner_marid_master.json +++ b/src/generated/resources/data/occultism/recipe/ritual/craft_miner_marid_master.json @@ -25,6 +25,9 @@ }, { "item": "minecraft:nether_star" + }, + { + "item": "occultism:marid_essence" } ], "pentacle_id": "occultism:craft_marid", diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier3.json b/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier3.json index 4c4561c6f..cae8fd3fa 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier3.json +++ b/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier3.json @@ -16,6 +16,9 @@ }, { "item": "occultism:spirit_attuned_crystal" + }, + { + "item": "occultism:afrit_essence" } ], "pentacle_id": "occultism:craft_afrit", diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier4.json b/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier4.json index 1d7638238..af5d25d62 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier4.json +++ b/src/generated/resources/data/occultism/recipe/ritual/craft_stabilizer_tier4.json @@ -19,6 +19,9 @@ }, { "item": "occultism:spirit_attuned_crystal" + }, + { + "item": "occultism:marid_essence" } ], "pentacle_id": "occultism:craft_marid", diff --git a/src/generated/resources/data/occultism/recipe/ritual/summon_afrit_crusher.json b/src/generated/resources/data/occultism/recipe/ritual/summon_afrit_crusher.json index d717de923..305b73d0b 100644 --- a/src/generated/resources/data/occultism/recipe/ritual/summon_afrit_crusher.json +++ b/src/generated/resources/data/occultism/recipe/ritual/summon_afrit_crusher.json @@ -7,16 +7,19 @@ "entity_to_summon": "occultism:afrit", "ingredients": [ { - "tag": "c:gems/diamond" + "tag": "c:dusts/iesnium" }, { - "tag": "c:dusts/iesnium" + "tag": "c:dusts/emerald" }, { - "tag": "c:dusts/iesnium" + "tag": "c:dusts/lapis" + }, + { + "tag": "c:dusts/amethyst" }, { - "tag": "c:gems/emerald" + "tag": "c:dusts/obsidian" } ], "pentacle_id": "occultism:summon_afrit", diff --git a/src/generated/resources/data/occultism/tags/block/pentacle_materials.json b/src/generated/resources/data/occultism/tags/block/pentacle_materials.json index 0ccf4cfbf..595381e8e 100644 --- a/src/generated/resources/data/occultism/tags/block/pentacle_materials.json +++ b/src/generated/resources/data/occultism/tags/block/pentacle_materials.json @@ -4,6 +4,14 @@ "occultism:golden_sacrificial_bowl", "occultism:spirit_attuned_crystal", "#minecraft:candles", + "#c:glass_panes", + "minecraft:enchanting_table", + "minecraft:beacon", + "minecraft:lodestone", + "minecraft:amethyst_cluster", + "minecraft:end_rod", + "minecraft:lightning_rod", + "minecraft:iron_bars", { "id": "#occultism:chalk_glyphs", "required": false diff --git a/src/generated/resources/data/occultism/tags/item/pentacle_materials.json b/src/generated/resources/data/occultism/tags/item/pentacle_materials.json index b3bd39f74..252ab30a1 100644 --- a/src/generated/resources/data/occultism/tags/item/pentacle_materials.json +++ b/src/generated/resources/data/occultism/tags/item/pentacle_materials.json @@ -8,6 +8,14 @@ "occultism:golden_sacrificial_bowl", "occultism:spirit_attuned_crystal", "#minecraft:candles", + "#c:glass_panes", + "minecraft:enchanting_table", + "minecraft:beacon", + "minecraft:lodestone", + "minecraft:amethyst_cluster", + "minecraft:end_rod", + "minecraft:lightning_rod", + "minecraft:iron_bars", { "id": "#occultism:chalk_glyphs", "required": false diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java index 603cddcab..51bfdbb2c 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java @@ -44,7 +44,7 @@ public class DjinniEntity extends SpiritEntity implements GeoEntity { private static final EntityDataAccessor SIZE_STATE = SynchedEntityData.defineId(DjinniEntity.class, EntityDataSerializers.INT); - protected EntityDimensions t2CrusherDimensions = EntityDimensions.scalable(1.2f, 2.4f); + protected EntityDimensions manageMachineDimensions = EntityDimensions.scalable(0.5f, 0.8f); AnimatableInstanceCache animatableInstanceCache = GeckoLibUtil.createInstanceCache(this); public DjinniEntity(EntityType type, Level level) { @@ -80,7 +80,7 @@ public void onSyncedDataUpdated(EntityDataAccessor pKey) { } if (JOB_ID.equals(pKey)) { - if (!Objects.equals(this.getJobID(), OccultismSpiritJobs.MANAGE_MACHINE.getId().toString()) && this.getSizeState() != 1) { + if (Objects.equals(this.getJobID(), OccultismSpiritJobs.MANAGE_MACHINE.getId().toString()) && this.getSizeState() != 1) { this.setSizeState(1); } } @@ -91,7 +91,7 @@ public void onSyncedDataUpdated(EntityDataAccessor pKey) { @Override public EntityDimensions getDefaultDimensions(Pose pPose) { if (this.getSizeState() == 1) - return this.t2CrusherDimensions; + return this.manageMachineDimensions; return super.getDefaultDimensions(pPose); } diff --git a/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java index 2d784fda0..86554bdfe 100644 --- a/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java @@ -157,6 +157,10 @@ public Ingredient getActivationItem() { return this.ritualRequirementSettings.activationItem(); } + public ItemStack[] getActivationItemStack() { + return this.ritualRequirementSettings.activationItem.getItems(); + } + public int getDuration() { return this.ritualRequirementSettings.duration(); } diff --git a/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementSubProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementSubProvider.java index 1e1e6389d..4a2b07e23 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementSubProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementSubProvider.java @@ -233,13 +233,19 @@ familiarRingStack, familiarTitle("capture"), familiarDescr("capture"), Optional. this.addRitualHidden(root, "craft_dimensional_matrix"); this.addRitualHidden(root, "craft_dimensional_mineshaft"); + this.addRitualHidden(root, "craft_dragonyst_dust"); this.addRitualHidden(root, "craft_familiar_ring"); this.addRitualHidden(root, "craft_infused_lenses"); this.addRitualHidden(root, "craft_infused_pickaxe"); + this.addRitualHidden(root, "craft_miner_afrit_deeps"); + this.addRitualHidden(root, "craft_miner_ancient_eldritch"); this.addRitualHidden(root, "craft_miner_djinni_ores"); this.addRitualHidden(root, "craft_miner_foliot_unspecialized"); - this.addRitualHidden(root, "craft_miner_afrit_deeps"); this.addRitualHidden(root, "craft_miner_marid_master"); + this.addRitualHidden(root, "craft_nature_paste"); + this.addRitualHidden(root, "craft_research_fragment_dust"); + this.addRitualHidden(root, "craft_ritual_satchel_t1"); + this.addRitualHidden(root, "craft_ritual_satchel_t2"); this.addRitualHidden(root, "craft_satchel"); this.addRitualHidden(root, "craft_soul_gem"); this.addRitualHidden(root, "craft_stabilizer_tier1"); @@ -249,29 +255,54 @@ familiarRingStack, familiarTitle("capture"), familiarDescr("capture"), Optional. this.addRitualHidden(root, "craft_stable_wormhole"); this.addRitualHidden(root, "craft_storage_controller_base"); this.addRitualHidden(root, "craft_storage_remote"); + this.addRitualHidden(root, "craft_witherite_dust"); this.addRitualHidden(root, "familiar_bat"); + this.addRitualHidden(root, "familiar_beaver"); + this.addRitualHidden(root, "familiar_beholder"); + this.addRitualHidden(root, "familiar_blacksmith"); + this.addRitualHidden(root, "familiar_chimera"); this.addRitualHidden(root, "familiar_cthulhu"); this.addRitualHidden(root, "familiar_deer"); this.addRitualHidden(root, "familiar_devil"); this.addRitualHidden(root, "familiar_dragon"); + this.addRitualHidden(root, "familiar_fairy"); this.addRitualHidden(root, "familiar_greedy"); - this.addRitualHidden(root, "familiar_otherworld_bird"); - this.addRitualHidden(root, "familiar_parrot"); this.addRitualHidden(root, "familiar_guardian"); - this.addRitualHidden(root, "familiar_blacksmith"); this.addRitualHidden(root, "familiar_headless"); - this.addRitualHidden(root, "familiar_chimera"); - this.addRitualHidden(root, "familiar_beholder"); - this.addRitualHidden(root, "familiar_fairy"); this.addRitualHidden(root, "familiar_mummy"); - this.addRitualHidden(root, "familiar_beaver"); + this.addRitualHidden(root, "familiar_otherworld_bird"); + this.addRitualHidden(root, "familiar_parrot"); + this.addRitualHidden(root, "misc_budding_amethyst"); + this.addRitualHidden(root, "misc_reinforced_deepslate"); + this.addRitualHidden(root, "misc_wild_trim"); + this.addRitualHidden(root, "possess_bee"); + this.addRitualHidden(root, "possess_elder_guardian"); this.addRitualHidden(root, "possess_enderman"); this.addRitualHidden(root, "possess_endermite"); - this.addRitualHidden(root, "possess_skeleton"); this.addRitualHidden(root, "possess_ghast"); + this.addRitualHidden(root, "possess_goat"); + this.addRitualHidden(root, "possess_hoglin"); + this.addRitualHidden(root, "possess_phantom"); + this.addRitualHidden(root, "possess_random_animal"); + this.addRitualHidden(root, "possess_shulker"); + this.addRitualHidden(root, "possess_skeleton"); + this.addRitualHidden(root, "possess_unbound_otherworld_bird"); + this.addRitualHidden(root, "possess_unbound_parrot"); + this.addRitualHidden(root, "possess_warden"); + this.addRitualHidden(root, "possess_weak_shulker"); + this.addRitualHidden(root, "possess_witch"); + this.addRitualHidden(root, "possess_zombie_piglin"); + this.addRitualHidden(root, "repair_armors"); + this.addRitualHidden(root, "repair_chalks"); + this.addRitualHidden(root, "repair_miners"); + this.addRitualHidden(root, "repair_tools"); + this.addRitualHidden(root, "resurrect_allay"); + this.addRitualHidden(root, "resurrect_familiar"); this.addRitualHidden(root, "summon_afrit_crusher"); this.addRitualHidden(root, "summon_afrit_rain_weather"); this.addRitualHidden(root, "summon_afrit_thunder_weather"); + this.addRitualHidden(root, "summon_demonic_husband"); + this.addRitualHidden(root, "summon_demonic_wife"); this.addRitualHidden(root, "summon_djinni_clear_weather"); this.addRitualHidden(root, "summon_djinni_crusher"); this.addRitualHidden(root, "summon_djinni_day_time"); @@ -284,8 +315,17 @@ familiarRingStack, familiarTitle("capture"), familiarDescr("capture"), Optional. this.addRitualHidden(root, "summon_foliot_sapling_trader"); this.addRitualHidden(root, "summon_foliot_transport_items"); this.addRitualHidden(root, "summon_marid_crusher"); - this.addRitualHidden(root, "summon_wild_afrit"); - this.addRitualHidden(root, "summon_wild_hunt"); + this.addRitualHidden(root, "summon_unbound_afrit"); + this.addRitualHidden(root, "summon_unbound_marid"); + this.addRitualHidden(root, "wild_breeze"); + this.addRitualHidden(root, "wild_creeper"); + this.addRitualHidden(root, "wild_drowned"); + this.addRitualHidden(root, "wild_horde_illager"); + this.addRitualHidden(root, "wild_hunt"); + this.addRitualHidden(root, "wild_husk"); + this.addRitualHidden(root, "wild_silverfish"); + this.addRitualHidden(root, "wild_strong_breeze"); + this.addRitualHidden(root, "wild_weak_breeze"); } private AdvancementHolder addRitualHidden(AdvancementHolder parent, String id) { 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 b23af9f94..e04c5ef41 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java @@ -49,13 +49,13 @@ protected void generateCategories() { var pentaclesCategory = this.add(new PentaclesCategory(this).generate().withSortNumber(sortNum++)); var summoningRitualsCategory = this.add(this.makeSummoningRitualsSubcategory().withSortNumber(sortNum++)); - summoningRitualsCategory.withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/white")); + summoningRitualsCategory.withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/summon_foliot"))); var possessionRitualsCategory = this.add(this.makePossessionRitualsSubcategory().withSortNumber(sortNum++)); - possessionRitualsCategory.withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + possessionRitualsCategory.withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); var familiarRitualsCategory = this.add(new FamiliarRitualsCategory(this).generate().withSortNumber(sortNum++)); - familiarRitualsCategory.withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + familiarRitualsCategory.withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); var craftingRitualsCategory = this.add(new BindingRitualsCategory(this).generate().withSortNumber(sortNum++)); - craftingRitualsCategory.withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + craftingRitualsCategory.withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_foliot"))); var storageCategory = this.add(this.makeStorageCategory().withSortNumber(sortNum++)); storageCategory.withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("crafting_rituals/craft_storage_system"))); @@ -293,7 +293,7 @@ private BookEntryModel makeEssenceDecayEntry(CategoryEntryMap entryMap, char ico this.lang().add(this.context().pageTitle(), "Affected Spirits"); this.lang().add(this.context().pageText(), """ - Only tier 1 spirits are affected by essence decay, by default. All higher tiers are immune and will not despawn. Modpacks may modify this behaviour. + Only trader, time and weather spirits are affected by essence decay, by default. All others are immune and will not despawn. Modpacks may modify this behaviour. """.formatted(COLOR_PURPLE)); return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) @@ -470,16 +470,16 @@ private BookCategoryModel makeRitualsCategory() { var summoning = this.makeSummoningRitualsSubcategoryEntry(entryMap, 's'); summoning.withParent(BookEntryParentModel.create(sacrifice.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/white")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/summon_foliot"))); var possession = this.makePossessionRitualsSubcategoryEntry(entryMap, 'p'); possession.withParent(BookEntryParentModel.create(sacrifice.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); var crafting = this.makeCraftingRitualsSubcategoryEntry(entryMap, 'c'); crafting.withParent(BookEntryParentModel.create(sacrifice.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_foliot"))); var familiars = this.makeFamiliarRitualsSubcategoryEntry(entryMap, 'f'); familiars.withParent(BookEntryParentModel.create(sacrifice.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); //enable all entries by default itemUse.withCondition(BookTrueConditionModel.create()); @@ -2106,7 +2106,7 @@ private BookEntryModel makeHordeSilverfishEntry(CategoryEntryMap entryMap, char private BookEntryModel makeHordeIllagerEntry(CategoryEntryMap entryMap, char icon) { this.context().entry("horde_illager"); - this.lang().add(this.context().entryName(), "Mini Illager Invasion"); + this.lang().add(this.context().entryName(), "Wild Illager Invasion"); this.context().page("entity"); var entity = BookEntityPageModel.create() @@ -2127,7 +2127,7 @@ private BookEntryModel makeHordeIllagerEntry(CategoryEntryMap entryMap, char ico .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - Summon a possessed Evoker and his henchmen to get [](item://minecraft:totem_of_undying), [](item://minecraft:vex_armor_trim_smithing_template) and [](item://minecraft:sentry_armor_trim_smithing_template). + Summon a Wild Evoker and his henchmen to get [](item://minecraft:totem_of_undying), [](item://minecraft:vex_armor_trim_smithing_template) and [](item://minecraft:sentry_armor_trim_smithing_template). """.formatted(COLOR_PURPLE)); return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) @@ -2163,7 +2163,7 @@ private BookEntryModel makePossessWeakBreezeEntry(CategoryEntryMap entryMap, cha .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - [](item://minecraft:breeze_rod) cannot be obtained from Possessed Weak Breeze rods due to their fragile nature, but this version of Breeze hides some treasures and has a chance to drop: [](item://minecraft:guster_pottery_sherd), [](item://minecraft:scrape_pottery_sherd), [](item://minecraft:music_disc_creator_music_box) and [](item://minecraft:ominous_bottle). + [](item://minecraft:breeze_rod) cannot be obtained from Wild Weak Breeze rods due to their fragile nature, but this version of Breeze hides some treasures and has a chance to drop: [](item://minecraft:guster_pottery_sherd), [](item://minecraft:scrape_pottery_sherd), [](item://minecraft:music_disc_creator_music_box) and [](item://minecraft:ominous_bottle). """.formatted(COLOR_PURPLE)); return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) @@ -2199,7 +2199,7 @@ private BookEntryModel makePossessBreezeEntry(CategoryEntryMap entryMap, char ic .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - The Possessed Breeze has intrinsic Ominous Essence causing a drop of [](item://minecraft:ominous_trial_key). The [](item://minecraft:breeze_rod) form this enemy can survive after the battle and the extra loot is: [](item://minecraft:bolt_armor_trim_smithing_template), [](item://minecraft:guster_banner_pattern) and [](item://minecraft:music_disc_precipice). + The Wild Breeze has intrinsic Ominous Essence causing a drop of [](item://minecraft:ominous_trial_key). The [](item://minecraft:breeze_rod) form this enemy can survive after the battle and the extra loot is: [](item://minecraft:bolt_armor_trim_smithing_template), [](item://minecraft:guster_banner_pattern) and [](item://minecraft:music_disc_precipice). """.formatted(COLOR_PURPLE)); return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) @@ -2235,7 +2235,7 @@ private BookEntryModel makePossessStrongBreezeEntry(CategoryEntryMap entryMap, c .withText(this.context().pageText()); this.lang().add(this.context().pageText(), """ - The Possessed Strong Breeze is 'Flow-Forged', granting a powerful version of the regular Breeze. This is the final target to obtain a [](item://minecraft:heavy_core) and as a bonus, you can get: [](item://minecraft:flow_armor_trim_smithing_template), [](item://minecraft:flow_banner_pattern), [](item://minecraft:flow_pottery_sherd) and [](item://minecraft:music_disc_creator). + The Wild Strong Breeze is 'Flow-Forged', granting a powerful version of the regular Breeze. This is the final target to obtain a [](item://minecraft:heavy_core) and as a bonus, you can get: [](item://minecraft:flow_armor_trim_smithing_template), [](item://minecraft:flow_banner_pattern), [](item://minecraft:flow_pottery_sherd) and [](item://minecraft:music_disc_creator). """.formatted(COLOR_PURPLE)); return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/BindingRitualsCategory.java b/src/main/java/com/klikli_dev/occultism/datagen/book/BindingRitualsCategory.java index 4ee511f2f..4e98f4f7f 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/BindingRitualsCategory.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/BindingRitualsCategory.java @@ -237,13 +237,19 @@ private BookEntryModel makeCraftDimensionalMineshaftEntry(CategoryEntryMap entry .withTitle(this.context().pageTitle()) .withText(this.context().pageText()); + this.context().page("config"); + var config = BookTextPageModel.create() + .withTitle(this.context().pageTitle()) + .withText(this.context().pageText()); + return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) .withIcon(OccultismBlocks.DIMENSIONAL_MINESHAFT.get()) .withLocation(entryMap.get(icon)) .withPages( spotlight, ritual, - description + description, + config ); } diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/GettingStartedCategory.java b/src/main/java/com/klikli_dev/occultism/datagen/book/GettingStartedCategory.java index bd0df8a81..cc19db367 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/GettingStartedCategory.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/GettingStartedCategory.java @@ -6,7 +6,6 @@ import com.klikli_dev.modonomicon.api.datagen.book.BookEntryModel; import com.klikli_dev.modonomicon.api.datagen.book.BookEntryParentModel; import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel; -import com.klikli_dev.modonomicon.api.datagen.book.condition.BookAdvancementConditionModel; import com.klikli_dev.modonomicon.api.datagen.book.condition.BookAndConditionModel; import com.klikli_dev.modonomicon.api.datagen.book.condition.BookEntryReadConditionModel; import com.klikli_dev.modonomicon.api.datagen.book.condition.BookModLoadedConditionModel; @@ -121,7 +120,7 @@ protected void generateEntries() { var ritualSatchelsEntry = this.add(new RitualSatchelsEntry(this).generate('ĝ')); ritualSatchelsEntry.withParent(BookEntryParentModel.create(advancedChalksEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_djinni"))); var moreRitualsEntry = this.add(this.makeMoreRitualsEntry(this.entryMap, 'm')); moreRitualsEntry.withParent(BookEntryParentModel.create(advancedChalksEntry.getId())); @@ -134,10 +133,11 @@ protected void generateEntries() { var otherworldGoggles = this.add(this.makeOtherworldGogglesEntry(this.entryMap, 'g')); otherworldGoggles.withParent(BookEntryParentModel.create(advancedChalksEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_foliot"))); var infusedPickaxe = this.add(this.makeInfusedPickaxeEntry(this.entryMap, 'I')); - infusedPickaxe.withParent(BookEntryParentModel.create(otherworldGoggles.getId())); + infusedPickaxe.withParent(BookEntryParentModel.create(otherworldGoggles.getId())) + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_djinni"))); var iesnium = this.add(this.makeIesniumEntry(this.entryMap, 'O')); iesnium.withParent(BookEntryParentModel.create(infusedPickaxe.getId())); @@ -156,23 +156,23 @@ protected void generateEntries() { var storageEntry = this.add(this.makeStorageEntry(this.entryMap, 's')); storageEntry.withParent(BookEntryParentModel.create(advancedChalksEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_djinni"))); var possessionRitualsEntry = this.add(this.makePossessionRitualsEntry(this.entryMap, 'w')); possessionRitualsEntry.withParent(BookEntryParentModel.create(moreRitualsEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); var familiarRitualsEntry = this.add(this.makeFamiliarRitualsEntry(this.entryMap, 'x')); familiarRitualsEntry.withParent(BookEntryParentModel.create(moreRitualsEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/yellow")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/possess_foliot"))); var summoningRitualsEntry = this.add(this.makeSummoningRitualsEntry(this.entryMap, 'y')); summoningRitualsEntry.withParent(BookEntryParentModel.create(moreRitualsEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/white")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/summon_foliot"))); var craftingRitualsEntry = this.add(this.makeCraftingRitualsEntry(this.entryMap, 'z')); craftingRitualsEntry.withParent(BookEntryParentModel.create(moreRitualsEntry.getId())) - .withCondition(BookAdvancementConditionModel.create().withAdvancementId("occultism:chalks/purple")); + .withCondition(BookEntryReadConditionModel.create().withEntry(this.modLoc("pentacles/craft_foliot"))); } @Override @@ -688,6 +688,20 @@ private BookEntryModel makeDivinationRodEntry(CategoryEntryMap entryMap, char ic Trees grown from Stable Otherworld Saplings as obtained from spirit traders do not have that limitation. """); + this.context().page("config"); + var config = BookTextPageModel.create() + .withTitle(this.context().pageTitle()) + .withText(this.context().pageText()); + this.lang().add(this.context().pageTitle(), "Extra Config"); + this.lang().add(this.context().pageText(), + """ + An additional function of the Divination Rod is to locate any ore, + however this is not a default function and needs to be enabled, + as we recommend using the Theurgy mod for this type of divination. + If you want to enable this feature directly in Occultism, check + "Server Configuration > Items" and set "Divination c:ores" to "on". + """); + return BookEntryModel.create(this.modLoc(this.context().categoryId() + "/" + this.context().entryId()), this.context().entryName()) .withDescription(this.context().entryDescription()) .withIcon(OccultismItems.DIVINATION_ROD.get()) @@ -708,7 +722,9 @@ private BookEntryModel makeDivinationRodEntry(CategoryEntryMap entryMap, char ic otherworldGroves, otherworldGroves2, otherworldTrees, - otherworldTrees2); + otherworldTrees2, + config + ); } diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactEldritchSpiritEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactEldritchSpiritEntry.java index b1b219dcc..f8bbf1da3 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactEldritchSpiritEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactEldritchSpiritEntry.java @@ -30,6 +30,9 @@ protected void generatePages() { **Purpose:** Contact {0}\\ \\ This is a very strange pentacle that you dont understand for now. + \\ + \\ + **NOTE** Iron bar is not rendering in the world preview, just put one in the last brown pointed part. """, this.color("Eldritch", ChatFormatting.DARK_PURPLE) ); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactWildSpiritEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactWildSpiritEntry.java index ec8dc46b4..b5acedd2d 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactWildSpiritEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/ContactWildSpiritEntry.java @@ -54,7 +54,7 @@ protected void generatePages() { - [Trial Key](entry://possession_rituals/possess_weak_breeze) - [Ominous Trial Key](entry://possession_rituals/possess_breeze) - [Heavy Core](entry://possession_rituals/possess_strong_breeze) - - [Small Illager Invasion](entry://possession_rituals/horde_illager) + - [Wild Illager Invasion](entry://possession_rituals/horde_illager) - [Wild Armor Trim Smithing Template](entry://crafting_rituals/craft_wild_trim) - [Budding Amethyst](entry://crafting_rituals/craft_budding_amethyst) """ diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftAfritEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftAfritEntry.java index 375a2c616..8ffd3729a 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftAfritEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftAfritEntry.java @@ -62,7 +62,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Afrit Infusing"; + return "Afrit Infusion"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftDjinniEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftDjinniEntry.java index dc2c4abef..956ec5c69 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftDjinniEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftDjinniEntry.java @@ -68,7 +68,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Djinni Infusing"; + return "Djinni Infusion"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftFoliotEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftFoliotEntry.java index 1c24d4636..40342bef9 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftFoliotEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftFoliotEntry.java @@ -64,7 +64,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Foliot Infusing"; + return "Foliot Infusion"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftMaridEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftMaridEntry.java index f78d4e4d3..eee577945 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftMaridEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CraftMaridEntry.java @@ -60,7 +60,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Marid Infusing"; + return "Marid Infusion"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CyanChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CyanChalkEntry.java index 694e65028..632541acd 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CyanChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/CyanChalkEntry.java @@ -50,7 +50,7 @@ protected void generatePages() { .withRecipeId1(this.modLoc("crafting/chalk_cyan_impure")) .withText(this.context().pageText())); this.pageText(""" - Pulverize the {0} keeping their properties is a job that only the best crusher can do. + "Pulverizing an {0} while retaining its properties is a job that only the best crushers can do. """, this.color("Echo Shard", ChatFormatting.LIGHT_PURPLE)); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/DidacticsEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/DidacticsEntry.java index e662697ae..bd87eee35 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/DidacticsEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/DidacticsEntry.java @@ -48,7 +48,7 @@ protected void generatePages() { @Override protected String entryName() { - return "Reading this category"; + return "Reading this Section"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/GreenChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/GreenChalkEntry.java index fdceb5b8e..852332b75 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/GreenChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/GreenChalkEntry.java @@ -59,7 +59,7 @@ protected void generatePages() { @Override protected String entryName() { - return "The Nature Chalk, specifically The Flora Chalk"; + return "The Plant Chalk"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LightBlueChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LightBlueChalkEntry.java index 009ea8eed..1ed106a8f 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LightBlueChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LightBlueChalkEntry.java @@ -28,7 +28,7 @@ protected void generatePages() { .withTitle(this.context().pageTitle()) .withText(this.context().pageText()) ); - this.pageTitle("Never Melt"); + this.pageTitle("Never Melts"); this.pageText(""" The light blue chalk is made with such icy materials that its glyphs are inert and impart a natural stability to the pentacles. @@ -47,7 +47,7 @@ protected void generatePages() { .withRecipeId1(this.modLoc("crafting/chalk_light_blue_impure")) .withText(this.context().pageText())); this.pageText(""" - Crushing ice without melting it is a job a Foliot can't do, so you need a better crusher. + Crushing ice without melting it is a job a Foliot can't do, so you'll need a better crusher. """); this.page("recipe", () -> BookSpiritFireRecipePageModel.create() @@ -58,7 +58,7 @@ protected void generatePages() { @Override protected String entryName() { - return "The Glaced Chalk"; + return "The Glacial Chalk"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LimeChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LimeChalkEntry.java index a3797ae29..52f256781 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LimeChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/LimeChalkEntry.java @@ -32,7 +32,7 @@ protected void generatePages() { ); this.pageTitle("Getting Experience"); this.pageText(""" - The lime chalk attracts spirits beyond Folio. + The lime chalk attracts greater spirits than Foliots. Anyone wishing to elevate the level of their rituals will need this chalk. """ ); @@ -61,7 +61,7 @@ protected void generatePages() { @Override protected String entryName() { - return "First Tier Increase Chalk"; + return "The Knowledge Chalk"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/OrangeChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/OrangeChalkEntry.java index f8e4ed219..1ebd519c4 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/OrangeChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/OrangeChalkEntry.java @@ -58,7 +58,7 @@ protected void generatePages() { @Override protected String entryName() { - return "The Little Hot Chalk"; + return "The Tangy Chalk"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessAfritEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessAfritEntry.java index 90ce43c2a..ed3ad4708 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessAfritEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessAfritEntry.java @@ -61,7 +61,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Possessing Afrit"; + return "Afrit Possession"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessDjinniEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessDjinniEntry.java index b4317c4d9..628160ab0 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessDjinniEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessDjinniEntry.java @@ -82,7 +82,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Possessing Djinni"; + return "Djinni Possession"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessFoliotEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessFoliotEntry.java index fe2431023..631a6a142 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessFoliotEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessFoliotEntry.java @@ -68,7 +68,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Possessing Foliot"; + return "Foliot Possession"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessMaridEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessMaridEntry.java index b1149d2c4..f3ce87f06 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessMaridEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessMaridEntry.java @@ -57,7 +57,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Possessing Marid"; + return "Marid Possession"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessUnboundAfritEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessUnboundAfritEntry.java index b717bbbf1..d16970dd8 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessUnboundAfritEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PossessUnboundAfritEntry.java @@ -46,7 +46,7 @@ protected void generatePages() { ); this.pageTitle("Uses"); this.pageText(""" - - [Possessed Pig](entry://possession_rituals/possess_zombie_piglin) + - [Possessed Zombified Piglin](entry://possession_rituals/possess_zombie_piglin) """ ); @@ -59,7 +59,7 @@ protected String entryName() { @Override protected String entryDescription() { - return "Possessing Unbound Afrit"; + return "Unbound Afrit Possession"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PurpleChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PurpleChalkEntry.java index c4160a181..8b85687f9 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PurpleChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/PurpleChalkEntry.java @@ -63,7 +63,7 @@ protected void generatePages() { @Override protected String entryName() { - return "The Chalk to Infusion"; + return "The Chalk of Infusion"; } @Override diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/YellowChalkEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/YellowChalkEntry.java index f9f546e0f..3c3b49abd 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/YellowChalkEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/pentacles/YellowChalkEntry.java @@ -56,7 +56,7 @@ the addition of yellow glyphs, allowing spirits to manifest in bodies (material @Override protected String entryName() { - return "The Chalk to Possession"; + return "The Chalk of Possession"; } @Override 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 bd893da96..65e8f44b0 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 @@ -900,9 +900,9 @@ private void addRitualMessages() { this.add("ritual.occultism.possess_witch.finished", "Summoned possessed witch successfully."); this.add("ritual.occultism.possess_witch.interrupted", "Summoning of possessed witch interrupted."); this.add("ritual.occultism.possess_zombie_piglin.conditions", "Not all requirements for this ritual are met."); - this.add("ritual.occultism.possess_zombie_piglin.started", "Started summoning possessed zombie piglin."); - this.add("ritual.occultism.possess_zombie_piglin.finished", "Summoned possessed zombie piglin successfully."); - this.add("ritual.occultism.possess_zombie_piglin.interrupted", "Summoning of possessed zombie piglin interrupted."); + this.add("ritual.occultism.possess_zombie_piglin.started", "Started summoning possessed zombified piglin."); + this.add("ritual.occultism.possess_zombie_piglin.finished", "Summoned possessed zombified piglin successfully."); + this.add("ritual.occultism.possess_zombie_piglin.interrupted", "Summoning of possessed zombified piglin interrupted."); this.add("ritual.occultism.possess_bee.conditions", "Not all requirements for this ritual are met."); this.add("ritual.occultism.possess_bee.started", "Started summoning possessed bee."); this.add("ritual.occultism.possess_bee.finished", "Summoned possessed bee successfully."); @@ -1033,9 +1033,9 @@ private void addRitualMessages() { this.add("ritual.occultism.wild_strong_breeze.finished", "Summoned wild strong breeze successfully."); this.add("ritual.occultism.wild_strong_breeze.interrupted", "Summoning of wild strong breeze interrupted."); this.add("ritual.occultism.summon_horde_illager.conditions", "Not all requirements for this ritual are met."); - this.add("ritual.occultism.summon_horde_illager.started", "Started summoning the small illager invasion."); - this.add("ritual.occultism.summon_horde_illager.finished", "Summoned the small illager invasion successfully."); - this.add("ritual.occultism.summon_horde_illager.interrupted", "Summoning of the small illager invasion interrupted."); + this.add("ritual.occultism.summon_horde_illager.started", "Started summoning the wild illager invasion."); + this.add("ritual.occultism.summon_horde_illager.finished", "Summoned the wild illager invasion successfully."); + this.add("ritual.occultism.summon_horde_illager.interrupted", "Summoning of the wild illager invasion interrupted."); this.add("ritual.occultism.craft_nature_paste.conditions", "Not all requirements for this ritual are met."); this.add("ritual.occultism.craft_nature_paste.started", "Started infusing Nature Paste."); @@ -1075,7 +1075,6 @@ private void addRitualMessages() { this.addRitualMessage(OccultismRituals.RESURRECT_FAMILIAR, "finished", "Successfully resurrected familiar."); this.addRitualMessage(OccultismRituals.RESURRECT_FAMILIAR, "interrupted", "Resurrection interrupted."); - //item.occultism.ritual_dummy.summon_horde_illager this.addRitualMessage(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1, "conditions", "Not all requirements for this ritual are met."); this.addRitualMessage(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1, "started", "Started binding a djinni into a satchel."); this.addRitualMessage(OccultismItems.RITUAL_DUMMY_CRAFT_RITUAL_SATCHEL_T1, "finished", "Successfully bound a djinni into a satchel."); @@ -1200,7 +1199,7 @@ private void addSummoningRitualsCategory(BookContextHelper helper) { this.add(helper.pageTitle(), "Summoning Rituals"); this.add(helper.pageText(), """ - Summon rituals force spirits to enter this world in their chosen shape, leading to little restrictions on their power, but expose them to essence decay. Summoned spirits range from trade spirits that trade and convert items, to slave-like helpers for manual labour. + Summon rituals force spirits to enter this world in their chosen shape, leading to little restrictions on their power. Summoned spirits range from trade spirits that trade and convert items, to slave-like helpers for manual labour. """); helper.entry("return_to_rituals"); @@ -1216,8 +1215,8 @@ private void addSummoningRitualsCategory(BookContextHelper helper) { this.add(helper.pageTitle(), "Djinni Crusher"); this.add(helper.pageText(), """ - The djinni crusher is resistant essence decay and faster and more efficient than the foliot crusher. - \\ + The djinni crusher is faster, more efficient and proficient than the foliot crusher. + Allowing ice to be crushed without melting. \\ It will crush **one** ore into **three** corresponding dusts. """); @@ -1232,7 +1231,7 @@ private void addSummoningRitualsCategory(BookContextHelper helper) { this.add(helper.pageTitle(), "Afrit Crusher"); this.add(helper.pageText(), """ - The afrit crusher is resistant to essence decay and faster and more efficient than the djinni crusher. + The afrit crusher is faster and more efficient than the djinni crusher. \\ \\ It will crush **one** ore into **four** corresponding dusts. @@ -1248,8 +1247,8 @@ private void addSummoningRitualsCategory(BookContextHelper helper) { this.add(helper.pageTitle(), "Marid Crusher"); this.add(helper.pageText(), """ - The marid crusher is resistant to essence decay and faster and more efficient than the afrit crusher. - \\ + The marid crusher is faster, more efficient and proficient than the afrit crusher. + Allowing crushing the echo shard while maintaining its properties. \\ It will crush **one** ore into **six** corresponding dusts. """); @@ -1463,7 +1462,7 @@ private void addPossessionRitualsCategory(BookContextHelper helper) { """.formatted(COLOR_PURPLE)); helper.entry("wither_skull"); - this.add(helper.entryName(), "Wither Skeleton Skull"); + this.add(helper.entryName(), "Wild Hunt"); helper.page("intro"); this.add(helper.pageTitle(), "Wither Skeleton Skull"); @@ -1617,6 +1616,12 @@ private void addCraftingRitualsCategory(BookContextHelper helper) { The dimensional mineshaft will discard any items it cannot store, so it is important to regularly empty the mineshaft, either manually, with hoppers or using a transporter spirit. Spirits in lamps can be **inserted** from the top, all other sides can be used to **extract** items. """.formatted(COLOR_PURPLE)); + helper.page("config"); + this.add(helper.pageTitle(), "Config"); + this.add(helper.pageText(), + """ + If you want to save your miners before they break, check "Server Configuration > Items". By setting the "Save miners before breaking" option to "on", a miner will go to the output of the dimensional mineshaft when it reaches 1 durability. + """.formatted(COLOR_PURPLE)); helper.entry("craft_infused_pickaxe"); this.add(helper.entryName(), "Infused Pickaxe"); @@ -2877,37 +2882,37 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.familiar_beaver", "Ritual: Summon Beaver Familiar"); this.add("item.occultism.ritual_dummy.familiar_beaver.tooltip", "The Beaver familiar provides increased woodcutting speed to their masters and harvests nearby trees when they grow from a sapling."); this.add("item.occultism.ritual_dummy.possess_enderman", "Ritual: Summon Possessed Enderman"); - this.add("item.occultism.ritual_dummy.possess_enderman.tooltip", "The possessed Enderman will always drop at least one ender pearl when killed."); + this.add("item.occultism.ritual_dummy.possess_enderman.tooltip", "The Possessed Enderman will always drop at least one ender pearl when killed."); this.add("item.occultism.ritual_dummy.possess_endermite", "Ritual: Summon Possessed Endermite"); - this.add("item.occultism.ritual_dummy.possess_endermite.tooltip", "The possessed Endermite drops End Stone."); + this.add("item.occultism.ritual_dummy.possess_endermite.tooltip", "The Possessed Endermite drops End Stone."); this.add("item.occultism.ritual_dummy.possess_skeleton", "Ritual: Summon Possessed Skeleton"); - this.add("item.occultism.ritual_dummy.possess_skeleton.tooltip", " The possessed Skeleton is immune to daylight and always drop at least one Skeleton Skull when killed."); + this.add("item.occultism.ritual_dummy.possess_skeleton.tooltip", " The Possessed Skeleton is immune to daylight and always drop at least one Skeleton Skull when killed."); this.add("item.occultism.ritual_dummy.possess_ghast", "Ritual: Summon Possessed Ghast"); - this.add("item.occultism.ritual_dummy.possess_ghast.tooltip", "The possessed Ghast will always drop at least one ghast tear when killed."); + this.add("item.occultism.ritual_dummy.possess_ghast.tooltip", "The Possessed Ghast will always drop at least one ghast tear when killed."); this.add("item.occultism.ritual_dummy.possess_phantom", "Ritual: Summon Possessed Phantom"); - this.add("item.occultism.ritual_dummy.possess_phantom.tooltip", "The possessed Phantom will always drop at least one phantom membrane when killed and is easy to trap."); + this.add("item.occultism.ritual_dummy.possess_phantom.tooltip", "The Possessed Phantom will always drop at least one phantom membrane when killed and is easy to trap."); this.add("item.occultism.ritual_dummy.possess_weak_shulker", "Ritual: Summon Possessed Weak Shulker"); - this.add("item.occultism.ritual_dummy.possess_weak_shulker.tooltip", "The possessed Weak Shulker will drop at least one chorus fruit when killed and can drop shulker shell."); + this.add("item.occultism.ritual_dummy.possess_weak_shulker.tooltip", "The Possessed Weak Shulker will drop at least one chorus fruit when killed and can drop shulker shell."); this.add("item.occultism.ritual_dummy.possess_shulker", "Ritual: Summon Possessed Shulker"); - this.add("item.occultism.ritual_dummy.possess_shulker.tooltip", "The possessed Shulker will always drop at least one shulker shell when killed."); + this.add("item.occultism.ritual_dummy.possess_shulker.tooltip", "The Possessed Shulker will always drop at least one shulker shell when killed."); this.add("item.occultism.ritual_dummy.possess_elder_guardian", "Ritual: Summon Possessed Elder Guardian"); - this.add("item.occultism.ritual_dummy.possess_elder_guardian.tooltip", "The possessed elder guardian will drop at least one nautilus shell when killed, also can drop heart of the sea and the commom drops."); + this.add("item.occultism.ritual_dummy.possess_elder_guardian.tooltip", "The Possessed Elder Guardian will drop at least one nautilus shell when killed, also can drop heart of the sea and the commom drops."); this.add("item.occultism.ritual_dummy.possess_warden", "Ritual: Summon Possessed Warden"); - this.add("item.occultism.ritual_dummy.possess_warden.tooltip", "The possessed Warden will always drop at least six echo shard and can drop anothers ancient stuff (smithing templates and discs) when killed."); + this.add("item.occultism.ritual_dummy.possess_warden.tooltip", "The Possessed Warden will always drop at least six echo shard and can drop anothers ancient stuff (smithing templates and discs) when killed."); this.add("item.occultism.ritual_dummy.possess_hoglin", "Ritual: Summon Possessed Hoglin"); - this.add("item.occultism.ritual_dummy.possess_hoglin.tooltip", "The possessed Hoglin has a chance to drop smithing template of netherite upgrade when killed."); + this.add("item.occultism.ritual_dummy.possess_hoglin.tooltip", "The Possessed Hoglin has a chance to drop smithing template of netherite upgrade when killed."); this.add("item.occultism.ritual_dummy.possess_witch", "Ritual: Summon Possessed Witch"); - this.add("item.occultism.ritual_dummy.possess_witch.tooltip", "The possessed Witch will drop a special filled bottle."); - this.add("item.occultism.ritual_dummy.possess_zombie_piglin", "Ritual: Summon Possessed Zombie Piglin"); - this.add("item.occultism.ritual_dummy.possess_zombie_piglin.tooltip", "The possessed Zombie Piglin will drop demonic meat."); + this.add("item.occultism.ritual_dummy.possess_witch.tooltip", "The Possessed Witch will drop a special filled bottle."); + this.add("item.occultism.ritual_dummy.possess_zombie_piglin", "Ritual: Summon Possessed Zombified Piglin"); + this.add("item.occultism.ritual_dummy.possess_zombie_piglin.tooltip", "The Possessed Zombified Piglin will drop demonic meat."); this.add("item.occultism.ritual_dummy.possess_bee", "Ritual: Summon Possessed Bee"); - this.add("item.occultism.ritual_dummy.possess_bee.tooltip", "The possessed Bee will drop cursed honey."); + this.add("item.occultism.ritual_dummy.possess_bee.tooltip", "The Possessed Bee will drop cursed honey."); this.add("item.occultism.ritual_dummy.possess_goat", "Ritual: Summon Goat of Mercy"); this.add("item.occultism.ritual_dummy.possess_goat.tooltip", "The Goat of Mercy will drop the Cruelty Essence."); this.add("item.occultism.ritual_dummy.summon_afrit_rain_weather", "Ritual: Rainy Weather"); - this.add("item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip", "Summons an bound Afrit that creates rain."); + this.add("item.occultism.ritual_dummy.summon_afrit_rain_weather.tooltip", "Summons an Afrit that creates rain."); this.add("item.occultism.ritual_dummy.summon_afrit_thunder_weather", "Ritual: Thunderstorm"); - this.add("item.occultism.ritual_dummy.summon_afrit_thunder_weather.tooltip", "Summons an bound Afrit that creates a thunderstorm."); + this.add("item.occultism.ritual_dummy.summon_afrit_thunder_weather.tooltip", "Summons an Afrit that creates a thunderstorm."); this.add("item.occultism.ritual_dummy.summon_djinni_clear_weather", "Ritual: Clear Weather"); this.add("item.occultism.ritual_dummy.summon_djinni_clear_weather.tooltip", "Summons a Djinni that clears the weather."); this.add("item.occultism.ritual_dummy.summon_djinni_day_time", "Ritual: Summoning of Dawn"); @@ -2919,11 +2924,11 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.summon_foliot_crusher", "Ritual: Summon Foliot Crusher"); this.add("item.occultism.ritual_dummy.summon_foliot_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively doubling the metal output.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); this.add("item.occultism.ritual_dummy.summon_djinni_crusher", "Ritual: Summon Djinni Crusher"); - this.add("item.occultism.ritual_dummy.summon_djinni_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); + this.add("item.occultism.ritual_dummy.summon_djinni_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); this.add("item.occultism.ritual_dummy.summon_afrit_crusher", "Ritual: Summon Afrit Crusher"); - this.add("item.occultism.ritual_dummy.summon_afrit_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); + this.add("item.occultism.ritual_dummy.summon_afrit_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); this.add("item.occultism.ritual_dummy.summon_marid_crusher", "Ritual: Summon Marid Crusher"); - this.add("item.occultism.ritual_dummy.summon_marid_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); + this.add("item.occultism.ritual_dummy.summon_marid_crusher.tooltip", "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output.\n" + ChatFormatting.GRAY + ChatFormatting.ITALIC + "Note: Some recipes may require higher or lower tier crushers."); this.add("item.occultism.ritual_dummy.summon_foliot_lumberjack", "Ritual: Summon Foliot Lumberjack"); this.add("item.occultism.ritual_dummy.summon_foliot_lumberjack.tooltip", "The lumberjack will harvest trees in it's working area and deposit the dropped items into the specified chest."); this.add("item.occultism.ritual_dummy.summon_foliot_otherstone_trader", "Ritual: Summon Otherstone Trader"); @@ -2945,7 +2950,7 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.possess_unbound_parrot", "Ritual: Possess Unbound Parrot"); this.add("item.occultism.ritual_dummy.possess_unbound_parrot.tooltip", "Possess a Parrot that can be tamed by anyone, not just the summoner."); this.add("item.occultism.ritual_dummy.resurrect_allay", "Ritual: Purify Vex to Allay"); - this.add("item.occultism.ritual_dummy.resurrect_allay.tooltip", "Purify a Vex to a Allay on a resurrection process."); + this.add("item.occultism.ritual_dummy.resurrect_allay.tooltip", "Purifies a Vex into an Allay."); this.add("item.occultism.ritual_dummy.wild_husk", "Ritual: Summon The Wild Horde Husk"); this.add("item.occultism.ritual_dummy.wild_husk.tooltip", "The Wild Horde Husk consists of a few Husks that drop items related to desert trails."); @@ -2955,14 +2960,14 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.wild_creeper.tooltip", "The Wild Horde Creeper consists of a few charged Creepers that drop many disks."); this.add("item.occultism.ritual_dummy.wild_silverfish", "Ritual: Summon The Wild Horde Silverfish"); this.add("item.occultism.ritual_dummy.wild_silverfish.tooltip", "The Wild Horde Silverfish consists of a few Silverfishs that drop items related to ruins trails."); - this.add("item.occultism.ritual_dummy.wild_weak_breeze", "Ritual: Summon Possessed Weak Breeze"); - this.add("item.occultism.ritual_dummy.wild_weak_breeze.tooltip", "The possessed Weak Breeze will drop a Trial Key and trial chamber related items."); - this.add("item.occultism.ritual_dummy.wild_breeze", "Ritual: Summon Possessed Breeze"); - this.add("item.occultism.ritual_dummy.wild_breeze.tooltip", "The possessed Breeze will drop a Ominous Trial Key and trial chamber related items."); - this.add("item.occultism.ritual_dummy.wild_strong_breeze", "Ritual: Summon Possessed Strong Breeze"); - this.add("item.occultism.ritual_dummy.wild_strong_breeze.tooltip", "The possessed Strong Breeze will drop a Heavy Core and trial chamber related items."); - this.add("item.occultism.ritual_dummy.wild_horde_illager", "Ritual: Summon Possessed Evoker"); - this.add("item.occultism.ritual_dummy.wild_horde_illager.tooltip", "Summon a possessed Evoker and his henchmen."); + this.add("item.occultism.ritual_dummy.wild_weak_breeze", "Ritual: Summon Wild Weak Breeze"); + this.add("item.occultism.ritual_dummy.wild_weak_breeze.tooltip", "The Wild Weak Breeze will drop a Trial Key and trial chamber related items."); + this.add("item.occultism.ritual_dummy.wild_breeze", "Ritual: Summon Wild Breeze"); + this.add("item.occultism.ritual_dummy.wild_breeze.tooltip", "The Wild Breeze will drop a Ominous Trial Key and trial chamber related items."); + this.add("item.occultism.ritual_dummy.wild_strong_breeze", "Ritual: Summon Wild Strong Breeze"); + this.add("item.occultism.ritual_dummy.wild_strong_breeze.tooltip", "The Wild Strong Breeze will drop a Heavy Core and trial chamber related items."); + this.add("item.occultism.ritual_dummy.wild_horde_illager", "Ritual: Summon Wild Illagers"); + this.add("item.occultism.ritual_dummy.wild_horde_illager.tooltip", "Summon a Wild Evoker and his henchmen."); this.add("item.occultism.ritual_dummy.craft_nature_paste", "Ritual: Craft Nature Paste"); this.add("item.occultism.ritual_dummy.craft_nature_paste.tooltip", "A foliot will craft the nature paste mixing ingredients."); @@ -2971,19 +2976,19 @@ private void addRitualDummies() { this.add("item.occultism.ritual_dummy.craft_research_fragment_dust", "Ritual: Craft Research Fragment Dust"); this.add("item.occultism.ritual_dummy.craft_research_fragment_dust.tooltip", "A foliot will infuse experience in the emerald dust."); this.add("item.occultism.ritual_dummy.craft_witherite_dust", "Ritual: Craft Witherite Dust"); - this.add("item.occultism.ritual_dummy.craft_witherite_dust.tooltip", "A afrit will infuse wither essence in the netherite dust."); + this.add("item.occultism.ritual_dummy.craft_witherite_dust.tooltip", "An afrit will infuse netherite dust with wither essence."); this.add("item.occultism.ritual_dummy.craft_dragonyst_dust", "Ritual: Craft Dragonyst Dust"); this.add("item.occultism.ritual_dummy.craft_dragonyst_dust.tooltip", "A marid will infuse ender dragon essence in the amethyst dust."); this.add("item.occultism.ritual_dummy.repair_chalks", "Ritual: Repair Chalk"); - this.add("item.occultism.ritual_dummy.repair_chalks.tooltip", "A djinni will repair your chalk."); + this.add("item.occultism.ritual_dummy.repair_chalks.tooltip", "Fully repair chalk by infusing it with a Djinni."); this.add("item.occultism.ritual_dummy.repair_tools", "Ritual: Repair Tool"); - this.add("item.occultism.ritual_dummy.repair_tools.tooltip", "A afrit will repair your tool."); + this.add("item.occultism.ritual_dummy.repair_tools.tooltip", "Fully repair a tool by infusing it with an Afrit."); this.add("item.occultism.ritual_dummy.repair_armors", "Ritual: Repair Armor"); - this.add("item.occultism.ritual_dummy.repair_armors.tooltip", "A afrit will repair your armor."); + this.add("item.occultism.ritual_dummy.repair_armors.tooltip", "Fully repair armor by infusing it with an Afrit."); this.add("item.occultism.ritual_dummy.repair_miners", "Ritual: Repair Miner"); - this.add("item.occultism.ritual_dummy.repair_miners.tooltip", "A afrit will extend your miner contract."); + this.add("item.occultism.ritual_dummy.repair_miners.tooltip", "Extend a Miner's contract by striking a deal with an Afrit."); this.add(OccultismItems.RITUAL_DUMMY_SUMMON_DEMONIC_WIFE.get(), "Ritual: Summon Demonic Wife"); this.addTooltip(OccultismItems.RITUAL_DUMMY_SUMMON_DEMONIC_WIFE.get(), "Summons a Demonic Wife to support you: She will fight for you, help with cooking, and extend potion durations."); @@ -3220,7 +3225,7 @@ private void addConfigurationTranslations() { this.addConfig("lightBlueChalkGlyphColor", "Light Blue Chalk Glyph Color"); this.addConfig("blueChalkGlyphColor", "Blue Chalk Glyph Color"); this.addConfig("magentaChalkGlyphColor", "Magenta Chalk Glyph Color"); - this.addConfig("pinkChalkGlyphColor", "PinkChalk Glyph Color"); + this.addConfig("pinkChalkGlyphColor", "Pink Chalk Glyph Color"); this.addConfig("misc", "Misc Settings"); this.addConfig("syncJeiSearch", "Sync JEI Search"); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/recipe/MinerRecipes.java b/src/main/java/com/klikli_dev/occultism/datagen/recipe/MinerRecipes.java index 043f16304..d1777832c 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/recipe/MinerRecipes.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/recipe/MinerRecipes.java @@ -142,10 +142,11 @@ public static void eldritch(RecipeOutput recipeOutput) { //Raw makeStorageRecipe("raw_aethersent", 90, recipeOutput); makeStorageRecipe("raw_allthemodium", 30, recipeOutput); - makeStorageRecipe("raw_aluminium", 90, recipeOutput); + makeStorageRecipe("raw_aluminum", 90, recipeOutput); makeStorageRecipe("raw_azure_silver", 90, recipeOutput); makeStorageRecipe("raw_antimony", 90, recipeOutput); makeStorageRecipe("raw_cloggrum", 90, recipeOutput); + makeStorageRecipe("raw_cobalt", 90, recipeOutput); makeStorageRecipe("raw_copper", 90, recipeOutput); makeStorageRecipe("raw_crimson_iron", 90, recipeOutput); makeStorageRecipe("raw_froststeel", 90, recipeOutput); @@ -174,9 +175,11 @@ public static void eldritch(RecipeOutput recipeOutput) { makeStorageRecipe("emerald", 90, recipeOutput); makeStorageRecipe("fluorite", 90, recipeOutput); makeStorageRecipe("inferium_essence", 90, recipeOutput); + makeStorageRecipe("jade", 90, recipeOutput); makeStorageRecipe("lapis", 90, recipeOutput); makeStorageRecipe("lignite_coal", 90, recipeOutput); makeStorageRecipe("monazite", 90, recipeOutput); + makeStorageRecipe("onyx", 90, recipeOutput); makeStorageRecipe("peridot", 90, recipeOutput); makeStorageRecipe("prosperity_shard", 90, recipeOutput); makeStorageRecipe("redstone", 90, recipeOutput); @@ -197,7 +200,6 @@ public static void eldritch(RecipeOutput recipeOutput) { makeStorageRecipe("beryl", 90, recipeOutput); makeStorageRecipe("boron", 90, recipeOutput); makeStorageRecipe("cinnabar", 90, recipeOutput); - makeStorageRecipe("cobalt", 90, recipeOutput); makeStorageRecipe("dimensional_shard",90,recipeOutput); makeStorageRecipe("electrotine", 90, recipeOutput); makeStorageRecipe("garnet", 90, recipeOutput); @@ -210,7 +212,6 @@ public static void eldritch(RecipeOutput recipeOutput) { makeStorageRecipe("mithril", 90, recipeOutput); makeStorageRecipe("morganite", 90, recipeOutput); makeStorageRecipe("niter", 90, recipeOutput); - makeStorageRecipe("onyx", 90, recipeOutput); makeStorageRecipe("opal", 90, recipeOutput); makeStorageRecipe("tanzanite", 90, recipeOutput); makeStorageRecipe("thorium", 90, recipeOutput); @@ -230,7 +231,6 @@ public static void eldritch(RecipeOutput recipeOutput) { makeStorageRecipe("ghastly", 90, recipeOutput); makeStorageRecipe("ghoulish", 90, recipeOutput); makeStorageRecipe("green_gemstone", 90, recipeOutput); - makeStorageRecipe("jade", 90, recipeOutput); makeStorageRecipe("jewelyte", 90, recipeOutput); makeStorageRecipe("limonite", 90, recipeOutput); makeStorageRecipe("lyon", 90, recipeOutput); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/recipe/OccultismRecipeProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/recipe/OccultismRecipeProvider.java index a9a07779d..db08ea0a3 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/recipe/OccultismRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/recipe/OccultismRecipeProvider.java @@ -377,6 +377,11 @@ private void crushingRecipes(RecipeOutput pRecipeOutput) { .setResultAmount(4) .unlockedBy("has_blaze_rod", has(Tags.Items.RODS_BLAZE)) .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crushing/blaze_powder_from_rod")); + CrushingRecipeBuilder.crushingRecipe(Tags.Items.BONES, Items.BONE_MEAL, 200) + .allowEmpty() + .setResultAmount(4) + .unlockedBy("has_bone", has(Tags.Items.BONES)) + .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crushing/bone_meal_from_bone")); CrushingRecipeBuilder.crushingRecipe(Tags.Items.ORES_NETHERITE_SCRAP, OccultismTags.Items.NETHERITE_SCRAP_DUST, 200) .allowEmpty() .setResultAmount(2) 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 9dd0478e3..61e93c2b7 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 @@ -108,10 +108,11 @@ private static void summonRituals(RecipeOutput recipeOutput, HolderLookup.Provid 120, RITUAL_SUMMON_JOB, PENTACLE_SUMMON_AFRIT, - Ingredient.of(Tags.Items.GEMS_DIAMOND), - Ingredient.of(OccultismTags.Items.IESNIUM_DUST), Ingredient.of(OccultismTags.Items.IESNIUM_DUST), - Ingredient.of(Tags.Items.GEMS_EMERALD)) + Ingredient.of(OccultismTags.Items.EMERALD_DUST), + Ingredient.of(OccultismTags.Items.LAPIS_DUST), + Ingredient.of(OccultismTags.Items.AMETHYST_DUST), + Ingredient.of(OccultismTags.Items.OBSIDIAN_DUST)) .unlockedBy("has_bound_afrit", has(OccultismItems.BOOK_OF_BINDING_BOUND_AFRIT.get())) .spiritMaxAge(-1) .spiritJobType(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crush_tier3")) @@ -1402,7 +1403,8 @@ private static void craftingRituals(RecipeOutput recipeOutput) { Ingredient.of(OccultismBlocks.STORAGE_STABILIZER_TIER2.get()), Ingredient.of(Tags.Items.STORAGE_BLOCKS_GOLD), Ingredient.of(Items.NETHER_STAR), - Ingredient.of(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get())) + Ingredient.of(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get()), + Ingredient.of(OccultismItems.AFRIT_ESSENCE.get())) .unlockedBy("has_bound_afrit", has(OccultismItems.BOOK_OF_BINDING_BOUND_AFRIT.get())) .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual/craft_stabilizer_tier3")); @@ -1416,7 +1418,8 @@ private static void craftingRituals(RecipeOutput recipeOutput) { Ingredient.of(OccultismTags.Items.STORAGE_BLOCK_IESNIUM), Ingredient.of(Items.DRAGON_HEAD), Ingredient.of(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get()), - Ingredient.of(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get())) + Ingredient.of(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get()), + Ingredient.of(OccultismItems.MARID_ESSENCE.get())) .unlockedBy("has_bound_marid", has(OccultismItems.BOOK_OF_BINDING_BOUND_MARID.get())) .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual/craft_stabilizer_tier4")); @@ -1656,7 +1659,8 @@ private static void minerRecipes(RecipeOutput recipeOutput) { Ingredient.of(Items.NETHERITE_PICKAXE), Ingredient.of(Items.DRAGON_BREATH), Ingredient.of(Items.TOTEM_OF_UNDYING), - Ingredient.of(Items.NETHER_STAR)) + Ingredient.of(Items.NETHER_STAR), + Ingredient.of(OccultismItems.MARID_ESSENCE.get())) .unlockedBy("has_bound_marid", has(OccultismItems.BOOK_OF_BINDING_BOUND_MARID.get())) .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "ritual/craft_miner_marid_master")); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java index 9fd395929..71f0aed5b 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismBlockTagProvider.java @@ -7,6 +7,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; @@ -124,6 +125,14 @@ private void addOccultismTags(HolderLookup.Provider provider) { .add(OccultismBlocks.GOLDEN_SACRIFICIAL_BOWL.get()) .add(OccultismBlocks.SPIRIT_ATTUNED_CRYSTAL.get()) .addTag(BlockTags.CANDLES) + .addTag(Tags.Blocks.GLASS_PANES) + .add(Blocks.ENCHANTING_TABLE) + .add(Blocks.BEACON) + .add(Blocks.LODESTONE) + .add(Blocks.AMETHYST_CLUSTER) + .add(Blocks.END_ROD) + .add(Blocks.LIGHTNING_ROD) + .add(Blocks.IRON_BARS) .addOptionalTag(OccultismTags.Blocks.CHALK_GLYPHS) .replace(false); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java index a663b4c6d..d644e0f27 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java @@ -288,6 +288,19 @@ private void addCommonTags(HolderLookup.Provider provider) { this.tag(OccultismTags.Items.DATURA_SEEDS).add(OccultismItems.DATURA_SEEDS.get()).replace(false); this.tag(Tags.Items.SEEDS).addTags(OccultismTags.Items.DATURA_SEEDS).replace(false); + //Foods + this.tag(Tags.Items.FOODS) + .add(OccultismItems.DATURA.get()) + .add(OccultismItems.DEMONS_DREAM_ESSENCE.get()) + .add(OccultismItems.OTHERWORLD_ESSENCE.get()) + .add(OccultismItems.BEAVER_NUGGET.get()) + .add(OccultismItems.CURSED_HONEY.get()) + .add(OccultismItems.DEMONIC_MEAT.get()) + .replace(false); + this.tag(ItemTags.MEAT) + .add(OccultismItems.DEMONIC_MEAT.get()) + .replace(false); + // Storage Blocks this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_IESNIUM, OccultismTags.Items.STORAGE_BLOCK_IESNIUM); this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_SILVER, OccultismTags.Items.STORAGE_BLOCK_SILVER); diff --git a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/CrushingRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/CrushingRecipeCategory.java index d9100513f..666058882 100644 --- a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/CrushingRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/CrushingRecipeCategory.java @@ -12,13 +12,18 @@ import dev.emi.emi.api.stack.EmiStack; import dev.emi.emi.api.widget.WidgetHolder; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTextTooltip; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeHolder; import org.jetbrains.annotations.Nullable; +import java.util.ArrayList; import java.util.List; public class CrushingRecipeCategory implements EmiRecipe { @@ -26,8 +31,13 @@ public class CrushingRecipeCategory implements EmiRecipe { private final List input; private final List output; + private final Integer min; + private final Integer max; + public CrushingRecipeCategory(RecipeHolder recipe) { id=recipe.id(); + this.min = recipe.value().getMinTier(); + this.max = recipe.value().getMaxTier(); this.input = List.of(EmiIngredient.of(recipe.value().getIngredients().get(0))); this.output = List.of(EmiStack.of(recipe.value().getResultItem(Minecraft.getInstance().level.registryAccess()))); } @@ -52,6 +62,14 @@ public List getOutputs() { return this.output; } + public Integer getMin() { + return this.min; + } + + public Integer getMax() { + return this.max; + } + @Override public int getDisplayWidth() { return 110; @@ -59,21 +77,46 @@ public int getDisplayWidth() { @Override public int getDisplayHeight() { - return 20; + return 30; } + @Override public void addWidgets(WidgetHolder widgetHolder) { - widgetHolder.addSlot(input.get(0), 0, 2); - widgetHolder.addTexture(EmiTexture.EMPTY_ARROW,18,2); + widgetHolder.addSlot(input.get(0), 0, 7); + widgetHolder.addTexture(EmiTexture.EMPTY_ARROW,18,7); + int y = 0; + int s = 12; + EntityType spiritType; + if(getMin() <= 1) { + y = 10; + s = 16; + spiritType = OccultismEntities.FOLIOT.get(); + } else if(getMin() == 2){ + spiritType = OccultismEntities.DJINNI.get(); + } else if(getMin() == 3){ + spiritType = OccultismEntities.AFRIT.get(); + } else { + spiritType = OccultismEntities.MARID.get(); + } + SpiritWidget widget = new SpiritWidget(53, y, spiritType,s).tooltip((mouseX, mouseY) -> + { + List tooltip = new ArrayList<>(); + if(getMin() >= 1) { + tooltip.add(new ClientTextTooltip(Component.translatable("jei.occultism.crushing.min_tier", getMin()).getVisualOrderText())); + } + if(getMax() >= 1) { + tooltip.add(new ClientTextTooltip(Component.translatable("jei.occultism.crushing.max_tier", getMax()).getVisualOrderText())); + } + return tooltip; + }); - SpiritWidget widget= new SpiritWidget(53,0, OccultismEntities.FOLIOT.get()); widgetHolder.add(widget); - widgetHolder.addTexture(EmiTexture.EMPTY_ARROW,64,2); + widgetHolder.addTexture(EmiTexture.EMPTY_ARROW,64,7); // Adds an output slot on the right // Note that output slots need to call `recipeContext` to inform EMI about their recipe context // This includes being able to resolve recipe trees, favorite stacks with recipe context, and more - widgetHolder.addSlot(output.get(0), 90, 2).recipeContext(this); + widgetHolder.addSlot(output.get(0), 90, 7).recipeContext(this); } private static final List tiers = List.of( diff --git a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/RitualRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/RitualRecipeCategory.java index cd6890823..6c781f487 100644 --- a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/RitualRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/recipes/RitualRecipeCategory.java @@ -8,8 +8,7 @@ import com.klikli_dev.occultism.crafting.recipe.conditionextension.RitualRecipeConditionDescriptionVisitor; import com.klikli_dev.occultism.integration.emi.impl.OccultismEmiPlugin; import com.klikli_dev.occultism.integration.emi.impl.render.ItemWidget; -import com.klikli_dev.occultism.registry.OccultismBlocks; -import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.*; import com.mojang.datafixers.util.Pair; import dev.emi.emi.api.recipe.EmiRecipe; import dev.emi.emi.api.recipe.EmiRecipeCategory; @@ -27,6 +26,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.SpawnEggItem; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeHolder; @@ -79,7 +79,15 @@ public List getOutputs() { outputs.add(EmiStack.of(egg)); } } + extraItems(recipe.getEntityToSummon().getDefaultLootTable().toString(), outputs); } + + if(recipe.getRitualType().toString().contains("repair")){ + for(ItemStack item:recipe.getActivationItemStack()){ + outputs.add(EmiStack.of(item)); + } + } + outputs.add(EmiStack.of(recipe.getRitualDummy())); return outputs; } @@ -94,6 +102,129 @@ public int getDisplayHeight() { return 90; } + public void extraItems(String mob, List list){ + if(mob.contains("possessed_breeze")) { + list.add(EmiStack.of(Items.BREEZE_ROD)); + list.add(EmiStack.of(Items.BOLT_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.GUSTER_BANNER_PATTERN)); + list.add(EmiStack.of(Items.MUSIC_DISC_PRECIPICE)); + } + if(mob.contains("possessed_elder_guardian")) { + list.add(EmiStack.of(Items.NAUTILUS_SHELL)); + list.add(EmiStack.of(Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.WET_SPONGE)); + list.add(EmiStack.of(Items.TROPICAL_FISH)); + list.add(EmiStack.of(Items.COD)); + list.add(EmiStack.of(Items.SALMON)); + list.add(EmiStack.of(Items.PUFFERFISH)); + list.add(EmiStack.of(Items.COOKED_COD)); + list.add(EmiStack.of(Items.COOKED_SALMON)); + list.add(EmiStack.of(Items.PRISMARINE_SHARD)); + list.add(EmiStack.of(Items.PRISMARINE_CRYSTALS)); + } + if(mob.contains("possessed_enderman")) { + list.add(EmiStack.of(Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE)); + } + if(mob.contains("possessed_evoker")) { + list.add(EmiStack.of(Items.OMINOUS_BOTTLE)); + list.add(EmiStack.of(Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE)); + } + if(mob.contains("possessed_ghast")) { + list.add(EmiStack.of(Items.GUNPOWDER)); + } + if(mob.contains("possessed_hoglin")) { + list.add(EmiStack.of(Items.NETHERITE_SCRAP)); + list.add(EmiStack.of(Items.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.PIGLIN_BANNER_PATTERN)); + list.add(EmiStack.of(Items.NETHER_BRICK)); + } + if(mob.contains("possessed_shulker")) { + list.add(EmiStack.of(Items.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE)); + } + if(mob.contains("possessed_skeleton")) { + list.add(EmiStack.of(Items.BONE)); + list.add(EmiStack.of(Items.ARROW)); + } + if(mob.contains("possessed_strong_breeze")) { + list.add(EmiStack.of(Items.FLOW_BANNER_PATTERN)); + list.add(EmiStack.of(Items.FLOW_POTTERY_SHERD)); + list.add(EmiStack.of(Items.FLOW_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.MUSIC_DISC_CREATOR)); + } + if(mob.contains("possessed_warden")) { + list.add(EmiStack.of(Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.MUSIC_DISC_OTHERSIDE)); + list.add(EmiStack.of(Items.DISC_FRAGMENT_5)); + } + if(mob.contains("possessed_weak_breeze")) { + list.add(EmiStack.of(Items.OMINOUS_BOTTLE)); + list.add(EmiStack.of(Items.MUSIC_DISC_CREATOR_MUSIC_BOX)); + list.add(EmiStack.of(Items.SCRAPE_POTTERY_SHERD)); + list.add(EmiStack.of(Items.GUSTER_POTTERY_SHERD)); + } + if(mob.contains("possessed_weak_shulker")) { + list.add(EmiStack.of(Items.SHULKER_SHELL)); + } + if(mob.contains("possessed_witch")) { + list.add(EmiStack.of(Items.OMINOUS_BOTTLE)); + list.add(EmiStack.of(Items.HONEY_BOTTLE)); + list.add(EmiStack.of(Items.POTION)); + } + if(mob.contains("wild_hunt")) { + list.add(EmiStack.of(Items.RIB_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.COAL)); + list.add(EmiStack.of(Items.BONE)); + list.add(EmiStack.of(Items.ARROW)); + } + if(mob.contains("horde_creeper")) { + list.add(EmiStack.of(Items.MUSIC_DISC_13)); + list.add(EmiStack.of(Items.MUSIC_DISC_BLOCKS)); + list.add(EmiStack.of(Items.MUSIC_DISC_CHIRP)); + list.add(EmiStack.of(Items.MUSIC_DISC_FAR)); + list.add(EmiStack.of(Items.MUSIC_DISC_MALL)); + list.add(EmiStack.of(Items.MUSIC_DISC_MELLOHI)); + list.add(EmiStack.of(Items.MUSIC_DISC_STAL)); + list.add(EmiStack.of(Items.MUSIC_DISC_STRAD)); + list.add(EmiStack.of(Items.MUSIC_DISC_WARD)); + list.add(EmiStack.of(Items.MUSIC_DISC_11)); + list.add(EmiStack.of(Items.MUSIC_DISC_WAIT)); + } + if(mob.contains("horde_drowned")) { + list.add(EmiStack.of(Items.TRIDENT)); + list.add(EmiStack.of(Items.TURTLE_EGG)); + list.add(EmiStack.of(Items.SHELTER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.SNORT_POTTERY_SHERD)); + list.add(EmiStack.of(Items.ANGLER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.PLENTY_POTTERY_SHERD)); + list.add(EmiStack.of(Items.BLADE_POTTERY_SHERD)); + list.add(EmiStack.of(Items.EXPLORER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.MOURNER_POTTERY_SHERD)); + } + if(mob.contains("horde_husk")) { + list.add(EmiStack.of(Items.SKULL_POTTERY_SHERD)); + list.add(EmiStack.of(Items.ARCHER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.PRIZE_POTTERY_SHERD)); + list.add(EmiStack.of(Items.MINER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.BREWER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.ARMS_UP_POTTERY_SHERD)); + } + if(mob.contains("horde_silverfish")) { + list.add(EmiStack.of(Items.HEART_POTTERY_SHERD)); + list.add(EmiStack.of(Items.SHEAF_POTTERY_SHERD)); + list.add(EmiStack.of(Items.DANGER_POTTERY_SHERD)); + list.add(EmiStack.of(Items.BURN_POTTERY_SHERD)); + list.add(EmiStack.of(Items.HOWL_POTTERY_SHERD)); + list.add(EmiStack.of(Items.FRIEND_POTTERY_SHERD)); + list.add(EmiStack.of(Items.HEARTBREAK_POTTERY_SHERD)); + list.add(EmiStack.of(Items.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE)); + list.add(EmiStack.of(Items.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE)); + } + } @Override public void addWidgets(WidgetHolder widgetHolder) { @@ -158,7 +289,6 @@ public void addWidgets(WidgetHolder widgetHolder) { widgetHolder.addSlot(EmiIngredient.of(Ingredient.of(recipe.getRitualDummy())), 110, 70); } - widgetHolder.addSlot(EmiIngredient.of(Ingredient.of(recipe.getRitualDummy())), 82, 53).drawBack(false); int infotextY = 0; @@ -212,6 +342,12 @@ public void addWidgets(WidgetHolder widgetHolder) { } return tooltip; }); + + List drops = new ArrayList<>(); + extraItems(recipe.getEntityToSummon().getDefaultLootTable().toString(), drops); + if(!drops.isEmpty()) { + widgetHolder.addSlot(EmiIngredient.of(drops), 110, 52); + } } if(recipe.getCondition() != null){ diff --git a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/render/SpiritWidget.java b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/render/SpiritWidget.java index ceb239522..035020aa7 100644 --- a/src/main/java/com/klikli_dev/occultism/integration/emi/impl/render/SpiritWidget.java +++ b/src/main/java/com/klikli_dev/occultism/integration/emi/impl/render/SpiritWidget.java @@ -6,29 +6,46 @@ import dev.emi.emi.api.widget.Widget; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.world.entity.EntityType; +import java.util.List; +import java.util.function.BiFunction; + public class SpiritWidget extends Widget { - private int x,y; + private int x,y,s; private T spiritEntity; private EntityType spiritType; - public SpiritWidget(int x, int y, EntityType spiritType) { + private BiFunction> tooltipSupplier = (mouseX, mouseY) -> List.of(); + public SpiritWidget(int x, int y, EntityType spiritType, int s) { super(); this.x=x; this.y=y; + this.s=s; this.spiritType=spiritType; } @Override public Bounds getBounds() { - return new Bounds(x, y, 20, 20); + return new Bounds(x-15, 0, 30, 30); } @Override public void render(GuiGraphics draw, int mouseX, int mouseY, float delta) { if(spiritEntity==null) spiritEntity= spiritType.create(Minecraft.getInstance().level); - SpiritGui.drawEntityToGui(draw, (int) (x),(int)(y+(spiritEntity.getEyeHeight()*15)+5),15,1,1,spiritEntity); + SpiritGui.drawEntityToGui(draw, (int) (x),(int)(y+(spiritEntity.getEyeHeight()*15)),s,1,1,spiritEntity); + } + + + public SpiritWidget tooltip(BiFunction> tooltipSupplier) { + this.tooltipSupplier = tooltipSupplier; + return this; } + @Override + public List getTooltip(int mouseX, int mouseY) { + return tooltipSupplier.apply(mouseX, mouseY); + } + } \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java index bc858ab98..9dbc350e6 100644 --- a/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java @@ -46,35 +46,35 @@ public class OccultismEntities { public static final Lazy> FOLIOT_TYPE = Lazy.of(() -> EntityType.Builder.of(FoliotEntity::new, MobCategory.CREATURE) - .sized(0.6f, 1.2f) + .sized(0.5f, 1.2f) .clientTrackingRange(8) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "foliot").toString())); public static final Lazy> DJINNI_TYPE = Lazy.of(() -> EntityType.Builder.of(DjinniEntity::new, MobCategory.CREATURE) - .sized(0.6f, 1.2f) + .sized(1.0f, 2.4f) .clientTrackingRange(8) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "djinni").toString())); public static final Lazy> AFRIT_TYPE = Lazy.of(() -> EntityType.Builder.of((EntityType t, Level l) -> new AfritEntity(t, l), MobCategory.CREATURE) .fireImmune() - .sized(1.2f, 2.4f) + .sized(1.0f, 2.4f) .clientTrackingRange(8) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "afrit").toString())); public static final Lazy> AFRIT_WILD_TYPE = Lazy.of(() -> EntityType.Builder.of((EntityType t, Level l) -> new AfritWildEntity(t, l), MobCategory.CREATURE) .fireImmune() - .sized(1.2f, 2.4f) + .sized(1.0f, 2.4f) .clientTrackingRange(8) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "afrit_wild").toString())); public static final Lazy> MARID_TYPE = Lazy.of(() -> EntityType.Builder.of(MaridEntity::new, MobCategory.CREATURE) - .sized(1.2f, 2.4f) + .sized(1.0f, 2.4f) .clientTrackingRange(8) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "marid").toString())); public static final Lazy> MARID_UNBOUND_TYPE = Lazy.of(() -> EntityType.Builder.of((EntityType t, Level l) -> new MaridUnboundEntity(t, l), MobCategory.CREATURE) - .sized(1.2f, 2.4f) + .sized(1.0f, 2.4f) .clientTrackingRange(16) .build(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "marid_unbound").toString())); diff --git a/src/main/resources/assets/occultism/textures/item/crushed_blackstone.png b/src/main/resources/assets/occultism/textures/item/crushed_blackstone.png index 035eb5abd..74f189223 100644 Binary files a/src/main/resources/assets/occultism/textures/item/crushed_blackstone.png and b/src/main/resources/assets/occultism/textures/item/crushed_blackstone.png differ diff --git a/src/main/resources/assets/occultism/textures/item/crushed_calcite.png b/src/main/resources/assets/occultism/textures/item/crushed_calcite.png index d1ce6cac1..72dd60bf0 100644 Binary files a/src/main/resources/assets/occultism/textures/item/crushed_calcite.png and b/src/main/resources/assets/occultism/textures/item/crushed_calcite.png differ diff --git a/src/main/resources/assets/occultism/textures/item/emerald_dust.png b/src/main/resources/assets/occultism/textures/item/emerald_dust.png index 2713dfc47..426de8f1b 100644 Binary files a/src/main/resources/assets/occultism/textures/item/emerald_dust.png and b/src/main/resources/assets/occultism/textures/item/emerald_dust.png differ diff --git a/src/main/resources/assets/occultism/textures/item/familiar_ring.png b/src/main/resources/assets/occultism/textures/item/familiar_ring.png index 7ce7b9b9c..78ce71567 100644 Binary files a/src/main/resources/assets/occultism/textures/item/familiar_ring.png and b/src/main/resources/assets/occultism/textures/item/familiar_ring.png differ diff --git a/src/main/resources/assets/occultism/textures/item/netherite_dust.png b/src/main/resources/assets/occultism/textures/item/netherite_dust.png index 4c994cf39..e93401cf0 100644 Binary files a/src/main/resources/assets/occultism/textures/item/netherite_dust.png and b/src/main/resources/assets/occultism/textures/item/netherite_dust.png differ diff --git a/src/main/resources/assets/occultism/textures/item/purified_ink.png b/src/main/resources/assets/occultism/textures/item/purified_ink.png index 4e23d4cda..289d911fd 100644 Binary files a/src/main/resources/assets/occultism/textures/item/purified_ink.png and b/src/main/resources/assets/occultism/textures/item/purified_ink.png differ diff --git a/src/main/resources/data/occultism/advancement/chalks/black.json b/src/main/resources/data/occultism/advancement/chalks/black.json index c0fdda98a..0018d9b2e 100644 --- a/src/main/resources/data/occultism/advancement/chalks/black.json +++ b/src/main/resources/data/occultism/advancement/chalks/black.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_black" }, "title": {"translate": "advancements.occultism.chalks.black.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.black.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.black.description"} }, "parent": "occultism:chalks/red", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_black": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_black"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/blue.json b/src/main/resources/data/occultism/advancement/chalks/blue.json index e060e2f34..02d372d1f 100644 --- a/src/main/resources/data/occultism/advancement/chalks/blue.json +++ b/src/main/resources/data/occultism/advancement/chalks/blue.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_blue" }, "title": {"translate": "advancements.occultism.chalks.blue.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.blue.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.blue.description"} }, "parent": "occultism:chalks/black", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_blue": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_blue"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/brown.json b/src/main/resources/data/occultism/advancement/chalks/brown.json index 8159c85be..ae999113c 100644 --- a/src/main/resources/data/occultism/advancement/chalks/brown.json +++ b/src/main/resources/data/occultism/advancement/chalks/brown.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_brown" }, "title": {"translate": "advancements.occultism.chalks.brown.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.brown.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.brown.description"} }, "parent": "occultism:chalks/blue", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_brown": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_brown"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/cyan.json b/src/main/resources/data/occultism/advancement/chalks/cyan.json index 8421602ea..f4cd87623 100644 --- a/src/main/resources/data/occultism/advancement/chalks/cyan.json +++ b/src/main/resources/data/occultism/advancement/chalks/cyan.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_cyan" }, "title": {"translate": "advancements.occultism.chalks.cyan.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.cyan.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.cyan.description"} }, "parent": "occultism:chalks/blue", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_cyan": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_cyan"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/gray.json b/src/main/resources/data/occultism/advancement/chalks/gray.json index 275d9db8d..2982c6817 100644 --- a/src/main/resources/data/occultism/advancement/chalks/gray.json +++ b/src/main/resources/data/occultism/advancement/chalks/gray.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_gray" }, "title": {"translate": "advancements.occultism.chalks.gray.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.gray.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.gray.description"} }, "parent": "occultism:chalks/lime", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_gray": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_gray"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/green.json b/src/main/resources/data/occultism/advancement/chalks/green.json index 35c4ddcb7..6df6f9a59 100644 --- a/src/main/resources/data/occultism/advancement/chalks/green.json +++ b/src/main/resources/data/occultism/advancement/chalks/green.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_green" }, "title": {"translate": "advancements.occultism.chalks.green.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.green.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.green.description"} }, "parent": "occultism:chalks/purple", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_green": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_green"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/light_blue.json b/src/main/resources/data/occultism/advancement/chalks/light_blue.json index fd879ceba..f673e14d7 100644 --- a/src/main/resources/data/occultism/advancement/chalks/light_blue.json +++ b/src/main/resources/data/occultism/advancement/chalks/light_blue.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_light_blue" }, "title": {"translate": "advancements.occultism.chalks.light_blue.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.light_blue.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.light_blue.description"} }, "parent": "occultism:chalks/lime", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_light_blue": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_light_blue"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/light_gray.json b/src/main/resources/data/occultism/advancement/chalks/light_gray.json index 8c7a6c58d..309284b0e 100644 --- a/src/main/resources/data/occultism/advancement/chalks/light_gray.json +++ b/src/main/resources/data/occultism/advancement/chalks/light_gray.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_light_gray" }, "title": {"translate": "advancements.occultism.chalks.light_gray.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.light_gray.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.light_gray.description"} }, "parent": "occultism:chalks/white", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_light_gray": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_light_gray"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/lime.json b/src/main/resources/data/occultism/advancement/chalks/lime.json index 8ec01fead..dc6114ff0 100644 --- a/src/main/resources/data/occultism/advancement/chalks/lime.json +++ b/src/main/resources/data/occultism/advancement/chalks/lime.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_lime" }, "title": {"translate": "advancements.occultism.chalks.lime.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.lime.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.lime.description"} }, "parent": "occultism:chalks/purple", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_lime": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_lime"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/magenta.json b/src/main/resources/data/occultism/advancement/chalks/magenta.json index b1b870676..806df8d21 100644 --- a/src/main/resources/data/occultism/advancement/chalks/magenta.json +++ b/src/main/resources/data/occultism/advancement/chalks/magenta.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_magenta" }, "title": {"translate": "advancements.occultism.chalks.magenta.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.magenta.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.magenta.description"} }, "parent": "occultism:chalks/blue", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_magenta": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_magenta"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/orange.json b/src/main/resources/data/occultism/advancement/chalks/orange.json index a2efcd02c..f35a14cdb 100644 --- a/src/main/resources/data/occultism/advancement/chalks/orange.json +++ b/src/main/resources/data/occultism/advancement/chalks/orange.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_orange" }, "title": {"translate": "advancements.occultism.chalks.orange.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.orange.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.orange.description"} }, "parent": "occultism:chalks/lime", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_orange": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_orange"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/pink.json b/src/main/resources/data/occultism/advancement/chalks/pink.json index a3e91bd88..4f1032635 100644 --- a/src/main/resources/data/occultism/advancement/chalks/pink.json +++ b/src/main/resources/data/occultism/advancement/chalks/pink.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_pink" }, "title": {"translate": "advancements.occultism.chalks.pink.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.pink.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.pink.description"} }, "parent": "occultism:chalks/orange", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_pink": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_pink"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/purple.json b/src/main/resources/data/occultism/advancement/chalks/purple.json index fc825ef1a..3487dbcaf 100644 --- a/src/main/resources/data/occultism/advancement/chalks/purple.json +++ b/src/main/resources/data/occultism/advancement/chalks/purple.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_purple" }, "title": {"translate": "advancements.occultism.chalks.purple.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.purple.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.purple.description"} }, "parent": "occultism:chalks/yellow", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_purple": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_purple"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/red.json b/src/main/resources/data/occultism/advancement/chalks/red.json index cf822278c..71555fe10 100644 --- a/src/main/resources/data/occultism/advancement/chalks/red.json +++ b/src/main/resources/data/occultism/advancement/chalks/red.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_red" }, "title": {"translate": "advancements.occultism.chalks.red.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.red.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.red.description"} }, "parent": "occultism:chalks/orange", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_red": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_red"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/root.json b/src/main/resources/data/occultism/advancement/chalks/root.json index 6dea3f5a0..bfb9c7d38 100644 --- a/src/main/resources/data/occultism/advancement/chalks/root.json +++ b/src/main/resources/data/occultism/advancement/chalks/root.json @@ -10,17 +10,8 @@ "announce_to_chat": false }, "criteria": { - "chalk_impure": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "occultism:chalk_white_impure" - ] - } - ] - } + "always": { + "trigger": "minecraft:tick" } } } \ No newline at end of file diff --git a/src/main/resources/data/occultism/advancement/chalks/white.json b/src/main/resources/data/occultism/advancement/chalks/white.json index 0c3e0d544..e41711bc0 100644 --- a/src/main/resources/data/occultism/advancement/chalks/white.json +++ b/src/main/resources/data/occultism/advancement/chalks/white.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_white" }, "title": {"translate": "advancements.occultism.chalks.white.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.white.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.white.description"} }, "parent": "occultism:chalks/root", "criteria": { "chalk_white": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_white"]], + "sends_telemetry_event": true } diff --git a/src/main/resources/data/occultism/advancement/chalks/yellow.json b/src/main/resources/data/occultism/advancement/chalks/yellow.json index 572070260..020cf4ecf 100644 --- a/src/main/resources/data/occultism/advancement/chalks/yellow.json +++ b/src/main/resources/data/occultism/advancement/chalks/yellow.json @@ -1,17 +1,15 @@ { "display": { "icon": { + "count": 1, "id": "occultism:chalk_gold" }, "title": {"translate": "advancements.occultism.chalks.yellow.title"}, - "description": {"color":"green","translate":"advancements.occultism.chalks.yellow.description"}, - "show_toast": true, - "announce_to_chat": false + "description": {"color":"green","translate":"advancements.occultism.chalks.yellow.description"} }, "parent": "occultism:chalks/white", "criteria": { - "chalk_white": { - "trigger": "minecraft:inventory_changed", + "chalk_gold": { "conditions": { "items": [ { @@ -20,7 +18,10 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" } - } + }, + "requirements": [["chalk_gold"]], + "sends_telemetry_event": true }