From 1242d9ef7ccc0a6126deddac35285574f4add8d5 Mon Sep 17 00:00:00 2001 From: Johann Kraus <56100605+JericoFX@users.noreply.github.com> Date: Fri, 9 May 2025 23:06:01 -0300 Subject: [PATCH] Add GetPlayer functions to framework and New FUnctions to Utility --- lib/utility/client/utility.lua | 91 ++++++++++++++++++++++++ modules/framework/es_extended/server.lua | 9 +++ modules/framework/qb-core/server.lua | 9 +++ modules/framework/qbx_core/server.lua | 9 +++ 4 files changed, 118 insertions(+) diff --git a/lib/utility/client/utility.lua b/lib/utility/client/utility.lua index d9a87bd..14b4747 100644 --- a/lib/utility/client/utility.lua +++ b/lib/utility/client/utility.lua @@ -404,6 +404,97 @@ function Utility.RemovePoint(pointID) return Point.Remove(pointID) end +---Simple switch-case function +---@generic T +---@param value T The value to match against the cases +---@param cases table Table with case functions and an optional default (false key) +---@return any|false result The return value of the matched case function, or false if none matched +function Utility.Switch(value, cases) + local caseFunc = cases[value] or cases[false] + + if caseFunc and type(caseFunc) == "function" then + local ok, result = pcall(caseFunc) + return ok and result or false + end + + return false +end + +--[[ +local vehicleType = "boat" + +local result = Utility.Switch(vehicleType, { + car = function() + print("This is a Car") + -- Car-related logic here + return "Car logic executed" + end, + bike = function() + print("This is a Bike") + -- Bike-related logic here + return "Bike logic executed" + end, + [false] = function() + print("Unknown vehicle type. Running default logic.") + -- Default logic here + return "Default logic executed" + end, +}) + +print("Result:", result) + +]] + + +--- Pattern match-like function +---@generic T +---@param value T The value to match +---@param patterns table A list of matchers and their handlers +---@return any|false result The result of the first matched case, or false if none +function Utility.Match(value, patterns) + for pattern, handler in pairs(patterns) do + if type(pattern) == "function" then + local ok, matched = pcall(pattern, value) + if ok and matched then + local success, result = pcall(handler) + return success and result or false + end + elseif pattern == value then + local success, result = pcall(handler) + return success and result or false + end + end + + if patterns[false] then + local ok, result = pcall(patterns[false]) + return ok and result or false + end + + return false +end + +--[[ +local input = 42 + +local result = Utility.Match(input, { + [function(v) return v < 0 end] = function() + print("Negative number") + return "Negative" + end, + [function(v) return v % 2 == 0 end] = function() + print("Even number") + return "Even" + end, + [false] = function() + print("No match") + return "Default" + end, +}) + +print("Result:", result) + +]] + AddEventHandler('onResourceStop', function(resource) if resource ~= GetCurrentResourceName() then return end for _, blip in pairs(blipIDs) do diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 1c2a297..899e945 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -16,6 +16,15 @@ Framework.GetPlayerDob = function(src) return dob end +--- This will return a table of the players data +---@param src any +---@return table | nil +Framework.GetPlayer = function(src) + local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end + return xPlayer +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index c7f39ad..9316fae 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -19,6 +19,15 @@ Framework.GetPlayerIdentifier = function(src) return playerData.citizenid end +--- Returns the player data of the specified source. +---@param src any +---@return table | nil +Framework.GetPlayer = function(src) + local player = QBCore.Functions.GetPlayer(src) + if not player then return end + return player +end + Framework.GetFrameworkJobs = function() local jobs = {} for k, v in pairs(QBCore.Shared.Jobs) do diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index e6d349d..d47e1af 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -21,6 +21,15 @@ Framework.GetPlayerDob = function(src) return playerData.charinfo.birthdate end +--- Returns the player data of the specified source. +---@param src any +---@return table | nil +Framework.GetPlayer = function(src) + local player = QBox:GetPlayer(src) + if not player then return end + return player +end + ---Returns a table of the jobs in the framework. ---@return table Framework.GetFrameworkJobs = function()