Update cobble gen advancement to check tag

- Stops MC-196976 from being annoying
BluePsychoRanger · Mar 8, 2024 · 91bc2b4 · 91bc2b4
1 parent 3674040
commit 91bc2b4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/...p_skyvoid_advancements_v1_0_1-MC_1_20.zip → ...p_skyvoid_advancements_v1_0_2-MC_1_20.zip b/...p_skyvoid_advancements_v1_0_1-MC_1_20.zip → ...p_skyvoid_advancements_v1_0_2-MC_1_20.zip
diff --git a/...d/skyvoid_advancements_v1_0_1-MC_1_20.zip → ...d/skyvoid_advancements_v1_0_2-MC_1_20.zip b/...d/skyvoid_advancements_v1_0_1-MC_1_20.zip → ...d/skyvoid_advancements_v1_0_2-MC_1_20.zip
diff --git a/src/packs/extras/skyvoid_advancements/beet.yaml b/src/packs/extras/skyvoid_advancements/beet.yaml
@@ -1,7 +1,7 @@
 id: 'skyvoid_advancements'
 name: 'SkyBlock Advancements'
 author: 'EpyonProjects'
-version: 1.0.1
+version: 1.0.2
 
 data_pack:
   load: .

diff --git a/...ncements/data/skyvoid_advancements/advancements/overworld/technical/cobble_gen_check.json b/...ncements/data/skyvoid_advancements/advancements/overworld/technical/cobble_gen_check.json
@@ -3,6 +3,25 @@
     "requirement": {
       "trigger": "minecraft:item_durability_changed",
       "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "condition": "minecraft:entity_properties",
+              "entity": "this",
+              "predicate": {
+                "type_specific": {
+                  "type": "player",
+                  "advancements": {
+                    "skyvoid_advancements:overworld/obsidian": true,
+                    "skyvoid_advancements:overworld/cobble_gen": true
+                  }
+                },
+                "nbt": "{Tags:[\"sva_lava_source_delay_check\"]}"
+              }
+            }
+          }
+        ],
         "item": {
           "items": [
             "minecraft:wooden_pickaxe",

diff --git a/...d_advancements/data/skyvoid_advancements/functions/overworld/lava_source_check.mcfunction b/...d_advancements/data/skyvoid_advancements/functions/overworld/lava_source_check.mcfunction
@@ -5,7 +5,7 @@
 
 execute store result score $lava_source_curr_count sva_data run clone ~-5 ~-5 ~-5 ~5 ~5 ~5 ~-5 ~-5 ~-5 filtered lava[level=0] force
 execute if score $lava_source_curr_count sva_data < $lava_source_prev_count sva_data run advancement grant @a[distance=..16] only skyvoid_advancements:overworld/obsidian
-advancement grant @a[distance=..4,scores={sva_cobble_broken=4..},advancements={skyvoid_advancements:overworld/technical/cobble_gen_check=true}] only skyvoid_advancements:overworld/cobble_gen
-advancement revoke @a[distance=..16,predicate=skyvoid_advancements:cobble_or_obsidian_advancement_check] only skyvoid_advancements:overworld/technical/cobble_gen_check
+advancement grant @a[tag=sva_lava_source_delay_check,scores={sva_cobble_broken=4..},distance=..4] only skyvoid_advancements:overworld/cobble_gen
+tag @a remove sva_lava_source_delay_check
 
 kill @e[type=marker,tag=sva_lava_source_check]
diff --git a/...void_advancements/data/skyvoid_advancements/functions/overworld/obsidian_delay.mcfunction b/...void_advancements/data/skyvoid_advancements/functions/overworld/obsidian_delay.mcfunction
@@ -3,6 +3,8 @@
 # at @s
 # run from advancements, skyvoid_advancements:overworld/technical/cobble_gen_check
 
+advancement revoke @s only skyvoid_advancements:overworld/technical/cobble_gen_check
+tag @s add sva_lava_source_delay_check
 execute store result score $lava_source_prev_count sva_data run clone ~-5 ~-5 ~-5 ~5 ~5 ~5 ~-5 ~-5 ~-5 filtered lava[level=0] force
 
 summon marker ~ ~ ~ {Tags:["sva_lava_source_check"]}