AFK feature and bugfixes

Bugfixes:
- Days will no longer be resetted
- Notification works perfect now

AFK feature
- Compatible with my AFK Announcer datapack, so you can change if players who are afk have to sleep or not

Author: Jodekq

data/jodek/advancement/sleep.json

@@ -35,7 +35,7 @@
             "color": "dark_green"
         },
         {
-            "text": "v.2.4.2",
+            "text": "v.2.5.2",
             "color": "green"
         },
         {

data/sleep/function/calc_online_players_afk.mcfunction

@@ -0,0 +1,7 @@
+# get number of players online
+execute store result score &playerNum sleep.players_online run list
+
+# get number of players who have afk tag
+execute store result score &playerNumAFK sleep.players_online if entity @a[tag=afkannouncer.afk]
+
+scoreboard players operation &playerNum sleep.players_online -= &playerNumAFK sleep.players_online 

data/sleep/function/load.mcfunction

@@ -1,4 +1,4 @@
-tellraw @a ["",{"text":"Sleep","color":"blue","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":" loaded - ","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":"[1.21]","color":"green","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":" ","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":"v.2.4.2","color":"dark_green","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}}]
+tellraw @a ["",{"text":"Sleep","color":"blue","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":" loaded - ","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":"[1.21]","color":"green","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":" ","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}},{"text":"v.2.5.2","color":"dark_green","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/sleep/"},"hoverEvent":{"action":"show_text","contents":"modrinth.com/datapack/sleep/"}}]
 
 scoreboard objectives add sleep.time_since_rest custom:time_since_rest
 
@@ -39,6 +39,9 @@ execute as @a unless score &amount_to_sleep sleep.config = &amount_to_sleep slee
 # time skip or accelerated
 execute as @a unless score &time_control sleep.config = &time_control sleep.config run scoreboard players set &time_control sleep.config 0
 
+# afk players are included in online players or not
+execute as @a unless score &afk_players_sleep sleep.config = &afk_players_sleep sleep.config run scoreboard players set &afk_players_sleep sleep.config 0
+
 # setting to disable phantoms
 # execute as @a unless score &phantoms_spawning sleep.config = &phantoms_spawning sleep.config run scoreboard players set &phantoms_spawning sleep.config 0
 # This is WIP 

data/sleep/function/main.mcfunction

@@ -2,8 +2,9 @@
 execute as @a unless score @s sleep_notification = @s sleep_notification run scoreboard players set @s sleep_notification 0
 scoreboard players enable @a sleep_notification
 
-execute as @a[scores={sleep_notification=1..}] at @s if score $global sleep.total_speeping matches 0 run function sleep:timeofday
+schedule function sleep:timeofday 1t
 
+execute if score &afk_players_sleep sleep.config matches 1 run function sleep:calc_online_players_afk
 
 # How long does one player sleep
 scoreboard players set @a[scores={sleep.time_since_rest=1..}] sleep.time_in_bed 0
@@ -26,7 +27,7 @@ execute if score &sleep_amount sleep.sleeping_players = &amount_to_sleep sleep.c
 execute if entity @a[tag=sleeping] run function sleep:actionbar/main_actionbar
 
 # check how many players --> if only 1 then skip when 1 sleeps
-execute store result score &playerNum sleep.players_online run list
+execute if score &afk_players_sleep sleep.config matches 0 run execute store result score &playerNum sleep.players_online run list
 execute if score &playerNum sleep.players_online < &amount_to_sleep sleep.config if score &sleep_amount sleep.sleeping_players < &amount_to_sleep sleep.config run function sleep:time_control/time_control
 execute as @a[scores={sleep.time_in_bed=1..}] run execute if score &playerNum sleep.players_online < &amount_to_sleep sleep.config if score &sleep_amount sleep.sleeping_players < &amount_to_sleep sleep.config run function sleep:actionbar/main_actionbar
 

data/sleep/function/time_control/time_control.mcfunction

@@ -1,4 +1,3 @@
 execute if score &time_control sleep.config matches 0 run function sleep:time_control/time_skip
-execute if score &time_control sleep.config matches 0 run function sleep:time_control/time_skip
 
 execute if score &time_control sleep.config matches 1 run function sleep:time_control/time_accelerate

data/sleep/function/time_control/time_skip/10seconds.mcfunction

@@ -1,4 +1,4 @@
-execute as @a[scores={sleep.time_in_bed=200..}] run time set 0
+execute as @a[scores={sleep.time_in_bed=200}] run time add 11000
 
 # weather clear
 execute if predicate sleep:weather_check_thunder run execute as @a[scores={sleep.time_in_bed=200..}] run weather clear

data/sleep/function/time_control/time_skip/2seconds.mcfunction

@@ -1,4 +1,4 @@
-execute as @a[scores={sleep.time_in_bed=20..}] run time set 0
+execute as @a[scores={sleep.time_in_bed=20}] run time add 11000
 
 # weather clear
 execute if predicate sleep:weather_check_thunder run execute as @a[scores={sleep.time_in_bed=20..}] run weather clear

data/sleep/function/time_control/time_skip/5seconds.mcfunction

@@ -1,4 +1,4 @@
-execute as @a[scores={sleep.time_in_bed=100..}] run time set 0
+execute as @a[scores={sleep.time_in_bed=100}] run time add 11000
 
 # weather clear
 execute if predicate sleep:weather_check_thunder run execute as @a[scores={sleep.time_in_bed=100..}] run weather clear

data/sleep/function/timeofday.mcfunction

@@ -6,7 +6,7 @@ execute as @a[scores={sleep_notification=1}] at @s if score Timeofday sleep.cloc
 execute as @a[scores={sleep_notification=2}] at @s if score Timeofday sleep.clock matches 12542 run playsound minecraft:block.note_block.cow_bell voice
 
 
-execute as @a[scores={sleep_notification=3}] at @s if score Timeofday sleep.clock matches 12542 run tellraw @s {"text":"You can sleep now","color":"yellow", "hoverEvent":{"action":"show_text","value":[{"text":"by clicking on a bed"}]}}
+# execute as @a[scores={sleep_notification=3}] at @s if score Timeofday sleep.clock matches 12542 run tellraw @s {"text":"You can sleep now","color":"yellow", "hoverEvent":{"action":"show_text","value":[{"text":"by clicking on a bed"}]}}
 
 execute as @a[scores={sleep_notification=3}] at @s if score Timeofday sleep.clock matches 12542 run playsound minecraft:block.note_block.cow_bell voice
 

pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "pack_format": 48,
-    "description": "Simple Multiplayer Sleep - [1.21] v.2.4.2"
+    "description": "Simple Multiplayer Sleep - [1.21] v.2.5.2"
   }
 }