Fixed unused/typo function names.

trackedout · Dec 15, 2024 · fd11e9f · fd11e9f
1 parent 670a4ca
commit fd11e9f
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 44 deletions.
diff --git a/...agronet/add-items/add_artifake.mcfunction → ...agronet/add_items/add_artifake.mcfunction b/...agronet/add-items/add_artifake.mcfunction → ...agronet/add_items/add_artifake.mcfunction
diff --git a/...s/agronet/add-items/add_crowns.mcfunction → ...s/agronet/add_items/add_crowns.mcfunction b/...s/agronet/add-items/add_crowns.mcfunction → ...s/agronet/add_items/add_crowns.mcfunction
diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction
@@ -1,4 +1,4 @@
-function do2:dev/markers/turn_invisible/fish_markers
+function do2:dev/markers/turn_invisible/fish_marker
 function do2:dev/markers/turn_invisible/l1z1
 function do2:dev/markers/turn_invisible/l1z2
 function do2:dev/markers/turn_invisible/l1z3

diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction
@@ -18,7 +18,7 @@ function do2:dungeon_setup/summon/no_zones/summon_level_3_markers
 function do2:dungeon_setup/summon/no_zones/summon_willy_markers
 
 # Training Room Markers
-function do2:dungeon_setup/summon/no_zones/summon_training
+function do2:dungeon_setup/summon/no_zones/summon_training_markers
 
 # Turn invisible *all* markers.
 function do2:dev/markers/turn_invisible/all
diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_ravagers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_ravagers.mcfunction
@@ -10,9 +10,9 @@ execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do
 execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l1z4
 execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l1z5
 #L2
-execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/l2z1
-execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/l2z2
-execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/l2z3
+execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/zones/l2z1
+execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/zones/l2z2
+execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:mob_controller/generate_mobs/zones/l2z3
 execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l2z4
 execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l2z5
 

diff --git a/Brilliance Datapack/data/do2/functions/events/on_artifact_converted_to_artifake.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_artifact_converted_to_artifake.mcfunction
@@ -5,7 +5,7 @@ execute as @a[scores={do2.logs.player_actions=2..}] run tellraw @s ["",{"text":"
 execute as @p[tag=do2.received_shulker] as @p[tag=do2.received_shulker] run scoreboard players set @s do2.run.convertedArtifake 1
 
 # Agronet handling
-function do2:agronet/add_artifake
+function do2:agronet/add_items/add_artifake
 
 # NOW: determine WHICH artifact got converted.
 

diff --git a/Brilliance Datapack/data/do2/functions/events/on_game_end.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_game_end.mcfunction
@@ -18,7 +18,7 @@ execute as @a[team=do2.players] unless entity @s[tag=do2.won] run function do2:e
 execute as @a[team=do2.ghosts] unless entity @s[tag=do2.won] run function do2:events/on_player_loss
 
 # Track crowns player collected.
-execute as @a[team=do2.players] if entity @s[tag=do2.won] run function do2:agronet/add_crowns
+execute as @a[team=do2.players] if entity @s[tag=do2.won] run function do2:agronet/add_items/add_crowns
 
 # Reset Players
 execute as @a[name=!TangoCam,name=!tangocam] run function do2:reset_player

diff --git a/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/black_shulker_box.mcfunction b/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/black_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:black_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/black_shulker_box
diff --git a/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/blue_shulker_box.mcfunction b/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/blue_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:blue_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/blue_shulker_box
diff --git a/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/brown_shulker_box.mcfunction b/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/brown_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:brown_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/brown_shulker_box
diff --git a/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/cyan_shulker_box.mcfunction b/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/cyan_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:cyan_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/cyan_shulker_box
diff --git a/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/gray_shulker_box.mcfunction b/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/gray_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:gray_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/gray_shulker_box
diff --git a/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/green_shulker_box.mcfunction b/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/green_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:green_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/green_shulker_box
diff --git a/...apack/data/do2/functions/events/picked_up/shulker_boxes/light_blue_shulker_box.mcfunction b/...apack/data/do2/functions/events/picked_up/shulker_boxes/light_blue_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:light_blue_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/light_blue_shulker_box
diff --git a/...apack/data/do2/functions/events/picked_up/shulker_boxes/light_gray_shulker_box.mcfunction b/...apack/data/do2/functions/events/picked_up/shulker_boxes/light_gray_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:light_gray_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/light_gray_shulker_box
diff --git a/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/lime_shulker_box.mcfunction b/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/lime_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:lime_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/lime_shulker_box
diff --git a/...Datapack/data/do2/functions/events/picked_up/shulker_boxes/magenta_shulker_box.mcfunction b/...Datapack/data/do2/functions/events/picked_up/shulker_boxes/magenta_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:magenta_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/magenta_shulker_box
diff --git a/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/orange_shulker_box.mcfunction b/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/orange_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:orange_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/orange_shulker_box
diff --git a/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/pink_shulker_box.mcfunction b/...ce Datapack/data/do2/functions/events/picked_up/shulker_boxes/pink_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:pink_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/pink_shulker_box
diff --git a/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/purple_shulker_box.mcfunction b/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/purple_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:purple_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/purple_shulker_box
diff --git a/...nce Datapack/data/do2/functions/events/picked_up/shulker_boxes/red_shulker_box.mcfunction b/...nce Datapack/data/do2/functions/events/picked_up/shulker_boxes/red_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:red_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/red_shulker_box
diff --git a/Brilliance Datapack/data/do2/functions/events/picked_up/shulker_boxes/shulker_box.mcfunction b/Brilliance Datapack/data/do2/functions/events/picked_up/shulker_boxes/shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/shulker_box
diff --git a/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/white_shulker_box.mcfunction b/...e Datapack/data/do2/functions/events/picked_up/shulker_boxes/white_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:white_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/white_shulker_box
diff --git a/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/yellow_shulker_box.mcfunction b/... Datapack/data/do2/functions/events/picked_up/shulker_boxes/yellow_shulker_box.mcfunction
@@ -76,7 +76,5 @@ execute at @s run item replace block ~ 316 ~ container.0 from entity @s inventor
 execute at @s if data block ~ 316 ~ Items[{Slot:0b,id:"minecraft:yellow_shulker_box"}] run function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot_36
 
 
-function do2:events/picked_up/shulker_boxes/shulker_adjustments/adjust_slot
-
 execute at @s run setblock ~ 316 ~ air replace
 advancement revoke @s only do2:utility/picked_up/shulker_boxes/yellow_shulker_box
diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction
@@ -2,7 +2,7 @@
 function do2:mob_controller/save_storages
 function do2:mob_controller/get_mob_count/count_mobs
 function do2:mob_controller/get_mob_names/get_mob_names
-function do2:mob_controller/add_mob_names/ravager_default_names
+function do2:mob_controller/add_mob_names/ravager_names
 scoreboard players set $dungeon do2.utility.mc.collectingLogs 1
 data modify storage do2:mobs mobCountErrors set value []
 data modify storage do2:mobs mobNameCountErrors set value []

diff --git a/...nce Datapack/data/do2/functions/mob_spawning/fish_counts/summon_random_variant.mcfunction b/...nce Datapack/data/do2/functions/mob_spawning/fish_counts/summon_random_variant.mcfunction
@@ -1,4 +1,4 @@
 summon minecraft:tropical_fish ~ ~ ~ {Variant:235340288,Tags:["determine_variant","do2.manually_spawned"]}
-function do2:mob_spawning/fish_counts//determine_variant
+function do2:mob_spawning/fish_counts/determine_variant
 execute store result entity @e[type=minecraft:tropical_fish,tag=determine_variant,limit=1] Variant double 1 run scoreboard players get $dungeon do2.utility.fishVariant
 tag @e[type=minecraft:tropical_fish,tag=determine_variant] remove determine_variant
diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/setup/all.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/setup/all.mcfunction
@@ -62,7 +62,7 @@ function do2:scoreboard/setup/systems
 function do2:scoreboard/setup/easter_eggs
 
 # - cards -
-function do2:scoreboard/setup/cards/run_cards_available
+function do2:scoreboard/setup/cards/cards_available_run
 function do2:scoreboard/setup/cards/cards_available_total
 function do2:scoreboard/setup/cards/cards_bought_run
 function do2:scoreboard/setup/cards/cards_bought_total

diff --git a/...etup/cards/cards_availible_run.mcfunction → ...etup/cards/cards_available_run.mcfunction b/...etup/cards/cards_availible_run.mcfunction → ...etup/cards/cards_available_run.mcfunction
diff --git a/...up/cards/cards_availible_total.mcfunction → ...up/cards/cards_available_total.mcfunction b/...up/cards/cards_availible_total.mcfunction → ...up/cards/cards_available_total.mcfunction