From 83b982c40087e3f711c5482de566d6b7aa8ee0c7 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:09:24 -0500 Subject: [PATCH 01/33] start to doc functs --- modules/inventory/_default/client.lua | 10 ++- modules/inventory/_default/server.lua | 48 ++++++++++++ modules/inventory/codem-inventory/client.lua | 8 ++ modules/inventory/core_inventory/client.lua | 3 + modules/inventory/core_inventory/server.lua | 7 ++ modules/inventory/jpr-inventory/client.lua | 6 ++ modules/inventory/jpr-inventory/server.lua | 30 ++++++++ modules/inventory/origen_inventory/client.lua | 11 +++ modules/inventory/ox_inventory/client.lua | 11 +++ modules/inventory/ox_inventory/server.lua | 74 ++++++++++++++++++- modules/inventory/ps-inventory/client.lua | 7 ++ modules/inventory/ps-inventory/server.lua | 47 ++++++++++++ modules/inventory/qb-inventory/client.lua | 6 ++ modules/inventory/qb-inventory/server.lua | 33 +++++++++ modules/inventory/qs-inventory/client.lua | 14 ++++ modules/inventory/qs-inventory/server.lua | 54 ++++++++++++++ modules/inventory/tgiann-inventory/client.lua | 9 +++ modules/inventory/tgiann-inventory/server.lua | 51 ++++++++++++- 18 files changed, 426 insertions(+), 3 deletions(-) diff --git a/modules/inventory/_default/client.lua b/modules/inventory/_default/client.lua index bd5f17b..1cb439d 100644 --- a/modules/inventory/_default/client.lua +++ b/modules/inventory/_default/client.lua @@ -1,14 +1,22 @@ Inventory = Inventory or {} +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) - print('client funct') return Framework.GetItemInfo(item) end +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) return Framework.HasItem(item) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" end diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 565b87f..18f5b23 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -1,38 +1,86 @@ Inventory = Inventory or {} +---comment +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.AddItem = function(src, item, count, slot, metadata) return Framework.AddItem(src, item, count, slot, metadata) end +---comment +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.RemoveItem = function(src, item, count, slot, metadata) item = type(item) == "table" and item.name or item return Framework.RemoveItem(src, item, count, slot, metadata) end +---comment +---@param item string +---@return boolean Inventory.GetItemInfo = function(item) return false, print("This Inventory Has Not Been Bridged For An Item Info Feature.") end +---comment +---@param src number +---@param item string +---@param metadata table +---@return number Inventory.GetItemCount = function(src, item, metadata) return Framework.GetItemCount(src, item, metadata) end +---comment +---@param src number +---@return table Inventory.GetPlayerInventory = function(src) return Framework.GetPlayerInventory(src) end +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) return Framework.GetItemBySlot(src, slot) end +---comment +---@param src number +---@param item string +---@param slot number +---@param metadata table +---@return boolean Inventory.SetMetadata = function(src, item, slot, metadata) return Framework.SetMetadata(src, item, slot, metadata) end +---comment +---@param src number +---@param id string||number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) return false, print("This Inventory Has Not Been Bridged For A Stash Feature.") end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" end \ No newline at end of file diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index a6bfaad..fc616b5 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -3,6 +3,9 @@ Inventory = Inventory or {} local codem = exports['codem-inventory'] +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = codem:GetItemList(item) local repackedTable = { @@ -16,6 +19,8 @@ Inventory.GetItemInfo = function(item) return repackedTable or {} end +---comment +---@return table Inventory.GetPlayerInventory = function() local items = {} local inventory = codem:getUserInventory() @@ -34,6 +39,9 @@ Inventory.GetPlayerInventory = function() return items end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("codem-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://codem-inventory/html/images/%s.png", item) diff --git a/modules/inventory/core_inventory/client.lua b/modules/inventory/core_inventory/client.lua index 206e39e..27eb884 100644 --- a/modules/inventory/core_inventory/client.lua +++ b/modules/inventory/core_inventory/client.lua @@ -6,6 +6,9 @@ local core = exports.core_inventory Inventory = Inventory or {} +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("core_inventory", string.format("html/img/%s.png", item)) local imagePath = file and string.format("nui://core_inventory/html/img/%s.png", item) diff --git a/modules/inventory/core_inventory/server.lua b/modules/inventory/core_inventory/server.lua index 6ff7faa..7acfbe8 100644 --- a/modules/inventory/core_inventory/server.lua +++ b/modules/inventory/core_inventory/server.lua @@ -4,12 +4,19 @@ Inventory = Inventory or {} local core = exports.core_inventory +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("core_inventory", string.format("html/img/%s.png", item)) local imagePath = file and string.format("nui://core_inventory/html/img/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) -- have no clue if this will work but fingers crossed local queries = { diff --git a/modules/inventory/jpr-inventory/client.lua b/modules/inventory/jpr-inventory/client.lua index cf5a4df..42f6c98 100644 --- a/modules/inventory/jpr-inventory/client.lua +++ b/modules/inventory/jpr-inventory/client.lua @@ -9,10 +9,16 @@ RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) return jpr:HasItem(item) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("jpr-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://jpr-inventory/html/images/%s.png", item) diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua index ff40531..e0aabab 100644 --- a/modules/inventory/jpr-inventory/server.lua +++ b/modules/inventory/jpr-inventory/server.lua @@ -4,26 +4,56 @@ local jpr = exports['jpr-inventory'] Inventory = Inventory or {} +---comment +---@param id string||number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) return true end +---comment +---@param src number +---@param id string||number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return nil Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) TriggerClientEvent('community_bridge:client:qb-inventory:openStash', src, id, { weight = weight, slots = slots }) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("jpr-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://jpr-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) local slotData = jpr:GetItemBySlot(src, slot) if not slotData then return {} end return { name = slotData.name, label = slotData.label, weight = slotData.weight, slot = slot, count = slotData.amount, metadata = slotData.info, stack = slotData.unique, description = slotData.description } end +---comment +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) local queries = { 'UPDATE gloveboxitems SET plate = @newplate WHERE plate = @oldplate', diff --git a/modules/inventory/origen_inventory/client.lua b/modules/inventory/origen_inventory/client.lua index e7c139a..e355e7d 100644 --- a/modules/inventory/origen_inventory/client.lua +++ b/modules/inventory/origen_inventory/client.lua @@ -4,6 +4,9 @@ Inventory = Inventory or {} local origin = exports.origen_inventory +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = origin:Items(item) local repackedTable = { @@ -17,16 +20,24 @@ Inventory.GetItemInfo = function(item) return repackedTable or {} end +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) return origin:HasItem(item) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("origen_inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://origen_inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@return table Inventory.GetPlayerInventory = function() local items = {} local inventory = origin:GetInventory() diff --git a/modules/inventory/ox_inventory/client.lua b/modules/inventory/ox_inventory/client.lua index dc2f1d0..3980d9d 100644 --- a/modules/inventory/ox_inventory/client.lua +++ b/modules/inventory/ox_inventory/client.lua @@ -3,6 +3,9 @@ local ox_inventory = exports.ox_inventory Inventory = Inventory or {} +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = ox_inventory:Items(item) if not itemData then return {} end @@ -17,18 +20,26 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) local itemCount = ox_inventory:Search('count', item) local hasItem = itemCount ~= 0 return hasItem end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@return table Inventory.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 442b14d..74aaaef 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -4,44 +4,102 @@ local ox_inventory = exports.ox_inventory Inventory = Inventory or {} +---comment +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.AddItem = function(src, item, count, slot, metadata) TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = count, slot = slot, metadata = metadata}) return ox_inventory:AddItem(src, item, count, metadata) end +---comment +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.RemoveItem = function(src, item, count, slot, metadata) TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = count, slot = slot, metadata = metadata}) return ox_inventory:RemoveItem(src, item, count, metadata, slot) end +---comment +---@param src number +---@param item string +---@param metadata table +---@return table Inventory.GetItem = function(src, item, metadata) return ox_inventory:GetItem(src, item, metadata, false) end +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) return ox_inventory:GetSlot(src, slot) end +---comment +---@param src number +---@param item string +---@param metadata table +---@return number Inventory.GetItemCount = function(src, item, metadata) return ox_inventory:GetItemCount(src, item, metadata, false) end +---comment +---@param src number +---@return table Inventory.GetPlayerInventory = function(src) return ox_inventory:GetInventoryItems(src, false) end +---comment +---@param src number +---@param item string +---@param count number +---@return boolean Inventory.CanCarryItem = function(src, item, count) return ox_inventory:CanCarryItem(src, item, count) end +---comment +---@param id number||string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) return ox_inventory:RegisterStash(id, label, slots, weight, owner) end +---comment +---@param src number +---@param id number||string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return nil Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) TriggerClientEvent('ox_inventory:openInventory', src, 'stash', 'stash_' .. id) end +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = ox_inventory:Items(item) if not itemData then return {} end @@ -56,16 +114,30 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---comment +---@param src number +---@param item string +---@param slot number +---@param metadata table +---@return nil Inventory.SetMetadata = function(src, item, slot, metadata) ox_inventory:SetMetadata(src, slot, metadata) end +---comment +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) ox_inventory:UpdateVehicle(oldplate, newplate) - if GetResourceState('jg-mechanic') ~= 'started' then return end + if GetResourceState('jg-mechanic') ~= 'started' then return true end exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) + return true end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index b1f0332..6ffcd0a 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -10,10 +10,17 @@ RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, TriggerServerEvent('ps-inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) + +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) return ps:HasItem(item) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("ps-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://ps-inventory/html/images/%s.png", item) diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index d3d2184..cbd481e 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -4,38 +4,85 @@ local sloth = exports['ps-inventory'] Inventory = Inventory or {} + +---comment +---@param id string||number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) return true end +---comment +---@param src number +---@param id string||number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return nil Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) TriggerClientEvent('community_bridge:client:ps-inventory:openStash', src, id, { label = label, maxweight = weight, slots = slots, }) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("ps-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://ps-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) local slotData = sloth:GetItemBySlot(src, slot) if not slotData then return {} end return {name = slotData.name, label = slotData.name, weight = slotData.weight, slot = slot, count = slotData.amount, metadata = slotData.info, stack = slotData.unique, description = slotData.description} end +---comment +---@param src number +---@param item string +---@param amount number +---@param slot number +---@param metadata table +---@return boolean Inventory.AddItem = function(src, item, amount, slot, metadata) TriggerClientEvent('ps-inventory:client:ItemBox', src, QBCore.Shared.Items[item], 'add') TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) return exports['ps-inventory']:AddItem(src, item, amount, slot, metadata, 'community_bridge') end + +---comment +---@param src number +---@param item string +---@param amount number +---@param slot number +---@param metadata table +---@return boolean Inventory.RemoveItem = function(src, item, amount, slot, metadata) TriggerClientEvent('ps-inventory:client:ItemBox', src, QBCore.Shared.Items[item], 'remove') TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) return exports['ps-inventory']:RemoveItem(src, item, amount, slot, 'community_bridge') end + +---comment +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) local queries = { 'UPDATE gloveboxitems SET plate = @newplate WHERE plate = @oldplate', diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index cfe6b5c..fe00af4 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -10,10 +10,16 @@ RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) return qb:HasItem(item) end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("qb-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qb-inventory/html/images/%s.png", item) diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index afcd323..4724450 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -12,20 +12,48 @@ local function getInventoryNewVersion() end end +---comment +---@param id string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) return true end +---comment +---@param src number +---@param id number||string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return nil Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) TriggerClientEvent('community_bridge:client:qb-inventory:openStash', src, id, { weight = weight, slots = slots }) end + +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("qb-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qb-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end + +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) local slotData = qbInventory:GetItemBySlot(src, slot) if not slotData then return {} end @@ -41,6 +69,11 @@ Inventory.GetItemBySlot = function(src, slot) } end + +---comment +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) local newVersion = getInventoryNewVersion() if newVersion then diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index 819abe6..797e9f3 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -3,10 +3,16 @@ local quasar = exports["qs-inventory"] Inventory = Inventory or {} +---comment +---@param id any +---@return nil Inventory.OpenStash = function(id) quasar:RegisterStash(id, 50, 50000) end +---comment +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = quasar:GetItemList() if not itemData[item] then return {} end @@ -21,17 +27,25 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---comment +---@param item string +---@return boolean Inventory.HasItem = function(item) local check = quasar:Search(item) return check and true or false end +---comment +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("qs-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qs-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@return table Inventory.GetPlayerInventory = function() local items = {} local inventory = quasar:getUserInventory() diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index f42b0a1..60d86da 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -4,21 +4,39 @@ local quasar = exports['qs-inventory'] Inventory = Inventory or {} +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.AddItem = function(src, item, count, slot, metadata) if not quasar:CanCarryItem(src, item, count) then return false end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = count, slot = slot, metadata = metadata}) return quasar:AddItem(src, item, count, slot, metadata) end +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.RemoveItem = function(src, item, count, slot, metadata) TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = count, slot = slot, metadata = metadata}) return quasar:RemoveItem(src, item, count, slot, metadata) end +---@param src number +---@param item string +---@param metadata table +---@return number Inventory.GetItemCount = function(src, item, metadata) return quasar:GetItemTotalAmount(src, item) end +---@param src number +---@return table Inventory.GetPlayerInventory = function(src) local playerItems = quasar:GetInventory(src) local repackedTable = {} @@ -33,6 +51,9 @@ Inventory.GetPlayerInventory = function(src) return repackedTable end +---@param src number +---@param slot number +---@return table | nil Inventory.GetItemBySlot = function(src, slot) local playerItems = quasar:GetInventory(src) for _, item in pairs(playerItems) do @@ -52,19 +73,42 @@ Inventory.GetItemBySlot = function(src, slot) return nil end +---@param src number +---@param item string +---@param count number +---@return boolean Inventory.CanCarryItem = function(src, item, count) return quasar:CanCarryItem(src, item, count) end +---@param id string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) return true end +---@param src number +---@param id string +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@param groups table +---@param coords table +---@return nil Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) TriggerEvent("inventory:server:OpenInventory", "stash", id, { maxweight = weight, slots = slots }) TriggerClientEvent("inventory:client:SetCurrentStash",src, id) end +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = quasar:GetItemList() if not itemData[item] then return {} end @@ -79,16 +123,26 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---@param src number +---@param item string +---@param slot number +---@param metadata table +---@return boolean Inventory.SetMetadata = function(src, item, slot, metadata) return quasar:SetItemMetadata(src, slot, metadata) end +---@param item string +---@return string Inventory.GetImagePath = function(item) local file = LoadResourceFile("qs-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qs-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) local queries = { 'UPDATE inventory_trunk SET plate = @newplate WHERE plate = @oldplate', diff --git a/modules/inventory/tgiann-inventory/client.lua b/modules/inventory/tgiann-inventory/client.lua index bef81e4..ca83bdf 100644 --- a/modules/inventory/tgiann-inventory/client.lua +++ b/modules/inventory/tgiann-inventory/client.lua @@ -3,10 +3,14 @@ local tgiann = exports["tgiann-inventory"] Inventory = Inventory or {} +---@param id any +---@return nil Inventory.OpenStash = function(id) -- open stash export... not sure what it is yet. end +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = tgiann:GetItemList() if not itemData[item] then return {} end @@ -21,10 +25,14 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---@param item string +---@return boolean Inventory.HasItem = function(item) return tgiann:HasItem(item) end +---@param item string +---@return string Inventory.GetImagePath = function(item) local pngPath = LoadResourceFile("inventory_images", string.format("html/images/%s.png", item)) local webpPath = LoadResourceFile("inventory_images", string.format("html/images/%s.webp", item)) @@ -32,6 +40,7 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---@return table Inventory.GetPlayerInventory = function() local items = {} local inventory = tgiann:GetPlayerItems() diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index 48e1bd6..9b70622 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -4,17 +4,33 @@ local tgiann = exports["tgiann-inventory"] Inventory = Inventory or {} +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.AddItem = function(src, item, count, slot, metadata) if not tgiann:CanCarryItem(src, item, count) then return false end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = count, slot = slot, metadata = metadata}) return tgiann:AddItem(src, item, count, slot, metadata, false) end +---@param src number +---@param item string +---@param count number +---@param slot number +---@param metadata table +---@return boolean Inventory.RemoveItem = function(src, item, count, slot, metadata) TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = count, slot = slot, metadata = metadata}) return tgiann:RemoveItem(src, item, count, slot, metadata) end +---@param src number +---@param item string +---@param metadata table +---@return table Inventory.GetItem = function(src, item, metadata) local item = tgiann:GetItemByName(src, item, metadata) item.count = item.amount @@ -22,11 +38,17 @@ Inventory.GetItem = function(src, item, metadata) return item end +---@param src number +---@param item string +---@param metadata optional table +---@return number Inventory.GetItemCount = function(src, item, metadata) local _item = tgiann:GetItemByName(src, item, metadata) return _item.amount or 0 end +---@param src number +---@return table Inventory.GetPlayerInventory = function(src) local inventory = tgiann:GetPlayerItems(src) local items = {} @@ -38,20 +60,37 @@ Inventory.GetPlayerInventory = function(src) return items end +---comment +---@param src number +---@param item string +---@param count number +---@return boolean Inventory.CanCarryItem = function(src, item, count) return tgiann:CanCarryItem(src, item, count) end - +---comment +---@param id string or number +---@param label string +---@param slots number +---@param weight number +---@param owner string +---@return boolean Inventory.RegisterStash = function(id, label, slots, weight, owner) return tgiann:CreateCustomStashWithItem(id, {}) end +---comment +---@param src number +---@param slot number +---@return table Inventory.GetItemBySlot = function(src, slot) local item = tgiann:GetItemBySlot(src, slot) if not item then return {} end return {name = item.name, label = item.label, weight = item.weight, slot = slot, count = item.amount, metadata = item.info, stack = item.unique or false, description = item.description} end +---@param item string +---@return table Inventory.GetItemInfo = function(item) local itemData = tgiann:GetItemList() if not itemData[item] then return {} end @@ -66,10 +105,17 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---@param src number +---@param item string +---@param slot number +---@param metadata table +---@return nil Inventory.SetMetadata = function(src, item, slot, metadata) tgiann:UpdateItemMetadata(src, item, slot, metadata) end +---@param item string +---@return string Inventory.GetImagePath = function(item) local pngPath = LoadResourceFile("inventory_images", string.format("html/images/%s.png", item)) local webpPath = LoadResourceFile("inventory_images", string.format("html/images/%s.webp", item)) @@ -77,6 +123,9 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---@param oldplate string +---@param newplate string +---@return boolean Inventory.UpdatePlate = function(oldplate, newplate) local queries = { 'UPDATE tgiann_inventory_trunkitems SET plate = @newplate WHERE plate = @oldplate', From 5f42429c5397e48782e20eb7cf1dca6775e35fb2 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:34:22 -0500 Subject: [PATCH 02/33] vehiclekey and weather moved only to client side server side was incomplete and would have rare use cases --- init.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index e3eea58..d83ee02 100644 --- a/init.lua +++ b/init.lua @@ -52,8 +52,7 @@ Bridge.RegisterModule("Language", Language) Bridge.RegisterModule("Doorlock", Doorlock) Bridge.RegisterModule("Phone", Phone) Bridge.RegisterModule("Dispatch", Dispatch) -Bridge.RegisterModule("VehicleKey", VehicleKey) -Bridge.RegisterModule("Weather", Weather) + --lib Bridge.RegisterModule("Tables", cLib.Tables) Bridge.RegisterModule("Math", cLib.Math) @@ -92,6 +91,8 @@ if IsDuplicityVersion() then return end Bridge.RegisterModule("Fuel", Fuel) Bridge.RegisterModule("Input", Input) Bridge.RegisterModule("ProgressBar", ProgressBar) +Bridge.RegisterModule("VehicleKey", VehicleKey) +Bridge.RegisterModule("Weather", Weather) Bridge.RegisterModule("Target", Target) Bridge.RegisterModule("Menu", Menu) From 9a04f054489c98de924b0b5e305ccd5cb010714b Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:37:07 -0500 Subject: [PATCH 03/33] keys moved to client config --- .../F_RealCarKeysSystem/client/client.lua | 2 +- .../MrNewbVehicleKeys/client/client.lua | 2 +- .../MrNewbVehicleKeys/server/server.lua | 21 ------------------- .../Renewed-Vehiclekeys/client/client.lua | 2 +- .../Renewed-Vehiclekeys/server/server.lua | 13 ------------ modules/vehicleKey/_default/server/server.lua | 9 -------- .../vehicleKey/cd_garage/client/client.lua | 2 +- .../vehicleKey/cd_garage/server/server.lua | 10 --------- .../mk_vehiclekeys/client/client.lua | 2 +- .../mk_vehiclekeys/server/server.lua | 11 ---------- .../vehicleKey/mono_carkeys/client/client.lua | 2 +- .../vehicleKey/okokGarage/client/client.lua | 2 +- .../vehicleKey/okokGarage/server/server.lua | 11 ---------- .../qb-vehiclekeys/client/client.lua | 2 +- .../qb-vehiclekeys/server/server.lua | 17 --------------- .../qbx_vehiclekeys/client/client.lua | 2 +- .../qbx_vehiclekeys/server/server.lua | 11 ---------- .../qs-vehiclekeys/client/client.lua | 2 +- .../qs-vehiclekeys/server/server.lua | 15 ------------- .../vehicleKey/t1ger_keys/client/client.lua | 2 +- .../vehicleKey/t1ger_keys/server/server.lua | 11 ---------- .../wasabi_carlock/client/client.lua | 2 +- .../wasabi_carlock/server/server.lua | 12 ----------- .../weather/qb-weathersync/server/server.lua | 6 ------ .../renewed-weathersync/server/server.lua | 6 ------ modules/weather/vSync/server/server.lua | 6 ------ settings/clientConfig.lua | 17 ++++++++------- settings/sharedConfig.lua | 1 - 28 files changed, 21 insertions(+), 180 deletions(-) delete mode 100644 modules/vehicleKey/MrNewbVehicleKeys/server/server.lua delete mode 100644 modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua delete mode 100644 modules/vehicleKey/_default/server/server.lua delete mode 100644 modules/vehicleKey/cd_garage/server/server.lua delete mode 100644 modules/vehicleKey/mk_vehiclekeys/server/server.lua delete mode 100644 modules/vehicleKey/okokGarage/server/server.lua delete mode 100644 modules/vehicleKey/qb-vehiclekeys/server/server.lua delete mode 100644 modules/vehicleKey/qbx_vehiclekeys/server/server.lua delete mode 100644 modules/vehicleKey/qs-vehiclekeys/server/server.lua delete mode 100644 modules/vehicleKey/t1ger_keys/server/server.lua delete mode 100644 modules/vehicleKey/wasabi_carlock/server/server.lua delete mode 100644 modules/weather/qb-weathersync/server/server.lua delete mode 100644 modules/weather/renewed-weathersync/server/server.lua delete mode 100644 modules/weather/vSync/server/server.lua diff --git a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua index 5a9f367..e7f4001 100644 --- a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua +++ b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('F_RealCarKeysSystem') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "F_RealCarKeysSystem" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('F_RealCarKeysSystem') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "F_RealCarKeysSystem" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 55689b2..2118527 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "MrNewbVehicleKeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "MrNewbVehicleKeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua b/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua deleted file mode 100644 index c584568..0000000 --- a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua +++ /dev/null @@ -1,21 +0,0 @@ -if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "MrNewbVehicleKeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - if vehicle then - local netId = NetworkGetNetworkIdFromEntity(vehicle) - return exports.MrNewbVehicleKeys:GiveKeys(src, netId) - elseif plate then - return exports.MrNewbVehicleKeys:GiveKeysByPlate(src, plate) - end -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - if vehicle then - local netId = NetworkGetNetworkIdFromEntity(vehicle) - return exports.MrNewbVehicleKeys:RemoveKeys(src, netId) - elseif plate then - return exports.MrNewbVehicleKeys:RemoveKeysByPlate(src, plate) - end -end \ No newline at end of file diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua index 21b7028..e99b79e 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "Renewed-Vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "Renewed-Vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua b/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua deleted file mode 100644 index 78f76ef..0000000 --- a/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua +++ /dev/null @@ -1,13 +0,0 @@ -if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "Renewed-Vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - if not plate then plate = GetVehicleNumberPlateText(vehicle) end - exports['Renewed-Vehiclekeys']:addKey(src, plate) -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - if not plate then plate = GetVehicleNumberPlateText(vehicle) end - exports['Renewed-Vehiclekeys']:removeKey(src, plate) -end \ No newline at end of file diff --git a/modules/vehicleKey/_default/server/server.lua b/modules/vehicleKey/_default/server/server.lua deleted file mode 100644 index 26b525d..0000000 --- a/modules/vehicleKey/_default/server/server.lua +++ /dev/null @@ -1,9 +0,0 @@ -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip -end \ No newline at end of file diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua index b83de16..c77b950 100644 --- a/modules/vehicleKey/cd_garage/client/client.lua +++ b/modules/vehicleKey/cd_garage/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('cd_garage') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "cd_garage" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('cd_garage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "cd_garage" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/cd_garage/server/server.lua b/modules/vehicleKey/cd_garage/server/server.lua deleted file mode 100644 index e69d70c..0000000 --- a/modules/vehicleKey/cd_garage/server/server.lua +++ /dev/null @@ -1,10 +0,0 @@ -if GetResourceState('cd_garage') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "cd_garage" and BridgeSharedConfig.VehicleKey ~= "auto") then return end -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip -end \ No newline at end of file diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua index 82debda..5c11155 100644 --- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "mk_vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mk_vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/mk_vehiclekeys/server/server.lua b/modules/vehicleKey/mk_vehiclekeys/server/server.lua deleted file mode 100644 index d14ad51..0000000 --- a/modules/vehicleKey/mk_vehiclekeys/server/server.lua +++ /dev/null @@ -1,11 +0,0 @@ -if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "mk_vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - -- wip -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - --wip -end \ No newline at end of file diff --git a/modules/vehicleKey/mono_carkeys/client/client.lua b/modules/vehicleKey/mono_carkeys/client/client.lua index 3180d32..ae05305 100644 --- a/modules/vehicleKey/mono_carkeys/client/client.lua +++ b/modules/vehicleKey/mono_carkeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('mono_carkeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "mono_carkeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('mono_carkeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mono_carkeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua index afea250..37e4c64 100644 --- a/modules/vehicleKey/okokGarage/client/client.lua +++ b/modules/vehicleKey/okokGarage/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('okokGarage') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "okokGarage" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('okokGarage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "okokGarage" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/okokGarage/server/server.lua b/modules/vehicleKey/okokGarage/server/server.lua deleted file mode 100644 index 702bf82..0000000 --- a/modules/vehicleKey/okokGarage/server/server.lua +++ /dev/null @@ -1,11 +0,0 @@ -if GetResourceState('okokGarage') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "okokGarage" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip -end \ No newline at end of file diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index 09d3485..c12f66d 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx_vehiclekeys") == "started" or (BridgeSharedConfig.VehicleKey ~= "qb-vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx_vehiclekeys") == "started" or (BridgeClientConfig.VehicleKey ~= "qb-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/qb-vehiclekeys/server/server.lua b/modules/vehicleKey/qb-vehiclekeys/server/server.lua deleted file mode 100644 index e331af6..0000000 --- a/modules/vehicleKey/qb-vehiclekeys/server/server.lua +++ /dev/null @@ -1,17 +0,0 @@ -if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx_vehiclekeys") == "started" or (BridgeSharedConfig.VehicleKey ~= "qb-vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - if not plate and vehicle then - plate = GetVehicleNumberPlateText(vehicle) - end - return exports["qb-vehiclekeys"]:GiveKeys(src, plate) -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - if not plate and vehicle then - plate = GetVehicleNumberPlateText(vehicle) - end - return exports["qb-vehiclekeys"]:RemoveKeys(src, plate) -end \ No newline at end of file diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua index 3ba123c..3ad5b25 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "qbx_vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qbx_vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qbx_vehiclekeys/server/server.lua b/modules/vehicleKey/qbx_vehiclekeys/server/server.lua deleted file mode 100644 index 1c25ea5..0000000 --- a/modules/vehicleKey/qbx_vehiclekeys/server/server.lua +++ /dev/null @@ -1,11 +0,0 @@ -if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "qbx_vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip -end \ No newline at end of file diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua index 6882001..e0a06ba 100644 --- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "qs-vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qs-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qs-vehiclekeys/server/server.lua b/modules/vehicleKey/qs-vehiclekeys/server/server.lua deleted file mode 100644 index 13579d3..0000000 --- a/modules/vehicleKey/qs-vehiclekeys/server/server.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "qs-vehiclekeys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - if not vehicle and not plate then return end - local netId = NetworkGetNetworkIdFromEntity(vehicle) - TriggerClientEvent("community_bridge:vehicleKey:giveKeys", src, netId, plate) -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - if not vehicle and not plate then return end - local netId = NetworkGetNetworkIdFromEntity(vehicle) - TriggerClientEvent("community_bridge:vehicleKey:removeKeys", src, netId, plate) -end \ No newline at end of file diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua index 6834932..347e2fe 100644 --- a/modules/vehicleKey/t1ger_keys/client/client.lua +++ b/modules/vehicleKey/t1ger_keys/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('t1ger_keys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "t1ger_keys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('t1ger_keys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "t1ger_keys" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/t1ger_keys/server/server.lua b/modules/vehicleKey/t1ger_keys/server/server.lua deleted file mode 100644 index 1130e37..0000000 --- a/modules/vehicleKey/t1ger_keys/server/server.lua +++ /dev/null @@ -1,11 +0,0 @@ -if GetResourceState('t1ger_keys') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "t1ger_keys" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - TriggerClientEvent("community_bridge:vehicleKey:giveKeys", src, plate) -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - -end \ No newline at end of file diff --git a/modules/vehicleKey/wasabi_carlock/client/client.lua b/modules/vehicleKey/wasabi_carlock/client/client.lua index 3bee3e2..11e0fe7 100644 --- a/modules/vehicleKey/wasabi_carlock/client/client.lua +++ b/modules/vehicleKey/wasabi_carlock/client/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('wasabi_carlock') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "wasabi_carlock" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +if GetResourceState('wasabi_carlock') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "wasabi_carlock" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/wasabi_carlock/server/server.lua b/modules/vehicleKey/wasabi_carlock/server/server.lua deleted file mode 100644 index 36e7689..0000000 --- a/modules/vehicleKey/wasabi_carlock/server/server.lua +++ /dev/null @@ -1,12 +0,0 @@ -if GetResourceState('wasabi_carlock') ~= 'started' or (BridgeSharedConfig.VehicleKey ~= "wasabi_carlock" and BridgeSharedConfig.VehicleKey ~= "auto") then return end -VehicleKey = VehicleKey or {} - -VehicleKey.GiveKeys = function(src, vehicle, plate) - if not plate and vehicle then plate = GetVehicleNumberPlateText(vehicle) end - exports.wasabi_carlock:GiveKey(src, plate) -end - -VehicleKey.RemoveKeys = function(src, vehicle, plate) - if not plate and vehicle then plate = GetVehicleNumberPlateText(vehicle) end - exports.wasabi_carlock:RemoveKey(src, plate) -end \ No newline at end of file diff --git a/modules/weather/qb-weathersync/server/server.lua b/modules/weather/qb-weathersync/server/server.lua deleted file mode 100644 index b03d4c5..0000000 --- a/modules/weather/qb-weathersync/server/server.lua +++ /dev/null @@ -1,6 +0,0 @@ -if GetResourceState('qb-weathersync') ~= 'started' then return end -Weather = {} - -Weather.ToggleSync = function(src, toggle) - -- wip -end \ No newline at end of file diff --git a/modules/weather/renewed-weathersync/server/server.lua b/modules/weather/renewed-weathersync/server/server.lua deleted file mode 100644 index dc6adfc..0000000 --- a/modules/weather/renewed-weathersync/server/server.lua +++ /dev/null @@ -1,6 +0,0 @@ -if GetResourceState('Renewed-Weathersync') ~= 'started' then return end -Weather = {} - -Weather.ToggleSync = function(src, toggle) - -- wip -end \ No newline at end of file diff --git a/modules/weather/vSync/server/server.lua b/modules/weather/vSync/server/server.lua deleted file mode 100644 index b03d4c5..0000000 --- a/modules/weather/vSync/server/server.lua +++ /dev/null @@ -1,6 +0,0 @@ -if GetResourceState('qb-weathersync') ~= 'started' then return end -Weather = {} - -Weather.ToggleSync = function(src, toggle) - -- wip -end \ No newline at end of file diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 54ae1e2..a22f5ba 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -1,12 +1,13 @@ BridgeClientConfig = {} -BridgeClientConfig.DebugLevel = 0 -- Debug level, 0 for none, 1 for some, 2 for all data -BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ] -BridgeClientConfig.HelpTextSystem = "auto" -BridgeClientConfig.ShowHelpText = "ox" -- [ox | jg | qb | lab | custom ] -BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] -BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] +BridgeClientConfig.DebugLevel = 0 -- Debug level, 0 for none, 1 for some, 2 for all data +BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ] +BridgeClientConfig.HelpTextSystem = "auto" +BridgeClientConfig.ShowHelpText = "ox" -- [ox | jg | qb | lab | custom ] +BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] +BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ProgressBarSystem = "auto" -BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] -BridgeClientConfig.ProgressBar = "ox" -- [ ox | qb ] +BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] +BridgeClientConfig.ProgressBar = "ox" -- [ ox | qb ] +BridgeClientConfig.VehicleKey = "auto" -- Change this to your prefrence or leave it as auto return BridgeClientConfig \ No newline at end of file diff --git a/settings/sharedConfig.lua b/settings/sharedConfig.lua index 366e261..ee434c1 100644 --- a/settings/sharedConfig.lua +++ b/settings/sharedConfig.lua @@ -1,7 +1,6 @@ BridgeSharedConfig = {} BridgeSharedConfig.Lang = "auto" -- Change this to your preferred language (must match the locale file name ex. en or fr etc) BridgeSharedConfig.DebugLevel = 0 -- Change this to your Debug level, 0 for none, 1 for some, 2 for all data -BridgeSharedConfig.VehicleKey = "auto" -- Change this to your prefrence or leave it as auto BridgeSharedConfig.Phone = "auto" -- Change this to your prefrence or leave it as auto return BridgeSharedConfig \ No newline at end of file From 79ca0bc65adf1cac69ccfe286de228f3b667839a Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:37:19 -0500 Subject: [PATCH 04/33] Update fxmanifest.lua --- fxmanifest.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 3409f07..63ec190 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -26,8 +26,6 @@ server_scripts { 'modules/managment/**/server.lua', 'modules/dispatch/**/server.lua', 'modules/clothing/**/server.lua', - 'modules/weather/**/server.lua', - 'modules/vehicleKey/**/server.lua', 'modules/notify/**/server.lua', 'init.lua', } From ce1903b7d6227aade1c66926697085ca4ec082f2 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:37:29 -0500 Subject: [PATCH 05/33] more documentation --- modules/framework/es_extended/client.lua | 26 +++++++ modules/notify/_default/client.lua | 9 +++ modules/notify/_default/server.lua | 9 +++ modules/phone/gksphone/client.lua | 5 ++ modules/phone/gksphone/server.lua | 9 +++ modules/phone/lb-phone/client.lua | 5 ++ modules/phone/lb-phone/server.lua | 6 ++ modules/phone/qs-smartphone/client.lua | 5 ++ modules/phone/qs-smartphone/server.lua | 9 +++ modules/progressbar/ox_lib/client.lua | 51 +++---------- modules/progressbar/qb-progressbar/client.lua | 73 +++---------------- modules/target/ox_target/client.lua | 33 +++++++++ .../weather/qb-weathersync/client/client.lua | 2 + .../renewed-weathersync/client/client.lua | 2 + modules/weather/vSync/client/client.lua | 2 + 15 files changed, 140 insertions(+), 106 deletions(-) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index e905e97..9b6dd40 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -8,10 +8,14 @@ Framework.GetFrameworkName = function() return 'es_extended' end +---comment +---@return table Framework.GetPlayerData = function() return ESX.PlayerData end +---comment +---@return string Framework.GetPlayerDob = function() local playerData = ESX.GetPlayerData() local dob = playerData.dateofbirth @@ -22,35 +26,57 @@ Framework.GetPlayerMetaData = function(metadata) return ESX.GetPlayerData().metadata[metadata] end +---comment +---@param message string +---@param type string +---@param time number +---@return nil Framework.Notify = function(message, type, time) return ESX.ShowNotification(message, type, time) end +---comment +---@return string Framework.GetPlayerIdentifier = function() local playerData = ESX.GetPlayerData() return playerData.identifier end +---comment +---@return string +---@return string Framework.GetPlayerName = function() local playerData = ESX.GetPlayerData() return playerData.firstName, playerData.lastName end +---comment +---@return string +---@return string +---@return string +---@return string Framework.GetPlayerJob = function() local playerData = ESX.GetPlayerData() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end +---comment +---@param item string +---@return boolean Framework.HasItem = function(item) local hasItem = ESX.SearchInventory(item, true) return hasItem > 0 and true or false end +---comment +---@return table Framework.GetPlayerInventory = function() local playerData = ESX.GetPlayerData() return playerData.inventory end +---comment +---@return boolean Framework.GetIsPlayerDead = function() local playerData = ESX.GetPlayerData() return playerData.dead diff --git a/modules/notify/_default/client.lua b/modules/notify/_default/client.lua index a796cb9..6411e8f 100644 --- a/modules/notify/_default/client.lua +++ b/modules/notify/_default/client.lua @@ -2,6 +2,11 @@ Notify = Notify or {} local notifyType = BridgeClientConfig.NotifySystem local helptextType = BridgeClientConfig.ShowHelpText +---comment +---@param message string +---@param _type string +---@param time number +---@return nil Notify.SendNotify = function(message, _type, time) time = time or 3000 if notifyType == 'qb' then @@ -27,6 +32,10 @@ Notify.SendNotify = function(message, _type, time) end end +---comment +---@param message string +---@param _position string +---@return nil Notify.ShowHelpText = function(message, _position) if helptextType == 'ox' then if _position == nil then _position = 'left-center' end diff --git a/modules/notify/_default/server.lua b/modules/notify/_default/server.lua index fd2c122..759bdb2 100644 --- a/modules/notify/_default/server.lua +++ b/modules/notify/_default/server.lua @@ -1,9 +1,18 @@ Notify = Notify or {} +---comment +---@param src number +---@param message string +---@param _type string +---@param time number Notify.SendNotify = function(src, message, _type, time) TriggerClientEvent('community_bridge:Client:Notify', src, message, _type, time) end +---comment +---@param src number +---@param message string +---@param position string Notify.ShowHelpText = function(src, message, position) TriggerClientEvent('community_bridge:Client:ShowHelpText', src, message, position) end diff --git a/modules/phone/gksphone/client.lua b/modules/phone/gksphone/client.lua index d8ddb8f..a06ce8e 100644 --- a/modules/phone/gksphone/client.lua +++ b/modules/phone/gksphone/client.lua @@ -2,6 +2,11 @@ if GetResourceState('gksphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "gk Phone = {} +---comment +---@param email string +---@param title string +---@param message string +---@return boolean Phone.SendEmail = function(email, title, message) return exports["gksphone"]:SendNewMail({ sender = email, image = '/html/static/img/icons/mail.png', subject = title, message = message }) end \ No newline at end of file diff --git a/modules/phone/gksphone/server.lua b/modules/phone/gksphone/server.lua index 0d50297..31d5b5f 100644 --- a/modules/phone/gksphone/server.lua +++ b/modules/phone/gksphone/server.lua @@ -2,10 +2,19 @@ if GetResourceState('gksphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "gk Phone = {} +---comment +---@param src number +---@return number||boolean Phone.GetPlayerPhone = function(src) return exports["gksphone"]:GetPhoneBySource(src) or false end +---comment +---@param src number +---@param email string +---@param title string +---@param message string +---@return boolean Phone.SendEmail = function(src, email, title, message) local data = {} data.sender = email diff --git a/modules/phone/lb-phone/client.lua b/modules/phone/lb-phone/client.lua index 8eb3fe6..3ea1eb1 100644 --- a/modules/phone/lb-phone/client.lua +++ b/modules/phone/lb-phone/client.lua @@ -2,6 +2,11 @@ if GetResourceState('lb-phone') ~= 'started' or (BridgeSharedConfig.Phone ~= "lb Phone = {} +---comment +---@param email string +---@param title string +---@param message string +---@return nil Phone.SendEmail = function(email, title, message) TriggerServerEvent('community_bridge:Server:genericEmail', {email = email, title = title, message = message}) end \ No newline at end of file diff --git a/modules/phone/lb-phone/server.lua b/modules/phone/lb-phone/server.lua index f298707..7657411 100644 --- a/modules/phone/lb-phone/server.lua +++ b/modules/phone/lb-phone/server.lua @@ -6,6 +6,12 @@ Phone.GetPlayerPhone = function(src) return exports["lb-phone"]:GetEquippedPhoneNumber(src) or false end +---comment +---@param src number +---@param email string +---@param title string +---@param message string +---@return boolean Phone.SendEmail = function(src, email, title, message) local numberNumber = exports["lb-phone"]:GetEquippedPhoneNumber(src) if not numberNumber then return false, Prints.Error("Could not Find Phone number") end diff --git a/modules/phone/qs-smartphone/client.lua b/modules/phone/qs-smartphone/client.lua index 4194a00..f60e0cb 100644 --- a/modules/phone/qs-smartphone/client.lua +++ b/modules/phone/qs-smartphone/client.lua @@ -2,6 +2,11 @@ if GetResourceState('qs-smartphone') ~= 'started' or (BridgeSharedConfig.Phone ~ Phone = {} +---comment +---@param email string +---@param title string +---@param message string +---@return nil Phone.SendEmail = function(email, title, message) return TriggerServerEvent('qs-smartphone:server:sendNewMail', { sender = email, subject = title, message = message, button = {} }) end diff --git a/modules/phone/qs-smartphone/server.lua b/modules/phone/qs-smartphone/server.lua index 5694c32..b152b27 100644 --- a/modules/phone/qs-smartphone/server.lua +++ b/modules/phone/qs-smartphone/server.lua @@ -1,10 +1,19 @@ if GetResourceState('qs-smartphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "qs-smartphone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end Phone = {} +---comment +---@param src number +---@return number||boolean Phone.GetPlayerPhone = function(src) return exports['qs-base']:GetPlayerPhone(src) or false end +---comment +---@param src number +---@param email string +---@param title string +---@param message string +---@return boolean Phone.SendEmail = function(src, email, title, message) TriggerClientEvent('community_bridge:Server:genericEmail', src, { sender = email, subject = title, message = message, button = {} }) return true diff --git a/modules/progressbar/ox_lib/client.lua b/modules/progressbar/ox_lib/client.lua index f7a002e..fa3b996 100644 --- a/modules/progressbar/ox_lib/client.lua +++ b/modules/progressbar/ox_lib/client.lua @@ -1,43 +1,3 @@ --- if BridgeClientConfig.ProgressBar ~= "ox" then return end --- Progressbar = {} --- local _progBarType = BridgeClientConfig.ProgressBarStyle or "bar" - --- Progressbar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) --- local runTime = time or 10000 --- local textLabel = label or "Doing something" --- local deadBool = whiledead or false --- local cancelBool = cancancel or false --- local disableKeys = disable or { move = true, sprint = true, car = true, combat = true, } --- local anim = animTable or nil --- local success = successAction or function() Prints.Debug("Success") end --- local canceled = canceledAction or function() Prints.Debug("Cancelled") end --- if _progBarType == "bar" then --- if exports.ox_lib:progressBar({ --- duration = runTime, --- label = textLabel, --- useWhileDead = deadBool, --- canCancel = cancelBool, --- disable = disableKeys, --- anim = anim, --- }) then success() else canceled() end --- elseif _progBarType == "circle" then --- if exports.ox_lib:progressCircle({ --- duration = runTime, --- label = textLabel, --- position = 'bottom', --- useWhileDead = deadBool, --- canCancel = cancelBool, --- disable = disableKeys, --- anim = anim, --- }) then success() else canceled() end --- end --- end - --- Progressbar.IsProgressBarActive = function() --- return exports.ox_lib:progressActive() --- end - - if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "ox" and BridgeClientConfig.InputSystem ~= "auto") then return end ProgressBar = ProgressBar or {} @@ -81,18 +41,24 @@ local function convertFromQB(options) } end +---comment +---@param options table +---@param cb any +---@param isQBInput boolean +---@return nil function ProgressBar.Open(options, cb, isQBInput) if isQBInput then options = convertFromQB(options) end - + local style = options.style or 'bar' local success = style == 'circle' and exports.ox_lib:progressCircle(options) or exports.ox_lib:progressBar(options) - + if cb then cb(not success) end return success end +--[[ RegisterCommand("progressbar", function() ProgressBar.Open({ duration = 5000, @@ -109,3 +75,4 @@ RegisterCommand("progressbar", function() print(cancelled and "Cancelled" or "Complete") end) end) +--]] diff --git a/modules/progressbar/qb-progressbar/client.lua b/modules/progressbar/qb-progressbar/client.lua index 3092381..b5e5714 100644 --- a/modules/progressbar/qb-progressbar/client.lua +++ b/modules/progressbar/qb-progressbar/client.lua @@ -1,65 +1,3 @@ --- if BridgeClientConfig.ProgressBar ~= "qb" then return end --- Progressbar = {} - --- local function convertOxToQB(disabledTable, animTable) --- local repackedTable = { disabled = {}, animations = {}} --- for _, v in pairs(disabledTable) do --- if v.move then --- repackedTable.disabled.disableMovement = v.move --- end --- if v.car then --- repackedTable.disabled.disableCarMovement = v.car --- end --- if v.combat then --- repackedTable.disabled.disableCombat = v.combat --- end --- if v.mouse then --- repackedTable.disabled.disableMouse = v.mouse --- end --- end --- for _, v in pairs(animTable) do --- if v.dict then --- repackedTable.animations.animDict = v.animDict --- end --- if v.clip then --- repackedTable.animations.anim = v.anim --- end --- end --- return repackedTable --- end - --- Progressbar.StartProgressBar = function(time, label, whiledead, cancancel, disable, animTable, successAction, canceledAction) --- local runTime = time or 10000 --- local textLabel = label or "Doing something" --- local deadBool = whiledead or false --- local cancelBool = cancancel or false --- local success = successAction or function() Prints.Debug("Success") end --- local canceled = canceledAction or function() Prints.Debug("Cancelled") end --- local repackedTable = convertOxToQB(disable, animTable) --- exports['progressbar']:Progress({ --- name = textLabel, --- duration = runTime, --- label = textLabel, --- useWhileDead = deadBool, --- canCancel = cancelBool, --- controlDisables = repackedTable.disabled, --- animation = repackedTable.animations, --- prop = {}, --- propTwo = {} --- }, function(cancelled) --- if not cancelled then --- success() --- else --- canceled() --- end --- end) --- end - --- Progressbar.IsProgressBarActive = function() --- return exports["progressbar"]:isDoingSomething() --- end - - if GetResourceState('progressbar') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "qb" and BridgeClientConfig.ProgressBarSystem ~= "auto") then return end ProgressBar = ProgressBar or {} @@ -98,18 +36,24 @@ local function convertFromOx(options) } end +---comment +---@param options table +---@param cb any +---@param qbFormat boolean +---@return nil function ProgressBar.Open(options, cb, qbFormat) if not exports['progressbar'] then return false end - + if not qbFormat then options = convertFromOx(options) end - + exports['progressbar']:Progress(options, cb) end -- Example usage: +--[[ RegisterCommand("progressbar", function() ProgressBar.Open({ duration = 5000, @@ -131,3 +75,4 @@ RegisterCommand("progressbar", function() print(cancelled and "Cancelled" or "Complete") end) end) +--]] \ No newline at end of file diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 332e170..99f39e9 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -28,16 +28,25 @@ Target.FixOptions = function(options) return options end +---comment +---@param options table +---@return nil Target.AddGlobalPlayer = function(options) options = Target.FixOptions(options) ox_target:addGlobalPlayer(options) end +---comment +---@param options table +---@return nil Target.AddGlobalVehicle = function(options) options = Target.FixOptions(options) ox_target:addGlobalVehicle(options) end +---comment +---@param options table +---@return nil Target.RemoveGlobalVehicle = function(options) local assembledLables = {} for k, v in pairs(options) do @@ -46,16 +55,31 @@ Target.RemoveGlobalVehicle = function(options) ox_target:removeGlobalVehicle(assembledLables) end +---comment +---@param entities table +---@param options table +---@return nil Target.AddLocalEntity = function(entities, options) options = Target.FixOptions(options) ox_target:addLocalEntity(entities, options) end +---comment +---@param models table +---@param options table +---@return nil Target.AddModel = function(models, options) options = Target.FixOptions(options) ox_target:addModel(models, options) end +---comment +---@param name string +---@param coords table +---@param size table +---@param heading number +---@param options table +---@return number Target.AddBoxZone = function(name, coords, size, heading, options) options = Target.FixOptions(options) local target = ox_target:addBoxZone({ @@ -73,14 +97,23 @@ Target.RemoveGlobalPlayer = function() ox_target:removeGlobalPlayer() end +---comment +---@param entity number +---@return nil Target.RemoveLocalEntity = function(entity) ox_target:removeLocalEntity(entity) end +---comment +---@param model string +---@return nil Target.RemoveModel = function(model) ox_target:removeModel(model) end +---comment +---@param name string +---@return nil Target.RemoveZone = function(name) for _, data in pairs(targetZones) do if data.name == name then diff --git a/modules/weather/qb-weathersync/client/client.lua b/modules/weather/qb-weathersync/client/client.lua index 154a846..e669fac 100644 --- a/modules/weather/qb-weathersync/client/client.lua +++ b/modules/weather/qb-weathersync/client/client.lua @@ -1,6 +1,8 @@ if GetResourceState('qb-weathersync') ~= 'started' then return end Weather = {} +---comment +---@param toggle boolean Weather.ToggleSync = function(toggle) if toggle then TriggerEvent("qb-weathersync:client:EnableSync") diff --git a/modules/weather/renewed-weathersync/client/client.lua b/modules/weather/renewed-weathersync/client/client.lua index a8a1766..d6589c7 100644 --- a/modules/weather/renewed-weathersync/client/client.lua +++ b/modules/weather/renewed-weathersync/client/client.lua @@ -1,6 +1,8 @@ if GetResourceState('Renewed-Weathersync') ~= 'started' then return end Weather = {} +---comment +---@param toggle boolean Weather.ToggleSync = function(toggle) LocalPlayer.state.syncWeather = toggle end \ No newline at end of file diff --git a/modules/weather/vSync/client/client.lua b/modules/weather/vSync/client/client.lua index 154a846..e669fac 100644 --- a/modules/weather/vSync/client/client.lua +++ b/modules/weather/vSync/client/client.lua @@ -1,6 +1,8 @@ if GetResourceState('qb-weathersync') ~= 'started' then return end Weather = {} +---comment +---@param toggle boolean Weather.ToggleSync = function(toggle) if toggle then TriggerEvent("qb-weathersync:client:EnableSync") From b77fbeffa803e11dbf038a3720bd1cb2b3d4a8f0 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 02:05:53 -0500 Subject: [PATCH 06/33] player/xplayer guards --- modules/framework/es_extended/server.lua | 24 +++++++++++- modules/framework/qb-core/server.lua | 29 +++++++++++++- modules/framework/qbx_core/server.lua | 50 +++++++++++++++++++----- 3 files changed, 91 insertions(+), 12 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 4496eee..fb0c4fc 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -10,6 +10,7 @@ end Framework.GetPlayerDob = function(src) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end local dob = xPlayer.get("dateofbirth") return dob end @@ -18,6 +19,7 @@ end -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.getIdentifier() end @@ -25,6 +27,7 @@ end -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.variables.firstName, xPlayer.variables.lastName end @@ -32,7 +35,9 @@ end -- Returns a table of items matching the specified name and if passed metadata from the player's inventory. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, _) - local playerItems = ESX.GetPlayerFromId(src).getInventory() + local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end + local playerItems = xPlayer.getInventory() local repackedTable = {} for _, v in pairs(playerItems) do if v.name == item then @@ -51,6 +56,7 @@ end -- Returns the count of items matching the specified name and if passed metadata from the player's inventory. Framework.GetItemCount = function(src, item, _) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.getInventoryItem(item).count end @@ -58,7 +64,9 @@ end -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, _, _} Framework.GetPlayerInventory = function(src) - local playerItems = ESX.GetPlayerFromId(src).getInventory() + local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end + local playerItems = xPlayer.getInventory() local repackedTable = {} for _, v in pairs(playerItems) do if v.count > 0 then @@ -77,6 +85,7 @@ end -- Adds the specified metadata key and number value to the player's data. Framework.SetPlayerMetadata = function(src, metadata, value) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end xPlayer.setMeta(metadata, value, nil) return true end @@ -85,6 +94,7 @@ end -- Gets the specified metadata key and value to the player's data. Framework.GetPlayerMetadata = function(src, metadata) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.getMeta(metadata) or false end @@ -95,6 +105,7 @@ end -- phone_number, pincode Framework.GetStatus = function(src, column) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.get(column) or nil end @@ -132,6 +143,7 @@ end -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.get("phone_number") end @@ -139,6 +151,7 @@ end -- Returns the job name, label, grade name, and grade level of the player. Framework.GetPlayerJob = function(src) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.getJob().name, xPlayer.getJob().label, xPlayer.getJob().grade_label, xPlayer.getJob().grade end @@ -160,12 +173,14 @@ end -- Sets the player's job to the specified name and grade. 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) return end return xPlayer.setJob(name, grade, true) end Framework.ToggleDuty = function(src, status) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end local name = xPlayer.getJob().name local grade = xPlayer.getJob().grade xPlayer.setJob(name, grade, status) @@ -175,6 +190,7 @@ end -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.addAccountMoney(_type, amount) end @@ -182,6 +198,7 @@ end -- Removes the specified amount from the player's account balance of the specified type. Framework.RemoveAccountBalance = function(src, _type, amount) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.removeAccountMoney(_type, amount) end @@ -189,6 +206,7 @@ end -- Returns the player's account balance of the specified type. Framework.GetAccountBalance = function(src, _type) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.getAccount(_type).money end @@ -196,6 +214,7 @@ end -- Adds the specified item to the player's inventory. Framework.AddItem = function(src, item, amount, slot, metadata) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.addInventoryItem(item, amount) end @@ -203,6 +222,7 @@ end -- Removes the specified item from the player's inventory. Framework.RemoveItem = function(src, item, amount, slot, metadata) local xPlayer = ESX.GetPlayerFromId(src) + if not xPlayer then return end return xPlayer.removeInventoryItem(item, amount) end diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 6ea0e5d..3b977a0 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -13,6 +13,7 @@ end -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.citizenid end @@ -21,12 +22,14 @@ end -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.charinfo.firstname, playerData.charinfo.lastname end Framework.GetPlayerDob = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.charinfo.birthdate end @@ -36,6 +39,7 @@ end -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items local repackedTable = {} @@ -56,6 +60,7 @@ end -- Returns the count of items matching the specified name and if passed metadata from the player's inventory. Framework.GetItemCount = function(src, item, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items local count = 0 @@ -72,6 +77,7 @@ end -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetPlayerInventory = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items local repackedTable = {} @@ -88,6 +94,7 @@ end Framework.GetItemBySlot = function(src, slot) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local playerInventory = playerData.items local repack = {} @@ -112,6 +119,7 @@ end -- Adds the specified metadata key and number value to the player's data. Framework.SetPlayerMetadata = function(src, metadata, value) local player = QBCore.Functions.GetPlayer(src) + if not player then return end player.Functions.SetMetaData(metadata, value) return true end @@ -120,6 +128,7 @@ end -- Gets the specified metadata key to the player's data. Framework.GetPlayerMetadata = function(src, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.metadata[metadata] or false end @@ -128,6 +137,7 @@ end -- Adds the specified value to the player's stress level and updates the client HUD. Framework.AddStress = function(src, value) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newStress = playerData.metadata.stress + value player.Functions.SetMetaData('stress', Math.Clamp(newStress, 0, 100)) @@ -139,6 +149,7 @@ end -- Removes the specified value from the player's stress level and updates the client HUD. Framework.RemoveStress = function(src, value) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newStress = (playerData.metadata.stress or 0) - value player.Functions.SetMetaData('stress', Math.Clamp(newStress, 0, 100)) @@ -150,6 +161,7 @@ end -- Adds the specified value from the player's hunger level. Framework.AddHunger = function(src, value) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) + value player.Functions.SetMetaData('hunger', Math.Clamp(newHunger, 0, 100)) @@ -161,6 +173,7 @@ end -- Adds the specified value from the player's thirst level. Framework.AddThirst = function(src, value) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) + value player.Functions.SetMetaData('thirst', Math.Clamp(newThirst, 0, 100)) @@ -170,6 +183,7 @@ end Framework.GetHunger = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) return newHunger @@ -177,6 +191,7 @@ end Framework.GetThirst = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) return newThirst @@ -186,6 +201,7 @@ end -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.charinfo.phone end @@ -194,6 +210,7 @@ end -- Returns the gang name of the player. Framework.GetPlayerGang = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.gang.name end @@ -216,6 +233,7 @@ end -- Returns the job name, label, grade name, and grade level of the player. Framework.GetPlayerJob = function(src) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end @@ -224,11 +242,13 @@ end -- Sets the player's job to the specified name and grade. Framework.SetPlayerJob = function(src, name, grade) local player = QBCore.Functions.GetPlayer(src) + if not player then return end return player.Functions.SetJob(name, grade) end Framework.ToggleDuty = function(src, status) local player = QBCore.Functions.GetPlayer(src) + if not player then return end player.Functions.SetJobDuty(status) TriggerEvent('QBCore:Server:SetDuty', src, player.PlayerData.job.onduty) end @@ -237,6 +257,7 @@ end -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount) local player = QBCore.Functions.GetPlayer(src) + if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.AddMoney(_type, amount) end @@ -245,6 +266,7 @@ end -- Removes the specified amount from the player's account balance of the specified type. Framework.RemoveAccountBalance = function(src, _type, amount) local player = QBCore.Functions.GetPlayer(src) + if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.RemoveMoney(_type, amount) end @@ -252,7 +274,9 @@ end -- Framework.GetAccountBalance(src, _type) -- Returns the player's account balance of the specified type. Framework.GetAccountBalance = function(src, _type) - local playerData = QBCore.Functions.GetPlayer(src).PlayerData + local player = QBCore.Functions.GetPlayer(src) + if not player then return end + local playerData = player.PlayerData if _type == 'money' then _type = 'cash' end return playerData.money[_type] end @@ -261,6 +285,7 @@ end -- Adds the specified item to the player's inventory. Framework.AddItem = function(src, item, amount, slot, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) return player.Functions.AddItem(item, amount, slot, metadata) end @@ -269,6 +294,7 @@ end -- Removes the specified item from the player's inventory. Framework.RemoveItem = function(src, item, amount, slot, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) return player.Functions.RemoveItem(item, amount, slot or nil) end @@ -278,6 +304,7 @@ end -- Notes, this is kinda a jank workaround. with the framework aside from updating the entire table theres not really a better way Framework.SetMetadata = function(src, item, slot, metadata) local player = QBCore.Functions.GetPlayer(src) + if not player then return end local slotFinder = Framework.GetPlayerInventory(src) local freeSlot = Table.FindFirstUnoccupiedSlot(slotFinder) local itemSlot = slot or nil diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 7790468..ebd17b8 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -9,14 +9,18 @@ Framework.GetFrameworkName = function() end Framework.GetPlayerDob = function(src) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData return playerData.charinfo.birthdate end -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData if not playerData then return false end return playerData.citizenid end @@ -24,7 +28,9 @@ end -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData return playerData.charinfo.firstname, playerData.charinfo.lastname end @@ -32,7 +38,9 @@ end -- Returns a table of items matching the specified name and if passed metadata from the player's inventory. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, metadata) - local playerInventory = QBox:GetPlayer(src).PlayerData.items + local player = QBox:GetPlayer(src) + if not player then return end + local playerInventory = player.PlayerData.items local repackedTable = {} for _, v in pairs(playerInventory) do if v.name == item and (not metadata or v.info == metadata) then @@ -50,7 +58,9 @@ end -- Framework.GetItemCount(src, item, metadata) -- Returns the count of items matching the specified name and if passed metadata from the player's inventory. Framework.GetItemCount = function(src, item, metadata) - local playerInventory = QBox:GetPlayer(src).PlayerData.items + local player = QBox:GetPlayer(src) + if not player then return end + local playerInventory = player.PlayerData.items local count = 0 for _, v in pairs(playerInventory) do if v.name == item and (not metadata or v.info == metadata) then @@ -64,7 +74,9 @@ end -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetPlayerInventory = function(src) - local playerItems = QBox:GetPlayer(src).PlayerData.items + local player = QBox:GetPlayer(src) + if not player then return end + local playerItems = player.PlayerData.items local repackedTable = {} for _, v in pairs(playerItems) do table.insert(repackedTable, { @@ -81,6 +93,7 @@ end -- Adds the specified metadata key and number value to the player's data. Framework.SetPlayerMetadata = function(src, metadata, value) local player = QBox:GetPlayer(src) + if not player then return end player.Functions.SetMetaData(metadata, value) return true end @@ -89,6 +102,7 @@ end -- Gets the specified metadata key to the player's data. Framework.GetPlayerMetadata = function(src, metadata) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData return playerData.metadata[metadata] or false end @@ -97,6 +111,7 @@ end -- Adds the specified value to the player's stress level and updates the client HUD. Framework.AddStress = function(src, value) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newStress = playerData.metadata.stress + value player.Functions.SetMetaData('stress', Math.Clamp(newStress, 0, 100)) @@ -108,6 +123,7 @@ end -- Removes the specified value from the player's stress level and updates the client HUD. Framework.RemoveStress = function(src, value) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newStress = (playerData.metadata.stress or 0) - value player.Functions.SetMetaData('stress', Math.Clamp(newStress, 0, 100)) @@ -119,6 +135,7 @@ end -- Adds the specified value from the player's hunger level. Framework.AddHunger = function(src, value) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) + value player.Functions.SetMetaData('hunger', Math.Clamp(newHunger, 0, 100)) @@ -130,6 +147,7 @@ end -- Adds the specified value from the player's thirst level. Framework.AddThirst = function(src, value) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) + value player.Functions.SetMetaData('thirst', Math.Clamp(newThirst, 0, 100)) @@ -139,6 +157,7 @@ end Framework.GetHunger = function(src) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) return newHunger @@ -146,6 +165,7 @@ end Framework.GetThirst = function(src) local player = QBox:GetPlayer(src) + if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) return newThirst @@ -154,7 +174,9 @@ end -- Framework.GetPlayerPhone(src) -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData return playerData.charinfo.phone end @@ -187,11 +209,14 @@ end -- Sets the player's job to the specified name and grade. Framework.SetPlayerJob = function(src, name, grade) local player = QBox:GetPlayer(src) + if not player then return end return player.Functions.SetJob(name, grade) end Framework.ToggleDuty = function(src, status) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData QBox:SetJobDuty(playerData.citizenid, status) end @@ -199,6 +224,7 @@ end -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount) local player = QBox:GetPlayer(src) + if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.AddMoney(_type, amount) end @@ -207,6 +233,7 @@ end -- Removes the specified amount from the player's account balance of the specified type. Framework.RemoveAccountBalance = function(src, _type, amount) local player = QBox:GetPlayer(src) + if not player then return end if _type == 'money' then _type = 'cash' end return player.Functions.RemoveMoney(_type, amount) end @@ -214,7 +241,9 @@ end -- Framework.GetAccountBalance(src, _type) -- Returns the player's account balance of the specified type. Framework.GetAccountBalance = function(src, _type) - local playerData = QBox:GetPlayer(src).PlayerData + local player = QBox:GetPlayer(src) + if not player then return end + local playerData = player.PlayerData if _type == 'money' then _type = 'cash' end return playerData.money[_type] end @@ -223,6 +252,7 @@ end -- Adds the specified item to the player's inventory. Framework.AddItem = function(src, item, amount, slot, metadata) local player = QBox:GetPlayer(src) + if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) return player.Functions.AddItem(item, amount, slot, metadata) end @@ -231,6 +261,7 @@ end -- Removes the specified item from the player's inventory. Framework.RemoveItem = function(src, item, amount, slot, metadata) local player = QBox:GetPlayer(src) + if not player then return end TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) return player.Functions.RemoveItem(item, amount, slot) end @@ -240,6 +271,7 @@ end -- Notes, this is kinda a jank workaround. with the framework aside from updating the entire table theres not really a better way Framework.SetMetadata = function(src, item, slot, metadata) local player = QBox:GetPlayer(src) + if not player then return end player.Functions.RemoveItem(item, 1, slot) return player.Functions.AddItem(item, 1, slot, metadata) end From a53995a7735d9570456a860d904e040860c2c938 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:08:46 -0500 Subject: [PATCH 07/33] fuel to auto or manual --- modules/fuel/BigDaddy-Fuel/client.lua | 4 +++- modules/fuel/LegacyFuel/client.lua | 4 +++- modules/fuel/Renewed-Fuel/client.lua | 3 ++- modules/fuel/cdn-fuel/client.lua | 6 ++++-- modules/fuel/esx-sna-fuel/client.lua | 4 +++- modules/fuel/okokGasStation/client.lua | 4 +++- modules/fuel/ox_fuel/client.lua | 3 ++- modules/fuel/ps-fuel/client.lua | 4 +++- modules/fuel/qs-fuelstations/client.lua | 4 +++- modules/fuel/ti_fuel/client.lua | 14 ++++++++------ modules/fuel/x-fuel/client.lua | 12 +++++++----- 11 files changed, 41 insertions(+), 21 deletions(-) diff --git a/modules/fuel/BigDaddy-Fuel/client.lua b/modules/fuel/BigDaddy-Fuel/client.lua index c4ff03e..b9a3ff2 100644 --- a/modules/fuel/BigDaddy-Fuel/client.lua +++ b/modules/fuel/BigDaddy-Fuel/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end +if GetResourceState('BigDaddy-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "BigDaddy" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/LegacyFuel/client.lua b/modules/fuel/LegacyFuel/client.lua index 524f590..61c6655 100644 --- a/modules/fuel/LegacyFuel/client.lua +++ b/modules/fuel/LegacyFuel/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('LegacyFuel') ~= 'started' then return end +if GetResourceState('LegacyFuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "LegacyFuel" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('LegacyFuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/Renewed-Fuel/client.lua b/modules/fuel/Renewed-Fuel/client.lua index 7a44d74..48d1072 100644 --- a/modules/fuel/Renewed-Fuel/client.lua +++ b/modules/fuel/Renewed-Fuel/client.lua @@ -1,4 +1,5 @@ -if GetResourceState('Renewed-Fuel') ~= 'started' then return end +if GetResourceState('Renewed-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "Renewed-Fuel" and BridgeClientConfig.Fuel ~= "auto") then return end +--if GetResourceState('Renewed-Fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua index 486519c..97e570a 100644 --- a/modules/fuel/cdn-fuel/client.lua +++ b/modules/fuel/cdn-fuel/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('cdn-fuel') ~= 'started' then return end +if GetResourceState('cdn-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "cdn" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('cdn-fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) @@ -6,7 +8,7 @@ Fuel.GetFuel = function(vehicle) return exports['cdn-fuel']:GetFuel(vehicle) end -Fuel.SetFuel = function(vehicle, fuel, type) +Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['cdn-fuel']:SetFuel(vehicle, fuel) end \ No newline at end of file diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua index 774fc6d..9abc9c7 100644 --- a/modules/fuel/esx-sna-fuel/client.lua +++ b/modules/fuel/esx-sna-fuel/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('esx-sna-fuel') ~= 'started' then return end +if GetResourceState('esx-sna-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "sna" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('esx-sna-fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua index 78c4f42..219730c 100644 --- a/modules/fuel/okokGasStation/client.lua +++ b/modules/fuel/okokGasStation/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('okokGasStation') ~= 'started' then return end +if GetResourceState('okokGasStation') ~= 'started' or (BridgeClientConfig.Fuel ~= "okokGasStation" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('okokGasStation') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua index 2032591..bcd820a 100644 --- a/modules/fuel/ox_fuel/client.lua +++ b/modules/fuel/ox_fuel/client.lua @@ -1,4 +1,5 @@ -if GetResourceState('cdn-fuel') ~= 'started' then return end +if GetResourceState('ox_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ox_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end +--if GetResourceState('ox_fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua index 590122f..61f0468 100644 --- a/modules/fuel/ps-fuel/client.lua +++ b/modules/fuel/ps-fuel/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('ps-fuel') ~= 'started' then return end +if GetResourceState('ps-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ps-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('ps-fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua index ae19c7b..d0bcbfa 100644 --- a/modules/fuel/qs-fuelstations/client.lua +++ b/modules/fuel/qs-fuelstations/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qs-fuelstations') ~= 'started' then return end +if GetResourceState('qs-fuelstations') ~= 'started' or (BridgeClientConfig.Fuel ~= "qs-fuelstations" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('qs-fuelstations') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua index 55eac90..a075d29 100644 --- a/modules/fuel/ti_fuel/client.lua +++ b/modules/fuel/ti_fuel/client.lua @@ -1,13 +1,15 @@ -if GetResourceState('ti_fuel') ~= 'started' then return end +if GetResourceState('ti_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ti_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('ti_fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0, type end - local level, type = exports["ti_fuel"]:getFuel(vehicle) - return level, type + if not DoesEntityExist(vehicle) then return 0.0 end + local level, _ = exports["ti_fuel"]:getFuel(vehicle) + return level end -Fuel.SetFuel = function(vehicle, fuel, type) +Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end - return exports['ti_fuel']:setFuel(vehicle, fuel, type or "RON91") + return exports['ti_fuel']:setFuel(vehicle, fuel, "RON91") end \ No newline at end of file diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua index 22b59c1..db18170 100644 --- a/modules/fuel/x-fuel/client.lua +++ b/modules/fuel/x-fuel/client.lua @@ -1,13 +1,15 @@ -if GetResourceState('x-fuel') ~= 'started' then return end +if GetResourceState('x-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "x-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end + +--if GetResourceState('x-fuel') ~= 'started' then return end Fuel = Fuel or {} Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0, type end - local level, type = exports["x-fuel"]:getFuel(vehicle) - return level, type + if not DoesEntityExist(vehicle) then return 0.0 end + local level, _ = exports["x-fuel"]:getFuel(vehicle) + return level end -Fuel.SetFuel = function(vehicle, fuel, type) +Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['x-fuel']:SetFuel(vehicle, fuel) end \ No newline at end of file From cd7f41b5180a2dbf1e3a75049146ccee8525e3d6 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:08:58 -0500 Subject: [PATCH 08/33] managment to auto or manual --- modules/managment/Renewed-Banking/server.lua | 2 +- modules/managment/_default/server.lua | 13 +++++++++++++ modules/managment/okokBanking/server.lua | 2 +- modules/managment/qb-banking/server.lua | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 modules/managment/_default/server.lua diff --git a/modules/managment/Renewed-Banking/server.lua b/modules/managment/Renewed-Banking/server.lua index c030fc2..4a952de 100644 --- a/modules/managment/Renewed-Banking/server.lua +++ b/modules/managment/Renewed-Banking/server.lua @@ -1,5 +1,5 @@ if GetResourceState('Renewed-Banking') ~= 'started' then return end -Managment = {} +Managment = Managment or {} Managment.GetAccountMoney = function(account) return exports['Renewed-Banking']:getAccountMoney(account) diff --git a/modules/managment/_default/server.lua b/modules/managment/_default/server.lua new file mode 100644 index 0000000..26593d6 --- /dev/null +++ b/modules/managment/_default/server.lua @@ -0,0 +1,13 @@ +Managment = Managment or {} + +Managment.GetAccountMoney = function(account) + return false, print("The resource you are using does not support this function.") +end + +Managment.AddAccountMoney = function(account, amount) + return false, print("The resource you are using does not support this function.") +end + +Managment.RemoveAccountMoney = function(account, amount) + return false, print("The resource you are using does not support this function.") +end \ No newline at end of file diff --git a/modules/managment/okokBanking/server.lua b/modules/managment/okokBanking/server.lua index 6e3934e..90ad050 100644 --- a/modules/managment/okokBanking/server.lua +++ b/modules/managment/okokBanking/server.lua @@ -1,5 +1,5 @@ if GetResourceState('okokBanking') ~= 'started' then return end -Managment = {} +Managment = Managment or {} Managment.GetAccountMoney = function(account) return exports['okokBanking']:GetAccount(account) diff --git a/modules/managment/qb-banking/server.lua b/modules/managment/qb-banking/server.lua index 8a7a640..5a7facf 100644 --- a/modules/managment/qb-banking/server.lua +++ b/modules/managment/qb-banking/server.lua @@ -1,5 +1,5 @@ if GetResourceState('qb-banking') ~= 'started' then return end -Managment = {} +Managment = Managment or {} Managment.GetAccountMoney = function(account) return exports['qb-banking']:GetAccountBalance(account) From b0f17048060694061f03f2e59ba665b1c0b22d13 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:09:06 -0500 Subject: [PATCH 09/33] target to auto or manual --- modules/target/_defualt/client.lua | 2 +- modules/target/ox_target/client.lua | 2 +- modules/target/qb-target/client.lua | 3 ++- modules/target/sleepless_interact/client.lua | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/target/_defualt/client.lua b/modules/target/_defualt/client.lua index 6c3a7ca..bc9b892 100644 --- a/modules/target/_defualt/client.lua +++ b/modules/target/_defualt/client.lua @@ -1,7 +1,7 @@ Target = Target or {} local function warnUser() - print("Currently Only Targeting Is Supported.") + print("Currently Only Targeting Is Supported By Community Bridge, You Are Using A Resource That Requires The Target Module To Be Used.") end Target.AddGlobalPlayer = function(options) diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 99f39e9..cf694ed 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -1,4 +1,4 @@ -if GetResourceState('ox_target') ~= 'started' then return end +if GetResourceState('ox_target') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "ox" and BridgeClientConfig.TargetSystem ~= "auto") then return end local targetDebug = false local function detectDebugEnabled() diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index 72a7001..c113208 100644 --- a/modules/target/qb-target/client.lua +++ b/modules/target/qb-target/client.lua @@ -1,4 +1,5 @@ -if GetResourceState('qb-target') ~= 'started' or GetResourceState('ox_target') == 'started' then return end +if GetResourceState('qb-target') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "qb" and BridgeClientConfig.TargetSystem ~= "auto") then return end +if GetResourceState('ox_target') == 'started' then return end -- this is for older versions of ox that supported the backwards compatability. As its depricated we dont want to touch that. local targetDebug = false local function detectDebugEnabled() diff --git a/modules/target/sleepless_interact/client.lua b/modules/target/sleepless_interact/client.lua index d3870cd..9ee93eb 100644 --- a/modules/target/sleepless_interact/client.lua +++ b/modules/target/sleepless_interact/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('sleepless_interact') ~= 'started' then return end +if GetResourceState('sleepless_interact') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "sleepless" and BridgeClientConfig.TargetSystem ~= "auto") then return end + +--if GetResourceState('sleepless_interact') ~= 'started' then return end +-- This is only partially supported local sleepless = exports.sleepless_interact From 6bcd894fdb6aa3500725e12067498ec8219602fb Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:09:18 -0500 Subject: [PATCH 10/33] vehiclekeys to auto or manual --- .../F_RealCarKeysSystem/client/client.lua | 4 +++- .../MrNewbVehicleKeys/client/client.lua | 9 ++++----- .../Renewed-Vehiclekeys/client/client.lua | 4 ++-- modules/vehicleKey/_default/client/client.lua | 4 ++-- modules/vehicleKey/cd_garage/client/client.lua | 4 +++- .../mk_vehiclekeys/client/client.lua | 4 ++-- .../vehicleKey/mono_carkeys/client/client.lua | 4 ++-- .../vehicleKey/okokGarage/client/client.lua | 1 + .../qb-vehiclekeys/client/client.lua | 4 ++-- .../qbx_vehiclekeys/client/client.lua | 4 ++-- .../qs-vehiclekeys/client/client.lua | 18 +++--------------- .../vehicleKey/t1ger_keys/client/client.lua | 6 +----- 12 files changed, 27 insertions(+), 39 deletions(-) diff --git a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua index e7f4001..cbc4c75 100644 --- a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua +++ b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua @@ -1,10 +1,12 @@ if GetResourceState('F_RealCarKeysSystem') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "F_RealCarKeysSystem" and BridgeClientConfig.VehicleKey ~= "auto") then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) + if not plate then return false end TriggerServerEvent('F_RealCarKeysSystem:generateVehicleKeys', plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - return + return true end diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 2118527..259df39 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -3,12 +3,11 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeClientConfig.Veh VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not DoesEntityExist(vehicle) and not plate then return false end - return exports.MrNewbVehicleKeys:GiveKeys(vehicle) + if not plate then return false end + return exports.MrNewbVehicleKeys:GiveKeysByPlate(plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - if not vehicle and not plate then return false end - if not DoesEntityExist(vehicle) then return exports.MrNewbVehicleKeys:RemoveKeysByPlate(plate) end - return exports.MrNewbVehicleKeys:RemoveKeys(vehicle) + if not plate then return false end + return exports.MrNewbVehicleKeys:RemoveKeysByPlate(plate) end \ No newline at end of file diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua index e99b79e..6558428 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua @@ -3,11 +3,11 @@ if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeClientConfig.V VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not plate and not DoesEntityExist(vehicle) then return false end + if not plate then return false end return exports['Renewed-Vehiclekeys']:addKey(plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - if not plate and not DoesEntityExist(vehicle) then return false end + if not plate then return false end return exports['Renewed-Vehiclekeys']:removeKey(plate) end \ No newline at end of file diff --git a/modules/vehicleKey/_default/client/client.lua b/modules/vehicleKey/_default/client/client.lua index af15d71..da6a547 100644 --- a/modules/vehicleKey/_default/client/client.lua +++ b/modules/vehicleKey/_default/client/client.lua @@ -1,9 +1,9 @@ VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - -- wip + return true, print("There Is No Vehicle Key System Installed") end VehicleKey.RemoveKeys = function(vehicle, plate) - -- wip + return true, print("There Is No Vehicle Key System Installed") end \ No newline at end of file diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua index c77b950..d9998be 100644 --- a/modules/vehicleKey/cd_garage/client/client.lua +++ b/modules/vehicleKey/cd_garage/client/client.lua @@ -1,10 +1,12 @@ if GetResourceState('cd_garage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "cd_garage" and BridgeClientConfig.VehicleKey ~= "auto") then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) + if not plate then return false end TriggerEvent('cd_garage:AddKeys', plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - + return true end \ No newline at end of file diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua index 5c11155..7f5cc6a 100644 --- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua @@ -3,11 +3,11 @@ if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeClientConfig.Vehicl VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not DoesEntityExist(vehicle) then return false end + if not vehicle and not DoesEntityExist(vehicle) then return false end return exports["mk_vehiclekeys"]:AddKey(vehicle) end VehicleKey.RemoveKeys = function(vehicle, plate) - if not DoesEntityExist(vehicle) then return false end + if not vehicle and not DoesEntityExist(vehicle) then return false end return exports["mk_vehiclekeys"]:RemoveKey(vehicle) end \ No newline at end of file diff --git a/modules/vehicleKey/mono_carkeys/client/client.lua b/modules/vehicleKey/mono_carkeys/client/client.lua index ae05305..da85cc3 100644 --- a/modules/vehicleKey/mono_carkeys/client/client.lua +++ b/modules/vehicleKey/mono_carkeys/client/client.lua @@ -2,11 +2,11 @@ if GetResourceState('mono_carkeys') ~= 'started' or (BridgeClientConfig.VehicleK VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if type(plate) ~= 'string' then return end + if not plate then return false end TriggerServerEvent('mono_carkeys:CreateKey', plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - if type(plate) ~= 'string' then return end + if not plate then return false end TriggerServerEvent('mono_carkeys:DeleteKey', 1, plate) end diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua index 37e4c64..3da9e3f 100644 --- a/modules/vehicleKey/okokGarage/client/client.lua +++ b/modules/vehicleKey/okokGarage/client/client.lua @@ -3,6 +3,7 @@ if GetResourceState('okokGarage') ~= 'started' or (BridgeClientConfig.VehicleKey VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) + if not plate then return false end TriggerServerEvent('okokGarage:GiveKeys', plate) end diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index c12f66d..7c2b10d 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -2,11 +2,11 @@ if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not plate and vehicle then plate = GetVehicleNumberPlateText(vehicle) end + if not plate then return false end TriggerServerEvent("qb-vehiclekeys:server:AcquireVehicleKeys", plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - if not plate and vehicle then plate = GetVehicleNumberPlateText(vehicle) end + if not plate then return false end TriggerEvent("qb-vehiclekeys:client:RemoveKeys", plate) end \ No newline at end of file diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua index 3ad5b25..7358f04 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua @@ -1,9 +1,9 @@ -if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qbx_vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qbx" and BridgeClientConfig.VehicleKey ~= "auto") then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not plate and vehicle then plate = GetVehicleNumberPlateText(vehicle) end + if not plate then return false end TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) end diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua index e0a06ba..b0ed802 100644 --- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua @@ -3,27 +3,15 @@ if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeClientConfig.Vehicl VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not vehicle then return end + if not vehicle then return false end local model = GetDisplayNameFromVehicleModel(GetEntityModel(vehicle)) local verifiedPlate = GetVehicleNumberPlateText(vehicle) return exports['qs-vehiclekeys']:GiveKeys(verifiedPlate, model, true) end VehicleKey.RemoveKeys = function(vehicle, plate) - if not vehicle then return end + if not vehicle then return false end local model = GetDisplayNameFromVehicleModel(GetEntityModel(vehicle)) local verifiedPlate = GetVehicleNumberPlateText(vehicle) return exports['qs-vehiclekeys']:RemoveKeys(verifiedPlate, model) -end - -RegisterNetEvent("community_bridge:vehicleKey:removeKeys", function(netId, plate) - if not NetworkDoesNetworkIdExist(netId) then return end - local vehicle = NetworkGetEntityFromNetworkId(netId) - VehicleKey.RemoveKeys(vehicle, plate) -end) - -RegisterNetEvent("community_bridge:vehicleKey:giveKeys", function(netId, plate) - if not NetworkDoesNetworkIdExist(netId) then return end - local vehicle = NetworkGetEntityFromNetworkId(netId) - VehicleKey.GiveKeys(vehicle, plate) -end) \ No newline at end of file +end \ No newline at end of file diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua index 347e2fe..8482f8c 100644 --- a/modules/vehicleKey/t1ger_keys/client/client.lua +++ b/modules/vehicleKey/t1ger_keys/client/client.lua @@ -10,8 +10,4 @@ end VehicleKey.RemoveKeys = function(vehicle, plate) -end - -RegisterNetEvent("community_bridge:vehicleKey:giveKeys", function(plate) - VehicleKey.GiveKeys(nil, plate) -end) \ No newline at end of file +end \ No newline at end of file From 835406d74beea6d12bdc595770702765f8a3cb4d Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:09:45 -0500 Subject: [PATCH 11/33] configs to new auto/manual preferences also removed unused values --- settings/clientConfig.lua | 10 +++++----- settings/serverConfig.lua | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index a22f5ba..c1f0445 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -1,13 +1,13 @@ BridgeClientConfig = {} BridgeClientConfig.DebugLevel = 0 -- Debug level, 0 for none, 1 for some, 2 for all data BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ] -BridgeClientConfig.HelpTextSystem = "auto" -BridgeClientConfig.ShowHelpText = "ox" -- [ox | jg | qb | lab | custom ] +BridgeClientConfig.ShowHelpText = "auto" -- [ ox | qb | jg | okok | cd | lab | custom ] BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] -BridgeClientConfig.ProgressBarSystem = "auto" +BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] -BridgeClientConfig.ProgressBar = "ox" -- [ ox | qb ] -BridgeClientConfig.VehicleKey = "auto" -- Change this to your prefrence or leave it as auto +BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | qbx | cd | f_real | mk | mono | okok | qs | renewed | t1ger | wasabi ] +BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] +BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file diff --git a/settings/serverConfig.lua b/settings/serverConfig.lua index 4ef1c58..abfdd4d 100644 --- a/settings/serverConfig.lua +++ b/settings/serverConfig.lua @@ -1,6 +1,6 @@ BridgeServerConfig = {} -BridgeServerConfig.LogSystem = "builtin" -- [ builtin | qb | ox ] -BridgeServerConfig.WebhookURL = "PUT_WEBHOOK_URL_HERE" +BridgeServerConfig.LogSystem = "ox" -- [ builtin | qb | ox ] +BridgeServerConfig.WebhookURL = "PUT_WEBHOOK_URL_HERE" -- only if using builtin BridgeServerConfig.WebhookImage = "https://cdn.discordapp.com/avatars/299410129982455808/31ce635662206e8bd0132c34ce9ce683?size=1024" BridgeServerConfig.MaxInventorySlots = 50 From 28c3df293aff2bedf5a276ccff360b61c317d401 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:27:34 -0500 Subject: [PATCH 12/33] jaksams_VehiclesKeys --- modules/vehicleKey/jacksam/client.lua | 13 +++++++++++++ settings/clientConfig.lua | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 modules/vehicleKey/jacksam/client.lua diff --git a/modules/vehicleKey/jacksam/client.lua b/modules/vehicleKey/jacksam/client.lua new file mode 100644 index 0000000..67b2908 --- /dev/null +++ b/modules/vehicleKey/jacksam/client.lua @@ -0,0 +1,13 @@ +if GetResourceState('jaksams_VehiclesKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "jaksam" and BridgeClientConfig.VehicleKey ~= "auto") then return end + +VehicleKey = VehicleKey or {} + +VehicleKey.GiveKeys = function(vehicle, plate) + if not plate then return false end + return TriggerServerEvent("vehicles_keys:selfGiveVehicleKeys", plate) +end + +VehicleKey.RemoveKeys = function(vehicle, plate) + if not plate then return false end + return TriggerServerEvent("vehicles_keys:selfRemoveKeys", plate) +end \ No newline at end of file diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index c1f0445..0ef6b3e 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -6,7 +6,7 @@ BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] -BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | qbx | cd | f_real | mk | mono | okok | qs | renewed | t1ger | wasabi ] +BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place From 498433cd03b1a9453502a2aa776dbc34734140a8 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:09:04 -0500 Subject: [PATCH 13/33] Update clientConfig.lua --- settings/clientConfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 0ef6b3e..7aab942 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -1,7 +1,7 @@ BridgeClientConfig = {} BridgeClientConfig.DebugLevel = 0 -- Debug level, 0 for none, 1 for some, 2 for all data BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ] -BridgeClientConfig.ShowHelpText = "auto" -- [ ox | qb | jg | okok | cd | lab | custom ] +BridgeClientConfig.ShowHelpText = "ox" -- [ ox | qb | jg | okok | cd | lab | custom ] BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] From 7e9f0df74aaeecdfadc03ba1e8d027f8ee36e551 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:50:47 -0500 Subject: [PATCH 14/33] Version.VersionChecker(repoPath, tebex) ---Pass a github username and repo name to check for the latest version of the resource. --- --- ---Tebex is a optional boolean to determine if the message should be for a escrowed resource or not. --- --- ---Example Version.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") ---@param repoPath string ---@param tebex boolean | nil ---@return nil --- modules/version/server/VersionChecker.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/version/server/VersionChecker.lua b/modules/version/server/VersionChecker.lua index 35ecfe3..dde4d03 100644 --- a/modules/version/server/VersionChecker.lua +++ b/modules/version/server/VersionChecker.lua @@ -1,6 +1,16 @@ Version = Version or {} -function Version.VersionChecker(repoPath) +---Pass a github username and repo name to check for the latest version of the resource. +--- +--- +---Tebex is a optional boolean to determine if the message should be for a escrowed resource or not. +--- +--- +---Example Version.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") +---@param repoPath string +---@param tebex boolean | nil +---@return nil +function Version.VersionChecker(repoPath, tebex) local resource = repoPath:match("([^/]+)$") if not resource then return Prints.Error('^1Invalid repository format. Expected format: "username/reponame"^0') end @@ -28,6 +38,7 @@ function Version.VersionChecker(repoPath) local currentVersion, latestVersion = version:gsub('%D', ''), latest:gsub('%D', '') if currentVersion < latestVersion then + if tebex then return print(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the portal/keymaster.^7\r\n%s'):format(resource, version, "https://portal.cfx.re/assets/granted-assets")) end return print(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the GitHub release page.^7\r\n%s'):format(resource, version, response.html_url)) end end, 'GET') From a759e9c27bebbb1a8f668de8927764a34dfed0ee Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:03:49 -0500 Subject: [PATCH 15/33] fuels folder fix --- modules/fuel.zip | Bin 0 -> 7538 bytes modules/fuel/BigDaddy-Fuel/client.lua | 14 -------------- modules/fuel/LegacyFuel/client.lua | 14 -------------- modules/fuel/Renewed-Fuel/client.lua | 13 ------------- modules/fuel/_defualts/client.lua | 11 ----------- modules/fuel/cdn-fuel/client.lua | 14 -------------- modules/fuel/esx-sna-fuel/client.lua | 14 -------------- modules/fuel/okokGasStation/client.lua | 14 -------------- modules/fuel/ox_fuel/client.lua | 15 --------------- modules/fuel/ps-fuel/client.lua | 14 -------------- modules/fuel/qs-fuelstations/client.lua | 14 -------------- modules/fuel/ti_fuel/client.lua | 15 --------------- modules/fuel/x-fuel/client.lua | 15 --------------- settings/clientConfig.lua | 2 +- 14 files changed, 1 insertion(+), 168 deletions(-) create mode 100644 modules/fuel.zip delete mode 100644 modules/fuel/BigDaddy-Fuel/client.lua delete mode 100644 modules/fuel/LegacyFuel/client.lua delete mode 100644 modules/fuel/Renewed-Fuel/client.lua delete mode 100644 modules/fuel/_defualts/client.lua delete mode 100644 modules/fuel/cdn-fuel/client.lua delete mode 100644 modules/fuel/esx-sna-fuel/client.lua delete mode 100644 modules/fuel/okokGasStation/client.lua delete mode 100644 modules/fuel/ox_fuel/client.lua delete mode 100644 modules/fuel/ps-fuel/client.lua delete mode 100644 modules/fuel/qs-fuelstations/client.lua delete mode 100644 modules/fuel/ti_fuel/client.lua delete mode 100644 modules/fuel/x-fuel/client.lua diff --git a/modules/fuel.zip b/modules/fuel.zip new file mode 100644 index 0000000000000000000000000000000000000000..621c4243e2562b3ab06eafa46bc49ce6a5c2752f GIT binary patch literal 7538 zcmbuE2{hE*|Ho%Y44LfvmYqhDwTyiq*_SM3pT?GbSJ_GSwNhj$SwrISC}bx+lr7Ov zmZwPBLMr^eBQyq&f9F4)lRD>q?>(>A_s;u%K9{yS{vj$5<`a=`W3us&&A$kMpBFum zj)L0TLsFegcMPH28e(OKQna+O@fA?Uet-x>U20;#~WMQ6yX{_nSWEpxo%ReDAG3AncYa7;d z+fp~eBQ1~SI`0%om~~PR8$_$EgyT|Ia9P#G8!mJ2Gs2L`#*mg4gBy8M7b$4xz!2D@ z@EdxeQczBKs#DVo{ZIWS*nOIwG`DT4O zvBc%7=ltNvqF-SD(KToBTj+BPS;F0=DrB|y2o=Fg^{MHEPb41D&b@mUuYu9(J2jqjh%ixb8=7Fi`bH`7qsNGcaKxWr!t_WA!B1d2krVs2W>gcmXp4V z-Rn^l*FKw_rS4NnPo(P-@lztO5=Iy0?g(im`(h-aoRVUJemo_S|6TMJ%^Z{uUgmvB zm0x2?lakih<9tI6HA0VMjI~1~pCA2VaehX1xML#Zyfk6cMI*VV+22}GX?IvYX`ea5 zsFhf8f0WeQgyD!05l>+IskcVcVohly;)Liqy0lW7MfUmc%?SYmrmg6OxakhJz>I{3 z{=CPldXvOf^%GX>i43K}h6Ag3`x~d&vWRr|5pZ|1#I=4DurALRq(BK+PX??r?KvLX z{O%p!^H_cIrRT?9*&= zL)58?uO#%| z6`JTb6zPr45dtKQMm(o&DGe_K7X&1gUei)ti%dTzTQK&~k<&HxYpkhHe|BoG{A?FI z_PV^7L$e3HI$^s<;@Q`k86Ziz6PMn75RYwX?WWagY|&}f)msYVG3NVfJKNf*CJeWI zOlZ|U5}|35p#XN!b5dpjz4-a1h;(RK`6iEI z2DvaH!>81SQ67DnUkIbzUQ{ti_8Lun&6DNY2QgF(FldW$WY;L=dnmDhj7dawTe;ee zaFf0o;?KdCoeg^4BaU;Lt@17AjC2b3$=@pSJN|xviY+gQXZ*&^a%8 zYSVFKRx=ELF8G!&|JB`~fLbB?aKezrG^4qy;liM?Zu*XFv$JrJ%lOc8%lxd^kOj{; zUBkth4m$tDiJ4gKp(t&4qLhE1SqI?1OK}mB{^t%^0Qk3Q+-N7;)`vt{TKnS2h5)j4 z&*gv!0oi(hY=%8X|DSwMvW;UxU0FKiCMMJ?REuSgDMq~;27LD@6O+;qjukbb=7L-Z zo1v1&T2(N{+u2Dg3jC=D30i9mG$I&_<9!wid+XCt1!1SkzKd)NH>yC@8+AqyJ?xyFwohIn z5CI?@4W3bj0K%;S;Vk<+v7dD4uT7q|d6G_-b7T+GPwG=37KV=ZaVv&HV}MQWJ#z(B zWq25NW~s6TwFpQjVEtBV;KYLv(Mv#u6koLWTrP-?d+1+y8~R$Aqy782d={xRc#lAG zq$nr9;Q7Gp!())!v1&R1WCez5S$F0#;j5p;>cQ!|?z!NBQ%?<9pYBt8xPshFED zs;w%R$1o-r%6+4A0XFr%`djn&k{LK-xB(k$bH5(*>IBah&r2tZI5%#<&!dn z_)<+A`cVM>^si2Y>0pN}vCxe008UEcHxC7HPvVQb&R>uviD0#6~}@9Gf2cjz<@`GkR}2==HRZ z#Liioq?-x*3b*~s-iDX$4|W?^C7e2xEHfw>aR;@EAOzj`+6#}WM#Kla`S~Bk%C>J8 zcidAG1o(!_>1iGUe5+vl-WrPKJ02^&+rxWppdNNW_CM9TcWr@_) z=zdPiBO`jn{?dPW*!z?rF+Q}0RCBcan`~8>{jB%}S-q6zJazT-FXmwowOV(R#VRp| z$k%m4~^A7j@Q?;n%!X z=ORNmWOb235*p{vMYk06DlE6IH+p2z~F$#+ViG>Nt* z(|UUo)>xxdcdY;Nz;wljH_2tNp@}wpknqUW(%99ZpJOwH`3v`Wq5mijl`E2{f=S*r zx)7kbZ1lX%B<5E^`|oM$tzdBd<=FjKl(=JMiEoLG32WS!(-_y7EMeX6k>AdDl;vDv zkGb75)pr&tx|904K$!R!C|x69&Q@|+z6wVa7O1H?6e`zjrJd9BuT^z}+p*?5(5j=HEpWVR1G$@;eCH}77h#_&Qw6pU& zUMoJY=qr7Jo(p+nF#e$zAwChD9MD)$zF<^MPm?D#{kd6NgA%*YpS`)TY}w8z^Xc_9 zz9_o^Vm}jTP_=EIjOzo*5G#CNx6{Vql2KO`idG!lUuGonTANgMM51-T6vs4mw z#9^)yfkuT{Nhe%d=Xw%M=W%+3%Q0W7@N8(^{?4~cLN}xn(i>@m+XZ<6!pFKbuMq*l zO#$KCCE^Dpvm5=YPk`utpur(x#1vglT6LE0Iru|8|C?Vm%5hJZ54Y^I&K5~)Nr({;CC)}ajYI;QeByC+ zaE|y<7%T_Ie^M;w47Uyn!O$ehDPx6##M^9FC{g6PI)v@%1{q-^BQ&+zYYVqgW2H-P zfeJ;m=tzorm0pZ;-Ql&B^7fN(2B!X|>qkG;Fi50z2GT5Ah2jNLj@OE(Ml8Qcwp%KT zZcY-b^KBS3Yf4l26n1(xs}4M8|CA`cGB!S7f8*Op;$erI+-`vE=V%dWHbC}8>?GM5 z`rC5~R+40KiP0s+if%*+ALq;ap=`hzsePXlP%`#dI?FKnq z?3LS09iUQ$uWa>NG8xvDJ#60>^*%+NcHEz%8ceI3ncb|E&w9l(Ba-F%yL|QS=!?N9Ig&tzZTzynsV>v-E$GE@$BU_Q-gB#>dfPUVqph;>#zcHYn2500R_Jh_M z0sHs3%d@sJh2nZ?SFCJG@MYqS#)se1ULnGkyxJSc@$Sk51}13#lf!o>2pa^h&E+oS z5untZiYE2f`77e4()BLInHIl%xdhZE^5Uq15UYNMJNI~w%cjw=B$&Cq$l$b`6Mr14 zZp)&2rok}T0{wRCRJjSSJI9%92-kckC@r--NiUq3oZi9b(IbQ0h^LnA#zhguqtw=Q zwWrma`N>da3%SRT8m=ul_9EdzL_9D@Sba^iB}(+<;byO!bv z;4mLdi-P%VRL;a8wvGRQfoqP;z!k7Z%n;yV=LdUQT)mVa>}ffG2REkOd9j7P$R{?X zHr2@gT4b;5udPMcfCcpTUgY`g>$-&J=I(e9g! zt<^BwIQh^f(bl~NHjKWy03GT-Up*0M_wC2l^q8Gihdce=92Ib?rw4K1es9QjyqPuN z(s*N!IsU#iz($!BR6X#$?7myTMu8pPy~5r!p$Y9(e@a8OgT{eyb1j^<9GhrONbNwP z-OW2TQTjfs>`kR(ed_U_QjzYU8YSAI+U$CK*T+l4O$uw`0TRDLHZWK%U)w z9X8M8e#`95CF8N4_orMtQ<@(r(l@eTN0);Q8Xp@&8E5vrDOex(-2PLFqdO?#$Tul|7sS{gfhyVug6uAvu|b~hUSMyQ%=JN9 Z|2+?A0^qa)ff#{5tw5ZlU@i(k{{wbVX5at- literal 0 HcmV?d00001 diff --git a/modules/fuel/BigDaddy-Fuel/client.lua b/modules/fuel/BigDaddy-Fuel/client.lua deleted file mode 100644 index b9a3ff2..0000000 --- a/modules/fuel/BigDaddy-Fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('BigDaddy-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "BigDaddy" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['BigDaddy-Fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - exports['BigDaddy-Fuel']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/LegacyFuel/client.lua b/modules/fuel/LegacyFuel/client.lua deleted file mode 100644 index 61c6655..0000000 --- a/modules/fuel/LegacyFuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('LegacyFuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "LegacyFuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('LegacyFuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['LegacyFuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['LegacyFuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/Renewed-Fuel/client.lua b/modules/fuel/Renewed-Fuel/client.lua deleted file mode 100644 index 48d1072..0000000 --- a/modules/fuel/Renewed-Fuel/client.lua +++ /dev/null @@ -1,13 +0,0 @@ -if GetResourceState('Renewed-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "Renewed-Fuel" and BridgeClientConfig.Fuel ~= "auto") then return end ---if GetResourceState('Renewed-Fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['Renewed-Fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['Renewed-Fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/_defualts/client.lua b/modules/fuel/_defualts/client.lua deleted file mode 100644 index 7b1055b..0000000 --- a/modules/fuel/_defualts/client.lua +++ /dev/null @@ -1,11 +0,0 @@ -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return GetVehicleFuelLevel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return SetVehicleFuelLevel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua deleted file mode 100644 index 97e570a..0000000 --- a/modules/fuel/cdn-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('cdn-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "cdn" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('cdn-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['cdn-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['cdn-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua deleted file mode 100644 index 9abc9c7..0000000 --- a/modules/fuel/esx-sna-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('esx-sna-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "sna" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('esx-sna-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['esx-sna-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - exports['esx-sna-fuel']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua deleted file mode 100644 index 219730c..0000000 --- a/modules/fuel/okokGasStation/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('okokGasStation') ~= 'started' or (BridgeClientConfig.Fuel ~= "okokGasStation" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('okokGasStation') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['okokGasStation']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['okokGasStation']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua deleted file mode 100644 index bcd820a..0000000 --- a/modules/fuel/ox_fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('ox_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ox_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end ---if GetResourceState('ox_fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return Entity(vehicle).state.fuel -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - local currentFuel = Entity(vehicle).state.fuel - Entity(vehicle).state.fuel = currentFuel + fuel - return Entity(vehicle).state.fuel -end \ No newline at end of file diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua deleted file mode 100644 index 61f0468..0000000 --- a/modules/fuel/ps-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('ps-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ps-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('ps-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['ps-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['ps-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua deleted file mode 100644 index d0bcbfa..0000000 --- a/modules/fuel/qs-fuelstations/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('qs-fuelstations') ~= 'started' or (BridgeClientConfig.Fuel ~= "qs-fuelstations" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('qs-fuelstations') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['qs-fuelstations']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['qs-fuelstations']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua deleted file mode 100644 index a075d29..0000000 --- a/modules/fuel/ti_fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('ti_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ti_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('ti_fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - local level, _ = exports["ti_fuel"]:getFuel(vehicle) - return level -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['ti_fuel']:setFuel(vehicle, fuel, "RON91") -end \ No newline at end of file diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua deleted file mode 100644 index db18170..0000000 --- a/modules/fuel/x-fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('x-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "x-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('x-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - local level, _ = exports["x-fuel"]:getFuel(vehicle) - return level -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['x-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 7aab942..9fb4326 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -7,7 +7,7 @@ BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] -BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] +BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file From 7702faa2697355b82afb808fa2248388d2c8ec28 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:07:34 -0500 Subject: [PATCH 16/33] fuels patched auto start by @gononono64 --- modules/fuel.zip | Bin 7538 -> 0 bytes modules/fuel/_defualts/client.lua | 11 +++++++++++ modules/fuel/bigDaddy-Fuel/client.lua | 17 +++++++++++++++++ modules/fuel/cdn-fuel/client.lua | 16 ++++++++++++++++ modules/fuel/esx-sna-fuel/client.lua | 16 ++++++++++++++++ modules/fuel/lc_fuel/client.lua | 15 +++++++++++++++ modules/fuel/legacyfuel/client.lua | 16 ++++++++++++++++ modules/fuel/okokGasStation/client.lua | 15 +++++++++++++++ modules/fuel/ox_fuel/client.lua | 17 +++++++++++++++++ modules/fuel/ps-fuel/client.lua | 15 +++++++++++++++ modules/fuel/qs-fuelstations/client.lua | 15 +++++++++++++++ modules/fuel/renewed-Fuel/client.lua | 15 +++++++++++++++ modules/fuel/ti_fuel/client.lua | 16 ++++++++++++++++ modules/fuel/x-fuel/client.lua | 16 ++++++++++++++++ 14 files changed, 200 insertions(+) delete mode 100644 modules/fuel.zip create mode 100644 modules/fuel/_defualts/client.lua create mode 100644 modules/fuel/bigDaddy-Fuel/client.lua create mode 100644 modules/fuel/cdn-fuel/client.lua create mode 100644 modules/fuel/esx-sna-fuel/client.lua create mode 100644 modules/fuel/lc_fuel/client.lua create mode 100644 modules/fuel/legacyfuel/client.lua create mode 100644 modules/fuel/okokGasStation/client.lua create mode 100644 modules/fuel/ox_fuel/client.lua create mode 100644 modules/fuel/ps-fuel/client.lua create mode 100644 modules/fuel/qs-fuelstations/client.lua create mode 100644 modules/fuel/renewed-Fuel/client.lua create mode 100644 modules/fuel/ti_fuel/client.lua create mode 100644 modules/fuel/x-fuel/client.lua diff --git a/modules/fuel.zip b/modules/fuel.zip deleted file mode 100644 index 621c4243e2562b3ab06eafa46bc49ce6a5c2752f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7538 zcmbuE2{hE*|Ho%Y44LfvmYqhDwTyiq*_SM3pT?GbSJ_GSwNhj$SwrISC}bx+lr7Ov zmZwPBLMr^eBQyq&f9F4)lRD>q?>(>A_s;u%K9{yS{vj$5<`a=`W3us&&A$kMpBFum zj)L0TLsFegcMPH28e(OKQna+O@fA?Uet-x>U20;#~WMQ6yX{_nSWEpxo%ReDAG3AncYa7;d z+fp~eBQ1~SI`0%om~~PR8$_$EgyT|Ia9P#G8!mJ2Gs2L`#*mg4gBy8M7b$4xz!2D@ z@EdxeQczBKs#DVo{ZIWS*nOIwG`DT4O zvBc%7=ltNvqF-SD(KToBTj+BPS;F0=DrB|y2o=Fg^{MHEPb41D&b@mUuYu9(J2jqjh%ixb8=7Fi`bH`7qsNGcaKxWr!t_WA!B1d2krVs2W>gcmXp4V z-Rn^l*FKw_rS4NnPo(P-@lztO5=Iy0?g(im`(h-aoRVUJemo_S|6TMJ%^Z{uUgmvB zm0x2?lakih<9tI6HA0VMjI~1~pCA2VaehX1xML#Zyfk6cMI*VV+22}GX?IvYX`ea5 zsFhf8f0WeQgyD!05l>+IskcVcVohly;)Liqy0lW7MfUmc%?SYmrmg6OxakhJz>I{3 z{=CPldXvOf^%GX>i43K}h6Ag3`x~d&vWRr|5pZ|1#I=4DurALRq(BK+PX??r?KvLX z{O%p!^H_cIrRT?9*&= zL)58?uO#%| z6`JTb6zPr45dtKQMm(o&DGe_K7X&1gUei)ti%dTzTQK&~k<&HxYpkhHe|BoG{A?FI z_PV^7L$e3HI$^s<;@Q`k86Ziz6PMn75RYwX?WWagY|&}f)msYVG3NVfJKNf*CJeWI zOlZ|U5}|35p#XN!b5dpjz4-a1h;(RK`6iEI z2DvaH!>81SQ67DnUkIbzUQ{ti_8Lun&6DNY2QgF(FldW$WY;L=dnmDhj7dawTe;ee zaFf0o;?KdCoeg^4BaU;Lt@17AjC2b3$=@pSJN|xviY+gQXZ*&^a%8 zYSVFKRx=ELF8G!&|JB`~fLbB?aKezrG^4qy;liM?Zu*XFv$JrJ%lOc8%lxd^kOj{; zUBkth4m$tDiJ4gKp(t&4qLhE1SqI?1OK}mB{^t%^0Qk3Q+-N7;)`vt{TKnS2h5)j4 z&*gv!0oi(hY=%8X|DSwMvW;UxU0FKiCMMJ?REuSgDMq~;27LD@6O+;qjukbb=7L-Z zo1v1&T2(N{+u2Dg3jC=D30i9mG$I&_<9!wid+XCt1!1SkzKd)NH>yC@8+AqyJ?xyFwohIn z5CI?@4W3bj0K%;S;Vk<+v7dD4uT7q|d6G_-b7T+GPwG=37KV=ZaVv&HV}MQWJ#z(B zWq25NW~s6TwFpQjVEtBV;KYLv(Mv#u6koLWTrP-?d+1+y8~R$Aqy782d={xRc#lAG zq$nr9;Q7Gp!())!v1&R1WCez5S$F0#;j5p;>cQ!|?z!NBQ%?<9pYBt8xPshFED zs;w%R$1o-r%6+4A0XFr%`djn&k{LK-xB(k$bH5(*>IBah&r2tZI5%#<&!dn z_)<+A`cVM>^si2Y>0pN}vCxe008UEcHxC7HPvVQb&R>uviD0#6~}@9Gf2cjz<@`GkR}2==HRZ z#Liioq?-x*3b*~s-iDX$4|W?^C7e2xEHfw>aR;@EAOzj`+6#}WM#Kla`S~Bk%C>J8 zcidAG1o(!_>1iGUe5+vl-WrPKJ02^&+rxWppdNNW_CM9TcWr@_) z=zdPiBO`jn{?dPW*!z?rF+Q}0RCBcan`~8>{jB%}S-q6zJazT-FXmwowOV(R#VRp| z$k%m4~^A7j@Q?;n%!X z=ORNmWOb235*p{vMYk06DlE6IH+p2z~F$#+ViG>Nt* z(|UUo)>xxdcdY;Nz;wljH_2tNp@}wpknqUW(%99ZpJOwH`3v`Wq5mijl`E2{f=S*r zx)7kbZ1lX%B<5E^`|oM$tzdBd<=FjKl(=JMiEoLG32WS!(-_y7EMeX6k>AdDl;vDv zkGb75)pr&tx|904K$!R!C|x69&Q@|+z6wVa7O1H?6e`zjrJd9BuT^z}+p*?5(5j=HEpWVR1G$@;eCH}77h#_&Qw6pU& zUMoJY=qr7Jo(p+nF#e$zAwChD9MD)$zF<^MPm?D#{kd6NgA%*YpS`)TY}w8z^Xc_9 zz9_o^Vm}jTP_=EIjOzo*5G#CNx6{Vql2KO`idG!lUuGonTANgMM51-T6vs4mw z#9^)yfkuT{Nhe%d=Xw%M=W%+3%Q0W7@N8(^{?4~cLN}xn(i>@m+XZ<6!pFKbuMq*l zO#$KCCE^Dpvm5=YPk`utpur(x#1vglT6LE0Iru|8|C?Vm%5hJZ54Y^I&K5~)Nr({;CC)}ajYI;QeByC+ zaE|y<7%T_Ie^M;w47Uyn!O$ehDPx6##M^9FC{g6PI)v@%1{q-^BQ&+zYYVqgW2H-P zfeJ;m=tzorm0pZ;-Ql&B^7fN(2B!X|>qkG;Fi50z2GT5Ah2jNLj@OE(Ml8Qcwp%KT zZcY-b^KBS3Yf4l26n1(xs}4M8|CA`cGB!S7f8*Op;$erI+-`vE=V%dWHbC}8>?GM5 z`rC5~R+40KiP0s+if%*+ALq;ap=`hzsePXlP%`#dI?FKnq z?3LS09iUQ$uWa>NG8xvDJ#60>^*%+NcHEz%8ceI3ncb|E&w9l(Ba-F%yL|QS=!?N9Ig&tzZTzynsV>v-E$GE@$BU_Q-gB#>dfPUVqph;>#zcHYn2500R_Jh_M z0sHs3%d@sJh2nZ?SFCJG@MYqS#)se1ULnGkyxJSc@$Sk51}13#lf!o>2pa^h&E+oS z5untZiYE2f`77e4()BLInHIl%xdhZE^5Uq15UYNMJNI~w%cjw=B$&Cq$l$b`6Mr14 zZp)&2rok}T0{wRCRJjSSJI9%92-kckC@r--NiUq3oZi9b(IbQ0h^LnA#zhguqtw=Q zwWrma`N>da3%SRT8m=ul_9EdzL_9D@Sba^iB}(+<;byO!bv z;4mLdi-P%VRL;a8wvGRQfoqP;z!k7Z%n;yV=LdUQT)mVa>}ffG2REkOd9j7P$R{?X zHr2@gT4b;5udPMcfCcpTUgY`g>$-&J=I(e9g! zt<^BwIQh^f(bl~NHjKWy03GT-Up*0M_wC2l^q8Gihdce=92Ib?rw4K1es9QjyqPuN z(s*N!IsU#iz($!BR6X#$?7myTMu8pPy~5r!p$Y9(e@a8OgT{eyb1j^<9GhrONbNwP z-OW2TQTjfs>`kR(ed_U_QjzYU8YSAI+U$CK*T+l4O$uw`0TRDLHZWK%U)w z9X8M8e#`95CF8N4_orMtQ<@(r(l@eTN0);Q8Xp@&8E5vrDOex(-2PLFqdO?#$Tul|7sS{gfhyVug6uAvu|b~hUSMyQ%=JN9 Z|2+?A0^qa)ff#{5tw5ZlU@i(k{{wbVX5at- diff --git a/modules/fuel/_defualts/client.lua b/modules/fuel/_defualts/client.lua new file mode 100644 index 0000000..b6213e5 --- /dev/null +++ b/modules/fuel/_defualts/client.lua @@ -0,0 +1,11 @@ +Fuel = Fuel or {} +----print("Fuel: Loading Defualt") +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return GetVehicleFuelLevel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return SetVehicleFuelLevel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/bigDaddy-Fuel/client.lua b/modules/fuel/bigDaddy-Fuel/client.lua new file mode 100644 index 0000000..f1f0a46 --- /dev/null +++ b/modules/fuel/bigDaddy-Fuel/client.lua @@ -0,0 +1,17 @@ +local resourceName = "BigDaddy-Fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + +--print("Fuel: Loading BigDaddy-Fuel") +--if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['BigDaddy-Fuel']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + exports['BigDaddy-Fuel']:SetFuel(vehicle, fuel) +end diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua new file mode 100644 index 0000000..bb5b1d7 --- /dev/null +++ b/modules/fuel/cdn-fuel/client.lua @@ -0,0 +1,16 @@ +local resourceName = "cdn-fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +----print("Fuel: Loading cdn-fuel") +--if GetResourceState('cdn-fuel') ~= 'started' then return end +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['cdn-fuel']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + return exports['cdn-fuel']:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua new file mode 100644 index 0000000..acfac8d --- /dev/null +++ b/modules/fuel/esx-sna-fuel/client.lua @@ -0,0 +1,16 @@ +local resourceName = "esx-sna-fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading esx-sna-fuel") +--if GetResourceState('esx-sna-fuel') ~= 'started' then return end +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['esx-sna-fuel']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + exports['esx-sna-fuel']:SetFuel(vehicle, fuel) +end diff --git a/modules/fuel/lc_fuel/client.lua b/modules/fuel/lc_fuel/client.lua new file mode 100644 index 0000000..235a12a --- /dev/null +++ b/modules/fuel/lc_fuel/client.lua @@ -0,0 +1,15 @@ +local resourceName = "lc_fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading lc_fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports["lc_fuel"]:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + return exports["lc_fuel"]:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/legacyfuel/client.lua b/modules/fuel/legacyfuel/client.lua new file mode 100644 index 0000000..d788982 --- /dev/null +++ b/modules/fuel/legacyfuel/client.lua @@ -0,0 +1,16 @@ +local resourceName = "LegacyFuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading LegacyFuel") + +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['LegacyFuel']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return exports['LegacyFuel']:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua new file mode 100644 index 0000000..147588f --- /dev/null +++ b/modules/fuel/okokGasStation/client.lua @@ -0,0 +1,15 @@ +local resourceName = "okokGasStation" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading okokGasStation") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['okokGasStation']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return exports['okokGasStation']:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua new file mode 100644 index 0000000..730fe27 --- /dev/null +++ b/modules/fuel/ox_fuel/client.lua @@ -0,0 +1,17 @@ +local resourceName = "ox_fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading ox_fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return Entity(vehicle).state.fuel +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + local currentFuel = Entity(vehicle).state.fuel + Entity(vehicle).state.fuel = currentFuel + fuel + return Entity(vehicle).state.fuel +end \ No newline at end of file diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua new file mode 100644 index 0000000..87ad695 --- /dev/null +++ b/modules/fuel/ps-fuel/client.lua @@ -0,0 +1,15 @@ +local resourceName = "ps-fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading ps-fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports["ps-fuel"]:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return exports["ps-fuel"]:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua new file mode 100644 index 0000000..40007f8 --- /dev/null +++ b/modules/fuel/qs-fuelstations/client.lua @@ -0,0 +1,15 @@ +local resourceName = "qs-fuelstations" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading qs-fuelstations") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['qs-fuelstations']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + return exports['qs-fuelstations']:SetFuel(vehicle, fuel) +end diff --git a/modules/fuel/renewed-Fuel/client.lua b/modules/fuel/renewed-Fuel/client.lua new file mode 100644 index 0000000..52cf8ac --- /dev/null +++ b/modules/fuel/renewed-Fuel/client.lua @@ -0,0 +1,15 @@ +local resourceName = "Renewed-Fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading Renewed-Fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + return exports['Renewed-Fuel']:GetFuel(vehicle) +end + +Fuel.SetFuel = function(vehicle, fuel, type) + if not DoesEntityExist(vehicle) then return end + return exports['Renewed-Fuel']:SetFuel(vehicle, fuel) +end \ No newline at end of file diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua new file mode 100644 index 0000000..08779a8 --- /dev/null +++ b/modules/fuel/ti_fuel/client.lua @@ -0,0 +1,16 @@ +local resourceName = "ti_fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading ti_fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + local level, _ = exports["ti_fuel"]:getFuel(vehicle) + return level +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + return exports['ti_fuel']:setFuel(vehicle, fuel, "RON91") +end \ No newline at end of file diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua new file mode 100644 index 0000000..0af0b38 --- /dev/null +++ b/modules/fuel/x-fuel/client.lua @@ -0,0 +1,16 @@ +local resourceName = "x-fuel" +local configValue = BridgeClientConfig.Fuel +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +--print("Fuel: Loading x-fuel") +Fuel = Fuel or {} + +Fuel.GetFuel = function(vehicle) + if not DoesEntityExist(vehicle) then return 0.0 end + local level, _ = exports["x-fuel"]:getFuel(vehicle) + return level +end + +Fuel.SetFuel = function(vehicle, fuel) + if not DoesEntityExist(vehicle) then return end + return exports['x-fuel']:SetFuel(vehicle, fuel) +end \ No newline at end of file From 799c774f1f8bbcf7040bdf0eff795e9ded5626da Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:15:29 -0500 Subject: [PATCH 17/33] menu overrides --- modules/menu/_oxlib.lua | 4 +++- modules/menu/_qb-menu.lua | 4 +++- settings/clientConfig.lua | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/menu/_oxlib.lua b/modules/menu/_oxlib.lua index 46cc0e1..c1e78cf 100644 --- a/modules/menu/_oxlib.lua +++ b/modules/menu/_oxlib.lua @@ -1,4 +1,6 @@ -if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.MenuSystem ~= "ox" and BridgeClientConfig.MenuSystem ~= "auto") then return end +local resourceName = "ox_lib" +local configValue = BridgeClientConfig.MenuSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end Menus = Menus or {} --- Converts a QB menu to an Ox menu. ---@param id string The menu ID. diff --git a/modules/menu/_qb-menu.lua b/modules/menu/_qb-menu.lua index 9115f79..511495a 100644 --- a/modules/menu/_qb-menu.lua +++ b/modules/menu/_qb-menu.lua @@ -1,4 +1,6 @@ -if GetResourceState('qb-menu') ~= 'started' or (BridgeClientConfig.MenuSystem ~= "qb" and BridgeClientConfig.MenuSystem ~= "auto") then return end +local resourceName = "qb-menu" +local configValue = BridgeClientConfig.MenuSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end --print("Loading QB Menu") --- Converts an Ox menu to a QB menu. ---@param id string The menu ID. diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 9fb4326..babaaf7 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -3,7 +3,7 @@ BridgeClientConfig.DebugLevel = 0 -- Debug level, 0 for none, BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic | pNotify | t-notify | wasabi | lab | custom ] BridgeClientConfig.ShowHelpText = "ox" -- [ ox | qb | jg | okok | cd | lab | custom ] BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] -BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] +BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] From 355d8dd29f419855c1488e5753491efceb0d8686 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:18:04 -0500 Subject: [PATCH 18/33] Update clientConfig.lua --- settings/clientConfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index babaaf7..8817544 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -7,7 +7,7 @@ BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] -BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] +BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file From aede7a3d2a8d2f3b221fcbfd0d3423921b258e32 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:24:19 -0500 Subject: [PATCH 19/33] vehicle keys moved to new auto/config format --- modules/vehicleKey/F_RealCarKeysSystem/client/client.lua | 4 +++- modules/vehicleKey/MrNewbVehicleKeys/client/client.lua | 4 +++- modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/cd_garage/client/client.lua | 4 +++- modules/vehicleKey/jacksam/client.lua | 5 ++++- modules/vehicleKey/mk_vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/mono_carkeys/client/client.lua | 4 +++- modules/vehicleKey/okokGarage/client/client.lua | 4 +++- modules/vehicleKey/qb-vehiclekeys/client/client.lua | 5 ++++- modules/vehicleKey/qbx_vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/qs-vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/t1ger_keys/client/client.lua | 4 +++- modules/vehicleKey/wasabi_carlock/client/client.lua | 5 ++++- settings/clientConfig.lua | 2 +- 14 files changed, 43 insertions(+), 14 deletions(-) diff --git a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua index cbc4c75..6013011 100644 --- a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua +++ b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('F_RealCarKeysSystem') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "F_RealCarKeysSystem" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "F_RealCarKeysSystem" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 259df39..7cf6df9 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "MrNewbVehicleKeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "MrNewbVehicleKeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua index 6558428..4344bb7 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "Renewed-Vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "Renewed-Vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua index d9998be..936e1d0 100644 --- a/modules/vehicleKey/cd_garage/client/client.lua +++ b/modules/vehicleKey/cd_garage/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('cd_garage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "cd_garage" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "cd_garage" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/jacksam/client.lua b/modules/vehicleKey/jacksam/client.lua index 67b2908..2b2f643 100644 --- a/modules/vehicleKey/jacksam/client.lua +++ b/modules/vehicleKey/jacksam/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('jaksams_VehiclesKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "jaksam" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "jaksams_VehiclesKeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua index 7f5cc6a..c39def4 100644 --- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mk_vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "mk_vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/mono_carkeys/client/client.lua b/modules/vehicleKey/mono_carkeys/client/client.lua index da85cc3..03790d3 100644 --- a/modules/vehicleKey/mono_carkeys/client/client.lua +++ b/modules/vehicleKey/mono_carkeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('mono_carkeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mono_carkeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "mono_carkeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua index 3da9e3f..3d62e22 100644 --- a/modules/vehicleKey/okokGarage/client/client.lua +++ b/modules/vehicleKey/okokGarage/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('okokGarage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "okokGarage" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "okokGarage" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index 7c2b10d..3ab78a2 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx_vehiclekeys") == "started" or (BridgeClientConfig.VehicleKey ~= "qb-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qb-vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua index 7358f04..8e554a8 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qbx" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qbx_vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua index b0ed802..d9a4423 100644 --- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qs-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qs-vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua index 8482f8c..23dd224 100644 --- a/modules/vehicleKey/t1ger_keys/client/client.lua +++ b/modules/vehicleKey/t1ger_keys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('t1ger_keys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "t1ger_keys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "t1ger_keys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/wasabi_carlock/client/client.lua b/modules/vehicleKey/wasabi_carlock/client/client.lua index 11e0fe7..8f03b0f 100644 --- a/modules/vehicleKey/wasabi_carlock/client/client.lua +++ b/modules/vehicleKey/wasabi_carlock/client/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('wasabi_carlock') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "wasabi_carlock" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "wasabi_carlock" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 8817544..af0d021 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -6,7 +6,7 @@ BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] -BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] +BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | jaksams_VehiclesKeys | wasabi_carlock | mk_vehiclekeys | qbx_vehiclekeys | qs-vehiclekeys | t1ger_keys | Renewed-Vehiclekeys | mono_carkeys| cd_garage | okokGarage | F_RealCarKeysSystem BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place From 064d3b7ccdc421166eb8282134a37200a5fa28e8 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:28:34 -0500 Subject: [PATCH 20/33] target to new format --- modules/target/ox_target/client.lua | 5 ++++- modules/target/qb-target/client.lua | 4 +++- modules/target/sleepless_interact/client.lua | 4 +++- settings/clientConfig.lua | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index cf694ed..422a64e 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('ox_target') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "ox" and BridgeClientConfig.TargetSystem ~= "auto") then return end +local resourceName = "ox_target" +local configValue = BridgeClientConfig.TargetSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + local targetDebug = false local function detectDebugEnabled() diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index c113208..bf627bb 100644 --- a/modules/target/qb-target/client.lua +++ b/modules/target/qb-target/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qb-target') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "qb" and BridgeClientConfig.TargetSystem ~= "auto") then return end +local resourceName = "qb-target" +local configValue = BridgeClientConfig.TargetSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end if GetResourceState('ox_target') == 'started' then return end -- this is for older versions of ox that supported the backwards compatability. As its depricated we dont want to touch that. local targetDebug = false diff --git a/modules/target/sleepless_interact/client.lua b/modules/target/sleepless_interact/client.lua index 9ee93eb..01315b0 100644 --- a/modules/target/sleepless_interact/client.lua +++ b/modules/target/sleepless_interact/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('sleepless_interact') ~= 'started' or (BridgeClientConfig.TargetSystem ~= "sleepless" and BridgeClientConfig.TargetSystem ~= "auto") then return end +local resourceName = "sleepless_interact" +local configValue = BridgeClientConfig.TargetSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end --if GetResourceState('sleepless_interact') ~= 'started' then return end -- This is only partially supported diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index af0d021..79ee5e4 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -8,6 +8,6 @@ BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | jaksams_VehiclesKeys | wasabi_carlock | mk_vehiclekeys | qbx_vehiclekeys | qs-vehiclekeys | t1ger_keys | Renewed-Vehiclekeys | mono_carkeys| cd_garage | okokGarage | F_RealCarKeysSystem BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] -BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place +BridgeClientConfig.TargetSystem = "auto" -- [ auto | ox_target | qb-target | sleepless_interact ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file From f517d23a41e9f6eb638ec88aab8529bbefa595e6 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:33:30 -0500 Subject: [PATCH 21/33] phone in the auto/manual config --- modules/phone/gksphone/client.lua | 6 ++++-- modules/phone/gksphone/server.lua | 7 ++++--- modules/phone/lb-phone/client.lua | 7 ++++--- modules/phone/lb-phone/server.lua | 7 ++++--- modules/phone/qs-smartphone/client.lua | 7 ++++--- modules/phone/qs-smartphone/server.lua | 7 ++++--- settings/sharedConfig.lua | 2 +- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/modules/phone/gksphone/client.lua b/modules/phone/gksphone/client.lua index a06ce8e..45bfa53 100644 --- a/modules/phone/gksphone/client.lua +++ b/modules/phone/gksphone/client.lua @@ -1,6 +1,8 @@ -if GetResourceState('gksphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "gksphone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end +local resourceName = "gksphone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end -Phone = {} +Phone = Phone or {} ---comment ---@param email string diff --git a/modules/phone/gksphone/server.lua b/modules/phone/gksphone/server.lua index 31d5b5f..1796a95 100644 --- a/modules/phone/gksphone/server.lua +++ b/modules/phone/gksphone/server.lua @@ -1,6 +1,7 @@ -if GetResourceState('gksphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "gksphone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -Phone = {} +local resourceName = "gksphone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +Phone = Phone or {} ---comment ---@param src number diff --git a/modules/phone/lb-phone/client.lua b/modules/phone/lb-phone/client.lua index 3ea1eb1..97e556c 100644 --- a/modules/phone/lb-phone/client.lua +++ b/modules/phone/lb-phone/client.lua @@ -1,6 +1,7 @@ -if GetResourceState('lb-phone') ~= 'started' or (BridgeSharedConfig.Phone ~= "lb-phone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -Phone = {} +local resourceName = "lb-phone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +Phone = Phone or {} ---comment ---@param email string diff --git a/modules/phone/lb-phone/server.lua b/modules/phone/lb-phone/server.lua index 7657411..c6ddad1 100644 --- a/modules/phone/lb-phone/server.lua +++ b/modules/phone/lb-phone/server.lua @@ -1,6 +1,7 @@ -if GetResourceState('lb-phone') ~= 'started' or (BridgeSharedConfig.Phone ~= "lb-phone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -Phone = {} +local resourceName = "lb-phone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +Phone = Phone or {} Phone.GetPlayerPhone = function(src) return exports["lb-phone"]:GetEquippedPhoneNumber(src) or false diff --git a/modules/phone/qs-smartphone/client.lua b/modules/phone/qs-smartphone/client.lua index f60e0cb..b482589 100644 --- a/modules/phone/qs-smartphone/client.lua +++ b/modules/phone/qs-smartphone/client.lua @@ -1,6 +1,7 @@ -if GetResourceState('qs-smartphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "qs-smartphone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end - -Phone = {} +local resourceName = "qs-smartphone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +Phone = Phone or {} ---comment ---@param email string diff --git a/modules/phone/qs-smartphone/server.lua b/modules/phone/qs-smartphone/server.lua index b152b27..b5e3f96 100644 --- a/modules/phone/qs-smartphone/server.lua +++ b/modules/phone/qs-smartphone/server.lua @@ -1,6 +1,7 @@ -if GetResourceState('qs-smartphone') ~= 'started' or (BridgeSharedConfig.Phone ~= "qs-smartphone" and BridgeSharedConfig.VehicleKey ~= "auto") then return end -Phone = {} - +local resourceName = "qs-smartphone" +local configValue = BridgeSharedConfig.Phone +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end +Phone = Phone or {} ---comment ---@param src number ---@return number||boolean diff --git a/settings/sharedConfig.lua b/settings/sharedConfig.lua index ee434c1..7fe6461 100644 --- a/settings/sharedConfig.lua +++ b/settings/sharedConfig.lua @@ -1,6 +1,6 @@ BridgeSharedConfig = {} BridgeSharedConfig.Lang = "auto" -- Change this to your preferred language (must match the locale file name ex. en or fr etc) BridgeSharedConfig.DebugLevel = 0 -- Change this to your Debug level, 0 for none, 1 for some, 2 for all data -BridgeSharedConfig.Phone = "auto" -- Change this to your prefrence or leave it as auto +BridgeSharedConfig.Phone = "auto" -- [ auto | qs-smartphone | lb-phone | gksphone] return BridgeSharedConfig \ No newline at end of file From 0d31632dfbf7e93c1ef1759a8c8075af12ad8f29 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:42:35 -0500 Subject: [PATCH 22/33] ProgressBarSystem to new auto detect --- modules/progressbar/ox_lib/client.lua | 5 ++++- modules/progressbar/qb-progressbar/client.lua | 5 ++++- settings/clientConfig.lua | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/progressbar/ox_lib/client.lua b/modules/progressbar/ox_lib/client.lua index fa3b996..99448d7 100644 --- a/modules/progressbar/ox_lib/client.lua +++ b/modules/progressbar/ox_lib/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "ox" and BridgeClientConfig.InputSystem ~= "auto") then return end +local resourceName = "ox_lib" +local configValue = BridgeClientConfig.ProgressBarSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + ProgressBar = ProgressBar or {} local function convertFromQB(options) diff --git a/modules/progressbar/qb-progressbar/client.lua b/modules/progressbar/qb-progressbar/client.lua index b5e5714..2fb16bc 100644 --- a/modules/progressbar/qb-progressbar/client.lua +++ b/modules/progressbar/qb-progressbar/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('progressbar') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "qb" and BridgeClientConfig.ProgressBarSystem ~= "auto") then return end +local resourceName = "progressbar" +local configValue = BridgeClientConfig.ProgressBarSystem +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + ProgressBar = ProgressBar or {} local function convertFromOx(options) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 79ee5e4..e02f660 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -4,7 +4,7 @@ BridgeClientConfig.NotifySystem = "ox" -- [ ox | qb | esx | mythic BridgeClientConfig.ShowHelpText = "ox" -- [ ox | qb | jg | okok | cd | lab | custom ] BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu ] -BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] +BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox_lib | progressbar ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | jaksams_VehiclesKeys | wasabi_carlock | mk_vehiclekeys | qbx_vehiclekeys | qs-vehiclekeys | t1ger_keys | Renewed-Vehiclekeys | mono_carkeys| cd_garage | okokGarage | F_RealCarKeysSystem BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] From f28e511de60428f76e4be39e96e52f89ddfd1c8d Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:52:15 -0600 Subject: [PATCH 23/33] Update to callbacks Callbacks must now for sure fire back a callback --- lib/shared/callbacks.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/shared/callbacks.lua b/lib/shared/callbacks.lua index 02d27c5..88a228a 100644 --- a/lib/shared/callbacks.lua +++ b/lib/shared/callbacks.lua @@ -106,13 +106,7 @@ function Callback.Trigger(name, func, ...) local p = promise.new() TriggerServerEvent(clientToServerName, name, ...) cbData[name] = {cb = func, p = p} - CreateThread(function() - Wait(5000) - if cbData[name] then - cbData[name].p:resolve() - cbData[name] = nil - end - end) + return Citizen.Await(p) end From dee14600ba0477ed9e87101fc28fbc75c52ba90c Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 7 Mar 2025 04:08:40 -0500 Subject: [PATCH 24/33] HasItem + partial support for shops --- modules/framework/es_extended/server.lua | 9 +++++ modules/framework/qb-core/server.lua | 9 +++++ modules/framework/qbx_core/server.lua | 9 +++++ modules/inventory/codem-inventory/server.lua | 11 ++++- modules/inventory/jpr-inventory/server.lua | 31 ++++++++++++++ modules/inventory/origen_inventory/server.lua | 9 +++++ modules/inventory/ox_inventory/client.lua | 4 ++ modules/inventory/ox_inventory/server.lua | 23 +++++++++++ modules/inventory/ps-inventory/server.lua | 34 +++++++++++++++- modules/inventory/qb-inventory/client.lua | 4 +- modules/inventory/qb-inventory/server.lua | 40 +++++++++++++++++++ modules/inventory/qs-inventory/server.lua | 18 +++++++++ modules/inventory/tgiann-inventory/client.lua | 3 ++ modules/inventory/tgiann-inventory/server.lua | 23 ++++++++++- 14 files changed, 220 insertions(+), 7 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index fb0c4fc..08b8dc9 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -60,6 +60,15 @@ Framework.GetItemCount = function(src, item, _) return xPlayer.getInventoryItem(item).count end +---comment +---@param src number +---@param item string +---@return boolean +Framework.HasItem = function(src, item) + local getCount = Framework.GetItemCount(src, item, nil) + return getCount > 0 +end + -- Framework.GetPlayerInventory(src) -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, _, _} diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 3b977a0..39629b5 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -72,6 +72,15 @@ Framework.GetItemCount = function(src, item, metadata) return count end +---comment +---@param src number +---@param item string +---@return boolean +Framework.HasItem = function(src, item) + local getCount = Framework.GetItemCount(src, item, nil) + return getCount > 0 +end + -- Framework.GetPlayerInventory(src) -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index ebd17b8..8d62d13 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -70,6 +70,15 @@ Framework.GetItemCount = function(src, item, metadata) return count end +---comment +---@param src number +---@param item string +---@return boolean +Framework.HasItem = function(src, item) + local getCount = Framework.GetItemCount(src, item, nil) + return getCount > 0 +end + -- Framework.GetPlayerInventory(src) -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} diff --git a/modules/inventory/codem-inventory/server.lua b/modules/inventory/codem-inventory/server.lua index 0d8a635..55d0b3b 100644 --- a/modules/inventory/codem-inventory/server.lua +++ b/modules/inventory/codem-inventory/server.lua @@ -60,6 +60,14 @@ Inventory.SetMetadata = function(src, item, slot, metadata) return codem:SetItemMetadata(src, slot, metadata) end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + return codem:HasItem(src, item, 1) +end + Inventory.GetItemBySlot = function(src, slot) local slotData = codem:GetItemBySlot(src, slot) if not slotData then return {} end @@ -81,4 +89,5 @@ Inventory.GetImagePath = function(item) local file = LoadResourceFile("codem-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://codem-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end + diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua index e0aabab..06b4f12 100644 --- a/modules/inventory/jpr-inventory/server.lua +++ b/modules/inventory/jpr-inventory/server.lua @@ -17,6 +17,14 @@ Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coor return true end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + return jpr:HasItem(src, item, 1) +end + ---comment ---@param src number ---@param id string||number @@ -64,4 +72,27 @@ Inventory.UpdatePlate = function(oldplate, newplate) if GetResourceState('jg-mechanic') ~= 'started' then return true end exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) return true +end + + +local registeredShops = {} + +Inventory.OpenShop = function(src, shopTitle) + return jpr:OpenShop(src, shopTitle) +end + +Inventory.CreateShop = function(src, shopTitle, shopInventory, shopCoords, shopGroups) + if not shopTitle or not shopInventory or not shopCoords then return end + if registeredShops[shopTitle] then return true end + + local repackItems = {} + local repackedShopItems = {name = shopTitle, label = shopTitle, coords = shopCoords, items = repackItems, slots = #shopInventory, } + for k, v in pairs(shopInventory) do + table.insert(repackItems, { name = v.name, price = v.price or 1000, amount = v.count or 1, slot = k }) + end + + jpr:CreateShop(repackedShopItems) + registeredShops[shopTitle] = true + --Inventory.OpenShop(src, shopTitle) + return true end \ No newline at end of file diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 4b35b94..5605d56 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -14,6 +14,15 @@ Inventory.RemoveItem = function(src, item, count, slot, metadata) return origen_inventory:removeItem(src, item, count, metadata, slot, true) end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + local count = origen_inventory:getItemCount(src , item) + return count > 0 +end + Inventory.GetItemInfo = function(item) local itemData = origen_inventory:Items(item) local repackedTable = { diff --git a/modules/inventory/ox_inventory/client.lua b/modules/inventory/ox_inventory/client.lua index 3980d9d..709f477 100644 --- a/modules/inventory/ox_inventory/client.lua +++ b/modules/inventory/ox_inventory/client.lua @@ -44,4 +44,8 @@ Inventory.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end +Inventory.OpenShop = function(shopTitle, shopInventory) + ox_inventory:openInventory("shop", { type = shopTitle, id = 1 }) +end + --Bridge.RegisterModule("Inventory", Inventory) diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 74aaaef..71352ac 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -54,6 +54,15 @@ Inventory.GetItemCount = function(src, item, metadata) return ox_inventory:GetItemCount(src, item, metadata, false) end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + local count = ox_inventory:GetItemCount(src, item, nil, false) + return count > 0 +end + ---comment ---@param src number ---@return table @@ -142,4 +151,18 @@ Inventory.GetImagePath = function(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" +end + +local registeredShops = {} + +Inventory.OpenShop = function(src, shopTitle) + TriggerClientEvent('ox_inventory:openInventory', src, 'shop', {type = shopTitle}) +end + +Inventory.CreateShop = function(shopTitle, shopInventory, shopCoords, shopGroups) + if registeredShops[shopTitle] then return true end + registeredShops[shopTitle] = true + ox_inventory:RegisterShop(shopTitle, { name = shopTitle, inventory = shopInventory, groups = shopGroups, }) + --return Inventory.OpenShop(src, shopTitle) + return true end \ No newline at end of file diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index cbd481e..2967b58 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -41,6 +41,14 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + return sloth:HasItem(src, item, 1) +end + ---comment ---@param src number ---@param slot number @@ -61,7 +69,7 @@ end Inventory.AddItem = function(src, item, amount, slot, metadata) TriggerClientEvent('ps-inventory:client:ItemBox', src, QBCore.Shared.Items[item], 'add') TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "add", item = item, count = amount, slot = slot, metadata = metadata}) - return exports['ps-inventory']:AddItem(src, item, amount, slot, metadata, 'community_bridge') + return sloth:AddItem(src, item, amount, slot, metadata, 'community_bridge') end @@ -75,7 +83,7 @@ end Inventory.RemoveItem = function(src, item, amount, slot, metadata) TriggerClientEvent('ps-inventory:client:ItemBox', src, QBCore.Shared.Items[item], 'remove') TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) - return exports['ps-inventory']:RemoveItem(src, item, amount, slot, 'community_bridge') + return sloth:RemoveItem(src, item, amount, slot, 'community_bridge') end @@ -93,4 +101,26 @@ Inventory.UpdatePlate = function(oldplate, newplate) if GetResourceState('jg-mechanic') ~= 'started' then return true end exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) return true +end + +local registeredShops = {} + +Inventory.OpenShop = function(src, shopTitle) + return sloth:OpenShop(src, shopTitle) +end + +Inventory.CreateShop = function(src, shopTitle, shopInventory, shopCoords, shopGroups) + if not shopTitle or not shopInventory or not shopCoords then return end + if registeredShops[shopTitle] then return true end + + local repackItems = {} + local repackedShopItems = {name = shopTitle, label = shopTitle, coords = shopCoords, items = repackItems, slots = #shopInventory, } + for k, v in pairs(shopInventory) do + table.insert(repackItems, { name = v.name, price = v.price or 1000, amount = v.count or 1, slot = k }) + end + + sloth:CreateShop(repackedShopItems) + registeredShops[shopTitle] = true + --Inventory.OpenShop(src, shopTitle) + return true end \ No newline at end of file diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index fe00af4..c699953 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -10,14 +10,14 @@ RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) ----comment +---This will return a boolean if the player has the item in their inventory ---@param item string ---@return boolean Inventory.HasItem = function(item) return qb:HasItem(item) end ----comment +---This will return a string of the image path for the item ---@param item string ---@return string Inventory.GetImagePath = function(item) diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index 4724450..cdb20c8 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -49,6 +49,13 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---comment +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + return qbInventory:HasItem(src, item, 1) +end ---comment ---@param src number @@ -112,3 +119,36 @@ Inventory.RemoveItem = function(src, item, amount, slot, metadata) TriggerClientEvent("community_bridge:client:inventory:updateInventory", src, {action = "remove", item = item, count = amount, slot = slot, metadata = metadata}) return exports['qb-inventory']:RemoveItem(src, item, amount, slot, 'community_bridge') end + +local registeredShops = {} + +Inventory.OpenShop = function(src, shopTitle) + return exports['qb-inventory']:OpenShop(src, shopTitle) +end + +Inventory.CreateShop = function(src, shopTitle, shopInventory, shopCoords, shopGroups) + if not shopTitle or not shopInventory or not shopCoords then return end + local newVersion = getInventoryNewVersion() + if newVersion then + if registeredShops[shopTitle] then return true end + registeredShops[shopTitle] = true + local repackedShopItems = {} + for _, v in pairs(shopInventory) do + table.insert(repackedShopItems, {name = v.name, price = v.price, amount = v.count or 1000}) + end + exports['qb-inventory']:CreateShop({ name = shopTitle, label = shopTitle, coords = shopCoords, items = repackedShopItems, }) + --exports['qb-inventory']:OpenShop(src, shopTitle) + --return Inventory.OpenShop(src, shopTitle) + return true + else + local shopData = { label = shopTitle, items = {}, slots = 0 } + + for _, v in pairs(shopInventory) do + table.insert(shopData.items, { name = v.name, price = v.price, amount = v.count or 1000, info = {}, type = 'item' }) + end + + shopData.slots = #shopData.items + TriggerClientEvent("inventory:client:OpenInventory", src, "shop", shopTitle, shopData) + print("QB-INVENTORY: You are using an outdated version of qb-inventory, please update to the latest version. Stuff will still work but you are using litterally the most exploitable inventory in fivem.") + end +end \ No newline at end of file diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 60d86da..a3496d1 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -4,6 +4,7 @@ local quasar = exports['qs-inventory'] Inventory = Inventory or {} +---This will add the item if found and return a boolean on success ---@param src number ---@param item string ---@param count number @@ -16,6 +17,7 @@ Inventory.AddItem = function(src, item, count, slot, metadata) return quasar:AddItem(src, item, count, slot, metadata) end +---This will remove the item if found and return a boolean on success ---@param src number ---@param item string ---@param count number @@ -27,6 +29,7 @@ Inventory.RemoveItem = function(src, item, count, slot, metadata) return quasar:RemoveItem(src, item, count, slot, metadata) end +---This will return a number of the items count in the inventory ---@param src number ---@param item string ---@param metadata table @@ -35,6 +38,7 @@ Inventory.GetItemCount = function(src, item, metadata) return quasar:GetItemTotalAmount(src, item) end +---This will return the player inventory in a table following ox_inventory format ---@param src number ---@return table Inventory.GetPlayerInventory = function(src) @@ -51,6 +55,17 @@ Inventory.GetPlayerInventory = function(src) return repackedTable end +---This will return a boolean of if the player has the item in the inventory +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + local count = quasar:GetItemTotalAmount(src, item) + if not count then return false end + return count > 0 +end + +---This will return the item data in the inventory based on the slot if not found will return nil ---@param src number ---@param slot number ---@return table | nil @@ -73,6 +88,7 @@ Inventory.GetItemBySlot = function(src, slot) return nil end +---This will return a boolean if the player can carry the item ---@param src number ---@param item string ---@param count number @@ -107,6 +123,7 @@ Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coo TriggerClientEvent("inventory:client:SetCurrentStash",src, id) end +---This will return the data to an item ---@param item string ---@return table Inventory.GetItemInfo = function(item) @@ -123,6 +140,7 @@ Inventory.GetItemInfo = function(item) return repackedTable end + ---@param src number ---@param item string ---@param slot number diff --git a/modules/inventory/tgiann-inventory/client.lua b/modules/inventory/tgiann-inventory/client.lua index ca83bdf..5407c52 100644 --- a/modules/inventory/tgiann-inventory/client.lua +++ b/modules/inventory/tgiann-inventory/client.lua @@ -25,12 +25,14 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---This will return a boolean if the player has the item in the inventory ---@param item string ---@return boolean Inventory.HasItem = function(item) return tgiann:HasItem(item) end +-- This will return the image path, it is incredibley useful for menus etc ---@param item string ---@return string Inventory.GetImagePath = function(item) @@ -40,6 +42,7 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---This will return the player inventory in a table ---@return table Inventory.GetPlayerInventory = function() local items = {} diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index 9b70622..0456e1d 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -4,6 +4,7 @@ local tgiann = exports["tgiann-inventory"] Inventory = Inventory or {} +---This Will add the item if found and return boolean on success ---@param src number ---@param item string ---@param count number @@ -16,6 +17,7 @@ Inventory.AddItem = function(src, item, count, slot, metadata) return tgiann:AddItem(src, item, count, slot, metadata, false) end +---This Will remove the item if found and return boolean on success ---@param src number ---@param item string ---@param count number @@ -27,6 +29,7 @@ Inventory.RemoveItem = function(src, item, count, slot, metadata) return tgiann:RemoveItem(src, item, count, slot, metadata) end +-- ---@param src number ---@param item string ---@param metadata table @@ -38,6 +41,15 @@ Inventory.GetItem = function(src, item, metadata) return item end +---This will return a boolean if the player has the item in their inventory +---@param src number +---@param item string +---@return boolean +Inventory.HasItem = function(src, item) + return tgiann:HasItem(src, item, 1) +end + +---This will return the count of the item in the players inventory ---@param src number ---@param item string ---@param metadata optional table @@ -47,6 +59,7 @@ Inventory.GetItemCount = function(src, item, metadata) return _item.amount or 0 end +---This will return the players inventory in a table in the format ox_inventory uses ---@param src number ---@return table Inventory.GetPlayerInventory = function(src) @@ -60,7 +73,7 @@ Inventory.GetPlayerInventory = function(src) return items end ----comment +---This will return a boolean if the player can carry the item ---@param src number ---@param item string ---@param count number @@ -68,6 +81,7 @@ end Inventory.CanCarryItem = function(src, item, count) return tgiann:CanCarryItem(src, item, count) end + ---comment ---@param id string or number ---@param label string @@ -79,7 +93,7 @@ Inventory.RegisterStash = function(id, label, slots, weight, owner) return tgiann:CreateCustomStashWithItem(id, {}) end ----comment +---This will return the item data in the slot the item is found ---@param src number ---@param slot number ---@return table @@ -89,6 +103,7 @@ Inventory.GetItemBySlot = function(src, slot) return {name = item.name, label = item.label, weight = item.weight, slot = slot, count = item.amount, metadata = item.info, stack = item.unique or false, description = item.description} end +---This will return a table of the item data including the image (very useful for menus etc) ---@param item string ---@return table Inventory.GetItemInfo = function(item) @@ -105,6 +120,8 @@ Inventory.GetItemInfo = function(item) return repackedTable end +---This will update the item metadata for an item with the provided slot and metadata, its best to get the item first +---And then set the metadata ---@param src number ---@param item string ---@param slot number @@ -114,6 +131,7 @@ Inventory.SetMetadata = function(src, item, slot, metadata) tgiann:UpdateItemMetadata(src, item, slot, metadata) end +---This will return the image path for the item ---@param item string ---@return string Inventory.GetImagePath = function(item) @@ -123,6 +141,7 @@ Inventory.GetImagePath = function(item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" end +---This will update the plate to a vehicle in the inventory ---@param oldplate string ---@param newplate string ---@return boolean From bcc0c4d9641a2eaf27a398f929ba5bb2503bc027 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 7 Mar 2025 04:23:06 -0500 Subject: [PATCH 25/33] Update clientConfig.lua --- settings/clientConfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index e02f660..f89f5a4 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -7,7 +7,7 @@ BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox_lib | progressbar ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | jaksams_VehiclesKeys | wasabi_carlock | mk_vehiclekeys | qbx_vehiclekeys | qs-vehiclekeys | t1ger_keys | Renewed-Vehiclekeys | mono_carkeys| cd_garage | okokGarage | F_RealCarKeysSystem -BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] +BridgeClientConfig.Fuel = "auto" -- [ auto | LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] BridgeClientConfig.TargetSystem = "auto" -- [ auto | ox_target | qb-target | sleepless_interact ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file From fcc717cd5d40af6cd807f5aa2125bb21ad1b3011 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 7 Mar 2025 04:24:35 -0500 Subject: [PATCH 26/33] tailing whitespace removed --- modules/dialogue/default/client/client.lua | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/dialogue/default/client/client.lua b/modules/dialogue/default/client/client.lua index 7b3deed..c00ed6d 100644 --- a/modules/dialogue/default/client/client.lua +++ b/modules/dialogue/default/client/client.lua @@ -10,7 +10,7 @@ function Dialogue.Close(name) -- Instead of destroying immediately, wait to see if new dialogue opens pendingCameraDestroy = true activeDialogue = nil - + SetNuiFocus(false, false) SendNUIMessage({ type = "close", @@ -28,7 +28,7 @@ function Dialogue.Close(name) cam = nil end end) - + promises[name] = nil end @@ -50,17 +50,17 @@ function Dialogue.Open( name, dialogue, characterOptions, dialogueOptions, onSel pendingCameraDestroy = false activeDialogue = name - -- camera magic! - if entity then + -- camera magic! + if entity then local pedHeading = GetEntityHeading(entity) -- Convert heading to radians and calculate offset local angleRad = math.rad(pedHeading) local offsetX = math.sin(angleRad) * 1.5 local offsetY = math.cos(angleRad) * 1.5 - + -- Get position in front of ped based on their heading local endLocation = GetEntityCoords(entity) + vector3(offsetX, offsetY, 0.5) + offset - + if not cam then cam = CreateCam("DEFAULT_SCRIPTED_CAMERA", 1) end local camPos = GetCamCoord(cam) local dist = #(endLocation - camPos) @@ -71,7 +71,7 @@ function Dialogue.Open( name, dialogue, characterOptions, dialogueOptions, onSel SetCamCoord(cam, endLocation.x, endLocation.y, endLocation.z) RenderScriptCams(true, true, 1000, true, false) SetCamActive(cam, true) - end + end end SendNUIMessage({ type = "open", @@ -80,10 +80,10 @@ function Dialogue.Open( name, dialogue, characterOptions, dialogueOptions, onSel options = dialogueOptions }) SetNuiFocus(true, true) - + local prom = promise.new() - local wrappedFunction = function(selected) + local wrappedFunction = function(selected) SetNuiFocus(false, false) Dialogue.Close(name) if onSelected then onSelected(selected) end @@ -101,7 +101,7 @@ RegisterNuiCallback("dialogue:SelectOption", function(data) end) -- Debug command -if BridgeSharedConfig.DebugLevel >= 1 then +if BridgeSharedConfig.DebugLevel >= 1 then RegisterCommand("dialogue", function() local pos = GetOffsetFromEntityInWorldCoords(PlayerPedId(), 0, 2.0, 0) local timeout = 500 @@ -123,7 +123,7 @@ if BridgeSharedConfig.DebugLevel >= 1 then rotationOffset = vector3(0, 0, 0) } Wait(750) - Dialogue.Open("Akmed", "Hello how are you doing my friend?", characterData, { + Dialogue.Open("Akmed", "Hello how are you doing my friend?", characterData, { { label = "Trade with me", id = 'something', @@ -135,10 +135,10 @@ if BridgeSharedConfig.DebugLevel >= 1 then }, function(selectedId) if selectedId == 'something' then - Dialogue.Open( "Akmed" , "Thank you for wanting to purchase me lucky charms", characterData, { + Dialogue.Open( "Akmed" , "Thank you for wanting to purchase me lucky charms", characterData, { { label = "Fuck off", - id = 'something', + id = 'something', }, { label = "Goodbye", @@ -147,7 +147,7 @@ if BridgeSharedConfig.DebugLevel >= 1 then }, function(selectedId) DeleteEntity(ped) - if selectedId == "something" then + if selectedId == "something" then print("You hate lucky charms") else print("Thanks for keeping it civil") From f5913a0c451a935791b8414100349007ec6e32ca Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 7 Mar 2025 06:29:23 -0500 Subject: [PATCH 27/33] Update server.lua --- modules/inventory/ox_inventory/server.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 71352ac..51a5293 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -4,7 +4,7 @@ local ox_inventory = exports.ox_inventory Inventory = Inventory or {} ----comment +---This will add an item, and return true or false based on success ---@param src number ---@param item string ---@param count number @@ -16,7 +16,7 @@ Inventory.AddItem = function(src, item, count, slot, metadata) return ox_inventory:AddItem(src, item, count, metadata) end ----comment +---This will remove an item, and return true or false based on success ---@param src number ---@param item string ---@param count number From 6c18fd7a6cd8dab760325d69abfa65f440284a7c Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 7 Mar 2025 11:45:39 -0500 Subject: [PATCH 28/33] Patch blip issue, add param to blip, guard in removeped, Patch blip error on bridge restart, add param to blip, guard in removeped, redid lib point functions (now much much much easier to work with, --- lib/client/utility.lua | 90 ++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/lib/client/utility.lua b/lib/client/utility.lua index 63d6fb3..d023f07 100644 --- a/lib/client/utility.lua +++ b/lib/client/utility.lua @@ -4,7 +4,6 @@ local spawnedPeds = {} local ActivePoints = {} Utility.CreateProp = function(model, coords, heading, networked) - if networked == nil then networked = true end Utility.LoadModel(model) if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local propEntity = CreateObject(model, coords.x, coords.y, coords.z, networked, false, false) @@ -14,30 +13,20 @@ Utility.CreateProp = function(model, coords, heading, networked) end Utility.CreateVehicle = function(model, coords, heading, networked) - if networked == nil then networked = true end Utility.LoadModel(model) if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z, heading, networked, false) SetVehicleHasBeenOwnedByPlayer(vehicle, true) SetVehicleNeedsToBeHotwired(vehicle, false) - SetModelAsNoLongerNeeded(model) SetVehRadioStation(vehicle, "OFF") + SetModelAsNoLongerNeeded(model) return vehicle, { networkid = NetworkGetNetworkIdFromEntity(vehicle) or 0, coords = GetEntityCoords(vehicle), heading = GetEntityHeading(vehicle), } end -Utility.CreatePed = function(model, coords, heading, networked, clothing) - if networked == nil then networked = true end +Utility.CreatePed = function(model, coords, heading, networked, settings) Utility.LoadModel(model) if not HasModelLoaded(model) then return Prints.Error("Model Has Not Loaded") end local spawnedEntity = CreatePed(0, model, coords.x, coords.y, coords.z, heading, networked, false) - if clothing then - for componentID, v in pairs(clothing) do - SetPedComponentVariation(spawnedEntity, componentID, v[1], v[2], 0) - end - end - FreezeEntityPosition(spawnedEntity, true) - SetEntityInvincible(spawnedEntity, true) - SetBlockingOfNonTemporaryEvents(spawnedEntity, true) SetModelAsNoLongerNeeded(model) table.insert(spawnedPeds, spawnedEntity) return spawnedEntity @@ -48,17 +37,23 @@ Utility.StartBusySpinner = function(text) BeginTextCommandBusyString(text) AddTextComponentSubstringPlayerName(text) EndTextCommandBusyString(0) + return true end Utility.StopBusySpinner = function() - if BusyspinnerIsOn() then BusyspinnerOff() end + if BusyspinnerIsOn() then + BusyspinnerOff() + return true + end + return false end -Utility.CreateBlip = function(coords, sprite, color, scale, label, shortRange) +Utility.CreateBlip = function(coords, sprite, color, scale, label, shortRange, displayType) local blip = AddBlipForCoord(coords.x, coords.y, coords.z) SetBlipSprite(blip, sprite or 8) SetBlipColour(blip, color or 3) SetBlipScale(blip, scale or 0.8) + SetBlipDisplay(blip, displayType or 2) SetBlipAsShortRange(blip, shortRange) AddTextEntry(label, label) BeginTextCommandSetBlipName(label) @@ -71,7 +66,7 @@ Utility.RemoveBlip = function(blip) local success = false for i, storedBlip in ipairs(blipIDs) do if storedBlip == blip then - RemoveBlip(blip) + RemoveBlip(storedBlip) table.remove(blipIDs, i) success = true break @@ -104,7 +99,9 @@ end Utility.RemovePed = function(entity) local success = false - DeleteEntity(entity) + if DoesEntityExist(entity) then + DeleteEntity(entity) + end for i, storedEntity in ipairs(spawnedPeds) do if storedEntity == entity then table.remove(spawnedPeds, i) @@ -230,51 +227,58 @@ Utility.GetClosestPlayer = function(coords, distanceScope, includeMe) return closestPlayer, closestDistance, GetPlayerServerId(closestPlayer) end --- register points -Utility.RegisterPoint = function(pointCoords, pointDistance, pointOnEnter, pointOnExit) - local enterZone = lib.points.new({ - coords = pointCoords, +---This function is used to register a point on the map, functions are fired when in the distance/exiting the area +---@param pointID string +---@param pointCoords table +---@param pointDistance number +---@param _onEnter function +---@param _onExit function +---@param _nearby function +Utility.RegisterPoint = function(pointID, pointCoords, pointDistance, _onEnter, _onExit, _nearby) + ActivePoints[pointID] = lib.points.new({ + coords = pointCoords, distance = pointDistance, - onEnter = function(self) - pointOnEnter(self) + onEnter = function(self) + _onEnter(self) end, - onExit = function(self) - pointOnExit(self) + onExit = function(self) + _onExit(self) end, + nearby = function(self) + _nearby(self) + end }) - local pointID = Bridge.Ids.RandomLower(nil, 8) - ActivePoints[pointID] = enterZone - return enterZone, pointID end --- Function to retrieve the enterZone using pointID +-- Function to retrieve the zone by the pointID +---@param pointID string Utility.GetPointById = function(pointID) return ActivePoints[pointID] end +---@return table | nil +Utility.GetActivePoints = function() + return ActivePoints +end +---Pass the point ID to remove the point from the map +---@param pointID string +---@return boolean Utility.RemovePoint = function(pointID) - local point = ActivePoints[pointID] - if point then - --print("Removing point with ID " .. pointID) - point:remove() -- Call the remove method on the point (ensure this method stops all event listeners) - ActivePoints[pointID] = nil -- Remove from ActivePoints table - --print("Point removed successfully.") - return true - else - --print("Point with ID " .. pointID .. " not found.") - return false - end + if not ActivePoints[pointID] then return false end + ActivePoints[pointID]:remove() + ActivePoints[pointID] = nil + return true end AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then for _, blip in pairs(blipIDs) do - if DoesBlipExist(blip.id) then - RemoveBlip(blip.id) + if blip and DoesBlipExist(blip) then + RemoveBlip(blip) end end for _, ped in pairs(spawnedPeds) do - if DoesEntityExist(ped) then + if ped and DoesEntityExist(ped) then DeleteEntity(ped) end end From 31f747508962fc16b105a28e04fd9b146d992c3c Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 9 Mar 2025 01:50:10 -0500 Subject: [PATCH 29/33] Update server.lua --- modules/inventory/qb-inventory/server.lua | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index cdb20c8..3e83d72 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -121,24 +121,30 @@ Inventory.RemoveItem = function(src, item, amount, slot, metadata) end local registeredShops = {} +local v1ShopData = {} Inventory.OpenShop = function(src, shopTitle) - return exports['qb-inventory']:OpenShop(src, shopTitle) + local newVersion = getInventoryNewVersion() + if newVersion then + return exports['qb-inventory']:OpenShop(src, shopTitle) + else + local shopData = v1ShopData[shopTitle] + if not shopData then return false end + TriggerClientEvent("inventory:client:OpenInventory", src, "shop", shopTitle, shopData) + end end Inventory.CreateShop = function(src, shopTitle, shopInventory, shopCoords, shopGroups) if not shopTitle or not shopInventory or not shopCoords then return end + if registeredShops[shopTitle] then return true end + registeredShops[shopTitle] = true local newVersion = getInventoryNewVersion() if newVersion then - if registeredShops[shopTitle] then return true end - registeredShops[shopTitle] = true local repackedShopItems = {} for _, v in pairs(shopInventory) do table.insert(repackedShopItems, {name = v.name, price = v.price, amount = v.count or 1000}) end exports['qb-inventory']:CreateShop({ name = shopTitle, label = shopTitle, coords = shopCoords, items = repackedShopItems, }) - --exports['qb-inventory']:OpenShop(src, shopTitle) - --return Inventory.OpenShop(src, shopTitle) return true else local shopData = { label = shopTitle, items = {}, slots = 0 } @@ -149,6 +155,7 @@ Inventory.CreateShop = function(src, shopTitle, shopInventory, shopCoords, shopG shopData.slots = #shopData.items TriggerClientEvent("inventory:client:OpenInventory", src, "shop", shopTitle, shopData) + v1ShopData[shopTitle] = shopData print("QB-INVENTORY: You are using an outdated version of qb-inventory, please update to the latest version. Stuff will still work but you are using litterally the most exploitable inventory in fivem.") end end \ No newline at end of file From 85c1414ca06a87b11346329c81d4cfa9356150f6 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 9 Mar 2025 01:50:19 -0500 Subject: [PATCH 30/33] add support for r_notify --- modules/notify/_default/client.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/notify/_default/client.lua b/modules/notify/_default/client.lua index 6411e8f..743e348 100644 --- a/modules/notify/_default/client.lua +++ b/modules/notify/_default/client.lua @@ -25,6 +25,8 @@ Notify.SendNotify = function(message, _type, time) return exports['t-notify']:Alert({ style = 'info', message = message, duration = time, }) elseif notifyType == 'wasabi' then return exports.wasabi_notify:notify(_type, message, time, _type) + elseif notifyType == 'r_notify' then + return exports.r_notify:notify({title = 'Notification', content = message, type = _type, icon = "fas fa-check", duration = time, position = 'top-right', sound = false}) elseif notifyType == 'custom' then return Prints.Error("You have not set up a custom notify in community_bridge") else From e54213398e91e26a186e7b7998ce5fedfc7859a1 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 9 Mar 2025 05:49:05 -0400 Subject: [PATCH 31/33] wip --- fxmanifest.lua | 2 + init.lua | 1 + locales/en.json | 1 + modules/inventory/ox_inventory/server.lua | 2 +- modules/shops/_default/client.lua | 100 ++++++++++++++++++++++ modules/shops/_default/server.lua | 44 ++++++++++ 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 modules/shops/_default/client.lua create mode 100644 modules/shops/_default/server.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index 63ec190..d83beed 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -26,6 +26,7 @@ server_scripts { 'modules/managment/**/server.lua', 'modules/dispatch/**/server.lua', 'modules/clothing/**/server.lua', + 'modules/shops/**/server.lua', 'modules/notify/**/server.lua', 'init.lua', } @@ -48,6 +49,7 @@ client_scripts { 'modules/menu/*.lua', 'modules/notify/**/client.lua', 'modules/dialogue/**/client/*.lua', + 'modules/shops/**/client.lua', 'init.lua', } diff --git a/init.lua b/init.lua index d83ee02..fc9ec63 100644 --- a/init.lua +++ b/init.lua @@ -52,6 +52,7 @@ Bridge.RegisterModule("Language", Language) Bridge.RegisterModule("Doorlock", Doorlock) Bridge.RegisterModule("Phone", Phone) Bridge.RegisterModule("Dispatch", Dispatch) +Bridge.RegisterModule("Shops", Shops) --lib Bridge.RegisterModule("Tables", cLib.Tables) diff --git a/locales/en.json b/locales/en.json index 643f796..1410ada 100644 --- a/locales/en.json +++ b/locales/en.json @@ -6,6 +6,7 @@ "place_object_scroll_down": "[SCROLL DOWN] Turn left", "enter_text": "Enter Text", "no_prop_defined": "You didnt define any object to place", + "Shops": {"NotEnoughMoney": "You dont have enough money to buy this item", "PurchasedItem": "You Have Purchased ", "CurrencySymbol": "$", "Confirm":"Confirm Purchase","AreYouSure":"Are you sure you want to purchase a ", "PayByCash": "Pay by cash", "PayByCard": "Pay by card" }, "UNITTEST": { "UNITTESTA": "Im a %s %s", "UNITTEST": { diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 51a5293..5749bcf 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -118,7 +118,7 @@ Inventory.GetItemInfo = function(item) stack = itemData.stack or "true", weight = itemData.weight or "0", description = itemData.description or "none", - image = itemData.client.image or Inventory.GetImagePath(item), + image = itemData.client and itemData.client.image or Inventory.GetImagePath(item), } return repackedTable end diff --git a/modules/shops/_default/client.lua b/modules/shops/_default/client.lua new file mode 100644 index 0000000..3ffc10a --- /dev/null +++ b/modules/shops/_default/client.lua @@ -0,0 +1,100 @@ +Shops = Shops or {} + +RegisterNetEvent('community_bridge:openShop', function(_type, _title, shopData) + if source ~= 65535 then return end + if not _title and not _title and not shopData then return end + if _type ~= 'shop' then return end + Shops.OpenShop(_title, shopData.inventory) +end) + +Shops.FinalizeCheckOut = function(shopName, item, itemLabel, price) + if not shopName and not item and not itemLabel and not price then return end + local generatedID = Ids.CreateUniqueId() + local buildMenu = { + { + title = locale('Shops.PayByCash')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-money-bill-wave", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "cash") + end + }, + { + title = locale('Shops.PayByCard')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-building-column", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "bank") + end + } + } + Bridge.Menu.Open({ id = generatedID, title = locale("Shops.Confirm"), options = buildMenu }, false) +end + +Shops.FinalizeCheckOut = function(shopName, item, itemLabel, price) + if not shopName and not item and not itemLabel and not price then return end + local generatedID = Ids.CreateUniqueId() + local buildMenu = { + { + title = locale('Shops.PayByCash')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-money-bill-wave", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "cash") + end + }, + { + title = locale('Shops.PayByCard')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-building-column", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "bank") + end + } + } + Menu.Open({ id = generatedID, title = locale("Shops.Input"), options = buildMenu }, false) +end + +--[[ +Shops.AmountSelect = function(shopName, item, itemLabel, price) + if not shopName and not item and not itemLabel and not price then return end + local generatedID = Ids.CreateUniqueId() + local buildMenu = { + { + title = locale('Shops.PayByCash')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-money-bill-wave", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "cash") + end + }, + { + title = locale('Shops.PayByCard')..tostring(price), + description = locale('Shops.AreYouSure') .. itemLabel, + icon = "fa-solid fa-building-column", + onSelect = function(_, __, ___) + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "bank") + end + } + } + Menu.Open({ id = generatedID, title = locale("Shops.Input"), options = buildMenu }, false) +end +--]] + +Shops.OpenShop = function(title, shopData) + if not title and not shopData and not title then return print("No Title Passed") end + local generatedID = Ids.CreateUniqueId() + local buildMenu = {} + for _, v in pairs(shopData) do + local getItemName = Inventory.GetItemInfo(v.name).label + table.insert(buildMenu, { + title = getItemName, + description = locale('Shops.CurrencySymbol')..tostring(v.price), + icon = "fa-solid fa-basket-shopping", + onSelect = function(selected, secondary, args) + Shops.FinalizeCheckOut(title, v.name, getItemName, v.price) + end + }) + end + Menu.Open({ id = generatedID, title = title, options = buildMenu }, false) +end \ No newline at end of file diff --git a/modules/shops/_default/server.lua b/modules/shops/_default/server.lua new file mode 100644 index 0000000..d698363 --- /dev/null +++ b/modules/shops/_default/server.lua @@ -0,0 +1,44 @@ +Shops = Shops or {} + +local registeredShops = {} + +Shops.OpenShop = function(src, shopTitle) + if not shopTitle and not registeredShops[shopTitle] then return false end + TriggerClientEvent('community_bridge:openShop', src, 'shop', shopTitle, registeredShops[shopTitle]) +end + +Shops.CreateShop = function(shopTitle, shopInventory, shopCoords, shopGroups) + if not shopTitle and not shopInventory and not shopCoords then return end + if registeredShops[shopTitle] then return true end + registeredShops[shopTitle] = {name = shopTitle, inventory = shopInventory, shopCoords = shopCoords, groups = shopGroups} + return true +end + +Shops.CompleteCheckout = function(src, shopName, item, paymentType) + if not src and not shopName and not item and not paymentType then return end + local ilocale = Language.Locale + local shopData = registeredShops[shopName] + if not shopData then return end + local itemData = nil + for _, data in pairs(shopData.inventory) do + if data.name == item then + itemData = data + break + end + end + if not itemData then return print("Player ID "..src.." Is Possibly A Cheater And Has Attempted To Purchase A "..item) end + if not itemData.price then return end + local balance = Framework.GetAccountBalance(src, paymentType) + if balance < itemData.price then return Notify.SendNotify(src, ilocale('Shops.NotEnoughMoney'), "error", 5000) end + if not Framework.RemoveAccountBalance(src, paymentType, itemData.price) then return end + Inventory.AddItem(src, itemData.name, 1) + local itemLabel = Inventory.GetItemInfo(itemData.name).label + Notify.SendNotify(src, ilocale('Shops.PurchasedItem')..itemLabel, "success", 5000) +end + +RegisterNetEvent("community_bridge:completeCheckout", function(shopName, item, paymentType) + local src = source + if not shopName and not item and not paymentType then return end + if not paymentType == "cash" or not paymentType == "bank" then return end + Shops.CompleteCheckout(src, shopName, item, paymentType) +end) \ No newline at end of file From 3de3bf2883db459ccee30fbe369b02346d691411 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 9 Mar 2025 06:14:38 -0400 Subject: [PATCH 32/33] shops FIN --- locales/en.json | 2 +- modules/shops/_default/client.lua | 47 +++++++++++++------------------ modules/shops/_default/server.lua | 18 ++++++------ 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/locales/en.json b/locales/en.json index 1410ada..6b04803 100644 --- a/locales/en.json +++ b/locales/en.json @@ -6,7 +6,7 @@ "place_object_scroll_down": "[SCROLL DOWN] Turn left", "enter_text": "Enter Text", "no_prop_defined": "You didnt define any object to place", - "Shops": {"NotEnoughMoney": "You dont have enough money to buy this item", "PurchasedItem": "You Have Purchased ", "CurrencySymbol": "$", "Confirm":"Confirm Purchase","AreYouSure":"Are you sure you want to purchase a ", "PayByCash": "Pay by cash", "PayByCard": "Pay by card" }, + "Shops": {"NotEnoughMoney": "You dont have enough money to buy this item", "Input":"Amount Input", "PurchaseAmount":"Purchase Quanity","PurchasedItem": "You Have Purchased ", "CurrencySymbol": "$", "Confirm":"Confirm Purchase","AreYouSure":"Are you sure you want to purchase a ", "PayByCash": "Pay by cash", "PayByCard": "Pay by card" }, "UNITTEST": { "UNITTESTA": "Im a %s %s", "UNITTEST": { diff --git a/modules/shops/_default/client.lua b/modules/shops/_default/client.lua index 3ffc10a..e68c3b4 100644 --- a/modules/shops/_default/client.lua +++ b/modules/shops/_default/client.lua @@ -31,55 +31,45 @@ Shops.FinalizeCheckOut = function(shopName, item, itemLabel, price) Bridge.Menu.Open({ id = generatedID, title = locale("Shops.Confirm"), options = buildMenu }, false) end -Shops.FinalizeCheckOut = function(shopName, item, itemLabel, price) +Shops.FinalizeCheckOut = function(shopName, item, itemLabel, price, amount) if not shopName and not item and not itemLabel and not price then return end + local mathStuff = tonumber(price) * tonumber(amount) local generatedID = Ids.CreateUniqueId() local buildMenu = { { - title = locale('Shops.PayByCash')..tostring(price), + title = locale('Shops.PayByCash').." "..tostring(mathStuff), description = locale('Shops.AreYouSure') .. itemLabel, icon = "fa-solid fa-money-bill-wave", onSelect = function(_, __, ___) - TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "cash") + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, amount, "money") end }, { - title = locale('Shops.PayByCard')..tostring(price), + title = locale('Shops.PayByCard').." "..tostring(mathStuff), description = locale('Shops.AreYouSure') .. itemLabel, icon = "fa-solid fa-building-column", onSelect = function(_, __, ___) - TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "bank") + TriggerServerEvent('community_bridge:completeCheckout', shopName, item, amount, "bank") end } } Menu.Open({ id = generatedID, title = locale("Shops.Input"), options = buildMenu }, false) end ---[[ Shops.AmountSelect = function(shopName, item, itemLabel, price) if not shopName and not item and not itemLabel and not price then return end - local generatedID = Ids.CreateUniqueId() - local buildMenu = { - { - title = locale('Shops.PayByCash')..tostring(price), - description = locale('Shops.AreYouSure') .. itemLabel, - icon = "fa-solid fa-money-bill-wave", - onSelect = function(_, __, ___) - TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "cash") - end - }, - { - title = locale('Shops.PayByCard')..tostring(price), - description = locale('Shops.AreYouSure') .. itemLabel, - icon = "fa-solid fa-building-column", - onSelect = function(_, __, ___) - TriggerServerEvent('community_bridge:completeCheckout', shopName, item, "bank") - end - } - } - Menu.Open({ id = generatedID, title = locale("Shops.Input"), options = buildMenu }, false) + local numberOptions = {} + for i = 1, 100 do + table.insert(numberOptions, {label = tostring(i), value = i}) + end + local _input = Input.Open(shopName, { + {type = 'select', label = locale("Shops.PurchaseAmount"), options = numberOptions}, + }) + + if _input and _input[1] then + Shops.FinalizeCheckOut(shopName, item, itemLabel, price, tostring(_input[1])) + end end ---]] Shops.OpenShop = function(title, shopData) if not title and not shopData and not title then return print("No Title Passed") end @@ -92,7 +82,8 @@ Shops.OpenShop = function(title, shopData) description = locale('Shops.CurrencySymbol')..tostring(v.price), icon = "fa-solid fa-basket-shopping", onSelect = function(selected, secondary, args) - Shops.FinalizeCheckOut(title, v.name, getItemName, v.price) + Shops.AmountSelect(title, v.name, getItemName, v.price) + --Shops.FinalizeCheckOut(title, v.name, getItemName, v.price) end }) end diff --git a/modules/shops/_default/server.lua b/modules/shops/_default/server.lua index d698363..edf4737 100644 --- a/modules/shops/_default/server.lua +++ b/modules/shops/_default/server.lua @@ -14,8 +14,9 @@ Shops.CreateShop = function(shopTitle, shopInventory, shopCoords, shopGroups) return true end -Shops.CompleteCheckout = function(src, shopName, item, paymentType) - if not src and not shopName and not item and not paymentType then return end +Shops.CompleteCheckout = function(src, shopName, item, amount, paymentType) + + if not src and not shopName and not item and not amount and not paymentType then return end local ilocale = Language.Locale local shopData = registeredShops[shopName] if not shopData then return end @@ -29,16 +30,17 @@ Shops.CompleteCheckout = function(src, shopName, item, paymentType) if not itemData then return print("Player ID "..src.." Is Possibly A Cheater And Has Attempted To Purchase A "..item) end if not itemData.price then return end local balance = Framework.GetAccountBalance(src, paymentType) - if balance < itemData.price then return Notify.SendNotify(src, ilocale('Shops.NotEnoughMoney'), "error", 5000) end - if not Framework.RemoveAccountBalance(src, paymentType, itemData.price) then return end - Inventory.AddItem(src, itemData.name, 1) + local mathStuff = tonumber(itemData.price) * tonumber(amount) + if balance < mathStuff then return Notify.SendNotify(src, ilocale('Shops.NotEnoughMoney'), "error", 5000) end + if not Framework.RemoveAccountBalance(src, paymentType, mathStuff) then return end + Inventory.AddItem(src, itemData.name, amount) local itemLabel = Inventory.GetItemInfo(itemData.name).label Notify.SendNotify(src, ilocale('Shops.PurchasedItem')..itemLabel, "success", 5000) end -RegisterNetEvent("community_bridge:completeCheckout", function(shopName, item, paymentType) +RegisterNetEvent("community_bridge:completeCheckout", function(shopName, item, amount, paymentType) local src = source if not shopName and not item and not paymentType then return end - if not paymentType == "cash" or not paymentType == "bank" then return end - Shops.CompleteCheckout(src, shopName, item, paymentType) + if not paymentType == "money" or not paymentType == "bank" then return end + Shops.CompleteCheckout(src, shopName, item, amount, paymentType) end) \ No newline at end of file From 6eb444b7b34761b00398ccf66617de856dc77b8d Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 9 Mar 2025 23:42:26 -0400 Subject: [PATCH 33/33] Update fxmanifest.lua --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index d83beed..8c28da5 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.' -version '0.3.13' +version '0.4.0' shared_scripts { '@ox_lib/init.lua',