Skip to content

Commit

Permalink
0.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Gu-ZT committed Mar 25, 2022
1 parent 5fd7917 commit 502f669
Show file tree
Hide file tree
Showing 38 changed files with 388 additions and 27 deletions.
Binary file modified Add.xls
Binary file not shown.
5 changes: 4 additions & 1 deletion assets/anc/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"block.minecraft.petrified_oak_slab": "Bamboo Slab",
"Please install the correct resource pack": "§f§l============================§r\n§b§lWelcome to use AnvilCraft,Datapack Version:§r%s§b§l,Resourcepack Version:§6§l0.6.4§r\n§b§lDatapack author:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§lResourcepack author:§r§6§lXe_Kr§r\n§f§l============================§r",
"Please install the correct resource pack": "§f§l============================§r\n§b§lWelcome to use AnvilCraft,Datapack Version:§r%s§b§l,Resourcepack Version:§6§l0.6.5§r\n§b§lDatapack author:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§lResourcepack author:§r§6§lXe_Kr§r\n§f§l============================§r",
"anc.block.magnet_block.name": "Magnet Block",
"anc.block.magnet_block.lore": "When activated by redstone, it can suck up the anvil directly below it (within 4 blocks)",
"anc.item.empty_protocol.name": "Empty Protocol",
Expand Down Expand Up @@ -76,6 +76,8 @@
"anc.item.command_book.rookie_mode": "Enable rookie mode:%s\n",
"anc.item.command_book.experience_repair": "In experience repair 2, the durability value of each experience bottle that can be repaired:%s\n",
"anc.item.command_book.processing_count": "Processing efficiency (items / time):%s\n",
"anc.item.command_book.keep_inventory": "Enable KeepInventory:%s\n",
"anc.item.command_book.reminder_voice": "Enable Reminder Voice:%s\n",
"anc.item.command_book.skyland_mode": "Enable SkylandMode:%s\n",
"anc.item.command_book.single_land": "Enable SingleLands:%s\n",
"anc.skyland.help": "§f§l============================§r\n§6/trigger skyland §aOpen this page\n§6/trigger skyland.visit set <uid> §aVisit other players' islands\n§6/trigger skyland.home §aReturn of players from other islands\n§f§l============================§r",
Expand Down Expand Up @@ -112,6 +114,7 @@
"anc.item.seal_slate_water.name": "Seal Slate Water",
"anc.item.enchant.beheading": "Beheading",
"anc.item.enchant.sucking_blood": "Sucking Blood",
"anc.item.enchant.soul_binding": "Soul Binding",
"anc.item.bark.name": "Bark",
"anc.item.pulp.name": "Pulp",
"anc.item.changeable_pickaxe_silk_touch.name": "Changeable Pickaxe Silk Touch",
Expand Down
5 changes: 4 additions & 1 deletion assets/anc/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"block.minecraft.petrified_oak_slab": "竹台阶",
"Please install the correct resource pack": "§f§l============================§r\n§b§l欢迎使用铁砧工艺,数据包版本:§r%s§b§l,资源包版本:§6§l0.6.4§r\n§b§l数据包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l资源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"Please install the correct resource pack": "§f§l============================§r\n§b§l欢迎使用铁砧工艺,数据包版本:§r%s§b§l,资源包版本:§6§l0.6.5§r\n§b§l数据包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l资源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"anc.block.magnet_block.name": "磁铁",
"anc.block.magnet_block.lore": "被红石激活时可以吸起其正下方(4个方块内)的铁砧",
"anc.block.crafting_machine.name": "合成器",
Expand Down Expand Up @@ -78,6 +78,8 @@
"anc.item.command_book.rookie_mode": "是否启用无忧模式:%s\n",
"anc.item.command_book.experience_repair": "在经验修补2中每个经验瓶可以修补的耐久值:%s\n",
"anc.item.command_book.processing_count": "处理效率(个物品/次):%s\n",
"anc.item.command_book.keep_inventory": "是否启用死亡不掉落:%s\n",
"anc.item.command_book.reminder_voice": "是否启用游商提醒音效:%s\n",
"anc.item.command_book.skyland_mode": "是否启用空岛模式:%s\n",
"anc.item.command_book.single_land": "是否启用单独岛屿:%s\n",
"anc.skyland.help": "§f§l============================§r\n§6/trigger skyland §a打开此页面\n§6/trigger skyland.visit set <uid> §a访问其他玩家的岛屿\n§6/trigger skyland.home §a从其他玩家的岛屿返回\n§f§l============================§r",
Expand Down Expand Up @@ -114,6 +116,7 @@
"anc.item.seal_slate_water.name": "寒水封印石",
"anc.item.enchant.beheading": "斩首",
"anc.item.enchant.sucking_blood": "吸血",
"anc.item.enchant.soul_binding": "灵魂绑定",
"anc.item.bark.name": "树皮",
"anc.item.pulp.name": "纸浆",
"anc.item.changeable_pickaxe_silk_touch.name": "应变之镐(丝触)",
Expand Down
5 changes: 4 additions & 1 deletion assets/anc/lang/zh_hk.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"block.minecraft.petrified_oak_slab": "竹臺階",
"Please install the correct resource pack": "§f§l============================§r\n§b§l歡迎使用鐵砧工藝,資料包版本:§r%s§b§l,資源包版本:§6§l0.6.4§r\n§b§l資料包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l資源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"Please install the correct resource pack": "§f§l============================§r\n§b§l歡迎使用鐵砧工藝,資料包版本:§r%s§b§l,資源包版本:§6§l0.6.5§r\n§b§l資料包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l資源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"anc.block.magnet_block.name": "磁鐵",
"anc.block.magnet_block.lore": "被紅石啟動時可以吸起其正下方(4個方塊內)的鐵砧",
"anc.item.empty_protocol.name": "空協定",
Expand Down Expand Up @@ -76,6 +76,8 @@
"anc.item.command_book.rookie_mode": "是否啟用菜鳥模式:%s\n",
"anc.item.command_book.experience_repair": "在經驗修補2中每個經驗瓶可以修補的耐久值:%s\n",
"anc.item.command_book.processing_count": "處理效率(個物品/次):%s\n",
"anc.item.command_book.keep_inventory": "是否啟用死亡不掉落:%s\n",
"anc.item.command_book.reminder_voice": "是否啓用游商提醒音效:%s\n",
"anc.item.command_book.skyland_mode": "是否啟用空島模式:%s\n",
"anc.item.command_book.single_land": "是否啟用單獨島嶼:%s\n",
"anc.skyland.help": "§f§l============================§r\n§6/trigger skyland §a打開此頁面\n§6/trigger skyland.visit set <uid> §a訪問其他玩家的島嶼\n§6/trigger skyland.home §a從其他玩家的島嶼返回\n§f§l============================§r",
Expand Down Expand Up @@ -112,6 +114,7 @@
"anc.item.seal_slate_water.name": "寒水封印石",
"anc.item.enchant.beheading": "斬首",
"anc.item.enchant.sucking_blood": "吸血",
"anc.item.enchant.soul_binding": "靈魂綁定",
"anc.item.bark.name": "樹皮",
"anc.item.pulp.name": "紙漿",
"anc.item.changeable_pickaxe_silk_touch.name": "應變之鎬(絲觸)",
Expand Down
5 changes: 4 additions & 1 deletion assets/anc/lang/zh_tw.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"block.minecraft.petrified_oak_slab": "竹臺階",
"Please install the correct resource pack": "§f§l============================§r\n§b§l歡迎使用鐵砧工藝,資料包版本:§r%s§b§l,資源包版本:§6§l0.6.4§r\n§b§l資料包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l資源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"Please install the correct resource pack": "§f§l============================§r\n§b§l歡迎使用鐵砧工藝,資料包版本:§r%s§b§l,資源包版本:§6§l0.6.5§r\n§b§l資料包作者:§r§6§lGu_ZT§r§b§l、§r§6§lsch246§r §b§l資源包作者:§r§6§lXe_Kr§r\n§f§l============================§r",
"anc.block.magnet_block.name": "磁鐵",
"anc.block.magnet_block.lore": "被紅石啟動時可以吸起其正下方(4個方塊內)的鐵砧",
"anc.item.empty_protocol.name": "空協定",
Expand Down Expand Up @@ -76,6 +76,8 @@
"anc.item.command_book.rookie_mode": "是否啟用菜鳥模式:%s\n",
"anc.item.command_book.experience_repair": "在經驗修補2中每個經驗瓶可以修補的耐久值:%s\n",
"anc.item.command_book.processing_count": "處理效率(個物品/次):%s\n",
"anc.item.command_book.keep_inventory": "是否啟用死亡不掉落:%s\n",
"anc.item.command_book.reminder_voice": "是否啓用游商提醒音效:%s\n",
"anc.item.command_book.skyland_mode": "是否啟用空島模式:%s\n",
"anc.item.command_book.single_land": "是否啟用單獨島嶼:%s\n",
"anc.skyland.help": "§f§l============================§r\n§6/trigger skyland §a打開此頁面\n§6/trigger skyland.visit set <uid> §a訪問其他玩家的島嶼\n§6/trigger skyland.home §a從其他玩家的島嶼返回\n§f§l============================§r",
Expand Down Expand Up @@ -112,6 +114,7 @@
"anc.item.seal_slate_water.name": "寒水封印石",
"anc.item.enchant.beheading": "斬首",
"anc.item.enchant.sucking_blood": "吸血",
"anc.item.enchant.soul_binding": "靈魂綁定",
"anc.item.bark.name": "樹皮",
"anc.item.pulp.name": "紙漿",
"anc.item.changeable_pickaxe_silk_touch.name": "應變之鎬(絲觸)",
Expand Down
10 changes: 7 additions & 3 deletions data/anc/advancements/custom_enchantments/sucking_blood.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
"sucking_blood": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"item": {
"nbt": "{ancCustomEnchantments:[{id:\"anc:sucking_blood\",lvl:1b}]}"
"player": {
"equipment": {
"mainhand": {
"nbt": "{ancCustomEnchantments:[{id:\"anc:sucking_blood\",lvl:1b}]}"
}
}
}
}
}
},
"requirements": [["sucking_blood"]],
"rewards":{
"function": "anc:custom_enchantments/sucking_blood"
"function": "anc:custom_enchantments/sucking_blood/sucking_blood"
}
}
4 changes: 4 additions & 0 deletions data/anc/functions/config.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ scoreboard players set $ancAttractingFalling ancConfig 1
scoreboard players set $ancExperienceRepair ancConfig 14
# 是否启用菜鸟模式
scoreboard players set $ancRookieMode ancConfig 1
# 是否启用死亡不掉落
scoreboard players set $ancKeepInventory ancConfig 0
# 是否启用游商提醒音效
scoreboard players set $ancReminderVoice ancConfig 1

# 是否启用空岛模式
scoreboard players set $ancSkylandMode ancConfig 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
execute unless data entity @s Inventory[{Slot:103b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s armor.head with air
execute unless data entity @s Inventory[{Slot:102b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s armor.chest with air
execute unless data entity @s Inventory[{Slot:101b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s armor.legs with air
execute unless data entity @s Inventory[{Slot:100b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s armor.feet with air

execute unless data entity @s Inventory[{Slot:-106b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s weapon.mainhand with air

execute unless data entity @s Inventory[{Slot:0b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.0 with air
execute unless data entity @s Inventory[{Slot:1b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.1 with air
execute unless data entity @s Inventory[{Slot:2b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.2 with air
execute unless data entity @s Inventory[{Slot:3b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.3 with air
execute unless data entity @s Inventory[{Slot:4b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.4 with air
execute unless data entity @s Inventory[{Slot:5b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.5 with air
execute unless data entity @s Inventory[{Slot:6b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.6 with air
execute unless data entity @s Inventory[{Slot:7b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.7 with air
execute unless data entity @s Inventory[{Slot:8b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.8 with air
execute unless data entity @s Inventory[{Slot:9b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.9 with air
execute unless data entity @s Inventory[{Slot:10b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.10 with air
execute unless data entity @s Inventory[{Slot:11b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.11 with air
execute unless data entity @s Inventory[{Slot:12b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.12 with air
execute unless data entity @s Inventory[{Slot:13b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.13 with air
execute unless data entity @s Inventory[{Slot:14b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.14 with air
execute unless data entity @s Inventory[{Slot:15b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.15 with air
execute unless data entity @s Inventory[{Slot:16b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.16 with air
execute unless data entity @s Inventory[{Slot:17b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.17 with air
execute unless data entity @s Inventory[{Slot:18b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.18 with air
execute unless data entity @s Inventory[{Slot:19b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.19 with air
execute unless data entity @s Inventory[{Slot:20b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.20 with air
execute unless data entity @s Inventory[{Slot:21b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.21 with air
execute unless data entity @s Inventory[{Slot:22b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.22 with air
execute unless data entity @s Inventory[{Slot:23b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.23 with air
execute unless data entity @s Inventory[{Slot:24b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.24 with air
execute unless data entity @s Inventory[{Slot:25b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.25 with air
execute unless data entity @s Inventory[{Slot:26b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.26 with air
execute unless data entity @s Inventory[{Slot:27b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.27 with air
execute unless data entity @s Inventory[{Slot:28b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.28 with air
execute unless data entity @s Inventory[{Slot:29b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.29 with air
execute unless data entity @s Inventory[{Slot:30b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.30 with air
execute unless data entity @s Inventory[{Slot:31b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.31 with air
execute unless data entity @s Inventory[{Slot:32b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.32 with air
execute unless data entity @s Inventory[{Slot:33b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.33 with air
execute unless data entity @s Inventory[{Slot:34b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.34 with air
execute unless data entity @s Inventory[{Slot:35b}].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace entity @s container.35 with air
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
execute store result score #inoverworld ancValue if predicate anc:inoverworld

data remove storage anc:temp ItemsTemp
data modify storage anc:temp ItemsTemp set from entity @s Inventory
function anc:custom_enchantments/soul_binding/clear

execute if score #inoverworld ancValue matches 1 run setblock ~ 319 ~ shulker_box
execute unless score #inoverworld ancValue matches 1 run setblock ~ 255 ~ shulker_box

execute if score #inoverworld ancValue matches 1 run function anc:custom_enchantments/soul_binding/drop/319
execute unless score #inoverworld ancValue matches 1 run function anc:custom_enchantments/soul_binding/drop/255

execute if score #inoverworld ancValue matches 1 run setblock ~ 319 ~ air
execute unless score #inoverworld ancValue matches 1 run setblock ~ 255 ~ air
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
data remove storage anc:temp ItemsTemp[0].Slot
loot replace block ~ 255 ~ container.0 loot anc:gui/empty
data modify block ~ 255 ~ Items[0] set from storage anc:temp ItemsTemp[0]
execute unless data block ~ 255 ~ Items[0].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run loot spawn ~ ~ ~ mine ~ 255 ~ tnt{drop_content:1b}
execute if data block ~ 255 ~ Items[0].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace block ~ 255 ~ container.0 with air
data remove storage anc:temp ItemsTemp[0]
execute store result score $soulBinding ancValue run data get storage anc:temp ItemsTemp
execute if score $soulBinding ancValue matches 1.. run function anc:custom_enchantments/soul_binding/drop/255
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
data remove storage anc:temp ItemsTemp[0].Slot
loot replace block ~ 319 ~ container.0 loot anc:gui/empty
data modify block ~ 319 ~ Items[0] set from storage anc:temp ItemsTemp[0]
execute unless data block ~ 319 ~ Items[0].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run loot spawn ~ ~ ~ mine ~ 319 ~ tnt{drop_content:1b}
execute if data block ~ 319 ~ Items[0].tag.ancCustomEnchantments[{id:"anc:soul_binding"}] run item replace block ~ 319 ~ container.0 with air
data remove storage anc:temp ItemsTemp[0]
execute store result score $soulBinding ancValue run data get storage anc:temp ItemsTemp
execute if score $soulBinding ancValue matches 1.. run function anc:custom_enchantments/soul_binding/drop/319
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execute if score $ancKeepInventory ancConfig matches 0 as @s at @s run function anc:custom_enchantments/soul_binding/drop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
effect give @s instant_health 1 0 true
effect give @s instant_health 1 1 true
advancement revoke @s only anc:custom_enchantments/sucking_blood
2 changes: 2 additions & 0 deletions data/anc/functions/handle/death.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
function #anc:death
scoreboard players reset @s ancPlayerDeath
2 changes: 1 addition & 1 deletion data/anc/functions/handle/join.mcfunction
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tellraw @s {"translate": "Please install the correct resource pack","with":[{"text": "0.6.4","color": "gold","bold": true}]}
tellraw @s {"translate": "Please install the correct resource pack","with":[{"text": "0.6.5","color": "gold","bold": true}]}
2 changes: 1 addition & 1 deletion data/anc/functions/handle/wandering_trader.mcfunction
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tellraw @a {"translate":"anc.trader.coming","with":[{"nbt":"Pos","entity":"@s","color":"green"}],"color": "gold"}
execute as @a at @s run playsound minecraft:trader.coming player @s
execute if score $ancReminderVoice ancConfig matches 1 as @a at @s run playsound minecraft:trader.coming player @s
tag @s add ancWanderingTrader
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set $ancKeepInventory ancConfig 0
function anc:items/command_book/reload
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set $ancKeepInventory ancConfig 1
function anc:items/command_book/reload
Loading

0 comments on commit 502f669

Please sign in to comment.