Added Manager.global

FactorioSoftmodManager.lua

@@ -145,6 +145,38 @@ Manager.setVerbose = setmetatable(
 -- call to verbose to show start up, will always be present
 Manager.verbose('Current state is now: "selfInit"; The verbose state is: '..tostring(Manager.setVerbose.selfInit),true)
 
+--- An optinal feature that can be used if you dont want to worry about conflicting global paths
+-- @usage local global = global_manager() -- sets up the global struture
+-- @usage global{'foo','bar'} -- sets the default value
+-- @tparam[opt={}] table default the default value of global
+-- @treturn table the new global table for that module
+function Manager.global(default)
+    local default = default or {}
+    return setmetatable(default,{
+        __call=function(tbl,default)
+            if default then rawset(tbl,'default',default) end
+            local global = _G.global
+            if not module_path then return global end
+            local path = 'global'
+            local new_dir = false -- this is to test if the default should be used
+            for dir in module_path:gmatch('%a+') do
+                path = path..'.'..dir
+                if not rawget(global,dir) then new_dir=true Manager.verbose('Added Global Dir: '..path) rawset(global,dir,{}) end
+                global = rawget(global,dir)
+            end
+            if new_dir then 
+                Manager.verbose('Set Global Dir: '..path..' to its default') 
+                for key,value in pairs(rawget(tbl,'default')) do rawset(global,key,value) end
+            end
+            return global
+        end,
+        __index=function(tbl,key) return rawget(tbl(),key) or rawget(_G.global,key) end,
+        __newindex=function(tbl,key,value) rawset(tbl(),key,value) end,
+        __pairs=function(tbl) return pairs(tbl()) end,
+        __ipairs=function(tbl) return ipairs(tbl()) end
+    })
+end
+
 --- Creates a sand box envorment and runs a callback in that sand box; provents global pollution
 -- @function Manager.sandbox
 -- @usage Manager.sandbox(callback) -- return sandbox, success, other returns from callback
@@ -233,6 +265,7 @@ Manager.loadModules = setmetatable({},
                     if rawget(_G,module_name) and type(tbl[module_name]) == 'table' then setmetatable(rawget(_G,module_name),{__index=tbl[module_name]}) end
                 else
                     Manager.verbose('Failed load: "'..module_name..'"; path: '..path..' ('..module..')','errorCaught')
+                    for event_name,callbacks in pairs(Manager.event) do Manager.verbose('Removed Event Handler: "'..module_name..'/'..tbl.names[event_name],'eventRegistered') callbacks[module_name] = nil end
                 end
             end
             -- new state for the manager to allow control of verbose
@@ -243,7 +276,7 @@ Manager.loadModules = setmetatable({},
                 if type(data) == 'table' and data.init and data.on_init == nil then data.on_init = data.init data.init = nil end
                 if type(data) == 'table' and data.on_init and type(data.on_init) == 'function' then
                     Manager.verbose('Initiating module: "'..module_name..'"')
-                    local sandbox, success, err = Manager.sandbox(data.on_init,{module_name=setupModuleName(module_name),module_path=moduleIndex[module_name]},data)
+                    local sandbox, success, err = Manager.sandbox(data.on_init,{module_name=setupModuleName(module_name),module_path=moduleIndex[tostring(module_name)]},data)
                     if success then
                         Manager.verbose('Successfully Initiated: "'..module_name..'"')
                     else
@@ -400,8 +433,8 @@ Manager.event = setmetatable({
             for module_name,callback in pairs(tbl[event_name]) do
                 -- loops over the call backs and which module it is from
                 if type(callback) ~= 'function' then error('Invalid Event Callback: "'..event_name..'/'..module_name..'"') end
-                local sandbox, success, err = Manager.sandbox(callback,{module_name=setupModuleName(module_name),module_path=moduleIndex[module_name]},new_callback,...)
+                local sandbox, success, err = Manager.sandbox(callback,{module_name=setupModuleName(module_name),module_path=moduleIndex[tostring(module_name)]},new_callback,...)
-                if not success then Manager.verbose('Event Failed: "'..tbl.names[event_name]..'/'..module_name..'" ('..err..')','errorCaught') error('Event Failed: "'..event_name..'/'..module_name..'" ('..err..')') end
+                if not success then Manager.verbose('Event Failed: "'..module_name..'/'..tbl.names[event_name]..'" ('..err..')','errorCaught') error('Event Failed: "'..module_name..'/'..tbl.names[event_name]..'" ('..err..')') end
                 -- if stop constant is returned then stop further processing
                 if err == rawget(tbl,'__stop') then Manager.verbose('Event Haulted By: "'..module_name..'"','errorCaught') break end
             end
@@ -415,12 +448,12 @@ Manager.event = setmetatable({
         -- converts the key to a number index for the event
         Manager.verbose('Added Handler: "'..tbl.names[key]..'"','eventRegistered')
         -- checks that the event has a valid table to store callbacks; if its not valid it will creat it and register a real event handler
-        if not rawget(rawget(tbl,'__events'),key) then 
+        if not rawget(rawget(tbl,'__events'),key) then
             if key < 0  then rawget(tbl,tbl.names[key])(function(...) tbl(key,...) end) 
             else rawget(tbl,'__event')(key,function(...) tbl(key,...) end) end
             rawset(rawget(tbl,'__events'),key,{}) end
         -- adds callback to Manager.event.__events[event_id][module_name]
-        rawset(rawget(rawget(tbl,'__events'),key),module_name,value)
+        rawset(rawget(rawget(tbl,'__events'),key),tostring(module_name),value)
     end,
     __index=function(tbl,key)
         -- few redirect key
@@ -429,8 +462,8 @@ Manager.event = setmetatable({
         -- proforms different look ups depentding weather the current module has an event handler registered
         if module_name then
             -- first looks for the event callback table and then under the module name; does same but converts the key to a number; no handler regisered so returns the converted event id
-            return rawget(rawget(tbl,'__events'),key) and rawget(rawget(rawget(tbl,'__events'),key),module_name)
+            return rawget(rawget(tbl,'__events'),key) and rawget(rawget(rawget(tbl,'__events'),key),tostring(module_name))
-            or rawget(rawget(tbl,'__events'),rawget(tbl,'names')[key]) and rawget(rawget(rawget(tbl,'__events'),rawget(tbl,'names')[key]),module_name) 
+            or rawget(rawget(tbl,'__events'),rawget(tbl,'names')[key]) and rawget(rawget(rawget(tbl,'__events'),rawget(tbl,'names')[key]),tostring(module_name)) 
             or rawget(tbl,'names')[key]
         else
             -- if there is no module present then it will return the full list of regisered handlers; or other wise the converted event id

modules/ExpGamingCore/Sync/control.lua

@@ -6,6 +6,7 @@
 
 local Sync = {}
 local Sync_updates = {}
+local global = Manager.global()
 
 --- Used to standidise the tick format for any sync info
 -- @usage Sync.tick_format(60) -- return {60,'1.00M'}
@@ -175,35 +176,10 @@ end
 -- @tparam[opt=nil] table set keys to be replaced in the server info
 -- @treturn boolean success was the data set
 Sync.info = setmetatable({},{
-    __index=function(tbl,key)
+    __index=global,
-        if not global.exp_core then global.exp_core = {} end
-        if not global.exp_core.sync then global.exp_core.sync = {
-            server_name='Factorio Server',
-            server_description='A factorio server for everyone',
-            reset_time='On Demand',
-            time='Day Mth 00 00:00:00 UTC Year',
-            time_set=Sync.tick_format(0),
-            last_update=Sync.tick_format(0),
-            time_period=Sync.tick_format(18000),
-            players={
-                online=Sync.count_players(true),
-                n_online=#game.connected_players,
-                all=Sync.count_players(),
-                n_all=#game.players,
-                admins_online=Sync.count_admins(),
-                afk_players=Sync.count_afk(),
-                times=Sync.count_player_times()
-            },
-            ranks=Sync.count_ranks(),
-            rockets=game.forces['player'].get_item_launched('satellite'),
-            mods={'base'}
-        } end
-        return global.exp_core.sync[key]
-    end,
     __call=function(tbl,set)
-        local _ = tbl.time -- used to create the global if not made
         if not is_type(set,'table') then return false end
-        for key,value in pairs(set) do global.exp_core.sync[key] = value end
+        for key,value in pairs(set) do global[key] = value end
         return true
     end
 })
@@ -268,9 +244,31 @@ function Sync:on_init()
         info.time_set[2] = tick_to_display_format(game.tick)
         return true
     end,function() local info = Sync.info return info.time..' (+'..(game.tick-info.time_set[1])..' Ticks)' end)
+    -- sets up the global for this module
+    global{
+        server_name='Factorio Server',
+        server_description='A factorio server for everyone',
+        reset_time='On Demand',
+        time='Day Mth 00 00:00:00 UTC Year',
+        time_set=Sync.tick_format(0),
+        last_update=Sync.tick_format(0),
+        time_period=Sync.tick_format(18000),
+        players={
+            online=Sync.count_players(true),
+            n_online=game and #game.connected_players or 0,
+            all=Sync.count_players(),
+            n_all=game and #game.players or 0,
+            admins_online=Sync.count_admins(),
+            afk_players=Sync.count_afk(),
+            times=Sync.count_player_times()
+        },
+        ranks=Sync.count_ranks(),
+        rockets=game and game.forces['player'].get_item_launched('satellite') or 0,
+        mods=table.keys(loaded_modules)
+    }    
     -- optinal dependies
-    if loaded_modules.Gui then verbose('ExpGamingCore.Gui is installed; Loading gui lib') require(module_path..'/lib/gui') end
+    if loaded_modules.Gui then verbose('ExpGamingCore.Gui is installed; Loading gui lib') require(module_path..'/src/gui') end
-    if loaded_modules.Ranking then verbose('ExpGamingCore.Ranking is installed; Loading ranking lib') require(module_path..'/lib/ranking') end
+    if loaded_modules.Ranking then verbose('ExpGamingCore.Ranking is installed; Loading ranking lib') require(module_path..'/src/ranking') end
 end
 
 return Sync

modules/ExpGamingCore/Sync/src/gui.lua

@@ -7,7 +7,6 @@
 --- This file will be loaded when ExpGamingCore/Gui is present
 -- @function _comment
 
-
 local Sync_gui_functions = {}
 
 --- Adds a emeltent to the sever info gui

modules/ExpGamingLib/control.lua

@@ -110,6 +110,7 @@ end
 -- @treturn number the number of whole hours from this tick
 function ExpLib.tick_to_hour(tick)
     if not ExpLib.is_type(tick,'number') then return 0 end
+    if not game then return math.floor(tick/216000) end
     return math.floor(tick/(216000*game.speed))
 end
 
@@ -119,6 +120,7 @@ end
 -- @treturn number the number of whole minutes from this tick
 function ExpLib.tick_to_min (tick)
     if not ExpLib.is_type(tick,'number') then return 0 end
+    if not game then return math.floor(tick/3600) end
     return math.floor(tick/(3600*game.speed))
 end
 
@@ -130,6 +132,7 @@ end
 function ExpLib.tick_to_display_format(tick)
     if not ExpLib.is_type(tick,'number') then return '0H 0M' end
     if ExpLib.tick_to_min(tick) < 10 then
+        if not game then return math.floor(tick/3600) end
 		return string.format('%.2f M',tick/(3600*game.speed))
 	else
         return string.format('%d H %d M',