diff --git a/lua/autorun/gmod_integration.lua b/lua/autorun/gmod_integration.lua index fc22af1..f004d73 100644 --- a/lua/autorun/gmod_integration.lua +++ b/lua/autorun/gmod_integration.lua @@ -1,6 +1,6 @@ if game.SinglePlayer() then return print("Gmod Integration is not supported in Singleplayer!") end gmInte = gmInte || {} -gmInte.version = "0.4.9" +gmInte.version = "0.5.0" gmInte.config = {} gmInte.materials = {} local function loadServerConfig() diff --git a/lua/gmod_integration/shared/sh_api_format.lua b/lua/gmod_integration/core/api/sh_api_format.lua similarity index 100% rename from lua/gmod_integration/shared/sh_api_format.lua rename to lua/gmod_integration/core/api/sh_api_format.lua diff --git a/lua/gmod_integration/shared/sh_http.lua b/lua/gmod_integration/core/api/sh_http.lua similarity index 100% rename from lua/gmod_integration/shared/sh_http.lua rename to lua/gmod_integration/core/api/sh_http.lua diff --git a/lua/gmod_integration/server/sv__websocket.lua b/lua/gmod_integration/core/api/sv__websocket.lua similarity index 100% rename from lua/gmod_integration/server/sv__websocket.lua rename to lua/gmod_integration/core/api/sv__websocket.lua diff --git a/lua/gmod_integration/client/cl_gui_admin.lua b/lua/gmod_integration/core/config/cl_gui_admin.lua similarity index 100% rename from lua/gmod_integration/client/cl_gui_admin.lua rename to lua/gmod_integration/core/config/cl_gui_admin.lua diff --git a/lua/gmod_integration/client/cl_hook.lua b/lua/gmod_integration/core/config/cl_hook.lua similarity index 65% rename from lua/gmod_integration/client/cl_hook.lua rename to lua/gmod_integration/core/config/cl_hook.lua index 6663821..f6db1f8 100644 --- a/lua/gmod_integration/client/cl_hook.lua +++ b/lua/gmod_integration/core/config/cl_hook.lua @@ -1,9 +1,3 @@ -hook.Add("InitPostEntity", "gmInte:Ply:Ready", function() - gmInte.SendNet("ready", { - ["branch"] = LocalPlayer():gmInteGetBranch() - }) -end) - hook.Add("OnPlayerChat", "gmInte:OnPlayerChat:AdminCmd", function(ply, strText, bTeamOnly, bPlayerIsDead) if ply != LocalPlayer() then return end strText = string.lower(strText) diff --git a/lua/gmod_integration/server/sv_con.lua b/lua/gmod_integration/core/config/sv_con.lua similarity index 100% rename from lua/gmod_integration/server/sv_con.lua rename to lua/gmod_integration/core/config/sv_con.lua diff --git a/lua/gmod_integration/sv_config.lua b/lua/gmod_integration/core/config/sv_config.lua similarity index 100% rename from lua/gmod_integration/sv_config.lua rename to lua/gmod_integration/core/config/sv_config.lua diff --git a/lua/gmod_integration/server/sv_settings.lua b/lua/gmod_integration/core/config/sv_settings.lua similarity index 100% rename from lua/gmod_integration/server/sv_settings.lua rename to lua/gmod_integration/core/config/sv_settings.lua diff --git a/lua/gmod_integration/client/cl_net.lua b/lua/gmod_integration/core/net/cl_net.lua similarity index 100% rename from lua/gmod_integration/client/cl_net.lua rename to lua/gmod_integration/core/net/cl_net.lua diff --git a/lua/gmod_integration/server/sv_net.lua b/lua/gmod_integration/core/net/sv_net.lua similarity index 100% rename from lua/gmod_integration/server/sv_net.lua rename to lua/gmod_integration/core/net/sv_net.lua diff --git a/lua/gmod_integration/server/sv_tokens.lua b/lua/gmod_integration/core/security/sv_tokens.lua similarity index 100% rename from lua/gmod_integration/server/sv_tokens.lua rename to lua/gmod_integration/core/security/sv_tokens.lua diff --git a/lua/gmod_integration/client/cl__color.lua b/lua/gmod_integration/core/ui/cl__color.lua similarity index 100% rename from lua/gmod_integration/client/cl__color.lua rename to lua/gmod_integration/core/ui/cl__color.lua diff --git a/lua/gmod_integration/client/cl_context_menu.lua b/lua/gmod_integration/core/ui/cl_context_menu.lua similarity index 100% rename from lua/gmod_integration/client/cl_context_menu.lua rename to lua/gmod_integration/core/ui/cl_context_menu.lua diff --git a/lua/gmod_integration/client/cl_font.lua b/lua/gmod_integration/core/ui/cl_font.lua similarity index 100% rename from lua/gmod_integration/client/cl_font.lua rename to lua/gmod_integration/core/ui/cl_font.lua diff --git a/lua/gmod_integration/client/cl_materials.lua b/lua/gmod_integration/core/ui/cl_materials.lua similarity index 100% rename from lua/gmod_integration/client/cl_materials.lua rename to lua/gmod_integration/core/ui/cl_materials.lua diff --git a/lua/gmod_integration/client/cl_main.lua b/lua/gmod_integration/core/utils/cl_main.lua similarity index 100% rename from lua/gmod_integration/client/cl_main.lua rename to lua/gmod_integration/core/utils/cl_main.lua diff --git a/lua/gmod_integration/shared/sh_con.lua b/lua/gmod_integration/core/utils/sh_con.lua similarity index 100% rename from lua/gmod_integration/shared/sh_con.lua rename to lua/gmod_integration/core/utils/sh_con.lua diff --git a/lua/gmod_integration/shared/sh_player_meta.lua b/lua/gmod_integration/core/utils/sh_player_meta.lua similarity index 100% rename from lua/gmod_integration/shared/sh_player_meta.lua rename to lua/gmod_integration/core/utils/sh_player_meta.lua diff --git a/lua/gmod_integration/shared/sh_main.lua b/lua/gmod_integration/core/utils/sh_utils.lua similarity index 100% rename from lua/gmod_integration/shared/sh_main.lua rename to lua/gmod_integration/core/utils/sh_utils.lua diff --git a/lua/gmod_integration/shared/sh__language.lua b/lua/gmod_integration/languages/sh__language.lua similarity index 71% rename from lua/gmod_integration/shared/sh__language.lua rename to lua/gmod_integration/languages/sh__language.lua index d88acbe..7e42eb1 100644 --- a/lua/gmod_integration/shared/sh__language.lua +++ b/lua/gmod_integration/languages/sh__language.lua @@ -1,4 +1,4 @@ -local default = include("gmod_integration/shared/languages/sh_en.lua") +local default = include("gmod_integration/languages/sh_en.lua") local translationTable = default function gmInte.getTranslation(key, defaultTranslation, ...) local translation = translationTable[key] @@ -16,8 +16,8 @@ function gmInte.loadTranslations() if lang == "en" then translationTable = default else - if file.Exists("gmod_integration/shared/languages/sh_" .. lang .. ".lua", "LUA") then - translationTable = include("gmod_integration/shared/languages/sh_" .. lang .. ".lua") + if file.Exists("gmod_integration/languages/sh_" .. lang .. ".lua", "LUA") then + translationTable = include("gmod_integration/languages/sh_" .. lang .. ".lua") else print("Unknown Language") return diff --git a/lua/gmod_integration/shared/languages/sh_de.lua b/lua/gmod_integration/languages/sh_de.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_de.lua rename to lua/gmod_integration/languages/sh_de.lua diff --git a/lua/gmod_integration/shared/languages/sh_en.lua b/lua/gmod_integration/languages/sh_en.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_en.lua rename to lua/gmod_integration/languages/sh_en.lua diff --git a/lua/gmod_integration/shared/languages/sh_es.lua b/lua/gmod_integration/languages/sh_es.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_es.lua rename to lua/gmod_integration/languages/sh_es.lua diff --git a/lua/gmod_integration/shared/languages/sh_fr.lua b/lua/gmod_integration/languages/sh_fr.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_fr.lua rename to lua/gmod_integration/languages/sh_fr.lua diff --git a/lua/gmod_integration/shared/languages/sh_it.lua b/lua/gmod_integration/languages/sh_it.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_it.lua rename to lua/gmod_integration/languages/sh_it.lua diff --git a/lua/gmod_integration/shared/languages/sh_nl.lua b/lua/gmod_integration/languages/sh_nl.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_nl.lua rename to lua/gmod_integration/languages/sh_nl.lua diff --git a/lua/gmod_integration/shared/languages/sh_pl.lua b/lua/gmod_integration/languages/sh_pl.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_pl.lua rename to lua/gmod_integration/languages/sh_pl.lua diff --git a/lua/gmod_integration/shared/languages/sh_ru.lua b/lua/gmod_integration/languages/sh_ru.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_ru.lua rename to lua/gmod_integration/languages/sh_ru.lua diff --git a/lua/gmod_integration/shared/languages/sh_tr.lua b/lua/gmod_integration/languages/sh_tr.lua similarity index 100% rename from lua/gmod_integration/shared/languages/sh_tr.lua rename to lua/gmod_integration/languages/sh_tr.lua diff --git a/lua/gmod_integration/server/sv_rcon.lua b/lua/gmod_integration/modules/console_commands/sv_rcon.lua similarity index 100% rename from lua/gmod_integration/server/sv_rcon.lua rename to lua/gmod_integration/modules/console_commands/sv_rcon.lua diff --git a/lua/gmod_integration/server/compatibility/chatm/sv_atm.lua b/lua/gmod_integration/modules/money_trackers/chatm/sv_atm.lua similarity index 100% rename from lua/gmod_integration/server/compatibility/chatm/sv_atm.lua rename to lua/gmod_integration/modules/money_trackers/chatm/sv_atm.lua diff --git a/lua/gmod_integration/server/compatibility/darkrp/sv_darkrp.lua b/lua/gmod_integration/modules/money_trackers/darkrp/sv_darkrp.lua similarity index 100% rename from lua/gmod_integration/server/compatibility/darkrp/sv_darkrp.lua rename to lua/gmod_integration/modules/money_trackers/darkrp/sv_darkrp.lua diff --git a/lua/gmod_integration/server/sv_filtrers.lua b/lua/gmod_integration/modules/player_whitelist/sv_filtrers.lua similarity index 100% rename from lua/gmod_integration/server/sv_filtrers.lua rename to lua/gmod_integration/modules/player_whitelist/sv_filtrers.lua diff --git a/lua/gmod_integration/client/cl_gui_wrong_branch.lua b/lua/gmod_integration/modules/players_filter_branch/cl_gui_wrong_branch.lua similarity index 100% rename from lua/gmod_integration/client/cl_gui_wrong_branch.lua rename to lua/gmod_integration/modules/players_filter_branch/cl_gui_wrong_branch.lua diff --git a/lua/gmod_integration/modules/players_filter_branch/cl_hook copy.lua b/lua/gmod_integration/modules/players_filter_branch/cl_hook copy.lua new file mode 100644 index 0000000..d68d81f --- /dev/null +++ b/lua/gmod_integration/modules/players_filter_branch/cl_hook copy.lua @@ -0,0 +1,5 @@ +hook.Add("InitPostEntity", "gmInte:Ply:Ready", function() + gmInte.SendNet("ready", { + ["branch"] = LocalPlayer():gmInteGetBranch() + }) +end) \ No newline at end of file diff --git a/lua/gmod_integration/client/cl_gui_link.lua b/lua/gmod_integration/modules/players_filter_link_account/cl_gui_link.lua similarity index 100% rename from lua/gmod_integration/client/cl_gui_link.lua rename to lua/gmod_integration/modules/players_filter_link_account/cl_gui_link.lua diff --git a/lua/gmod_integration/server/sv_players_verif.lua b/lua/gmod_integration/modules/players_filter_link_account/sv_players_verif.lua similarity index 100% rename from lua/gmod_integration/server/sv_players_verif.lua rename to lua/gmod_integration/modules/players_filter_link_account/sv_players_verif.lua diff --git a/lua/gmod_integration/server/sv_players.lua b/lua/gmod_integration/modules/players_logs/sv_players.lua similarity index 100% rename from lua/gmod_integration/server/sv_players.lua rename to lua/gmod_integration/modules/players_logs/sv_players.lua diff --git a/lua/gmod_integration/client/cl_report_bug.lua b/lua/gmod_integration/modules/report_bugs/cl_report_bug.lua similarity index 100% rename from lua/gmod_integration/client/cl_report_bug.lua rename to lua/gmod_integration/modules/report_bugs/cl_report_bug.lua diff --git a/lua/gmod_integration/shared/sh_errors.lua b/lua/gmod_integration/modules/report_errors/sh_errors.lua similarity index 100% rename from lua/gmod_integration/shared/sh_errors.lua rename to lua/gmod_integration/modules/report_errors/sh_errors.lua diff --git a/lua/gmod_integration/client/cl_screenshots.lua b/lua/gmod_integration/modules/screenshots/cl_screenshots.lua similarity index 100% rename from lua/gmod_integration/client/cl_screenshots.lua rename to lua/gmod_integration/modules/screenshots/cl_screenshots.lua diff --git a/lua/gmod_integration/server/sv_status.lua b/lua/gmod_integration/modules/server_status/sv_status.lua similarity index 100% rename from lua/gmod_integration/server/sv_status.lua rename to lua/gmod_integration/modules/server_status/sv_status.lua diff --git a/lua/gmod_integration/server/sv_sync_bans.lua b/lua/gmod_integration/modules/sync_bans/sv_sync_bans.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_bans.lua rename to lua/gmod_integration/modules/sync_bans/sv_sync_bans.lua diff --git a/lua/gmod_integration/client/cl_sync_chat.lua b/lua/gmod_integration/modules/sync_chat/cl_sync_chat.lua similarity index 100% rename from lua/gmod_integration/client/cl_sync_chat.lua rename to lua/gmod_integration/modules/sync_chat/cl_sync_chat.lua diff --git a/lua/gmod_integration/server/sv_sync_chat.lua b/lua/gmod_integration/modules/sync_chat/sv_sync_chat.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_chat.lua rename to lua/gmod_integration/modules/sync_chat/sv_sync_chat.lua diff --git a/lua/gmod_integration/server/sv_sync_kicks.lua b/lua/gmod_integration/modules/sync_kicks/sv_sync_kicks.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_kicks.lua rename to lua/gmod_integration/modules/sync_kicks/sv_sync_kicks.lua diff --git a/lua/gmod_integration/server/sv_sync_names.lua b/lua/gmod_integration/modules/sync_pseudos/sv_sync_names.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_names.lua rename to lua/gmod_integration/modules/sync_pseudos/sv_sync_names.lua diff --git a/lua/gmod_integration/server/sv_sync_roles.lua b/lua/gmod_integration/modules/sync_usergroups/sv_sync_roles.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_roles.lua rename to lua/gmod_integration/modules/sync_usergroups/sv_sync_roles.lua diff --git a/lua/gmod_integration/server/sv_sync_warn.lua b/lua/gmod_integration/modules/sync_warns/awarn3/sv_sync_warn.lua similarity index 100% rename from lua/gmod_integration/server/sv_sync_warn.lua rename to lua/gmod_integration/modules/sync_warns/awarn3/sv_sync_warn.lua