Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bloat & Fix stuff #1623

Merged
merged 40 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
bd2d580
Remove legacy http check function
ccuser44 Oct 15, 2024
11a0d0d
Convert usage of legacy function
ccuser44 Oct 15, 2024
27dfea8
Add support for legacy function usage
ccuser44 Oct 15, 2024
1ea82f1
Fix typo
ccuser44 Oct 15, 2024
079362a
Convert spaces to tab
ccuser44 Oct 15, 2024
29c4ea1
Convert spaces to tabs
ccuser44 Oct 15, 2024
d217a1d
Move Trello functions to plugin
ccuser44 Oct 15, 2024
514923b
Update Urgent_Messages.luau
ccuser44 Oct 15, 2024
969a14c
Add log
ccuser44 Oct 15, 2024
96e9b6e
Add plugin load log
ccuser44 Oct 15, 2024
d9bfa22
Update Debug_Specific.luau
ccuser44 Oct 15, 2024
cfafee1
Update Cross_Server.luau
ccuser44 Oct 15, 2024
593d203
Update Anti_Cheat.luau
ccuser44 Oct 15, 2024
21ad78f
Add plugin load log
ccuser44 Oct 15, 2024
c292cca
Remove cruft
ccuser44 Oct 15, 2024
ec5290e
Remove cruft
ccuser44 Oct 15, 2024
b131774
Remove cruft
ccuser44 Oct 15, 2024
8f74302
Fix log order
ccuser44 Oct 15, 2024
c20c7b7
Simplify script
ccuser44 Oct 15, 2024
52e643a
Fix indentation
ccuser44 Oct 15, 2024
95086fd
Optimise Glitcher.rbxmx
ccuser44 Oct 15, 2024
7ce70ce
Optimise and fix Illegal.client.luau
ccuser44 Oct 15, 2024
f6f24db
Optimise
ccuser44 Oct 15, 2024
43e0f14
Fix deprecated usage
ccuser44 Oct 15, 2024
c6147a7
Optimise Clipper.rbxmx
ccuser44 Oct 15, 2024
0710e5a
Convert deprecated usage
ccuser44 Oct 15, 2024
cc85638
Remove cruft
ccuser44 Oct 15, 2024
5bcefaa
Remove cruft
ccuser44 Oct 15, 2024
e9301f3
Remove cruft
ccuser44 Oct 15, 2024
3e9dd88
Remove cruft
ccuser44 Oct 15, 2024
a38f09c
Remove cruft
ccuser44 Oct 15, 2024
f8ffda8
Remove cruft
ccuser44 Oct 15, 2024
7839170
Remove cruft
ccuser44 Oct 15, 2024
7efca0e
Remove cruft
ccuser44 Oct 15, 2024
844cf07
Remove cruft
ccuser44 Oct 15, 2024
6a1f0ee
Remove cruft
ccuser44 Oct 15, 2024
a22b7a8
Fix things
ccuser44 Oct 16, 2024
959ebe9
Temporarily turn on lint
ccuser44 Oct 16, 2024
78b4f7c
Remove unused
ccuser44 Oct 16, 2024
6fbba98
Re-disable lint
ccuser44 Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .github/build.project.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "Adonis_Rojo",
"tree": {
"$className": "Folder",
"MainModule": {
"$path": "../MainModule"
},
"Adonis_Loader": {
"$className": "Model",
"$path": "../Loader"
}
}
}
"name": "Adonis_Rojo",
"emitLegacyScripts": true,
"tree": {
"$className": "Folder",
"MainModule": {
"$path": "../MainModule"
},
"Adonis_Loader": {
"$className": "Model",
"$path": "../Loader"
}
}
}
2 changes: 1 addition & 1 deletion Loader/Config/init.meta.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"className": "Configuration"
"className": "Configuration"
}
2 changes: 0 additions & 2 deletions MainModule/Client/Client.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand All @@ -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)),
Expand Down
31 changes: 0 additions & 31 deletions MainModule/Client/Core/Core.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
31 changes: 0 additions & 31 deletions MainModule/Client/Core/Functions.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
36 changes: 0 additions & 36 deletions MainModule/Client/Core/Process.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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])
Expand All @@ -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)
Expand Down
32 changes: 0 additions & 32 deletions MainModule/Client/Core/Remote.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)))

Expand Down
34 changes: 1 addition & 33 deletions MainModule/Client/Core/UI.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -195,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
Expand All @@ -207,7 +176,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")
Expand Down Expand Up @@ -327,7 +296,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)
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Server/Commands/Players.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 1 addition & 28 deletions MainModule/Server/Core/Admin.luau
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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({
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -1507,7 +1481,6 @@ return function(Vargs, GetEnv)
end
end
end
--end

return msg
end;
Expand Down
Loading
Loading