This commit is contained in:
延皓
2021-07-03 06:21:34 +08:00
parent 5e41b7d950
commit b2843145af
52 changed files with 1523 additions and 1844 deletions
@@ -11,8 +11,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedWooShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -21,8 +20,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedWooPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -31,8 +29,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedWooHoe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -41,8 +38,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedWooAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -51,8 +47,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedStoShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -61,8 +56,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedStoPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -71,8 +65,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedStoHoe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -81,8 +74,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedStoAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -91,8 +83,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedNetShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -101,8 +92,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedNetPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -111,8 +101,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedNetHoe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -121,8 +110,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedNetAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -131,8 +119,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedIroShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -141,8 +128,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedIroPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -151,8 +137,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedIroHoe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -161,8 +146,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedIroAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -171,8 +155,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedGolShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -181,8 +164,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedGolPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -190,9 +172,8 @@
{
"condition": "minecraft:entity_scores",
"scores": {
"usedDiaHoe": {
"min": 1,
"max": 2147483647
"usedGolHoe": {
"min": 1
}
},
"entity": "this"
@@ -201,8 +182,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedGolAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -211,8 +191,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedDiaShovel": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -221,8 +200,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedDiaPickaxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -231,8 +209,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedDiaHoe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -241,8 +218,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedDiaAxe": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -251,8 +227,7 @@
"condition": "minecraft:entity_scores",
"scores": {
"usedShears": {
"min": 1,
"max": 2147483647
"min": 1
}
},
"entity": "this"
@@ -1,484 +1,57 @@
{
"criteria": {
"used_axe_on_block": {
"right_click_tools": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_axe"
}
}
}
}
"item": {
"items": [
"golden_axe",
"golden_hoe",
"golden_shovel",
"wooden_axe",
"wooden_hoe",
"wooden_shovel",
"diamond_axe",
"diamond_hoe",
"diamond_shovel",
"iron_axe",
"iron_hoe",
"iron_shovel",
"stone_axe",
"stone_hoe",
"stone_shovel",
"netherite_axe",
"netherite_hoe",
"netherite_shovel"
]
},
"location": {
"block": {
"blocks": [
"dirt_path",
"farmland",
"oak_log",
"stripped_birch_log",
"stripped_acacia_log",
"stripped_jungle_log",
"stripped_spruce_log",
"stripped_dark_oak_log",
"stripped_warped_stem",
"stripped_crimson_stem",
"stripped_oak_wood",
"stripped_birch_wood",
"stripped_acacia_wood",
"stripped_jungle_wood",
"stripped_spruce_wood",
"stripped_dark_oak_wood",
"stripped_warped_hyphae",
"stripped_crimson_hyphae"
]
}
]
}
},
"attacked_with_axe": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_axe"
}
}
}
}
]
}
]
}
},
"used_shovel_on_block": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_shovel"
}
}
}
}
]
}
]
}
},
"attacked_with_shovel": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_shovel"
}
}
}
}
]
}
]
}
},
"used_hoe_on_block": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_hoe"
}
}
}
}
]
}
]
}
},
"attacked_with_hoe": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"player": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:wooden_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:golden_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_hoe"
}
}
}
}
]
}
]
}
}
}
},
"requirements": [
[
"used_axe_on_block",
"attacked_with_axe",
"used_shovel_on_block",
"attacked_with_shovel",
"used_hoe_on_block",
"attacked_with_hoe"
]
],
"rewards": {
"function": "fz:scoreboards/digcounter/toolsfix"
}