aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 21:01:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Few Big Changes In Core File

Browse Source
This commit is contained in:
Cooldude2606
2018-03-30 20:55:07 +01:00
parent d56f056073
commit d6a8c02287
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ExpCore/commands.lua
View File

@@ -143,5 +143,8 @@ commands.add_command = function(name, description, inputs, event)
inputs=inputs inputs=inputs
} }
command_calls[name] = event command_calls[name] = event
commands._add_command(name,command_inputs(command_data[name])..'- '..description,run_custom_command) commands._add_command(name,command_inputs(command_data[name])..'- '..description,function(...)
local success, err = pcall(run_custom_command,...)
if not success then error(err) end
end)
end end

12
control.lua
View File

@@ -14,6 +14,9 @@ error = function(err)
if _G.discord_emit and game then if _G.discord_emit and game then
local color = _G.Color and Color.to_hex(defines.text_color.bg) or '0x0' local color = _G.Color and Color.to_hex(defines.text_color.bg) or '0x0'
discord_emit{title='SCRIPT ERROR',color=color,description='There was an error in the script @Developers ',Error=err} discord_emit{title='SCRIPT ERROR',color=color,description='There was an error in the script @Developers ',Error=err}
elseif _G.error_handle and type(error_handle) == 'function' then
local success, _err = error_handle(err)
if not success then _error({handle=_err,err=err}) end
elseif _G.Game and game then elseif _G.Game and game then
if Game.print_all(err) == 0 then if Game.print_all(err) == 0 then
_error(err) _error(err)
@@ -23,11 +26,12 @@ error = function(err)
end end
end end
-- replaces the base require function -- replaces the base require function
require_return_err = false require_return_err = false -- set to false when removing files; set to true for debuging
_require = require _require = require
local function require(path) require = function(path)
local success, err = pcall(_require,path) local _return = {pcall(_require,path)}
if not success and require_return_err then error(err) end if not table.remove(_return, 1) and require_return_err then error(unpack(_return)) end
return unpack(_return)
end end
require("mod-gui") require("mod-gui")