Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6.0.1
- uses: actions/checkout@v7.0.1

- name: Layout file name
id: naming
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Build
run: rojo build -o ${{ steps.naming.outputs.output_name }}.rbxm .github/build.project.json

- uses: actions/upload-artifact@v6.0.0
- uses: actions/upload-artifact@v7.0.1
with:
name: ${{ steps.naming.outputs.output_name }}
path: ${{ steps.naming.outputs.output_name }}.rbxm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@v3.4
- uses: github/issue-labeler@v3.5
with:
configuration-path: .github/labeler.yml
enable-versioned-regex: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v7.0.1

- uses: ok-nick/setup-aftman@v0.4.2
with:
token: ${{ SECRETS.GITHUB_TOKEN }}

- name: Cache Roblox Standard Library
id: cache-roblox-std
uses: actions/cache@v4.2.2
uses: actions/cache@v6.1.0
with:
path: roblox.yml
key: roblox-std
Expand Down
2 changes: 2 additions & 0 deletions Loader/Config/InGameSettingsEditorSettings/Descriptions.luau
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ return {
HelpButton = [[ Shows a little help button in the bottom right corner ]];
HelpButtonImage = [[ Change this to change the help button's image ]];

LegacyCommandList = [[ If true, :cmds will show the old plain command list instead of the modern command list UI ]];

AllowClientAntiExploit = [[ Enables client-sided anti-exploit functionality ]];
Detection = [[ (Extremely important, makes all protection systems work) A global toggle for all the other protection settings ]];
CheckClients = [[ (Important, makes sure Adonis clients are connected to the server) Checks clients every minute or two to make sure they are still active ]];
Expand Down
2 changes: 2 additions & 0 deletions Loader/Config/InGameSettingsEditorSettings/Order.luau
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ return {
"HelpButton";
"HelpButtonImage";
" ";
"LegacyCommandList";
" ";
"DonorCommands";
"DonorCapes";
"LocalCapes";
Expand Down
1 change: 1 addition & 0 deletions Loader/Config/Plugins/Server-Example Plugin.luau
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ return function(Vargs)
Commands = {"example"}; -- Commands
Args = {"arg1"}; -- Command arguments
Description = "Example command"; -- Command Description
Category = "General"; -- Category to group the command under in the command list
Hidden = true; -- Is it hidden from the command list?
Fun = false; -- Is it fun?
AdminLevel = "Players"; -- Admin level; If using settings.CustomRanks set this to the custom rank name (eg. "Baristas")
Expand Down
3 changes: 3 additions & 0 deletions Loader/Config/Settings/General.luau
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ return {
SplitKey = " "; -- The space in :kill me (eg if you change it to / :kill me would be :kill/me)
BatchKey = "|"; -- :kill me | :ff bob | :explode scel
ConsoleKeyCode = "Quote"; -- Keybind to open the console; Rebindable per player in userpanel; KeyCodes: https://developer.roblox.com/en-us/api-reference/enum/KeyCode
FlyKeyCode = "E"; -- Keybind to toggle fly; Rebindable per player in userpanel; KeyCodes: https://developer.roblox.com/en-us/api-reference/enum/KeyCode

HideScript = true; -- When the game starts the Adonis_Loader model will be hidden so other scripts cannot access the settings module; Disable if your game uses AssetService:SavePlaceAsync()

Expand Down Expand Up @@ -90,5 +91,7 @@ return {
HelpButton = true; -- Shows a little help button in the bottom right corner.
HelpButtonImage = "rbxassetid://357249130"; -- Sets the image used for the Adonis help button above.

LegacyCommandList = false; -- If true, :cmds will show the old plain command list instead of the modern command list UI

HttpWait = 60; -- How long things that use the HttpService will wait before updating again
};
2 changes: 1 addition & 1 deletion Loader/Version.model.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ClassName": "NumberValue",
"Properties": {
"Value": 281
"Value": 282
}
}
177 changes: 15 additions & 162 deletions MainModule/Client/Core/Functions.luau
Original file line number Diff line number Diff line change
Expand Up @@ -401,161 +401,6 @@ return function(Vargs, GetEnv)
end;

GetGuiData = function(args)
local props = {
"AbsolutePosition";
"AutomaticCanvasSize";
"BottomImage";
"AbsoluteSize";
"AnchorPoint";
"CornerRadius";
"CanvasSize";
"CanvasPosition";
"ClassName";
"ElasticBehavior";
"Name";
"Parent";
"Archivable";
"DisplayOrder";
"SelectionImageObject";
"Active";
"BackgroundColor3";
"BackgroundTransparency";
"BorderColor3";
"BorderSizePixel";
"Position";
"Rotation";
"RichText";
"Selectable";
"HorizontalScrollBarPosition";
"Size";
"Enabled";
"Active";
"SizeConstraint";
"Style";
"ScrollBarThickness";
"ScrollBarImageTransparency";
"ScrollingEnabled";
"ScrollingDirection";
"ScrollBarImageColor";
"Visible";
"ZIndex";
"ClipsDescendants";
"Draggable";
"NextSelectionDown";
"NextSelectionLeft";
"NextSelectionRight";
"NextSelectionUp";
"PlaceholderColor3";
"PlaceholderText";
"AutoButtonColor";
"Modal";
"MidImage";
"Image";
"ImageColor3";
"ImageRectOffset";
"ImageRectSize";
"ImageTransparency";
"ScaleType";
"SliceCenter";
"Text";
"TopImage";
"TextColor3";
"TextDirection";
"Font";
"TextScaled";
"TextSize";
"TextStrokeColor3";
"TextStrokeTransparency";
"TextTransparency";
"TextTuncate";
"TextWrapped";
"TextXAlignment";
"TextYAlignment";
"VerticalScrollBarInset";
"VerticalScrollBarPosition";
"AspectRatio";
"AspectType";
"DominantAxis";
"Offset";
"Transparency";
"CellPadding";
"CellSize";
"Padding";
"PaddingBottom";
"PaddingLeft";
"PaddingRight";
"PaddingTop";
"Animated";
"Circular";
"EasingDirection";
"EasingStyle";
"TweenTime";
"FillDirection";
"SortOrder";
"VerticalAlignment";
"GamepadInputEnabled";
"ScrollWheelInputEnabled";
"TouchInputEnabled";
"Scale";
"MaxSize";
"MinSize";
"ApplyStrokeMode";
"Color";
"LineJoinMode";
"Thickness";
"FillEmptySpaceColumns";
"FillEmptySpaceRow";
"MajorAxis";
"HorizontalAlignment";
"MaxTextSize";
"MinTextSize";
"GroupColor3";
"GroupTransparency";
"SelectionImageObject";
"Looped";
"Playing";
"TimePosition";
"Video";
"Volume";
"LayoutOrder";
"Ambient";
"LightColor";
"LightDirection";
"CurrentCamera";
"AutomaticSize";
"AutoLocalize";
"RootLocalizationTable";
};

local classes = {
"ScreenGui";
"GuiMain";
"Frame";
"CanvasGroup";
"TextButton";
"TextLabel";
"ImageButton";
"ImageLabel";
"ScrollingFrame";
"TextBox";
"BillboardGui";
"SurfaceGui";
"UICorner";
"UIAspectRatioConstraint";
"UIGradient";
"UIGridLayout";
"UIListLayout";
"UIPadding";
"UIPageLayout";
"UIScale";
"UISizeConstraint";
"UIStroke";
"UITableLayout";
"UITextSizeConstraint";
"VideoFrame";
"ViewportFrame"
}

local guis = {
Properties = {
Name = "ViewGuis";
Expand All @@ -564,12 +409,14 @@ return function(Vargs, GetEnv)
Children = {};
}

local add; add = function(tab,child)
local good = false
local add; add = function(tab, child)
local good = Variables.GuiClasses.Cache[child.ClassName]

for _, v in classes do
if child:IsA(v) then
good = true
if not good then
for _, v in Variables.GuiClasses do
if child:IsA(v) then
good = true
end
end
end

Expand All @@ -579,7 +426,7 @@ return function(Vargs, GetEnv)
Children = {};
}

for _, v in props do
for _, v in Variables.GuiProperties do
pcall(function()
new.Properties[v] = child[v]
end)
Expand Down Expand Up @@ -1265,7 +1112,13 @@ return function(Vargs, GetEnv)
end;

KeyCodeToName = function(keyVal)
local keyCode = Enum.KeyCode:FromValue(tonumber(keyVal))
local keyCode: Enum.KeyCode? = nil

if typeof(keyVal) == "Enum" then
keyCode = Enum.KeyCode:FromName(keyVal.Name)
elseif tonumber(keyVal) then
keyCode = Enum.KeyCode:FromValue(tonumber(keyVal))
end

if keyCode then
local name = service.UserInputService:GetStringForKeyCode(keyCode)
Expand Down
5 changes: 0 additions & 5 deletions MainModule/Client/Core/Process.luau
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,6 @@ return function(Vargs, GetEnv)
end
end

if Variables.GuiViewFolder then
Variables.GuiViewFolder:Destroy()
Variables.GuiViewFolder = nil
end

if Variables.ChatEnabled then
service.StarterGui:SetCoreGuiEnabled(Enum.CoreGuiType.Chat, true)
end
Expand Down
51 changes: 50 additions & 1 deletion MainModule/Client/Core/Variables.luau
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ return function(Vargs, GetEnv)
Functions = client.Functions;
Process = client.Process;
Remote = client.Remote;
Variables.GuiClasses.Cache = service.Lookupify(Variables.GuiClasses)

Variables.Init = nil;
end
Expand All @@ -55,7 +56,7 @@ return function(Vargs, GetEnv)
end

local function RunLast()
Variables.RunLast = nil;
Variables.RunLast = nil;
end

getfenv().client = nil
Expand Down Expand Up @@ -113,5 +114,53 @@ return function(Vargs, GetEnv)
};
KeycodeNames = require(client.Shared.KeycodeNames);
HelpButtonAction = "Info",
CommandListGroupBy = "Rank",
GuiClasses = {
"AdGui", "BillboardGui", "CanvasGroup",
"DockWidgetPluginGui", "Frame", "GuiBase", "GuiBase2d",
"GuiButton", "GuiLabel", "GuiMain", "GuiObject",
"ImageButton", "ImageLabel", "LayerCollector", "PluginGui",
"QWidgetPluginGui", "RelativeGui", "ScreenGui", "ScrollingFrame",
"SurfaceGui", "SurfaceGuiBase", "TextBox", "TextButton",
"TextLabel", "UIAspectRatioConstraint", "UIBase", "UIComponent",
"UIConstraint", "UICorner", "UIDragDetector", "UIFlexItem",
"UIGradient", "UIGridLayout", "UIGridStyleLayout", "UILayout",
"UIListLayout", "UIPadding", "UIPageLayout", "UIScale",
"UIShadow", "UISizeConstraint", "UIStroke", "UITableLayout",
"UITextSizeConstraint", "VideoDisplay", "VideoFrame", "ViewportFrame"
};
GuiProperties = {
"ActivatedCursorIcon", "ActivatedCursorIconContent", "Adornee",
"AdShape", "AlwaysOnTop", "BackgroundColor", "BlurRadius",
"BorderColor", "BorderMode", "BorderOffset", "BorderStrokePosition",
"BottomImageContent", "BottomLeftRadius", "BottomRightRadius", "BoundingBehavior",
"BoundingUI", "Brightness", "ClearTextOnFocus", "ClipToDeviceSafeArea",
"CursorIcon", "CursorIconContent", "CursorPosition", "DistanceLowerLimit",
"DistanceStep", "DistanceUpperLimit", "DragAxis", "DragRelativity",
"DragRotation", "DragSpace", "DragStyle", "DragUDim2",
"EnableVideoAds", "ExtentsOffset", "ExtentsOffsetWorldSpace", "Face",
"FallbackImage", "FallbackImageContent", "FillDirectionMaxCells", "FillEmptySpaceRows",
"FlexMode", "FontFace", "FontSize", "GrowRatio",
"HorizontalFlex", "HorizontalScrollBarInset", "HoverHapticEffect", "HoverImage",
"HoverImageContent", "IgnoreGuiInset", "ImageContent", "InputSink",
"Interactable", "InternalVideoUsage", "ItemLineAlignment", "LightInfluence",
"LineHeight", "Localize", "MaxDistance", "MaxDragAngle",
"MaxDragTranslation", "MaximumResolution", "MaxVisibleGraphemes", "MidImageContent",
"MinDragAngle", "MinDragTranslation", "MultiLine", "OpenTypeFeatures",
"PixelsPerStud", "PlayerToHideFrom", "PressedImage", "PressedImageContent",
"PressHapticEffect", "ReferenceUIInstance", "ResampleMode", "ResetOnSpawn",
"ResponseStyle", "RollOffMaxDistance", "RollOffMinDistance", "RollOffMode",
"SafeAreaCompatibility", "ScreenInsets", "ScrollBarImageColor3", "Selected",
"SelectionBehaviorDown", "SelectionBehaviorLeft", "SelectionBehaviorRight", "SelectionBehaviorUp",
"SelectionGroup", "SelectionModeDragSpeed", "SelectionModeRotateSpeed", "SelectionOrder",
"SelectionStart", "ShowNativeInput", "ShrinkRatio", "SizeOffset",
"SizingMode", "SliceScale", "Spread", "StartCorner",
"StrokeSizingMode", "StudsOffset", "StudsOffsetWorldSpace", "TextColor",
"TextEditable", "TextTruncate", "TextWrap", "TileSize",
"Title", "ToolPunchThroughDistance", "TopImageContent", "TopLeftRadius",
"TopRightRadius", "UIDragSpeedAxisMapping", "VerticalFlex", "VideoColor3",
"VideoContent", "VideoRectOffset", "VideoRectSize", "VideoTransparency",
"Wraps", "ZIndexBehavior", "ZOffset"
};
};
end
Loading
Loading