diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..37d8e2e --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +data/minecraft/advancements +data/minecraft/loot_tables +data/minecraft/recipes +data/minecraft/tags/blocks +data/minecraft/tags/entity_types +data/minecraft/tags/fluids +data/minecraft/tags/game_events +data/minecraft/tags/items +data/minecraft/tags/worldgen diff --git a/.vscode/settings.json b/.vscode/settings.json index 4b9c9e4..cad41ce 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "executeIfScoreSet": "execute if score ${1:score_holder} ${2:objective} = ${1:score_holder} ${2:objective} $0", "scoreboardPlayersOperation": "scoreboard players operation ${1:target_score_holder} ${2:target_objective} ${3|+=,-=,*=,/=,%=,=,>,<,<>|} ${4:source_score_holder} ${5:source_objective}", "scoreboardPlayersSet": "scoreboard players set ${1:score_holder} ${2:objective} ${3:0}", + "scoreboardAddObjective": "scoreboard objectives add ${1:objective} ${2:dummy}", "tagAdd": "tag ${1:target} add ${2:tag}", "tagRemove": "tag ${1:target} remove ${2:tag}", "dataModifyStorageFromSelf": "data modify storage ${1:id} ${2:path} set from entity @s ${3:path}", @@ -12,5 +13,7 @@ "logInfo": "execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{\"nbt\": \"fz.level.info\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_info}\"}]", "logAlert": "execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @a [{\"nbt\": \"fz.level.alert\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_alert}\"}]", "logError": "execute if score fz.logger.level fz.variable.integer matches ..800 run tellraw @a [{\"nbt\": \"fz.level.error\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_error}\"}]", + "TEXT": "{\"text\": \"${1:TEXT}\", \"color\": \"${2:COLOR}\"}", + "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}" } } \ No newline at end of file diff --git a/DEVDOC.md b/DEVDOC.md index cf701bd..c372a56 100644 --- a/DEVDOC.md +++ b/DEVDOC.md @@ -8,18 +8,14 @@ ``` { "replace": true, - "values": [ - ... - ] + "values": ... } ``` - `向标签中注册函数`时，`replace`为`false` ``` { "replace": false, - "values": [ - ... - ] + "values": ... } ``` diff --git a/data/fz.settings/functions/autocarpet.mcfunction b/data/fz.admin.implement/functions/autocarpet.mcfunction similarity index 97% rename from data/fz.settings/functions/autocarpet.mcfunction rename to data/fz.admin.implement/functions/autocarpet.mcfunction index 333a213..193fb6c 100644 --- a/data/fz.settings/functions/autocarpet.mcfunction +++ b/data/fz.admin.implement/functions/autocarpet.mcfunction @@ -1,17 +1,17 @@ -carpet setDefault language zh_cn -carpet setDefault stackableShulkerBoxes 16 -carpet setDefault leadFix true -carpet setDefault ctrlQCraftingFix true -carpet setDefault smoothClientAnimations true -carpet setDefault fastRedstoneDust true -carpet setDefault reloadSuffocationFix true -carpet setDefault persistentParrots true -carpet setDefault missingTools true -carpet setDefault optimizedTNT true -carpet setDefault placementRotationFix true -carpet setDefault cleanLogs true -carpet setDefault lightningKillsDropsFix true -carpet setDefault lagFreeSpawning true -carpet setDefault accurateBlockPlacement true -carpet setDefault flippinCactus true -carpet setDefault defaultLoggers mobcaps,tps +carpet setDefault language zh_cn +carpet setDefault stackableShulkerBoxes 16 +carpet setDefault leadFix true +carpet setDefault ctrlQCraftingFix true +carpet setDefault smoothClientAnimations true +carpet setDefault fastRedstoneDust true +carpet setDefault reloadSuffocationFix true +carpet setDefault persistentParrots true +carpet setDefault missingTools true +carpet setDefault optimizedTNT true +carpet setDefault placementRotationFix true +carpet setDefault cleanLogs true +carpet setDefault lightningKillsDropsFix true +carpet setDefault lagFreeSpawning true +carpet setDefault accurateBlockPlacement true +carpet setDefault flippinCactus true +carpet setDefault defaultLoggers mobcaps,tps diff --git a/data/fz.admin/tags/functions/autocarpet.json b/data/fz.admin/tags/functions/autocarpet.json new file mode 100644 index 0000000..df1bea6 --- /dev/null +++ b/data/fz.admin/tags/functions/autocarpet.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "fz.admin.implement:autocarpet", + "required": true + } + ] +} \ No newline at end of file diff --git a/data/fz/functions/boot_manager/if_install.mcfunction b/data/fz.admin/tags/functions/install.json similarity index 100% rename from data/fz/functions/boot_manager/if_install.mcfunction rename to data/fz.admin/tags/functions/install.json diff --git a/data/fz/functions/boot_manager/if_load.mcfunction b/data/fz.admin/tags/functions/install/config.json similarity index 100% rename from data/fz/functions/boot_manager/if_load.mcfunction rename to data/fz.admin/tags/functions/install/config.json diff --git a/data/fz/functions/boot_manager/if_update.mcfunction b/data/fz.admin/tags/functions/install/scoreboard.json similarity index 100% rename from data/fz/functions/boot_manager/if_update.mcfunction rename to data/fz.admin/tags/functions/install/scoreboard.json diff --git a/data/fz/functions/boot_manager/install_or_else.mcfunction b/data/fz.admin/tags/functions/install/sweeper.json similarity index 100% rename from data/fz/functions/boot_manager/install_or_else.mcfunction rename to data/fz.admin/tags/functions/install/sweeper.json diff --git a/data/fz.admin/tags/functions/log_level/debug.json b/data/fz.admin/tags/functions/log_level/debug.json new file mode 100644 index 0000000..93f432e --- /dev/null +++ b/data/fz.admin/tags/functions/log_level/debug.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:logger/level/debug" + ] +} \ No newline at end of file diff --git a/data/fz.admin/tags/functions/log_level/fine.json b/data/fz.admin/tags/functions/log_level/fine.json new file mode 100644 index 0000000..f5aea0e --- /dev/null +++ b/data/fz.admin/tags/functions/log_level/fine.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:logger/level/fine" + ] +} \ No newline at end of file diff --git a/data/fz.admin/tags/functions/log_level/info.json b/data/fz.admin/tags/functions/log_level/info.json new file mode 100644 index 0000000..b7f5112 --- /dev/null +++ b/data/fz.admin/tags/functions/log_level/info.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:logger/level/info" + ] +} \ No newline at end of file diff --git a/data/fz/functions/boot_manager/load_or_else.mcfunction b/data/fz.admin/tags/functions/uninstall.json similarity index 100% rename from data/fz/functions/boot_manager/load_or_else.mcfunction rename to data/fz.admin/tags/functions/uninstall.json diff --git a/data/fz/functions/boot_manager/update_or_else.mcfunction b/data/fz.admin/tags/functions/uninstall/config.json similarity index 100% rename from data/fz/functions/boot_manager/update_or_else.mcfunction rename to data/fz.admin/tags/functions/uninstall/config.json diff --git a/data/fz.admin/tags/functions/uninstall/scoreboard.json b/data/fz.admin/tags/functions/uninstall/scoreboard.json new file mode 100644 index 0000000..e69de29 diff --git a/data/fz.admin/tags/functions/uninstall/sweeper.json b/data/fz.admin/tags/functions/uninstall/sweeper.json new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/advancements/event/on_aviate_one_meter.json b/data/fz/advancements/event/on_aviate_one_meter.json index f4ce9fb..400c3b1 100644 --- a/data/fz/advancements/event/on_aviate_one_meter.json +++ b/data/fz/advancements/event/on_aviate_one_meter.json @@ -18,6 +18,6 @@ } }, "rewards": { - "function": "fz:event/on_aviate_one_meter" + "function": "fz:event/player/on_aviate_one_meter" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_dead.json b/data/fz/advancements/event/on_dead.json new file mode 100644 index 0000000..4f9028d --- /dev/null +++ b/data/fz/advancements/event/on_dead.json @@ -0,0 +1,23 @@ +{ + "criteria": { + "on_dead": { + "trigger": "minecraft:tick", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.death_count": { + "min": 1 + } + } + } + ] + } + } + }, + "rewards": { + "function": "fz:event/player/on_dead" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_fished.json b/data/fz/advancements/event/on_fished.json new file mode 100644 index 0000000..c93509d --- /dev/null +++ b/data/fz/advancements/event/on_fished.json @@ -0,0 +1,15 @@ +{ + "criteria": { + "on_fished": { + "trigger": "minecraft:fishing_rod_hooked", + "conditions": { + "item": { + "tag": "fz:raw_fishes" + } + } + } + }, + "rewards": { + "function": "fz:event/player/on_fished" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_hurt_entity_with_tools.json b/data/fz/advancements/event/on_hurt_entity_with_tools.json new file mode 100644 index 0000000..8ce20f4 --- /dev/null +++ b/data/fz/advancements/event/on_hurt_entity_with_tools.json @@ -0,0 +1,19 @@ +{ + "criteria": { + "on_hurt_entity_with_tools": { + "trigger": "minecraft:player_hurt_entity", + "conditions": { + "player": { + "equipment": { + "mainhand": { + "tag": "fz:tools" + } + } + } + } + } + }, + "rewards": { + "function": "fz:event/player/on_hurt_entity_with_tools" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_killed_mob_or_player.json b/data/fz/advancements/event/on_killed_mob_or_player.json new file mode 100644 index 0000000..d9850be --- /dev/null +++ b/data/fz/advancements/event/on_killed_mob_or_player.json @@ -0,0 +1,27 @@ +{ + "criteria": { + "on_killed_mob_or_player": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "entity": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "#fz:ignore_on_player_killed_entity" + } + } + } + ], + "killing_blow": { + "bypasses_invulnerability": false + } + } + } + }, + "rewards": { + "function": "fz:event/player/on_killed_mob_or_player" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_login.json b/data/fz/advancements/event/on_login.json index 8feae53..2a03f45 100644 --- a/data/fz/advancements/event/on_login.json +++ b/data/fz/advancements/event/on_login.json @@ -21,6 +21,6 @@ } }, "rewards": { - "function": "fz:event/on_login" + "function": "fz:event/player/on_login" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_piglin_trade.json b/data/fz/advancements/event/on_piglin_trade.json index d295d37..282aa11 100644 --- a/data/fz/advancements/event/on_piglin_trade.json +++ b/data/fz/advancements/event/on_piglin_trade.json @@ -4,12 +4,15 @@ "trigger": "minecraft:thrown_item_picked_up_by_entity", "conditions": { "entity": { - "type": "minecraft:piglin" + "type": "minecraft:piglin", + "flags": { + "is_baby": false + } } } } }, "rewards": { - "function": "fz:event/on_piglin_trade" + "function": "fz:event/player/on_piglin_trade" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_placed_block.json b/data/fz/advancements/event/on_placed_block.json new file mode 100644 index 0000000..9f14160 --- /dev/null +++ b/data/fz/advancements/event/on_placed_block.json @@ -0,0 +1,10 @@ +{ + "criteria": { + "on_placed_block": { + "trigger": "minecraft:placed_block" + } + }, + "rewards": { + "function": "fz:event/player/on_placed_block" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_play_one_hour.json b/data/fz/advancements/event/on_play_one_hour.json index 4216652..e9b4a2c 100644 --- a/data/fz/advancements/event/on_play_one_hour.json +++ b/data/fz/advancements/event/on_play_one_hour.json @@ -18,6 +18,6 @@ } }, "rewards": { - "function": "fz:event/on_play_one_hour" + "function": "fz:event/player/on_play_one_hour" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_shears_used_on_entity.json b/data/fz/advancements/event/on_shears_used_on_entity.json new file mode 100644 index 0000000..1bd0b91 --- /dev/null +++ b/data/fz/advancements/event/on_shears_used_on_entity.json @@ -0,0 +1,18 @@ +{ + "criteria": { + "on_shears_used_on_entity": { + "trigger": "minecraft:player_interacted_with_entity", + "conditions": { + "entity": { + "type": "#fz:shearable" + }, + "item": { + "tag": "fz:tool/shears" + } + } + } + }, + "rewards": { + "function": "fz:event/player/on_shears_used_on_entity" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_sneak.json b/data/fz/advancements/event/on_sneak.json index 2863d37..484f422 100644 --- a/data/fz/advancements/event/on_sneak.json +++ b/data/fz/advancements/event/on_sneak.json @@ -10,5 +10,8 @@ } } } + }, + "rewards": { + "function": "fz:event/player/on_sneak" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_damage_taken.json b/data/fz/advancements/event/on_took_damage.json similarity index 86% rename from data/fz/advancements/event/on_damage_taken.json rename to data/fz/advancements/event/on_took_damage.json index efaa391..ee65e60 100644 --- a/data/fz/advancements/event/on_damage_taken.json +++ b/data/fz/advancements/event/on_took_damage.json @@ -1,6 +1,6 @@ { "criteria": { - "on_damage_taken": { + "on_took_damage": { "trigger": "minecraft:tick", "conditions": { "player": [ @@ -18,6 +18,6 @@ } }, "rewards": { - "function": "fz:event/on_damage_taken" + "function": "fz:event/player/on_took_damage" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_tools_used_on_block.json b/data/fz/advancements/event/on_tools_used_on_block.json new file mode 100644 index 0000000..df3a799 --- /dev/null +++ b/data/fz/advancements/event/on_tools_used_on_block.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "on_tools_used_on_block": { + "__comment": "斧子剥树皮会触发两次！", + "trigger": "minecraft:item_used_on_block", + "conditions": { + "item": { + "tag": "fz:tools" + } + } + } + }, + "rewards": { + "function": "fz:event/player/on_tools_used_on_block" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_unsneak.json b/data/fz/advancements/event/on_unsneak.json index a380109..3842c18 100644 --- a/data/fz/advancements/event/on_unsneak.json +++ b/data/fz/advancements/event/on_unsneak.json @@ -1,5 +1,5 @@ { - "parent": "fz:sneak", + "parent": "fz:event/on_sneak", "criteria": { "on_unsneak": { "trigger": "minecraft:tick", @@ -11,7 +11,7 @@ "type_specific": { "type": "player", "advancements": { - "fz:sneak": true + "fz:event/on_sneak": true } } } @@ -19,6 +19,6 @@ } }, "rewards": { - "function": "fz:event/on_unsneak" + "function": "fz:event/player/on_unsneak" } } \ No newline at end of file diff --git a/data/fz/advancements/event/on_used_tool.json b/data/fz/advancements/event/on_used_tool.json new file mode 100644 index 0000000..34aba3a --- /dev/null +++ b/data/fz/advancements/event/on_used_tool.json @@ -0,0 +1,19 @@ +{ + "criteria": { + "on_used_tool": { + "trigger": "minecraft:tick", + "conditions": { + "player": [ + { + "condition": "minecraft:reference", + "entity": "this", + "name": "fz:used_tool" + } + ] + } + } + }, + "rewards": { + "function": "fz:event/player/on_used_tool" + } +} \ No newline at end of file diff --git a/data/fz/advancements/event/on_villager_trade.json b/data/fz/advancements/event/on_villager_trade.json index cf23c64..620888a 100644 --- a/data/fz/advancements/event/on_villager_trade.json +++ b/data/fz/advancements/event/on_villager_trade.json @@ -5,6 +5,6 @@ } }, "rewards": { - "function": "fz:event/on_villager_trade" + "function": "fz:event/player/on_villager_trade" } } \ No newline at end of file diff --git a/data/fz/functions/boot_manager/0.mcfunction b/data/fz/functions/boot_manager/0.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/1.mcfunction b/data/fz/functions/boot_manager/1.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/10.mcfunction b/data/fz/functions/boot_manager/10.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/2.mcfunction b/data/fz/functions/boot_manager/2.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/3.mcfunction b/data/fz/functions/boot_manager/3.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/4.mcfunction b/data/fz/functions/boot_manager/4.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/5.mcfunction b/data/fz/functions/boot_manager/5.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/6.mcfunction b/data/fz/functions/boot_manager/6.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/7.mcfunction b/data/fz/functions/boot_manager/7.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/8.mcfunction b/data/fz/functions/boot_manager/8.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/boot_manager/9.mcfunction b/data/fz/functions/boot_manager/9.mcfunction new file mode 100644 index 0000000..e69de29 diff --git a/data/fz/functions/entry.mcfunction b/data/fz/functions/entry.mcfunction index acc98da..7d560cc 100644 --- a/data/fz/functions/entry.mcfunction +++ b/data/fz/functions/entry.mcfunction @@ -1,3 +1,7 @@ -function #fz:system_load +## 整数类型 +scoreboard objectives add fz.variable.integer dummy +function fz:logger/install +function fz:logger/load +function fz:event/install function #fz:install function #fz:load \ No newline at end of file diff --git a/data/fz/functions/event/init.mcfunction b/data/fz/functions/event/init.mcfunction deleted file mode 100644 index 040f505..0000000 --- a/data/fz/functions/event/init.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -scoreboard objectives add fz.event.aviating_distance minecraft.custom:aviate_one_cm - -scoreboard objectives add fz.event.damage_taken minecraft.custom:damage_taken - -scoreboard objectives add fz.event.fishing_count minecraft.custom:fish_caught - -scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game - -scoreboard objectives add fz.event.play_seconds minecraft.custom:play_time - -scoreboard objectives add fz.event.villager_trade minecraft.custom:traded_with_villager - -## 调试 -execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已初始化系统组件：事件"}] \ No newline at end of file diff --git a/data/fz/functions/event/install.mcfunction b/data/fz/functions/event/install.mcfunction new file mode 100644 index 0000000..699545d --- /dev/null +++ b/data/fz/functions/event/install.mcfunction @@ -0,0 +1,47 @@ +## 事件触发 +scoreboard objectives add fz.event.aviating_distance minecraft.custom:aviate_one_cm +scoreboard objectives add fz.event.damage_taken minecraft.custom:damage_taken +scoreboard objectives add fz.event.death_count deathCount +scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game +scoreboard objectives add fz.event.play_seconds minecraft.custom:play_time +scoreboard objectives add fz.event.villager_trade minecraft.custom:traded_with_villager + +## 使用工具 +scoreboard objectives add fz.event.used_tool.dig_offset dummy +scoreboard objectives add fz.event.used_tool.iron_axe minecraft.used:iron_axe +scoreboard objectives add fz.event.used_tool.stone_axe minecraft.used:stone_axe +scoreboard objectives add fz.event.used_tool.golden_axe minecraft.used:golden_axe +scoreboard objectives add fz.event.used_tool.wooden_axe minecraft.used:wooden_axe +scoreboard objectives add fz.event.used_tool.diamond_axe minecraft.used:diamond_axe +scoreboard objectives add fz.event.used_tool.netherite_axe minecraft.used:netherite_axe +scoreboard objectives add fz.event.used_tool.iron_hoe minecraft.used:iron_hoe +scoreboard objectives add fz.event.used_tool.stone_hoe minecraft.used:stone_hoe +scoreboard objectives add fz.event.used_tool.golden_hoe minecraft.used:golden_hoe +scoreboard objectives add fz.event.used_tool.wooden_hoe minecraft.used:wooden_hoe +scoreboard objectives add fz.event.used_tool.diamond_hoe minecraft.used:diamond_hoe +scoreboard objectives add fz.event.used_tool.netherite_hoe minecraft.used:netherite_hoe +scoreboard objectives add fz.event.used_tool.iron_pickaxe minecraft.used:iron_pickaxe +scoreboard objectives add fz.event.used_tool.stone_pickaxe minecraft.used:stone_pickaxe +scoreboard objectives add fz.event.used_tool.golden_pickaxe minecraft.used:golden_pickaxe +scoreboard objectives add fz.event.used_tool.wooden_pickaxe minecraft.used:wooden_pickaxe +scoreboard objectives add fz.event.used_tool.diamond_pickaxe minecraft.used:diamond_pickaxe +scoreboard objectives add fz.event.used_tool.netherite_pickaxe minecraft.used:netherite_pickaxe +scoreboard objectives add fz.event.used_tool.shears minecraft.used:shears +scoreboard objectives add fz.event.used_tool.iron_shovel minecraft.used:iron_shovel +scoreboard objectives add fz.event.used_tool.stone_shovel minecraft.used:stone_shovel +scoreboard objectives add fz.event.used_tool.golden_shovel minecraft.used:golden_shovel +scoreboard objectives add fz.event.used_tool.wooden_shovel minecraft.used:wooden_shovel +scoreboard objectives add fz.event.used_tool.diamond_shovel minecraft.used:diamond_shovel +scoreboard objectives add fz.event.used_tool.netherite_shovel minecraft.used:netherite_shovel +scoreboard objectives add fz.event.used_tool.iron_sword minecraft.used:iron_sword +scoreboard objectives add fz.event.used_tool.stone_sword minecraft.used:stone_sword +scoreboard objectives add fz.event.used_tool.golden_sword minecraft.used:golden_sword +scoreboard objectives add fz.event.used_tool.wooden_sword minecraft.used:wooden_sword +scoreboard objectives add fz.event.used_tool.diamond_sword minecraft.used:diamond_sword +scoreboard objectives add fz.event.used_tool.netherite_sword minecraft.used:netherite_sword + +## 标记为已安装 +data modify storage fz:install_manager fz.event set value 1b + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装系统组件：事件"}] \ No newline at end of file diff --git a/data/fz/functions/event/on_aviate_one_meter.mcfunction b/data/fz/functions/event/on_aviate_one_meter.mcfunction deleted file mode 100644 index 7d28827..0000000 --- a/data/fz/functions/event/on_aviate_one_meter.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.aviating_distance -scoreboard players operation fz.var.score fz.variable.integer /= 200 fz.variable.integer - -function #fz:event/on_aviate_one_meter - -scoreboard players operation @s fz.event.aviating_distance %= 200 fz.variable.integer -advancement revoke @s only fz:event/on_aviate_one_meter \ No newline at end of file diff --git a/data/fz/functions/event/on_damage_taken.mcfunction b/data/fz/functions/event/on_damage_taken.mcfunction deleted file mode 100644 index eaad76e..0000000 --- a/data/fz/functions/event/on_damage_taken.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.damage_taken - -function #fz:event/on_damage_taken - -scoreboard players set @s fz.event.damage_taken 0 -advancement revoke @s only fz:event/on_damage_taken \ No newline at end of file diff --git a/data/fz/functions/event/on_login.mcfunction b/data/fz/functions/event/on_login.mcfunction deleted file mode 100644 index 7c36d51..0000000 --- a/data/fz/functions/event/on_login.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -## 调试 -execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "登录游戏"}] - -function #fz:event/on_login - -## 复位其他触发器 -advancement revoke @s until fz:event/on_damage_taken -advancement revoke @s until fz:event/on_piglin_trade -advancement revoke @s until fz:event/on_play_one_hour -advancement revoke @s until fz:event/on_sneak -advancement revoke @s until fz:event/on_unsneak -advancement revoke @s until fz:event/on_villager_trade - -## 复位进度触发器 -scoreboard players set @s fz.event.leave_game 0 -advancement revoke @s only fz:event/on_login \ No newline at end of file diff --git a/data/fz/functions/event/on_piglin_trade.mcfunction b/data/fz/functions/event/on_piglin_trade.mcfunction deleted file mode 100644 index 6360530..0000000 --- a/data/fz/functions/event/on_piglin_trade.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -function #fz:event/on_piglin_trade -advancement revoke @s only fz:event/on_piglin_trade \ No newline at end of file diff --git a/data/fz/functions/event/on_play_one_hour.mcfunction b/data/fz/functions/event/on_play_one_hour.mcfunction deleted file mode 100644 index cb7f81f..0000000 --- a/data/fz/functions/event/on_play_one_hour.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.play_seconds -scoreboard players operation fz.var.score fz.variable.integer /= 3600 fz.variable.integer - -function #fz:event/on_play_one_hour - -scoreboard players operation @s fz.event.play_seconds %= 3600 fz.variable.integer -advancement revoke @s only fz:event/on_play_one_hour \ No newline at end of file diff --git a/data/fz/functions/event/on_villager_trade.mcfunction b/data/fz/functions/event/on_villager_trade.mcfunction deleted file mode 100644 index 1fe8571..0000000 --- a/data/fz/functions/event/on_villager_trade.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -function #fz:event/on_villager_trade -advancement revoke @s only fz:event/on_villager_trade \ No newline at end of file diff --git a/data/fz/functions/event/player/on_aviate_one_meter.mcfunction b/data/fz/functions/event/player/on_aviate_one_meter.mcfunction new file mode 100644 index 0000000..aed054c --- /dev/null +++ b/data/fz/functions/event/player/on_aviate_one_meter.mcfunction @@ -0,0 +1,15 @@ +# 调用者：advancements/fz:~ + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "飞行了1m"}] + +## 将事件数据缓存，并重置事件计分板 +scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.aviating_distance +scoreboard players operation fz.var.score fz.variable.integer /= 200 fz.variable.integer +scoreboard players operation @s fz.event.aviating_distance %= 200 fz.variable.integer + +## 运行事件 +function #fz:event/player/on_aviate_one_meter + +## 重置事件进度 +advancement revoke @s only fz:event/on_aviate_one_meter \ No newline at end of file diff --git a/data/fz/functions/event/player/on_broke_block.mcfunction b/data/fz/functions/event/player/on_broke_block.mcfunction new file mode 100644 index 0000000..3b87a4f --- /dev/null +++ b/data/fz/functions/event/player/on_broke_block.mcfunction @@ -0,0 +1,40 @@ +# 调用者：fz:event/player/on_used_tool + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "挖掘了方块"}] + +## 收集挖掘数据 +scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.used_tool.diamond_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_sword +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_sword +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_sword +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_sword +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.shears +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_sword +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_axe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_hoe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_pickaxe +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_shovel +scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_sword + +## 运行事件 +function #fz:event/player/on_broke_block \ No newline at end of file diff --git a/data/fz/functions/event/player/on_dead.mcfunction b/data/fz/functions/event/player/on_dead.mcfunction new file mode 100644 index 0000000..a0e1f32 --- /dev/null +++ b/data/fz/functions/event/player/on_dead.mcfunction @@ -0,0 +1,14 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "死亡"}] + +## 将事件数据缓存，并重置事件计分板 +# scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.death_count +scoreboard players set @s fz.event.death_count 0 + +## 运行事件 +function #fz:event/player/on_dead + +## 重置事件进度 +advancement revoke @s only fz:event/on_dead \ No newline at end of file diff --git a/data/fz/functions/event/player/on_fished.mcfunction b/data/fz/functions/event/player/on_fished.mcfunction new file mode 100644 index 0000000..02094d9 --- /dev/null +++ b/data/fz/functions/event/player/on_fished.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "钓鱼上钩"}] + +## 运行事件 +function #fz:event/player/on_fished + +## 重置事件进度 +advancement revoke @s only fz:event/on_fished \ No newline at end of file diff --git a/data/fz/functions/event/player/on_hurt_entity_with_tools.mcfunction b/data/fz/functions/event/player/on_hurt_entity_with_tools.mcfunction new file mode 100644 index 0000000..bb6b470 --- /dev/null +++ b/data/fz/functions/event/player/on_hurt_entity_with_tools.mcfunction @@ -0,0 +1,13 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了挖掘工具攻击实体"}] + +## 计算挖掘数据偏移量 +scoreboard players remove @s fz.event.used_tool.dig_offset 1 + +## 运行事件 +function #fz:event/player/on_hurt_entity_with_tools + +## 重置事件进度 +advancement revoke @s only fz:event/on_hurt_entity_with_tools diff --git a/data/fz/functions/event/player/on_killed_mob_or_player.mcfunction b/data/fz/functions/event/player/on_killed_mob_or_player.mcfunction new file mode 100644 index 0000000..3c8778b --- /dev/null +++ b/data/fz/functions/event/player/on_killed_mob_or_player.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "击杀了生物"}] + +## 运行事件 +function #fz:event/player/on_killed_mob_or_player + +## 重置事件进度 +advancement revoke @s only fz:event/on_killed_mob_or_player \ No newline at end of file diff --git a/data/fz/functions/event/player/on_login.mcfunction b/data/fz/functions/event/player/on_login.mcfunction new file mode 100644 index 0000000..340ee1e --- /dev/null +++ b/data/fz/functions/event/player/on_login.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "登录游戏"}] + +scoreboard players set @s fz.event.leave_game 0 + +## 运行事件 +### 会调用reset_events标签，故本函数内不需要再重置事件进度 +function #fz:event/player/on_login \ No newline at end of file diff --git a/data/fz/functions/event/player/on_piglin_trade.mcfunction b/data/fz/functions/event/player/on_piglin_trade.mcfunction new file mode 100644 index 0000000..d2076bc --- /dev/null +++ b/data/fz/functions/event/player/on_piglin_trade.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "与猪灵交易"}] + +## 运行事件 +function #fz:event/player/on_piglin_trade + +## 重置事件进度 +advancement revoke @s only fz:event/on_piglin_trade \ No newline at end of file diff --git a/data/fz/functions/event/player/on_placed_block.mcfunction b/data/fz/functions/event/player/on_placed_block.mcfunction new file mode 100644 index 0000000..a22c6ac --- /dev/null +++ b/data/fz/functions/event/player/on_placed_block.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "放置了方块"}] + +## 运行事件 +function #fz:event/player/on_placed_block + +## 重置事件进度 +advancement revoke @s only fz:event/on_placed_block \ No newline at end of file diff --git a/data/fz/functions/event/player/on_play_one_hour.mcfunction b/data/fz/functions/event/player/on_play_one_hour.mcfunction new file mode 100644 index 0000000..735941f --- /dev/null +++ b/data/fz/functions/event/player/on_play_one_hour.mcfunction @@ -0,0 +1,15 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "游玩了1h"}] + +## 将事件数据缓存，并重置事件计分板 +# scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.play_seconds +# scoreboard players operation fz.var.score fz.variable.integer /= 3600 fz.variable.integer +scoreboard players operation @s fz.event.play_seconds %= 3600 fz.variable.integer + +## 运行事件 +function #fz:event/player/on_play_one_hour + +## 重置事件进度 +advancement revoke @s only fz:event/on_play_one_hour \ No newline at end of file diff --git a/data/fz/functions/event/player/on_shears_used_on_entity.mcfunction b/data/fz/functions/event/player/on_shears_used_on_entity.mcfunction new file mode 100644 index 0000000..438f474 --- /dev/null +++ b/data/fz/functions/event/player/on_shears_used_on_entity.mcfunction @@ -0,0 +1,13 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "对实体使用剪刀"}] + +## 计算挖掘数据偏移量 +scoreboard players remove @s fz.event.used_tool.dig_offset 1 + +## 运行事件 +function #fz:event/player/on_shears_used_on_entity + +## 重置事件进度 +advancement revoke @s only fz:event/on_shears_used_on_entity \ No newline at end of file diff --git a/data/fz/functions/event/player/on_sneak.mcfunction b/data/fz/functions/event/player/on_sneak.mcfunction new file mode 100644 index 0000000..dfff2b8 --- /dev/null +++ b/data/fz/functions/event/player/on_sneak.mcfunction @@ -0,0 +1,7 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "蹲下"}] + +## 运行事件 +function #fz:event/player/on_sneak diff --git a/data/fz/functions/event/player/on_took_damage.mcfunction b/data/fz/functions/event/player/on_took_damage.mcfunction new file mode 100644 index 0000000..8410f9d --- /dev/null +++ b/data/fz/functions/event/player/on_took_damage.mcfunction @@ -0,0 +1,14 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "受到了伤害"}] + +## 将事件数据缓存，并重置事件计分板 +scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.damage_taken +scoreboard players set @s fz.event.damage_taken 0 + +## 运行事件 +function #fz:event/player/on_took_damage + +## 重置事件进度 +advancement revoke @s only fz:event/on_took_damage \ No newline at end of file diff --git a/data/fz/functions/event/player/on_tools_used_on_block.mcfunction b/data/fz/functions/event/player/on_tools_used_on_block.mcfunction new file mode 100644 index 0000000..c525c44 --- /dev/null +++ b/data/fz/functions/event/player/on_tools_used_on_block.mcfunction @@ -0,0 +1,14 @@ +# 调用者：advancements/fz:~ +## 斧子剥树皮会触发两次！！ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "在方块上使用了工具"}] + +## 计算挖掘数据偏移量 +scoreboard players remove @s fz.event.used_tool.dig_offset 1 + +## 运行事件 +function #fz:event/player/on_tools_used_on_block + +## 重置事件进度 +advancement revoke @s only fz:event/on_tools_used_on_block \ No newline at end of file diff --git a/data/fz/functions/event/on_unsneak.mcfunction b/data/fz/functions/event/player/on_unsneak.mcfunction similarity index 74% rename from data/fz/functions/event/on_unsneak.mcfunction rename to data/fz/functions/event/player/on_unsneak.mcfunction index d8cde9b..c6143d5 100644 --- a/data/fz/functions/event/on_unsneak.mcfunction +++ b/data/fz/functions/event/player/on_unsneak.mcfunction @@ -1,12 +1,14 @@ +# 调用者：advancements/fz:~ + ## 调试 -execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "由下蹲状态站起"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "从蹲下状态站起"}] # 调用者：advancement/fz:unskeak ##### 当玩家蹲起后触发此事件 ## 运行事件 -function #fz:event/on_unsneak +function #fz:event/player/on_unsneak execute if entity @s[x_rotation = -90] run function #fz:event/module/config/on_config -## 复位进度触发器 +## 重置事件进度 advancement revoke @s until fz:event/on_unsneak \ No newline at end of file diff --git a/data/fz/functions/event/player/on_used_tool.mcfunction b/data/fz/functions/event/player/on_used_tool.mcfunction new file mode 100644 index 0000000..aab655a --- /dev/null +++ b/data/fz/functions/event/player/on_used_tool.mcfunction @@ -0,0 +1,16 @@ +# 调用者：advancements/fz:~ + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}] + +## 运行事件 +function #fz:event/player/on_used_tool + +## 判断并触发挖掘事件 +execute unless score @s fz.event.used_tool.offset matches ..-1 run function fz:event/player/on_broke_block + +## 重置事件计分板 +function #fz:event/player/on_used_tool/reset_used_tool + +## 重置事件进度 +advancement revoke @s only fz:event/on_used_tool \ No newline at end of file diff --git a/data/fz/functions/event/player/on_used_tool/reset_used_tool.mcfunction b/data/fz/functions/event/player/on_used_tool/reset_used_tool.mcfunction new file mode 100644 index 0000000..15d4440 --- /dev/null +++ b/data/fz/functions/event/player/on_used_tool/reset_used_tool.mcfunction @@ -0,0 +1,35 @@ +scoreboard players set @s fz.event.used_tool.offset 0 +scoreboard players set @s fz.event.used_tool.diamond_axe 0 +scoreboard players set @s fz.event.used_tool.diamond_hoe 0 +scoreboard players set @s fz.event.used_tool.diamond_pickaxe 0 +scoreboard players set @s fz.event.used_tool.diamond_shovel 0 +scoreboard players set @s fz.event.used_tool.diamond_sword 0 +scoreboard players set @s fz.event.used_tool.golden_axe 0 +scoreboard players set @s fz.event.used_tool.golden_hoe 0 +scoreboard players set @s fz.event.used_tool.golden_pickaxe 0 +scoreboard players set @s fz.event.used_tool.golden_shovel 0 +scoreboard players set @s fz.event.used_tool.golden_sword 0 +scoreboard players set @s fz.event.used_tool.iron_axe 0 +scoreboard players set @s fz.event.used_tool.iron_hoe 0 +scoreboard players set @s fz.event.used_tool.iron_pickaxe 0 +scoreboard players set @s fz.event.used_tool.iron_shovel 0 +scoreboard players set @s fz.event.used_tool.iron_sword 0 +scoreboard players set @s fz.event.used_tool.netherite_axe 0 +scoreboard players set @s fz.event.used_tool.netherite_hoe 0 +scoreboard players set @s fz.event.used_tool.netherite_pickaxe 0 +scoreboard players set @s fz.event.used_tool.netherite_shovel 0 +scoreboard players set @s fz.event.used_tool.netherite_sword 0 +scoreboard players set @s fz.event.used_tool.shears 0 +scoreboard players set @s fz.event.used_tool.stone_axe 0 +scoreboard players set @s fz.event.used_tool.stone_hoe 0 +scoreboard players set @s fz.event.used_tool.stone_pickaxe 0 +scoreboard players set @s fz.event.used_tool.stone_shovel 0 +scoreboard players set @s fz.event.used_tool.stone_sword 0 +scoreboard players set @s fz.event.used_tool.wooden_axe 0 +scoreboard players set @s fz.event.used_tool.wooden_hoe 0 +scoreboard players set @s fz.event.used_tool.wooden_pickaxe 0 +scoreboard players set @s fz.event.used_tool.wooden_shovel 0 +scoreboard players set @s fz.event.used_tool.wooden_sword 0 + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "重置了玩家"}, {"selector": "@s"}, {"text": "的used_tool计分板"}] \ No newline at end of file diff --git a/data/fz/functions/event/player/on_villager_trade.mcfunction b/data/fz/functions/event/player/on_villager_trade.mcfunction new file mode 100644 index 0000000..ce1777e --- /dev/null +++ b/data/fz/functions/event/player/on_villager_trade.mcfunction @@ -0,0 +1,10 @@ +# 调用者：advancements/fz:~ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "与村民交易"}] + +## 运行事件 +function #fz:event/player/on_villager_trade + +## 重置事件进度 +advancement revoke @s only fz:event/on_villager_trade \ No newline at end of file diff --git a/data/fz/functions/event/player/reset_advancements.mcfunction b/data/fz/functions/event/player/reset_advancements.mcfunction new file mode 100644 index 0000000..14bcfc3 --- /dev/null +++ b/data/fz/functions/event/player/reset_advancements.mcfunction @@ -0,0 +1,16 @@ +## 复位所有事件进度 +advancement revoke @s only fz:event/on_aviate_one_meter +advancement revoke @s only fz:event/on_dead +advancement revoke @s only fz:event/on_dig +advancement revoke @s only fz:event/on_interacted_with_entity/on_shears_used_on_entity +advancement revoke @s only fz:event/on_login +advancement revoke @s only fz:event/on_piglin_trade +advancement revoke @s only fz:event/on_play_one_hour +advancement revoke @s only fz:event/on_sneak +advancement revoke @s only fz:event/on_take_damage +advancement revoke @s only fz:event/on_tools_used_on_block +advancement revoke @s only fz:event/on_unsneak +advancement revoke @s only fz:event/on_villager_trade + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "已重置玩家"}, {"selector": "@s"}, {"text": "的所有事件成就"}] \ No newline at end of file diff --git a/data/fz/functions/event/uninstall.mcfunction b/data/fz/functions/event/uninstall.mcfunction new file mode 100644 index 0000000..ea3f1a8 --- /dev/null +++ b/data/fz/functions/event/uninstall.mcfunction @@ -0,0 +1,47 @@ +## 事件触发 +scoreboard objectives remove fz.event.aviating_distance +scoreboard objectives remove fz.event.damage_taken +scoreboard objectives remove fz.event.death_count +scoreboard objectives remove fz.event.leave_game +scoreboard objectives remove fz.event.play_seconds +scoreboard objectives remove fz.event.villager_trade + +## 使用工具 +scoreboard objectives remove fz.event.used_tool.dig_offset +scoreboard objectives remove fz.event.used_tool.iron_axe +scoreboard objectives remove fz.event.used_tool.stone_axe +scoreboard objectives remove fz.event.used_tool.golden_axe +scoreboard objectives remove fz.event.used_tool.wooden_axe +scoreboard objectives remove fz.event.used_tool.diamond_axe +scoreboard objectives remove fz.event.used_tool.netherite_axe +scoreboard objectives remove fz.event.used_tool.iron_hoe +scoreboard objectives remove fz.event.used_tool.stone_hoe +scoreboard objectives remove fz.event.used_tool.golden_hoe +scoreboard objectives remove fz.event.used_tool.wooden_hoe +scoreboard objectives remove fz.event.used_tool.diamond_hoe +scoreboard objectives remove fz.event.used_tool.netherite_hoe +scoreboard objectives remove fz.event.used_tool.iron_pickaxe +scoreboard objectives remove fz.event.used_tool.stone_pickaxe +scoreboard objectives remove fz.event.used_tool.golden_pickaxe +scoreboard objectives remove fz.event.used_tool.wooden_pickaxe +scoreboard objectives remove fz.event.used_tool.diamond_pickaxe +scoreboard objectives remove fz.event.used_tool.netherite_pickaxe +scoreboard objectives remove fz.event.used_tool.shears +scoreboard objectives remove fz.event.used_tool.iron_shovel +scoreboard objectives remove fz.event.used_tool.stone_shovel +scoreboard objectives remove fz.event.used_tool.golden_shovel +scoreboard objectives remove fz.event.used_tool.wooden_shovel +scoreboard objectives remove fz.event.used_tool.diamond_shovel +scoreboard objectives remove fz.event.used_tool.netherite_shovel +scoreboard objectives remove fz.event.used_tool.iron_sword +scoreboard objectives remove fz.event.used_tool.stone_sword +scoreboard objectives remove fz.event.used_tool.golden_sword +scoreboard objectives remove fz.event.used_tool.wooden_sword +scoreboard objectives remove fz.event.used_tool.diamond_sword +scoreboard objectives remove fz.event.used_tool.netherite_sword + +## 删除安装标记 +data remove storage fz:install_manager fz.event + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已卸载系统组件：事件"}] \ No newline at end of file diff --git a/data/fz/functions/install.mcfunction b/data/fz/functions/install.mcfunction index a67df27..1bcd151 100644 --- a/data/fz/functions/install.mcfunction +++ b/data/fz/functions/install.mcfunction @@ -1,8 +1,5 @@ # 调用者：#fz:install -## 整数类型 -scoreboard objectives add fz.variable.integer dummy - ## 安装模块 function #fz:module/install diff --git a/data/fz/functions/logger/init.mcfunction b/data/fz/functions/logger/install.mcfunction similarity index 87% rename from data/fz/functions/logger/init.mcfunction rename to data/fz/functions/logger/install.mcfunction index 075480d..81f6e84 100644 --- a/data/fz/functions/logger/init.mcfunction +++ b/data/fz/functions/logger/install.mcfunction @@ -1,29 +1,28 @@ -# 调用者：#fz:logger/init -##### 使用方式，形如：tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] - -## 根 -data modify storage fz:logger fz.root set value '[{"text": "", "color": "white"}, {"text": "[", "color": "dark_gray"}, {"text": "FZD", "color": "gold"}, {"text": "]", "color": "dark_gray"}]' - -## 不同日志等级 -### error 800 -data modify storage fz:logger fz.level.error set value '[{"text": "", "color": "red"}, {"nbt": "root", "interpret": true, "storage": "fz:logger"}, {"text": "[错误]"}]' -### alert 600 -data modify storage fz:logger fz.level.alert set value '[{"text": "", "color": "yellow"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[提醒]"}]' -### info 500 -data modify storage fz:logger fz.level.info set value '[{"text": "", "color": "green"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[信息]"}]' -### debug 400 -data modify storage fz:logger fz.level.debug set value '[{"text": "", "color": "dark_aqua"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[调试]"}]' -### fine 300 -data modify storage fz:logger fz.level.fine set value '[{"text": "", "color": "gray"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[详细]"}]' - -## 异常 -data modify storage fz:logger fz.exception.load_without_install_exception set value '[{"nbt": "fz.level.error", "interpret": true, "storage": "fz:logger"}, {"text": "模块在未安装时被加载："}]' - -## 首次安装时日志等级默认为一般消息 -execute unless data storage fz:logger fz.levels.current run data modify storage fz:logger fz.levels.current set value 500 - -## 读取debug等级存入缓存 -execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current - -## 调试 -execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已初始化系统组件：日志"}] \ No newline at end of file +##### 使用方式，形如：tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] + +## 根 +data modify storage fz:logger fz.root set value '[{"text": "", "color": "white"}, {"text": "[", "color": "dark_gray"}, {"text": "FZD", "color": "gold"}, {"text": "]", "color": "dark_gray"}]' + +## 不同日志等级 +### error 800 +data modify storage fz:logger fz.level.error set value '[{"text": "", "color": "red"}, {"nbt": "root", "interpret": true, "storage": "fz:logger"}, {"text": "[错误]"}]' +### alert 600 +data modify storage fz:logger fz.level.alert set value '[{"text": "", "color": "yellow"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[提醒]"}]' +### info 500 +data modify storage fz:logger fz.level.info set value '[{"text": "", "color": "green"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[信息]"}]' +### debug 400 +data modify storage fz:logger fz.level.debug set value '[{"text": "", "color": "dark_aqua"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[调试]"}]' +### fine 300 +data modify storage fz:logger fz.level.fine set value '[{"text": "", "color": "gray"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[详细]"}]' + +## 异常 +data modify storage fz:logger fz.exception.load_without_install_exception set value '[{"nbt": "fz.level.error", "interpret": true, "storage": "fz:logger"}, {"text": "模块在未安装时被加载："}]' + +## 首次安装时日志等级默认为一般消息 +execute unless data storage fz:logger fz.levels.current run data modify storage fz:logger fz.levels.current set value 500 + +## 标记为已安装 +data modify storage fz:install_manager fz.logger set value 1b + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装系统组件：日志"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/debug.mcfunction b/data/fz/functions/logger/level/debug.mcfunction index dce3360..ec797cf 100644 --- a/data/fz/functions/logger/level/debug.mcfunction +++ b/data/fz/functions/logger/level/debug.mcfunction @@ -1,6 +1,7 @@ ## debug 400 data modify storage fz:logger fz.levels.current set value 400 +execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current ## 日志 tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为调试"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/fine.mcfunction b/data/fz/functions/logger/level/fine.mcfunction index e3f4ab7..59daab0 100644 --- a/data/fz/functions/logger/level/fine.mcfunction +++ b/data/fz/functions/logger/level/fine.mcfunction @@ -1,6 +1,7 @@ ## fine 300 data modify storage fz:logger fz.levels.current set value 300 +execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current ## 日志 tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为详细"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/info.mcfunction b/data/fz/functions/logger/level/info.mcfunction index b9b651e..d97f0d1 100644 --- a/data/fz/functions/logger/level/info.mcfunction +++ b/data/fz/functions/logger/level/info.mcfunction @@ -1,6 +1,7 @@ ## info 500 data modify storage fz:logger fz.levels.current set value 500 +execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current ## 日志 tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为一般信息"}] \ No newline at end of file diff --git a/data/fz/functions/logger/load.mcfunction b/data/fz/functions/logger/load.mcfunction new file mode 100644 index 0000000..baa24b2 --- /dev/null +++ b/data/fz/functions/logger/load.mcfunction @@ -0,0 +1,7 @@ +# 调用者：#fz:logger/init + +## 读取日志等级存入缓存 +execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已加载系统组件：日志"}] \ No newline at end of file diff --git a/data/fz/functions/logger/uninstall.mcfunction b/data/fz/functions/logger/uninstall.mcfunction index 50e31c9..f7e9281 100644 --- a/data/fz/functions/logger/uninstall.mcfunction +++ b/data/fz/functions/logger/uninstall.mcfunction @@ -1,4 +1,10 @@ ## 调用者：#fz:logger/uninstall +## 删除安装标记 +data remove storage fz:install_manager fz.logger + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已卸载系统组件：日志"}] + ## 询问是否清除数据 execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @s [{"nbt": "fz.level.alert", "interpret": true, "storage": "fz:logger"}, {"text": "您要删除日志配置吗，它将会永久失去！(真的很久！)"}, {"text": "[确定]", "color": "dark_red", "clickEvent": {"action": "suggest_command", "value": "/function #fz:logger/clear_data"}, "hoverEvent": {"action": "show_text", "contents": {"text": "将命令填入聊天框"}}}] \ No newline at end of file diff --git a/data/fz/functions/module/config/load.mcfunction b/data/fz/functions/module/config/load.mcfunction index a3ad759..45291bf 100644 --- a/data/fz/functions/module/config/load.mcfunction +++ b/data/fz/functions/module/config/load.mcfunction @@ -1,3 +1,5 @@ + + function #fz:module/config/reset_trigger ## 日志 diff --git a/data/fz/functions/module/config/loop.mcfunction b/data/fz/functions/module/config/loop.mcfunction index a39b753..afe3b93 100644 --- a/data/fz/functions/module/config/loop.mcfunction +++ b/data/fz/functions/module/config/loop.mcfunction @@ -1,7 +1,7 @@ # 调用者：fz:module/config/trigger ## 如果分数大于0说明玩家点击了按钮 -execute as @a if score @s fz.module.config.trigger matches 1.. run function #fz:module/config/on_click +execute as @a if score @s fz.module.config.trigger matches 1.. run function #fz:event/module/config/on_click execute as @a if score @s fz.module.config.trigger matches 1.. run function #fz:module/config/reset_trigger schedule function fz:module/config/loop 1t replace diff --git a/data/fz/functions/module/config/on_config.mcfunction b/data/fz/functions/module/config/on_config.mcfunction index 257fa43..b111927 100644 --- a/data/fz/functions/module/config/on_config.mcfunction +++ b/data/fz/functions/module/config/on_config.mcfunction @@ -4,8 +4,7 @@ ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "触发了配置功能"}] -## 监听计分板分数的循环，schedule是为了避免1tick内执行两次，但可有可无 -schedule function fz:module/config/loop 0t replace +function fz:module/config/loop ## 显示按钮 function #fz:module/config/display diff --git a/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction b/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction deleted file mode 100644 index 3153e7b..0000000 --- a/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# 源计分板 -## 总榜 -scoreboard objectives add fz.module.scoreboard.assign.general dummy diff --git a/data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/activation.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/activation.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/aviating_distance.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/aviating_distance.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/damage_taken.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/damage_taken.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/death_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/death_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/death_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/death_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/dig_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/dig_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/dig_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/dig_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/fishing_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/fishing_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/fishing_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/activation.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/activation.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/activation.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/activation.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/aviating_distance.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/aviating_distance.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/aviating_distance.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/damage_taken.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/damage_taken.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/damage_taken.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/death_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/death_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/death_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/death_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/dig_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/dig_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/dig_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/dig_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/fishing_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/fishing_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/fishing_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/kill_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/kill_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/kill_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/kill_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/placement_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/placement_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/placement_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/placement_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/general/trade_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/general/trade_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/general/trade_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/kill_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/kill_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/kill_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/kill_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/placement_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/placement_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/placement_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/placement_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/scoreboard/trade_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/scoreboard/trade_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction index b93360f..6ad4b3a 100644 --- a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction +++ b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction @@ -1,3 +1,3 @@ # 调用者：#fz:module/scoreboard/config/display/buttons -tellraw @s [[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1100"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]] \ No newline at end of file +tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1100"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction b/data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction deleted file mode 100644 index 5d74cd9..0000000 --- a/data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction +++ /dev/null @@ -1,46 +0,0 @@ -## 创建显示计分板 -### 轮播 -team add fz.module.scoreboard.display.carousel - -## 主计分板 -###### 判据均为dummy，便于升级维护！ - -### 总榜 -scoreboard objectives add fz.module.scoreboard.display.general dummy -team add fz.module.scoreboard.display.general - -### 活跃度 -scoreboard objectives add fz.module.scoreboard.display.activation dummy -team add fz.module.scoreboard.display.activation - -### 飞行距离 -scoreboard objectives add fz.module.scoreboard.display.aviating_distance dummy -team add fz.module.scoreboard.display.aviating_distance - -### 抖M榜 -scoreboard objectives add fz.module.scoreboard.display.damage_taken dummy -team add fz.module.scoreboard.display.damage_taken - -### 死亡榜 -scoreboard objectives add fz.module.scoreboard.display.death_count dummy -team add fz.module.scoreboard.display.death_count - -### 挖掘榜 -scoreboard objectives add fz.module.scoreboard.display.dig_count dummy -team add fz.module.scoreboard.display.dig_count - -### 钓鱼榜 -scoreboard objectives add fz.module.scoreboard.display.fishing_count dummy -team add fz.module.scoreboard.display.fishing_count - -### 击杀榜 -scoreboard objectives add fz.module.scoreboard.display.kill_count dummy -team add fz.module.scoreboard.display.kill_count - -### 放置榜 -scoreboard objectives add fz.module.scoreboard.placement_count dummy -team add fz.module.scoreboard.display.placement_count - -### 交易榜 -scoreboard objectives add fz.module.scoreboard.display.trade_count dummy -team add fz.module.scoreboard.display.trade_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/install.mcfunction b/data/fz/functions/module/scoreboard/install.mcfunction index 3167bf5..f6a4af8 100644 --- a/data/fz/functions/module/scoreboard/install.mcfunction +++ b/data/fz/functions/module/scoreboard/install.mcfunction @@ -1,9 +1,55 @@ # 调用者：#fz:module/scoreboard/install ## 源计分板 -function fz:module/scoreboard/assign/create_scoreboards -## 显示计分板 -function fz:module/scoreboard/display/create_scoreboards + +### 总榜 +scoreboard objectives add fz.module.scoreboard.assign.general dummy + +## 轮播 +team add fz.module.scoreboard.display.carousel + +## 创建显示计分板 +###### 判据均为dummy，便于升级维护！ + +### 总榜 +scoreboard objectives add fz.module.scoreboard.display.general dummy +team add fz.module.scoreboard.display.general + +### 活跃度 +scoreboard objectives add fz.module.scoreboard.display.activation dummy +team add fz.module.scoreboard.display.activation + +### 飞行距离 +scoreboard objectives add fz.module.scoreboard.display.aviating_distance dummy +team add fz.module.scoreboard.display.aviating_distance + +### 抖M榜 +scoreboard objectives add fz.module.scoreboard.display.damage_taken dummy +team add fz.module.scoreboard.display.damage_taken + +### 死亡榜 +scoreboard objectives add fz.module.scoreboard.display.death_count dummy +team add fz.module.scoreboard.display.death_count + +### 挖掘榜 +scoreboard objectives add fz.module.scoreboard.display.dig_count dummy +team add fz.module.scoreboard.display.dig_count + +### 钓鱼榜 +scoreboard objectives add fz.module.scoreboard.display.fishing_count dummy +team add fz.module.scoreboard.display.fishing_count + +### 击杀榜 +scoreboard objectives add fz.module.scoreboard.display.kill_count dummy +team add fz.module.scoreboard.display.kill_count + +### 放置榜 +scoreboard objectives add fz.module.scoreboard.placement_count dummy +team add fz.module.scoreboard.display.placement_count + +### 交易榜 +scoreboard objectives add fz.module.scoreboard.display.trade_count dummy +team add fz.module.scoreboard.display.trade_count ## 标记为已安装 data modify storage fz:install_manager fz.module.scoreboard set value 1b diff --git a/data/fz/functions/module/scoreboard/uninstall.mcfunction b/data/fz/functions/module/scoreboard/uninstall.mcfunction index f55db69..863f2b8 100644 --- a/data/fz/functions/module/scoreboard/uninstall.mcfunction +++ b/data/fz/functions/module/scoreboard/uninstall.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fz:module/scoreboard/uninstall ## 关闭轮播循环 -schedule clear #fz:module/scoreboard/display/carousel_controller/loop +schedule clear fz:module/scoreboard/display/carousel/loop ## 清除队伍 ### 轮播 diff --git a/data/fz/functions/system_load.mcfunction b/data/fz/functions/system_load.mcfunction deleted file mode 100644 index fb1e0c2..0000000 --- a/data/fz/functions/system_load.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ - -## 先初始化日志组件 -function #fz:logger/init -## 再初始化事件组件，因为事件组件的初始化函数中使用了日志组件 -function #fz:event/init - -## 日志 -execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "系统组件初始化完成！"}] \ No newline at end of file diff --git a/data/fz/functions/uninstall.mcfunction b/data/fz/functions/uninstall.mcfunction index 2a9de20..fdb3d13 100644 --- a/data/fz/functions/uninstall.mcfunction +++ b/data/fz/functions/uninstall.mcfunction @@ -5,9 +5,11 @@ function #fz:module/uninstall ## 整数类型 scoreboard objectives remove fz.variable.integer -function #fz:logger/uninstall +function fz:event/uninstall +function fz:logger/uninstall ## 标记为已卸载 +data remove storage fz:install_manager fz data modify storage fz:install_manager fz.global set value 0b ## 日志 diff --git a/data/fz/predicates/axe_in_hand_effective.json b/data/fz/predicates/axe_in_hand_effective.json new file mode 100644 index 0000000..4376a5c --- /dev/null +++ b/data/fz/predicates/axe_in_hand_effective.json @@ -0,0 +1,51 @@ +{ + "condition": "minecraft:alternative", + "terms": [ + { + "__comment": "主手==斧子", + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "mainhand": { + "tag": "fz:tool/axes" + } + } + } + }, + { + "__comment": "主手!=工具&&副手==斧子", + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "mainhand": { + "tag": "fz:tools" + } + } + } + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "offhand": { + "tag": "fz:tool/axes" + } + } + } + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/data/fz/predicates/used_tool.json b/data/fz/predicates/used_tool.json new file mode 100644 index 0000000..1f4e824 --- /dev/null +++ b/data/fz/predicates/used_tool.json @@ -0,0 +1,284 @@ +{ + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.diamond_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.diamond_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.diamond_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.diamond_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.diamond_sword": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.golden_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.golden_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.golden_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.golden_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.golden_sword": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.iron_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.iron_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.iron_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.iron_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.iron_sword": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.netherite_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.netherite_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.netherite_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.netherite_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.netherite_sword": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.shears": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.stone_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.stone_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.stone_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.stone_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.stone_sword": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.wooden_axe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.wooden_hoe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.wooden_pickaxe": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.wooden_shovel": { + "min": 1 + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fz.event.used_tool.wooden_sword": { + "min": 1 + } + } + } + ] +} \ No newline at end of file diff --git a/data/fz/tags/blocks/stripped_blocks.json b/data/fz/tags/blocks/stripped_blocks.json new file mode 100644 index 0000000..64a5793 --- /dev/null +++ b/data/fz/tags/blocks/stripped_blocks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "minecraft:stripped_acacia_log", + "minecraft:stripped_acacia_wood", + "minecraft:stripped_birch_log", + "minecraft:stripped_birch_wood", + "minecraft:stripped_crimson_hyphae", + "minecraft:stripped_crimson_stem", + "minecraft:stripped_dark_oak_log", + "minecraft:stripped_dark_oak_wood", + "minecraft:stripped_jungle_log", + "minecraft:stripped_jungle_wood", + "minecraft:stripped_oak_log", + "minecraft:stripped_oak_wood", + "minecraft:stripped_spruce_log", + "minecraft:stripped_spruce_wood", + "minecraft:stripped_warped_hyphae", + "minecraft:stripped_warped_stem" + ] +} \ No newline at end of file diff --git a/data/fz/tags/entity_types/ignore_on_player_killed_entity.json b/data/fz/tags/entity_types/ignore_on_player_killed_entity.json new file mode 100644 index 0000000..46e01c5 --- /dev/null +++ b/data/fz/tags/entity_types/ignore_on_player_killed_entity.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:armor_stand", + "minecraft:boat", + "minecraft:minecart", + "minecraft:shulker_bullet", + "minecraft:item_frame", + "minecraft:glow_item_frame", + "minecraft:painting", + "minecraft:end_crystal" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/logger/uninstall.json b/data/fz/tags/entity_types/shearable.json similarity index 61% rename from data/fz/tags/functions/logger/uninstall.json rename to data/fz/tags/entity_types/shearable.json index 8cbb61b..6f7fd6b 100644 --- a/data/fz/tags/functions/logger/uninstall.json +++ b/data/fz/tags/entity_types/shearable.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:logger/uninstall" + "minecraft:sheep" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/event/module/config/on_click.json b/data/fz/tags/functions/event/module/config/on_click.json new file mode 100644 index 0000000..a7bfb04 --- /dev/null +++ b/data/fz/tags/functions/event/module/config/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/config/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_aviate_one_meter.json b/data/fz/tags/functions/event/on_aviate_one_meter.json deleted file mode 100644 index 802f9f3..0000000 --- a/data/fz/tags/functions/event/on_aviate_one_meter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/aviating_distance" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_damage_taken.json b/data/fz/tags/functions/event/on_damage_taken.json deleted file mode 100644 index 98602d4..0000000 --- a/data/fz/tags/functions/event/on_damage_taken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/damage_taken" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_piglin_trade.json b/data/fz/tags/functions/event/on_piglin_trade.json deleted file mode 100644 index 8c1fc89..0000000 --- a/data/fz/tags/functions/event/on_piglin_trade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/trade_count/piglin" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_play_one_hour.json b/data/fz/tags/functions/event/on_play_one_hour.json deleted file mode 100644 index e2913c2..0000000 --- a/data/fz/tags/functions/event/on_play_one_hour.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/activation" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_villager_trade.json b/data/fz/tags/functions/event/on_villager_trade.json deleted file mode 100644 index 7be6563..0000000 --- a/data/fz/tags/functions/event/on_villager_trade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/trade_count/villager" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_aviate_one_meter.json b/data/fz/tags/functions/event/player/on_aviate_one_meter.json new file mode 100644 index 0000000..348f79e --- /dev/null +++ b/data/fz/tags/functions/event/player/on_aviate_one_meter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_broke_block.json b/data/fz/tags/functions/event/player/on_broke_block.json new file mode 100644 index 0000000..e8c6a0c --- /dev/null +++ b/data/fz/tags/functions/event/player/on_broke_block.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_dead.json b/data/fz/tags/functions/event/player/on_dead.json new file mode 100644 index 0000000..0080ec7 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_dead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_fished.json b/data/fz/tags/functions/event/player/on_fished.json new file mode 100644 index 0000000..b14f026 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_fished.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_hurt_entity_with_tools.json b/data/fz/tags/functions/event/player/on_hurt_entity_with_tools.json new file mode 100644 index 0000000..0673d42 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_hurt_entity_with_tools.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:event/player/on_dig/reset_used_tools" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_killed_mob_or_player.json b/data/fz/tags/functions/event/player/on_killed_mob_or_player.json new file mode 100644 index 0000000..60105f5 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_killed_mob_or_player.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_login.json b/data/fz/tags/functions/event/player/on_login.json similarity index 74% rename from data/fz/tags/functions/event/on_login.json rename to data/fz/tags/functions/event/player/on_login.json index ed79e07..4736be3 100644 --- a/data/fz/tags/functions/event/on_login.json +++ b/data/fz/tags/functions/event/player/on_login.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "#fz:event/reset_all", "#fz:module/config/reset_trigger" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_piglin_trade.json b/data/fz/tags/functions/event/player/on_piglin_trade.json new file mode 100644 index 0000000..877b07a --- /dev/null +++ b/data/fz/tags/functions/event/player/on_piglin_trade.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_placed_block.json b/data/fz/tags/functions/event/player/on_placed_block.json new file mode 100644 index 0000000..9968eef --- /dev/null +++ b/data/fz/tags/functions/event/player/on_placed_block.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/placement_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_play_one_hour.json b/data/fz/tags/functions/event/player/on_play_one_hour.json new file mode 100644 index 0000000..a2d2a22 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_play_one_hour.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/init.json b/data/fz/tags/functions/event/player/on_shears_used_on_entity.json similarity index 66% rename from data/fz/tags/functions/event/init.json rename to data/fz/tags/functions/event/player/on_shears_used_on_entity.json index 04496e5..907e30b 100644 --- a/data/fz/tags/functions/event/init.json +++ b/data/fz/tags/functions/event/player/on_shears_used_on_entity.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:event/init" + ] } \ No newline at end of file diff --git a/data/fz/tags/functions/logger/init.json b/data/fz/tags/functions/event/player/on_sneak.json similarity index 65% rename from data/fz/tags/functions/logger/init.json rename to data/fz/tags/functions/event/player/on_sneak.json index dd432eb..907e30b 100644 --- a/data/fz/tags/functions/logger/init.json +++ b/data/fz/tags/functions/event/player/on_sneak.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:logger/init" + ] } \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_took_damage.json b/data/fz/tags/functions/event/player/on_took_damage.json new file mode 100644 index 0000000..32fbef2 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_took_damage.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/system_load.json b/data/fz/tags/functions/event/player/on_tools_right_click_used.json similarity index 65% rename from data/fz/tags/functions/system_load.json rename to data/fz/tags/functions/event/player/on_tools_right_click_used.json index 886dbc0..907e30b 100644 --- a/data/fz/tags/functions/system_load.json +++ b/data/fz/tags/functions/event/player/on_tools_right_click_used.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:system_load" + ] } \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_tools_used_on_block.json b/data/fz/tags/functions/event/player/on_tools_used_on_block.json new file mode 100644 index 0000000..907e30b --- /dev/null +++ b/data/fz/tags/functions/event/player/on_tools_used_on_block.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_unsneak.json b/data/fz/tags/functions/event/player/on_unsneak.json similarity index 100% rename from data/fz/tags/functions/event/on_unsneak.json rename to data/fz/tags/functions/event/player/on_unsneak.json diff --git a/data/fz/tags/functions/event/player/on_used_tool.json b/data/fz/tags/functions/event/player/on_used_tool.json new file mode 100644 index 0000000..907e30b --- /dev/null +++ b/data/fz/tags/functions/event/player/on_used_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_used_tool/reset_used_tool.json b/data/fz/tags/functions/event/player/on_used_tool/reset_used_tool.json new file mode 100644 index 0000000..ba1aa74 --- /dev/null +++ b/data/fz/tags/functions/event/player/on_used_tool/reset_used_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:event/player/on_used_tool/reset_used_tool" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/on_villager_trade.json b/data/fz/tags/functions/event/player/on_villager_trade.json new file mode 100644 index 0000000..877b07a --- /dev/null +++ b/data/fz/tags/functions/event/player/on_villager_trade.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/assign/scoreboard/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/player/reset_advancements.json b/data/fz/tags/functions/event/player/reset_advancements.json new file mode 100644 index 0000000..fd1034a --- /dev/null +++ b/data/fz/tags/functions/event/player/reset_advancements.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:event/player/reset_advancements" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/reset_all.json b/data/fz/tags/functions/event/reset_all.json new file mode 100644 index 0000000..dfca80a --- /dev/null +++ b/data/fz/tags/functions/event/reset_all.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#fz:event/player/reset_advancements", + "#fz:event/player/on_dig/reset_used_tools" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/activation.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/activation.json new file mode 100644 index 0000000..acdbe58 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/activation.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/activation", + "#fz:module/scoreboard/assign/scoreboard/general/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/aviating_distance.json new file mode 100644 index 0000000..be6e8a7 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/aviating_distance.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/aviating_distance", + "#fz:module/scoreboard/assign/scoreboard/general/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/damage_taken.json new file mode 100644 index 0000000..15b2f8b --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/damage_taken.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/damage_taken", + "#fz:module/scoreboard/assign/scoreboard/general/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/death_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/death_count.json new file mode 100644 index 0000000..d326d25 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/death_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/death_count", + "#fz:module/scoreboard/assign/scoreboard/general/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/dig_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/dig_count.json new file mode 100644 index 0000000..637f3d2 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/dig_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/dig_count", + "#fz:module/scoreboard/assign/scoreboard/general/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/fishing_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/fishing_count.json new file mode 100644 index 0000000..c500da4 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/fishing_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/fishing_count", + "#fz:module/scoreboard/assign/scoreboard/general/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/activation.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/activation.json new file mode 100644 index 0000000..692d174 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/activation.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/aviating_distance.json new file mode 100644 index 0000000..2795de8 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/aviating_distance.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/damage_taken.json new file mode 100644 index 0000000..9d73c5d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/damage_taken.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/death_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/death_count.json new file mode 100644 index 0000000..2cc9174 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/death_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/dig_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/dig_count.json new file mode 100644 index 0000000..9ec4db1 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/dig_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/fishing_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/fishing_count.json new file mode 100644 index 0000000..a6952fb --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/fishing_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/kill_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/kill_count.json new file mode 100644 index 0000000..ef2adaf --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/kill_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/placement_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/placement_count.json new file mode 100644 index 0000000..f0d857f --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/placement_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/placement_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/trade_count.json new file mode 100644 index 0000000..1d135d2 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/general/trade_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/general/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/kill_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/kill_count.json new file mode 100644 index 0000000..8351710 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/kill_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/kill_count", + "#fz:module/scoreboard/assign/scoreboard/general/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/placement_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/placement_count.json new file mode 100644 index 0000000..4bb229f --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/placement_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/placement_count", + "#fz:module/scoreboard/assign/scoreboard/general/placement_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/scoreboard/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/trade_count.json new file mode 100644 index 0000000..850fe9a --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/assign/scoreboard/trade_count.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/assign/scoreboard/trade_count", + "#fz:module/scoreboard/assign/scoreboard/general/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json deleted file mode 100644 index c365321..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/activation", - "#fz:module/scoreboard/assign/set_display/general/activation" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json deleted file mode 100644 index 3e78cbc..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/aviating_distance", - "#fz:module/scoreboard/assign/set_display/general/aviating_distance" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json deleted file mode 100644 index ca201a7..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/damage_taken", - "#fz:module/scoreboard/assign/set_display/general/damage_taken" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/activation.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/activation.json deleted file mode 100644 index b42990e..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/activation.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/total_name/activation" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/aviating_distance.json deleted file mode 100644 index fb5bd9c..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/aviating_distance.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/total_name/aviating_distance" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/damage_taken.json deleted file mode 100644 index 7bd8a91..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/damage_taken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/total_name/damage_taken" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/trade_count.json deleted file mode 100644 index bb11717..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/general/trade_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/total_name/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json deleted file mode 100644 index ce18bd0..0000000 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/assign/set_display/trade_count", - "#fz:module/scoreboard/assign/set_display/general/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/items/raw_fishes.json b/data/fz/tags/items/raw_fishes.json new file mode 100644 index 0000000..e6560a6 --- /dev/null +++ b/data/fz/tags/items/raw_fishes.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/axes.json b/data/fz/tags/items/tool/axes.json new file mode 100644 index 0000000..6304dcf --- /dev/null +++ b/data/fz/tags/items/tool/axes.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_axe", + "minecraft:stone_axe", + "minecraft:golden_axe", + "minecraft:wooden_axe", + "minecraft:diamond_axe", + "minecraft:netherite_axe" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/hoes.json b/data/fz/tags/items/tool/hoes.json new file mode 100644 index 0000000..08d1d2c --- /dev/null +++ b/data/fz/tags/items/tool/hoes.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_hoe", + "minecraft:stone_hoe", + "minecraft:golden_hoe", + "minecraft:wooden_hoe", + "minecraft:diamond_hoe", + "minecraft:netherite_hoe" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/pickaxes.json b/data/fz/tags/items/tool/pickaxes.json new file mode 100644 index 0000000..db245a3 --- /dev/null +++ b/data/fz/tags/items/tool/pickaxes.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:wooden_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/shears.json b/data/fz/tags/items/tool/shears.json new file mode 100644 index 0000000..9520270 --- /dev/null +++ b/data/fz/tags/items/tool/shears.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:shears" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/shovels.json b/data/fz/tags/items/tool/shovels.json new file mode 100644 index 0000000..c95f9de --- /dev/null +++ b/data/fz/tags/items/tool/shovels.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_shovel", + "minecraft:stone_shovel", + "minecraft:golden_shovel", + "minecraft:wooden_shovel", + "minecraft:diamond_shovel", + "minecraft:netherite_shovel" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tool/swords.json b/data/fz/tags/items/tool/swords.json new file mode 100644 index 0000000..0a351a0 --- /dev/null +++ b/data/fz/tags/items/tool/swords.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_sword", + "minecraft:stone_sword", + "minecraft:golden_sword", + "minecraft:wooden_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword" + ] +} \ No newline at end of file diff --git a/data/fz/tags/items/tools.json b/data/fz/tags/items/tools.json new file mode 100644 index 0000000..750fe07 --- /dev/null +++ b/data/fz/tags/items/tools.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#fz:tool/axes", + "#fz:tool/hoes", + "#fz:tool/pickaxes", + "#fz:tool/shears", + "#fz:tool/shovels", + "#fz:tool/swords" + ] +} \ No newline at end of file