Fixed tag compatibility

OKTW-Network · Jan 18, 2020 · ab30136 · ab30136
1 parent 48b5b64
commit ab30136
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 42 deletions.
diff --git a/.datapack/cache.json b/.datapack/cache.json
diff --git a/data/galaxy/functions/block/functional/initial.mcfunction b/data/galaxy/functions/block/functional/initial.mcfunction
@@ -1,2 +1,2 @@
 function galaxy:block/functional/meta/scoreboard/register
-execute as @a[tag=!InitializedBlockFunctionalScore] run function galaxy:block/functional/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyBlockFunctionalScore] run function galaxy:block/functional/meta/scoreboard/set_player_score
diff --git a/data/galaxy/functions/block/functional/main.mcfunction b/data/galaxy/functions/block/functional/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedBlockFunctionalScore] run function galaxy:block/functional/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyBlockFunctionalScore] run function galaxy:block/functional/meta/scoreboard/set_player_score
 
 execute as @e[tag=functional_placer] at @s run function galaxy:block/functional/placer/main
 

diff --git a/data/galaxy/functions/block/functional/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/block/functional/meta/scoreboard/set_player_score.mcfunction
@@ -1,3 +1,3 @@
 scoreboard players remove @s statusBlockDisp 0
 
-tag @s add InitializedBlockFunctionalScore
+tag @s add InitializedGalaxyBlockFunctionalScore
diff --git a/data/galaxy/functions/debug/clean_up-tag.mcfunction b/data/galaxy/functions/debug/clean_up-tag.mcfunction
@@ -0,0 +1,9 @@
+tag @s remove InitializedGlobalScore
+tag @s remove InitializedGalaxyScore
+tag @s remove InitializedBlockFunctionalScore
+tag @s remove InitializedToolScore
+tag @s remove InitializedKatanaScore
+tag @s remove InitializedEnergySaberScore
+tag @s remove InitializedPistolScore
+tag @s remove InitializedStatus_effectScore
+tag @s remove InitializedHUDScore
diff --git a/data/galaxy/functions/debug/remove_init_tag.mcfunction b/data/galaxy/functions/debug/remove_init_tag.mcfunction
@@ -1,7 +1,8 @@
 tag @s remove InitializedGalaxyScore
-tag @s remove InitializedToolScore
-tag @s remove InitializedKatanaScore
-tag @s remove InitializedEnergySaberScore
-tag @s remove InitializedPistolScore
-tag @s remove InitializedStatus_effectScore
-tag @s remove InitializedHUDScore
+tag @s remove InitializedGalaxyBlockFunctionalScore
+tag @s remove InitializedGalaxyToolScore
+tag @s remove InitializedGalaxyKatanaScore
+tag @s remove InitializedGalaxyEnergySaberScore
+tag @s remove InitializedGalaxyPistolScore
+tag @s remove InitializedGalaxyStatusEffectScore
+tag @s remove InitializedGalaxyHUDScore
diff --git a/data/galaxy/functions/hud/initial.mcfunction b/data/galaxy/functions/hud/initial.mcfunction
@@ -2,6 +2,6 @@
 function galaxy:hud/meta/storage/register
 
 function galaxy:hud/meta/scoreboard/register
-execute as @a[tag=!InitializedHUDScore] run function galaxy:hud/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyHUDScore] run function galaxy:hud/meta/scoreboard/set_player_score
 
 execute if score #galaxy_print_init Config matches 1 run tellraw @a ["",{"text":"[Galaxy]: ","color":"yellow","bold":true},{"text":"HUD: "},{"text":"Initialize complete!"}]
diff --git a/data/galaxy/functions/hud/main.mcfunction b/data/galaxy/functions/hud/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedHUDScore] run function galaxy:hud/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyHUDScore] run function galaxy:hud/meta/scoreboard/set_player_score
 
 execute if score #hud_katana Config matches 1 as @a run function galaxy:hud/katana/main
 execute if score #hud_pistol Config matches 1 as @a run function galaxy:hud/pistol/main
diff --git a/data/galaxy/functions/hud/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/hud/meta/scoreboard/set_player_score.mcfunction
@@ -7,4 +7,4 @@ scoreboard players remove @s isPistolHUD 0
 
 scoreboard players remove @s hudPistol 0
 
-tag @s add InitializedHUDScore
+tag @s add InitializedGalaxyHUDScore
diff --git a/data/galaxy/functions/main.mcfunction b/data/galaxy/functions/main.mcfunction
@@ -1,3 +1,3 @@
 function galaxy:meta/detector/main
 
-execute as @a[tag=!InitializedGlobalScore] run function galaxy:meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyScore] run function galaxy:meta/scoreboard/set_player_score
diff --git a/data/galaxy/functions/status_effect/initial.mcfunction b/data/galaxy/functions/status_effect/initial.mcfunction
@@ -1,5 +1,5 @@
 
 function galaxy:status_effect/meta/scoreboard/register
-execute as @a[tag=!InitializedStatusEffectScore] run function galaxy:status_effect/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyStatusEffectScore] run function galaxy:status_effect/meta/scoreboard/set_player_score
 
 execute if score #galaxy_print_init Config matches 1 run tellraw @a ["",{"text":"[Galaxy]: ","color":"yellow","bold":true},{"text":"Status effect: "},{"text":"Initialize complete!"}]
diff --git a/data/galaxy/functions/status_effect/main.mcfunction b/data/galaxy/functions/status_effect/main.mcfunction
@@ -1,4 +1,4 @@
 
-execute as @a[tag=!InitializedStatusEffectScore] run function galaxy:status_effect/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyStatusEffectScore] run function galaxy:status_effect/meta/scoreboard/set_player_score
 
 execute if score #stu_stun Config matches 1 run function galaxy:status_effect/stun
diff --git a/data/galaxy/functions/status_effect/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/status_effect/meta/scoreboard/set_player_score.mcfunction
@@ -4,4 +4,4 @@ scoreboard players remove @s isStuStun 0
 scoreboard players remove @s durStuStun 0
 
 
-tag @s add InitializedStatusEffectScore
+tag @s add InitializedGalaxyStatusEffectScore
diff --git a/data/galaxy/functions/tool/initial.mcfunction b/data/galaxy/functions/tool/initial.mcfunction
@@ -1,5 +1,5 @@
 
 function galaxy:tool/meta/scoreboard/register
-execute as @a[tag=!InitializedToolScore] run function galaxy:tool/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyToolScore] run function galaxy:tool/meta/scoreboard/set_player_score
 
 execute if score #galaxy_print_init Config matches 1 run tellraw @a ["",{"text":"[Galaxy]: ","color":"yellow","bold":true},{"text":"Tool: "},{"text":"Initialize complete!"}]
diff --git a/data/galaxy/functions/tool/main.mcfunction b/data/galaxy/functions/tool/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedToolScore] run function galaxy:tool/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyToolScore] run function galaxy:tool/meta/scoreboard/set_player_score
 function galaxy:tool/meta/detector/main
 
 execute if score #structure_empower Config matches 1 as @e[tag=structure_empower_detector] at @s if predicate galaxy:configurable/structure_empower_success_chance run function galaxy:tool/structure_empower

diff --git a/data/galaxy/functions/tool/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/tool/meta/scoreboard/set_player_score.mcfunction
@@ -17,4 +17,4 @@ scoreboard players remove @s shieldFull 0
 
 scoreboard players remove @s shieldHealthy 0
 
-tag @s add InitializedToolScore
+tag @s add InitializedGalaxyToolScore
diff --git a/data/galaxy/functions/version_check.mcfunction b/data/galaxy/functions/version_check.mcfunction
@@ -7,5 +7,7 @@ execute if score #galaxy_version Meta = #galaxy_currently_version Meta if score
 scoreboard players operation #galaxy_currently_version Meta = #galaxy_version Meta
 
 scoreboard players remove @s versionGalaxy 0
+execute as @a unless score @s versionGalaxy = #galaxy_currently_version Meta run function galaxy:debug/clean_up-scoreboard
+execute as @a unless score @s versionGalaxy = #galaxy_currently_version Meta run function galaxy:debug/clean_up-tag
 execute as @a unless score @s versionGalaxy = #galaxy_currently_version Meta run function galaxy:debug/remove_init_tag
 execute as @a unless score @s versionGalaxy = #galaxy_currently_version Meta run scoreboard players operation @s versionGalaxy = #galaxy_currently_version Meta
diff --git a/data/galaxy/functions/weapon/energy_saber/initial.mcfunction b/data/galaxy/functions/weapon/energy_saber/initial.mcfunction
@@ -0,0 +1,2 @@
+function galaxy:weapon/energy_saber/meta/scoreboard/register
+execute as @a[tag=!InitializedGalaxyEnergySaberScore] run function galaxy:weapon/energy_saber/meta/scoreboard/set_player_score
diff --git a/data/galaxy/functions/weapon/energy_saber/main.mcfunction b/data/galaxy/functions/weapon/energy_saber/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedEnergySaberScore] run function galaxy:weapon/energy_saber/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyEnergySaberScore] run function galaxy:weapon/energy_saber/meta/scoreboard/set_player_score
 
 function galaxy:weapon/energy_saber/action/main
 function galaxy:weapon/energy_saber/cooldown/main

diff --git a/data/galaxy/functions/weapon/energy_saber/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/weapon/energy_saber/meta/scoreboard/set_player_score.mcfunction
@@ -13,4 +13,4 @@ scoreboard players remove @s cdActTurnOn 0
 
 scoreboard players remove @s cdActTurnOff 0
 
-tag @s add InitializedEnergySaberScore
+tag @s add InitializedGalaxyEnergySaberScore
diff --git a/data/galaxy/functions/weapon/initial.mcfunction b/data/galaxy/functions/weapon/initial.mcfunction
@@ -1,11 +1,5 @@
-
-function galaxy:weapon/katana/meta/scoreboard/register
-execute as @a[tag=!InitializedKatanaScore] run function galaxy:weapon/katana/meta/scoreboard/set_player_score
-
-function galaxy:weapon/energy_saber/meta/scoreboard/register
-execute as @a[tag=!InitializedEnergySaberScore] run function galaxy:weapon/energy_saber/meta/scoreboard/set_player_score
-
-function galaxy:weapon/pistol/meta/scoreboard/register
-execute as @a[tag=!InitializedPistolScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score
+function galaxy:weapon/katana/initial
+function galaxy:weapon/energy_saber/initial
+function galaxy:weapon/pistol/initial
 
 execute if score #galaxy_print_init Config matches 1 run tellraw @a ["",{"text":"[Galaxy]: ","color":"yellow","bold":true},{"text":"Weapon: "},{"text":"Initialize complete!"}]
diff --git a/data/galaxy/functions/weapon/katana/initial.mcfunction b/data/galaxy/functions/weapon/katana/initial.mcfunction
@@ -0,0 +1,2 @@
+function galaxy:weapon/katana/meta/scoreboard/register
+execute as @a[tag=!InitializedGalaxyKatanaScore] run function galaxy:weapon/katana/meta/scoreboard/set_player_score
diff --git a/data/galaxy/functions/weapon/katana/main.mcfunction b/data/galaxy/functions/weapon/katana/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedKatanaScore] run function galaxy:weapon/katana/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyKatanaScore] run function galaxy:weapon/katana/meta/scoreboard/set_player_score
 
 function galaxy:weapon/katana/action/main
 function galaxy:weapon/katana/cooldown/main

diff --git a/data/galaxy/functions/weapon/katana/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/weapon/katana/meta/scoreboard/set_player_score.mcfunction
@@ -47,4 +47,4 @@ scoreboard players remove @s cdActStun 0
 
 scoreboard players remove @s cdActFlash 0
 
-tag @s add InitializedKatanaScore
+tag @s add InitializedGalaxyKatanaScore
diff --git a/data/galaxy/functions/weapon/pistol/initial.mcfunction b/data/galaxy/functions/weapon/pistol/initial.mcfunction
@@ -0,0 +1,2 @@
+function galaxy:weapon/pistol/meta/scoreboard/register
+execute as @a[tag=!InitializedGalaxyPistolScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score
diff --git a/data/galaxy/functions/weapon/pistol/main.mcfunction b/data/galaxy/functions/weapon/pistol/main.mcfunction
@@ -1,4 +1,4 @@
-execute as @a[tag=!InitializedPistolScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score
+execute as @a[tag=!InitializedGalaxyPistolScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score
 
 function galaxy:weapon/pistol/meta/detector/main
 execute as @e[tag=pistolBullet] at @s run function galaxy:weapon/pistol/bullet/main

diff --git a/data/galaxy/functions/weapon/pistol/meta/detector/change_pistol.mcfunction b/data/galaxy/functions/weapon/pistol/meta/detector/change_pistol.mcfunction
@@ -1,5 +1,5 @@
 # init pistol UUID score
-execute as @a[tag=!InitializedPistolUUIDScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score-pistol_uuid
+execute as @a[tag=!InitializedGalaxyPistolUUIDScore] run function galaxy:weapon/pistol/meta/scoreboard/set_player_score-pistol_uuid
 
 execute if score @s holdPistol matches 1 run tag @s add detectHandMain
 execute if score @s holdPistol matches 2 run tag @s add detectHandMain

diff --git a/data/galaxy/functions/weapon/pistol/meta/scoreboard/set_player_score-pistol_uuid.mcfunction b/data/galaxy/functions/weapon/pistol/meta/scoreboard/set_player_score-pistol_uuid.mcfunction
@@ -4,4 +4,4 @@ execute store result score @s MhPistolUUIDL run data get entity @s SelectedItem.
 execute store result score @s FhPistolUUIDM run data get entity @s Inventory[{Slot:-106b}].tag.miniUUIDMost
 execute store result score @s FhPistolUUIDL run data get entity @s Inventory[{Slot:-106b}].tag.miniUUIDLeast
 
-tag @s add InitializedPistolUUIDScore
+tag @s add InitializedGalaxyPistolUUIDScore
diff --git a/data/galaxy/functions/weapon/pistol/meta/scoreboard/set_player_score.mcfunction b/data/galaxy/functions/weapon/pistol/meta/scoreboard/set_player_score.mcfunction
@@ -63,4 +63,4 @@ scoreboard players remove @s optPistolBltSped 0
 
 scoreboard players remove @s optPistolBltOfst 0
 
-tag @s add InitializedPistolScore
+tag @s add InitializedGalaxyPistolScore
diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json
@@ -1,7 +1,5 @@
 {
     "values":[
-        "galaxy:initial",
-		"creative-utilities:initial",
-		"math:initial"
+        "galaxy:initial"
     ]
 }
diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json
@@ -1,6 +1,5 @@
 {
     "values":[
-        "galaxy:tick",
-        "creative-utilities:tick"
+        "galaxy:tick"
     ]
 }