Skip to content

Commit 399cb3f

Browse files
ApertureDevelopmentApertureDevelopment
committed
Bugfixes
First test didn't go very well. Much more work needs to be done. UPDATE: EGG_0.0.4
1 parent 8cbf6c8 commit 399cb3f

File tree

9 files changed

+47
-41
lines changed

9 files changed

+47
-41
lines changed

‎autorun/msync_autorun.lua‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
if SERVER then
2-
include("/msync/sh_init.lua")
3-
AddCSLuaFile("/msync/sh_init.lua")
2+
include("msync/sh_init.lua")
3+
AddCSLuaFile("msync/sh_init.lua")
44

5-
include("/msync/server/sv_init.lua")
5+
include("msync/server/sv_init.lua")
66

7-
MSync.function.loadServer()
8-
9-
for k, v in pairs(file.Find("msync/client_gui/*.lua", "LUA")[1]) do
10-
AddCSLuaFile("msync/client_gui/"..v)
11-
end
7+
MSync.func.loadServer()
128
elseif CLIENT then
13-
include("/msync/sh_init.lua")
9+
include("msync/sh_init.lua")
1410

15-
include("/msync/client_gui/cl_admin_gui.lua")
16-
include("/msync/client_gui/cl_init.lua")
17-
include("/msync/client_gui/cl_net.lua")
18-
include("/msync/client_gui/cl_modules.lua")
11+
include("msync/client_gui/cl_admin_gui.lua")
12+
include("msync/client_gui/cl_init.lua")
13+
include("msync/client_gui/cl_net.lua")
14+
include("msync/client_gui/cl_modules.lua")
1915

2016
end

‎msync/client_gui/modules/cl_samplemodule.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ MSync.modules.SampleModule = MSync.modules.SampleModule or {}
1515
MSync.modules.SampleModule.info = {
1616
Name = "Sample Module",
1717
ModuleIdentifier = "SampleModule",
18-
Description = "A basic example module on how to create modules"
18+
Description = "A basic example module on how to create modules",
19+
Version = "0.0.1"
1920
}
2021

2122
--[[

‎msync/server/modules/sv_samplemodule.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ MSync.modules.SampleModule = MSync.modules.SampleModule or {}
1515
MSync.modules.SampleModule.info = {
1616
Name = "Sample Module",
1717
ModuleIdentifier = "SampleModule",
18-
Description = "A basic example module on how to create modules"
18+
Description = "A basic example module on how to create modules",
19+
Version = "1.0.0"
1920
}
2021

2122
--[[

‎msync/server/sv_hooks.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Returns: nothing
44
]]
55
hook.Add( "Initialize", "msync.initScript", function()
6-
MSync.function.loadSettings()
6+
MSync.func.loadSettings()
77

88
--[[
99
Description: timer to prevent loading before ULX

‎msync/server/sv_init.lua‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
MSync = MSync or {}
22
MSync.net = MSync.net or {}
33
MSync.mysql = MSync.mysql or {}
4-
MSync.modules = MSync.modules or {}
4+
MSync.modules = MSync.modules or {}
55
MSync.settings = MSync.settings or {}
6-
MSync.function = MSync.function or {}
6+
MSync.func = MSync.func or {}
77

88
--[[
99
Description: Function to load the server side files
1010
Returns: nothing
1111
]]
12-
function MSync.function.loadServer()
12+
function MSync.func.loadServer()
1313

14-
include("/msync/server/sv_net.lua")
15-
include("/msync/server/sv_mysql.lua")
16-
include("/msync/server/sv_modules.lua")
17-
include("/msync/server/sv_hooks.lua")
14+
include("msync/server/sv_net.lua")
15+
include("msync/server/sv_mysql.lua")
16+
include("msync/server/sv_modules.lua")
17+
include("msync/server/sv_hooks.lua")
18+
include("msync/server/sv_ulx.lua")
19+
20+
local files, _ = file.Find("msync/client_gui/*.lua", "LUA")
21+
for k, v in pairs(files) do
22+
AddCSLuaFile("msync/client_gui/"..v)
23+
end
1824

1925
end
2026

2127
--[[
2228
Description: Function to load the MSync settings file
2329
Returns: true
2430
]]
25-
function MSync.function.loadSettings()
31+
function MSync.func.loadSettings()
2632
if not file.Exists("msync/settings.txt", "DATA") then
2733
MSync.settings.data = {
2834
mysql = {
@@ -50,7 +56,7 @@ end
5056
Description: Function to save the MSync settings to the settings file
5157
Returns: true if the settings file exists
5258
]]
53-
function MSync.function.saveSettings()
59+
function MSync.func.saveSettings()
5460
file.Write("msync/settings.txt", util.TableToJSON(MSync.settings.data, true))
5561
return file.Exists("msync/settings.txt", "DATA")
5662
end
@@ -59,7 +65,7 @@ end
5965
Description: Function to get a table of the module informations
6066
Returns: table with Module informations
6167
]]
62-
function MSync.function.getModuleInfos()
68+
function MSync.func.getModuleInfos()
6369
local infoTable = {}
6470

6571
for k,v in pairs(MSync.modules) do
@@ -75,9 +81,9 @@ end
7581
We have decided that its better to Re-Enter the password always, and not be able to see the MySQL password client side
7682
Returns: safe settings table
7783
]]
78-
function MSync.function.getSafeSettings()
84+
function MSync.func.getSafeSettings()
7985
local settings = MSync.settings.data
8086
settings.mysql.password = nil
81-
87+
8288
return settings
8389
end

‎msync/server/sv_modules.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ MSync.modules = MSync.modules or {}
88
Returns: nothing
99
]]
1010
function MSync.loadModules()
11-
for k, v in pairs(file.Find("msync/server/modules/*.lua", "LUA")[1]) do
11+
local files, _ = file.Find("msync/server/modules/*.lua", "LUA")
12+
for k, v in pairs(files) do
1213
include("msync/server/modules/"..v)
1314
end
1415
end

‎msync/server/sv_mysql.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MSync = MSync or {}
22
MSync.net = MSync.net or {}
33
MSync.mysql = MSync.mysql or {}
44
MSync.settings = MSync.settings or {}
5-
MSync.function = MSync.function or {}
5+
MSync.func = MSync.func or {}
66

77
--[[
88
Description: initializes the MySQL part

‎msync/server/sv_net.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ net.Receive("msync.sendSettings", function(len, ply)
5656
if not ply:query("msync.sendSettings") then return end
5757

5858
MSync.settings.data = net.ReadTable()
59-
MSync.function.saveSettings()
59+
MSync.func.saveSettings()
6060
end )
6161

6262
--[[
@@ -66,7 +66,7 @@ end )
6666
net.Receive("msync.getSettings", function(len, ply)
6767
if not ply:query("msync.getSettings") then return end
6868

69-
MSync.net.sendTable(ply, "settings", MSync.function.getSafeSettings())
69+
MSync.net.sendTable(ply, "settings", MSync.func.getSafeSettings())
7070
end )
7171

7272
--[[
@@ -76,5 +76,5 @@ end )
7676
net.Receive("msync.getModules", function(len, ply)
7777
if not ply:query("msync.getModules") then return end
7878

79-
MSync.net.sendTable(ply, "modules", MSync.function.getModuleInfos())
79+
MSync.net.sendTable(ply, "modules", MSync.func.getModuleInfos())
8080
end )

‎msync/server/sv_ulx.lua‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
MSync = MSync or {}
2+
MSync.ulx = MSync.ulx or {}
23

34
function MSync.ulx.createPermissions()
4-
ucl.registerAccess("msync.getTable", "superadmin", "Allows player to get MSync tables", "MSync")
5-
ucl.registerAccess("msync.sendSettings", "superadmin", "Allows player to send settings to server", "MSync")
6-
ucl.registerAccess("msync.connectDB", "superadmin", "Allows player to connect the server to the database server", "MSync")
7-
ucl.registerAccess("msync.resetSettings", "superadmin", "Allows the player to reset the settings", "MSync")
8-
ucl.registerAccess("msync.loadModule", "superadmin", "Allows the player to load a module", "MSync")
9-
ucl.registerAccess("msync.reloadModules", "superadmin", "Allows the player to reload all modules", "MSync")
10-
ucl.registerAccess("msync.toggleModule", "superadmin", "Allows the player to enable/disable modules", "MSync" )
11-
ucl.registerAccess("msync.openAdminGUI", "superadmin", "Allows the player to see the admin gui", "MSync" )
5+
ULib.ucl.registerAccess("msync.getTable", "superadmin", "Allows player to get MSync tables", "MSync")
6+
ULib.ucl.registerAccess("msync.sendSettings", "superadmin", "Allows player to send settings to server", "MSync")
7+
ULib.ucl.registerAccess("msync.connectDB", "superadmin", "Allows player to connect the server to the database server", "MSync")
8+
ULib.ucl.registerAccess("msync.resetSettings", "superadmin", "Allows the player to reset the settings", "MSync")
9+
ULib.ucl.registerAccess("msync.loadModule", "superadmin", "Allows the player to load a module", "MSync")
10+
ULib.ucl.registerAccess("msync.reloadModules", "superadmin", "Allows the player to reload all modules", "MSync")
11+
ULib.ucl.registerAccess("msync.toggleModule", "superadmin", "Allows the player to enable/disable modules", "MSync" )
12+
ULib.ucl.registerAccess("msync.openAdminGUI", "superadmin", "Allows the player to see the admin gui", "MSync" )
1213
end
1314
--ucl.registerAccess("msync.", "superadmin", "", "MSync" )

0 commit comments

Comments
 (0)