From 411fa9aa7496b5dc86220d05d3ec93c9b8a82c00 Mon Sep 17 00:00:00 2001 From: Lewin Kelly Date: Wed, 6 Sep 2023 06:32:00 +0100 Subject: [PATCH] Some formatting changes to config files and corescripts --- defs.d.lua | 20 +++----------------- luau/10000001.luau | 8 ++++---- luau/152908679.luau | 4 +++- luau/153556783.luau | 4 +++- luau/157877000.luau | 4 +++- luau/38037565.luau | 4 +++- mercury.yml | 32 +++++++------------------------- 7 files changed, 26 insertions(+), 50 deletions(-) diff --git a/defs.d.lua b/defs.d.lua index 85274dc..46f489e 100644 --- a/defs.d.lua +++ b/defs.d.lua @@ -6832,21 +6832,6 @@ end declare class LodDataService extends Instance end -declare class LogService extends Instance - HttpResultOut: RBXScriptSignal<{ [any]: any }> - MessageOut: RBXScriptSignal - OnHttpResultApproved: RBXScriptSignal - ServerHttpResultOut: RBXScriptSignal<{ [any]: any }> - ServerMessageOut: RBXScriptSignal - function ClearOutput(self): nil - function ExecuteScript(self, source: string): nil - function GetHttpResultHistory(self): { any } - function GetLogHistory(self): { any } - function RequestHttpResultApproved(self): nil - function RequestServerHttpResult(self): nil - function RequestServerOutput(self): nil -end - declare class LoginService extends Instance LoginFailed: RBXScriptSignal LoginSucceeded: RBXScriptSignal @@ -8504,7 +8489,6 @@ declare class ServiceProvider extends Instance LiveScriptingService: LiveScriptingService LocalStorageService: LocalStorageService LodDataService: LodDataService - LogService: LogService LoginService: LoginService LuaWebService: LuaWebService LuauScriptAnalyzerService: LuauScriptAnalyzerService @@ -8706,7 +8690,6 @@ declare class ServiceProvider extends Instance function GetService(self, service: "LiveScriptingService"): LiveScriptingService function GetService(self, service: "LocalStorageService"): LocalStorageService function GetService(self, service: "LodDataService"): LodDataService - function GetService(self, service: "LogService"): LogService function GetService(self, service: "LoginService"): LoginService function GetService(self, service: "LuaWebService"): LuaWebService function GetService(self, service: "LuauScriptAnalyzerService"): LuauScriptAnalyzerService @@ -10285,6 +10268,9 @@ declare _SERVER_PRESENCE_URL: string declare _GUEST_NUMBER: number +declare _SERVER: boolean +declare _CLIENT: boolean + declare game: DataModel declare Game: DataModel declare workspace: Workspace diff --git a/luau/10000001.luau b/luau/10000001.luau index f47c89e..64f6566 100644 --- a/luau/10000001.luau +++ b/luau/10000001.luau @@ -1610,7 +1610,7 @@ do Cleanup.kind = "Cleanup" Cleanup.stage = "observer" - function Cleanup:apply(userTask, applyTo, cleanupTasks) + function Cleanup:apply(userTask, _, cleanupTasks) table.insert(cleanupTasks, userTask) end @@ -1731,7 +1731,7 @@ do for oldInstance in pairs(oldParented) do oldInstance.Parent = nil end - for oldState, disconnect in pairs(oldDisconnects) do + for _, disconnect in pairs(oldDisconnects) do disconnect() end end @@ -1920,7 +1920,7 @@ do ) end - Spawn(function(...) + Spawn(function() error(errorString:gsub("\n", "\n "), 0) end, ...) end @@ -3162,7 +3162,7 @@ do __DARKLUA_BUNDLE_MODULES.S = Spring end do - local function doNothing(...) end + local function doNothing() end __DARKLUA_BUNDLE_MODULES.T = doNothing end diff --git a/luau/152908679.luau b/luau/152908679.luau index 775483e..fd46075 100644 --- a/luau/152908679.luau +++ b/luau/152908679.luau @@ -2,7 +2,9 @@ -- Unused by Mercury print "[Mercury]: Loaded corescript 152908679" for _ = 1, 4 do - warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + pcall(function() + warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + end) print "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" end diff --git a/luau/153556783.luau b/luau/153556783.luau index 3729a60..0bbff0a 100644 --- a/luau/153556783.luau +++ b/luau/153556783.luau @@ -2,7 +2,9 @@ -- Unused by Mercury print "[Mercury]: Loaded corescript 153556783" for _ = 1, 4 do - warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + pcall(function() + warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + end) print "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" end diff --git a/luau/157877000.luau b/luau/157877000.luau index 17740ea..c75c4eb 100644 --- a/luau/157877000.luau +++ b/luau/157877000.luau @@ -1,7 +1,9 @@ -- Unused by Mercury print "[Mercury]: Loaded corescript 157877000" for _ = 1, 4 do - warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + pcall(function() + warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + end) print "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" end diff --git a/luau/38037565.luau b/luau/38037565.luau index bd94bb0..f2097ab 100644 --- a/luau/38037565.luau +++ b/luau/38037565.luau @@ -1,7 +1,9 @@ -- Unused by Mercury print "[Mercury]: Loaded corescript 38037565" for _ = 1, 4 do - warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + pcall(function() + warn "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" + end) print "IF YOU SEE THIS MESSAGE, PLEASE REPORT IT TO THE MERCURY DEVELOPERS" end diff --git a/mercury.yml b/mercury.yml index 633d454..30cb674 100644 --- a/mercury.yml +++ b/mercury.yml @@ -24,6 +24,10 @@ globals: args: [] _CHAR_APPEARANCE: args: [] + _SERVER: + args: [] + _CLIENT: + args: [] assert: args: @@ -5022,7 +5026,6 @@ globals: - AnimationController - AnimationRigData - Animator - - Atmosphere - Attachment - Bone - Backpack @@ -5099,7 +5102,6 @@ globals: - FlyweightService - CSGDictionaryService - NonReplicatedCSGDictionaryService - - Folder - ForceField - FunctionalTest - GetTextBoundsParams @@ -5192,8 +5194,6 @@ globals: - ColorCorrectionEffect - DepthOfFieldEffect - SunRaysEffect - - ProximityPrompt - - ProximityPromptService - ReflectionMetadata - ReflectionMetadataCallbacks - ReflectionMetadataClasses @@ -5240,18 +5240,6 @@ globals: - TrackerStreamAnimation - Trail - Tween - - UIAspectRatioConstraint - - UISizeConstraint - - UITextSizeConstraint - - UICorner - - UIGradient - - UIGridLayout - - UIListLayout - - UIPageLayout - - UITableLayout - - UIPadding - - UIScale - - UIStroke - BinaryStringValue - BoolValue - BrickColorValue @@ -5623,7 +5611,7 @@ globals: struct: Plugin require: args: - - type: number + - type: any script: struct: Script settings: @@ -5636,6 +5624,8 @@ globals: Spawn: args: - type: function + - required: false + type: "..." LoadLibrary: args: - type: string @@ -7043,7 +7033,6 @@ structs: - UserStorageService - LocalizationService - LodDataService - - LogService - LoginService - LuaWebService - LuauScriptAnalyzerService @@ -7472,13 +7461,6 @@ structs: Value: property: read-only Event: - Connect: - args: - - type: function - method: true - Wait: - args: [] - method: true connect: args: - type: function