fix structure and doc issues

lumin-org · Sep 25, 2023 · 4a269da · 4a269da
1 parent c4cc6c9
commit 4a269da
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git 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))\<string | [Array](/api/engine/types#array)<string\>**
+* **[Array](/api/engine/types#array)\<string | [Array](/api/engine/types#array)<string\>**
 
 ## Functions
 

diff --git a/plugin/src/json/structure.json b/plugin/src/json/structure.json
@@ -47,50 +47,43 @@
         "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"
                             }
                         }
                     },
                     "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"
                             }
                         }
                     }
                 },
-                "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
@@ -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
@@ -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)