Fix syntax errors and bugs on 1.21.10

This commit is contained in:
Rares Bozga
2025-12-11 22:40:02 +02:00
parent a77544467d
commit 9cd58c5041
4 changed files with 35 additions and 23 deletions

View File

@@ -120,11 +120,10 @@ phones_gui_home:
- define number <item[player_head]> - define number <item[player_head]>
- adjust def:number "display:<&6>Your Number" - adjust def:number "display:<&6>Your Number"
- adjust def:number lore:<list[<&e><proc[phones_nicer_format].context[<[player].flag[phones].get[number]>]>||<&7>You may also view your number|<&7>using /phonenumber.]> - adjust def:number lore:<list[<&e><proc[phones_nicer_format].context[<[player].flag[phones].get[number]>]>||<&7>You may also view your number|<&7>using /phonenumber.]>
- flag <[number]> phones_target_skull_uuid:<[player].uuid>
- inventory set destination:<[inventory]> slot:41 origin:<[number]> - inventory set destination:<[inventory]> slot:41 origin:<[number]>
- inventory adjust destination:<[inventory]> slot:41 skull_skin:<[player].uuid>|<proc[wardrobe_skin_texture_base64].context[<[player]>]>|<[player].name>
# #
- inventory open player:<[player]> destination:<[inventory]> - inventory open player:<[player]> destination:<[inventory]>
- run phones_target_skulls_update def.player:<[player]>
# --- # ---
# --- contacts related # --- contacts related
@@ -278,8 +277,9 @@ phones_gui_texts:
- adjust def:textsender lore:<[textsender].lore.include[|<&7>You have <&6><[notifications_text]> <&7>unread messages.]> - adjust def:textsender lore:<[textsender].lore.include[|<&7>You have <&6><[notifications_text]> <&7>unread messages.]>
# #
- flag <[textsender]> phones:<[target]> - flag <[textsender]> phones:<[target]>
- flag <[textsender]> phones_target_skull_uuid:<[target].uuid> - define slot <[loop_index].sub[1].div[3].round_down.mul[9].add[4].add[<[loop_index].sub[1].mod[3]>]>
- inventory set destination:<[inventory]> slot:<[loop_index].sub[1].div[3].round_down.mul[9].add[4].add[<[loop_index].sub[1].mod[3]>]> origin:<[textsender]> - inventory set destination:<[inventory]> slot:<[slot]> origin:<[textsender]>
- inventory adjust destination:<[inventory]> slot:<[slot]> skull_skin:<[target].uuid>|<proc[wardrobe_skin_texture_base64].context[<[target]>]>|<[target].name>
# back # back
- define back <item[oak_door]> - define back <item[oak_door]>
- adjust def:back display:<&7>Back - adjust def:back display:<&7>Back
@@ -295,21 +295,6 @@ phones_gui_texts:
- inventory set destination:<[inventory]> slot:51 origin:<[nextpage]> - inventory set destination:<[inventory]> slot:51 origin:<[nextpage]>
# #
- inventory open player:<[player]> destination:<[inventory]> - inventory open player:<[player]> destination:<[inventory]>
- run phones_target_skulls_update def.player:<[player]>
# each skull you want to change has to be flagged with phones_target_skull_uuid:<[target].uuid>
phones_target_skulls_update:
debug: false
type: task
definitions: player
script:
- define inventory <[player].open_inventory>
- foreach <[inventory].map_slots> key:slot as:item:
- if <[item].has_flag[phones_target_skull_uuid]>:
- if <[inventory].viewers.if_null[<list[]>].is_empty>:
- stop
- define uuid <[item].flag[phones_target_skull_uuid]>
- inventory adjust slot:<[slot]> skull_skin:<[uuid]>|<player[<[uuid]>].skin_blob.if_null[0000]>|<player[<[uuid]>].name> destination:<[inventory]>
#### ####
## NOTIFICATIONS ## NOTIFICATIONS
@@ -435,7 +420,7 @@ phones_gui_settings_blocked:
- define blocked <item[player_head]> - define blocked <item[player_head]>
- adjust def:blocked display:<&e><[blockednumber]> - adjust def:blocked display:<&e><[blockednumber]>
- adjust def:blocked lore:<list[<&7>You may use /phoneunblock to unblock this number.]> - adjust def:blocked lore:<list[<&7>You may use /phoneunblock to unblock this number.]>
- flag <[blocked]> phones_target_skull_uuid:<[target].uuid> - adjust def:blocked skull_skin:<[target].uuid>|<proc[wardrobe_skin_texture_base64].context[<[target]>]>|<[target].name>
- inventory set destination:<[inventory]> slot:<[loop_index].sub[1].div[3].round_down.mul[9].add[4].add[<[loop_index].sub[1].mod[3]>]> origin:<[blocked]> - inventory set destination:<[inventory]> slot:<[loop_index].sub[1].div[3].round_down.mul[9].add[4].add[<[loop_index].sub[1].mod[3]>]> origin:<[blocked]>
# back # back
- define back <item[oak_door]> - define back <item[oak_door]>
@@ -452,4 +437,3 @@ phones_gui_settings_blocked:
- inventory set destination:<[inventory]> slot:51 origin:<[nextpage]> - inventory set destination:<[inventory]> slot:51 origin:<[nextpage]>
# #
- inventory open player:<[player]> destination:<[inventory]> - inventory open player:<[player]> destination:<[inventory]>
- run phones_target_skulls_update def.player:<[player]>

View File

@@ -245,7 +245,7 @@ storyboard_npc_internal_auto_display_entities:
debug: false debug: false
type: world type: world
events: events:
on player joins bukkit_priority:high: after player joins bukkit_priority:high:
- foreach <server.online_players.exclude[<player>]> as:target: - foreach <server.online_players.exclude[<player>]> as:target:
- define registry registry_<[target].uuid> - define registry registry_<[target].uuid>
- define npcs <server.npcs[<[registry]>].if_null[<list[]>]> - define npcs <server.npcs[<[registry]>].if_null[<list[]>]>

View File

@@ -58,11 +58,32 @@ vehicles_world:
- adjust <context.entity> passenger:<player> - adjust <context.entity> passenger:<player>
# vehicle control # vehicle control
on player steers armor_stand: on player steers armor_stand:
- if <player.viaversion_protocol> >= 767:
# >=1.21 uses player input event instead
- stop
- if <context.entity.flag[vehicles].if_null[null]> != driver: - if <context.entity.flag[vehicles].if_null[null]> != driver:
- stop - stop
- define vehicle <context.entity.flag[vehicles_data]> - define vehicle <context.entity.flag[vehicles_data]>
- flag <[vehicle]> vehicles_player_input:<map[].with[forward].as[<context.forward>].with[sideways].as[<context.sideways>]> - flag <[vehicle]> vehicles_player_input:<map[].with[forward].as[<context.forward>].with[sideways].as[<context.sideways>]>
# place vehicle down # place vehicle down
on player input:
- if <player.viaversion_protocol> < 767:
# <1.21 uses player steers event instead
- stop
- if <player.vehicle.flag[vehicles].if_null[null]> != driver:
- stop
- define forward_backward 0
- if <context.forward>:
- define forward_backward 1
- if <context.backward>:
- define forward_backward -1
- define left_right 0
- if <context.left>:
- define left_right 1
- if <context.right>:
- define left_right -1
- define vehicle <player.vehicle.flag[vehicles_data]>
- flag <[vehicle]> vehicles_player_input:<map[].with[forward].as[<[forward_backward]>].with[sideways].as[<[left_right]>]>
on player right clicks block: on player right clicks block:
- if <player.item_in_hand.has_flag[vehicles]>: - if <player.item_in_hand.has_flag[vehicles]>:
- determine cancelled passively - determine cancelled passively

View File

@@ -28,6 +28,13 @@ wardrobe_skull_texture_update_single:
## ##
wardrobe_skin_texture_base64:
debug: false
type: procedure
definitions: player
script:
- determine <[player].flag[wardrobe_current].split[;].get[1].if_null[<[player].flag[wardrobe_latest].split[;].get[1].if_null[null]>]>
wardrobe_max_skins: wardrobe_max_skins:
debug: false debug: false
type: procedure type: procedure