Skip to content

Commit 064201e

Browse files
authored
Fix guidebook infinite loop (#1275)
1 parent 6461283 commit 064201e

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

gm4_guidebook/beet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: gm4_guidebook
22
name: Guidebook
3-
version: 3.1.X
3+
version: 3.2.X
44

55
data_pack:
66
load: .

gm4_guidebook/data/gm4_guidebook/function/init.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ scoreboard players reset $module_count gm4_guide
1919
#declare storage gm4_guidebook:pages
2020
schedule function gm4_guidebook:update_storage/setup_markers 1t
2121

22+
scoreboard players set $ready gm4_guide 0
2223
schedule function #gm4_guidebook:setup_storage 5t
24+
schedule function gm4_guidebook:update_storage/mark_ready 6t
2325

2426
data modify storage gm4_guidebook:register front_matter set value [{raw:["",{"translate":"gui.gm4.guidebook.page.intro","fallback": "","color": "white","font": "gm4:guidebook"},{"translate":"text.gm4.guidebook.introduction","fallback":"Introduction","underlined":true},{"text":"\n\n"},{"translate":"text.gm4.guidebook.letter","fallback":"This is a world unlike others. It appears that certain things work...differently to say the least.\n\nThis book will document discoveries regarding these new mechanics."},{"text":"\n\n> ","color":"#4AA0C7"},{"translate":"text.gm4.guidebook.refresh_findings","fallback":"Refresh Findings","color":"#4AA0C7","hover_event":{"action":"show_text","value":[{"translate":"text.gm4.guidebook.refresh_toc","fallback":"Refresh Table of Contents","color":"gold"}]},"click_event":{"action":"run_command","command":"/trigger gm4_guide set 1"}}]}]
2527

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# marks the module ready for advancements to be granted
2+
# @s = none
3+
# located at world spawn
4+
# run from gm4_guidebook:init
5+
6+
scoreboard players set $ready gm4_guide 1

gm4_guidebook/generate_guidebooks.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,6 +1499,18 @@ def generate_advancement(book: Book, section_index: int) -> Advancement | None:
14991499
"score": "load.status"
15001500
},
15011501
"range": {"min": 1}
1502+
},
1503+
{
1504+
"condition": "minecraft:value_check",
1505+
"value": {
1506+
"type": "minecraft:score",
1507+
"target": {
1508+
"type": "minecraft:fixed",
1509+
"name": "$ready"
1510+
},
1511+
"score": "gm4_guide"
1512+
},
1513+
"range": {"min": 1}
15021514
}
15031515
]
15041516

0 commit comments

Comments
 (0)