Merge pull request #3 from AtomicGmod/develop

fix client package loading

Author: smokingplaya

lua/atomic/libraries/loader.lua

@@ -3,31 +3,34 @@ atomic.loader = atomic.loader or {
 }
 
 ---@param path string
+---@return ...?
 function atomic.loader.client(path)
   if (SERVER) then
     return AddCSLuaFile(path)
   end
 
   atomic.loader.logger:debug("including client file `%s`", path)
 
-  include(path)
+  return include(path)
 end
 
 ---@param path string
+---@return ...?
 function atomic.loader.shared(path)
   if (SERVER) then
     AddCSLuaFile(path)
   end
 
   atomic.loader.logger:debug("including shared file `%s`", path)
 
-  include(path)
+  return include(path)
 end
 
 ---@param path string
+---@return ...?
 function atomic.loader.server(path)
   if (SERVER) then
     atomic.loader.logger:debug("including server file `%s`", path)
-    include(path)
+    return include(path)
   end
 end

lua/atomic/libraries/package/common.lua

@@ -54,7 +54,7 @@ function atomic.package.find(path, isInGamemode)
   local gameDir = isInGamemode and "GAME" or "LUA"
 
   if file.Exists(pkg, gameDir) then
-    local package = include(path .. "/package.lua")
+    local package = atomic.loader.shared(path .. "/package.lua")
 
     if (type(package) ~= "table") then
       return
@@ -71,7 +71,7 @@ function atomic.package.find(path, isInGamemode)
   for _, package in ipairs(packages) do
     local pkgPath = gameRelativePath .. "/" .. package .. "/package.lua"
     if file.Exists(pkgPath, gameDir) then
-      local packageData = include(path .. "/" .. package .. "/package.lua")
+      local packageData = atomic.loader.shared(path .. "/" .. package .. "/package.lua")
       packageData._path = path .. "/" .. package
       if type(packageData) == "table" then
         table.insert(result, packageData)

lua/autorun/atomic_autorun.lua

@@ -2,7 +2,7 @@ atomic = {
   meta = {
     author = "smokingplaya",
     version_name = "Feijoa",
-    version = "0.2.0",
+    version = "0.2.1",
   }
 }