diff --git a/fxmanifest.lua b/fxmanifest.lua index 4668f29..556bcf1 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -9,8 +9,8 @@ version '0.7.0' shared_scripts { '@ox_lib/init.lua', - 'lib/init.lua', 'settings/sharedConfig.lua', + 'lib/init.lua', 'modules/math/*.lua', 'modules/locales/*.lua', } diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index faf8e02..5e125d9 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -1,5 +1,6 @@ ---@diagnostic disable: duplicate-set-field if GetResourceState('es_extended') ~= 'started' then return end +Prints = Prints or Require("lib/utility/shared/prints.lua") ESX = exports["es_extended"]:getSharedObject() @@ -251,7 +252,7 @@ Framework.SetPlayerJob = function(src, name, grade) local xPlayer = ESX.GetPlayerFromId(src) if not xPlayer then return end if not ESX.DoesJobExist(name, grade) then - lib.print.error("Job Does Not Exsist In Framework :NAME " .. name .. " Grade:" .. grade) + Prints.Error("Job Does Not Exsist In Framework :NAME " .. name .. " Grade:" .. grade) return end return xPlayer.setJob(name, grade, true) @@ -341,6 +342,7 @@ AddEventHandler("playerDropped", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", src) end) +--<-- TODO swap to internal callback system lib.callback.register('community_bridge:Callback:GetFrameworkJobs', function(source) return Framework.GetFrameworkJobs() or {} end) @@ -354,3 +356,5 @@ Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, arguments = arguments }) end + +return Framework \ No newline at end of file diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 707d1c6..c94145f 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -496,3 +496,5 @@ Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...) end + +return Framework \ No newline at end of file diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 6845f27..ddc1017 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -452,3 +452,5 @@ AddEventHandler("playerDropped", function() local src = source TriggerEvent("community_bridge:Server:OnPlayerUnload", src) end) + +return Framework \ No newline at end of file