From 0d24257835b38601adf218a268c44b2b9cc6fd01 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 25 May 2019 16:21:32 +0100 Subject: [PATCH] Fixing file load failing --- expcore/{Gui => .gui}/buttons.lua | 0 expcore/{Gui => .gui}/center.lua | 0 expcore/{Gui => .gui}/checkboxs.lua | 0 expcore/{Gui => .gui}/core.lua | 0 expcore/{Gui => .gui}/dropdown.lua | 0 expcore/{Gui => .gui}/elem-button.lua | 0 expcore/{Gui => .gui}/instances.lua | 0 expcore/{Gui => .gui}/left.lua | 0 expcore/{Gui => .gui}/popups.lua | 0 expcore/{Gui => .gui}/progress-bar.lua | 8 ++++---- expcore/{Gui => .gui}/slider.lua | 0 expcore/{Gui => .gui}/test.lua | 0 expcore/{Gui => .gui}/text.lua | 0 expcore/{Gui => .gui}/toolbar.lua | 0 modules/addons/compilatron.lua | 8 ++++---- modules/addons/jail-control.lua | 8 ++++---- modules/addons/warnings-control.lua | 8 ++++---- modules/commands/interface.lua | 9 ++++++--- 18 files changed, 22 insertions(+), 19 deletions(-) rename expcore/{Gui => .gui}/buttons.lua (100%) rename expcore/{Gui => .gui}/center.lua (100%) rename expcore/{Gui => .gui}/checkboxs.lua (100%) rename expcore/{Gui => .gui}/core.lua (100%) rename expcore/{Gui => .gui}/dropdown.lua (100%) rename expcore/{Gui => .gui}/elem-button.lua (100%) rename expcore/{Gui => .gui}/instances.lua (100%) rename expcore/{Gui => .gui}/left.lua (100%) rename expcore/{Gui => .gui}/popups.lua (100%) rename expcore/{Gui => .gui}/progress-bar.lua (98%) rename expcore/{Gui => .gui}/slider.lua (100%) rename expcore/{Gui => .gui}/test.lua (100%) rename expcore/{Gui => .gui}/text.lua (100%) rename expcore/{Gui => .gui}/toolbar.lua (100%) diff --git a/expcore/Gui/buttons.lua b/expcore/.gui/buttons.lua similarity index 100% rename from expcore/Gui/buttons.lua rename to expcore/.gui/buttons.lua diff --git a/expcore/Gui/center.lua b/expcore/.gui/center.lua similarity index 100% rename from expcore/Gui/center.lua rename to expcore/.gui/center.lua diff --git a/expcore/Gui/checkboxs.lua b/expcore/.gui/checkboxs.lua similarity index 100% rename from expcore/Gui/checkboxs.lua rename to expcore/.gui/checkboxs.lua diff --git a/expcore/Gui/core.lua b/expcore/.gui/core.lua similarity index 100% rename from expcore/Gui/core.lua rename to expcore/.gui/core.lua diff --git a/expcore/Gui/dropdown.lua b/expcore/.gui/dropdown.lua similarity index 100% rename from expcore/Gui/dropdown.lua rename to expcore/.gui/dropdown.lua diff --git a/expcore/Gui/elem-button.lua b/expcore/.gui/elem-button.lua similarity index 100% rename from expcore/Gui/elem-button.lua rename to expcore/.gui/elem-button.lua diff --git a/expcore/Gui/instances.lua b/expcore/.gui/instances.lua similarity index 100% rename from expcore/Gui/instances.lua rename to expcore/.gui/instances.lua diff --git a/expcore/Gui/left.lua b/expcore/.gui/left.lua similarity index 100% rename from expcore/Gui/left.lua rename to expcore/.gui/left.lua diff --git a/expcore/Gui/popups.lua b/expcore/.gui/popups.lua similarity index 100% rename from expcore/Gui/popups.lua rename to expcore/.gui/popups.lua diff --git a/expcore/Gui/progress-bar.lua b/expcore/.gui/progress-bar.lua similarity index 98% rename from expcore/Gui/progress-bar.lua rename to expcore/.gui/progress-bar.lua index 6944fb8e..2b4ffcbc 100644 --- a/expcore/Gui/progress-bar.lua +++ b/expcore/.gui/progress-bar.lua @@ -63,11 +63,11 @@ local ProgressBar = { } } Global.register({ - ProgressBar.unregistered, - ProgressBar.independent + unregistered = ProgressBar.unregistered, + independent = ProgressBar.independent },function(tbl) - ProgressBar.unregistered = tbl[1] - ProgressBar.independent = tbl[2] + ProgressBar.unregistered = tbl.unregistered + ProgressBar.independent = tbl.independent end) --- Gets the define data, cant use Gui.get_define as it would error diff --git a/expcore/Gui/slider.lua b/expcore/.gui/slider.lua similarity index 100% rename from expcore/Gui/slider.lua rename to expcore/.gui/slider.lua diff --git a/expcore/Gui/test.lua b/expcore/.gui/test.lua similarity index 100% rename from expcore/Gui/test.lua rename to expcore/.gui/test.lua diff --git a/expcore/Gui/text.lua b/expcore/.gui/text.lua similarity index 100% rename from expcore/Gui/text.lua rename to expcore/.gui/text.lua diff --git a/expcore/Gui/toolbar.lua b/expcore/.gui/toolbar.lua similarity index 100% rename from expcore/Gui/toolbar.lua rename to expcore/.gui/toolbar.lua diff --git a/modules/addons/compilatron.lua b/modules/addons/compilatron.lua index ef81281d..cbe75b0c 100644 --- a/modules/addons/compilatron.lua +++ b/modules/addons/compilatron.lua @@ -13,11 +13,11 @@ local Public = { } Global.register({ - Public.compilatrons, - Public.current_messages + compilatrons = Public.compilatrons, + current_messages = Public.current_messages },function(tbl) - Public.compilatrons=tbl[1] - Public.current_messages=tbl[2] + Public.compilatrons = tbl.compilatrons + Public.current_messages = tbl.current_messages end) --- This will re-create the speech bubble after it de-spawns called with set_timeout diff --git a/modules/addons/jail-control.lua b/modules/addons/jail-control.lua index 512c7724..2706f0a1 100644 --- a/modules/addons/jail-control.lua +++ b/modules/addons/jail-control.lua @@ -13,11 +13,11 @@ local Public = { } Global.register({ - Public.old_roles, - Public.temp_bans + old_roles = Public.old_roles, + temp_bans = Public.temp_bans },function(tbl) - Public.old_roles=tbl[1] - Public.temp_bans=tbl[2] + Public.old_roles = tbl.old_roles + Public.temp_bans = tbl.temp_bans end) local function event_emit(event,player,by_player_name,reason) diff --git a/modules/addons/warnings-control.lua b/modules/addons/warnings-control.lua index d3c07bcd..bb19e7aa 100644 --- a/modules/addons/warnings-control.lua +++ b/modules/addons/warnings-control.lua @@ -15,11 +15,11 @@ local Public = { } Global.register({ - Public.user_warnings, - Public.user_temp_warnings + user_warnings = Public.user_warnings, + user_temp_warnings = Public.user_temp_warnings },function(tbl) - Public.user_warnings = tbl[1] - Public.user_temp_warnings = tbl[2] + Public.user_warnings = tbl.user_warnings + Public.user_temp_warnings = tbl.user_temp_warnings end) local function event_emit(event,player,by_player_name) diff --git a/modules/commands/interface.lua b/modules/commands/interface.lua index 03604435..51752618 100644 --- a/modules/commands/interface.lua +++ b/modules/commands/interface.lua @@ -23,9 +23,12 @@ end local interface_env = {} -- used as a persistent sandbox for interface commands local interface_callbacks = {} -- saves callbacks which can load new values per use -Global.register({interface_env,interface_callbacks},function(tbl) - interface_env = tbl[1] - interface_callbacks = tbl[2] +Global.register({ + interface_env = interface_env, + interface_callbacks = interface_callbacks +},function(tbl) + interface_env = tbl.interface_env + interface_callbacks = tbl.interface_callbacks end) --- Adds a callback function when the interface command is used