Skip to content

Commit

Permalink
Updated for 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
@RandomGgames
RandomGgames committed Jun 19, 2024
1 parent a459d08 commit d2e13cb
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 52 deletions.
32 changes: 16 additions & 16 deletions data/coordinates/function/menus/color.mcfunction
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/coordinates/function/menus/main.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Main menu
tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"[","color":"aqua"},{"text":"Power","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 2"}},{"text":"] [","color":"aqua"},{"text":"Modes","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 3"}},{"text":"] [","color":"aqua"},{"text":"Color","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 4"}},{"text":"]\n","color":"aqua"}]
tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"[","color":"aqua"},{"text":"Power","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 2"}},{"text":"] [","color":"aqua"},{"text":"Modes","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 3"}},{"text":"] [","color":"aqua"},{"text":"Color","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 4"}},{"text":"]\n","color":"aqua"}]
12 changes: 6 additions & 6 deletions data/coordinates/function/menus/modes.mcfunction
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions data/coordinates/function/menus/power.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Show the power menu, each with a specifically highlighted power selected
execute as @s if score @s RAN.CoordPower matches 0 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","bold":"true","underlined":"true"},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 1 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","bold":"true","underlined":"true"},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 2 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","bold":"true","underlined":"true"},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 3 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","bold":"true","underlined":"true"},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 4 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":"true"},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","bold":"true","underlined":"true"},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 0 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","bold":true,"underlined":true},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 1 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","bold":true,"underlined":true},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 2 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","bold":true,"underlined":true},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 3 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","bold":true,"underlined":true},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 105"}},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
execute as @s if score @s RAN.CoordPower matches 4 run tellraw @s ["",{"text":"\nRandomGgames Coordinates Control Panel\n","color":"gold","bold":true},{"text":"Power:","color":"aqua"},{"text":" "},{"text":"Off","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 101"}},{"text":" | ","color":"aqua"},{"text":"Always On","color":"green","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 102"}},{"text":" | ","color":"aqua"},{"text":"Map","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 103"}},{"text":" | ","color":"aqua"},{"text":"Compass","color":"gray","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 104"}},{"text":" | ","color":"aqua"},{"text":"Map/Compass","color":"gray","bold":true,"underlined":true},{"text":"\n[Back]","color":"red","clickEvent":{"action":"run_command","value":"/trigger Coordinates set 199"}}]
2 changes: 1 addition & 1 deletion data/coordinates/function/new.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scoreboard players set @s RAN.CoordColor 0
scoreboard players set @s RAN.CoordPower 1

#Inform player about datapack
tellraw @s ["",{"text":"RandomGgames' Coordinates Data Pack","color":"gold","bold":"true"},{"text":"\nTo use the data pack, run the command ","color":"aqua"},{"text":"\"/trigger Coordinates\"","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/trigger Coordinates"}},{"text":" to access the control panel. There, you can turn off the coordinate display, change the color, and change the mode.","color":"aqua"}]
tellraw @s ["",{"text":"RandomGgames' Coordinates Data Pack","color":"gold","bold":true},{"text":"\nTo use the data pack, run the command ","color":"aqua"},{"text":"\"/trigger Coordinates\"","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/trigger Coordinates"}},{"text":" to access the control panel. There, you can turn off the coordinate display, change the color, and change the mode.","color":"aqua"}]

#Code stuff
scoreboard players set @s RAN.CoordNew 1
10 changes: 3 additions & 7 deletions ...ordinates/predicates/holding_compass.json → ...oordinates/predicate/holding_compass.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"offhand": {
"items": [
"minecraft:compass"
]
"items": "minecraft:compass"
}
}
}
Expand All @@ -20,9 +18,7 @@
"predicate": {
"equipment": {
"mainhand": {
"items": [
"minecraft:compass"
]
"items": "minecraft:compass"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...es/predicates/holding_compass_or_map.json → ...tes/predicate/holding_compass_or_map.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:reference",
Expand Down
22 changes: 7 additions & 15 deletions data/coordinates/predicates/holding_map.json → data/coordinates/predicate/holding_map.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"condition": "minecraft:alternative",
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"offhand": {
"items": [
"minecraft:filled_map"
]
"items": "minecraft:map"
}
}
}
Expand All @@ -19,10 +17,8 @@
"entity": "this",
"predicate": {
"equipment": {
"offhand": {
"items": [
"minecraft:map"
]
"mainhand": {
"items": "minecraft:map"
}
}
}
Expand All @@ -32,10 +28,8 @@
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"items": [
"minecraft:filled_map"
]
"offhand": {
"items": "minecraft:filled_map"
}
}
}
Expand All @@ -46,9 +40,7 @@
"predicate": {
"equipment": {
"mainhand": {
"items": [
"minecraft:map"
]
"items": "minecraft:filled_map"
}
}
}
Expand Down
0 data/minecraft/tag/function/load.json → data/minecraft/tags/function/load.json
View file
File renamed without changes.
0 data/minecraft/tag/function/tick.json → data/minecraft/tags/function/tick.json
View file
File renamed without changes.

0 comments on commit d2e13cb

Please sign in to comment.