From 4a269da67167783afcf322a9e06bab35b724739c Mon Sep 17 00:00:00 2001 From: James Date: Sun, 24 Sep 2023 22:52:48 -0500 Subject: [PATCH] fix structure and doc issues --- .../api/engine/dependencies/enginedebugger.md | 2 +- plugin/src/json/structure.json | 43 ++++++++++++------- .../framework/Vendor/Controllers/init.luau | 4 +- src/lua/framework/init.luau | 2 +- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/docs/api/engine/dependencies/enginedebugger.md b/docs/api/engine/dependencies/enginedebugger.md index 9dc2d1b2..01d93d17 100644 --- a/docs/api/engine/dependencies/enginedebugger.md +++ b/docs/api/engine/dependencies/enginedebugger.md @@ -28,7 +28,7 @@ A list of cached stack traces for the current environment. A list of cached debug calls for the current environment. -* **[Array]((/api/engine/types#array))\** +* **[Array](/api/engine/types#array)\** ## Functions diff --git a/plugin/src/json/structure.json b/plugin/src/json/structure.json index 65bf52ea..f02a7ded 100644 --- a/plugin/src/json/structure.json +++ b/plugin/src/json/structure.json @@ -47,17 +47,18 @@ "Vendor": { "Controllers": { "Vendor": { - "SanitizeData": { + "Sanitize": { "$className": "ModuleScript", "$properties": { "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/Vendor/Sanitize.luau" } }, "NetworkController": { + "Events": { }, "Vendor": { "BridgeNet2": "BridgeNet2Package" }, - "NetworkController": { + "Init": { "$className": "ModuleScript", "$properties": { "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/Vendor/NetworkController/init.luau" @@ -65,15 +66,7 @@ } }, "SignalController": { - "Vendor": { - "Signal": { - "$className": "ModuleScript", - "$properties": { - "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/Vendor/SignalController/Vendor/Signal.luau" - } - } - }, - "SignalController": { + "Init": { "$className": "ModuleScript", "$properties": { "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/Vendor/SignalController/init.luau" @@ -81,16 +74,16 @@ } } }, - "Controllers": { + "Init": { "$className": "ModuleScript", "$properties": { - "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/Controllers.luau" + "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Controllers/init.luau" } } }, "Libraries": { "EasyProfile": { - "EasyProfile": { + "Init": { "$className": "ModuleScript", "$properties": { "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Libraries/EasyProfile/init.luau" @@ -100,10 +93,30 @@ "ProfileService": { "$className": "ModuleScript", "$properties": { - "Source": "https://raw.githubusercontent.com/MadStudioRoblox/ProfileService/master/ProfileService.lua" + "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Libraries/EasyProfile/Vendor/ProfileService.luau" } } } + }, + "RedbloxUtils": { + "Future": { + "$className": "ModuleScript", + "$properties": { + "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Libraries/RedbloxUtils/Future.luau" + } + }, + "Signal": { + "$className": "ModuleScript", + "$properties": { + "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Libraries/RedbloxUtils/Signal.luau" + } + }, + "Spawn": { + "$className": "ModuleScript", + "$properties": { + "Source": "https://raw.githubusercontent.com/canary-development/CanaryEngine/main/src/lua/framework/Vendor/Libraries/RedbloxUtils/Spawn.luau" + } + } } }, "Debugger": { diff --git a/src/lua/framework/Vendor/Controllers/init.luau b/src/lua/framework/Vendor/Controllers/init.luau index 440ede35..c246b254 100644 --- a/src/lua/framework/Vendor/Controllers/init.luau +++ b/src/lua/framework/Vendor/Controllers/init.luau @@ -3,8 +3,8 @@ local Vendor = script.Parent.Vendor -- // Variables -Controllers.SignalController = require(Vendor.SignalController.SignalController) -Controllers.NetworkController = require(Vendor.NetworkController.NetworkController) +Controllers.SignalController = require(Vendor.SignalController.Init) +Controllers.NetworkController = require(Vendor.NetworkController.Init) -- // Functions diff --git a/src/lua/framework/init.luau b/src/lua/framework/init.luau index be6b7609..adde4b7f 100644 --- a/src/lua/framework/init.luau +++ b/src/lua/framework/init.luau @@ -55,7 +55,7 @@ end function CanaryEngine.GetEngineServer() if RuntimeContext.Server then - CanaryEngineServer.Data = require(EngineVendor.Libraries.EasyProfile.EasyProfile) + CanaryEngineServer.Data = require(EngineVendor.Libraries.EasyProfile.Init) return CanaryEngineServer else Debugger.Debug(error, "Failed to fetch 'EngineServer', context must be server.", nil, false)