Merge branch 'aperx' of https://github.com/PHIDIAS0303/ExpCluster into aperx

exp_scenario/module/gui/elements.lua

@@ -7,34 +7,57 @@ local Gui = require("modules/exp_gui")
 --- @class ExpGui_Elements
 local Elements = {}
 
---- To help with caching and avoid context changes the player list from the previous update is remembered
---- @type (string?)[]
-local _player_names = {}
-
 --- Dropdown which allows selecting an online player
 --- @class ExpGui_Elements.online_player_dropdown: ExpElement
 --- @overload fun(parent: LuaGuiElement): LuaGuiElement
 Elements.online_player_dropdown = Gui.define("player_dropdown")
     :track_all_elements()
     :draw(function(def, parent)
+        local player_names = Elements.online_player_dropdown._access_player_names()
         return parent.add{
             type = "drop-down",
-            items = _player_names,
-            selected_index = #_player_names > 0 and 1 or nil,
+            items = player_names,
+            selected_index = 1,
         }
     end)
     :style{
         height = 24,
     } --[[ @as any ]]
 
+--- To help with caching and avoid context changes the player list from the previous update is remembered
+--- @type (string?)[]
+do local _player_names = {}
+    --- Updates the player name list after a join or leave
+    --- @return (string?)[]
+    function Elements.online_player_dropdown._update_player_names()
+        _player_names[#_player_names] = nil -- Nil last element to account for player leave
+        for i, player in pairs(game.connected_players) do
+            _player_names[i] = player.name
+        end
+        return _player_names
+    end
+
+    --- Safely access the player name list
+    --- @return (string?)[]
+    function Elements.online_player_dropdown._access_player_names()
+        if not _player_names[1] then
+            for i, player in pairs(game.connected_players) do
+                _player_names[i] = player.name
+            end
+        end
+        return _player_names
+    end
+end
+
 --- Get the selected player name from a online player dropdown
 --- @param online_player_dropdown LuaGuiElement
 --- @return string
 function Elements.online_player_dropdown.get_selected_name(online_player_dropdown)
-    local name = _player_names[online_player_dropdown.selected_index]
+    local player_names = Elements.online_player_dropdown._access_player_names()
+    local name = player_names[online_player_dropdown.selected_index]
     if not name then
         online_player_dropdown.selected_index = 1
-        name = _player_names[1] --- @cast name -nil
+        name = player_names[1] --- @cast name -nil
     end
     return name
 end
@@ -43,10 +66,11 @@ end
 --- @param online_player_dropdown LuaGuiElement
 --- @return LuaPlayer
 function Elements.online_player_dropdown.get_selected(online_player_dropdown)
-    local name = _player_names[online_player_dropdown.selected_index]
+    local player_names = Elements.online_player_dropdown._access_player_names()
+    local name = player_names[online_player_dropdown.selected_index]
     if not name then
         online_player_dropdown.selected_index = 1
-        name = _player_names[1] --- @cast name -nil
+        name = player_names[1] --- @cast name -nil
     end
     return assert(game.get_player(name))
 end
@@ -55,20 +79,15 @@ end
 --- Get the number of players in the dropdown
 --- @return number
 function Elements.online_player_dropdown.get_player_count()
-    return #_player_names
+    return #Elements.online_player_dropdown._access_player_names()
 end
 
 --- Update all player dropdowns to match the currently online players
 --- We don't split join and leave because the order would be inconsistent between players and cause desyncs
 function Elements.online_player_dropdown.refresh_online()
-    _player_names[#_player_names] = nil -- Nil last element to account for player leave
-
-    for i, player in pairs(game.connected_players) do
-        _player_names[i] = player.name
-    end
-
+    local player_names = Elements.online_player_dropdown._update_player_names()
     for _, online_player_dropdown in Elements.online_player_dropdown:online_elements() do
-        online_player_dropdown.items = _player_names
+        online_player_dropdown.items = player_names
     end
 end
 

exp_scenario/module/gui/module_inserter.lua

@@ -5,8 +5,9 @@ Adds a Gui which creates an selection planner to insert modules into buildings
 local Gui = require("modules/exp_gui")
 local AABB = require("modules/exp_util/aabb")
 local Roles = require("modules/exp_legacy/expcore/roles")
-local Selection = require("modules/exp_legacy/modules/control/selection")
-local SelectionModuleArea = "ModuleArea"
+
+local Selection = require("modules/exp_util/selection")
+local SelectArea = Selection.connect("ModuleArea")
 
 local config = require("modules/exp_legacy/config/module")
 
@@ -76,7 +77,7 @@ Elements.create_selection_planner = Gui.define("module_inserter/create_selection
     )
     :on_click(function(def, player, element)
         --- @cast def ExpGui_ModuleInserter.elements.create_selection_planner
-        Selection.start(player, SelectionModuleArea, false, def.data[element])
+        SelectArea:start(player, def.data[element])
     end) --[[ @as any ]]
 
 --- Used to select the machine to apply modules to
@@ -177,7 +178,7 @@ end
 function Elements.module_table.remove_row(module_table, machine_selector)
     local rows = Elements.module_table.data[module_table]
     local row = rows[machine_selector.index]
-    row[machine_selector.index] = nil
+    rows[machine_selector.index] = nil
     Gui.destroy_if_valid(machine_selector)
     for _, separator in pairs(row.row_separators) do
         Gui.destroy_if_valid(separator)
@@ -311,7 +312,7 @@ end
 --- When an area is selected to have module changes applied to it
 --- @param event EventData.on_player_selected_area
 --- @param module_table LuaGuiElement
-Selection.on_selection(SelectionModuleArea, function(event, module_table)
+SelectArea:on_selection(function(event, module_table)
     local player = Gui.get_player(event)
     local area = AABB.expand(event.area)
 

exp_scenario/module/gui/player_bonus.lua

@@ -401,6 +401,9 @@ end
 --- @param player LuaPlayer
 function Elements.container.clear_player_bonus(player)
     Elements.container.data[player] = {}
+    if not player.character then
+        return
+    end
     for _, bonus_data in pairs(config.player_bonus) do
         if not bonus_data.is_special then
             player[bonus_data.name] = 0

exp_scenario/module/gui/research_milestones.lua

@@ -304,8 +304,9 @@ end
 --- @param force LuaForce
 --- @return number
 function Elements.container.calculate_starting_research_index(force)
-    local force_data = Elements.container.data[force]
+    local force_data = Elements.container.data[force] or {}
     local research_index = research_targets.length
+    Elements.container.data[force] = force_data -- needed because of @clusterio/research_sync
 
     -- # does not work here because it returned the array alloc size
     for i = 1, research_targets.length do