merge 1.0.0-rc.1

Merge pull request #22 from TeamMeadows/develop

Author: smokingplaya

lua/atomic/libraries/package/class.lua

@@ -169,6 +169,8 @@ function Package:include(side, files)
   end
 
   local include = atomic.loader[side]
+  local gamemode = gmod.GetGamemode()
+  local isGamemodePackage = self._metadata._path:Split("/")[1] == gamemode.FolderName
 
   if (not include) then
     return self.logger:err("unknown include side `%s`", side)
@@ -177,10 +179,19 @@ function Package:include(side, files)
   local dir = self._metadata.files.dir
   dir = dir and dir .. "/" or ""
 
+  if (isGamemodePackage) then
+    GM = gamemode -- -\(3_3)/-
+  end
+
   for _, filename in ipairs(files) do
     filename = (filename:sub(-4) == ".lua" and filename or filename .. ".lua")
     include(self._metadata._path .. "/" .. dir .. filename)
   end
+
+  if (isGamemodePackage) then
+    ---@diagnostic disable-next-line
+    GM = nil
+  end
 end
 
 ---@private

lua/autorun/atomic_autorun.lua

@@ -1,16 +1,15 @@
-atomic = {
+atomic = atomic or {
   meta = {
     author = "smokingplaya",
     versionName = "Cherry",
-    version = "1.0.0-alpha.5",
+    version = "1.0.0-rc.1",
   },
-  _config = {}
+  _config = {},
+  _isGamemodeLoaded = false
 }
 
 file.CreateDir("atomic")
 
-local start = SysTime()
-
 local function includeSh(path)
   if (SERVER) then
     AddCSLuaFile(path)
@@ -50,11 +49,44 @@ shared("atomic/libraries/package/common.lua")
 server("atomic/libraries/mysql.lua")
 shared("atomic/utils/aliases.lua")
 
-local packageLoadingStart = SysTime()
-
 local package = atomic.package
 local packages = package.find("atomic/packages")
+---@type Atomic.Time.Instant
+local packageLoadingTime
+
+local function loadPackages()
+  package.loadMany(packages)
+  atomic.log:info("Atomic Framework %s %s has loaded %s packages for %sms", atomic.meta.version, atomic.meta.versionName, #packages, packageLoadingTime:elapsed():as_millis())
+end
+
+local function appendGamemodePackages()
+	local gamemode = gmod.GetGamemode()
+	local dir = gamemode and gamemode.packageDir
+	local gamemodePackages = dir and package.find(dir)
+
+	if (not gamemodePackages) then
+		return
+	end
 
-package.loadMany(packages)
+	for _, gamemodePackage in ipairs(gamemodePackages) do
+		packages[#packages + 1] = gamemodePackage
+	end
+end
+
+local function onGamemodeLoaded()
+	atomic._isGamemodeLoaded = true
+	packageLoadingTime = Instant()
+
+	appendGamemodePackages()
+	loadPackages()
+end
+
+local function init()
+	if (atomic._isGamemodeLoaded) then
+		onGamemodeLoaded()
+	else
+		hook.Add("OnGamemodeLoaded", "atomic:" .. atomic.meta.version, onGamemodeLoaded)
+	end
+end
 
-atomic.log:info("Atomic Framework %s %s has been loaded for %sms (%s packages loaded for %sms)", atomic.meta.version, atomic.meta.versionName, math.floor((SysTime() - start) * 1000 + 0.5), #atomic.package._list, math.floor((SysTime() - packageLoadingStart) * 1000 + 0.5))
+init()