Merge branch 'dev_rgb' of github.com:LTCatt/LTW3 into dev_rgb

data/mini/functions/main/tick20.mcfunction

@@ -3,6 +3,7 @@
 execute if score $mini_type mem matches 1 run function mini:parkour/tick20
 execute if score $mini_type mem matches 5 run function mini:phantom/tick20
 execute if score $mini_type mem matches 201 run function mini:ass/tick20
+execute if score $mini_type mem matches 202 run function mini:rgb/tick20
 execute if score $mini_type mem matches 101 run function mini:diamond/tick20
 execute if score $mini_type mem matches 102 run function mini:trade/tick20
 

data/mini/functions/rgb/game/give_random_rule.mcfunction

@@ -32,9 +32,6 @@ data modify block 0 0 0 RecordItem.tag.EntityTag.Small set value 1b
 data modify block 0 0 0 RecordItem.tag.EntityTag.ArmorItems set value [{id:"minecraft:stone",Count:1s},{}]
 data modify block 0 0 0 RecordItem.tag.EntityTag.ArmorItems[0].tag.conditions set from block 0 0 0 RecordItem.tag.conditions
 data modify block 0 0 0 RecordItem.tag.EntityTag.ArmorItems[0].tag.events set from block 0 0 0 RecordItem.tag.events
-
-tellraw @a {"nbt":"RecordItem","block": "0 0 0"}
-
 setblock 0 0 0 air destroy
 tag @s add rgb_temp
 execute as @e[nbt={"Item":{"tag":{"rgb_newrule":1b}}},limit=1] run function mini:rgb/game/tp_new_item

data/mini/functions/rgb/tick20.mcfunction

@@ -3,5 +3,5 @@ scoreboard players add $scb_switch rgb_sys 1
 execute if score $scb_switch rgb_sys matches 6.. run scoreboard players set $scb_switch rgb_sy 0
 
 execute if score $scb_switch rgb_sys matches 0..1 run scoreboard objectives setdisplay sidebar rgb_R
-execute if score $scb_switch rgb_sys matches 2..3 run scoreboard objectives setdisplay sidebar rgb_R
-execute if score $scb_switch rgb_sys matches 4..5 run scoreboard objectives setdisplay sidebar rgb_R
+execute if score $scb_switch rgb_sys matches 2..3 run scoreboard objectives setdisplay sidebar rgb_G
+execute if score $scb_switch rgb_sys matches 4..5 run scoreboard objectives setdisplay sidebar rgb_B