Simplify the setup for moderator events

engine/User.lua

@@ -163,11 +163,10 @@ end
 function EntityCategoryFilterOut(category, units)
 end
 
---- Executes some Lua code in the sim
+--- Executes some Lua code in the sim. Requires cheats to be enabled
 ---@param func function
----@param ... any this may actually be a comma-separated string of args instead of a vararg
----@return any
-function ExecLuaInSim(func, ...)
+---@param value any
+function ExecLuaInSim(func, value)
 end
 
 --- Requests that the application shut down

lua/SimCallbacks.lua

@@ -1247,3 +1247,19 @@ Callbacks.AIPlatoonSimpleStructureBehavior = function(data, units)
 end
 
 --#endregion
+
+-------------------------------------------------------------------------------
+--#region Moderator related functionality
+
+---@class CallbackModeratorEventData
+---@field From number
+---@field Message string
+
+---@param data CallbackModeratorEventData
+Callbacks.ModeratorEvent = function(data)
+    -- show up in the game logs
+    local brain = GetArmyBrain(GetCurrentCommandSource())
+    SPEW(string.format("Moderator event for %s: %s", tostring(brain.Nickname), repru(data, 10000)))
+end
+
+--#endregion

lua/SimPing.lua

@@ -122,7 +122,6 @@ end
 
 function OnArmyChange()
     Sync.MaxPingMarkers = MaxPingMarkers
-    LOG('syncing max ping markers: ', MaxPingMarkers)
     --Flush all of the current markers on the UI side
     if not Sync.Ping then Sync.Ping = {} end
     table.insert(Sync.Ping, {Action = 'flush'})

lua/SimSync.lua

@@ -122,8 +122,6 @@ function OnPostLoad()
 end
 
 function NoteFocusArmyChanged(new, old)
-    LOG("NoteFocusArmyChanged", new, old)
-    --LOG('NoteFocusArmyChanged(new=' .. repr(new) .. ', old=' .. repr(old) .. ')')
     import("/lua/simping.lua").OnArmyChange()
     import("/lua/sim/recall.lua").OnArmyChange()
     for entityID, data in UnitData do

lua/UserSync.lua

@@ -111,32 +111,17 @@ function OnSync()
 
         -- Informs moderators that the focus army has changed for the local player
         if Sync.FocusArmyChanged then
-            local clients = GetSessionClients()
-            local localClient = nil
-            for k = 1, table.getn(clients) do
-                if clients[k]["local"] then
-                    localClient = clients[k]
-                    break
-                end
-            end
-
             -- try to inform moderators
             SimCallback(
                 {
-                    Func="GiveResourcesToPlayer",
+                    Func="ModeratorEvent",
                     Args= {
-                        From=Sync.FocusArmyChanged.old,
-                        To=Sync.FocusArmyChanged.old,
-                        Mass=0,
-                        Energy=0,
-                        Sender=localClient.name,
-                        Msg={ to='moderators', text = string.format("Switched focus army from %s to %s!", tostring(Sync.FocusArmyChanged.old), tostring(Sync.FocusArmyChanged.new)) }
+                        From = Sync.FocusArmyChanged.old,
+                        Message = string.format("Switched focus army from %s to %s!", tostring(Sync.FocusArmyChanged.old), tostring(Sync.FocusArmyChanged.new)),
                     },
-                },
-                true
+                }
             )
         end
-
     end
 
     -- old sync callbacks

lua/keymap/misckeyactions.lua

@@ -662,7 +662,3 @@ SelectAllResourceConsumers = function(onscreen)
 
     SelectUnits(units)
 end
-
-TogglePerformanceMetricsWindow = function()
-    local instance = import("/lua/ui/lobby/sim-performance-popup.lua").OpenWindow()
-end