From bd2d580a6180a9ce2fbaef7125a6f4ffdb5b62fa Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:39:59 +0300 Subject: [PATCH 01/40] Remove legacy http check function --- MainModule/Server/Core/HTTP.luau | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/MainModule/Server/Core/HTTP.luau b/MainModule/Server/Core/HTTP.luau index cf4a6cecf8..7a8ee32fb2 100644 --- a/MainModule/Server/Core/HTTP.luau +++ b/MainModule/Server/Core/HTTP.luau @@ -52,10 +52,6 @@ return function(Vargs, GetEnv) end)(); LoadstringEnabled = pcall(loadstring, ""); - CheckHttp = function() - return HTTP.HttpEnabled - end; - WebPanel = { Moderators = {}; Admins = {}; @@ -202,7 +198,7 @@ return function(Vargs, GetEnv) return; end - if not HTTP.CheckHttp() then + if not HTTP.HttpEnabled then warn("Unable to connect to Trello. Make sure HTTP Requests are enabled in Game Settings.") return; else From 11a0d0df735233301d9f437a2e7959c66c1ff879 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:43:01 +0300 Subject: [PATCH 02/40] Convert usage of legacy function --- MainModule/Server/Commands/Players.luau | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainModule/Server/Commands/Players.luau b/MainModule/Server/Commands/Players.luau index f817d73245..d65a042d3d 100644 --- a/MainModule/Server/Commands/Players.luau +++ b/MainModule/Server/Commands/Players.luau @@ -973,7 +973,7 @@ return function(Vargs, env) ObjectCount = #Variables.Objects; CameraCount = #Variables.Cameras; NilPlayerCount = nilPlayers; - HttpEnabled = HTTP.CheckHttp(); + HttpEnabled = HTTP.HttpEnabled; LoadstringEnabled = HTTP.LoadstringEnabled; } end From 27dfea868b4feb945109d6d0ad3e39470de400fa Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:47:03 +0300 Subject: [PATCH 03/40] Add support for legacy function usage --- MainModule/Server/Plugins/Misc_Features.luau | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MainModule/Server/Plugins/Misc_Features.luau b/MainModule/Server/Plugins/Misc_Features.luau index 958e2e5da9..01890fb6ab 100644 --- a/MainModule/Server/Plugins/Misc_Features.luau +++ b/MainModule/Server/Plugins/Misc_Features.luau @@ -61,6 +61,9 @@ return function(Vargs, GetEnv) Variables.Aliases[k] = v end end + Http.CheckHttp = function() + return HTTP.HttpEnabled + end Logs:AddLog("Script", "Misc Features Module Loaded") end From 1ea82f14d0b668644ae05eac38289c1796443ae9 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:51:46 +0300 Subject: [PATCH 04/40] Fix typo --- MainModule/Server/Plugins/Misc_Features.luau | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainModule/Server/Plugins/Misc_Features.luau b/MainModule/Server/Plugins/Misc_Features.luau index 01890fb6ab..5ccaf70abf 100644 --- a/MainModule/Server/Plugins/Misc_Features.luau +++ b/MainModule/Server/Plugins/Misc_Features.luau @@ -44,7 +44,7 @@ return function(Vargs, GetEnv) local Len = (type(pLen) == "number" and pLen) or random(5,10) --// reru local Res = {} for Idx = 1, Len do - Res[Idx] = format('%02x', random(255)) + Res[Idx] = format("%02x", random(255)) end return table.concat(Res) end @@ -61,7 +61,7 @@ return function(Vargs, GetEnv) Variables.Aliases[k] = v end end - Http.CheckHttp = function() + HTTP.CheckHttp = function() return HTTP.HttpEnabled end From 079362add2ce8f3ac54902999d5dc9f0efa68d5a Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:57:26 +0300 Subject: [PATCH 05/40] Convert spaces to tab --- Loader/Config/init.meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loader/Config/init.meta.json b/Loader/Config/init.meta.json index 24b2bc3b5a..eec46840df 100644 --- a/Loader/Config/init.meta.json +++ b/Loader/Config/init.meta.json @@ -1,3 +1,3 @@ { - "className": "Configuration" + "className": "Configuration" } From 29c4ea16c2973e588ed98add1a87b88dbad5ecfd Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:58:48 +0300 Subject: [PATCH 06/40] Convert spaces to tabs --- .github/build.project.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/build.project.json b/.github/build.project.json index 902d7fdaac..237bfd7eff 100644 --- a/.github/build.project.json +++ b/.github/build.project.json @@ -1,13 +1,13 @@ { - "name": "Adonis_Rojo", - "tree": { - "$className": "Folder", - "MainModule": { - "$path": "../MainModule" - }, - "Adonis_Loader": { - "$className": "Model", - "$path": "../Loader" - } - } -} \ No newline at end of file + "name": "Adonis_Rojo", + "tree": { + "$className": "Folder", + "MainModule": { + "$path": "../MainModule" + }, + "Adonis_Loader": { + "$className": "Model", + "$path": "../Loader" + } + } +} From d217a1db1355da1438554bc82de2c65919a41400 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:07:59 +0300 Subject: [PATCH 07/40] Move Trello functions to plugin --- MainModule/Server/Core/HTTP.luau | 121 ------------------------------- 1 file changed, 121 deletions(-) diff --git a/MainModule/Server/Core/HTTP.luau b/MainModule/Server/Core/HTTP.luau index 7a8ee32fb2..198a90b32b 100644 --- a/MainModule/Server/Core/HTTP.luau +++ b/MainModule/Server/Core/HTTP.luau @@ -30,7 +30,6 @@ return function(Vargs, GetEnv) if Settings.Trello_Enabled then HTTP.Trello.API = require(server.Deps.TrelloAPI)(Settings.Trello_AppKey, Settings.Trello_Token) - service.StartLoop("TRELLO_UPDATER", Settings.HttpWait, HTTP.Trello.Update, true) end HTTP.Init = nil; @@ -193,126 +192,6 @@ return function(Vargs, GetEnv) } }; - Update = function() - if not HTTP.Trello.API or not Settings.Trello_Enabled then - return; - end - - if not HTTP.HttpEnabled then - warn("Unable to connect to Trello. Make sure HTTP Requests are enabled in Game Settings.") - return; - else - local data = { - Bans = {}; - Mutes = {}; - Music = {}; - Whitelist = {}; - Blacklist = {}; - InsertList = {}; - Agents = {}; - Ranks = { - ["Moderators"] = {}, - ["Admins"] = {}, - ["HeadAdmins"] = {}, - ["Creators"] = {} - }; - } - - local function grabData(board) - local lists: {List} = HTTP.Trello.API.getListsAndCards(board, true) - if #lists == 0 then error("L + ratio") end --TODO: Improve TrelloAPI error handling so we don't need to assume no lists = failed request - - for _, list in lists do - local foundOverride = false - - for _, override in HTTP.Trello.Overrides do - if table.find(override.Lists, list.name) then - foundOverride = true - for _, card in list.cards do - override.Process(card, data) - end - break - end - end - - -- Allow lists for custom ranks - if not foundOverride and not data.Ranks[list.name] then - local rank = Settings.Ranks[list.name] - - if rank and not rank.IsExternal then - local users = {} - for _, card in list.cards do - table.insert(users, card.name) - end - data.Ranks[list.name] = users - end - end - end - end - - local success = true - local boards = { - Settings.Trello_Primary, - unpack(Settings.Trello_Secondary) - } - for i,v in boards do - if not v or service.Trim(v) == "" then - continue - end - local ran, err = pcall(grabData, v) - if not ran then - warn("Unable to reach Trello. Ensure your board IDs, Trello key, and token are all correct. If issue persists, try increasing HttpWait in your Adonis settings.") - success = false - break - end - end - - -- Only replace existing values if all data was fetched successfully - if success then - HTTP.Trello.Bans = data.Bans - HTTP.Trello.Music = data.Music - HTTP.Trello.InsertList = data.InsertList - HTTP.Trello.Mutes = data.Mutes - HTTP.Trello.Agents = data.Agents - - Variables.Blacklist.Lists.Trello = data.Blacklist - Variables.Whitelist.Lists.Trello = data.Whitelist - - --// Clear any custom ranks that were not fetched from Trello - for rank, info in Settings.Ranks do - if rank.IsExternal and not data.Ranks[rank] then - Settings.Ranks[rank] = nil - end - end - - for rank, users in data.Ranks do - local name = string.format("[Trello] %s", server.Functions.Trim(rank)) - Settings.Ranks[name] = { - Level = Settings.Ranks[rank].Level or 1; - Users = users, - IsExternal = true, - Hidden = Settings.Trello_HideRanks; - } - end - - for i, v in service.GetPlayers() do - local isBanned, Reason = Admin.CheckBan(v) - if isBanned then - v:Kick(string.format("%s | Reason: %s", Variables.BanMessage, (Reason or "No reason provided"))) - continue - end - - Admin.UpdateCachedLevel(v) - end - - Logs.AddLog(Logs.Script,{ - Text = "Updated Trello data"; - Desc = "Data was retreived from Trello"; - }) - end - end - end; - GetOverrideLists = function() local lists = {} for _, override in HTTP.Trello.Overrides do From 514923bcd2348bbf41ae2cb5721f0d334c108302 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:01:20 +0300 Subject: [PATCH 08/40] Update Urgent_Messages.luau --- MainModule/Server/Plugins/Urgent_Messages.luau | 2 -- 1 file changed, 2 deletions(-) diff --git a/MainModule/Server/Plugins/Urgent_Messages.luau b/MainModule/Server/Plugins/Urgent_Messages.luau index aa8339188d..254ca7b2b2 100644 --- a/MainModule/Server/Plugins/Urgent_Messages.luau +++ b/MainModule/Server/Plugins/Urgent_Messages.luau @@ -1,6 +1,4 @@ - return function(Vargs, GetEnv) - local server = Vargs.Server; local service = Vargs.Service; From 969a14c0c4688f015b59f5514f8a649844565549 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:03:07 +0300 Subject: [PATCH 09/40] Add log --- MainModule/Server/Plugins/Server-SoftShutdown.luau | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MainModule/Server/Plugins/Server-SoftShutdown.luau b/MainModule/Server/Plugins/Server-SoftShutdown.luau index 18adbd7c6d..d4fb41e545 100644 --- a/MainModule/Server/Plugins/Server-SoftShutdown.luau +++ b/MainModule/Server/Plugins/Server-SoftShutdown.luau @@ -3,7 +3,6 @@ --// GitHub@Expertcoderz was here to make things look better return function(Vargs, GetEnv) - local server = Vargs.Server local service = Vargs.Service @@ -257,4 +256,6 @@ return function(Vargs, GetEnv) end end } + + Logs:AddLog("Script", "Soft Shutdown Module Loaded"); end From 96e9b6e0bb66de6c578362b9677c16cde848ce43 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:06:11 +0300 Subject: [PATCH 10/40] Add plugin load log --- MainModule/Server/Plugins/FindExistingObjects.luau | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MainModule/Server/Plugins/FindExistingObjects.luau b/MainModule/Server/Plugins/FindExistingObjects.luau index e027e2c44e..0a6df51b50 100644 --- a/MainModule/Server/Plugins/FindExistingObjects.luau +++ b/MainModule/Server/Plugins/FindExistingObjects.luau @@ -5,7 +5,6 @@ --]] return function(Vargs, GetEnv) - local server = Vargs.Server; local service = Vargs.Service; @@ -31,4 +30,6 @@ return function(Vargs, GetEnv) }) end end + + Logs:AddLog("Script", "Current Adonis objects successfully loaded in to instance lists"); end From d9bfa2244e4ae9162a5c5ba2b032d7d4ac96f152 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:06:34 +0300 Subject: [PATCH 11/40] Update Debug_Specific.luau --- MainModule/Server/Plugins/Debug_Specific.luau | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Server/Plugins/Debug_Specific.luau b/MainModule/Server/Plugins/Debug_Specific.luau index 6c0b49c13a..9337518eef 100644 --- a/MainModule/Server/Plugins/Debug_Specific.luau +++ b/MainModule/Server/Plugins/Debug_Specific.luau @@ -4,7 +4,6 @@ --// NOTE: THIS IS NOT A *CONFIG/USER* PLUGIN! ANYTHING IN THE MAINMODULE PLUGIN FOLDERS IS ALREADY PART OF/LOADED BY THE SCRIPT! DO NOT ADD THEM TO YOUR CONFIG>PLUGINS FOLDER! return function(Vargs, GetEnv) - local server = Vargs.Server; local service = Vargs.Service; From cfafee1c951ef024a301a46bacb736f418f131d1 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:06:52 +0300 Subject: [PATCH 12/40] Update Cross_Server.luau --- MainModule/Server/Plugins/Cross_Server.luau | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Server/Plugins/Cross_Server.luau b/MainModule/Server/Plugins/Cross_Server.luau index 9b44cf5302..409b3e34f7 100644 --- a/MainModule/Server/Plugins/Cross_Server.luau +++ b/MainModule/Server/Plugins/Cross_Server.luau @@ -2,7 +2,6 @@ --// This module is for stuff specific to cross server communication --// NOTE: THIS IS NOT A *CONFIG/USER* PLUGIN! ANYTHING IN THE MAINMODULE PLUGIN FOLDERS IS ALREADY PART OF/LOADED BY THE SCRIPT! DO NOT ADD THEM TO YOUR CONFIG>PLUGINS FOLDER! return function(Vargs, GetEnv) - local server = Vargs.Server; local service = Vargs.Service; From 593d203bfcc2370848ff740276c0dade8bb2bbaa Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:07:28 +0300 Subject: [PATCH 13/40] Update Anti_Cheat.luau --- MainModule/Server/Plugins/Anti_Cheat.luau | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Server/Plugins/Anti_Cheat.luau b/MainModule/Server/Plugins/Anti_Cheat.luau index d051e4d267..6365945582 100644 --- a/MainModule/Server/Plugins/Anti_Cheat.luau +++ b/MainModule/Server/Plugins/Anti_Cheat.luau @@ -1,7 +1,6 @@ --// Anti-Exploit return function(Vargs, GetEnv) - local server = Vargs.Server; local service = Vargs.Service; From 21ad78f92d0788b5b01fdacbd47198315b4ea918 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:09:48 +0300 Subject: [PATCH 14/40] Add plugin load log --- MainModule/Server/Plugins/Adonis_Agents.luau | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MainModule/Server/Plugins/Adonis_Agents.luau b/MainModule/Server/Plugins/Adonis_Agents.luau index dc5fa198c9..faaf6e6b5b 100644 --- a/MainModule/Server/Plugins/Adonis_Agents.luau +++ b/MainModule/Server/Plugins/Adonis_Agents.luau @@ -51,4 +51,6 @@ return function(Vargs, GetEnv) command.Agent = true end end + + Logs:AddLog("Script", "Adonis Agents module loaded") end From c292ccadc7abc6d2370632b8f6b1e8366fb81f11 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:12:48 +0300 Subject: [PATCH 15/40] Remove cruft --- MainModule/Server/Server.luau | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/MainModule/Server/Server.luau b/MainModule/Server/Server.luau index 3772fc0b56..52db89b6b5 100644 --- a/MainModule/Server/Server.luau +++ b/MainModule/Server/Server.luau @@ -209,15 +209,7 @@ local function LoadModule(module, yield, envVars, noEnv, isCore) GetEnv ) return err - - --[[elseif yield then (all pcalls yield by default for a quite a while time now) - --Pcall(setfenv(plug,GetEnv(getfenv(plug), envVars))) - local ran,err = service.TrackTask(`Plugin: {module}`, (noEnv and plug) or setfenv(plug, GetEnv(getfenv(plug), envVars)),function(err) - warn(`Module encountered an error while loading: {module}\n{err}\n{debug.traceback()}`) - end, GetVargTable()) - return err;]] else - --service.Threads.RunTask(`PLUGIN: {module}`,setfenv(plug,GetEnv(getfenv(plug), envVars))) local ran, err = service.TrackTask( `Plugin: {module}`, ((noEnv or isRaw or isValue) and plug) or setfenv(plug, GetEnv(getfenv(plug), envVars)), @@ -268,11 +260,7 @@ local function LoadPackage(package, folder, runNow) end; local function CleanUp() - --local env = getfenv(2) - --local ran,ret = pcall(function() return env.script:GetFullName() end) print("Beginning Adonis cleanup & shutdown process...") - --warn(`CleanUp called from {tostring((ran and ret) or "Unknown")}`) - --local loader = server.Core.ClientLoader local data = service.UnWrap(server.Data) if type(data) == "table" and typeof(service.UnWrap(data.Config)) == "Instance" then local Settings: ModuleScript = service.UnWrap(data.Config):FindFirstChild("Settings") @@ -299,9 +287,6 @@ local function CleanUp() table.remove(RbxEvents, i) end end) - --loader.Archivable = false - --loader.Disabled = true - --loader:Destroy() if server.Core and server.Core.RemoteEvent then pcall(server.Core.DisconnectEvent) end @@ -658,7 +643,6 @@ return service.NewProxy({ }) end - --// Load services for ind, serv in ipairs(SERVICES_WE_USE) do local temp = service[serv] @@ -739,7 +723,7 @@ return service.NewProxy({ local code = Instance.new("StringValue") code.Name = service.HttpService:GenerateGUID(false) - code.Value = server.Functions.Base64Encode(module:sub(1, 4) == "\27Lua" or server.Core.Bytecode(module)) + code.Value = server.Functions.Base64Encode(module:sub(1, 4) == "\27Lua" or server.Core.Bytecode(module)) code.Parent = server.Client.Plugins end end From ec5290e453ba732f709622786fc0b1b2ee74511c Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:16:53 +0300 Subject: [PATCH 16/40] Remove cruft --- MainModule/Client/Client.luau | 2 -- 1 file changed, 2 deletions(-) diff --git a/MainModule/Client/Client.luau b/MainModule/Client/Client.luau index 0791c910e3..8c2d7705c1 100644 --- a/MainModule/Client/Client.luau +++ b/MainModule/Client/Client.luau @@ -277,7 +277,6 @@ local LoadModule = function(module, yield, envVars, noEnv) if plugran then if type(plug) == "function" then if yield then - --Pcall(setfenv(plug,GetEnv(getfenv(plug), envVars))) local ran, err = service.TrackTask( `Plugin: {module}`, ((noEnv or isRaw or isValue) and plug) or setfenv(plug, GetEnv(getfenv(plug), envVars)), @@ -288,7 +287,6 @@ local LoadModule = function(module, yield, envVars, noEnv) GetEnv ) else - -- service.Threads.RunTask(`PLUGIN: {module,setfenv(plug,GetEnv(getfenv(plug), envVars))}`) local ran, err = service.TrackTask( `Thread: Plugin: {module}`, ((noEnv or isRaw or isValue) and plug) or setfenv(plug, GetEnv(getfenv(plug), envVars)), From b131774e00e968fdbbf24c1149c52eeaa7ff48a8 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:19:28 +0300 Subject: [PATCH 17/40] Remove cruft --- MainModule/Server/Shared/Service.luau | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/MainModule/Server/Shared/Service.luau b/MainModule/Server/Shared/Service.luau index 8ed46d7d65..a34a921888 100644 --- a/MainModule/Server/Shared/Service.luau +++ b/MainModule/Server/Shared/Service.luau @@ -1281,26 +1281,12 @@ return function(errorHandler, eventChecker, fenceSpecific, env) tab.Kill = kill RunningLoops[index] = tab - if noYield then service.TrackTask(`Thread: Loop: {name}`, loop, false) else service.TrackTask(`Loop: {name}`, loop, false) end - --[[local task = service.Threads.RunTask(`LOOP:{name}`, loop) - - if not noYield then - task.Finished:wait() - kill() - end--]] - - --[[if noYield then - Routine(loop) - else - loop() - end--]] - return tab end; StopLoop = function(name) From 8f7430247f27fda2689cadb2d43f43972f9af4b7 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:22:25 +0300 Subject: [PATCH 18/40] Fix log order --- MainModule/Server/Plugins/Anti_Cheat.luau | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MainModule/Server/Plugins/Anti_Cheat.luau b/MainModule/Server/Plugins/Anti_Cheat.luau index 6365945582..168fb0576d 100644 --- a/MainModule/Server/Plugins/Anti_Cheat.luau +++ b/MainModule/Server/Plugins/Anti_Cheat.luau @@ -22,8 +22,6 @@ return function(Vargs, GetEnv) end local function RunAfterPlugins(data) - Logs:AddLog("Script", "Anti Plugin Module RunAfterPlugins Finished"); - local function onPlayerAdded(player) if not player.Character then player.CharacterAdded:Wait() @@ -32,7 +30,6 @@ return function(Vargs, GetEnv) if Admin.GetLevel(player) < Settings.Ranks.Moderators.Level or Core.DebugMode then Anti.CharacterCheck(player) end - end if not Settings.Detection then @@ -53,6 +50,7 @@ return function(Vargs, GetEnv) end service.Players.PlayerAdded:Connect(onPlayerAdded) + Logs:AddLog("Script", "Anti Plugin Module RunAfterPlugins Finished") end local antiNotificationDebounce, antiNotificationResetTick = {}, os.clock() + 60 From c20c7b76ddcc744afb2293827a16fa5f357beac4 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:32:43 +0300 Subject: [PATCH 19/40] Simplify script --- MainModule/Server/Dependencies/Assets/Quacker.server.luau | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/Quacker.server.luau b/MainModule/Server/Dependencies/Assets/Quacker.server.luau index e16db13f37..5301e27d70 100644 --- a/MainModule/Server/Dependencies/Assets/Quacker.server.luau +++ b/MainModule/Server/Dependencies/Assets/Quacker.server.luau @@ -2,8 +2,7 @@ while true do task.wait(math.random(5, 20)) if script.Parent ~= nil then - local name = `Quack{math.random(1, 4)}` - script.Parent:FindFirstChild(name):Play() + script.Parent:FindFirstChild(`Quack{math.random(1, 4)}`):Play() else break end From 52e643acde8290ce7bc120ff37f3e6d3ebe97f42 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:33:55 +0300 Subject: [PATCH 20/40] Fix indentation --- MainModule/Server/Dependencies/Assets/Spinner.client.luau | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/Spinner.client.luau b/MainModule/Server/Dependencies/Assets/Spinner.client.luau index c8abb2762b..3a72663733 100644 --- a/MainModule/Server/Dependencies/Assets/Spinner.client.luau +++ b/MainModule/Server/Dependencies/Assets/Spinner.client.luau @@ -1,6 +1,6 @@ local torso = script.Parent local bg = torso:FindFirstChild("ADONIS_SPIN_GYRO") repeat - task.wait(1/44) - bg.CFrame *= CFrame.Angles(0,math.rad(12),0) + task.wait(1/44) + bg.CFrame *= CFrame.Angles(0,math.rad(12),0) until not bg or bg.Parent ~= torso From 95086fd901ff430aa80a92d5e52c69386f3894db Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:57:54 +0300 Subject: [PATCH 21/40] Optimise Glitcher.rbxmx --- .../Server/Dependencies/Assets/Glitcher.rbxmx | 53 ++++++------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/Glitcher.rbxmx b/MainModule/Server/Dependencies/Assets/Glitcher.rbxmx index 3682f7d3df..af0d4db9a1 100644 --- a/MainModule/Server/Dependencies/Assets/Glitcher.rbxmx +++ b/MainModule/Server/Dependencies/Assets/Glitcher.rbxmx @@ -13,46 +13,27 @@ local torso = script.Parent local posed = false local type = script:WaitForChild("Type").Value -local int = script:WaitForChild("Num").Value +local int = tonumber(script:WaitForChild("Num").Value) or 50 game:GetService("RunService").RenderStepped:Connect(function() - if posed then - if type == "ghost" then - torso.CFrame = torso.CFrame+Vector3.new(((tonumber(int) or 100)*2),0,0) - elseif type == "trippy" then - torso.CFrame = torso.CFrame*CFrame.new(((tonumber(int) or 100)*2),0,0) - elseif type == "vibrate" then - local num = math.random(1,4) - if num == 1 then - torso.CFrame = torso.CFrame*CFrame.new(((tonumber(int)*2) or 100),0,0) - elseif num == 2 then - torso.CFrame = torso.CFrame*CFrame.new(-((tonumber(int)*2) or 100),0,0) - elseif num == 3 then - torso.CFrame = torso.CFrame*CFrame.new(0,0,-((tonumber(int)*2) or 100)) - elseif num == 4 then - torso.CFrame=torso.CFrame*CFrame.new(0,0,((tonumber(int)*2) or 100)) - end - end - posed = false - else - if type == "ghost" then - torso.CFrame = torso.CFrame+Vector3.new(-((tonumber(int)*2) or 100),0,0) - elseif type == "trippy" then - torso.CFrame = torso.CFrame*CFrame.new(-((tonumber(int)*2) or 100),0,0) - elseif type == "vibrate" then - local num = math.random(1,4) - if num == 1 then - torso.CFrame = torso.CFrame*CFrame.new(((tonumber(int)*2) or 100),0,0) - elseif num == 2 then - torso.CFrame = torso.CFrame*CFrame.new(-((tonumber(int)*2) or 100),0,0) - elseif num == 3 then - torso.CFrame = torso.CFrame*CFrame.new(0,0,-((tonumber(int)*2) or 100)) - elseif num == 4 then - torso.CFrame = torso.CFrame*CFrame.new(0,0,((tonumber(int)*2) or 100)) - end + if type == "ghost" then + torso.CFrame += Vector3.new(tonumber(int) * (posed and 4 or -2), 0, 0) + elseif type == "trippy" then + torso.CFrame *= CFrame.new(tonumber(int) * (posed and 4 or -2), 0, 0) + elseif type == "vibrate" then + local num = math.random(1,4) + + if num == 1 then + torso.CFrame *= CFrame.new(tonumber(int) * 2, 0, 0) + elseif num == 2 then + torso.CFrame *= CFrame.new(-tonumber(int) * 2, 0, 0) + elseif num == 3 then + torso.CFrame *= CFrame.new(0, 0, -tonumber(int) * 2) + elseif num == 4 then + torso.CFrame *= CFrame.new(0 ,0, tonumber(int) * 2) end - posed = true end + posed = not posed end)]]> -1 From 7ce70ce46401746846e0faa6801303bb2409932b Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:06:00 +0300 Subject: [PATCH 22/40] Optimise and fix Illegal.client.luau --- .../Dependencies/Assets/Illegal.client.luau | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/Illegal.client.luau b/MainModule/Server/Dependencies/Assets/Illegal.client.luau index 87689ce722..0551a7df11 100644 --- a/MainModule/Server/Dependencies/Assets/Illegal.client.luau +++ b/MainModule/Server/Dependencies/Assets/Illegal.client.luau @@ -1,39 +1,39 @@ local msgs={ { -Msg='We need more..... philosophy... ya know?', +Msg="We need more..... philosophy... ya know?", Color=Enum.ChatColor.Green },{ -Msg='OH MY GOD STOP TRYING TO EAT MY SOUL', +Msg="OH MY GOD STOP TRYING TO EAT MY SOUL", Color=Enum.ChatColor.Red },{ -Msg='I.... CANT.... FEEL.... MY FACE', +Msg="I.... CANT.... FEEL.... MY FACE", Color=Enum.ChatColor.Red },{ -Msg='DO YOU SEE THE TURTLE?!?!', +Msg="DO YOU SEE THE TURTLE?!?!", Color=Enum.ChatColor.Red },{ -Msg='Omg puff the magic dragon!!!!', +Msg="Omg puff the magic dragon!!!!", Color=Enum.ChatColor.Green },{ -Msg='Omg double wat', +Msg="Omg double wat", Color=Enum.ChatColor.Blue },{ -Msg='WHO STOLE MY LEGS', +Msg="WHO STOLE MY LEGS", Color=Enum.ChatColor.Red },{ -Msg='I... I think I might be dead....', +Msg="I... I think I might be dead....", Color=Enum.ChatColor.Blue },{ Msg="I'M GOING TO EAT YOUR FACE", Color=Enum.ChatColor.Red },{ -Msg='Hey... Like... What if, like, listen, are you listening? What if.. like.. earth.. was a ball?', +Msg="Hey... Like... What if, like, listen, are you listening? What if.. like.. earth.. was a ball?", Color=Enum.ChatColor.Green },{ -Msg='WHY IS EVERYBODY TALKING SO LOUD AHHHHHH', +Msg="WHY IS EVERYBODY TALKING SO LOUD AHHHHHH", Color=Enum.ChatColor.Red },{ -Msg='Woooo man do you see the elephent... theres an elephent man..its... PURPLE OHMY GOD ITS A SIGN FROM LIKE THE WARDROBE..', +Msg="Woooo man do you see the elephent... theres an elephent man..its... PURPLE OHMY GOD ITS A SIGN FROM LIKE THE WARDROBE..", Color=Enum.ChatColor.Blue }} @@ -41,10 +41,10 @@ local Chat = game:GetService("Chat") local head = script.Parent.Parent.Head local humanoid = script.Parent.Parent:FindFirstChildOfClass("Humanoid") local torso = script.Parent -local val = Instance.new('StringValue') -val.Parent = head -local old = math.random() +local old = math.huge local stop = false +local val = Instance.new("StringValue") +val.Parent = head humanoid.Died:Connect(function() stop = true @@ -53,22 +53,21 @@ humanoid.Died:Connect(function() end) task.spawn(function() - while not stop and head and val and val.Parent==head do - local new=math.random(1,#msgs) - for k,m in pairs(msgs) do - if new==k then - if old ~= new then - old=new - print(m.Msg) - Chat:Chat(head,m.Msg,m.Color) - end - end + while not stop and head and val and val.Parent == head do + local new = math.random(1, #msgs) + + if old ~= new then + local m = msgs[new] + old = new + print(m.Msg) + Chat:Chat(head, m.Msg, m.Color) end + task.wait(5) end end) -humanoid.WalkSpeed=-16 +humanoid.WalkSpeed = -16 local startspaz = false @@ -76,28 +75,28 @@ task.spawn(function() repeat task.wait(0.1) workspace.CurrentCamera.FieldOfView = math.random(20, 80) - humanoid.Health:TakeDamage(0.5) + humanoid:TakeDamage(0.5) if startspaz then humanoid.PlatformStand = true torso.AssemblyLinearVelocity = Vector3.new(math.random(-10, 10), -5, math.random(-10, 10)) torso.AssemblyAngularVelocity = Vector3.new(math.random(-5, 5), math.random(-5, 5), math.random(-5, 5)) end - until stop or not humanoid or not humanoid.Parent or humanoid.Health<=0 or not torso + until stop or not humanoid or not humanoid.Parent or humanoid.Health <= 0 or not torso end) task.wait(10) local bg = Instance.new("BodyGyro") bg.Name = "SPINNER" -bg.maxTorque = Vector3.new(0,math.huge,0) +bg.maxTorque = Vector3.new(0, math.huge, 0) bg.P = 11111 bg.cframe = torso.CFrame bg.Parent = torso task.spawn(function() repeat task.wait(1/44) - bg.cframe = bg.cframe * CFrame.Angles(0,math.rad(30),0) + bg.cframe *= CFrame.Angles(0, math.rad(30), 0) until stop or not bg or bg.Parent ~= torso end) From f6f24db9949de9f988bc17a9cf67197a3d61fc64 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:08:57 +0300 Subject: [PATCH 23/40] Optimise --- MainModule/Server/Dependencies/Assets/Seize.client.luau | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainModule/Server/Dependencies/Assets/Seize.client.luau b/MainModule/Server/Dependencies/Assets/Seize.client.luau index 547dfed03f..269ffeef87 100644 --- a/MainModule/Server/Dependencies/Assets/Seize.client.luau +++ b/MainModule/Server/Dependencies/Assets/Seize.client.luau @@ -1,5 +1,5 @@ local root = script.Parent -local humanoid = script.Parent.Parent:FindFirstChildOfClass("Humanoid") +local humanoid = root.Parent:FindFirstChildOfClass("Humanoid") local origvel = root.AssemblyLinearVelocity local origrot = root.AssemblyAngularVelocity From 43e0f14561bec3519e0906bcfecb020d49e15448 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:10:17 +0300 Subject: [PATCH 24/40] Fix deprecated usage --- MainModule/Server/Dependencies/Assets/Sfling.rbxmx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MainModule/Server/Dependencies/Assets/Sfling.rbxmx b/MainModule/Server/Dependencies/Assets/Sfling.rbxmx index 69f0912bae..caa6fd505e 100644 --- a/MainModule/Server/Dependencies/Assets/Sfling.rbxmx +++ b/MainModule/Server/Dependencies/Assets/Sfling.rbxmx @@ -18,12 +18,13 @@ local strength = script:WaitForChild("Strength").Value for i = 1, 100 do task.wait(0.1) humanoid.Sit = true - local ex = Instance.new("Explosion", cam) + local ex = Instance.new("Explosion") ex.Position = torso.Position + Vector3.new(math.random(-5, 5), -10, math.random(-5, 5)) ex.BlastRadius = 35 ex.BlastPressure = strength ex.ExplosionType = Enum.ExplosionType.Craters ex.DestroyJointRadiusPercent = 0 + ex.Parent = cam end script:Destroy()]]> -1 From c6147a7033fdc2d2aac7515cf22e286e4ec857a7 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:23:27 +0300 Subject: [PATCH 25/40] Optimise Clipper.rbxmx --- .../Server/Dependencies/Assets/Clipper.rbxmx | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/Clipper.rbxmx b/MainModule/Server/Dependencies/Assets/Clipper.rbxmx index 6aedb2ffe6..71215654e0 100644 --- a/MainModule/Server/Dependencies/Assets/Clipper.rbxmx +++ b/MainModule/Server/Dependencies/Assets/Clipper.rbxmx @@ -15,16 +15,17 @@ Date: Wed, 16 Oct 2024 01:27:43 +0300 Subject: [PATCH 26/40] Convert deprecated usage --- MainModule/Server/Dependencies/Assets/ClickTeleport.rbxmx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MainModule/Server/Dependencies/Assets/ClickTeleport.rbxmx b/MainModule/Server/Dependencies/Assets/ClickTeleport.rbxmx index a80acfcaea..a1602fc675 100644 --- a/MainModule/Server/Dependencies/Assets/ClickTeleport.rbxmx +++ b/MainModule/Server/Dependencies/Assets/ClickTeleport.rbxmx @@ -33,7 +33,7 @@ local function onButton1Down(mouse) local rootPart = humanoid.RootPart if not rootPart then return end local FlightPos, FlightGyro = rootPart:FindFirstChild("ADONIS_FLIGHT_POSITION"), rootPart:FindFirstChild("ADONIS_FLIGHT_GYRO") - local pos = mouse.Hit.p + local pos = mouse.Hit.Position if FlightPos and FlightGyro then FlightPos.Position = rootPart.Position @@ -41,14 +41,14 @@ local function onButton1Down(mouse) end task.wait() - rootPart:PivotTo(CFrame.new(Vector3.new(pos.x, pos.y + 4, pos.z))) + rootPart:PivotTo(CFrame.new(Vector3.new(pos.X, pos.Y + 4, pos.Z))) if FlightPos and FlightGyro then FlightPos.Position = rootPart.Position FlightGyro.CFrame = rootPart.CFrame end elseif mode == "Walk" then - humanoid:MoveTo(mouse.Hit.p) + humanoid:MoveTo(mouse.Hit.Position) end end @@ -57,7 +57,7 @@ local function rotate() if not rootPart then return end repeat - rootPart:PivotTo(CFrame.new(rootPart.Position, Vector3.new(mouse.Hit.p.X, rootPart.Position.Y, mouse.Hit.p.Z))) + rootPart:PivotTo(CFrame.new(rootPart.Position, Vector3.new(mouse.Hit.Position.X, rootPart.Position.Y, mouse.Hit.Position.Z))) task.wait() until not holding or not use end From cc85638418cf863bc164f1d8f7884b36818dd92b Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:40:55 +0300 Subject: [PATCH 27/40] Remove cruft --- MainModule/Server/Core/Logs.luau | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/MainModule/Server/Core/Logs.luau b/MainModule/Server/Core/Logs.luau index 15db151f7d..cf98129234 100644 --- a/MainModule/Server/Core/Logs.luau +++ b/MainModule/Server/Core/Logs.luau @@ -138,13 +138,8 @@ return function(Vargs, GetEnv) return end - local logsToSave = {Logs.Commands} --{} + local logsToSave = {Logs.Commands} local maxLogs = Logs.OldCommandLogsLimit - --local numLogsToSave = 200; --// Save the last X logs from this server - - --for i = #Logs.Commands, i = math.max(#Logs.Commands - numLogsToSave, 1), -1 do - -- table.insert(logsToSave, Logs.Commands[i]); - --end Core.UpdateData("OldCommandLogs", function(oldLogs) if type(oldLogs) == "string" then From 5bcefaa414a5c0c3e73237b8ea664fe8d56ee2e5 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:44:03 +0300 Subject: [PATCH 28/40] Remove cruft --- MainModule/Server/Core/Remote.luau | 2 -- 1 file changed, 2 deletions(-) diff --git a/MainModule/Server/Core/Remote.luau b/MainModule/Server/Core/Remote.luau index ececa12a36..5d4563efd3 100644 --- a/MainModule/Server/Core/Remote.luau +++ b/MainModule/Server/Core/Remote.luau @@ -980,7 +980,6 @@ return function(Vargs, GetEnv) PrivateMessage = function(p: Player,args: {[number]: any}) if type(args[1]) ~= "string" then return end - -- 'Reply from '..localplayer.Name,player,localplayer,ReplyBox.Text local target = Variables.PMtickets[args[1]] if target or Admin.CheckAdmin(p) then if target then @@ -1219,7 +1218,6 @@ return function(Vargs, GetEnv) local pEvent = service.Players.PlayerRemoving:Connect(function(plr) if plr == p then event:Fire() end end) task.delay(600, function() if not finished then event:Fire() end end) print(string.format("WAITING FOR RETURN %s", tostring(returns))); - --returns = returns or {event:Wait()} Yield:Wait(); Yield:Destroy(); From e9301f342df431ba56aeb5681d70af76a04ca7db Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:47:59 +0300 Subject: [PATCH 29/40] Remove cruft --- MainModule/Server/Core/Process.luau | 8 -------- 1 file changed, 8 deletions(-) diff --git a/MainModule/Server/Core/Process.luau b/MainModule/Server/Core/Process.luau index 9c0ba40584..98b3a9871a 100644 --- a/MainModule/Server/Core/Process.luau +++ b/MainModule/Server/Core/Process.luau @@ -957,7 +957,6 @@ return function(Vargs, GetEnv) if Remote.Clients[key] then Remote.Clients[key].FinishedLoading = true if p.Character and p.Character.Parent == workspace then - --service.Threads.TimeoutRunTask(`{p.Name};CharacterAdded`,Process.CharacterAdded,60,p) local ran, err = TrackTask(`{p.Name} CharacterAdded`, Process.CharacterAdded, false, p, p.Character, {FinishedLoading = true}) if not ran then logError(err) @@ -1108,13 +1107,6 @@ return function(Vargs, GetEnv) end end - --// Check muted - --[=[for ind,admin in Settings.Muted do - if Admin.DoCheck(p, admin) then - Remote.LoadCode(p, [[service.StarterGui:SetCoreGuiEnabled("Chat",false) client.Variables.ChatEnabled = false client.Variables.Muted = true]]) - end - end--]=] - task.spawn(Functions.Donor, p) --// Fire added event From 3e9dd88f78a67f2a7190d74701912ef9e858f48c Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:57:34 +0300 Subject: [PATCH 30/40] Remove cruft --- MainModule/Server/Core/Admin.luau | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/MainModule/Server/Core/Admin.luau b/MainModule/Server/Core/Admin.luau index 51e4e7078f..1460fff01c 100644 --- a/MainModule/Server/Core/Admin.luau +++ b/MainModule/Server/Core/Admin.luau @@ -286,10 +286,6 @@ return function(Vargs, GetEnv) end end - --[[Settings.HeadAdmins = Settings.Ranks.HeadAdmins.Users; - Settings.Admins = Settings.Ranks.Admins.Users; - Settings.Moderators = Settings.Ranks.Moderators.Users;--]] - if Settings.CustomRanks then local Ranks = Settings.Ranks for name, users in Settings.CustomRanks do @@ -787,10 +783,6 @@ return function(Vargs, GetEnv) local checkTable = Admin.CheckTable local doCheck = Admin.DoCheck - --[[if data and data.AdminLevelOverride then - return data.AdminLevelOverride - end--]] - for _, admin in Admin.SpecialLevels do if doCheck(p, admin.Player) then return admin.Level, admin.Rank @@ -866,13 +858,6 @@ return function(Vargs, GetEnv) Level = level, Rank = rankName } - - --[[if doSave then - local data = Core.GetPlayer(p) - if data then - data.AdminLevelOverride = level; - end - end--]] end elseif level == "Reset" then Admin.SpecialLevels[tostring(p.UserId)] = nil @@ -988,12 +973,10 @@ return function(Vargs, GetEnv) end; CheckDonor = function(p) - --if not Settings.DonorPerks then return false end local key = tostring(p.UserId) if Variables.CachedDonors[key] then return true else - --if p.UserId<0 or (tonumber(p.AccountAge) and tonumber(p.AccountAge)<0) then return false end local pGroup = Admin.GetPlayerGroup(p, 886423) for _, pass in Variables.DonorPass do if p.Parent ~= service.Players then @@ -1060,7 +1043,7 @@ return function(Vargs, GetEnv) BanType = banType } - table.insert(Settings.Banned, value)--`{p.Name}:{p.UserId}` + table.insert(Settings.Banned, value) if doSave then Core.DoSave({ @@ -1186,12 +1169,6 @@ return function(Vargs, GetEnv) local cmdArgs = com.Args or com.Arguments local args = Admin.GetArgs(coma, #cmdArgs, ...) - --local task,ran,error = service.Threads.TimeoutRunTask(`SERVER_COMMAND: {coma}`,com.Function,60*5,false,args) - --[[local ran, error = TrackTask(`Command: {coma}`, com.Function, false, args) - if error then - --logError("SERVER","Command",error) - end]] - TrackTask(`Command: {coma}`, com.Function, function(err) warn(`Encountered an error while running a command: {coma}\n{err}\n{debug.traceback()}`) end, false, args) @@ -1227,8 +1204,6 @@ return function(Vargs, GetEnv) }, } ) - - --local task,ran,error = service.Threads.TimeoutRunTask(`COMMAND:{plr.Name}: {coma}`,com.Function,60*5,plr,args) end end; @@ -1497,7 +1472,6 @@ return function(Vargs, GetEnv) end end - --if not foundPlayerAlias then for alias, cmd in Variables.Aliases do local tAlias = stripArgPlaceholders(alias) if not CheckAliasBlacklist(tAlias) then @@ -1507,7 +1481,6 @@ return function(Vargs, GetEnv) end end end - --end return msg end; From a38f09c60d6f865f576cdbc5c220074c7cddedd2 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:00:35 +0300 Subject: [PATCH 31/40] Remove cruft --- MainModule/Server/Core/Core.luau | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Server/Core/Core.luau b/MainModule/Server/Core/Core.luau index 4252e9ab7e..9358ff3cd0 100644 --- a/MainModule/Server/Core/Core.luau +++ b/MainModule/Server/Core/Core.luau @@ -511,7 +511,6 @@ return function(Vargs, GetEnv) TrackTask(`Thread: Setup Existing Player: {p}`, function() Process.PlayerAdded(p) - --Core.MakeClient(p:FindFirstChildOfClass("PlayerGui") or p:WaitForChild("PlayerGui", 120)) end) end; From f8ffda889fde02f33dbb69b3823a64b6dd77588f Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:04:32 +0300 Subject: [PATCH 32/40] Remove cruft --- MainModule/Client/Core/Process.luau | 36 ----------------------------- 1 file changed, 36 deletions(-) diff --git a/MainModule/Client/Core/Process.luau b/MainModule/Client/Core/Process.luau index 1cd734c037..e9b303049c 100644 --- a/MainModule/Client/Core/Process.luau +++ b/MainModule/Client/Core/Process.luau @@ -50,37 +50,6 @@ return function(Vargs, GetEnv) end local function RunLast() - --[[client = service.ReadOnly(client, { - [client.Variables] = true; - [client.Handlers] = true; - G_API = true; - G_Access = true; - G_Access_Key = true; - G_Access_Perms = true; - Allowed_API_Calls = true; - HelpButtonImage = true; - Finish_Loading = true; - RemoteEvent = true; - ScriptCache = true; - Returns = true; - PendingReturns = true; - EncodeCache = true; - DecodeCache = true; - Received = true; - Sent = true; - Service = true; - Holder = true; - GUIs = true; - LastUpdate = true; - RateLimits = true; - - Init = true; - RunLast = true; - RunAfterInit = true; - RunAfterLoaded = true; - RunAfterPlugins = true; - }, true)--]] - Process.RunLast = nil; end @@ -131,7 +100,6 @@ return function(Vargs, GetEnv) local comString = Remote.Decrypt(com,Core.Key) local command = (data.Mode == "Get" and Remote.Returnables[comString]) or Remote.Commands[comString] if command then - --local ran,err = pcall(command, args) --task service.Threads.RunTask(`REMOTE:{comString}`,command,args) local rets = {service.TrackTask(`Remote: {comString}`, command, false, args)} if not rets[1] then logError(rets[2]) @@ -152,10 +120,6 @@ return function(Vargs, GetEnv) if Message and Message ~= "nil" and Message ~= "" and (string.find(Message,":: Adonis ::") or string.find(Message,script.Name) or Script == script) then logError(`{Message} - {Trace}`) end - - --if (Script == nil or (not Trace or Trace == "")) and not (Trace and string.find(Trace,"CoreGui.RobloxGui")) then - --Anti.Detected("log",`Scriptless/Traceless error found. Script: {Script} - Trace: {Trace}`) - --end end; Chat = function(msg) From 78391707b6ac27f2e3ea04c355930a5c84f96b31 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:05:33 +0300 Subject: [PATCH 33/40] Remove cruft --- MainModule/Client/Core/Remote.luau | 32 ------------------------------ 1 file changed, 32 deletions(-) diff --git a/MainModule/Client/Core/Remote.luau b/MainModule/Client/Core/Remote.luau index 4d5a7df68a..110c08766d 100644 --- a/MainModule/Client/Core/Remote.luau +++ b/MainModule/Client/Core/Remote.luau @@ -77,37 +77,6 @@ return function(Vargs, GetEnv) end local function RunLast() - --[[client = service.ReadOnly(client, { - [client.Variables] = true; - [client.Handlers] = true; - G_API = true; - G_Access = true; - G_Access_Key = true; - G_Access_Perms = true; - Allowed_API_Calls = true; - HelpButtonImage = true; - Finish_Loading = true; - RemoteEvent = true; - ScriptCache = true; - Returns = true; - PendingReturns = true; - EncodeCache = true; - DecodeCache = true; - Received = true; - Sent = true; - Service = true; - Holder = true; - GUIs = true; - LastUpdate = true; - RateLimits = true; - - Init = true; - RunLast = true; - RunAfterInit = true; - RunAfterLoaded = true; - RunAfterPlugins = true; - }, true)--]] - Remote.RunLast = nil; end @@ -477,7 +446,6 @@ return function(Vargs, GetEnv) Remote.PendingReturns[key] = true Remote.Send("GetReturn",com,key,...) print(string.format("GETTING RETURNS? %s", tostring(returns))) - --returns = returns or {event:Wait()} waiter.Event:Wait(); print(string.format("WE GOT IT! %s", tostring(returns))) From 7efca0e90f903f63779c89c8df06336585b4f7fc Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:09:33 +0300 Subject: [PATCH 34/40] Remove cruft --- MainModule/Client/Core/UI.luau | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/MainModule/Client/Core/UI.luau b/MainModule/Client/Core/UI.luau index 695747bc37..888c2507d5 100644 --- a/MainModule/Client/Core/UI.luau +++ b/MainModule/Client/Core/UI.luau @@ -60,36 +60,6 @@ return function(Vargs, GetEnv) end local function RunLast() - --[[client = service.ReadOnly(client, { - [client.Variables] = true; - [client.Handlers] = true; - G_API = true; - G_Access = true; - G_Access_Key = true; - G_Access_Perms = true; - Allowed_API_Calls = true; - HelpButtonImage = true; - Finish_Loading = true; - RemoteEvent = true; - ScriptCache = true; - Returns = true; - PendingReturns = true; - EncodeCache = true; - DecodeCache = true; - Received = true; - Sent = true; - Service = true; - Holder = true; - GUIs = true; - LastUpdate = true; - RateLimits = true; - - Init = true; - RunLast = true; - RunAfterInit = true; - RunAfterLoaded = true; - RunAfterPlugins = true; - }, true)--]] UI.DefaultTheme = Remote.Get("Setting","DefaultTheme"); UI.RunLast = nil; end @@ -207,7 +177,7 @@ return function(Vargs, GetEnv) if folder then local baseValue = folder:FindFirstChild("Base_Theme") local baseTheme = baseValue and baseValue.Value - local foundGUI = folder:FindFirstChild(name) --local foundGUI = (baseValue and folder:FindFirstChild(name)) or UIFolder.Default:FindFirstChild(name) + local foundGUI = folder:FindFirstChild(name) if foundGUI then local config = foundGUI:FindFirstChild("Config") @@ -327,7 +297,6 @@ return function(Vargs, GetEnv) end local mult = foundConf.AllowMultiple - --local keep = foundConf.CanKeepAlive local allowMult = mult and mult.Value or true local found, num = UI.Get(name) From 844cf07c415b8ee5dd551bb286ae9ba27816e66f Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:10:55 +0300 Subject: [PATCH 35/40] Remove cruft --- MainModule/Client/Core/Core.luau | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/MainModule/Client/Core/Core.luau b/MainModule/Client/Core/Core.luau index cf4e57cbf4..4c0d2a50b9 100644 --- a/MainModule/Client/Core/Core.luau +++ b/MainModule/Client/Core/Core.luau @@ -72,37 +72,6 @@ return function(Vargs, GetEnv) --service.Threads.RunTask("_G API Manager",client.Core.StartAPI) end - --[[client = service.ReadOnly(client, { - [client.Variables] = true; - [client.Handlers] = true; - G_API = true; - G_Access = true; - G_Access_Key = true; - G_Access_Perms = true; - Allowed_API_Calls = true; - HelpButtonImage = true; - Finish_Loading = true; - RemoteEvent = true; - ScriptCache = true; - Returns = true; - PendingReturns = true; - EncodeCache = true; - DecodeCache = true; - Received = true; - Sent = true; - Service = true; - Holder = true; - GUIs = true; - LastUpdate = true; - RateLimits = true; - - Init = true; - RunLast = true; - RunAfterInit = true; - RunAfterLoaded = true; - RunAfterPlugins = true; - }, true)--]] - Core.RunLast = nil end From 6a1f0ee31cfc30972de75790550bf51eaa9171c9 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 02:16:32 +0300 Subject: [PATCH 36/40] Remove cruft --- MainModule/Client/Core/Functions.luau | 31 --------------------------- 1 file changed, 31 deletions(-) diff --git a/MainModule/Client/Core/Functions.luau b/MainModule/Client/Core/Functions.luau index 5b639f20dc..e298cc0800 100644 --- a/MainModule/Client/Core/Functions.luau +++ b/MainModule/Client/Core/Functions.luau @@ -50,37 +50,6 @@ return function(Vargs, GetEnv) end local function RunLast() - --[[client = service.ReadOnly(client, { - [client.Variables] = true; - [client.Handlers] = true; - G_API = true; - G_Access = true; - G_Access_Key = true; - G_Access_Perms = true; - Allowed_API_Calls = true; - HelpButtonImage = true; - Finish_Loading = true; - RemoteEvent = true; - ScriptCache = true; - Returns = true; - PendingReturns = true; - EncodeCache = true; - DecodeCache = true; - Received = true; - Sent = true; - Service = true; - Holder = true; - GUIs = true; - LastUpdate = true; - RateLimits = true; - - Init = true; - RunLast = true; - RunAfterInit = true; - RunAfterLoaded = true; - RunAfterPlugins = true; - }, true)--]] - Functions.RunLast = nil; end From a22b7a8fa90b48aadd3b50e9551811e36a43fe00 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 03:14:52 +0300 Subject: [PATCH 37/40] Fix things --- .github/build.project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/build.project.json b/.github/build.project.json index 237bfd7eff..1247ef206f 100644 --- a/.github/build.project.json +++ b/.github/build.project.json @@ -1,5 +1,6 @@ { "name": "Adonis_Rojo", + "emitLegacyScripts": true, "tree": { "$className": "Folder", "MainModule": { From 959ebe974b6dc5484de6795d9c09f0429d815691 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:39:33 +0300 Subject: [PATCH 38/40] Temporarily turn on lint --- selene.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selene.toml b/selene.toml index 28af91da92..0c7f1e7d96 100644 --- a/selene.toml +++ b/selene.toml @@ -12,4 +12,4 @@ global_usage = "allow" multiple_statements = "allow" shadowing = "allow" unscoped_variables = "allow" -unused_variable = "allow" +#unused_variable = "allow" From 78b4f7c923064d4fc0314b188f4eb390ee3ec4f2 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:47:16 +0300 Subject: [PATCH 39/40] Remove unused --- MainModule/Client/Core/UI.luau | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Client/Core/UI.luau b/MainModule/Client/Core/UI.luau index 888c2507d5..c128ea6269 100644 --- a/MainModule/Client/Core/UI.luau +++ b/MainModule/Client/Core/UI.luau @@ -165,7 +165,6 @@ return function(Vargs, GetEnv) GetNew = function(theme, name) local foundConfigs = {} local endConfig = {} - local endConfValues = {} local confFolder = Instance.new("Folder") local debounce = false From 6fbba985973c495e28ad1e1393f68884210e510d Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 16 Oct 2024 12:13:28 +0300 Subject: [PATCH 40/40] Re-disable lint --- selene.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selene.toml b/selene.toml index 0c7f1e7d96..28af91da92 100644 --- a/selene.toml +++ b/selene.toml @@ -12,4 +12,4 @@ global_usage = "allow" multiple_statements = "allow" shadowing = "allow" unscoped_variables = "allow" -#unused_variable = "allow" +unused_variable = "allow"