fix1....

data/item/loot_tables/item/blue.json

@@ -55,7 +55,7 @@
     "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": "{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\"}'}}"
         }
     ]
 },

data/item/loot_tables/item/green.json

@@ -40,7 +40,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },
@@ -103,7 +103,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },
@@ -114,7 +114,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },

data/item/loot_tables/item/purple.json

@@ -2,67 +2,62 @@
 
     {
         "type": "minecraft:item",
-        "weight": 6,
-        "name": "minecraft:totem_of_undying",
+        "weight": 10,
+        "name": "minecraft:elytra",
         "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}}]}"
+                "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": 6,
-        "name": "minecraft:prismarine_crystals",
+        "weight": 10,
+        "name": "minecraft:golden_leggings",
         "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}}]}"
+                "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": 3,
-        "name": "minecraft:iron_ingot",
+        "weight": 10,
+        "name": "minecraft:chest",
         "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}"
+                "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": 3,
-        "name": "minecraft:diamond",
+        "weight": 10,
+        "name": "minecraft:enchanted_golden_apple",
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 5
+                "count": 2
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"钻石 x5\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
+                "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": 6,
-        "name": "minecraft:netherite_ingot",
+        "weight": 10,
+        "name": "minecraft:potion",
         "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}}]}"
+                "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\"}'}}}]}"
             }
         ]
     }
 
-
 ]}]}

data/item/loot_tables/item/white.json

@@ -85,7 +85,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },
@@ -96,7 +96,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },
@@ -107,7 +107,7 @@
     "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\"}'}}"
+            "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\"}'}}"
         }
     ]
 },

data/item/loot_tables/item_new/blue.json

@@ -1,4 +1,15 @@
 {"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\"}'}}}]}"
+            }
+        ]
+    }
 
     ]}]}

data/item/loot_tables/item_new/purple.json

@@ -44,7 +44,7 @@
             },
             {
                 "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\"}'}}"
+                "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\"}'}}"
             }
         ]
     },
@@ -55,7 +55,7 @@
         "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\"}'}}}]}"
+                "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\"}'}}}]}"
             }
         ]
     }

data/item/loot_tables/item_old/blue.json

@@ -0,0 +1,107 @@
+{"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}}]}"
+        }
+    ]
+}
+
+]}]}

data/item/loot_tables/item_old/green.json

@@ -0,0 +1,144 @@
+{"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}"
+        }
+    ]
+}
+
+]}]}

data/item/loot_tables/item_old/purple.json

@@ -0,0 +1,68 @@
+{"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}}]}"
+            }
+        ]
+    }
+
+
+]}]}

data/item/loot_tables/item_old/white.json

@@ -0,0 +1,163 @@
+{"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}"
+        }
+    ]
+}
+
+]}]}

data/mini/functions/colormatch/game/reach_max_speed.mcfunction

@@ -1,4 +1,4 @@
-advancement grant @a[tag=mini_running] only ltw:parkour/colormatch1
+advancement grant @a[tag=mini_running] only ltw:vs/colormatch1
 tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "色彩迷阵的切换速度已达满速！","color":"gold"}]
 playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
 scoreboard players set #max_speed mem 1

data/mini/functions/main/game_end.mcfunction

@@ -33,8 +33,8 @@ execute if score $mini_type mem matches 2 run advancement grant @a[tag=mini_rank
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/potato1
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=3..}] only ltw:vs/potato2
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
-execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:parkour/colormatch2
-execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,tag=!colormatch_hurt] only ltw:parkour/colormatch3
+execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/colormatch2
+execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,tag=!colormatch_hurt] only ltw:vs/colormatch3
 execute if score $mini_type mem matches 201 if score $countdown mem matches 1.. run advancement grant @a[tag=mini_rank1] only ltw:blood/ass1
 execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=10..}] only ltw:blood/ass2
 execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=20..}] only ltw:blood/ass3

data/mini/functions/parkour/player_finished.mcfunction

@@ -7,10 +7,10 @@ function mini:main/update_player_count
 # 计算时间
 scoreboard players set #temp mem 150
 scoreboard players operation #temp mem -= $countdown mem
-execute if score #temp mem matches 1..100 run advancement grant @s only ltw:vs/treasure1
-execute if score #temp mem matches 1..60 run advancement grant @s only ltw:vs/treasure2
-execute if score #temp mem matches 1..40 run advancement grant @s only ltw:vs/treasure3
-execute if score #temp mem matches 1..33 run advancement grant @s only ltw:vs/treasure4
+execute if score #temp mem matches 1..100 run advancement grant @s only ltw:parkour/treasure1
+execute if score #temp mem matches 1..60 run advancement grant @s only ltw:parkour/treasure2
+execute if score #temp mem matches 1..40 run advancement grant @s only ltw:parkour/treasure3
+execute if score #temp mem matches 1..33 run advancement grant @s only ltw:parkour/treasure4
 
 # 显示提示
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点，用时 ","color":"green"},{"score": {"name": "#temp","objective": "mem"}}," 秒",{"text": "！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]

data/mini/functions/parkour/watcher_limit.mcfunction

@@ -1,2 +1,2 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator] at @s unless entity @a[team=playing,distance=..0.1] run spectate @r[team=playing]
+execute as @a[gamemode=spectator,team=!debugging] at @s unless entity @a[team=playing,distance=..2] run spectate @r[team=playing]