From 1d132b92fbcd45a2bfbf733010919712e73cddd7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 22 Jun 2018 19:48:18 +0100 Subject: [PATCH] Fixed lua ENV stuff and non saving globals --- modules/ExpGamingCore/Gui/control.lua | 14 +++++++------- modules/ExpGamingCore/Gui/src/center.lua | 1 + modules/ExpGamingCore/Gui/src/inputs.lua | 1 + modules/ExpGamingCore/Gui/src/left.lua | 1 + modules/ExpGamingCore/Gui/src/popup.lua | 1 + modules/ExpGamingCore/Gui/src/server.lua | 1 + modules/ExpGamingCore/Gui/src/test.lua | 2 +- modules/ExpGamingCore/Gui/src/toolbar.lua | 1 + modules/ExpGamingCore/Sync/control.lua | 1 + modules/ExpGamingCore/Sync/src/gui.lua | 1 + 10 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/ExpGamingCore/Gui/control.lua b/modules/ExpGamingCore/Gui/control.lua index 09bb5463..f907d7f3 100644 --- a/modules/ExpGamingCore/Gui/control.lua +++ b/modules/ExpGamingCore/Gui/control.lua @@ -27,11 +27,11 @@ Gui.data = setmetatable({},{ end }) -Gui.center = require(module_path..'/src/center') -Gui.inputs = require(module_path..'/src/inputs') -Gui.left = require(module_path..'/src/left') -Gui.popup = require(module_path..'/src/popup') -Gui.toolbar = require(module_path..'/src/toolbar') +Gui.center = require(module_path..'/src/center',{Gui=Gui}) +Gui.inputs = require(module_path..'/src/inputs',{Gui=Gui}) +Gui.left = require(module_path..'/src/left',{Gui=Gui}) +Gui.popup = require(module_path..'/src/popup',{Gui=Gui}) +Gui.toolbar = require(module_path..'/src/toolbar',{Gui=Gui}) --- Add a white bar to any gui frame -- @usage Gui.bar(frame,100) @@ -157,7 +157,7 @@ script.on_event('on_player_respawned',function(event) end) function Gui:on_init() - if loaded_modules['ExpGamingCore.Server'] then verbose('ExpGamingCore.Server is installed; Loading server src') require(module_path..'/src/server') end + if loaded_modules['ExpGamingCore.Server'] then verbose('ExpGamingCore.Server is installed; Loading server src') require(module_path..'/src/server',{Gui=Gui}) end if loaded_modules['ExpGamingCore.Ranking'] then verbose('ExpGamingCore.Ranking is installed; Loading ranking src') script.on_event('on_rank_change',function(event) @@ -173,7 +173,7 @@ function Gui:on_init() end function Gui:on_post() - Gui.test = require(module_path..'/src/test') + Gui.test = require(module_path..'/src/test',{Gui=Gui}) Gui.popup.load() Gui.popup.load = nil end diff --git a/modules/ExpGamingCore/Gui/src/center.lua b/modules/ExpGamingCore/Gui/src/center.lua index 1da41f19..73cc2b30 100644 --- a/modules/ExpGamingCore/Gui/src/center.lua +++ b/modules/ExpGamingCore/Gui/src/center.lua @@ -10,6 +10,7 @@ local Game = require('FactorioStdLib.Game') local Color = require('FactorioStdLib.Color') local mod_gui = require("mod-gui") +local Gui = Gui -- this is to force gui to remain in the ENV local center = {} center._center = {} diff --git a/modules/ExpGamingCore/Gui/src/inputs.lua b/modules/ExpGamingCore/Gui/src/inputs.lua index 18cb869a..5c624a8f 100644 --- a/modules/ExpGamingCore/Gui/src/inputs.lua +++ b/modules/ExpGamingCore/Gui/src/inputs.lua @@ -10,6 +10,7 @@ local Game = require('FactorioStdLib.Game') local Color = require('FactorioStdLib.Color') local mod_gui = require("mod-gui") +local Gui = Gui -- this is to force gui to remain in the ENV local inputs = {} inputs._input = {} diff --git a/modules/ExpGamingCore/Gui/src/left.lua b/modules/ExpGamingCore/Gui/src/left.lua index b6017a0b..65a44fa1 100644 --- a/modules/ExpGamingCore/Gui/src/left.lua +++ b/modules/ExpGamingCore/Gui/src/left.lua @@ -12,6 +12,7 @@ local Color = require('FactorioStdLib.Color') local success, Ranking = pcall(require,'ExpGamingCore.Ranking') if not success then Ranking = nil end success = nil local mod_gui = require("mod-gui") +local Gui = Gui -- this is to force gui to remain in the ENV local left = {} left._left = {} diff --git a/modules/ExpGamingCore/Gui/src/popup.lua b/modules/ExpGamingCore/Gui/src/popup.lua index 2ddfe73e..426d2493 100644 --- a/modules/ExpGamingCore/Gui/src/popup.lua +++ b/modules/ExpGamingCore/Gui/src/popup.lua @@ -9,6 +9,7 @@ local Game = require('FactorioStdLib.Game') local mod_gui = require("mod-gui") +local Gui = Gui -- this is to force gui to remain in the ENV local popup = {} popup._popup = {} diff --git a/modules/ExpGamingCore/Gui/src/server.lua b/modules/ExpGamingCore/Gui/src/server.lua index d344e839..0fb9818e 100644 --- a/modules/ExpGamingCore/Gui/src/server.lua +++ b/modules/ExpGamingCore/Gui/src/server.lua @@ -9,6 +9,7 @@ local Game = require('FactorioStdLib.Game') local Server = require('ExpGamingCore.Server') +local Gui = Gui -- this is to force gui to remain in the ENV --- Adds a server thread that allows the camera follows to be toggled off and on -- @function __comment diff --git a/modules/ExpGamingCore/Gui/src/test.lua b/modules/ExpGamingCore/Gui/src/test.lua index 02614106..ac1e58c7 100644 --- a/modules/ExpGamingCore/Gui/src/test.lua +++ b/modules/ExpGamingCore/Gui/src/test.lua @@ -6,7 +6,7 @@ --- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module -- @function _comment -local Gui = require('ExpGamingCore.Gui') +local Gui = Gui -- this is to force gui to remain in the ENV local mod_gui = require("mod-gui") local gui_tset_close = Gui.inputs.add{ diff --git a/modules/ExpGamingCore/Gui/src/toolbar.lua b/modules/ExpGamingCore/Gui/src/toolbar.lua index d45848c4..52883df1 100644 --- a/modules/ExpGamingCore/Gui/src/toolbar.lua +++ b/modules/ExpGamingCore/Gui/src/toolbar.lua @@ -11,6 +11,7 @@ local Game = require('FactorioStdLib.Game') local success, Ranking = pcall(require,'ExpGamingCore.Ranking') if not success then Ranking = nil end success = nil local mod_gui = require("mod-gui") +local Gui = Gui -- this is to force gui to remain in the ENV local toolbar = {} diff --git a/modules/ExpGamingCore/Sync/control.lua b/modules/ExpGamingCore/Sync/control.lua index 19d58536..5db9acb6 100644 --- a/modules/ExpGamingCore/Sync/control.lua +++ b/modules/ExpGamingCore/Sync/control.lua @@ -143,6 +143,7 @@ end -- @function errorHandler -- @tparam string err the error passed by the err control error.addHandler('Discord Emit',function(err) + if not game then return error(error()) end local color = Color and Color.to_hex(defines.textcolor.bg) or '0x0' Sync.emit_embeded{title='SCRIPT ERROR',color=color,description='There was an error in the script @Developers ',Error=err} end) diff --git a/modules/ExpGamingCore/Sync/src/gui.lua b/modules/ExpGamingCore/Sync/src/gui.lua index 09603487..eaa4ece6 100644 --- a/modules/ExpGamingCore/Sync/src/gui.lua +++ b/modules/ExpGamingCore/Sync/src/gui.lua @@ -9,6 +9,7 @@ local Game = require('FactorioStdLib.Game') local Gui = require('ExpGamingCore.Gui') +local Sync = Sync -- this is to force sync to remain in the ENV local Sync_gui_functions = {}