Gui tags

features/gui/shortcuts.lua

@@ -84,7 +84,7 @@ local function add_shortcut_selection_row(player, parent, child)
     type = 'checkbox',
     caption = child.caption,
     state = player_data[child.name],
-    tags = { action = checkbox_action_name, name = child.name },
+    tags = { [Gui.tag] = checkbox_action_name, name = child.name },
   }
   Gui.set_style(checkbox, { minimal_width = 160, horizontally_stretchable = true })
 end
@@ -179,7 +179,7 @@ function Public.get_main_frame(player)
         sprite = s.sprite,
         hovered_sprite = s.hovered_sprite,
         tooltip = s.tooltip,
-        tags = { action = shortcut_action_name, name = button_name },
+        tags = { [Gui.tag] = shortcut_action_name, name = button_name },
       }
       Gui.set_style(button, { font_color = { 165, 165, 165 } })
       if player_data[button_name] == nil then
@@ -224,49 +224,24 @@ Gui.on_click(settings_button_name, function(event)
   Public.toggle_shortcuts_settings(event.player)
 end)
 
-Event.add(defines.events.on_gui_checked_state_changed, function(event)
+Gui.on_checked_state_changed(checkbox_action_name, function(event)
   local element = event.element
-  if not (element and element.valid) then
-    return
-  end
-
-  local player = game.get_player(event.player_index)
-  if not (player and player.valid) then
-    return
-  end
-
-  local action_name = element.tags and element.tags.action
-  if action_name and action_name == checkbox_action_name then
-    local name = element.tags.name
-    local frame = Public.get_main_frame(player)
-    for _, button in pairs(frame.children[1].table_frame.table.children) do
-      if button.tags.name == name then
-        local player_data = get_player_preferences(player)
-        player_data[name] = element.state
-        button.visible = element.state
-      end
+  local player = event.player
+  local name = element.tags.name
+  local frame = Public.get_main_frame(player)
+  for _, button in pairs(frame.children[1].table_frame.table.children) do
+    if button.tags.name == name then
+      local player_data = get_player_preferences(player)
+      player_data[name] = element.state
+      button.visible = element.state
     end
   end
 end)
 
-Event.add(defines.events.on_gui_click, function(event)
-  local element = event.element
-  if not (element and element.valid) then
-    return
-  end
-
-  local player = game.get_player(event.player_index)
-  if not (player and player.valid) then
-    return
-  end
-
-  local action_name = element.tags and element.tags.action
-  if action_name and action_name == shortcut_action_name then
-    local name = element.tags.name
-    local shortcut = shortcut_buttons[name]
-    if shortcut and shortcut.action then
-      shortcut.action(player, event)
-    end
+Gui.on_click(shortcut_action_name, function(event)
+  local shortcut = shortcut_buttons[event.element.tags.name]
+  if shortcut and shortcut.action then
+    shortcut.action(event.player, event)
   end
 end)
 

features/market_chest.lua

@@ -15,8 +15,7 @@ local b_bucket = Buckets.get_bucket
 local register_on_object_destroyed = script.register_on_object_destroyed
 
 local relative_frame_name = Gui.uid_name()
-local offer_tag_name = Gui.uid_name()
-local request_tag_name = Gui.uid_name()
+local button_tag_name = Gui.uid_name()
 local standard_market_name = 'fish_market'
 
 -- What market provides
@@ -222,7 +221,7 @@ Event.add(defines.events.on_gui_opened, function(event)
       sprite = 'item/'..name,
       number = value,
       tooltip = {'market_chest.item_tooltip', value},
-      tags = { name = request_tag_name, item = name, id = entity.unit_number },
+      tags = { [Gui.tag] = button_tag_name, name = 'request', item = name, id = entity.unit_number },
       toggled = data.request and data.request == name,
     }
     Gui.set_data(button, tables)
@@ -239,7 +238,7 @@ Event.add(defines.events.on_gui_opened, function(event)
       sprite = 'item/'..name,
       number = value,
       tooltip = {'market_chest.item_tooltip', value},
-      tags = { name = offer_tag_name, item = name, id = entity.unit_number },
+      tags = { [Gui.tag] = button_tag_name, name = 'offer', item = name, id = entity.unit_number },
       toggled = data.offer and data.offer == name,
     }
     Gui.set_data(button, tables)
@@ -248,17 +247,8 @@ Event.add(defines.events.on_gui_opened, function(event)
   this.relative_gui[event.player_index] = frame
 end)
 
-Event.add(defines.events.on_gui_click, function(event)
+Gui.on_click(button_tag_name, function(event)
   local element = event.element
-  if not (element and element.valid) then
-    return
-  end
-
-  local tag = element.tags and element.tags.name
-  if not tag or not (tag == request_tag_name or tag == offer_tag_name) then
-    return
-  end
-
   local toggled = not element.toggled
   for _, button in pairs(element.parent.children) do
     button.toggled = false
@@ -268,9 +258,9 @@ Event.add(defines.events.on_gui_click, function(event)
   local item_name = element.tags.item
   local data = b_get(this.chests, element.tags.id)
 
-  if tag == request_tag_name then
+  if element.tags.name == 'request' then
     data.request = toggled and item_name or nil
-  elseif tag == offer_tag_name then
+  elseif element.tags.name == 'offer' then
     data.offer = toggled and item_name or nil
   end
 

map_gen/maps/frontier/modules/restart.lua

@@ -2,7 +2,6 @@ local AdminPanel = require 'features.gui.admin_panel.core'
 local Color = require 'resources.color_presets'
 local Core = require 'utils.core'
 local Discord = require 'resources.discord'
-local Event = require 'utils.event'
 local Global = require 'utils.global'
 local Gui = require 'utils.gui'
 local PlayerStats = require 'features.player_stats'
@@ -130,13 +129,13 @@ local function show_values(parent, parent_data, params)
   local current = flow.add {
     type = 'text-box',
     style = 'short_number_textfield',
-    tags = { name = textbox_tag_name },
+    tags = { [Gui.tag] = textbox_tag_name },
     text = current_value,
   }
   local modifier = flow.add {
     type = 'text-box',
     style = 'short_number_textfield',
-    tags = { name = textbox_tag_name },
+    tags = { [Gui.tag] = textbox_tag_name },
     text = modifier_value,
   }
   local predicted = flow.add {
@@ -342,22 +341,10 @@ Gui.on_click(main_button_name, function(event)
   end
 end)
 
-Event.add(defines.events.on_gui_text_changed, function(event)
-  local element = event.element
-  if not (element and element.valid) then
-    return
-  end
-
-  local tag = element.tags and element.tags.name
-  if not tag then
-    return
-  end
-
-  if tag == textbox_tag_name then
-    local data = Gui.get_data(element)
-    local current, modifier = data.current, data.modifier
-    data.predicted.text = tostring(safe_add(current.text, modifier.text))
-  end
+Gui.on_text_changed(textbox_tag_name, function(event)
+  local data = Gui.get_data(event.element)
+  local current, modifier = data.current, data.modifier
+  data.predicted.text = tostring(safe_add(current.text, modifier.text))
 end)
 
 Gui.on_click(reset_button_name, function(event)

utils/gui.lua

@@ -18,6 +18,8 @@ local Gui = {}
 local data = {}
 local element_map = {}
 
+Gui.tag = '__@level-RedMew__'
+
 Gui.token =
     Global.register(
     {data = data, element_map = element_map},
@@ -234,7 +236,8 @@ local function handler_factory(event_id)
             return
         end
 
-        local handler = handlers[element.name]
+        local tag = element.tags[Gui.tag]
+        local handler = handlers[element.name] or handlers[tag]
         if not handler then
             return
         end