From dbca627bc3f2fe9fa64de874b40dc85cbf983bf9 Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Thu, 18 Jan 2024 13:05:45 +0000 Subject: [PATCH] Fix hasJob + Add more debug messages --- functions.lua | 36 +++++++++++++++++++++++++++++------- wrapper.lua | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/functions.lua b/functions.lua index e06fe7c..1eae914 100644 --- a/functions.lua +++ b/functions.lua @@ -558,12 +558,24 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give, if hasItem(item, amount and amount or 1, src) then -- check if you still have the item if GetResourceState(OXInv):find("start") then local success = exports[OXInv]:RemoveItem(src, item, (amount and amount or 1), nil) + if Config.System.Debug then + print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..OXInv) + end elseif GetResourceState(QSInv):find("start") then local success = exports[QSInv]:RemoveItem(src, item, amount) + if Config.System.Debug then + print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..QSInv) + end elseif GetResourceState(CoreInv):find("start") then local success = exports[CoreInv]:removeItemExact('primary-'..src, item, amount) + if Config.System.Debug then + print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..CoreInv) + end elseif GetResourceState(CodeMInv):find("start") then local success = exports[CodeMInv]:RemoveItem(src, item, amount) + if Config.System.Debug then + print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..CodeMInv) + end elseif GetResourceState(QBInv):find("start") then while remamount > 0 do if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1) then end @@ -572,10 +584,12 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give, if Config.Crafting.showItemBox then TriggerClientEvent('inventory:client:ItemBox', src, Items[item], "remove", (amount and amount or 1)) end + if Config.System.Debug then + print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..QBInv) + end + else + print("^4Error^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7") end - if Config.System.Debug then - print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7)'") - end else dupeWarn(src, item) -- if not boot the player end @@ -584,26 +598,34 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give, if GetResourceState(OXInv):find("start") then local success = exports[OXInv]:AddItem(src, item, amount or 1, nil) if Config.System.Debug then - print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^1OX^7'") + print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..OXInv) end elseif GetResourceState(QSInv):find("start") then local success = exports[QSInv]:AddItem(src, item, amount) if Config.System.Debug then - print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^1QS^7'") + print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..QSInv) end elseif GetResourceState(CoreInv):find("start") then local success = exports[CoreInv]:addItem('primary-'..src, item, amount) if Config.System.Debug then - print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^1Core^7'") + print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..CoreInv) end elseif GetResourceState(CodeMInv):find("start") then local success = exports[CodeMInv]:AddItem(src, item, amount) - elseif GetResourceState(QBInv):find("start") then + if Config.System.Debug then + print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..CodeMInv) + end + elseif GetResourceState(QBInv):find("start") then if Core.Functions.GetPlayer(src).Functions.AddItem(item, amount or 1) then --if Config.Crafting.showItemBox then TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "add", amount and amount or 1) --end end + if Config.System.Debug then + print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..QBInv) + end + else + print("^4Error^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7") end end end) diff --git a/wrapper.lua b/wrapper.lua index 1aa09dd..bc820e9 100644 --- a/wrapper.lua +++ b/wrapper.lua @@ -22,7 +22,7 @@ for k, v in pairs(Exports) do if GetResourceState(v):find("start") then print("^6Bridge^7: '^3"..v.."^7' ^2export found ^7") end end --- Load item lists from qb-core or ox_lib +-- Load item lists if GetResourceState(OXInv):find("start") then print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..OXInv) Items = exports[OXInv]:Items() @@ -42,6 +42,8 @@ elseif GetResourceState(ESXExport):find("start") then print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..ESXExport) ESX = exports[ESXExport]:getSharedObject() Items = ESX.Items +else + print("^4ERROR^7: ^2No Core Items detected ^7- ^2Check ^3exports^1.^2lua^7") end -- Load Vehicles @@ -79,6 +81,8 @@ elseif GetResourceState(ESXExport):find("start") then end end end) +else + print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3exports^1.^2lua^7") end -- Load Jobs @@ -137,6 +141,8 @@ elseif GetResourceState(ESXExport):find("start") then Gangs = Jobs end end) +else + print("^4ERROR^7: ^2No Job/Gang ifo detected ^7- ^2Check ^3exports^1.^2lua^7") end function makeBossRoles(role) @@ -179,6 +185,8 @@ function createPoly(data) local Location = nil data.onExit() end end) + else + print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7") end end @@ -196,6 +204,8 @@ function createCirclePoly(data) local Location = nil data.onExit() end end) + else + print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7") end end @@ -713,9 +723,12 @@ function onPlayerLoaded(func) elseif GetResourceState(OXCoreExport):find("start") then if Config.System.Debug then print("^6Bridge^7: ^2Registering ^3onPlayerLoaded^2 with ^7"..OXLibExport) end AddEventHandler('ox:playerLoaded', func) + else + print("^4ERROR^7: ^2No Core detected for onPlayerLoaded ^7- ^2Check ^3exports^1.^2lua^7") end end + -- INPUT -- function createInput(title, opts) local dialog = nil @@ -929,19 +942,24 @@ RegisterNetEvent(GetCurrentResourceName()..":server:ChargePlayer", function(cost if type == "cash" then if GetResourceState(OXInv):find("start") then exports[OXInv]:RemoveItem(src, "money", cost) + if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type, OXInv) end elseif GetResourceState(QBExport):find("start") then Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost) + if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type, QBExport) end elseif GetResourceState(ESXExport):find("start") then local Player = ESX.GetPlayerFromId(src) Player.removeMoney(cost, "") + if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type, ESXExport) end end end if type == "bank" then if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost) + if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type, QBExport) end elseif GetResourceState(ESXExport):find("start") then local Player = ESX.GetPlayerFromId(src) Player.removeMoney(cost, "") + if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type, ESXExport) end end end end) @@ -1008,6 +1026,8 @@ function hasJob(job, source, grade) local hasJob = false if grade and not (grade <= ganginfo.grade.level) then hasJob = false end end end + else + print("^4ERROR^7: ^2No Core detected for hasJob ^7- ^2Check ^3exports^1.^2lua^7") end else if GetResourceState(ESXExport):find("start") then @@ -1033,7 +1053,7 @@ function hasJob(job, source, grade) local hasJob = false if ganginfo.name == job then hasJob = true if grade and not (grade <= ganginfo.grade.level) then hasJob = false end end - elseif GetResourceState(QBXExport):find("start") and not GetResourceState(QBXExport):find("start") then + elseif GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then local info = nil Core.Functions.GetPlayerData(function(PlayerData) info = PlayerData @@ -1048,6 +1068,8 @@ function hasJob(job, source, grade) local hasJob = false hasJob = true if grade and not (grade <= ganginfo.grade.level) then hasJob = false end end + else + print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3exports^1.^2lua^7") end end return hasJob @@ -1098,6 +1120,8 @@ function getPlayer(source) local Player = {} bank = info.money["bank"], } end + else + print("^4ERROR^7: ^2No Core detected for getPlayer() ^7- ^2Check ^3exports^1.^2lua^7") end else if GetResourceState(ESXExport):find("start") and ESX ~= nil then @@ -1134,6 +1158,8 @@ function getPlayer(source) local Player = {} cash = info.money["cash"], bank = info.money["bank"], } + else + print("^4ERROR^7: ^2No Core detected for hasJob ^7- ^2Check ^3exports^1.^2lua^7") end end return Player @@ -1160,6 +1186,8 @@ function invImg(item) imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "") elseif GetResourceState(QBInv and QBInv or ""):find("start") then imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "") + else + print("^4ERROR^7: ^2No Inventory detected for invImg ^7- ^2Check ^3exports^1.^2lua^7") end end return imgLink