Compare commits

..

10 Commits

Author SHA1 Message Date
延皓 d93b266257 Update README.md 2021-07-04 00:19:22 +08:00
延皓 5b2b95fb99 2.1.0 2021-07-04 00:10:41 +08:00
延皓 66de9d3a8d 2.1.0 2021-07-04 00:02:56 +08:00
延皓 741f0c0622 2.1.0 2021-07-03 18:51:22 +08:00
延皓 e10cfac336 2.1.0 2021-07-03 18:11:55 +08:00
延皓 d5ac52d30c 2.1.0 2021-07-03 09:22:22 +08:00
延皓 17676af50f 2.1.0 2021-07-03 09:01:12 +08:00
延皓 f21d172ae9 datapack version 2021-07-03 09:00:39 +08:00
延皓 6b29d29367 fix tagplayer bugs 2021-07-03 08:02:29 +08:00
延皓 b2843145af 2.1.0 2021-07-03 06:21:34 +08:00
15 changed files with 150 additions and 761 deletions
-1
View File
@@ -11,7 +11,6 @@
"entity": "this", "entity": "this",
"scores": { "scores": {
"leaveGame": { "leaveGame": {
"min": -2147483648,
"max": 0 "max": 0
} }
} }
@@ -9,8 +9,7 @@
"entity": "this", "entity": "this",
"scores": { "scores": {
"fz.bbl": { "fz.bbl": {
"min": 1, "min": 1
"max": 2147483647
} }
} }
} }
@@ -9,8 +9,7 @@
"entity": "this", "entity": "this",
"scores": { "scores": {
"10xDamageTaken": { "10xDamageTaken": {
"min": 1, "min": 1
"max": 2147483647
} }
} }
} }
@@ -9,8 +9,7 @@
"entity": "this", "entity": "this",
"scores": { "scores": {
"deathTester": { "deathTester": {
"min": 1, "min": 1
"max": 2147483647
} }
} }
} }
@@ -11,8 +11,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedWooShovel": { "usedWooShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -21,8 +20,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedWooPickaxe": { "usedWooPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -31,8 +29,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedWooHoe": { "usedWooHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -41,8 +38,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedWooAxe": { "usedWooAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -51,8 +47,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedStoShovel": { "usedStoShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -61,8 +56,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedStoPickaxe": { "usedStoPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -71,8 +65,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedStoHoe": { "usedStoHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -81,8 +74,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedStoAxe": { "usedStoAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -91,8 +83,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedNetShovel": { "usedNetShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -101,8 +92,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedNetPickaxe": { "usedNetPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -111,8 +101,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedNetHoe": { "usedNetHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -121,8 +110,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedNetAxe": { "usedNetAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -131,8 +119,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedIroShovel": { "usedIroShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -141,8 +128,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedIroPickaxe": { "usedIroPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -151,8 +137,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedIroHoe": { "usedIroHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -161,8 +146,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedIroAxe": { "usedIroAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -171,8 +155,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedGolShovel": { "usedGolShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -181,8 +164,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedGolPickaxe": { "usedGolPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -191,8 +173,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedGolHoe": { "usedGolHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -201,8 +182,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedGolAxe": { "usedGolAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -211,8 +191,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedDiaShovel": { "usedDiaShovel": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -221,8 +200,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedDiaPickaxe": { "usedDiaPickaxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -231,8 +209,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedDiaHoe": { "usedDiaHoe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -241,8 +218,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedDiaAxe": { "usedDiaAxe": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -251,8 +227,7 @@
"condition": "minecraft:entity_scores", "condition": "minecraft:entity_scores",
"scores": { "scores": {
"usedShears": { "usedShears": {
"min": 1, "min": 1
"max": 2147483647
} }
}, },
"entity": "this" "entity": "this"
@@ -1,484 +1,57 @@
{ {
"criteria": { "criteria": {
"used_axe_on_block": { "right_click_tools": {
"trigger": "minecraft:item_used_on_block", "trigger": "minecraft:item_used_on_block",
"conditions": { "conditions": {
"player": [ "item": {
{ "items": [
"condition": "minecraft:alternative", "golden_axe",
"terms": [ "golden_hoe",
{ "golden_shovel",
"condition": "minecraft:entity_properties", "wooden_axe",
"entity": "this", "wooden_hoe",
"predicate": { "wooden_shovel",
"equipment": { "diamond_axe",
"mainhand": { "diamond_hoe",
"item": "minecraft:diamond_axe" "diamond_shovel",
} "iron_axe",
} "iron_hoe",
} "iron_shovel",
}, "stone_axe",
{ "stone_hoe",
"condition": "minecraft:entity_properties", "stone_shovel",
"entity": "this", "netherite_axe",
"predicate": { "netherite_hoe",
"equipment": { "netherite_shovel"
"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"
}
}
}
}
] ]
}
]
}
}, },
"attacked_with_axe": { "location": {
"trigger": "minecraft:player_hurt_entity", "block": {
"conditions": { "blocks": [
"player": [ "dirt_path",
{ "farmland",
"condition": "minecraft:alternative", "oak_log",
"terms": [ "stripped_birch_log",
{ "stripped_acacia_log",
"condition": "minecraft:entity_properties", "stripped_jungle_log",
"entity": "this", "stripped_spruce_log",
"predicate": { "stripped_dark_oak_log",
"equipment": { "stripped_warped_stem",
"mainhand": { "stripped_crimson_stem",
"item": "minecraft:diamond_axe" "stripped_oak_wood",
} "stripped_birch_wood",
} "stripped_acacia_wood",
} "stripped_jungle_wood",
}, "stripped_spruce_wood",
{ "stripped_dark_oak_wood",
"condition": "minecraft:entity_properties", "stripped_warped_hyphae",
"entity": "this", "stripped_crimson_hyphae"
"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": { "rewards": {
"function": "fz:scoreboards/digcounter/toolsfix" "function": "fz:scoreboards/digcounter/toolsfix"
} }
@@ -1,217 +1,48 @@
{ {
"criteria": { "criteria": {
"offhand_placed_fix": { "tools_hit_entities": {
"trigger": "minecraft:placed_block", "trigger": "minecraft:player_hurt_entity",
"conditions": { "conditions": {
"player": [ "player": [
{
"condition": "minecraft:alternative",
"terms": [
{ {
"condition": "minecraft:entity_properties", "condition": "minecraft:entity_properties",
"entity": "this", "entity": "this",
"predicate": { "predicate": {
"equipment": { "equipment": {
"mainhand": { "mainhand": {
"item": "minecraft:iron_shovel" "items": [
} "iron_axe",
} "stone_axe",
} "golden_axe",
}, "wooden_axe",
{ "diamond_axe",
"condition": "minecraft:entity_properties", "netherite_axe",
"entity": "this", "iron_shovel",
"predicate": { "stone_shovel",
"equipment": { "golden_shovel",
"mainhand": { "wooden_shovel",
"item": "minecraft:golden_shovel" "diamond_shovel",
} "netherite_shovel",
} "iron_hoe",
} "stone_hoe",
}, "golden_hoe",
{ "wooden_hoe",
"condition": "minecraft:entity_properties", "diamond_hoe",
"entity": "this", "netherite_hoe",
"predicate": { "iron_pickaxe",
"equipment": { "stone_pickaxe",
"mainhand": { "golden_pickaxe",
"item": "minecraft:wooden_shovel" "wooden_pickaxe",
} "diamond_pickaxe",
} "netherite_pickaxe"
} ]
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:stone_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:diamond_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_shovel"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_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:wooden_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:diamond_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_hoe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:iron_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:wooden_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:diamond_axe"
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"item": "minecraft:netherite_axe"
} }
} }
} }
} }
] ]
} }
]
}
} }
}, },
"rewards": { "rewards": {"function": "fz:scoreboards/digcounter/toolsfix2"}
"function": "fz:scoreboards/digcounter/toolsfix2"
}
} }
@@ -9,8 +9,7 @@
"entity": "this", "entity": "this",
"scores": { "scores": {
"fishingTester": { "fishingTester": {
"min": 1, "min": 1
"max": 2147483647
} }
} }
} }
+3 -3
View File
@@ -16,9 +16,9 @@ function fz:login/logintips/install
function fz:carpet/carpet function fz:carpet/carpet
#版本信息 #版本信息
data merge storage fz.installed {installed: 1b} data merge storage fz.installed {installed: 1b}
data merge storage fz {version: 2.0.3} data merge storage fz {version: 2.1.0}
data merge storage fz {date: 2020-1.17} data merge storage fz {date: 2020-7.1}
data merge storage fz {time: "18:21"} data merge storage fz {time: "02:43"}
##data merge storage fz {snapshot: -SNAPSHOT} ##data merge storage fz {snapshot: -SNAPSHOT}
data remove storage fz snapshot data remove storage fz snapshot
tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"} tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
+2 -2
View File
@@ -1,8 +1,8 @@
#如果未安装且未卸载则安装 #如果未安装且未卸载则安装
execute unless data storage fz.installed {installed: 1b} unless data storage fz.installed {installed: 0b} run function fz:install execute unless data storage fz.installed {installed: 1b} unless data storage fz.installed {installed: 0b} run function fz:install
#如果版本正确且已安装则开始运行 #如果版本正确且已安装则开始运行
execute if data storage fz {version: 2.0.3} if data storage fz.installed {installed: 1b} run function fz:start execute if data storage fz {version: 2.1.0} if data storage fz.installed {installed: 1b} run function fz:start
#如果版本不符则更新 #如果版本不符则更新
execute unless data storage fz {version: 2.0.3} run function fz:update execute unless data storage fz {version: 2.1.0} run function fz:update
#输出版本信息 #输出版本信息
tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}] tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
@@ -10,6 +10,7 @@ advancement revoke @s only fz:scoreboards/killcounter
advancement revoke @s only fz:scoreboards/tradingcounter advancement revoke @s only fz:scoreboards/tradingcounter
advancement revoke @s only fz:scoreboards/digcounter/digtrigger advancement revoke @s only fz:scoreboards/digcounter/digtrigger
advancement revoke @s only fz:scoreboards/digcounter/toolsfix advancement revoke @s only fz:scoreboards/digcounter/toolsfix
advancement revoke @s only fz:scoreboards/digcounter/toolsfix2
advancement revoke @s only fz:config/sneak advancement revoke @s only fz:config/sneak
advancement revoke @s only fz:config/unsneak advancement revoke @s only fz:config/unsneak
@@ -1,7 +1,7 @@
#为digtrigger函数修正非挖掘的使用带来的加分(使) #为digtrigger函数修正非挖掘的使用带来的加分(使)
#判断条件用于排除地毯小人 #判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1 execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove digCounter 1 execute unless score @s carpetBot matches 1 run scoreboard players remove digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove totalList 1 execute unless score @s carpetBot matches 1 run scoreboard players remove totalList 1
#重置探测右键使用工具的成就
advancement revoke @s only fz:scoreboards/digcounter/toolsfix advancement revoke @s only fz:scoreboards/digcounter/toolsfix
#铲子和锄头的方块判断居然只响应产物不响应原方块
@@ -1,7 +1,6 @@
#为digtrigger函数修正非挖掘的使用带来的加分() #为digtrigger函数修正非挖掘的使用带来的加分(使)
#判断条件用于排除地毯小人 #判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players add @s digCounter 1 execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players add digCounter 1 execute unless score @s carpetBot matches 1 run scoreboard players remove digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players add totalList 1 execute unless score @s carpetBot matches 1 run scoreboard players remove totalList 1
#重置探测右键副手放置时主手有工具的成就
advancement revoke @s only fz:scoreboards/digcounter/toolsfix2 advancement revoke @s only fz:scoreboards/digcounter/toolsfix2
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"pack": { "pack": {
"description": "FZ's Datapack - Code By Harvey_kang", "description": "FZ's Datapack - Code By Harvey_Husky",
"pack_format": 6 "pack_format": 7
} }
} }
+25 -10
View File
@@ -1,10 +1,10 @@
global_version = '1.1.1'; global_version = '1.2.0';
__config() -> { __config() -> {
'scope' -> 'global', 'scope' -> 'global',
'stay_loaded' -> false 'stay_loaded' -> false
}; };
__command() -> print('版本:' + global_version); __command() -> print('版本:' + global_version);
global_bl = l('stone', 'granite', 'polished_granite', 'diorite', 'polished_diorite', 'andesite', 'polished_andesite', 'grass_block', global_bl = ['stone', 'granite', 'polished_granite', 'diorite', 'polished_diorite', 'andesite', 'polished_andesite', 'grass_block',
'dirt', 'coarse_dirt', 'podzol', 'crimson_nylium', 'warped_nylium', 'cobblestone', 'oak_planks', 'spruce_planks', 'birch_planks', 'dirt', 'coarse_dirt', 'podzol', 'crimson_nylium', 'warped_nylium', 'cobblestone', 'oak_planks', 'spruce_planks', 'birch_planks',
'jungle_planks', 'acacia_planks', 'dark_oak_planks', 'crimson_planks', 'warped_planks', 'sand', 'red_sand', 'gravel', 'gold_ore', 'jungle_planks', 'acacia_planks', 'dark_oak_planks', 'crimson_planks', 'warped_planks', 'sand', 'red_sand', 'gravel', 'gold_ore',
'iron_ore', 'coal_ore', 'nether_gold_ore', 'oak_log', 'spruce_log', 'birch_log', 'jungle_log', 'acacia_log', 'dark_oak_log', 'iron_ore', 'coal_ore', 'nether_gold_ore', 'oak_log', 'spruce_log', 'birch_log', 'jungle_log', 'acacia_log', 'dark_oak_log',
@@ -101,8 +101,28 @@ global_bl = l('stone', 'granite', 'polished_granite', 'diorite', 'polished_diori
'light_weighted_pressure_plate', 'heavy_weighted_pressure_plate', 'daylight_detector', 'redstone_block', 'hopper', 'dropper', 'light_weighted_pressure_plate', 'heavy_weighted_pressure_plate', 'daylight_detector', 'redstone_block', 'hopper', 'dropper',
'iron_trapdoor', 'observer', 'iron_door', 'oak_door', 'spruce_door', 'birch_door', 'jungle_door', 'acacia_door', 'dark_oak_door', 'iron_trapdoor', 'observer', 'iron_door', 'oak_door', 'spruce_door', 'birch_door', 'jungle_door', 'acacia_door', 'dark_oak_door',
'crimson_door', 'warped_door', 'repeater', 'comparator', 'redstone', 'lectern', 'target', 'powered_rail', 'detector_rail', 'crimson_door', 'warped_door', 'repeater', 'comparator', 'redstone', 'lectern', 'target', 'powered_rail', 'detector_rail',
'rail', 'activator_rail', 'beacon', 'turtle_egg', 'conduit', 'brewing_stand', 'cauldron' 'rail', 'activator_rail', 'beacon', 'turtle_egg', 'conduit', 'brewing_stand', 'cauldron', 'sculk_sensor', 'raw_iron_block',
); 'raw_copper_block', 'raw_gold_block', 'powder_snow', 'candle', 'deepslate_coal_ore', 'deepslate_iron_ore', 'deepslate_copper_ore',
'deepslate_lapis_ore', 'deepslate_gold_ore', 'deepslate_redstone_ore', 'deepslate_diamond_ore', 'deepslate_emerald_ore',
'cobbled_deepslate', 'infested_stone', 'infested_cobblestone', 'infested_stone_bricks', 'infested_cracked_stone_bricks',
'infested_mossy_stone_bricks', 'infested_chiseled_stone_bricks', 'infested_deepslate', 'deepslate', 'chiseled_deepslate',
'polished_deepslate', 'spore_blossom', 'hanging_roots', 'rooted_dirt', 'dirt_path', 'farmland', 'wall_torch', 'tall_grass',
'tall_seagrass', 'big_dripleaf', 'small_dripleaf', 'glow_berries', 'cave_vines', 'cave_vines_plant', 'moss_carpet', 'moss_block',
'flowering_azalea_leaves', 'azalea_leaves', 'azalea', 'flowering_azalea', 'glow_lichen', 'dripstone_block', 'pointed_dripstone',
'lightning_rod', 'cobbled_deepslate_stairs', 'polished_deepslate_stairs', 'deepslate_brick_stairs', 'deepslate_tile_stairs',
'cut_copper_stairs', 'exposed_cut_copper_stairs', 'weathered_cut_copper_stairs', 'oxidized_cut_copper_stairs',
'waxed_cut_copper_stairs', 'waxed_exposed_cut_copper_stairs', 'waxed_weathered_cut_copper_stairs',
'waxed_oxidized_cut_copper_stairs', 'cobbled_deepslate_slab', 'polished_deepslate_slab', 'deepslate_brick_slab',
'deepslate_tile_slab', 'cut_copper_slab', 'exposed_cut_copper_slab', 'weathered_cut_copper_slab', 'oxidized_cut_copper_slab',
'waxed_cut_copper_slab', 'waxed_exposed_cut_copper_slab', 'waxed_weathered_cut_copper_slab', 'waxed_oxidized_cut_copper_slab',
'copper_block', 'exposed_copper', 'weathered_copper', 'oxidized_copper', 'cut_copper', 'exposed_cut_copper',
'weathered_cut_copper', 'oxidized_cut_copper', 'waxed_copper_block', 'waxed_exposed_copper', 'waxed_weathered_copper',
'waxed_oxidized_copper', 'waxed_cut_copper', 'waxed_exposed_cut_copper', 'waxed_weathered_cut_copper', 'waxed_oxidized_cut_copper',
'copper_ore', 'tinted_glass', 'smooth_basalt', 'calcite', 'amethyst_block', 'budding_amethyst', 'amethyst_cluster',
'small_amethyst_bud', 'medium_amethyst_bud', 'large_amethyst_bud', 'amethyst_cluster', 'tuff', 'white_candle', 'orange_candle',
'magenta_candle', 'light_blue_candle', 'yellow_candle', 'lime_candle', 'pink_candle', 'gray_candle', 'light_gray_candle',
'cyan_candle', 'purple_candle', 'blue_candle', 'brown_candle', 'green_candle', 'red_candle', 'black_candle'
];
__restore(pl, s_player) ->( __restore(pl, s_player) ->(
scoreboard_remove('killCounter'); scoreboard_remove('killCounter');
scoreboard_remove('digCounter'); scoreboard_remove('digCounter');
@@ -186,18 +206,13 @@ __restore(pl, s_player) ->(
scoreboard('damageTaken', '群p抖M', total_hurt); scoreboard('damageTaken', '群p抖M', total_hurt);
scoreboard('totalList', '群p抖M', total_hurt); scoreboard('totalList', '群p抖M', total_hurt);
game_tick(50); game_tick(50);
print('完成!');
run('function fz:scoreboards/install') run('function fz:scoreboards/install')
); );
by_whitelist() ->( by_whitelist() ->(
pl = keys(system_info('server_whitelist')); pl = keys(system_info('server_whitelist'));
s_player = player(); s_player = player();
//c_for(i = 0, i < length(pl), i += 1,
// run('player ' + pl:i + ' spawn at ' + (s_player~'x'+0.1)+ ' ' +s_player~'y'+ ' ' +(s_player~'z'+0.1));
//);
game_tick(50); game_tick(50);
__restore(pl, s_player); __restore(pl, s_player);
//c_for(i = 0, i < length(pl), i += 1,
// run('player ' + pl:i + ' kill');
//);
return() return()
) )