Skip to content

Commit 7383a99

Browse files
committed
v2.3 for 1.17–1.19
1 parent d2d70dd commit 7383a99

File tree

10 files changed

+45
-459
lines changed

10 files changed

+45
-459
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.datapack/

data/skywars/functions/goldrush/init.mcfunction

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
gamerule commandBlockOutput false
1111
gamerule doDaylightCycle false
12+
gamerule spawnRadius 1
1213
time set day
1314
setworldspawn 25 139 1
1415
spawnpoint @a 25 139 1
@@ -37,9 +38,11 @@ scoreboard objectives add kit dummy "KitID"
3738
scoreboard objectives add health health "HP"
3839
scoreboard objectives add deaths deathCount "Deaths"
3940
scoreboard objectives add tags dummy "Tags"
41+
scoreboard objectives setdisplay sidebar.team.yellow wins
4042
scoreboard objectives setdisplay sidebar.team.red kills
43+
scoreboard objectives setdisplay sidebar.team.gray kills
4144
scoreboard players set limit players_ready 2
42-
45+
scoreboard players set min players 1
4346

4447
### LOBBY ###
4548

@@ -52,15 +55,16 @@ fill 33 142 -7 19 142 7 white_stained_glass
5255
setblock 27 139 -6 oak_wall_sign[facing=south]{Text1:'{"text":"","clickEvent":{"action":"run_command","value":"function skywars:goldrush/startsign"}}',Text2:'{"text":"Start","color":"green"}'}
5356
setblock 25 139 -6 oak_wall_sign[facing=south]{Text1:'{"text":"","clickEvent":{"action":"run_command","value":"function skywars:goldrush/ready"}}',Text2:'{"text":"Ready","color":"yellow"}'}
5457
setblock 27 139 6 oak_wall_sign{Text2:'{"text":"Made by","color":"white"}',Text3:'{"text":"Nixinova","color":"aqua"}'}
55-
setblock 25 139 6 oak_wall_sign{Text2:'{"text":"SkyWars v2.2","color":"green"}',Text3:'{"text":"Minecraft 1.17","color":"aqua"}'}
58+
setblock 25 139 6 oak_wall_sign{Text2:'{"text":"SkyWars v2.3","color":"green"}',Text3:'{"text":"(MC 1.17-1.19)","color":"aqua"}'}
5659

5760
# Credit
5861
setblock 26 139 6 player_wall_head{SkullOwner:{Name:"Nixinova"}}
5962

6063
### MAP LOADING ###
6164

6265
# Structure block platform
63-
fill 22 205 9 28 205 -5 light_blue_terracotta
66+
fill 22 205 9 28 205 -5 prismarine_slab[type=top]
67+
fill 22 207 9 28 207 -5 prismarine_slab
6468

6569
# Ticker
6670
setblock 25 206 6 repeating_command_block{Command:"function skywars:goldrush/running",auto:true}
@@ -107,3 +111,4 @@ setblock 24 206 -4 structure_block{mode:LOAD,name:"skywars:isle_s4",posX:-5,posY
107111
setblock 25 206 7 command_block{Command:"setblock ~-1 ~ ~ air"}
108112
setblock 24 206 6 command_block{Command:'tellraw @a[team=playing] ["",{"text":"Starting!","color":"yellow"}]'}
109113
setblock 24 206 8 command_block{Command:"execute as @a[team=playing] at @s run fill ~ ~ ~ ~ ~-3 ~ air"}
114+
setblock 23 206 7 command_block{Command:"effect give @a[team=playing] slow_falling 5"}

data/skywars/functions/goldrush/ready.mcfunction

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ scoreboard players add currentTag tags 1
4040
execute if score currentTag tags matches 13.. run scoreboard players remove currentTag tags 12
4141

4242
# Final commands
43+
execute if score @s ready matches 1 run tellraw @a [{"selector":"@s","color":"green"},{"text":" is ready!","color":"yellow"}]
4344
execute unless score @s ready matches 1 run tellraw @a [{"selector":"@s","color":"green"},{"text":" is now ready!","color":"green"}]
4445
scoreboard players set @s ready 1
4546
team join ready @s
46-
scoreboard players add count players_ready 1
47+
scoreboard players add count players_ready 1

data/skywars/functions/goldrush/running.mcfunction

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ execute store result score alive players if entity @e[team=playing]
1313
execute if score alive players <= min players if score ingame players matches 1 run function skywars:goldrush/winner
1414

1515
# Lobby hotbar
16-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.0 replace diamond_sword{display:{Name:'"\\u00A7eLobby Blade"',Lore:['"\\u00A7cFight in the lobby!"']},Enchantments:[{id:"knockback",lvl:2}],Unbreakable:true,HideFlags:127}
17-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.1 replace air
18-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.2 replace air
19-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.3 replace written_book{pages:['[{"text":"Select a kit:\\n","color":"red"},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Miner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 1"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Witch","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 2"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Nurse","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 3"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Marksman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 4"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Armourer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 5"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Summoner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 6"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Farmer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 7"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Fisherman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 8"}}]'],title:"Kit Selector",author:"Nixinova",display:{Name:'"\\u00A7eKit Selector"',Lore:['"\\u00A7aSelect a kit"']},HideFlags:127}
20-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.4 replace air
21-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.5 replace written_book{pages:['[{"text":"\\u00A7cChoose a cage:\\u00A7r\\n"},{"text":"\\n\\u2022 Default","color":"reset","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 0"}},{"text":"\\n\\u2022 None","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 1"}},{"text":"\\n\\u2022 Glass: "},{"text":"\\u25a0","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 2"}},{"text":"\\u25a0","color":"green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 3"}},{"text":"\\u25a0","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 4"}},{"text":"\\u25a0","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 5"}},{"text":"\\u25a0","color":"light_purple","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 6"}},{"text":"\\u25a0","color":"yellow","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 7"}},{"text":"\\u25a0","color":"dark_blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 8"}},{"text":"\\u25a0","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 9"}},{"text":"\\u25a0","color":"dark_gray","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 10"}},{"text":"\\u25a0","color":"black","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 11"}},{"text":"\\n\\u2022 Iron","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 12"}},{"text":"\\n\\u2022 Wood","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 13"}}]'],title:"Cage Selector",author:"Nixinova",display:{Name:'"\\u00A7eCage Selector"',Lore:['"\\u00A7aChoose a cage"']},HideFlags:127}
22-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.6 replace air
23-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.7 replace air
24-
item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.8 replace air
16+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.0 with diamond_sword{display:{Name:'"\\u00A7eLobby Blade"',Lore:['"\\u00A7cFight in the lobby!"']},Enchantments:[{id:"knockback",lvl:2}],Unbreakable:true,HideFlags:127}
17+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.1 with air
18+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.2 with air
19+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.3 with written_book{pages:['[{"text":"Select a kit:\\n","color":"red"},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Miner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 1"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Witch","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 2"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Nurse","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 3"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Marksman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 4"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Armourer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 5"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Summoner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 6"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Farmer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 7"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Fisherman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 8"}}]'],title:"Kit Selector",author:"Nixinova",display:{Name:'"\\u00A7eKit Selector"',Lore:['"\\u00A7aSelect a kit"']},HideFlags:127}
20+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.4 with air
21+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.5 with written_book{pages:['[{"text":"\\u00A7cChoose a cage:\\u00A7r\\n"},{"text":"\\n\\u2022 Default","color":"reset","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 0"}},{"text":"\\n\\u2022 None","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 1"}},{"text":"\\n\\u2022 Glass: "},{"text":"\\u25a0","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 2"}},{"text":"\\u25a0","color":"green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 3"}},{"text":"\\u25a0","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 4"}},{"text":"\\u25a0","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 5"}},{"text":"\\u25a0","color":"light_purple","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 6"}},{"text":"\\u25a0","color":"yellow","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 7"}},{"text":"\\u25a0","color":"dark_blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 8"}},{"text":"\\u25a0","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 9"}},{"text":"\\u25a0","color":"dark_gray","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 10"}},{"text":"\\u25a0","color":"black","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 11"}},{"text":"\\n\\u2022 Iron","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 12"}},{"text":"\\n\\u2022 Wood","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 13"}}]'],title:"Cage Selector",author:"Nixinova",display:{Name:'"\\u00A7eCage Selector"',Lore:['"\\u00A7aChoose a cage"']},HideFlags:127}
22+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.6 with air
23+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.7 with air
24+
item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.8 with air
2525

2626
# Lobby commands
2727
kill @e[type=item,x=25,y=138,z=1,distance=..10]
@@ -42,4 +42,4 @@ execute as @a[team=spectator,x=0,y=-256,z=0,distance=..256] run tp @s ~ 64 ~
4242
kill @a[team=playing,x=0,y=-256,z=0,distance=..256]
4343

4444
# World commands
45-
weather clear
45+
weather clear

data/skywars/functions/goldrush/start.mcfunction

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#---------------------------------
2-
#
3-
# SKYWARS : GOLD RUSH
4-
# by Nixinova
5-
#
6-
# Game starting commands
7-
#
8-
#---------------------------------
1+
#---------------------------------#
2+
# #
3+
# SKYWARS : GOLD RUSH #
4+
# by Nixinova #
5+
# #
6+
# Game starting commands #
7+
# #
8+
#---------------------------------#
99

1010
scoreboard players set ingame players 1
1111

@@ -22,8 +22,7 @@ effect give @a[team=playing] minecraft:resistance 15 4
2222

2323
setblock 24 206 7 redstone_block
2424

25-
#tellraw @a[team=playing] {"text":"Resetting map, expect lag...","color":"red","italic":true}
26-
title @a[team=playing] actionbar {"text":"Resetting map","color":"red"}
25+
title @a[team=playing] actionbar {"text":"Resetting map...","color":"red"}
2726
function skywars:goldrush/clearmap
2827
title @a[team=playing] actionbar {"text":"Map cleared.","color":"green"}
2928
title @a[team=playing] actionbar {"text":"Loading new map...","color":"yellow"}
@@ -113,4 +112,4 @@ give @a[team=playing,scores={kit=7}] bread 8
113112

114113
# Fisherman
115114
give @a[team=playing,scores={kit=8}] fishing_rod{Enchantments:[{id:"minecraft:knockback",lvl:1}]}
116-
give @a[team=playing,scores={kit=8}] cod 12
115+
give @a[team=playing,scores={kit=8}] cod 12
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#---------------------------------
2-
#
3-
# SKYWARS : GOLD RUSH
4-
# by Nixinova
5-
#
6-
# Finishing commands
7-
#
8-
#---------------------------------
1+
#---------------------------------#
2+
# #
3+
# SKYWARS : GOLD RUSH #
4+
# by Nixinova #
5+
# #
6+
# Finishing commands #
7+
# #
8+
#---------------------------------#
99

1010
scoreboard players set ingame players 0
1111

@@ -19,4 +19,5 @@ title @a subtitle {"text":"has won!","color":"green"}
1919
tp @a 25 138 1
2020
gamemode adventure @a
2121
team join lobby @a
22-
clear @a
22+
clear @a
23+
execute at @a run playsound entity.ender_dragon.ambient ambient @p

data/skywars/loot_tables/skywars/chests/chest_island.json

Lines changed: 0 additions & 239 deletions
This file was deleted.

0 commit comments

Comments
 (0)