Merge branch 'Epix-Incorporated:master' into master

.editorconfig

@@ -30,3 +30,18 @@ end_of_line = lf
 
 [*.rbxmx]
 end_of_line = lf
+
+[*.txt]
+end_of_line = lf
+
+[*.bat]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = lf
+
+[*.sh]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = lf

.gitattributes

@@ -13,3 +13,9 @@
 *.toml eol=lf
 *.yml text=auto
 *.yml eol=lf
+*.txt text=auto
+*.txt eol=lf
+*.bat text=auto
+*.bat eol=lf
+*.sh text=auto
+*.sh eol=lf

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -23,7 +23,7 @@ body:
     id: loader-version
     attributes:
       label: Loader version
-      description: If your issue is related to loader/settings and you do not provide this we may not be able to solve your issue. Paste the value from `Adonis_Loader > Version > .Value` ![Version VALUE](https://media.discordapp.net/attachments/834826232565727282/1194191940640587836/image.png)
+      description: If your issue is related to loader/settings and you do not provide this we may not be able to solve your issue. Paste the value from `Adonis_Loader > Version > .Value` ![Version VALUE](loader_version.png)
       placeholder: Value of the version variable. "Latest" is invalid as unbeknownst you may not be using the latest loader for many reasons
   - type: dropdown
     id: segment
@@ -37,6 +37,7 @@ body:
         - GitHub Repository
         - Anti-Exploit
         - Trello
+        - F3X/Building Tools
         - Other
     validations:
       required: true
@@ -48,6 +49,14 @@ body:
       placeholder: ex. When I ran :shutdown, I expected the server to shut down, but instead...
     validations:
       required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: What are the steps to reproduce this issue?
+      placeholder: ex. 1. Attempt to ban Sceleratis 2. Get hacked by Sceleratis instead 3. Have your disappointment be immeasurable
+    validations:
+      required: true
   - type: dropdown
     id: device
     attributes:

.github/ISSUE_TEMPLATE/Feature_Request.yml

@@ -19,6 +19,8 @@ body:
         - Documentation
         - GitHub Repository
         - Anti-Exploit
+        - Trello
+        - F3X/Building Tools
         - Other
     validations:
       required: true
@@ -29,4 +31,4 @@ body:
       placeholder: ex. Add a new command that does XYZ
     validations:
       required: true
-
+

.github/alerts.deploy.project.json

@@ -0,0 +1,6 @@
+{
+	"name": "MainModule",
+	"tree": {
+		"$path": "../MainModule/Server/Dependencies/__URGENT_MESSAGES.luau"
+	}
+}

.github/build.project.json

@@ -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"
+		}
+	}
+}

.github/labeler.yml

@@ -10,5 +10,12 @@
   - '### What part of Adonis is this related to\?\s+GitHub Repository'
 '🖇️ loader':
   - '### What part of Adonis is this related to\?\s+Loader/Settings'
+'trello':
+  - '### What part of Adonis is this related to\?\s+Trello'
+'❌ invalid':
+  - '### What part of Adonis is this related to\?\s+F3X/Building Tools'
 '🎏 miscellaneous':
   - '### What part of Adonis is this related to\?\s+Other'
+'⌛needs PoF':
+  - '^(?!.*What part of Adonis is this related to)(?!.*([Pp]\-?[Oo]\-?[Ff]|[Pp][Rr][Oo]+[Ff][\-_\s]*[Oo][Ff][\-_\s]*[Ww][Oo][Rr][Kk])).*$'
+

.github/loader.deploy.project.json

@@ -1,5 +1,6 @@
 {
 	"name": "Adonis_Loader",
+	"emitLegacyScripts": true,
 	"tree": {
 		"$className": "Model",
 		"$path": "../Loader"

.github/module.deploy.project.json

@@ -1,6 +1,7 @@
 {
 	"name": "MainModule",
+	"emitLegacyScripts": true,
 	"tree": {
 		"$path": "../MainModule"
 	}
-}
+}

.github/workflows/close_issues.yml

@@ -0,0 +1,23 @@
+name: Close invalid issues
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  close-issue:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+
+      - name: Close issue
+        if: github.event.label.name == '❌ invalid' && !(contains(github.event.issue.body, 'F3X/Building Tools'))
+        run: gh issue close --comment "This issue has been closed as invalid. Please look at our [contribution guide](https://github.com/Epix-Incorporated/Adonis/blob/master/CONTRIBUTING.md)" --reason "not planned" "1"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Close BTools issue 
+        if: github.event.label.name == '❌ invalid' && (contains(github.event.issue.body, 'F3X/Building Tools'))
+        run: gh issue close --comment "We use F3X for our building tools system. Please [make an issue ticket](https://github.com/F3XTeam/RBX-Building-Tools/issues/new) on the F3X Team BTools repository." --reason "not planned" "1"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/labeling.yml → .github/workflows/labeler.yml

@@ -1,14 +1,14 @@
-name: Issue labeling
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened, edited]
 
 permissions:
   issues: write
   contents: read
 
-on:
-  issues:
-    types: [opened]
 jobs:
-  autotriage:
+  triage:
     runs-on: ubuntu-latest
     steps:
     - uses: github/[email protected]

.github/workflows/pof_handler.yml

@@ -13,14 +13,14 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.2.1
 
       - name: Check comment and image
         run: |
           comment_body=$(jq -r '.comment.body' "$GITHUB_EVENT_PATH")
           comment_body_lowercase=$(echo $comment_body | awk '{print tolower($0)}')
 
-          if [[ $comment_body_lowercase =~ "(p\-?o\-?f|proof[-_\s]*of[-_\s]*work)\:?.*\!\[.*\]\(.+\)" ]]; then
+          if [[ $comment_body_lowercase =~ "(p\-?o\-?f|proof[\-_\s]*of[\-_\s]*work)\:?[\r\n]*.*(\!?\[.*\]\(.+\)|\<?https?:\/\/.)" ]]; then
             echo "Found proper pof"
             echo "remove_label=true" >> $GITHUB_OUTPUT
           else

.github/workflows/publish.yml

@@ -55,6 +55,9 @@ jobs:
       - name: Set DebugMode off
         run: sed -i "s/DebugMode = true/DebugMode = false/g" Loader/Loader/Loader.server.luau
 
+      - name: Set NightlyMode off
+        run: sed -i "s/NightlyMode = true/NightlyMode = false/g" Loader/Loader/Loader.server.luau
+
       - name: Build Standalone
         run: rojo build -o ${{ steps.naming.outputs.output_name }}.rbxm .github/build.project.json
 
@@ -64,11 +67,14 @@ jobs:
           path: ${{ steps.naming.outputs.output_name }}.rbxm
 
       - name: Build Loader
-        run: rojo build -o loader.rbxm .github/loader.deploy.project.json
+        run: rojo build -o Adonis_Loader.rbxm .github/loader.deploy.project.json
 
       - name: Build MainModule
-        run: rojo build -o module.rbxm .github/module.deploy.project.json
-
+        run: rojo build -o Adonis_MainModule.rbxm .github/module.deploy.project.json
+
+      - name: Build Alerts Module
+        run: rojo build -o Adonis_AlertsModule.rbxm .github/alerts.deploy.project.json
+
       - name: Send Standalone Release to Discord channel
         uses: tsickert/[email protected]
         with:
@@ -81,7 +87,7 @@ jobs:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.LOADER_ID }}"
           method: "POST"
           contentType: "multipart/form-data"
-          files: '{ "file": "loader.rbxm" }'
+          files: '{ "file": "Adonis_Loader.rbxm" }'
           customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
           timeout: 10000
 
@@ -91,6 +97,16 @@ jobs:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.MODULE_ID }}"
           method: "POST"
           contentType: "multipart/form-data"
-          files: '{ "file": "module.rbxm" }'
+          files: '{ "file": "Adonis_MainModule.rbxm" }'
+          customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
+          timeout: 10000
+
+      - name: Publish Alerts Module
+        uses: fjogeleit/[email protected]
+        with:
+          url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.ALERTS_MODULE_ID }}"
+          method: "POST"
+          contentType: "multipart/form-data"
+          files: '{ "file": "Adonis_AlertsModule.rbxm" }'
           customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
           timeout: 10000

.gitignore

@@ -3,4 +3,10 @@
 
 # Build Files
 /Adonis_**.rbxm
+/Adonis_**.rbxmx
+/Adonis_**.rbxl
+/Adonis_**.rbxlx
 /Adonis.rbxm
+/Adonis.rbxmx
+/Adonis.rbxl
+/Adonis.rbxlx

LICENSE.luau

@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
+    Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
+Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Loader/Config/Settings.luau

@@ -210,6 +210,16 @@ settings.Aliases = {
 	[":examplealias <player> <fireColor>"] = ":ff <player> | :fling <player> | :fire <player> <fireColor>" --// Order arguments appear in alias string determines their required order in the command message when ran later
 };
 
+settings.Cameras = {
+--[[
+	"Camera Name" would be the name of your camera
+	{
+		Name = "Camera Name";
+		Position = Vector3.new(0, 0, 0)
+	}
+]]
+}
+
 settings.Banned = {}		-- List of people banned from the game 		  Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
 settings.Muted = {}			-- List of people muted (cannot send chat messages)				 		  Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
 settings.Blacklist = {}		-- List of people banned from running commands 	  Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
@@ -284,7 +294,6 @@ settings.CreatorPowers = true			-- Gives me creator-level admin; This is strictl
 settings.CodeExecution = true			-- Enables the use of code execution in Adonis; Scripting related (such as :s) and a few other commands require this
 settings.SilentCommandDenials = false	-- If true, there will be no differences between the error messages shown when a user enters an invalid command and when they have insufficient permissions for the command
 settings.OverrideChatCallbacks = true	-- If the TextChatService ShouldDeliverCallbacks of all channels are overridden by Adonis on load. Required for slowmode. Mutes use a CanSend method to mute when this is set to false.
-settings.ChatCreateRobloxCommands = true	-- Whether "/" commands for Roblox should get created in new Chat
 
 settings.BanMessage = "Banned"				-- Message shown to banned users upon kick
 settings.LockMessage = "Not Whitelisted"	-- Message shown to people when they are kicked while the game is :slocked
@@ -297,12 +306,11 @@ settings.SongHint = true		           -- Display a hint with the current song nam
 settings.TopBarShift = false	           -- By default hints and notifications will appear from the top edge of the window. Set this to true if you don't want hints/notifications to appear in that region.
 settings.DefaultTheme = "Default"		   -- Theme to be used as a replacement for "Default". The new replacement theme can still use "Default" as its Base_Theme however any other theme that references "Default" as its redirects to this theme.
 settings.HiddenThemes = {}				   -- Hide themes from the theme selector tab inside the userpanel. Each theme name must be the specific name such as "Mobilius"
-settings.Messages = {}			           -- A list of notification messages to show HeadAdmins and above on join
+settings.Messages = {}			           -- A list of notifications shown on join. Messages can either be strings or tables. Messages are shown to HeadAdmins+ by default but tables can define a different minimum level via .Level
 settings.AutoClean = false		           -- Will auto clean workspace of things like hats and tools
 settings.AutoCleanDelay = 60	           -- Time between auto cleans
 settings.AutoBackup = false 	           -- Run :backupmap automatically when the server starts. To restore the map, run :restoremap
 settings.ReJail = false			           -- If true then when a player rejoins they'll go back into jail. Or if the moderator leaves everybody gets unjailed
-settings.DisableRejoinAtMaxPlayers = false -- If true, disables rejoin when max players is reached to avoid an exploit that allows more players than the max amount.
 
 settings.Console = true				-- Whether the command console is enabled
 settings.Console_AdminsOnly = false -- If true, only admins will be able to access the console
@@ -376,7 +384,6 @@ settings.AntiNoclip = false					-- (Default: false)	Attempts to detect noclippin
 settings.AntiRootJointDeletion = false		-- (Default: false)	Attempts to detect paranoid and kills the player if found.
 settings.AntiMultiTool = false 				-- (Default: false)	Prevents multitool and because of that many other exploits.
 settings.AntiGod = false 					-- (Default: false)	If a player does not respawn when they should have they get respawned.
--- settings.AntiHumanoidDeletion and settings.ProtectHats have been superseded by Workspace.RejectCharacterDeletions.
 
 settings.AntiSpeed = false 				-- (Default: false)	(Client-Sided) Attempts to detect speed exploits.
 settings.AntiBuildingTools = false		-- (Default: false)	(Client-Sided) Attempts to detect any HopperBin(s)/Building Tools added to the client.
@@ -409,6 +416,7 @@ descs.Creators = [[ Anyone to be identified as a place owner; Format: {"Username
 
 descs.Permissions = [[ Command permissions; Format: {"Command:NewLevel";} ]]
 descs.Aliases = [[ Command aliases; Format: {[":alias <arg1> <arg2> ..."] = ":command <arg1> <arg2> ..."} ]]
+descs.Cameras = [[ Cameras; Format: {Name = "CamName", Position = Vector3.new(X, Y, Z)} ]]
 
 descs.Commands = [[ Custom commands ]]
 descs.Banned = [[ List of people banned from the game; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID";} ]]
@@ -459,7 +467,6 @@ descs.CrossServerCommands = [[ Are commands which affect more than one server en
 descs.ChatCommands = [[ If false you will not be able to run commands via the chat; Instead, you MUST use the console or you will be unable to run commands ]]
 descs.SilentCommandDenials = [[ If true, there will be no differences between the error messages shown when a user enters an invalid command and when they have insufficient permissions for the command ]]
 descs.OverrideChatCallbacks = [[ If the TextChatService ShouldDeliverCallbacks of all channels are overridden by Adonis on load. Required for muting ]]
-descs.ChatCreateRobloxCommands = [[ Whether "/" commands for Roblox should get created in new Chat ]]
 
 descs.BanMessage = [[ Message shown to banned users ]]
 descs.LockMessage = [[ Message shown to people when they are kicked while the game is :slocked ]]
@@ -474,9 +481,8 @@ descs.SongHint = [[ Display a hint with the current song name and ID when a song
 descs.TopBarShift = [[ By default hints and notifs will appear from the top edge of the window. Set this to true if you don't want hints/notifications to appear in that region. ]]
 descs.DefaultTheme = [[ Theme to be used as a replacement for "Default". The new replacement theme can still use "Default" as its Base_Theme however any other theme that references "Default" as its redirects to this theme. ]]
 descs.ReJail = [[ If true then when a player rejoins they'll go back into jail. Or if the moderator leaves everybody gets unjailed ]]
-descs.DisableRejoinAtMaxPlayers = [[ If true, disables rejoin when max players is reached to avoid an exploit that allows more players than the max amount. ]]
 
-descs.Messages = [[ A list of notification messages to show HeadAdmins and above on join ]]
+descs.Messages = [[ A list of notifications shown on join. Messages can either be strings or tables. Messages are shown to HeadAdmins+ by default but tables can define a different minimum level via .Level ]]
 
 descs.AutoClean = [[ Will auto clean workspace of things like hats and tools ]]
 descs.AutoBackup = [[ (not recommended) Run a map backup command when the server starts, this is mostly useless as clients cannot modify the server. To restore the map run :restoremap ]]
@@ -528,6 +534,7 @@ order = {
 	" ";
 	"Permissions";
 	"Aliases";
+	"Cameras";
 	" ";
 	"Commands";
 	"Banned";
@@ -579,7 +586,6 @@ order = {
 	"";
 	"SilentCommandDenials";
 	"OverrideChatCallbacks";
-	"ChatCreateRobloxCommands";
 	" ";
 	"BanMessage";
 	"LockMessage";
@@ -592,7 +598,6 @@ order = {
 	"TopBarShift";
 	"DefaultTheme";
 	"ReJail";
-	"DisableRejoinAtMaxPlayers";
 	"";
 	"AutoClean";
 	"AutoCleanDelay";

Loader/Config/Themes/README.luau

@@ -0,0 +1,6 @@
+--[[
+	If you wish to create a custom theme for your Adonis GUIs, place it in this folder.
+	You can find instructions about how to do this at our wiki:
+		https://github.com/Epix-Incorporated/Adonis/wiki/Guide:-Creating-a-theme
+--]]
+return function() end