0.6.3

Gu-ZT · Mar 10, 2022 · 2c7a77f · 2c7a77f
1 parent 3789d04
commit 2c7a77f
Show file tree

Hide file tree

Showing 105 changed files with 4,088 additions and 291 deletions.
diff --git a/Add.xls b/Add.xls
diff --git a/anc_item.json b/anc_item.json
diff --git a/assets/anc/lang/en_us.json b/assets/anc/lang/en_us.json
@@ -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.2§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.3§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",
@@ -103,5 +103,13 @@
     "anc.advancements.viscousbond.title": "Viscous Bond",
     "anc.advancements.viscousbond.description": "Do you want to enable the Viscous Bond?",
     "anc.trader.coming": "Wandering trader coming, at: %s",
-    "anc.trader.coming.sound": "Wandering trader coming"
+    "anc.trader.coming.sound": "Wandering trader coming",
+    "anc.item.space_capsule.name": "Space Capsule",
+    "anc.item.seal_slate_fire.name": "Seal Slate Fire",
+    "anc.item.seal_slate_poison.name": "Seal Slate Poison",
+    "anc.item.seal_slate_shadow.name": "Seal Slate Shadow",
+    "anc.item.seal_slate_soul.name": "Seal Slate Soul",
+    "anc.item.seal_slate_water.name": "Seal Slate Water",
+    "anc.item.enchant.beheading":"Beheading",
+    "anc.item.enchant.sucking_blood":"Sucking Blood"
 }
diff --git a/assets/anc/lang/zh_cn.json b/assets/anc/lang/zh_cn.json
@@ -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.2§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.3§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": "合成器",
@@ -105,5 +105,13 @@
     "anc.advancements.viscousbond.title": "粘滞键",
     "anc.advancements.viscousbond.description": "你想启用粘滞键吗？",
     "anc.trader.coming": "啊哈哈哈，游商来喽，位置在：%s",
-    "anc.trader.coming.sound": "啊哈哈哈，游商来喽"
+    "anc.trader.coming.sound": "啊哈哈哈，游商来喽",
+    "anc.item.space_capsule.name": "空间胶囊",
+    "anc.item.seal_slate_fire.name": "烈焰封印石",
+    "anc.item.seal_slate_poison.name": "剧毒封印石",
+    "anc.item.seal_slate_shadow.name": "暗影封印石",
+    "anc.item.seal_slate_soul.name": "亡魂封印石",
+    "anc.item.seal_slate_water.name": "寒水封印石",
+    "anc.item.enchant.beheading":"斩首",
+    "anc.item.enchant.sucking_blood":"吸血"
 }
diff --git a/assets/anc/lang/zh_hk.json b/assets/anc/lang/zh_hk.json
@@ -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.2§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.3§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": "空協定",
@@ -103,5 +103,13 @@
     "anc.advancements.viscousbond.title": "粘滯鍵",
     "anc.advancements.viscousbond.description": "你想啓用粘滯鍵嗎？",
     "anc.trader.coming": "啊哈哈哈，游商來嘍，位置在：%s",
-    "anc.trader.coming.sound": "啊哈哈哈，游商來嘍"
+    "anc.trader.coming.sound": "啊哈哈哈，游商來嘍",
+    "anc.item.space_capsule.name": "空間膠囊",
+    "anc.item.seal_slate_fire.name": "烈焰封印石",
+    "anc.item.seal_slate_poison.name": "劇毒封印石",
+    "anc.item.seal_slate_shadow.name": "暗影封印石",
+    "anc.item.seal_slate_soul.name": "亡魂封印石",
+    "anc.item.seal_slate_water.name": "寒水封印石",
+    "anc.item.enchant.beheading":"斬首",
+    "anc.item.enchant.sucking_blood":"吸血"
 }
diff --git a/assets/anc/lang/zh_tw.json b/assets/anc/lang/zh_tw.json
@@ -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.2§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.3§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": "空協定",
@@ -103,5 +103,13 @@
     "anc.advancements.viscousbond.title": "粘滯鍵",
     "anc.advancements.viscousbond.description": "你想啓用粘滯鍵嗎？",
     "anc.trader.coming": "啊哈哈哈，游商來嘍，位置在：%s",
-    "anc.trader.coming.sound": "啊哈哈哈，游商來嘍"
+    "anc.trader.coming.sound": "啊哈哈哈，游商來嘍",
+    "anc.item.space_capsule.name": "空間膠囊",
+    "anc.item.seal_slate_fire.name": "烈焰封印石",
+    "anc.item.seal_slate_poison.name": "劇毒封印石",
+    "anc.item.seal_slate_shadow.name": "暗影封印石",
+    "anc.item.seal_slate_soul.name": "亡魂封印石",
+    "anc.item.seal_slate_water.name": "寒水封印石",
+    "anc.item.enchant.beheading":"斬首",
+    "anc.item.enchant.sucking_blood":"吸血"
 }
diff --git a/assets/anc/models/item/seal_slate_fire.json b/assets/anc/models/item/seal_slate_fire.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/seal_slate_fire"
+  }
+}
diff --git a/assets/anc/models/item/seal_slate_poison.json b/assets/anc/models/item/seal_slate_poison.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/seal_slate_poison"
+  }
+}
diff --git a/assets/anc/models/item/seal_slate_shadow.json b/assets/anc/models/item/seal_slate_shadow.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/seal_slate_shadow"
+  }
+}
diff --git a/assets/anc/models/item/seal_slate_soul.json b/assets/anc/models/item/seal_slate_soul.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/seal_slate_soul"
+  }
+}
diff --git a/assets/anc/models/item/seal_slate_water.json b/assets/anc/models/item/seal_slate_water.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/seal_slate_water"
+  }
+}
diff --git a/assets/anc/models/item/space_capsule.json b/assets/anc/models/item/space_capsule.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/space_capsule"
+  }
+}
diff --git a/assets/anc/models/item/space_capsule_empty.json b/assets/anc/models/item/space_capsule_empty.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "anc:item/space_capsule_empty"
+  }
+}
diff --git a/assets/minecraft/models/item/firework_star.json b/assets/minecraft/models/item/firework_star.json
@@ -239,6 +239,48 @@
             },
             "model": "anc:item/sweet_dumpling_raw"
         },
+        {
+            "predicate": {
+                "custom_model_data": 11140059
+            },
+            "model": "anc:item/space_capsule_empty"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140060
+            },
+            "model": "anc:item/space_capsule"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140061
+            },
+            "model": "anc:item/seal_slate_fire"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140062
+            },
+            "model": "anc:item/seal_slate_poison"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140063
+            },
+            "model": "anc:item/seal_slate_shadow"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140064
+            },
+            "model": "anc:item/seal_slate_soul"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 11140065
+            },
+            "model": "anc:item/seal_slate_water"
+        },
         {
             "predicate": {
                 "custom_model_data": 11141000

diff --git a/data/anc/advancements/custom_enchantments/sucking_blood.json b/data/anc/advancements/custom_enchantments/sucking_blood.json
@@ -0,0 +1,16 @@
+{
+    "criteria": {
+        "sucking_blood": {
+            "trigger": "minecraft:player_hurt_entity",
+            "conditions": {
+                "item": {
+                    "nbt": "{ancCustomEnchantments:[{id:\"anc:sucking_blood\",lvl:1b}]}"
+                }
+            }
+        }
+    },
+    "requirements": [["sucking_blood"]],
+    "rewards":{
+        "function": "anc:custom_enchantments/sucking_blood"
+    }
+}
diff --git a/data/anc/functions/custom_enchantments/sucking_blood.mcfunction b/data/anc/functions/custom_enchantments/sucking_blood.mcfunction
@@ -0,0 +1,2 @@
+effect give @s regeneration 1 0 true
+advancement revoke @s only anc:custom_enchantments/sucking_blood
diff --git a/data/anc/functions/handle/join.mcfunction b/data/anc/functions/handle/join.mcfunction
@@ -1 +1 @@
-tellraw @s {"translate": "Please install the correct resource pack","with":[{"text": "0.6.2","color": "gold","bold": true}]}
+tellraw @s {"translate": "Please install the correct resource pack","with":[{"text": "0.6.3","color": "gold","bold": true}]}
diff --git a/data/anc/functions/handle/summon_magma_cube.mcfunction b/data/anc/functions/handle/summon_magma_cube.mcfunction
@@ -1,3 +1,3 @@
 summon magma_cube ~ ~ ~
 data modify entity @e[type=magma_cube,limit=1,sort=nearest] Size set from entity @s Size
-kill @s
+tp @s ~ -500 ~
diff --git a/data/anc/functions/items/seal_slate/color.mcfunction b/data/anc/functions/items/seal_slate/color.mcfunction
@@ -0,0 +1,57 @@
+scoreboard players set $min ancRandom 0
+scoreboard players set $min ancRandom 1000
+function anc:handle/random
+
+scoreboard players add ancLotteryPurpleTimes ancValue 1
+scoreboard players add ancLotteryGoldTimes ancValue 1
+
+# 基础概率
+    execute unless score ancLotteryPurpleTimes ancValue matches 80 unless score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 0..4 run tag @s add ancGlodUp
+    execute unless score ancLotteryPurpleTimes ancValue matches 80 unless score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 5..9 run tag @s add ancGlodNormal
+    execute unless score ancLotteryPurpleTimes ancValue matches 80 unless score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 10..99 run tag @s add ancPurple
+    execute unless score ancLotteryPurpleTimes ancValue matches 80 unless score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 100..1000 run tag @s add ancGreen
+
+
+# 保底机制
+    execute if score ancLotteryPurpleTimes ancValue matches 80 run tag @s add ancPurple
+    execute if score ancLotteryPurpleTimes ancValue matches 80 if score ancLotteryGoldTimes ancValue matches 180 run tag @s remove ancPurple
+    execute if score ancLotteryPurpleTimes ancValue matches 80 if score ancLotteryGoldTimes ancValue matches 180 run scoreboard players reset ancLotteryPurpleTimes ancValue
+    execute if score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 0..500 run tag @s add ancGlodUp
+    execute if score ancLotteryGoldTimes ancValue matches 180 if score $output ancRandom matches 501..1000 run tag @s add ancGlodNormal
+    execute if entity @s[tag=ancPurple] run scoreboard players reset ancLotteryPurpleTimes ancValue
+    execute if entity @s[tag=ancGlodNormal] run scoreboard players reset ancLotteryGoldTimes ancValue
+    execute if entity @s[tag=ancGlodUp] run scoreboard players reset ancLotteryGoldTimes ancValue
+
+# UP机制
+    execute if entity @s[tag=ancGlodNormal] run scoreboard players add ancGoldTimes ancValue 1
+    execute if entity @s[tag=ancGlodNormal] if score ancGoldTimes ancValue matches 2.. run tag @s add ancGlodUp
+    execute if entity @s[tag=ancGlodNormal] if score ancGoldTimes ancValue matches 2.. run tag @s remove ancGlodNormal
+    execute if entity @s[tag=ancGlodUp] run scoreboard players reset ancGoldTimes ancValue
+
+# 颜色
+    execute if entity @s[tag=sealFire] if entity @s[tag=ancGreen] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGreen","ancSeal","sealFire"],Color:5635925,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealFire] if entity @s[tag=ancPurple] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancPurple","ancSeal","sealFire"],Color:11141290,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealFire] if entity @s[tag=ancGlodNormal] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodNormal","ancSeal","sealFire"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealFire] if entity @s[tag=ancGlodUp] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodUp","ancSeal","sealFire"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+
+    execute if entity @s[tag=sealPoison] if entity @s[tag=ancGreen] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGreen","ancSeal","sealPoison"],Color:5635925,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealPoison] if entity @s[tag=ancPurple] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancPurple","ancSeal","sealPoison"],Color:11141290,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealPoison] if entity @s[tag=ancGlodNormal] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodNormal","ancSeal","sealPoison"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealPoison] if entity @s[tag=ancGlodUp] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodUp","ancSeal","sealPoison"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+
+    execute if entity @s[tag=sealShadow] if entity @s[tag=ancGreen] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGreen","ancSeal","sealShadow"],Color:5635925,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealShadow] if entity @s[tag=ancPurple] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancPurple","ancSeal","sealShadow"],Color:11141290,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealShadow] if entity @s[tag=ancGlodNormal] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodNormal","ancSeal","sealShadow"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealShadow] if entity @s[tag=ancGlodUp] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodUp","ancSeal","sealShadow"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+
+    execute if entity @s[tag=sealSoul] if entity @s[tag=ancGreen] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGreen","ancSeal","sealSoul"],Color:5635925,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealSoul] if entity @s[tag=ancPurple] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancPurple","ancSeal","sealSoul"],Color:11141290,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealSoul] if entity @s[tag=ancGlodNormal] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodNormal","ancSeal","sealSoul"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealSoul] if entity @s[tag=ancGlodUp] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodUp","ancSeal","sealSoul"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+
+    execute if entity @s[tag=sealWater] if entity @s[tag=ancGreen] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGreen","ancSeal","sealWater"],Color:5635925,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealWater] if entity @s[tag=ancPurple] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancPurple","ancSeal","sealWater"],Color:11141290,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealWater] if entity @s[tag=ancGlodNormal] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodNormal","ancSeal","sealWater"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    execute if entity @s[tag=sealWater] if entity @s[tag=ancGlodUp] run summon area_effect_cloud ~ ~ ~ {Tags:["ancColorTemp","ancGlodUp","ancSeal","sealWater"],Color:16754177,Duration:2147438647,Particle:"minecraft:dust",Radius:0.01f}
+    scoreboard players operation @e[tag=ancColorTemp,limit=1] ancValue = @s ancValue
+    kill @s
diff --git a/data/anc/functions/items/seal_slate/open.mcfunction b/data/anc/functions/items/seal_slate/open.mcfunction
@@ -0,0 +1,5 @@
+execute if entity @s[tag=ancGreen] run loot spawn ~ ~ ~ loot anc:seal_slate/green
+execute if entity @s[tag=ancPurple] run loot spawn ~ ~ ~ loot anc:seal_slate/purple
+execute if entity @s[tag=ancGlodNormal] run loot spawn ~ ~ ~ loot anc:seal_slate/gold_normal
+execute if entity @s[tag=ancGlodUp] run loot spawn ~ ~ ~ loot anc:seal_slate/gold_up
+kill @s
diff --git a/data/anc/functions/items/seal_slate/seal_aec.mcfunction b/data/anc/functions/items/seal_slate/seal_aec.mcfunction
@@ -0,0 +1,5 @@
+tp @s ~ ~0.1 ~
+scoreboard players add @s ancValue 1
+execute store result entity @s Air int 1 run scoreboard players get @s ancValue
+execute if score @s[tag=!ancColorTemp] ancValue matches 12 run function anc:items/seal_slate/color
+execute if score @s ancValue matches 18.. run function anc:items/seal_slate/open
diff --git a/data/anc/functions/items/seal_slate/tick3.mcfunction b/data/anc/functions/items/seal_slate/tick3.mcfunction
@@ -0,0 +1,2 @@
+execute as @e[type=area_effect_cloud,tag=ancSeal] at @s run function anc:items/seal_slate/seal_aec
+schedule function anc:items/seal_slate/tick3 3t