龙腾猫跃 3 лет назад
Родитель
Сommit
ad2e6a0698

+ 26 - 59
data/item/loot_tables/item/blue.json

@@ -1,61 +1,28 @@
 {"pools": [{"rolls": 1,"entries": [
 
-    {
-        "type": "minecraft:item",
-        "weight": 15,
-        "name": "minecraft:potion",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:10751624,item_name:'{\"text\":\"隐身药水 (0:30) x4\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:10751624,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:10751624,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:10751624,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:10751624,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
-            }
-        ]
-    },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:diamond",
+        "name": "minecraft:totem_of_undying",
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 5
+                "count": 3
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"钻石 x5\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:diamond_pickaxe",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<效率 II> 钻石镐\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"efficiency\",\"lvl\":2}],display:{Name:'{\"text\":\"<效率 II> 钻石镐\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 15,
-        "name": "minecraft:iron_axe",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<击退 II> 铁斧\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":2}],display:{Name:'{\"text\":\"<击退 II> 铁斧\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{item_name:'{\"text\":\"不死图腾 x3\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:chainmail_leggings",
+        "name": "minecraft:shield",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"<速度 +30%> 锁链护腿\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<速度 +30%> 锁链护腿\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,37,0,1],Amount:0.3,AttributeName:\"generic.movement_speed\",Name:\"spd\",Slot:\"legs\",Operation:1},{UUID:[I;23,37,0,2],Amount:4,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0}]}"
+                "tag": "{item_name:'{\"text\":\"盾牌\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"盾牌\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },
@@ -72,82 +39,82 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 7,
-        "name": "minecraft:netherite_chestplate",
+        "weight": 10,
+        "name": "minecraft:diamond",
         "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 5
+            },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,38,0,2],Amount:8,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,3],Amount:8,AttributeName:\"generic.armor_toughness\",Name:\"armor1\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,1],Amount:10,AttributeName:\"generic.knockback_resistance\",Name:\"kn\",Slot:\"legs\",Operation:0}]}"
+                "tag": "{item_name:'{\"text\":\"钻石 x5\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:shield",
+        "name": "minecraft:diamond_pickaxe",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"盾牌\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"盾牌\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{item_name:'{\"text\":\"<效率 I> 钻石镐\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"efficiency\",\"lvl\":1}],display:{Name:'{\"text\":\"<效率 I> 钻石镐\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
-        "name": "minecraft:netherite_ingot",
+        "weight": 10,
+        "name": "minecraft:enchanted_golden_apple",
         "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 4
-            },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"全身下界合金甲\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:netherite_helmet\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_chestplate\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_leggings\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_boots\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
+                "tag": "{item_name:'{\"text\":\"附魔生命果\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:shulker_box",
+        "name": "minecraft:golden_apple",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"铁镐, 铁斧, 铁锹\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_pickaxe\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"铁镐\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:iron_axe\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"铁斧\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:iron_shovel\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"铁锹\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{item_name:'{\"text\":\"生命果 + 9 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'},bonus_gold:9}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:totem_of_undying",
+        "weight": 15,
+        "name": "minecraft:potion",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"不死图腾 x3\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30) x4\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:enchanted_golden_apple",
+        "name": "minecraft:chainmail_leggings",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"附魔生命果\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{display:{Name:'{\"text\":\"<速度 +30%> 锁链护腿\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<速度 +30%> 锁链护腿\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,37,0,1],Amount:0.3,AttributeName:\"generic.movement_speed\",Name:\"spd\",Slot:\"legs\",Operation:1},{UUID:[I;23,37,0,2],Amount:4,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:golden_apple",
+        "name": "minecraft:netherite_chestplate",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"生命果 + 9 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'},bonus_gold:9}"
+                "tag": "{display:{Name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,38,0,2],Amount:8,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,3],Amount:8,AttributeName:\"generic.armor_toughness\",Name:\"armor1\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,1],Amount:100,AttributeName:\"generic.knockback_resistance\",Name:\"kn\",Slot:\"legs\",Operation:0}]}"
             }
         ]
     }

BIN
data/item/loot_tables/item/document.xlsx


+ 205 - 135
data/item/loot_tables/item/green.json

@@ -1,144 +1,214 @@
 {"pools": [{"rolls": 1,"entries": [
 
-{
+    {
         "type": "minecraft:item",
-        "weight":6,
+        "weight": 15,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 5,
+        "name": "minecraft:shield",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"破损的盾牌\",\"color\":\"aqua\"}',Damage:317,is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"破损的盾牌\",\"italic\":false,\"color\":\"aqua\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
         "name": "minecraft:fishing_rod",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<海之眷顾 II> 钓鱼竿\",\"color\":\"aqua\"}',\"Enchantments\":[{id:\"luck_of_the_sea\",\"lvl\":2}],is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"钓鱼竿\",\"italic\":false,\"color\":\"aqua\"}'}}"
-            }
-        ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:iron_axe",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"铁斧\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁斧\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:totem_of_undying",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"不死图腾\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:golden_apple",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"生命果\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:crossbow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<快速装填 III> 弩, 箭 x10\",\"color\":\"aqua\"}',\"Enchantments\":[{id:\"quick_charge\",\"lvl\":3}],is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:10,tag:{is_bonus:1b,bonus_clear_nbt:1b}}],display:{Name:'{\"text\":\"<快速装填 III> 弩\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:blast_furnace",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"高炉, 煤炭 x5\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b,bonus_give_items:[{id:\"minecraft:coal\",Count:5,tag:{is_bonus:1b,bonus_clear_nbt:1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:cobblestone",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 20
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"圆石 x20\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:raw_iron",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"粗铁 x5\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"急迫 VI (饮用, 3:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:3,Amplifier:5,Duration:3600}],CustomPotionColor:16578599,display:{Name:'{\"text\":\"速掘药水\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"力量 II (饮用, 1:30)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:5,Amplifier:1,Duration:1800}],CustomPotionColor:9836568,display:{Name:'{\"text\":\"力量药水\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金胸甲\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金护腿\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-}
+                "tag": "{item_name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"color\":\"aqua\"}',Damage:60,is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"lure\",lvl:3}],display:{Name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"italic\":false,\"color\":\"aqua\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:iron_ingot",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 5
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"铁锭 x5\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:iron_pickaxe",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"铁镐\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁镐\",\"italic\":false,\"color\":\"aqua\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:totem_of_undying",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 2
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"不死图腾 x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:crossbow",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"<快速装填 IV> 弩\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"<快速装填 IV> 弩, 箭 x5\",\"color\":\"aqua\"}',Enchantments:[{id:\"quick_charge\",lvl:4}],is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:5,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 5,
+        "name": "minecraft:shield",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"<速度 -60%> 盾牌\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"<速度 -60%> 盾牌\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,HideFlags:32767,AttributeModifiers:[{UUID:[I;19,31,0,1],Amount:-0.6,AttributeName:\"generic.movement_speed\",Name:\"spd\",Operation:1}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:elytra",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"鞘翅, 烟花火箭 x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:2,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:raw_gold_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"金镐、金锹、金斧、金剑\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:golden_pickaxe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:golden_axe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:golden_sword\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:golden_shovel\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30) x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:leather_chestplate",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<荆棘 XIV> 皮革外套\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"thorns\",lvl:14}],display:{Name:'{\"text\":\"<荆棘 XIV> 皮革外套\",\"italic\":false,\"color\":\"aqua\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:stick",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<击退 I> 木棍\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"knockback\",lvl:1}],display:{Name:'{\"text\":\"<击退 I> 木棍\",\"italic\":false,\"color\":\"aqua\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:netherite_boots",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"<免疫击退> 下界合金靴子\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"<免疫击退> 下界合金靴子\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;19,35,0,2],Amount:3,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"feet\",Operation:0},{UUID:[I;19,35,0,3],Amount:3,AttributeName:\"generic.armor_toughness\",Name:\"armor1\",Slot:\"feet\",Operation:0},{UUID:[I;19,35,0,1],Amount:100,AttributeName:\"generic.knockback_resistance\",Name:\"kn\",Slot:\"feet\",Operation:0}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 5,
+        "name": "minecraft:diamond_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<绑定诅咒> 全身钻石甲\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:diamond_helmet\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 钻石头盔\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:diamond_chestplate\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 钻石胸甲\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:diamond_leggings\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 钻石护腿\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:diamond_boots\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 钻石靴子\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:golden_apple",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 2
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"生命果 x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 5,
+        "name": "minecraft:netherite_ingot",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"下界合金头盔、护腿\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:netherite_helmet\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_leggings\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:turtle_helmet",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"<速度 +20%> 海龟壳\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"<速度 +20%> 海龟壳\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;19,42,0,1],Amount:0.2,AttributeName:\"generic.movement_speed\",Name:\"spd\",Slot:\"head\",Operation:1},{UUID:[I;19,42,0,2],Amount:2,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"head\",Operation:0}]}"
+            }
+        ]
+    }
 
 ]}]}

+ 12 - 1
data/item/loot_tables/item/purple.json

@@ -1,5 +1,16 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:diamond_axe",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<击退 II> 钻石斧\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":2}],display:{Name:'{\"text\":\"<击退 II> 钻石斧\",\"italic\":false,\"color\":\"gold\"}'}}"
+            }
+        ]
+    },
     {
         "type": "minecraft:item",
         "weight": 10,
@@ -7,7 +18,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"鞘翅, 烟花火箭 x5\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:5,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+                "tag": "{display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"鞘翅, 烟花火箭 x6\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:6,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
             }
         ]
     },

+ 229 - 159
data/item/loot_tables/item/white.json

@@ -1,163 +1,233 @@
 {"pools": [{"rolls": 1,"entries": [
 
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:fishing_rod",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.04, "max": 0.08}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"破损的钓鱼竿\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"钓鱼竿\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:stone_pickaxe",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"石镐\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"石镐\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:stick",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<击退 I> 木棍\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":1}],display:{Name:'{\"text\":\"<击退 I> 木棍\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:wooden_axe",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.05, "max": 0.08}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<击退 II> 破损的木斧\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":2}],display:{Name:'{\"text\":\"<击退 II> 木斧\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:shield",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.05, "max": 0.09}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"破损的盾牌\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"盾牌\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"神龟 (喷溅, 0:20)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Potion\":\"turtle_master\",display:{Name:'{\"text\":\"喷溅型神龟药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"飘浮 (喷溅, 0:10)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:25,Amplifier:0,Duration:200}],CustomPotionColor:11458519,display:{Name:'{\"text\":\"喷溅型浮空药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:lingering_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"失明 (滞留, 0:15)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:15,Amplifier:0,Duration:300}],CustomPotionColor:1644828,display:{Name:'{\"text\":\"滞留型致盲药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"隐身 (饮用, 1:00)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:1200}],CustomPotionColor:8553121,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:diamond_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"钻石头盔\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_boots",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金靴子\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:oak_log",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"橡木原木 x5\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:furnace",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"熔炉\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-}
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:stripped_spruce_log",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"木镐、木锹、木斧、木剑\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:wooden_pickaxe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:wooden_axe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:wooden_sword\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:wooden_shovel\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 6,
+        "name": "minecraft:tipped_arrow",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 3
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"失明之箭 (0:06) x3\",\"color\":\"white\"}',is_bonus:1b,CustomPotionEffects:[{Amplifier:0,Duration:120,Id:15}],HideFlags:32767,CustomPotionColor:10887087,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"失明之箭 (0:06)\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 6,
+        "name": "minecraft:tipped_arrow",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 4
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"超速之箭 (0:06) x4\",\"color\":\"white\"}',is_bonus:1b,CustomPotionEffects:[{Id:1,Amplifier:127,Duration:120}],HideFlags:32767,CustomPotionColor:1682142,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"超速之箭 (0:06)\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:16759841,item_name:'{\"text\":\"急迫 VI 药水 (5:00)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:3,Amplifier:5,Duration:6000}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"急迫 VI 药水 (5:00)\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:crossbow",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"弩\",\"italic\":false,\"color\":\"white\"}'},item_name:'{\"text\":\"弩, 箭 x4\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:4,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:lingering_potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:12754293,item_name:'{\"text\":\"滞留型神龟药水 (0:05) x3\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:16720161,item_name:'{\"text\":\"力量药水 (5:00)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:5,Amplifier:0,Duration:6000}],CustomPotionColor:16720161,display:{Name:'{\"text\":\"力量药水 (5:00)\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:crossbow",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"<多重射击,快速装填 IV> 弩\",\"italic\":false,\"color\":\"white\"}'},item_name:'{\"text\":\"<多重射击,快速装填 IV> 烟花弩\",\"color\":\"white\"}',Enchantments:[{id:\"quick_charge\",lvl:4},{id:\"multishot\",lvl:1}],is_bonus:1b,bonus_new:1b,bonus_return:1b,Charged:1b,ChargedProjectiles:[{id:\"firework_rocket\",Count:1,tag:{Fireworks:{Flight:3,Explosions:[{Colors:[I;16756224],Flicker:1b,Trail:0b,Type:0b}]}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:blast_furnace",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 2
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"高炉 x2、煤炭块 x2\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:blast_furnace\",Count:2,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:coal_block\",Count:2,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:cobblestone",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 32
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"圆石 x32\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 6,
+        "name": "minecraft:tipped_arrow",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 5
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"悬浮之箭 (0:06) x5\",\"color\":\"white\"}',is_bonus:1b,CustomPotionEffects:[{Id:25,Amplifier:0,Duration:120}],HideFlags:32767,CustomPotionColor:11858168,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"悬浮之箭 (0:06)\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:totem_of_undying",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"不死图腾\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:stone_pickaxe",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<效率 II> 破损的石镐\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"efficiency\",lvl:2}],display:{Name:'{\"text\":\"<效率 II> 破损的石镐\",\"italic\":false,\"color\":\"white\"}'},Damage:70}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 7,
+        "name": "minecraft:golden_pickaxe",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<效率 V> 金镐\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"efficiency\",lvl:5}],display:{Name:'{\"text\":\"<效率 V> 金镐\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:diamond_leggings",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"钻石护腿\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:golden_apple",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"生命果\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:raw_gold_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"破损的全身金甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:golden_helmet\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:72}},{id:\"minecraft:golden_chestplate\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:104}},{id:\"minecraft:golden_leggings\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:98}},{id:\"minecraft:golden_boots\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:85}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:raw_iron_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"铁头盔、胸甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_helmet\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:iron_chestplate\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    }
 
 ]}]}

+ 0 - 15
data/item/loot_tables/item_new/blue.json

@@ -1,15 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:potion",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:10751624,item_name:'{\"text\":\"隐身药水 (0:30) x4\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:10751624,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
-            }
-        ]
-    }
-
-    ]}]}

+ 0 - 4
data/item/loot_tables/item_new/green.json

@@ -1,4 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-
-]}]}

+ 0 - 63
data/item/loot_tables/item_new/purple.json

@@ -1,63 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:elytra",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"鞘翅, 烟花火箭 x5\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:5,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:golden_leggings",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"<速度 +50%> 金护腿\",\"italic\":false,\"color\":\"gold\"}'},item_name:'{\"text\":\"<速度 +50%> 金护腿\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;21,51,0,1],Amount:0.5,AttributeName:\"generic.movement_speed\",Name:\"spd\",Slot:\"legs\",Operation:1},{UUID:[I;21,51,0,2],Amount:3,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0}]}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:chest",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"地牢箱子\",\"italic\":false,\"color\":\"gold\"}'},item_name:'{\"text\":\"地牢箱子\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,BlockEntityTag:{LootTable:\"mini:diamond\"}}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:enchanted_golden_apple",
-        "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 2
-            },
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"附魔生命果 x2\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:potion",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00) x4\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
-            }
-        ]
-    }
-
-]}]}

+ 0 - 4
data/item/loot_tables/item_new/white.json

@@ -1,4 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-
-    ]}]}

+ 0 - 107
data/item/loot_tables/item_old/blue.json

@@ -1,107 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-    {
-        "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:iron_ingot",
-        "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 5
-            },
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"铁锭 x5\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-            }
-        ]
-    },
-{
-        "type": "minecraft:item",
-        "weight": 6,
-        "name": "minecraft:iron_pickaxe",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"铁镐\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁镐\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-            }
-        ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:diamond_sword",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<亡灵杀手 V> 钻石剑\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"smite\",\"lvl\":5}],display:{Name:'{\"text\":\"<亡灵杀手 V> 钻石剑\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:iron_sword",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<击退 I> 铁剑\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":1}],display:{Name:'{\"text\":\"<击退 I> 铁剑\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:enchanted_golden_apple",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"附魔生命果\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:shield",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"盾牌\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"盾牌\",\"italic\":false,\"color\":\"light_purple\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:elytra",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"鞘翅, 烟花火箭 x9\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"light_purple\"}'},bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:9,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金胸甲、靴子\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:netherite_boots\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金头盔、护腿\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:netherite_helmet\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
-        }
-    ]
-}
-
-]}]}

+ 0 - 144
data/item/loot_tables/item_old/green.json

@@ -1,144 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-        "type": "minecraft:item",
-        "weight":6,
-        "name": "minecraft:fishing_rod",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<海之眷顾 II> 钓鱼竿\",\"color\":\"aqua\"}',\"Enchantments\":[{id:\"luck_of_the_sea\",\"lvl\":2}],is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"钓鱼竿\",\"italic\":false,\"color\":\"aqua\"}'}}"
-            }
-        ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:iron_axe",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"铁斧\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁斧\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:totem_of_undying",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"不死图腾\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"不死图腾\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:golden_apple",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"生命果\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:crossbow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<快速装填 III> 弩, 箭 x10\",\"color\":\"aqua\"}',\"Enchantments\":[{id:\"quick_charge\",\"lvl\":3}],is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:10,tag:{is_bonus:1b,bonus_clear_nbt:1b}}],display:{Name:'{\"text\":\"<快速装填 III> 弩\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:blast_furnace",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"高炉, 煤炭 x5\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b,bonus_give_items:[{id:\"minecraft:coal\",Count:5,tag:{is_bonus:1b,bonus_clear_nbt:1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:cobblestone",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 20
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"圆石 x20\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:raw_iron",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"粗铁 x5\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"急迫 VI (饮用, 3:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:3,Amplifier:5,Duration:3600}],CustomPotionColor:16578599,display:{Name:'{\"text\":\"速掘药水\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"力量 II (饮用, 1:30)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:5,Amplifier:1,Duration:1800}],CustomPotionColor:9836568,display:{Name:'{\"text\":\"力量药水\",\"italic\":false,\"color\":\"aqua\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金胸甲\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金护腿\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-}
-
-]}]}

+ 0 - 68
data/item/loot_tables/item_old/purple.json

@@ -1,68 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-    {
-        "type": "minecraft:item",
-        "weight": 6,
-        "name": "minecraft:totem_of_undying",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"不死图腾 x3\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:totem_of_undying\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 6,
-        "name": "minecraft:prismarine_crystals",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"铁镐, 铁斧, 铁剑, 铁锹\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_pickaxe\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:iron_axe\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:iron_sword\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:iron_shovel\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
-            }
-        ]
-},
-    {
-        "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:iron_ingot",
-        "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 10
-            },
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"铁锭 x10\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:diamond",
-        "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 5
-            },
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"钻石 x5\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 6,
-        "name": "minecraft:netherite_ingot",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"下界合金全身甲\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:netherite_helmet\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_chestplate\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_leggings\",Count:1,tag:{bonus_return:1b,is_bonus:1b}},{id:\"minecraft:netherite_boots\",Count:1,tag:{bonus_return:1b,is_bonus:1b}}]}"
-            }
-        ]
-    }
-
-
-]}]}

+ 0 - 163
data/item/loot_tables/item_old/white.json

@@ -1,163 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:fishing_rod",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.04, "max": 0.08}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"破损的钓鱼竿\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"钓鱼竿\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:stone_pickaxe",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"石镐\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"石镐\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:stick",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<击退 I> 木棍\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":1}],display:{Name:'{\"text\":\"<击退 I> 木棍\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:wooden_axe",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.05, "max": 0.08}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"<击退 II> 破损的木斧\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Enchantments\":[{id:\"knockback\",\"lvl\":2}],display:{Name:'{\"text\":\"<击退 II> 木斧\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:shield",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.05, "max": 0.09}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"破损的盾牌\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"盾牌\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"神龟 (喷溅, 0:20)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,\"Potion\":\"turtle_master\",display:{Name:'{\"text\":\"喷溅型神龟药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"飘浮 (喷溅, 0:10)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:25,Amplifier:0,Duration:200}],CustomPotionColor:11458519,display:{Name:'{\"text\":\"喷溅型浮空药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:lingering_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"失明 (滞留, 0:15)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:15,Amplifier:0,Duration:300}],CustomPotionColor:1644828,display:{Name:'{\"text\":\"滞留型致盲药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"隐身 (饮用, 1:00)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:1200}],CustomPotionColor:8553121,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:diamond_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"钻石头盔\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_boots",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"下界合金靴子\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:oak_log",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"橡木原木 x5\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:furnace",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"熔炉\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
-        }
-    ]
-}
-
-]}]}

+ 28 - 2
data/item/tags/items/bonus.json

@@ -5,6 +5,11 @@
         "paper",
         "golden_leggings",
         "diamond_pickaxe",
+        "diamond_helmet",
+        "diamond_chestplate",
+        "diamond_leggings",
+        "diamond_boots",
+        "diamond_axe",
         "iron_axe",
         "chainmail_leggings",
         "target",
@@ -14,8 +19,11 @@
         "enchanted_golden_apple",
         "totem_of_undying",
         "golden_apple",
+        "turtle_helmet",
+        "diamond_block",
         "iron_sword",
         "nether_star",
+        "tipped_arrow",
         "stick",
         "netherite_ingot",
         "coal",
@@ -25,6 +33,7 @@
         "ender_pearl",
         "magenta_glazed_terracotta",
         "map",
+        "coal_block",
         "diamond",
         "diamond_sword",
         "prismarine_crystals",
@@ -45,15 +54,32 @@
         "shield",
         "potion",
         "splash_potion",
+        "iron_helmet",
+        "iron_chestplate",
+        "raw_gold_block",
+        "raw_iron_block",
+        "leather_chestplate",
+        "golden_pickaxe",
+        "golden_axe",
+        "golden_sword",
+        "golden_shovel",
         "lingering_potion",
         "crossbow",
         "bow",
         "stone_pickaxe",
         "arrow",
-        "diamond_helmet",
         "netherite_helmet",
         "netherite_chestplate",
         "netherite_leggings",
-        "netherite_boots"
+        "netherite_boots",
+        "golden_helmet",
+        "golden_chestplate",
+        "golden_leggings",
+        "golden_boots",
+        "wooden_pickaxe",
+        "wooden_sword",
+        "wooden_shovel",
+        "tipped_arrow",
+        "stripped_spruce_log"
     ]
 }

+ 2 - 2
data/mini/functions/phantom/tick20.mcfunction

@@ -10,8 +10,8 @@ scoreboard players set #new_item mem 0
 execute if entity @e[tag=bonus_phantom] run scoreboard players set #new_item mem 1
 # 如果没有物品,则计算冷却
 execute if score #new_item mem matches 0 run scoreboard players add $new_item_cd mem 1
-# 已经超过 15s 冷却时间
-execute if score $new_item_cd mem matches ..14 run scoreboard players set #new_item mem 1
+# 已经超过 10s 冷却时间
+execute if score $new_item_cd mem matches ..9 run scoreboard players set #new_item mem 1
 
 # 召唤幻翼
 execute if score $countdown mem matches 11.. run function mini:phantom/game/try_summon