杂项修改

data/item/functions/tick2.mcfunction

@@ -6,7 +6,7 @@ execute if score $survival mem matches 1.. unless score $state mem matches 5 as
 execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function item:bonus_item/call
 
 # 检测玩家格子锁定
-execute if score $state mem matches 1.. as @a[team=!debugging] run function item:disable_slot/check_slot
+execute if score $state mem matches 1.. unless score $survival mem matches 1 as @a[team=!debugging] run function item:disable_slot/check_slot
 execute if score $state mem matches 0 as @a run function ltw:state/0/state/check_slot
 execute if score $state mem matches 0.. run kill @e[type=item,tag=LockTempItem]
 

data/item/loot_tables/gold1.json

@@ -7,7 +7,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{is_bonus:1b,bonus_new:1b,\"bonus_gold\":1}"
+            "tag": "{is_bonus:1b,bonus_new:1b,bonus_gold:1}"
         }
     ]
 }

data/item/loot_tables/item/blue.json

@@ -2,8 +2,19 @@
 
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:iron_ingot",
+        "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",
         "functions": [
             {
                 "function": "minecraft:set_count",
@@ -11,97 +22,134 @@
             },
             {
                 "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}"
+                "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\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:chainmail_leggings",
+        "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}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 15,
+        "name": "minecraft:fishing_rod",
+        "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": 7,
+        "name": "minecraft:netherite_chestplate",
+        "functions": [
+            {
+                "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}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "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": 5,
+        "name": "minecraft:netherite_ingot",
+        "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}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:shulker_box",
+        "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\"}'}}}]}"
             }
         ]
     },
-{
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:totem_of_undying",
+        "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\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "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:iron_pickaxe",
+        "weight": 10,
+        "name": "minecraft:golden_apple",
         "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\":\"生命果 + 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": 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/score/blue.json

@@ -41,7 +41,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"4 积分 + 4 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:4,\"bonus_gold\":4}"
+            "tag": "{item_name:'{\"text\":\"4 积分 + 4 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:4,bonus_gold:4}"
         }
     ]
 },
@@ -56,7 +56,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"12 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,\"bonus_gold\":12}"
+            "tag": "{item_name:'{\"text\":\"12 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_gold:12}"
         }
     ]
 },

data/item/loot_tables/score/green.json

@@ -41,7 +41,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"2 积分 + 2 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:2,\"bonus_gold\":2}"
+            "tag": "{item_name:'{\"text\":\"2 积分 + 2 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:2,bonus_gold:2}"
         }
     ]
 },
@@ -56,7 +56,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"4 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,\"bonus_gold\":4}"
+            "tag": "{item_name:'{\"text\":\"4 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_gold:4}"
         }
     ]
 },
@@ -71,7 +71,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"6 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,\"bonus_gold\":6}"
+            "tag": "{item_name:'{\"text\":\"6 金粒\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_gold:6}"
         }
     ]
 },

data/item/loot_tables/score/purple.json

@@ -41,7 +41,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"5 积分 + 5 金粒\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:5,\"bonus_gold\":5}"
+            "tag": "{item_name:'{\"text\":\"5 积分 + 5 金粒\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:5,bonus_gold:5}"
         }
     ]
 },

data/item/loot_tables/score/white.json

@@ -22,7 +22,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"2 金粒\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,\"bonus_gold\":2}"
+            "tag": "{item_name:'{\"text\":\"2 金粒\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_gold:2}"
         }
     ]
 },

data/item/tags/items/bonus.json

@@ -1,55 +1,59 @@
 {
     "values": [
-        "minecraft:gold_nugget",
-        "minecraft:ender_eye",
-        "minecraft:paper",
-        "minecraft:golden_leggings",
-        "minecraft:target",
-        "minecraft:emerald",
-        "minecraft:ender_pearl",
-        "minecraft:enchanted_golden_apple",
-        "minecraft:totem_of_undying",
-        "minecraft:golden_apple",
-        "minecraft:iron_sword",
-        "minecraft:nether_star",
-        "minecraft:stick",
-        "minecraft:netherite_ingot",
-        "minecraft:coal",
-        "minecraft:chest",
-        "minecraft:lava_bucket",
-        "minecraft:blast_furnace",
-        "minecraft:ender_pearl",
-        "minecraft:magenta_glazed_terracotta",
-        "minecraft:map",
-        "minecraft:diamond",
-        "minecraft:diamond_sword",
-        "minecraft:prismarine_crystals",
-        "minecraft:shulker_shell",
-        "minecraft:blaze_powder",
-        "minecraft:cobblestone",
-        "minecraft:raw_iron",
-        "minecraft:iron_ingot",
-        "minecraft:elytra",
-        "minecraft:oak_log",
-        "minecraft:furnace",
-        "minecraft:firework_rocket",
-        "minecraft:wooden_axe",
-        "minecraft:stone_axe",
-        "minecraft:iron_axe",
-        "minecraft:iron_pickaxe",
-        "minecraft:fishing_rod",
-        "minecraft:shield",
-        "minecraft:potion",
-        "minecraft:splash_potion",
-        "minecraft:lingering_potion",
-        "minecraft:crossbow",
-        "minecraft:bow",
-        "minecraft:stone_pickaxe",
-        "minecraft:arrow",
-        "minecraft:diamond_helmet",
-        "minecraft:netherite_helmet",
-        "minecraft:netherite_chestplate",
-        "minecraft:netherite_leggings",
-        "minecraft:netherite_boots"
+        "gold_nugget",
+        "ender_eye",
+        "paper",
+        "golden_leggings",
+        "diamond_pickaxe",
+        "iron_axe",
+        "chainmail_leggings",
+        "target",
+        "shulker_box",
+        "emerald",
+        "ender_pearl",
+        "enchanted_golden_apple",
+        "totem_of_undying",
+        "golden_apple",
+        "iron_sword",
+        "nether_star",
+        "stick",
+        "netherite_ingot",
+        "coal",
+        "chest",
+        "lava_bucket",
+        "blast_furnace",
+        "ender_pearl",
+        "magenta_glazed_terracotta",
+        "map",
+        "diamond",
+        "diamond_sword",
+        "prismarine_crystals",
+        "shulker_shell",
+        "blaze_powder",
+        "cobblestone",
+        "raw_iron",
+        "iron_ingot",
+        "elytra",
+        "oak_log",
+        "furnace",
+        "firework_rocket",
+        "wooden_axe",
+        "stone_axe",
+        "iron_axe",
+        "iron_pickaxe",
+        "fishing_rod",
+        "shield",
+        "potion",
+        "splash_potion",
+        "lingering_potion",
+        "crossbow",
+        "bow",
+        "stone_pickaxe",
+        "arrow",
+        "diamond_helmet",
+        "netherite_helmet",
+        "netherite_chestplate",
+        "netherite_leggings",
+        "netherite_boots"
     ]
 }

data/ltw/advancements/parkour/treasure4.json

@@ -9,7 +9,7 @@
         "text": "争分夺秒 · Ω "
       },
       "description": [
-        {"text": "【遗迹寻宝】在 33 秒内到达终点\n", "color":"gray"},
+        {"text": "【遗迹寻宝】在 30 秒内到达终点\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/minecraft/recipes/baked_potato.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:baked_potato",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/black_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:black_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/blue_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:blue_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/brick.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:brick",
   "experience": 0.3,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/brown_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:brown_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/charcoal.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:charcoal",
   "experience": 0.15,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/coal_from_smelting_coal_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:coal",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/coal_from_smelting_deepslate_coal_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:coal",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_beef.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_beef",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_chicken.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_chicken",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_cod.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_cod",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_mutton.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_mutton",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_porkchop.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_porkchop",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_rabbit.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_rabbit",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cooked_salmon.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_salmon",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/copper_ingot_from_smelting_copper_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/copper_ingot_from_smelting_deepslate_copper_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/copper_ingot_from_smelting_raw_copper.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cracked_deepslate_bricks.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cracked_deepslate_bricks",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cracked_deepslate_tiles.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cracked_deepslate_tiles",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cracked_nether_bricks.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cracked_nether_bricks",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cracked_polished_blackstone_bricks.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cracked_polished_blackstone_bricks",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cracked_stone_bricks.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cracked_stone_bricks",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/cyan_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cyan_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/deepslate.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:deepslate",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/diamond_from_smelting_deepslate_diamond_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:diamond",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/diamond_from_smelting_diamond_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:diamond",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/dried_kelp_from_smelting.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:dried_kelp",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/emerald_from_smelting_deepslate_emerald_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:emerald",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/emerald_from_smelting_emerald_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:emerald",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/glass.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:glass",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gold_ingot_from_smelting_deepslate_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gold_ingot_from_smelting_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gold_ingot_from_smelting_nether_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gold_ingot_from_smelting_raw_gold.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gold_nugget_from_smelting.json

@@ -34,5 +34,5 @@
   ],
   "result": "minecraft:gold_nugget",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/gray_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:gray_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/green_dye.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:green_dye",
   "experience": 1.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/green_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:green_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/iron_ingot_from_smelting_deepslate_iron_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/iron_ingot_from_smelting_iron_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/iron_ingot_from_smelting_raw_iron.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/iron_nugget_from_smelting.json

@@ -46,5 +46,5 @@
   ],
   "result": "minecraft:iron_nugget",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/lapis_lazuli_from_smelting_deepslate_lapis_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:lapis_lazuli",
   "experience": 0.2,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/lapis_lazuli_from_smelting_lapis_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:lapis_lazuli",
   "experience": 0.2,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/light_blue_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:light_blue_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/light_gray_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:light_gray_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/lime_dye_from_smelting.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:lime_dye",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/lime_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:lime_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/magenta_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:magenta_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/nether_brick.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:nether_brick",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/netherite_scrap.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:netherite_scrap",
   "experience": 2.0,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/orange_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:orange_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/pink_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:pink_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/popped_chorus_fruit.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:popped_chorus_fruit",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/purple_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:purple_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/quartz.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:quartz",
   "experience": 0.2,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/red_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:red_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/redstone_from_smelting_deepslate_redstone_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:redstone",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/redstone_from_smelting_redstone_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:redstone",
   "experience": 0.7,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/smooth_basalt.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:smooth_basalt",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/smooth_quartz.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:smooth_quartz",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/smooth_red_sandstone.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:smooth_red_sandstone",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/smooth_sandstone.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:smooth_sandstone",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/smooth_stone.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:smooth_stone",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/sponge.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:sponge",
   "experience": 0.15,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/stone.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:stone",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:terracotta",
   "experience": 0.35,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/white_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:white_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/minecraft/recipes/yellow_glazed_terracotta.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:yellow_glazed_terracotta",
   "experience": 0.1,
-  "cookingtime": 80
+  "cookingtime": 50
 }

data/mini/functions/iron/game/respawn.mcfunction

@@ -8,3 +8,6 @@ effect give @s resistance 5 10 true
 # 传送玩家
 tp @s[team=playing] 1016 280 5016
 tp @s[team=watching] 1016 255 5016
+
+# 清理锁定物品
+clear @s crimson_button{LockItem:1b}

data/mini/functions/parkour/player_finished.mcfunction

@@ -10,7 +10,7 @@ scoreboard players operation #temp mem -= $countdown mem
 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 score #temp mem matches 1..30 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,team=!debugging] at @s unless entity @a[team=playing,distance=..2] run spectate @r[team=playing]
+execute as @a[gamemode=spectator,team=!debugging] at @s unless entity @a[team=playing,distance=..2] run spectate @p[team=playing]