Skip to content

Commit 43f222d

Browse files
JodekqJodekq
committed
Release v.2.8.5
Fixed some issues #5
1 parent 302f11c commit 43f222d

27 files changed

+470
-462
lines changed

‎data/jodek/advancement/root.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
{
2-
"display": {
3-
"icon": {
4-
"id": "minecraft:player_head",
5-
"components": {
6-
"minecraft:profile": {
7-
"id": [
8-
-678894869,
9-
-1704640057,
10-
-1185339821,
11-
1705315599
12-
],
13-
"properties": [
14-
{
15-
"name": "textures",
16-
"value": "ewogICJ0aW1lc3RhbXAiIDogMTcxMTk4OTU4MDU2NCwKICAicHJvZmlsZUlkIiA6ICJkNzg4ZTJlYjlhNjU0MWM3Yjk1OTI2NTM2NWE1MGQwZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJKb2RlayIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mZDIyZDNhMmI3NGY0ZDhlZDczMDg2NDk2NjM3NGMzMjYwOTg5ZGFhMTE4NWM1YTVkYTVhZjA2YzgwMmEyNmY3IgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mOWE3NjUzNzY0Nzk4OWY5YTBiNmQwMDFlMzIwZGFjNTkxYzM1OWU5ZTYxYTMxZjRjZTExYzg4ZjIwN2YwYWQ0IgogICAgfQogIH0KfQ=="
17-
}
18-
]
19-
}
20-
}
21-
},
22-
"title": "Jodeks Datapacks ",
23-
"description": [
24-
"",
25-
{
26-
"text": "Creator of vanilla friendly datapacks\n",
27-
"color": "white"
28-
},
29-
{
30-
"text": "\n",
31-
"color": "white"
32-
},
33-
{
34-
"text": "modrinth.com/user/Jodek",
35-
"color": "dark_purple"
36-
}
37-
],
38-
"background": "minecraft:textures/block/flowering_azalea_leaves.png",
39-
"frame": "challenge",
40-
"show_toast": false,
41-
"announce_to_chat": false
42-
},
43-
"criteria": {
44-
"tick": {
45-
"trigger": "minecraft:tick"
46-
}
47-
}
1+
{
2+
"display": {
3+
"icon": {
4+
"id": "minecraft:player_head",
5+
"components": {
6+
"minecraft:profile": {
7+
"id": [
8+
-678894869,
9+
-1704640057,
10+
-1185339821,
11+
1705315599
12+
],
13+
"properties": [
14+
{
15+
"name": "textures",
16+
"value": "ewogICJ0aW1lc3RhbXAiIDogMTcxMTk4OTU4MDU2NCwKICAicHJvZmlsZUlkIiA6ICJkNzg4ZTJlYjlhNjU0MWM3Yjk1OTI2NTM2NWE1MGQwZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJKb2RlayIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mZDIyZDNhMmI3NGY0ZDhlZDczMDg2NDk2NjM3NGMzMjYwOTg5ZGFhMTE4NWM1YTVkYTVhZjA2YzgwMmEyNmY3IgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mOWE3NjUzNzY0Nzk4OWY5YTBiNmQwMDFlMzIwZGFjNTkxYzM1OWU5ZTYxYTMxZjRjZTExYzg4ZjIwN2YwYWQ0IgogICAgfQogIH0KfQ=="
17+
}
18+
]
19+
}
20+
}
21+
},
22+
"title": "Jodeks Datapacks ",
23+
"description": [
24+
"",
25+
{
26+
"text": "Creator of vanilla friendly datapacks\n",
27+
"color": "white"
28+
},
29+
{
30+
"text": "\n",
31+
"color": "white"
32+
},
33+
{
34+
"text": "modrinth.com/user/Jodek",
35+
"color": "dark_purple"
36+
}
37+
],
38+
"background": "minecraft:textures/block/flowering_azalea_leaves.png",
39+
"frame": "challenge",
40+
"show_toast": false,
41+
"announce_to_chat": false
42+
},
43+
"criteria": {
44+
"tick": {
45+
"trigger": "minecraft:tick"
46+
}
47+
}
4848
}

‎data/jodek/advancement/sleep.json

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
{
2-
"display": {
3-
"icon": {
4-
"id": "minecraft:red_bed"
5-
},
6-
"title": "Sleep ",
7-
"description": [
8-
"",
9-
{
10-
"text": "Simple Multiplayer Sleep\n",
11-
"color": "white"
12-
},
13-
{
14-
"text": "\n",
15-
"color": "yellow"
16-
},
17-
{
18-
"text": "/trigger",
19-
"color": "yellow"
20-
},
21-
{
22-
"text": " help.sleep\n",
23-
"color": "yellow"
24-
},
25-
{
26-
"text": "for help\n",
27-
"color": "white"
28-
},
29-
{
30-
"text": "\n",
31-
"color": "green"
32-
},
33-
{
34-
"text": "Datapack version: ",
35-
"color": "dark_green"
36-
},
37-
{
38-
"text": "v.2.8.4",
39-
"color": "green"
40-
},
41-
{
42-
"text": "\n",
43-
"color": "green"
44-
},
45-
{
46-
"text": "Game version: ",
47-
"color": "dark_green"
48-
},
49-
{
50-
"text": "1.21",
51-
"color": "green"
52-
},
53-
{
54-
"text": "\n",
55-
"color": "green"
56-
},
57-
{
58-
"text": "\n",
59-
"color": "green"
60-
},
61-
{
62-
"text": "modrinth.com/datapack/sleep",
63-
"color": "dark_purple"
64-
}
65-
],
66-
"frame": "task",
67-
"show_toast": false,
68-
"announce_to_chat": false
69-
},
70-
"parent": "jodek:utility",
71-
"criteria": {
72-
"tick": {
73-
"trigger": "minecraft:tick"
74-
}
75-
}
1+
{
2+
"display": {
3+
"icon": {
4+
"id": "minecraft:red_bed"
5+
},
6+
"title": "Sleep ",
7+
"description": [
8+
"",
9+
{
10+
"text": "Simple Multiplayer Sleep\n",
11+
"color": "white"
12+
},
13+
{
14+
"text": "\n",
15+
"color": "yellow"
16+
},
17+
{
18+
"text": "/trigger",
19+
"color": "yellow"
20+
},
21+
{
22+
"text": " help.sleep\n",
23+
"color": "yellow"
24+
},
25+
{
26+
"text": "for help\n",
27+
"color": "white"
28+
},
29+
{
30+
"text": "\n",
31+
"color": "green"
32+
},
33+
{
34+
"text": "Datapack version: ",
35+
"color": "dark_green"
36+
},
37+
{
38+
"text": "v.2.8.5",
39+
"color": "green"
40+
},
41+
{
42+
"text": "\n",
43+
"color": "green"
44+
},
45+
{
46+
"text": "Game version: ",
47+
"color": "dark_green"
48+
},
49+
{
50+
"text": "1.21",
51+
"color": "green"
52+
},
53+
{
54+
"text": "\n",
55+
"color": "green"
56+
},
57+
{
58+
"text": "\n",
59+
"color": "green"
60+
},
61+
{
62+
"text": "modrinth.com/datapack/sleep",
63+
"color": "dark_purple"
64+
}
65+
],
66+
"frame": "task",
67+
"show_toast": false,
68+
"announce_to_chat": false
69+
},
70+
"parent": "jodek:utility",
71+
"criteria": {
72+
"tick": {
73+
"trigger": "minecraft:tick"
74+
}
75+
}
7676
}

‎data/jodek/advancement/utility.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
{
2-
"display": {
3-
"icon": {
4-
"id": "minecraft:command_block_minecart"
5-
},
6-
"title": "Utility ",
7-
"description": [
8-
"",
9-
{
10-
"text": "Utility collection of my datapacks\n",
11-
"color": "white"
12-
},
13-
{
14-
"text": "\n",
15-
"color": "white"
16-
},
17-
{
18-
"text": "modrinth.com/collection/P5y8mJyI",
19-
"color": "dark_purple"
20-
}
21-
],
22-
"frame": "goal",
23-
"show_toast": false,
24-
"announce_to_chat": false
25-
},
26-
"parent": "jodek:root",
27-
"criteria": {
28-
"tick": {
29-
"trigger": "minecraft:tick"
30-
}
31-
}
1+
{
2+
"display": {
3+
"icon": {
4+
"id": "minecraft:command_block_minecart"
5+
},
6+
"title": "Utility ",
7+
"description": [
8+
"",
9+
{
10+
"text": "Utility collection of my datapacks\n",
11+
"color": "white"
12+
},
13+
{
14+
"text": "\n",
15+
"color": "white"
16+
},
17+
{
18+
"text": "modrinth.com/collection/P5y8mJyI",
19+
"color": "dark_purple"
20+
}
21+
],
22+
"frame": "goal",
23+
"show_toast": false,
24+
"announce_to_chat": false
25+
},
26+
"parent": "jodek:root",
27+
"criteria": {
28+
"tick": {
29+
"trigger": "minecraft:tick"
30+
}
31+
}
3232
}

‎data/minecraft/tags/function/load.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"values": [
3-
"sleep:load"
4-
]
1+
{
2+
"values": [
3+
"sleep:load"
4+
]
55
}

‎data/minecraft/tags/function/tick.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"values": [
3-
"sleep:main"
4-
]
1+
{
2+
"values": [
3+
"sleep:main"
4+
]
55
}

‎data/sleep/function/amount_to_sleep.mcfunction

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# How long does one player sleep
2-
scoreboard players set @a[scores={sleep.time_since_rest=1..}] sleep.time_in_bed 0
3-
execute if score &playerNum sleep.players_online < &amount_to_sleep sleep.config run scoreboard players add @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 1
4-
5-
# only count up time until night skip when everyone is in bed
6-
execute if score &sleep_amount sleep.sleeping_players >= &amount_to_sleep sleep.config run scoreboard players add @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 1
7-
8-
# reset time when one goes out of bed
9-
execute if score &playerNum sleep.players_online >= &amount_to_sleep sleep.config run execute if score &sleep_amount sleep.sleeping_players < &amount_to_sleep sleep.config run scoreboard players set @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 0
10-
11-
# time skip
12-
# check config + how many players sleep
13-
execute if score &sleep_amount sleep.sleeping_players >= &amount_to_sleep sleep.config run function sleep:time_control/time_control
14-
15-
# check how many players --> if only 1 then skip when 1 sleeps
16-
execute if score &afk_players_sleep sleep.config matches 0 run execute store result score &playerNum sleep.players_online run list
17-
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
1+
# How long does one player sleep
2+
scoreboard players set @a[scores={sleep.time_since_rest=1..}] sleep.time_in_bed 0
3+
execute if score &playerNum sleep.players_online < &amount_to_sleep sleep.config run scoreboard players add @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 1
4+
5+
# only count up time until night skip when everyone is in bed
6+
execute if score &sleep_amount sleep.sleeping_players >= &amount_to_sleep sleep.config run scoreboard players add @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 1
7+
8+
# reset time when one goes out of bed
9+
execute if score &playerNum sleep.players_online >= &amount_to_sleep sleep.config run execute if score &sleep_amount sleep.sleeping_players < &amount_to_sleep sleep.config run scoreboard players set @a[scores={sleep.time_since_rest=0}] sleep.time_in_bed 0
10+
11+
# time skip
12+
# check config + how many players sleep
13+
execute if score &sleep_amount sleep.sleeping_players >= &amount_to_sleep sleep.config run function sleep:time_control/time_control
14+
15+
# check how many players --> if only 1 then skip when 1 sleeps
16+
execute if score &afk_players_sleep sleep.config matches 0 run execute store result score &playerNum sleep.players_online run list
17+
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
1818
execute if score &actionbar_display sleep.config matches 2 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/calc_online_players_afk.mcfunction

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# get number of players online
2-
execute store result score &playerNum sleep.players_online run list
3-
4-
# get number of players who have afk tag
5-
execute store result score &playerNumAFK sleep.players_online if entity @a[tag=afkannouncer.afk]
6-
1+
# get number of players online
2+
execute store result score &playerNum sleep.players_online run list
3+
4+
# get number of players who have afk tag
5+
execute store result score &playerNumAFK sleep.players_online if entity @a[tag=afkannouncer.afk]
6+
77
scoreboard players operation &playerNum sleep.players_online -= &playerNumAFK sleep.players_online

‎data/sleep/function/clear_title.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
title @a actionbar ""
2-
1+
title @a actionbar ""
2+

0 commit comments

Comments
 (0)