chore: update to minecraft 1.20.6

2mal3 · May 5, 2024 · cc461c1 · cc461c1
1 parent a677b52
commit cc461c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/beet.yaml b/beet.yaml
@@ -29,7 +29,7 @@ meta:
             - adco:advancements
 
     vanilla:
-        version: "1.20.1"
+        version: "1.20.6"
 
     installation_advancement:
         icon:

diff --git a/src/data/adco/functions/unlock_previous.mcfunction b/src/data/adco/functions/unlock_previous.mcfunction
@@ -23,9 +23,10 @@ for name, advancement in vanilla_advancements.items():
 
     # Give the corresponding points to all players that have unlocked the advancement
     advancement_content = advancement.data
-    if advancement_content["display"]["frame"] == "task":
+    advancement_display = advancement_content["display"]
+    if "frame" not in advancement_display or advancement_display["frame"] == "task":
         execute if predicate f"adco:unlock_previous/{predicate_name}" run function adco:count/1
-    if advancement_content["display"]["frame"] == "goal":
+    elif advancement_display["frame"] == "goal":
         execute if predicate f"adco:unlock_previous/{predicate_name}" run function adco:count/2
-    if advancement_content["display"]["frame"] == "challenge":
+    elif advancement_display["frame"] == "challenge":
         execute if predicate f"adco:unlock_previous/{predicate_name}" run function adco:count/5
diff --git a/src/data/adco/modules/advancements.bolt b/src/data/adco/modules/advancements.bolt
@@ -11,11 +11,12 @@ for name, advancement in vanilla_advancements.items():
     if "rewards" not in modified_advancement:
         modified_advancement["rewards"] = {}
 
-    if modified_advancement["display"]["frame"] == "task":
+    advancement_display = modified_advancement["display"]
+    if "frame" not in advancement_display or advancement_display["frame"] == "task":
         modified_advancement["rewards"]["function"] = "adco:count/1"
-    if modified_advancement["display"]["frame"] == "goal":
+    elif advancement_display["frame"] == "goal":
         modified_advancement["rewards"]["function"] = "adco:count/2"
-    if modified_advancement["display"]["frame"] == "challenge":
+    elif advancement_display["frame"] == "challenge":
         modified_advancement["rewards"]["function"] = "adco:count/5"
 
     advancement name modified_advancement