chore: Merge branch 'development' into trunk

Author: noodlebox

gui/gui.lua

@@ -230,7 +230,11 @@ local function on_gui_opened(event)
     if event.gui_type == defines.gui_type.entity then
         local parent = player.gui.relative
         local entity = event.entity
-        local gui = relative_gui_for_entity_type[entity and entity.valid and entity.type]
+        if not entity or not entity.valid then return destroy_on(parent) end
+
+        local entity_type = entity.type
+        if entity_type == "entity-ghost" then entity_type = entity.ghost_type end
+        local gui = relative_gui_for_entity_type[entity_type]
         if not gui then return destroy_on(parent) end
         return render_on(parent, { gui = gui, position = defines.relative_gui_position.right })
     elseif event.gui_type == defines.gui_type.custom then
@@ -245,7 +249,7 @@ end
 local function on_gui_checked_state_changed(event)
     local element = event.element
     local tags = element.tags --[[@as { mode: action, action: string }?]]
-    if not element.get_mod() == "inventory-selector" or not tags then return end
+    if element.get_mod() ~= "inventory-selector" or not tags then return end
     local player = game.get_player(event.player_index) --[[@as LuaPlayer]]
     if not player or not player.valid then return end
     local entity = player.opened --[[@as LuaEntity]]
@@ -256,14 +260,19 @@ local function on_gui_checked_state_changed(event)
     elseif tags.action == "circuit_set" then
         selector.set_circuit_mode(entity, tags.mode, event.element.state)
     end
-    return render_on(player.gui.relative, { gui = relative_gui_for_entity_type[entity.type], position = defines.relative_gui_position.right })
+
+    local entity_type = entity.type
+    if entity_type == "entity-ghost" then entity_type = entity.ghost_type end
+    local gui = relative_gui_for_entity_type[entity_type]
+
+    return render_on(player.gui.relative, { gui = gui, position = defines.relative_gui_position.right })
 end
 
 ---@param event EventData.on_gui_elem_changed
 local function on_gui_elem_changed(event)
     local element = event.element
     local tags = element.tags --[[@as { mode: action }?]]
-    if not element.get_mod() == "inventory-selector" or not tags then return end
+    if element.get_mod() ~= "inventory-selector" or not tags then return end
     local player = game.get_player(event.player_index) --[[@as LuaPlayer]]
     if not player or not player.valid then return end
     local entity = player.opened --[[@as LuaEntity]]
@@ -274,7 +283,12 @@ local function on_gui_elem_changed(event)
     local name = select(3, string.find(elem or "", "^inventory%-selector%-inventory%-([_%a]+)$")) or "none"
 
     selector.set(entity, tags.mode, name, true)
-    return render_on(player.gui.relative, { gui = relative_gui_for_entity_type[entity.type], position = defines.relative_gui_position.right })
+
+    local entity_type = entity.type
+    if entity_type == "entity-ghost" then entity_type = entity.ghost_type end
+    local gui = relative_gui_for_entity_type[entity_type]
+
+    return render_on(player.gui.relative, { gui = gui, position = defines.relative_gui_position.right })
 end
 
 -- TODO: Need to watch for externally triggered changes to the entity shown in the open GUI
@@ -298,9 +312,12 @@ return {
             end
             for _, player in pairs(game.players) do
                 if player.valid and player.opened_gui_type == defines.gui_type.entity then
-                    local anchor_gui = relative_gui_for_entity_type[player.opened.type]
-                    if anchor_gui then
-                        render_on(player.gui.relative, { gui = anchor_gui, position = defines.relative_gui_position.right })
+                    local entity = player.opened --[[@as LuaEntity]]
+                    local entity_type = entity and entity.valid and entity.type
+                    if entity_type == "entity-ghost" then entity_type = entity.ghost_type end
+                    local gui = relative_gui_for_entity_type[entity_type]
+                    if gui then
+                        render_on(player.gui.relative, { gui = gui, position = defines.relative_gui_position.right })
                     end
                 end
             end

locale/en/locale.cfg

@@ -33,7 +33,6 @@ inventory-selector-support-entities-filtered=Filtered inserters
 inventory-selector-support-entities-inserters=Any inserters
 inventory-selector-support-entities-all=Anything that drops items
 inventory-selector-deadlock-safety-always-immediate=Always immediate
-inventory-selector-deadlock-safety-allow-safe=Allow safe
 inventory-selector-deadlock-safety-allow-unsafe=Allow unsafe
 inventory-selector-deadlock-safety-always-safe=Always safe
 inventory-selector-enable-inventory-base=Base-game equivalent
@@ -44,7 +43,6 @@ inventory-selector-support-entities-filtered=Allow configuration of inserters on
 inventory-selector-support-entities-inserters=Allow configuration of any kind of inserter.
 inventory-selector-support-entities-all=Allow configuration of any kind of entity that can drop items nearby.\n\nThis additionally includes mining drills, recyclers, and any modded crafting machines that define a drop position for their output.
 inventory-selector-deadlock-safety-always-immediate=Always apply changes immediately, disabling deadlock mitigation completely.\n\nThis setting is ideal for control freaks and power users, giving your factory the power to deadlock itself at any moment because of an automated change to inserter settings.\n\n[img=warning-white] Switching to this mode mid-game will cause any previously deferred changes to be applied immediately (or more accurately on their next attempt, which is practically immediate).
-inventory-selector-deadlock-safety-allow-safe=Changes are applied immediately, with risky changes only deferred if safe behavior is specifically requested.\n\nThis is an alternative to the standard mode ("Allow Unsafe"), differing only in the default behavior when not explicitly specified.
 inventory-selector-deadlock-safety-allow-unsafe=Changes are automatically deferred when risky, unless immediate behavior is specifically requested (e.g. by a GUI interaction).\n\nThis allows most automated control to operate safely while enabling direct control by players similar to other settings. This is the default setting, ideal for engineers expecting sensible vanilla-like behavior in most situations.
 inventory-selector-deadlock-safety-always-safe=Risky changes are always deferred, potentially indefinitely.\n\nThis setting is ideal for those who do not trust their fellow engineers (or themselves) not to accidentally deadlock an inserter while configuring it, though possibly causing confusion for users expecting an instant response.
 inventory-selector-enable-inventory-base=Only allow selection of inventories that are generally accessible in the base game.\n\nThis setting still provides additional control, which may permit modes of interaction not otherwise possible in the base game.

script/limbo.lua

@@ -1,6 +1,6 @@
 local inventory = require("script.inventory")
 
--- Create a remapping for limbo container entities, which forwards all inventory types to the "storage" chest inventory
+-- Create a remapping for limbo container entities, which forwards all inventory types to the "main" chest inventory
 local limbo_remap = { "main", "closed" }
 inventory.register_inventory_remap({ name = "inventory-selector-limbo", base = "container" }, {
     ammo = limbo_remap,
@@ -22,18 +22,7 @@ local origin = {0, 0}
 
 -- Maintains "limbo" containers that can be used as the target of a proxy container to prevent inserters from losing interest in them
 -- See: https://forums.factorio.com/viewtopic.php?t=127774 for relevant discussion
---
--- This is a workaround: limbo containers provide a cheap and easy(?) target with probably no side effects ever. Though a single
--- limbo container could suffice for proxies across all surfaces, creating at least one per surface ensures they are unlikely to be
--- destroyed out of sync with the proxies that depend on them. Ensuring proxies never have an invalid target inventory is essential
--- in order to maintain functional correctness of the features provided by this mod.
---
--- We could watch for surface creation and destruction events, but this seems unnecessary for now. They are created lazily, and if a
--- surface is ever destroyed, everything referring to it should have been destroyed as well.
---
--- The strong need for these has been mostly resolved by changes to inserter behavior in 2.0.44, though this version introduces new
--- issues because of the change to the behavior of entity prototype flags concerning automated interaction.
--- TODO: Open a new bug report for these issues once explored a bit more.
+-- These are no longer strictly necessary in 2.0.44, but still provide a way to specify an explicitly unusable (but valid) inventory.
 local limbo = setmetatable({}, {
     ---@param surface_index uint
     ---@return LuaEntity?