From 8b59fe22aaff23af9379743e7fbdce59f1aac624 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 10 Mar 2025 01:17:18 -0400 Subject: [PATCH] get framework jobs These are not the same format, will need touchups --- modules/framework/es_extended/client.lua | 5 +++++ modules/framework/es_extended/server.lua | 8 ++++++++ modules/framework/qb-core/client.lua | 12 ++++++++++++ modules/framework/qb-core/server.lua | 12 ++++++++++++ modules/framework/qbx_core/client.lua | 4 ++++ modules/framework/qbx_core/server.lua | 4 ++++ 6 files changed, 45 insertions(+) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index 9b6dd40..5c0e1ac 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -14,6 +14,11 @@ Framework.GetPlayerData = function() return ESX.PlayerData end +Framework.GetFrameworkJobs = function() + local jobs = lib.callback.await('community_bridge:Callback:GetFrameworkJobs', false) + return jobs +end + ---comment ---@return string Framework.GetPlayerDob = function() diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 7b0d437..b5c8359 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -23,6 +23,10 @@ Framework.GetPlayerIdentifier = function(src) return xPlayer.getIdentifier() end +Framework.GetFrameworkJobs = function() + return ESX.GetJobs() +end + -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) @@ -274,6 +278,10 @@ AddEventHandler("playerDropped", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", src) end) +lib.callback.register('community_bridge:Callback:GetFrameworkJobs', function(source) + return Framework.GetFrameworkJobs() or {} +end) + Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) ESX.RegisterCommand(name, permission, function(xPlayer, args, showError) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 67766e8..86f3e1c 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -13,6 +13,18 @@ Framework.GetPlayerData = function() return QBCore.Functions.GetPlayerData() end +Framework.GetFrameworkJobs = function() + local jobs = {} + for k, v in pairs(QBCore.Shared.Jobs) do + table.insert(jobs, { + name = k, + label = v.label, + grade = v.grades + }) + end + return jobs +end + Framework.GetPlayerDob = function() local player = QBCore.Functions.GetPlayerData() local playerData = player.PlayerData diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 1fdb53d..9441ca9 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -18,6 +18,18 @@ Framework.GetPlayerIdentifier = function(src) return playerData.citizenid end +Framework.GetFrameworkJobs = function() + local jobs = {} + for k, v in pairs(QBCore.Shared.Jobs) do + table.insert(jobs, { + name = k, + label = v.label, + grade = v.grades + }) + end + return jobs +end + -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 5d17c3f..3138855 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -12,6 +12,10 @@ Framework.GetPlayerData = function() return QBox.GetPlayerData() end +Framework.GetFrameworkJobs = function() + return QBox.GetJobs() +end + Framework.GetPlayerDob = function() local playerData = QBox.GetPlayerData() return playerData.charinfo.birthdate diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index d0dcd10..4e3540d 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -15,6 +15,10 @@ Framework.GetPlayerDob = function(src) return playerData.charinfo.birthdate end +Framework.GetFrameworkJobs = function() + return QBox.GetJobs() +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src)