LTCatt преди 6 години
родител
ревизия
bff248d809

+ 3 - 3
data/item/functions/disable_slot/check_slot.mcfunction

@@ -1,10 +1,10 @@
 # 第八格
 execute unless data entity @s Inventory[{Slot:7b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b,LockSlot:7b},Count:1b}] run function item:disable_slot/disable_slot_7
-execute unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b,LockSlot:7b},Count:1b}] if data entity @s Inventory[{tag:{LockItem:1b,LockSlot:7b},Count:1b}] run clear @s red_dye{LockItem:1b,LockSlot:7b}
+execute unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b,LockSlot:7b},Count:1b}] if data entity @s Inventory[{tag:{LockItem:1b,LockSlot:7b},Count:1b}] run clear @s barrier{LockItem:1b,LockSlot:7b}
 
 # 第九格
 execute unless data entity @s Inventory[{Slot:8b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b,LockSlot:8b},Count:1b}] run function item:disable_slot/disable_slot_8
-execute unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b,LockSlot:8b},Count:1b}] if data entity @s Inventory[{tag:{LockItem:1b,LockSlot:8b},Count:1b}] run clear @s red_dye{LockItem:1b,LockSlot:8b}
+execute unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b,LockSlot:8b},Count:1b}] if data entity @s Inventory[{tag:{LockItem:1b,LockSlot:8b},Count:1b}] run clear @s barrier{LockItem:1b,LockSlot:8b}
 
 # 清除临时物品
-clear @a red_dye{LockTempItem:1b}
+clear @a barrier{LockTempItem:1b}

+ 2 - 2
data/item/functions/disable_slot/disable_slot_7.mcfunction

@@ -1,3 +1,3 @@
-clear @s red_dye{LockItem:1b,LockSlot:7b}
+clear @s barrier{LockItem:1b,LockSlot:7b}
 execute if data entity @s Inventory[{Slot:7b}] unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b}}] at @s run function item:return_slot/return_slot_7
-replaceitem entity @s hotbar.7 red_dye{LockItem:1b,LockSlot:7b,display:{Name:'{"text":"已锁定","color":"red","bold":true,"italic":false}'}}
+replaceitem entity @s hotbar.7 barrier{LockItem:1b,LockSlot:7b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}

+ 2 - 2
data/item/functions/disable_slot/disable_slot_8.mcfunction

@@ -1,3 +1,3 @@
-clear @s red_dye{LockItem:1b,LockSlot:8b}
+clear @s barrier{LockItem:1b,LockSlot:8b}
 execute if data entity @s Inventory[{Slot:8b}] unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b}}] at @s run function item:return_slot/return_slot_8
-replaceitem entity @s hotbar.8 red_dye{LockItem:1b,LockSlot:8b,display:{Name:'{"text":"已锁定","color":"red","bold":true,"italic":false}'}}
+replaceitem entity @s hotbar.8 barrier{LockItem:1b,LockSlot:8b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}

+ 1 - 1
data/item/functions/lobby_state/check_slot.mcfunction

@@ -4,4 +4,4 @@ execute unless data entity @s[tag=lobby_watch] Inventory[{Slot:8b,tag:{lobby_ite
 execute unless data entity @s[tag=lobby_ready] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] run function item:lobby_state/join_watch
 
 # 清除临时物品
-clear @s red_dye{LockTempItem:1b}
+clear @s barrier{LockTempItem:1b}

+ 1 - 1
data/item/functions/return_slot/return_slot_7.mcfunction

@@ -1,4 +1,4 @@
-summon item ~ ~ ~ {Item:{id:"red_dye",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem"]}
+summon item ~ ~ ~ {Item:{id:"barrier",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem"]}
 data modify entity @e[type=item,tag=LockTempItem,limit=1] Item set from entity @s Inventory[{Slot:7b}]
 data modify entity @e[type=item,tag=LockTempItem,limit=1] PickupDelay set value 0
 data modify entity @e[type=item,tag=LockTempItem,limit=1] Thrower set from entity @s UUID

+ 1 - 1
data/item/functions/return_slot/return_slot_8.mcfunction

@@ -1,4 +1,4 @@
-summon item ~ ~ ~ {Item:{id:"red_dye",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem"]}
+summon item ~ ~ ~ {Item:{id:"barrier",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem"]}
 data modify entity @e[type=item,tag=LockTempItem,limit=1] Item set from entity @s Inventory[{Slot:8b}]
 data modify entity @e[type=item,tag=LockTempItem,limit=1] PickupDelay set value 0
 data modify entity @e[type=item,tag=LockTempItem,limit=1] Thrower set from entity @s UUID