Skip to content

Commit

Permalink
Fixes for 1.16 changess: attribute name & uuid, dimension, disable TPS
Browse files Browse the repository at this point in the history
  • Loading branch information
Pablete1234 committed Jun 25, 2020
1 parent 4de8f0d commit 07d145b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ scoreboard objectives add PistonsMade minecraft.crafted:minecraft.piston "Piston
scoreboard objectives add TntPlaced minecraft.used:minecraft.tnt "StuffBlown"
scoreboard objectives add EmerladsPicked minecraft.mined:minecraft.emerald_ore "EmerladsPicked"
scoreboard objectives add SnowBallsMade minecraft.mined:minecraft.snow "SnowBallsMade"
scoreboard objectives add GoldenPigged minecraft.killed:zombie_pigman "GoldenPigged"
scoreboard objectives add GoldenPigged minecraft.killed:minecraft.zombified_piglin "GoldenPigged"
scoreboard objectives add SteakDinners minecraft.used:minecraft.cooked_beef "SteakDinners"
scoreboard objectives add HardcoreClayers minecraft.mined:minecraft.terracotta "HardcoreClayers"
scoreboard objectives add BlueOreMined minecraft.mined:minecraft.lapis_ore "BlueOreMined"
Expand Down
2 changes: 1 addition & 1 deletion spectator/data/spectator/functions/spectator.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ execute unless data entity @s {OnGround:1b} run scoreboard players set @s valid
execute if block ~ ~ ~ minecraft:water run scoreboard players set @s valid 1
execute unless data entity @s {Air:300s} run scoreboard players set @s valid 0
execute unless data entity @s {Fire:-20s} run scoreboard players set @s valid 0
execute unless data entity @s {Dimension:0} run scoreboard players set @s valid 0
execute unless data entity @s {Dimension:"minecraft:overworld"} run scoreboard players set @s valid 0

gamemode spectator @s[scores={valid=1}]
tellraw @s[scores={valid=0}] [{"text":"", "color":"yellow", "bold":"true"},{"text":"You are not safe to change into spectator mode", "color":"red", "bold": "false"}]
3 changes: 2 additions & 1 deletion tools/data/tools/functions/debug/tps_update.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ scoreboard players operation #TPS_digit2 Debug = #TPS_digit Debug
scoreboard players operation #TPS_digit Debug /= #TEN Debug
scoreboard players operation #TPS_digit2 Debug %= #TEN Debug

title @a footer [{"text":"TPS: ","color":"aqua"},{"score":{"name":"#TPS_whole","objective":"Debug"},"color":"blue"},{"text":".","color":"blue"},{"score":{"name":"#TPS_digit","objective":"Debug"},"color":"blue"},{"score":{"name":"#TPS_digit2","objective":"Debug"},"color":"blue"},{"text":" | ","color":"none"},{"text":"MSPT: ","color":"green"},{"score":{"name":"MSPT","objective":"Debug"},"color":"dark_green"}]
# Disabled due to lack of jarmod for this command
# title @a footer [{"text":"TPS: ","color":"aqua"},{"score":{"name":"#TPS_whole","objective":"Debug"},"color":"blue"},{"text":".","color":"blue"},{"score":{"name":"#TPS_digit","objective":"Debug"},"color":"blue"},{"score":{"name":"#TPS_digit2","objective":"Debug"},"color":"blue"},{"text":" | ","color":"none"},{"text":"MSPT: ","color":"green"},{"score":{"name":"MSPT","objective":"Debug"},"color":"dark_green"}]

# Since we now have a worldborder at 16K, the sensibility of MSPT no longer has decimals
# scoreboard players operation #MSPT_whole Debug = MSPT Debug
Expand Down
18 changes: 9 additions & 9 deletions tools/data/tools/functions/unicorn/set.mcfunction
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
replaceitem entity @s armor.head air
replaceitem entity @s[scores={.Unicorn=1}] armor.head minecraft:end_rod{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=2}] armor.head minecraft:oak_button{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=3}] armor.head minecraft:glass{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=4}] armor.head minecraft:lead{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=5}] armor.head minecraft:beacon{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=6}] armor.head minecraft:torch{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=7}] armor.head minecraft:glowstone{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=8}] armor.head minecraft:ender_chest{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=9}] armor.head minecraft:magma_block{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attackSpeed",Name:"generic.attackSpeed",Amount:100,Operation:0,UUIDLeast:645361,UUIDMost:147707,Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=1}] armor.head minecraft:end_rod{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=2}] armor.head minecraft:oak_button{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=3}] armor.head minecraft:glass{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=4}] armor.head minecraft:lead{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=5}] armor.head minecraft:beacon{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=6}] armor.head minecraft:torch{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=7}] armor.head minecraft:glowstone{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=8}] armor.head minecraft:ender_chest{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}
replaceitem entity @s[scores={.Unicorn=9}] armor.head minecraft:magma_block{Enchantments:[{id:"minecraft:binding_curse",lvl:5}],AttributeModifiers:[{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I; 42843, 1689025593, -201278, -1558272105],Slot:"head"}]}

tellraw @s {"color":"yellow","text":"You are now a unicorn"}

0 comments on commit 07d145b

Please sign in to comment.