Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
LeonNikolai committed Oct 20, 2020
1 parent 16c705a commit ad4751a
Show file tree
Hide file tree
Showing 150 changed files with 314 additions and 161 deletions.
1 change: 1 addition & 0 deletions data/durability/advancements/broke.json
@@ -0,0 +1 @@
{"rewards":{"function":"durability:broke"},"criteria":{"broke":{"trigger":"item_durability_changed","conditions":{"durability":{"max":0}}}}}
1 change: 0 additions & 1 deletion data/durability/advancements/inv.change.json

This file was deleted.

10 changes: 10 additions & 0 deletions data/durability/advancements/inventory.json
@@ -0,0 +1,10 @@
{
"rewards": {
"function": "durability:inventory"
},
"criteria": {
"inv_changed": {
"trigger": "minecraft:inventory_changed"
}
}
}
1 change: 0 additions & 1 deletion data/durability/advancements/item.breake.json

This file was deleted.

@@ -1,2 +1,2 @@
advancement revoke @s from durability:item.breake
advancement revoke @s from durability:broke
title @s actionbar [{"text":"BROKEN ✖ BROKEN","color":"red","bold":true}]
6 changes: 0 additions & 6 deletions data/durability/functions/durability.hud.both.mcfunction

This file was deleted.

3 changes: 0 additions & 3 deletions data/durability/functions/durability.hud.main.mcfunction

This file was deleted.

3 changes: 0 additions & 3 deletions data/durability/functions/durability.hud.off.mcfunction

This file was deleted.

4 changes: 4 additions & 0 deletions data/durability/functions/hotbar.mcfunction
@@ -0,0 +1,4 @@
execute store result score @s hotbar.old run data get entity @s SelectedItemSlot
scoreboard players reset @s itm.main.dr
execute unless predicate item_check:mainhand/empty run function durability:item.main
title @s actionbar [{"score":{"name":"@s","objective":"itm.off.dr"}},{"text":" "},{"score":{"name":"@s","objective":"itm.main.dr"}}]
4 changes: 0 additions & 4 deletions data/durability/functions/inv.change.trigger.mcfunction

This file was deleted.

6 changes: 6 additions & 0 deletions data/durability/functions/inventory.mcfunction
@@ -0,0 +1,6 @@
advancement revoke @s from durability:inventory
scoreboard players reset @s itm.main.dr
scoreboard players reset @s itm.off.dr
execute unless predicate item_check:mainhand/empty run function durability:item.main
execute unless predicate item_check:offhand/empty run function durability:item.off
title @s actionbar [{"score":{"name":"@s","objective":"itm.off.dr"}},{"text":" "},{"score":{"name":"@s","objective":"itm.main.dr"}}]
133 changes: 67 additions & 66 deletions data/durability/functions/item.main.mcfunction
@@ -1,67 +1,68 @@
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:bow"}}] itm.main.dr 384
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:crossbow"}}] itm.main.dr 326
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:trident"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:elytra"}}] itm.main.dr 432
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:shield"}}] itm.main.dr 336
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:shears"}}] itm.main.dr 238
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick"}}] itm.main.dr 25
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:warped_fungus_on_a_stick"}}] itm.main.dr 100
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:flint_and_steel"}}] itm.main.dr 64
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:fishing_rod"}}] itm.main.dr 64
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:wooden_pickaxe"}}] itm.main.dr 59
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:wooden_axe"}}] itm.main.dr 59
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:wooden_sword"}}] itm.main.dr 59
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:wooden_shovel"}}] itm.main.dr 59
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:wooden_hoe"}}] itm.main.dr 59
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:stone_pickaxe"}}] itm.main.dr 131
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:stone_axe"}}] itm.main.dr 131
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:stone_sword"}}] itm.main.dr 131
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:stone_shovel"}}] itm.main.dr 131
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:stone_hoe"}}] itm.main.dr 131
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_pickaxe"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_axe"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_sword"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_shovel"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_hoe"}}] itm.main.dr 250
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_pickaxe"}}] itm.main.dr 32
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_axe"}}] itm.main.dr 32
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_sword"}}] itm.main.dr 32
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_shovel"}}] itm.main.dr 32
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_hoe"}}] itm.main.dr 32
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_pickaxe"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_axe"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_sword"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_shovel"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_hoe"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_helmet"}}] itm.main.dr 364
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_chestplate"}}] itm.main.dr 529
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_leggings"}}] itm.main.dr 496
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:diamond_boots"}}] itm.main.dr 430
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_helmet"}}] itm.main.dr 166
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_chestplate"}}] itm.main.dr 241
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_leggings"}}] itm.main.dr 226
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:iron_boots"}}] itm.main.dr 196
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:chainmail_helmet"}}] itm.main.dr 165
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:chainmail_chestplate"}}] itm.main.dr 240
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:chainmail_leggings"}}] itm.main.dr 225
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:chainmail_boots"}}] itm.main.dr 195
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_helmet"}}] itm.main.dr 78
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_chestplate"}}] itm.main.dr 113
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_leggings"}}] itm.main.dr 92
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:golden_boots"}}] itm.main.dr 1561
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:leather_helmet"}}] itm.main.dr 56
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:leather_chestplate"}}] itm.main.dr 81
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:leather_leggings"}}] itm.main.dr 76
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:leather_boots"}}] itm.main.dr 66
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:turtle_helmet"}}] itm.main.dr 276
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_sword"}}] itm.main.dr 2031
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_axe"}}] itm.main.dr 2031
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_hoe"}}] itm.main.dr 2031
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_shovel"}}] itm.main.dr 2031
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_pickaxe"}}] itm.main.dr 2031
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_helmet"}}] itm.main.dr 407
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_chestplate"}}] itm.main.dr 592
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_leggings"}}] itm.main.dr 555
scoreboard players set @s[nbt={SelectedItem:{id:"minecraft:netherite_boots"}}] itm.main.dr 481
execute if predicate item_check:mainhand/bow run scoreboard players set @s itm.main.dr 384
execute if predicate item_check:mainhand/crossbow run scoreboard players set @s itm.main.dr 326
execute if predicate item_check:mainhand/trident run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/shield run scoreboard players set @s itm.main.dr 336
execute if predicate item_check:mainhand/shears run scoreboard players set @s itm.main.dr 238
execute if predicate item_check:mainhand/carrot_on_a_stick run scoreboard players set @s itm.main.dr 25
execute if predicate item_check:mainhand/warped_fungus_on_a_stick run scoreboard players set @s itm.main.dr 100
execute if predicate item_check:mainhand/flint_and_steel run scoreboard players set @s itm.main.dr 64
execute if predicate item_check:mainhand/fishing_rod run scoreboard players set @s itm.main.dr 64
execute if predicate item_check:mainhand/wooden_pickaxe run scoreboard players set @s itm.main.dr 59
execute if predicate item_check:mainhand/wooden_axe run scoreboard players set @s itm.main.dr 59
execute if predicate item_check:mainhand/wooden_sword run scoreboard players set @s itm.main.dr 59
execute if predicate item_check:mainhand/wooden_shovel run scoreboard players set @s itm.main.dr 59
execute if predicate item_check:mainhand/wooden_hoe run scoreboard players set @s itm.main.dr 59
execute if predicate item_check:mainhand/stone_pickaxe run scoreboard players set @s itm.main.dr 131
execute if predicate item_check:mainhand/stone_axe run scoreboard players set @s itm.main.dr 131
execute if predicate item_check:mainhand/stone_sword run scoreboard players set @s itm.main.dr 131
execute if predicate item_check:mainhand/stone_shovel run scoreboard players set @s itm.main.dr 131
execute if predicate item_check:mainhand/stone_hoe run scoreboard players set @s itm.main.dr 131
execute if predicate item_check:mainhand/iron_pickaxe run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/iron_axe run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/iron_sword run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/iron_shovel run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/iron_hoe run scoreboard players set @s itm.main.dr 250
execute if predicate item_check:mainhand/golden_pickaxe run scoreboard players set @s itm.main.dr 32
execute if predicate item_check:mainhand/golden_axe run scoreboard players set @s itm.main.dr 32
execute if predicate item_check:mainhand/golden_sword run scoreboard players set @s itm.main.dr 32
execute if predicate item_check:mainhand/golden_shovel run scoreboard players set @s itm.main.dr 32
execute if predicate item_check:mainhand/golden_hoe run scoreboard players set @s itm.main.dr 32
execute if predicate item_check:mainhand/diamond_pickaxe run scoreboard players set @s itm.main.dr 1561
execute if predicate item_check:mainhand/diamond_axe run scoreboard players set @s itm.main.dr 1561
execute if predicate item_check:mainhand/diamond_sword run scoreboard players set @s itm.main.dr 1561
execute if predicate item_check:mainhand/diamond_shovel run scoreboard players set @s itm.main.dr 1561
execute if predicate item_check:mainhand/diamond_hoe run scoreboard players set @s itm.main.dr 1561
execute if predicate item_check:mainhand/netherite_sword run scoreboard players set @s itm.main.dr 2031
execute if predicate item_check:mainhand/netherite_axe run scoreboard players set @s itm.main.dr 2031
execute if predicate item_check:mainhand/netherite_hoe run scoreboard players set @s itm.main.dr 2031
execute if predicate item_check:mainhand/netherite_shovel run scoreboard players set @s itm.main.dr 2031
execute if predicate item_check:mainhand/netherite_pickaxe run scoreboard players set @s itm.main.dr 2031
execute if predicate item_check:mainhand/netherite_chestplate run scoreboard players set @s itm.main.dr 592
execute if predicate item_check:mainhand/diamond_chestplate run scoreboard players set @s itm.main.dr 528
execute if predicate item_check:mainhand/iron_chestplate run scoreboard players set @s itm.main.dr 240
execute if predicate item_check:mainhand/chainmail_chestplate run scoreboard players set @s itm.main.dr 240
execute if predicate item_check:mainhand/golden_chestplate run scoreboard players set @s itm.main.dr 112
execute if predicate item_check:mainhand/leather_chestplate run scoreboard players set @s itm.main.dr 80
execute if predicate item_check:mainhand/elytra run scoreboard players set @s itm.main.dr 431
execute if predicate item_check:mainhand/diamond_boots run scoreboard players set @s itm.main.dr 429
execute if predicate item_check:mainhand/iron_boots run scoreboard players set @s itm.main.dr 195
execute if predicate item_check:mainhand/chainmail_boots run scoreboard players set @s itm.main.dr 195
execute if predicate item_check:mainhand/golden_boots run scoreboard players set @s itm.main.dr 91
execute if predicate item_check:mainhand/leather_boots run scoreboard players set @s itm.main.dr 65
execute if predicate item_check:mainhand/netherite_boots run scoreboard players set @s itm.main.dr 481
execute if predicate item_check:mainhand/diamond_leggings run scoreboard players set @s itm.main.dr 495
execute if predicate item_check:mainhand/iron_leggings run scoreboard players set @s itm.main.dr 225
execute if predicate item_check:mainhand/chainmail_leggings run scoreboard players set @s itm.main.dr 225
execute if predicate item_check:mainhand/golden_leggings run scoreboard players set @s itm.main.dr 105
execute if predicate item_check:mainhand/leather_leggings run scoreboard players set @s itm.main.dr 75
execute if predicate item_check:mainhand/netherite_leggings run scoreboard players set @s itm.main.dr 555
execute if predicate item_check:mainhand/diamond_helmet run scoreboard players set @s itm.main.dr 363
execute if predicate item_check:mainhand/iron_helmet run scoreboard players set @s itm.main.dr 165
execute if predicate item_check:mainhand/chainmail_helmet run scoreboard players set @s itm.main.dr 165
execute if predicate item_check:mainhand/golden_helmet run scoreboard players set @s itm.main.dr 77
execute if predicate item_check:mainhand/leather_helmet run scoreboard players set @s itm.main.dr 55
execute if predicate item_check:mainhand/turtle_helmet run scoreboard players set @s itm.main.dr 275
execute if predicate item_check:mainhand/netherite_helmet run scoreboard players set @s itm.main.dr 407
execute store result score @s itm.damage run data get entity @s SelectedItem.tag.Damage 1
scoreboard players operation @s itm.main.dr -= @s itm.damage
scoreboard players operation @s itm.main.dr -= @s itm.damage
execute if score @s itm.main.dr matches ..0 run scoreboard players reset @s itm.main.dr

0 comments on commit ad4751a

Please sign in to comment.