diff --git a/src/main/java/de/dafuqs/spectrum/blocks/structure/DreamGateBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/structure/DreamGateBlock.java index 09f6132ea0..d917cd1fd6 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/structure/DreamGateBlock.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/structure/DreamGateBlock.java @@ -1,6 +1,7 @@ package de.dafuqs.spectrum.blocks.structure; import de.dafuqs.spectrum.cca.azure_dike.*; +import de.dafuqs.spectrum.helpers.*; import de.dafuqs.spectrum.networking.*; import de.dafuqs.spectrum.particle.*; import de.dafuqs.spectrum.registries.*; @@ -34,6 +35,10 @@ public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos var sleep = SleepStatusEffect.getGeneralSleepResistanceIfEntityHasSoporificEffect(livingEntity); if (sleep != -1) { + if (entity instanceof ServerPlayerEntity player) { + Support.grantAdvancementCriterion(player, "lategame/enter_strange_preservation_ruin", "enter_dream_gate"); + } + return VoxelShapes.empty(); } } diff --git a/src/main/java/de/dafuqs/spectrum/blocks/structure/ManxiBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/structure/ManxiBlock.java index b0da14977d..98a427a2e6 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/structure/ManxiBlock.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/structure/ManxiBlock.java @@ -52,7 +52,9 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) { if (!world.isClient() && !player.getAbilities().creativeMode) { player.sendMessage(Text.translatable("block.spectrum.manxi.nope").styled(s -> s.withColor(SpectrumStatusEffects.ETERNAL_SLUMBER_COLOR)), true); - player.damage(SpectrumDamageTypes.sleep(world, null), 1); + world.playSoundAtBlockCenter(pos, SpectrumSoundEvents.DEEP_CRYSTAL_RING, SoundCategory.BLOCKS, 1, 1.5F, true); + player.damage(SpectrumDamageTypes.sleep(world, null), 6); + player.takeKnockback(2, player.getX() - (pos.getX() + 0.5), player.getZ() - (pos.getZ() + 0.5)); } } diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 178161b7e3..233e45b0ea 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -287,6 +287,14 @@ "advancements.spectrum.find_excavation_site.title": "Very Boring", "advancements.spectrum.find_forgotten_city.description": "Enter a Forgotten City", "advancements.spectrum.find_forgotten_city.title": "Remnants of the Past", + "advancements.spectrum.find_undergrowth_manor.description": "Enter an Undergrowth Manor", + "advancements.spectrum.find_undergrowth_manor.title": "Hideaway", + "advancements.spectrum.enter_strange_preservation_ruin.description": "Enter an unusually moist ruin that smells strongly of incense.", + "advancements.spectrum.enter_strange_preservation_ruin.title": "Jagged Dive", + "advancements.spectrum.solve_strange_preservation_ruin.description": "A structure that got you lost in black waters... no more", + "advancements.spectrum.solve_strange_preservation_ruin.title": "Resurfacing", + "advancements.spectrum.collect_nectar_gloves.description": "Discover the secret of the manor's courtyard", + "advancements.spectrum.collect_nectar_gloves.title": "Beaneath the Tide", "advancements.spectrum.find_forsaken_cathedral.description": "Find a run down Sacred Site", "advancements.spectrum.find_forsaken_cathedral.title": "Artists' Academy", "advancements.spectrum.find_preservation_ruins.description": "In the underground you found a well-protected structure. There HAS to be a way to get into it! If not now, then later... better keep this place in mind.", @@ -2466,7 +2474,7 @@ "book.spectrum.guidebook.downstone.page0.text": "In the deepest parts of the Deeper Down, I found this new type of stone.\\\nImmensely hard, even [#](bb00bb)Bedrock[#]() is a joke compared to it.", "book.spectrum.guidebook.downstone_fragments.page0.text": "Looks like whoever came before me was able to harvest Downstone! But only with the help of [colossal, imposing drills](entry://dimension/excavation_sites).\\\n\\\nIt seems like they used it to manufacture [#](bb00bb)Preservation Stone[#]()?", "book.spectrum.guidebook.knotted_sword.page0.text": "A living sword! Just as lively to use!.\\\nPlaying around with [Nightdew](entry://general/nightdew_sprout) and some of that [Vegetal](entry://general/vegetal) stuff I created, I managed to create this [#](bb00bb)Light greatsword[#](). I can use it to block attacks and even strengthen my counterattack if I shield right before I am hit.\\\nIf I am airborne when I stop blocking, I can even lunge forward with it!", - "book.spectrum.guidebook.knotted_sword.page1.text": "Getting hit by this mid-lunge would probably hurt a lot - especially since the force would probably be enough to make the blade shed some poison stuff.\\\n\\\n*I-no. Not that kind of knot.*", + "book.spectrum.guidebook.knotted_sword.page1.text": "Getting hit by this mid-lunge would probably hurt a lot - especially since the force would probably be enough to make the blade shed some poison stuff.\\\n\\\n*Not that kind of knot.*", "book.spectrum.guidebook.nectar_lance.page0.text": "Long did I stare into the pages of Manxi's journal, and at the endlessness of those vestiges I cannot find the words to describe.\\\nThis was the result. A new [#](bb00bb)Light greatsword[#](), one that is sharper, better honed, better balanced; its lunges go farther and strike truer, and its guard is more reliable.\\\n\\\nPiercing someone with its lunge will consume their status effects.", "book.spectrum.guidebook.nectar_lance.page1.text": "DoT effects will deal a chunk of the damage they would have dealt; if there are none, then those afflicted with sleep will always be crit. If neither of those can happen, then it will steal positive effects.\\\n\\\n*This one does not have a knot...*", "book.spectrum.guidebook.draconic_twinsword.page0.text": "What my musings have created here is nothing short of a masterpiece of versatility.\\\nThis double-headed sword is exquisitely balanced, allowing for wide and powerful sweeping attacks. The delicate [Bloodstone](entry://creating_life/bloodstone) construction of the weapon makes it delightfully stalwart, and excellent at keeping an edge.\\\n\\\nAn unwelcoming, yet entrancing weapon.", @@ -2474,6 +2482,10 @@ "book.spectrum.guidebook.draconic_twinsword.page2.text": "The dynamism of this weapon goes on much further. If I switch hands while holding it while my other hand is empty, I can split the sword in two, resulting in a pair of twin daggers. Swift and deadly, these can also be thrown, though they work a little differently. Those same wisps of fluttering dandelion allow for nefarious mobility.", "book.spectrum.guidebook.draconic_twinsword.page3.text": "I can recall the daggers at will after throwing them - flinging me forward, or alternatively throwing the mobs they hit towards me. There are a lot of things that affect how and who moves, so I better play around with it a bit.", "book.spectrum.guidebook.draconic_twinsword.page4.text": "As a footnote, the weapon has some unique enchantment interactions.\n- [Inertia](entry://enchanting/enchantments/inertia) boosts the Twinsword's strength each time it rebounds, while the talon's yoink on entities becomes stronger\n- [Improved Critical](entry://enchanting/enchantments/improved_critical) improves hits against airborne targets\n- Channeling improves sweeping and trades single-target ranged damage for AoE.\n- Piercing does exactly what I would expect", + "book.spectrum.guidebook.nectar_gloves.page0.text": "A strange find in an even stranger place. These aubergine gloves are crafted of fine leather and are adorned with a peculiar white crystal.\\\n\\\nPutting them on seems to ward me with dike, and more than that, they cleanse me of negative status effects.", + "book.spectrum.guidebook.nectar_gloves.page1.text": "*These leave me wondering so many things.\\\nTo bear dike while being devoid of [#](2432ff)Azurite[#]()... how?*", + "book.spectrum.guidebook.azuresque_dike_core.page0.text": "My magnum opus of azure dike! The machinations of preservation structures have vexed me for so long, but I think I have finally made an advanced in replicating them!\\\n\\\n Through the use of that... thing... I have managed to create a circuit that greatly empowers dike, speeding up its recovery and doubling any source of it.\\\nIt is, however, unable of producing a shield on its own. Hmph.", + "book.spectrum.guidebook.azuresque_dike_core.page1.text": "*A giant step for me!...\\\n\\\n...But a tiny one towards replicating the structures. The vestiges are far too faint, and the amount of azurite and downstone required would be unattainable.*", "book.spectrum.guidebook.dragonbone.page0.text": "Is it really dragons these giant remnants come from?\\\nI don't know, honestly. But judging by their size, they could very well be!\\\n\\\nEven now, these blocks are surrounded by a magical aura, protecting them from blatant mining attempts. I had a *blast* just running my fingers over their rough surface.", "book.spectrum.guidebook.dragonbone.page1.text": "Damaging Dragonbone using [#](449900)Explosions[#]() seems to blow away the magical aura protecting them, finally making the blocks mineable.\\\nThe dropped pieces still retain some of that ancient magic.", "book.spectrum.guidebook.dragonbone.page2.text": "The [Cinderhearth](entry://ink/cinderhearth) is the only thing that generates enough heat to turn these bones to ash.", @@ -2572,6 +2584,11 @@ "book.spectrum.guidebook.forgotten_cities.page1.text": "So **there is** intelligent life down there! Or... was.\\\nAlthough the city looks like it's absolutely inhabited, I haven't found a single sign of the inhabitants.\\\n\\\nWhere are they?\\\nWhere did they go?", "book.spectrum.guidebook.forsaken_cathedral.page0.text": "*A final landmark*", "book.spectrum.guidebook.forsaken_cathedral.page1.text": "The end of my journey for now.\\\n\\\nIt was an arduous journey at times, but I have learned a lot.\\\n\\\\nSee you some day, my *Colorful World*.", + "book.spectrum.guidebook.undergrowth_manor.page0.text": "*Hidden away, but why?*", + "book.spectrum.guidebook.undergrowth_manor.page1.text": "I was not expecting to find a mansion down here, much less deep within nooks of the gardens.\\\n\\\nIt is clear that this place held some status in its time, what with its lofty standing and stained glass... I am left to wonder why it is here, sequestered deep within the overgrowth.", + "book.spectrum.guidebook.undergrowth_manor.page4.title": "The Dreiton", + "book.spectrum.guidebook.undergrowth_manor.page5.text": "I was not expecting to find a person here, much less a sleeping woman.\\\n\\\nAt first I thought she was dead, but I quickly realized that she is breathing. They are just... very soft, very shallow, very quiet breaths.\\\n\\\n*This place is falling apart... she must have been here for decades if not centuries.*", + "book.spectrum.guidebook.undergrowth_manor.page4.text": "*...I don't think she is going to wake up.*", "book.spectrum.guidebook.foundry.page0.text": "I still remember my first days in this world, when I laboriously knocked coal out of stone to melt ore. But those days are numbered - the future is now, old me.\\\n\\\nBut there is a price to pay: I will lose out on the experience I would get from smelting.", "book.spectrum.guidebook.foundry.page1.text": "Automatically smelts broken blocks. Used on a [#](bb00bb)Fishing Rod[#]() it will set its hook on fire.\\\n\\\nMax Level: 1\\\nApplicable to mining tools and [#](bb00bb)Spectrum's Fishing Rods[#]().\\\nMutually exclusive with Silk Touch.", "book.spectrum.guidebook.four_upgrade_slots": "4 upgrade slots", @@ -2670,6 +2687,7 @@ "book.spectrum.guidebook.glowblocks.page0.text": "I now have pigments as pure as can be. So why not make blocks with color as pure as can be!\\\n\\\nI thought about calling them [#](449900)Antiblocks[#](), but since they are indeed blocks that would be silly, wouldn't it?", "book.spectrum.guidebook.glowblocks.page1.text": "Glowblocks glow from the inside so they always look the same, no matter how much light falls on their surface.", "book.spectrum.guidebook.greater_potion_pendant.page0.text": "Works very much like its [little brother](entry://brewing/lesser_potion_pendant).\\\nHowever, this version has three chambers, each of which can be filled with a different potion - meaning it can only support level I effects.", + "book.spectrum.guidebook.concealing_oils.page0.text": "This concoction caught my eye reading through the Dreiton's journal. I can use it to infuse food items with potion effects - just got to fill it in the workshop first...", "book.spectrum.guidebook.hardcore_revival.name": "Hardcore Revival", "book.spectrum.guidebook.hardcore_revival.page0.text": "I have made a discovery. The universe seems to be much kinder to me than anything else around me. Whenever I have blacked out from too much damage, I have always woken up healthy and fit again, as if I had been given new life.\\\nThough what if I can't always cheat death? I've come up with a failsafe in case things ever go horribly wrong.", "book.spectrum.guidebook.hardcore_revival.page0.title": "Hardcore Player Revival", @@ -3244,6 +3262,9 @@ "book.spectrum.guidebook.monstrosity.page0.text": "There is *something* lurking in the dark for me, I am sure. Am I going mad? Is it just my nerves?", "book.spectrum.guidebook.moonstone_cores.name": "Moonstone Cores", "book.spectrum.guidebook.moonstone_cores.page0.text": "This powerhouse of an item is capable pf channeling huge amounts of [#](d0d6d7)Ink[#]() with ease. Can be used to enhance the capabilities of equipment and devices.\\\n\\\n*A relic of times long past*.", + "book.spectrum.guidebook.aether_vestiges.page0.text": "Words leave me every time I look at this. I wish I could write more but...\\\n\\\nEvery time I look at this I loose track of time and space; my head pounds as if my brain were a trapped rat, trying to escape from certain doom. An overwhelming sense of dread creeps up from my heart and up my throat, it strangles and chokes me until I tear up.", + "book.spectrum.guidebook.aether_vestiges.page1.title": "Remnants", + "book.spectrum.guidebook.aether_vestiges.page1.text": "*These are but the barest dregs of something greater, something beyond time and thought.\\\n\\\nIt is beyond mortal mind and yet I cannot help but dream of what it could be.*", "book.spectrum.guidebook.moonstone_geodes.name": "Moonstone Geodes", "book.spectrum.guidebook.moonstone_geodes.page0.text": "*Purity*", "book.spectrum.guidebook.moonstone_geodes.page1.text": "Bright white shone towards me, almost dazzling down there. I knew right away where I was. Did fate bring me here? It can hardly be coincidence, can it?\\\n\\\n[Moonstone](entry://general/moonstone_shards), the last piece of my [big puzzle](entry://general/color_mixing_white).", diff --git a/src/main/resources/assets/spectrum/textures/gui/guidebook/stargazer_manxi.png b/src/main/resources/assets/spectrum/textures/gui/guidebook/stargazer_manxi.png new file mode 100644 index 0000000000..013897e0f9 Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/gui/guidebook/stargazer_manxi.png differ diff --git a/src/main/resources/assets/spectrum/textures/gui/guidebook/undergrowth_manor.png b/src/main/resources/assets/spectrum/textures/gui/guidebook/undergrowth_manor.png new file mode 100644 index 0000000000..707725601b Binary files /dev/null and b/src/main/resources/assets/spectrum/textures/gui/guidebook/undergrowth_manor.png differ diff --git a/src/main/resources/data/spectrum/advancements/lategame/collect_nectar_gloves.json b/src/main/resources/data/spectrum/advancements/lategame/collect_nectar_gloves.json new file mode 100644 index 0000000000..c3edfb40c2 --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/lategame/collect_nectar_gloves.json @@ -0,0 +1,36 @@ +{ + "parent": "spectrum:lategame/find_undergrowth_manor", + "display": { + "icon": { + "item": "spectrum:aether_graced_nectar_gloves" + }, + "hidden": true, + "frame": "challenge", + "title": { + "translate": "advancements.spectrum.collect_nectar_gloves.title" + }, + "description": { + "translate": "advancements.spectrum.collect_nectar_gloves.description" + } + }, + "criteria": { + "has_aether_vestiges": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "spectrum:aether_graced_nectar_gloves" + ] + } + ] + } + }, + "gotten_previous": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/find_undergrowth_manor" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/lategame/collect_poisoners_handbook.json b/src/main/resources/data/spectrum/advancements/lategame/collect_poisoners_handbook.json index c98e93e4ac..2333bf886d 100644 --- a/src/main/resources/data/spectrum/advancements/lategame/collect_poisoners_handbook.json +++ b/src/main/resources/data/spectrum/advancements/lategame/collect_poisoners_handbook.json @@ -1,5 +1,5 @@ { - "parent": "spectrum:lategame/collect_nectardew", + "parent": "spectrum:lategame/find_undergrowth_manor", "display": { "icon": { "item": "spectrum:poisoners_handbook" @@ -22,7 +22,7 @@ "gotten_previous": { "trigger": "revelationary:advancement_gotten", "conditions": { - "advancement_identifier": "spectrum:lategame/collect_nectardew" + "advancement_identifier": "spectrum:lategame/enter_strange_preservation_ruin" } } } diff --git a/src/main/resources/data/spectrum/advancements/lategame/create_evernectar.json b/src/main/resources/data/spectrum/advancements/lategame/create_evernectar.json index a50de9b30a..48194d03c0 100644 --- a/src/main/resources/data/spectrum/advancements/lategame/create_evernectar.json +++ b/src/main/resources/data/spectrum/advancements/lategame/create_evernectar.json @@ -1,5 +1,5 @@ { - "parent": "spectrum:lategame/collect_poisoners_handbook", + "parent": "spectrum:lategame/collect_nectardew", "display": { "icon": { "item": "spectrum:evernectar" diff --git a/src/main/resources/data/spectrum/advancements/lategame/enter_strange_preservation_ruin.json b/src/main/resources/data/spectrum/advancements/lategame/enter_strange_preservation_ruin.json new file mode 100644 index 0000000000..7b16db5922 --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/lategame/enter_strange_preservation_ruin.json @@ -0,0 +1,26 @@ +{ + "parent": "spectrum:lategame/find_undergrowth_manor", + "display": { + "icon": { + "item": "minecraft:purple_banner" + }, + "title": { + "translate": "advancements.spectrum.enter_strange_preservation_ruin.title" + }, + "description": { + "translate": "advancements.spectrum.enter_strange_preservation_ruin.description" + }, + "hidden": true + }, + "criteria": { + "enter_dream_gate": { + "trigger": "minecraft:impossible" + }, + "gotten_previous": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/find_undergrowth_manor" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/lategame/find_undergrowth_manor.json b/src/main/resources/data/spectrum/advancements/lategame/find_undergrowth_manor.json new file mode 100644 index 0000000000..2050e44267 --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/lategame/find_undergrowth_manor.json @@ -0,0 +1,39 @@ +{ + "parent": "spectrum:lategame/spectrum_lategame", + "display": { + "icon": { + "item": "spectrum:longing_chimera" + }, + "hidden": true, + "title": { + "translate": "advancements.spectrum.find_undergrowth_manor.title" + }, + "description": { + "translate": "advancements.spectrum.find_undergrowth_manor.description" + } + }, + "criteria": { + "in_manor": { + "trigger": "minecraft:location", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "structure": "spectrum:undergrowth_manor" + } + } + } + ] + } + }, + "gotten_previous": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/spectrum_lategame" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/lategame/solve_strange_preservation_ruin.json b/src/main/resources/data/spectrum/advancements/lategame/solve_strange_preservation_ruin.json new file mode 100644 index 0000000000..45a175609e --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/lategame/solve_strange_preservation_ruin.json @@ -0,0 +1,29 @@ +{ + "parent": "spectrum:lategame/enter_strange_preservation_ruin", + "display": { + "icon": { + "item": "spectrum:deep_light_chiseled_preservation_stone" + }, + "title": { + "translate": "advancements.spectrum.solve_strange_preservation_ruin.title" + }, + "description": { + "translate": "advancements.spectrum.solve_strange_preservation_ruin.description" + }, + "hidden": true + }, + "criteria": { + "gotten_handbook": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_cookbooks/poisoners_handbook" + } + }, + "gotten_previous": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/enter_strange_preservation_ruin" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/concealing_oils.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/concealing_oils.json new file mode 100644 index 0000000000..6291112164 --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/concealing_oils.json @@ -0,0 +1,29 @@ +{ + "name": "item.spectrum.concealing_oils", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_cookbooks/poisoners_handbook" + }, + "icon": "spectrum:concealing_oils", + "category": "spectrum:brewing", + "hide_while_locked": true, + "parents": [], + "background_u_index": 0, + "background_v_index": 0, + "x": -3, + "y": -3, + "pages": [ + { + "type": "modonomicon:spotlight", + "item": { + "item": "spectrum:concealing_oils" + }, + "text": "book.spectrum.guidebook.concealing_oils.page0.text" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "container.spectrum.rei.pedestal_recipe", + "recipe_id": "spectrum:pedestal/tier4/concealing_oils" + } + ] +} diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/aether_vestiges.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/aether_vestiges.json new file mode 100644 index 0000000000..3dc4cb77ca --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/aether_vestiges.json @@ -0,0 +1,34 @@ +{ + "name": "item.spectrum.aether_vestiges", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:lategame/collect_aether_vestiges" + }, + "icon": "spectrum:aether_vestiges", + "category": "spectrum:dimension", + "hide_while_locked": true, + "parents": [ + { + "entry": "spectrum:dimension/delving_deeper_down" + } + ], + "background_u_index": 0, + "background_v_index": 4, + "x": -2, + "y": -6, + "pages": [ + { + "type": "modonomicon:text", + "title": "item.spectrum.aether_vestiges", + "text": "book.spectrum.guidebook.aether_vestiges.page0.text" + }, + { + "type": "modonomicon:spotlight", + "title": "book.spectrum.guidebook.aether_vestiges.page1.title", + "item": { + "item": "spectrum:aether_vestiges" + }, + "text": "book.spectrum.guidebook.aether_vestiges.page1.text" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/nectar_gloves.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/nectar_gloves.json index bc7631c10d..7f2f410b9c 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/nectar_gloves.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/nectar_gloves.json @@ -2,14 +2,14 @@ "name": "item.spectrum.aether_graced_nectar_gloves", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_cookbooks/poisoners_handbook" + "advancement_id": "spectrum:lategame/collect_nectar_gloves" }, "icon": "spectrum:aether_graced_nectar_gloves", "category": "spectrum:dimension", "hide_while_locked": true, "parents": [ { - "entry": "spectrum:dimension/lore/poisoners_handbook" + "entry": "spectrum:dimension/undergrowth_manor" } ], "background_u_index": 0, @@ -19,8 +19,15 @@ "pages": [ { "type": "modonomicon:text", - "text": "book.spectrum.guidebook.aether_graced_nectar_gloves.page0.text", + "text": "book.spectrum.guidebook.nectar_gloves.page0.text", "title": "item.spectrum.aether_graced_nectar_gloves" + }, + { + "type": "modonomicon:spotlight", + "item": { + "item": "spectrum:aether_graced_nectar_gloves" + }, + "text": "book.spectrum.guidebook.nectar_gloves.page1.text" } ] } diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/undergrowth_manor.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/undergrowth_manor.json index a827915f67..fabfbdfa21 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/undergrowth_manor.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/dimension/undergrowth_manor.json @@ -1,10 +1,10 @@ { - "name": "book.spectrum.guidebook.undergrowth_mannor.name", + "name": "structure.spectrum.undergrowth_manor", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/find_forgotten_city" + "advancement_id": "spectrum:lategame/find_undergrowth_manor" }, - "icon": "minecraft:magenta_banner", + "icon": "spectrum:longing_chimera", "category": "spectrum:dimension", "hide_while_locked": true, "parents": [ @@ -19,16 +19,37 @@ "pages": [ { "type": "modonomicon:image", - "title": "book.spectrum.guidebook.undergrowth_mannor.name", + "title": "structure.spectrum.undergrowth_manor", "images": [ - "spectrum:textures/gui/guidebook/dd_forgotten_city.png" + "spectrum:textures/gui/guidebook/undergrowth_manor.png" ], "border": true, - "text": "book.spectrum.guidebook.undergrowth_mannor.page0.text" + "text": "book.spectrum.guidebook.undergrowth_manor.page0.text" }, { "type": "modonomicon:text", - "text": "book.spectrum.guidebook.undergrowth_mannor.page1.text" + "text": "book.spectrum.guidebook.undergrowth_manor.page1.text" + }, + { + "type": "modonomicon:image", + "title": "book.spectrum.guidebook.undergrowth_manor.page4.title", + "images": [ + "spectrum:textures/gui/guidebook/stargazer_manxi.png" + ], + "border": true, + "text": "book.spectrum.guidebook.undergrowth_manor.page4.text", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_cookbooks/poisoners_handbook" + } + }, + { + "type": "modonomicon:text", + "text": "book.spectrum.guidebook.undergrowth_manor.page5.text", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_cookbooks/poisoners_handbook" + } } ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/worldgen/structure_set/undergrowth_manor.json b/src/main/resources/data/spectrum/worldgen/structure_set/undergrowth_manor.json index c1f6f688df..305f1766ef 100644 --- a/src/main/resources/data/spectrum/worldgen/structure_set/undergrowth_manor.json +++ b/src/main/resources/data/spectrum/worldgen/structure_set/undergrowth_manor.json @@ -9,7 +9,7 @@ "type": "minecraft:random_spread", "salt": 7831267, "spread_type": "triangular", - "spacing": 150, + "spacing": 120, "separation": 80 }, "exclusion_zone": {