Fix: reimplement logistic trash support

Author: ahicks92

control.lua

@@ -38,6 +38,7 @@ local F = require("scripts.field-ref")
 local Filters = require("scripts.filters")
 local Graphics = require("scripts.graphics")
 local InventoryTransfers = require("scripts.inventory-transfers")
+local InventoryUtils = require("scripts.inventory-utils")
 local ItemDescriptions = require("scripts.item-descriptions")
 local KruiseKontrol = require("scripts.kruise-kontrol-wrapper")
 local Localising = require("scripts.localising")
@@ -67,7 +68,7 @@ require("scripts.ui.selectors.upgrade-selector")
 require("scripts.ui.selectors.blueprint-selector")
 require("scripts.ui.selectors.copy-paste-selector")
 require("scripts.ui.menus.gun-menu")
-require("scripts.ui.menus.main-menu")
+local MainMenu = require("scripts.ui.menus.main-menu")
 require("scripts.ui.menus.fast-travel-menu")
 require("scripts.ui.menus.debug-menu")
 require("scripts.ui.tabs.item-chooser")
@@ -2785,12 +2786,8 @@ local function kb_open_player_inventory(event)
    sounds.play_open_inventory(p.index)
    p.selected = nil
 
-   -- Use the router to open the main menu
-   local router = UiRouter.get_router(pindex)
-   router:open_ui(
-      UiRouter.UI_NAMES.MAIN,
-      { player_inventory = { entity = p.character, inventory_index = defines.inventory.character_main } }
-   )
+   -- Open the main menu
+   MainMenu.open_main_menu(pindex)
 end
 
 EventManager.on_event(
@@ -4189,16 +4186,6 @@ EventManager.on_event("fa-cas-r", function(event, pindex)
    game.reload_script()
 end)
 
-EventManager.on_event(
-   "fa-o",
-   ---@param event EventData.CustomInputEvent
-   function(event, pindex)
-      local p = game.get_player(pindex)
-      if p.character == nil then return end
-      if p.driving == true then Driving.pda_read_cruise_control_toggled_info(event.player_index) end
-   end
-)
-
 EventManager.on_event("fa-c-o", function(event)
    Speech.speak(
       event.player_index,
@@ -4279,3 +4266,47 @@ EventManager.on_event(
       KruiseKontrol.cancel_kk(pindex)
    end
 )
+
+-- Send hand contents to trash: O key
+EventManager.on_event("fa-o", function(event)
+   local pindex = event.player_index
+   local player = game.get_player(pindex)
+   if not player or not player.character then return end
+
+   local cursor_stack = player.cursor_stack
+   if not cursor_stack or not cursor_stack.valid_for_read then
+      Speech.speak(pindex, { "fa.trash-nothing-in-hand" })
+      return
+   end
+
+   -- Get character's trash inventory
+   local trash_inventory = InventoryUtils.find_trash_inventory(player.character)
+   if not trash_inventory then
+      Speech.speak(pindex, { "fa.trash-not-available" })
+      return
+   end
+
+   -- Try to insert into trash
+   local item_name = cursor_stack.name
+   local item_count = cursor_stack.count
+   local item_quality = cursor_stack.quality and cursor_stack.quality.name or nil
+
+   local inserted = trash_inventory.insert({ name = item_name, count = item_count, quality = item_quality })
+
+   if inserted > 0 then
+      -- Remove from hand
+      cursor_stack.count = cursor_stack.count - inserted
+
+      -- Announce success
+      local item_description = Localising.localise_item({
+         name = item_name,
+         count = inserted,
+         quality = item_quality,
+      })
+      Speech.speak(pindex, { "fa.trash-sent-to-trash", item_description })
+
+      if inserted < item_count then Speech.speak(pindex, { "fa.trash-full", tostring(item_count - inserted) }) end
+   else
+      Speech.speak(pindex, { "fa.trash-full-none-inserted" })
+   end
+end, EventManager.EVENT_KIND.WORLD)

locale/en/inventory-titles.cfg

@@ -39,7 +39,7 @@ inventory-title-hub_trash=Platform Trash
 inventory-title-lab_trash=Lab Trash
 inventory-title-cargo_landing_pad_trash=Landing Pad Trash
 inventory-title-rocket_silo_trash=Silo Trash
-inventory-title-logistic_container_trash=Trash Filter
+inventory-title-logistic_container_trash=Trash
 
 # Fuel inventories
 inventory-title-fuel=Fuel

locale/en/ui-inventory.cfg

@@ -7,6 +7,7 @@ ui-inventory-slot-locked-to=, locked to __1__
 ui-inventory-main-title=Main Inventory
 ui-inventory-player-title=Player Inventory
 ui-inventory-player-fallback=Player Inventory
+ui-inventory-trash-title=Trash Inventory
 ui-inventory-no-action=No action
 half-stack=half
 
@@ -21,3 +22,11 @@ ui-inventory-bar-not-supported=This inventory does not support a bar
 dangerous-delete-nothing-to-delete=Nothing to delete
 dangerous-delete-deleted=Deleted __1__
 dangerous-delete-not-planner=Can only delete blueprints or planners.
+
+# Trash functionality
+trash-nothing-in-hand=Nothing in hand
+trash-nothing-in-slot=Nothing in slot
+trash-not-available=Trash not available
+trash-sent-to-trash=Sent __1__ to trash
+trash-full=Trash full, __1__ remaining
+trash-full-none-inserted=Trash full

scripts/inventory-utils.lua

@@ -124,6 +124,28 @@ function mod.get_main_inventory(entity)
    return nil
 end
 
+---Find the trash inventory for an entity
+---
+---Checks all possible trash inventory types and returns the first one that exists.
+---@param entity LuaEntity
+---@return LuaInventory? inventory The trash inventory if it exists, nil otherwise
+function mod.find_trash_inventory(entity)
+   return mod.get_inventory_by_priority(
+      entity,
+      "character_trash",
+      "car_trash",
+      "spider_trash",
+      "assembling_machine_trash",
+      "cargo_landing_pad_trash",
+      "crafter_trash",
+      "furnace_trash",
+      "hub_trash",
+      "lab_trash",
+      "logistic_container_trash",
+      "rocket_silo_trash"
+   )
+end
+
 ---Quick transfer a stack from source to destination inventory
 ---@param pindex integer Player index performing the transfer (for sound playback)
 ---@param msg_builder fa.MessageBuilder Message builder to append transfer results to

scripts/ui/generic-inventory.lua

@@ -49,6 +49,24 @@ local function setup_shared_state(pindex, params)
       entity = p.character,
       inventory_index = defines.inventory.character_main,
    }
+
+   -- Add trash inventory for vehicles if vehicle logistics is enabled
+   local trash_inv_index = nil
+   local show_trash = false
+
+   if entity.type == "car" or entity.type == "spider-vehicle" then
+      trash_inv_index = defines.inventory.car_trash
+      -- For vehicles: only show if vehicle logistics is enabled
+      show_trash = entity.force.vehicle_logistics
+   end
+
+   if show_trash and trash_inv_index and entity.get_inventory(trash_inv_index) then
+      ret["trash_inventory"] = {
+         entity = entity,
+         inventory_index = trash_inv_index,
+      }
+   end
+
    return ret
 end
 
@@ -67,6 +85,12 @@ PERSONAL_GRID.callbacks.enabled = function(pindex)
    return game.players[pindex] ~= nil and game.players[pindex].character ~= nil and game.players[pindex].character.valid
 end
 
+local TRASH_GRID = InventoryGrid.create_inventory_grid({
+   name = "trash_inventory",
+   title = { "fa.ui-inventory-trash-title" },
+   subkey = "trash_inventory",
+})
+
 -- Create the TabList declaration for generic inventories.
 mod.generic_inventory = TabList.declare_tablist({
    ui_name = UiRouter.UI_NAMES.GENERIC_INVENTORY,
@@ -78,6 +102,7 @@ mod.generic_inventory = TabList.declare_tablist({
          tabs = {
             GENERIC_GRID,
             PERSONAL_GRID,
+            TRASH_GRID,
          },
       },
    }),

scripts/ui/inventory-grid.lua

@@ -469,6 +469,48 @@ local function render_inventory_grid(ctx)
                delete_ctx.message:fragment({ "fa.dangerous-delete-not-planner" })
             end
          end,
+         on_trash = function(trash_ctx)
+            -- Send item in slot to trash (slot_index captured from loop)
+            local stack = inv[slot_index]
+
+            if not stack or not stack.valid_for_read then
+               trash_ctx.message:fragment({ "fa.trash-nothing-in-slot" })
+               return
+            end
+
+            -- Get the entity's trash inventory
+            local trash_inv = InventoryUtils.find_trash_inventory(entity)
+            if not trash_inv then
+               trash_ctx.message:fragment({ "fa.trash-not-available" })
+               return
+            end
+
+            -- Try to insert into trash
+            local item_name = stack.name
+            local item_count = stack.count
+            local item_quality = stack.quality and stack.quality.name or nil
+
+            local inserted = trash_inv.insert({ name = item_name, count = item_count, quality = item_quality })
+
+            if inserted > 0 then
+               -- Remove from slot
+               stack.count = stack.count - inserted
+
+               -- Announce success
+               local item_description = Localising.localise_item({
+                  name = item_name,
+                  count = inserted,
+                  quality = item_quality,
+               })
+               trash_ctx.message:fragment({ "fa.trash-sent-to-trash", item_description })
+
+               if inserted < item_count then
+                  trash_ctx.message:fragment({ "fa.trash-full", tostring(item_count - inserted) })
+               end
+            else
+               trash_ctx.message:fragment({ "fa.trash-full-none-inserted" })
+            end
+         end,
       })
    end
 

scripts/ui/key-graph.lua

@@ -116,6 +116,7 @@ local mod = {}
 ---@field on_bar_down_small fa.ui.graph.SimpleCallback? Handler for bar down small (-)
 ---@field on_bar_up_large fa.ui.graph.SimpleCallback? Handler for bar up large (shift++)
 ---@field on_bar_down_large fa.ui.graph.SimpleCallback? Handler for bar down large (shift+-)
+---@field on_trash fa.ui.graph.SimpleCallback? Handler for trash (o key)
 ---@field exclude_from_search boolean? If true, this node won't be included in search results. Default false.
 
 ---@class fa.ui.graph.TransitionVtable
@@ -487,13 +488,22 @@ end
 ---@param ctx fa.ui.graph.InternalTabCtx
 ---@param accelerator_name string
 function Graph:on_accelerator(ctx, accelerator_name)
-   self:_with_render(ctx, function()
-      local n = self.render.nodes[ctx.state.cur_key]
-      if n and n.vtable.on_accelerator then
+   -- Check if there's a graph-level on_accelerator handler
+   if self.on_accelerator_callback then
+      self:_with_render(ctx, function()
          local wrapped_ctx = self:_wrap_ctx(ctx, self.name, NO_MODIFIERS)
-         n.vtable.on_accelerator(wrapped_ctx, accelerator_name)
-      end
-   end)
+         self.on_accelerator_callback(wrapped_ctx, accelerator_name)
+      end)
+   else
+      -- Fall back to node-level handler
+      self:_with_render(ctx, function()
+         local n = self.render.nodes[ctx.state.cur_key]
+         if n and n.vtable.on_accelerator then
+            local wrapped_ctx = self:_wrap_ctx(ctx, self.name, NO_MODIFIERS)
+            n.vtable.on_accelerator(wrapped_ctx, accelerator_name)
+         end
+      end)
+   end
 end
 
 ---@param ctx fa.ui.graph.InternalTabCtx
@@ -560,6 +570,14 @@ function Graph:on_bar_down_large(ctx)
    end)
 end
 
+---@param ctx fa.ui.graph.InternalTabCtx
+function Graph:on_trash(ctx)
+   self:_with_render(ctx, function()
+      local n = self.render.nodes[ctx.state.cur_key]
+      self:_maybe_call(n, ctx, "on_trash", NO_MODIFIERS)
+   end)
+end
+
 -- Search support
 
 ---Check if this UI supports search (always true for KeyGraph)
@@ -679,13 +697,15 @@ end
 ---@field title LocalisedString
 ---@field render_callback fa.ui.graph.RenderCallback
 ---@field name string
+---@field on_accelerator fun(ctx: fa.ui.graph.Ctx, accelerator_name: string)?
 
 ---@param declaration fa.ui.graph.Declaration
 ---@return fa.ui.TabDescriptor
 function mod.declare_graph(declaration)
    local graph = setmetatable({
       render_callback = declaration.render_callback,
       name = declaration.name,
+      on_accelerator_callback = declaration.on_accelerator,
       -- For debugging, because otherwise it is very unclear that this is a metatable trick.
       _callbacks_are_from_metatable = "yes because this is KeyGraph",
    }, Graph_meta)

scripts/ui/menu.lua

@@ -21,6 +21,7 @@ local mod = {}
 ---@field on_bar_down_small? fa.ui.graph.SimpleCallback
 ---@field on_bar_up_large? fa.ui.graph.SimpleCallback
 ---@field on_bar_down_large? fa.ui.graph.SimpleCallback
+---@field on_trash? fa.ui.graph.SimpleCallback
 
 ---@class fa.ui.menu.Entry
 ---@field vtable fa.ui.graph.NodeVtable
@@ -120,6 +121,7 @@ function MenuBuilder:add_clickable(key, label, click_handlers)
    if click_handlers.on_bar_down_small then vtable.on_bar_down_small = click_handlers.on_bar_down_small end
    if click_handlers.on_bar_up_large then vtable.on_bar_up_large = click_handlers.on_bar_up_large end
    if click_handlers.on_bar_down_large then vtable.on_bar_down_large = click_handlers.on_bar_down_large end
+   if click_handlers.on_trash then vtable.on_trash = click_handlers.on_trash end
 
    self:add_item(key, vtable)
 end