diff --git a/fxmanifest.lua b/fxmanifest.lua index 3b1e27d..5ddb371 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -30,7 +30,7 @@ files { 'locales/*.json', } -shared_script 'resource/main.lua' +shared_script 'resource/init.lua' shared_scripts { 'resource/**/shared.lua', diff --git a/resource/main.lua b/resource/init.lua similarity index 50% rename from resource/main.lua rename to resource/init.lua index 44d1493..1db9676 100644 --- a/resource/main.lua +++ b/resource/init.lua @@ -1,21 +1,27 @@ +local debug_getinfo = debug.getinfo + lib = setmetatable({ - name = 'ox_lib', - context = IsDuplicityVersion() and 'server' or 'client', + name = 'ox_lib', + context = IsDuplicityVersion() and 'server' or 'client', }, { - __newindex = function(self, name, fn) - exports(name, fn) - rawset(self, name, fn) - end + __newindex = function(self, name, fn) + rawset(self, name, fn) + + if debug_getinfo(2, 'S').short_src:find('@ox_lib/resource') then + exports(name, fn) + end + end }) cache = { - resource = lib.name + resource = lib.name } if not LoadResourceFile(lib.name, 'web/build/index.html') then local err = '^1Unable to load UI. Build ox_lib or download the latest release.\n ^3https://github.com/overextended/ox_lib/releases/latest/download/ox_lib.zip^0' function lib.hasLoaded() return err end - error(err) + + error(err) end function lib.hasLoaded() return true end