Version Bump

`2.0.15 - 2.0.16`
add openBossmenu() function
2026-08-17 05:56:02 +01:00 · 2025-06-16 11:05:46 +01:00 · 2025-06-16 00:10:32 +01:00 · 2025-06-14 22:32:58 +01:00 · 2025-06-14 14:44:16 +01:00 · 2025-06-13 23:25:32 +01:00
14 changed files with 385 additions and 119 deletions
--- a/frameworkCache.lua
+++ b/frameworkCache.lua
@@ -1,10 +1,11 @@
 --[[
    Cached Resource Initialization Module
    --------------------------------------
-    This module initializes shared data (Items, Vehicles, Jobs, Gangs)
-    only once and stores it in _G.__jimBridgeDataCache for reuse across scripts.
+    Initializes shared resource data (Items, Vehicles, Jobs, Gangs) once and caches it
+    to improve performance and reduce redundant data fetching across scripts.
 ]]

+-- Define resource names used in different frameworks
 local Exports = {
    QBExport = "qb-core",
    QBXExport = "qbx_core",
@@ -19,6 +20,7 @@ local Exports = {
    CodeMInv = "codem-inventory",
    OrigenInv = "origen_inventory",
    TgiannInv = "tgiann-inventory",
+    JPRInv = "jpr-inventory",

    OXLibExport = "ox_lib",

@@ -32,17 +34,20 @@ local Exports = {
    RSGInv = "rsg-inventory"
 }

-- Ensure cache only runs once
+-- Prevent reloading if cache is already initialized
 if _G.__jimBridgeDataCache then return end
 _G.__jimBridgeDataCache = {}
 local cache = _G.__jimBridgeDataCache

-function checkExists(resourceName)
+-- Helper function to check if resource exists in server (instead of if it is already started)
+local function checkExists(resourceName)
    return GetResourceState(resourceName):find("start") or GetResourceState(resourceName):find("stopped")
 end

+-- Ensure oxmysql resource is loaded
 local fileLoader = assert(load(LoadResourceFile("oxmysql", ('lib/MySQL.lua')), ('@@oxmysql/lib/MySQL.lua')))
 fileLoader()
+
 if checkExists(Exports.OXCoreExport) then
    -- Detected OX_Core in server, wait for it to be started if needed
    while GetResourceState(Exports.OXCoreExport) ~= "started" do Wait(100) end
@@ -56,7 +61,7 @@ if checkExists(Exports.ESXExport) then
    fileLoader()
 end

-- Init variables
+-- Initialize variables for caching
 local Items, Vehicles, Jobs, Gangs, Core = nil, nil, nil, nil, nil
 local itemResource, jobResource, vehResource = "", "", ""

@@ -70,32 +75,20 @@ end
 ---------------------
 ---- Load Items -----
 ---------------------
+-- Items initialization based on detected inventory system
 if checkExists(Exports.OXInv) then
    -- Wait for OX Inventory to start if it's not already started
    while GetResourceState(Exports.OXInv) ~= "started" do Wait(100) end
    itemResource = Exports.OXInv
    Items = exports[Exports.OXInv]:Items()
-    -- IF QBX-Core is running, merge items from there
-    if checkExists(Exports.QBExport)then
-        local tempWeapons = exports[Exports.QBExport]:GetCoreObject().Shared.Weapons
-        for k, v in pairs(tempWeapons) do
-            local info = exports[Exports.OXInv]:Items(v.name)
-            local weight = info and info.weight or 0
-            if not Items[v.name] then
-                Items[v.name] = {
-                    name = v.name,
-                    label = v.label,
-                    type = "weapon",
-                    ammotype = v.ammotype or "AMMO_PISTOL",
-                    weight = weight,
-                    image = v.image or (v.name..".png"),
-                    description = v.label or "",
-                }
-            end
-        end
-    end
-    -- tidy info into something jim_bridge can use
+
+    -- Get Weapon info and duplicate them if they are uppercase
+    -- (duplicate incase anything checks for the uppercase version)
    for k, v in pairs(Items) do
+        if k:find("WEAPON") then
+            Items[k:lower()] = Items[k]
+            Items[k:lower()].image = k..".png"
+        end
        Items[k].image = (v.client and v.client.image) and v.client.image:gsub("nui://"..Exports.OXInv.."/web/images/", "") or k..".png"
        Items[k].hunger = v.client and v.client.hunger
        Items[k].thirst = v.client and v.client.thirst
@@ -106,6 +99,10 @@ elseif checkExists(Exports.QBExport) then
    itemResource = Exports.QBExport
    Core = exports[Exports.QBExport]:GetCoreObject()
    Items = Core.Shared.Items
+    if Items == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Items ^1table^7, ^1possible error in that file^7?")
+        Items = {} -- Fallback to an empty table
+    end

 elseif checkExists(Exports.ESXExport) then
    itemResource = Exports.ESXExport
@@ -124,15 +121,25 @@ elseif checkExists(Exports.RSGExport) then
    itemResource = Exports.RSGExport
    Core = exports[Exports.RSGExport]:GetCoreObject()
    Items = Core.Shared.Items
+    if Items == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Items ^1table^7, ^1possible error in that file^7?")
+        Items = {} -- Fallback to an empty table
+    end
+
 end

 ---------------------
 --- Load Vehicles ---
 ---------------------
+-- Vehicle loading depending on framework
 if checkExists(Exports.QBXExport) or checkExists(Exports.QBExport) then
    vehResource = Exports.QBExport
    Core = Core or exports[Exports.QBExport]:GetCoreObject()
    Vehicles = Core.Shared.Vehicles
+    if Vehicles == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Vehicles ^1table^7, ^1possible error in that file^7?")
+        Vehicles = {} -- Fallback to an empty table
+    end

 elseif checkExists(Exports.OXCoreExport) then
    vehResource = Exports.OXCoreExport
@@ -163,15 +170,25 @@ elseif checkExists(Exports.RSGExport) then
    vehResource = Exports.RSGExport
    Core = Core or exports[Exports.RSGExport]:GetCoreObject()
    Vehicles = Core.Shared.Vehicles
+    if Vehicles == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Vehicles ^1table^7, ^1possible error in that file^7?")
+        Vehicles = {} -- Fallback to an empty table
+    end
+
 end

 ---------------------
 ----- Load Jobs -----
 ---------------------
+-- Jobs loading based on framework
 if checkExists(Exports.QBXExport) then
    jobResource = Exports.QBXExport
    Core = Core or exports[Exports.QBXExport]:GetCoreObject()
    Jobs, Gangs = exports[Exports.QBXExport]:GetJobs(), exports[Exports.QBXExport]:GetGangs()
+    if Jobs == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?")
+        Jobs = {} -- Fallback to an empty table
+    end

 elseif checkExists(Exports.OXCoreExport) then
    jobResource = Exports.OXCoreExport
@@ -225,7 +242,6 @@ elseif checkExists(Exports.ESXExport) then
        end

        if highestGrade then
-            print("found boss for", Role)
            Jobs[Role].grades[tostring(highestGrade)].isBoss = true
        end
        ::continue::
@@ -236,6 +252,11 @@ elseif checkExists(Exports.RSGExport) then
    jobResource = Exports.RSGExport
    Core = Core or exports[Exports.RSGExport]:GetCoreObject()
    Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+    if Jobs == nil then
+        print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?")
+        Jobs = {} -- Fallback to an empty table
+    end
+
 end

 -- Save to global cache
@@ -262,14 +283,11 @@ CreateThread(function()
    print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Gangs).."^2 Gangs from ^7"..jobResource)
 end)

--print(json.encode(cache.Items , { indent = true}))
-
 RegisterNetEvent("jim_bridge:requestCache", function()
    local src = source
    TriggerClientEvent("jim_bridge:receiveCache", src, _G.__jimBridgeDataCache)
 end)

-
 exports("GetSharedData", function()
    -- Wait for data to be ready before returning it
    local timeout = GetGameTimer() + 5000
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.15"
+version "2.0.16"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
--- a/shared/coreloader.lua
+++ b/shared/coreloader.lua
@@ -10,7 +10,7 @@ OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport =
    Exports.ESXExport or "",
    Exports.OXCoreExport or ""

-OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv =
+OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, JPRInv =
    Exports.OXInv or "",
    Exports.QBInv or "",
    Exports.PSInv or "",
@@ -18,7 +18,8 @@ OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv =
    Exports.CoreInv or "",
    Exports.CodeMInv or "",
    Exports.OrigenInv or "",
-    Exports.TgiannInv or ""
+    Exports.TgiannInv or "",
+    Exports.JPRInv or ""

 RSGExport, RSGInv = Exports.RSGExport or "", Exports.RSGInv or ""
 QBMenuExport = Exports.QBMenuExport or ""
--- a/shared/crafting.lua
+++ b/shared/crafting.lua
@@ -88,6 +88,7 @@ function craftingMenu(data)

    -- Check if the player can carry the required items (server callback).
    local canCarryTable = triggerCallback(getScript()..':server:canCarry', tempCarryTable)
+
    -- Process each recipe to create menu entries.
    for i = 1, #Recipes do
        if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
@@ -106,10 +107,13 @@ function craftingMenu(data)
                    local metaTable = {}
                    -- Build ingredient details.
                    for l, b in pairs(Recipes[i][tostring(k)]) do
-                        settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
+                        local label = Items[l] and Items[l].label or "error - "..l
+                        local hasItem = checkStashItem(data.stashName, { [l] = b })
+                        local missingMark = not hasItem and " ❌" or " "
+                        settext = settext..(settext ~= "" and br or "").."[ x"..b.." ] - "..label..(b > 1 and " x"..b or "")..missingMark
+
                        metaTable[Items[l] and Items[l].label or "error - "..l] = b
                        itemTable[l] = b
-                        --Wait(0)
                    end

                    while not canCarryTable do Wait(0) end
@@ -117,17 +121,17 @@ function craftingMenu(data)
                    setheader = ((metadata and metadata.label) or (Items[tostring(k)] and Items[tostring(k)].label) or "error - "..tostring(k))
                               ..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")

-                    local statusEmoji = disable and " ❌" or not canCarryTable[k] and " 📦" or " ✔️"
+                    local statusEmoji = disable and " " or not canCarryTable[k] and " 📦" or " ✔️"
                    local isNew = (Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil) and "✨ " or ""
                    setheader = isNew .. setheader .. statusEmoji

                    Menu[#Menu + 1] = {
-                        arrow = not disable and canCarryTable[k],
+                        arrow = isOx() and (not disable and canCarryTable[k]),
                        isMenuHeader = disable or not canCarryTable[k],
                        icon = invImg((metadata and metadata.image) or tostring(k)),
                        image = invImg((metadata and metadata.image) or tostring(k)),
                        header = setheader,
-                        txt = (isStarted(QBMenuExport) or disable) and settext or nil,
+                        txt = settext or nil,
                        metadata = metaTable,
                        onSelect = (not disable and canCarryTable[k]) and function()
                            local transdata = {
--- a/shared/helpers.lua
+++ b/shared/helpers.lua
@@ -56,6 +56,25 @@ function isServer()
    return IsDuplicityVersion()
 end

+function checkExportExists(resource, export)
+    if not resource or not export then return false end
+
+    local exists = false
+    local ok, result = pcall(function()
+        exists = type(exports[resource][export]) == "function"
+    end)
+
+    if ok and exists then
+        debugPrint(("^3Export Check^7: ^5exports^7['^5%s^7']:^5%s^7() ^2Exists^7"):format(resource, export))
+        return true
+    else
+        debugPrint(("^3Export Check^7: ^5exports^7['^5%s^7']:^5%s^7() ^1Doesn^7'^1t Exist^7"):format(resource, export))
+        return false
+    end
+end
+
+
+
 -------------------------------------------------------------
 -- Debugging and JSON Utilities
 -------------------------------------------------------------
@@ -474,7 +493,7 @@ end
 --- end
 --- ```
 function ensureNetToVeh(vehNetID)
-    debugPrint("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)")
+    --debugPrint("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)")
    local timeout = 100
    while not NetworkDoesNetworkIdExist(vehNetID) and timeout > 0 do
        timeout -= 1
@@ -502,7 +521,7 @@ end
 --- end
 --- ```
 function ensureNetToEnt(entNetID)
-    debugPrint("^6Bridge^7: ^3ensureNetToEnt^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..entNetID.."^7)")
+    --debugPrint("^6Bridge^7: ^3ensureNetToEnt^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..entNetID.."^7)")
    local timeout = 100
    while not NetworkDoesNetworkIdExist(entNetID) and timeout > 0 do
        timeout -= 1
--- a/shared/inventories.lua
+++ b/shared/inventories.lua
@@ -50,7 +50,7 @@ function hasItem(items, amount, src)

            local count = 0
            for _, itemData in pairs(grabInv) do
-                jsonPrint(itemData)
+                --jsonPrint(itemData)
                if itemData and itemData.name == item then
                    count += (itemData.amount or itemData.count or 1)
                end
@@ -138,6 +138,14 @@ function getPlayerInv(src)
            grabInv = exports[TgiannInv]:GetPlayerItems()
        end

+    elseif isStarted(JPRInv) then
+        foundInv = JPRInv
+        if src then
+            grabInv = Core.Functions.GetPlayer(src).PlayerData.items
+        else
+            grabInv = Core.Functions.GetPlayerData().items
+        end
+
    elseif isStarted(QBInv) then
        foundInv = QBInv
        if src then
@@ -148,8 +156,11 @@ function getPlayerInv(src)

    elseif isStarted(PSInv) then
        foundInv = PSInv
-        if src then grabInv = Core.Functions.GetPlayer(src).PlayerData.items
-        else grabInv = Core.Functions.GetPlayerData().items end
+        if src then
+            grabInv = Core.Functions.GetPlayer(src).PlayerData.items
+        else
+            grabInv = Core.Functions.GetPlayerData().items
+        end

    elseif ESX and isStarted(ESXExport) then
        foundInv = ESX
@@ -179,41 +190,6 @@ function isInventoryOpen()

    return IsNuiFocused()

-    --if isStarted(OXInv) then
-    --    return LocalPlayer.state.invBusy
-
-    --elseif isStarted(QSInv) then
-    --    return exports[QSInv]:inInventory()
-
-    --elseif isStarted(OrigenInv) then
-    --    return exports[OrigenInv]:IsInventoryOpen()
-
-    --elseif isStarted(CoreInv) then
-    --    return exports[CoreInv]:isInventoryOpen()
-
-    --elseif isStarted(CodeMInv) then
-    --    return false
-    --    -- CodeM doesn't have a function to check if the inventory is open
-    --    -- No idea what it uses, so it just skips the check
-
-    --elseif isStarted(TgiannInv) then
-    --    return IsNuiFocused()
-
-    --elseif isStarted(QBInv) then
-    --    return LocalPlayer.state.inv_busy
-
-    --elseif isStarted(PSInv) then
-    --    return LocalPlayer.state.inv_busy
-
-    --elseif ESX and isStarted(ESXExport) then
-    --    return false
-
-    --elseif isStarted(RSGInv) then
-    --    return LocalPlayer.state.inv_busy
-
-    --end
-
-
 end

 -------------------------------------------------------------
@@ -248,12 +224,14 @@ function invImg(item)
        elseif isStarted(OrigenInv) then
            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")

+        elseif isStarted(JPRInv) then
+            imgLink = "nui://"..JPRInv.."/html/images/"..(Items[item].image or "")
+
        elseif isStarted(QBInv) then
            imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")

        elseif isStarted(PSInv) then
            imgLink = "nui://"..PSInv.."/html/images/"..(Items[item].image or "")
-
        elseif isStarted(TgiannInv) then
            imgLink = "nui://inventory_images/images/"..(Items[item].image or "")

--- a/shared/itemcontrol.lua
+++ b/shared/itemcontrol.lua
@@ -186,6 +186,20 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                invName = TgiannInv
                exports[TgiannInv]:RemoveItem(src, item, remamount)

+            elseif isStarted(JPRInv) then
+                invName = JPRInv
+                while remamount > 0 do
+                    if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
+                        remamount -= 1
+                    else
+                        print("^1Error removing "..item.." Amount left: "..remamount)
+                        break
+                    end
+                end
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
+                    TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
+                end
+
            elseif isStarted(QBInv) then
                invName = QBInv
                while remamount > 0 do
@@ -196,7 +210,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                        break
                    end
                end
-                if Config.Crafting.showItemBox then
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
                    TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
                end

@@ -210,7 +224,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                        break
                    end
                end
-                if Config.Crafting.showItemBox then
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
                    TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
                end

@@ -223,7 +237,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                        break
                    end
                end
-                if Config.Crafting.showItemBox then
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
                    TriggerClientEvent("rsg-inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
                end

@@ -270,6 +284,13 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
        elseif isStarted(TgiannInv) then invName = TgiannInv
            exports[TgiannInv]:AddItem(src, item, amountToAdd, slot, info)

+        elseif isStarted(JPRInv) then invName = JPRInv
+            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
+                    TriggerClientEvent("ps-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
+                end
+            end
+
        elseif isStarted(QBInv) then invName = QBInv
            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
                TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
@@ -277,7 +298,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,

        elseif isStarted(PSInv) then invName = PSInv
            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
-                if Config.Crafting.showItemBox then
+                if Config.Crafting ~= nil and Config.Crafting.showItemBox then
                    TriggerClientEvent("ps-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
                end
            end
@@ -379,7 +400,7 @@ end
 function getDurability(item)
    local lowestSlot = 100
    local durability = nil
-    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) then
+    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then
        local itemcheck = Core.Functions.GetPlayerData().items
        for k, v in pairs(itemcheck) do
            if v.name == item then
@@ -488,7 +509,7 @@ end
 --- ```
 RegisterNetEvent(getScript()..":server:setMetaData", function(data)
    local src = source
-    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) then
+    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then
        debugPrint(src, data.item, 1, data.slot)
        local Player = Core.Functions.GetPlayer(src)
        Player.PlayerData.items[data.slot].info = data.metadata
@@ -626,6 +647,22 @@ function canCarry(itemTable, src)
                resultTable[k] = exports[TgiannInv]:CanCarryItem(source, k, v)
            end

+        elseif isStarted(JPRInv) then
+            local items = getPlayerInv(src)
+            local totalWeight = 0
+            if not items then return false end
+            for _, item in pairs(items) do
+                totalWeight += (item.weight * item.amount)
+            end
+            for k, v in pairs(itemTable) do
+                local itemInfo = Items[k]
+                if not itemInfo then
+                    resultTable[k] = true
+                else
+                    resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight
+                end
+            end
+
        elseif isStarted(QBInv) then
            if QBInvNew then
                for k, v in pairs(itemTable) do
--- a/shared/jobfunctions.lua
+++ b/shared/jobfunctions.lua
@@ -231,3 +231,16 @@ function useDoor(data)
    DoScreenFadeIn(1000)
    Wait(100)
 end
+
+
+function openBossMenu(isGang, group)
+    if isStarted("qb-management") then
+        if isGang then
+            TriggerEvent("qb-gangmenu:client:OpenMenu")
+        else
+            TriggerEvent("qb-bossmenu:client:OpenMenu")
+        end
+    elseif isStarted("qbx_management") then
+        exports["qbx_management"]:OpenBossMenu(isGang and "gang" or "job")
+    end
+end
--- a/shared/phones.lua
+++ b/shared/phones.lua
@@ -73,6 +73,11 @@ function sendPhoneMail(data)
                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
            end,
        },
+        {   name = "npwd_qbx_mail",
+            send = function(mailData)
+                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
+            end,
+        },
        {   name = "jpr-phonesystem",
            send = function(mailData)
                TriggerServerEvent(getScript()..":jpr:SendMail", mailData)
@@ -85,23 +90,125 @@ function sendPhoneMail(data)
        },
    }

-    local activePhone = nil
    -- Check each phone system in order and use the first active one.
    for _, phone in ipairs(phoneSystems) do
        if isStarted(phone.name) then
-            activePhone = phone.name
+            debugPrint("^6Bridge^7[^3"..phone.name.."^7]: ^2Sending mail to player")
            phone.send(data)
-            break
+            return true
        end
    end
-
-    if activePhone then
-        debugPrint("^6Bridge^7[^3"..activePhone.."^7]: ^2Sending mail to player")
-    else
-        print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7- ^2No supported phone found")
-    end
+    print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7- ^2No supported phone found")
+    return false
 end

+function sendPhoneInvoice(data)
+    if not data.src then return end
+    -- Define each supported phone system and its corresponding mail-sending function.
+    local phoneSystems = {
+        {
+            name = "qb-phone",
+            send = function(mailData)
+                -- Defensive check for required fields
+                local required = { "billedCitizenid", "amount", "job", "name", "billerCitizenid", "src" }
+                for _, field in ipairs(required) do
+                    if mailData[field] == nil then
+                        print("^1[jim-payments] ERROR:^0 Missing field '" .. field .. "' in mailData")
+                        return
+                    end
+                end
+
+                -- Safe insert with all parameters present
+                MySQL.Async.insert(
+                    'INSERT INTO phone_invoices (citizenid, amount, society, sender, sendercitizenid) VALUES (?, ?, ?, ?, ?)',
+                    {
+                        mailData.billedCitizenid,
+                        mailData.amount,
+                        mailData.job,
+                        mailData.name,
+                        mailData.billerCitizenid
+                    },
+                    function(id)
+                        if id then
+                            TriggerClientEvent('qb-phone:client:AcceptorDenyInvoice', mailData.src, id, mailData.name, mailData.job, mailData.billerCitizenid, mailData.amount, GetInvokingResource())
+                        end
+                    end
+                )
+
+                TriggerClientEvent('qb-phone:RefreshPhone', mailData.src)
+            end
+        },
+        {
+            name = "codem-phone",
+            send = function(mailData)
+                -- Defensive check for required fields
+                local required = { "billedCitizenid", "amount", "job", "name", "billerCitizenid", "src" }
+                for _, field in ipairs(required) do
+                    if mailData[field] == nil then
+                        print("^1[jim-payments] ERROR:^0 Missing field '" .. field .. "' in mailData")
+                        return
+                    end
+                end
+
+                -- Safe insert with all parameters present
+                MySQL.Async.insert(
+                    'INSERT INTO phone_invoices (citizenid, amount, society, sender, sendercitizenid) VALUES (?, ?, ?, ?, ?)',
+                    {
+                        mailData.billedCitizenid,
+                        mailData.amount,
+                        mailData.job,
+                        mailData.name,
+                        mailData.billerCitizenid
+                    },
+                    function(id)
+                    --    if id then
+                    --        TriggerClientEvent('qb-phone:client:AcceptorDenyInvoice', mailData.src, id, mailData.name, mailData.job, mailData.billerCitizenid, mailData.amount, GetInvokingResource())
+                    --    end
+                    end
+                )
+
+
+            end
+        },
+        {
+            name = "gks-phone",
+            send = function(mailData)
+                -- Defensive check for required fields
+                local required = { "billedCitizenid", "amount", "job", "name", "billerCitizenid", "label" }
+                for _, field in ipairs(required) do
+                    if mailData[field] == nil then
+                        print("^1[jim-payments] ERROR:^0 Missing field '" .. field .. "' in mailData")
+                        return
+                    end
+                end
+
+                MySQL.Async.execute(
+                    'INSERT INTO gksphone_invoices (citizenid, amount, society, sender, sendercitizenid, label) VALUES (@citizenid, @amount, @society, @sender, @sendercitizenid, @label)',
+                    {
+                        ['@citizenid'] = mailData.billedCitizenid,
+                        ['@amount'] = mailData.amount,
+                        ['@society'] = mailData.job,
+                        ['@sender'] = mailData.name,
+                        ['@sendercitizenid'] = mailData.billerCitizenid,
+                        ['@label'] = mailData.label
+                    }
+                )
+            end
+        }
+    }
+
+
+    -- Check each phone system in order and use the first active one.
+    for _, phone in ipairs(phoneSystems) do
+        if isStarted(phone.name) then
+            debugPrint("^6Bridge^7[^3"..phone.name.."^7]: ^2Sending mail to player^7", data.src)
+            phone.send(data)
+            return true
+        end
+    end
+    print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7- ^2No supported phone found")
+    return false
+end
 -------------------------------------------------------------
 -- Phone System Event Handlers
 -------------------------------------------------------------
--- a/shared/playerfunctions.lua
+++ b/shared/playerfunctions.lua
@@ -109,19 +109,18 @@ end)
 --- setThirst(playerId, 80)
 --- ```
 function setThirst(src, thirst)
+
+    debugPrint("^4Debug^7: ^2Adding thirst^7: ^3"..thirst.." ^2to player^7: ^3"..src.."^7")
    if isStarted(ESXExport) then
        TriggerClientEvent('esx_status:add', src, 'thirst', thirst)

-    elseif isStarted(QBExport) or isStarted(QBXExport) then
+    elseif isStarted(QBExport) or isStarted(QBXExport) or isStarted(RSGExport) then
        local Player = Core.Functions.GetPlayer(src)
        Player.Functions.SetMetaData('thirst', thirst)
-        TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
+        TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)

-    elseif isStarted(RSGExport) then
-        local Player = Core.Functions.GetPlayer(src)
-        Player.Functions.SetMetaData('thirst', thirst)
-        TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
    end
+
 end

 --- Sets the player's hunger level.
@@ -134,18 +133,16 @@ end
 --- setHunger(playerId, 60)
 --- ```
 function setHunger(src, hunger)
+
+    debugPrint("^4Debug^7: ^2Adding hunger^7: ^3"..hunger.." ^2to player^7: ^3"..src.."^7")
    if isStarted(ESXExport) then
        TriggerClientEvent('esx_status:add', src, 'hunger', hunger)

-    elseif isStarted(QBExport) or isStarted(QBXExport) then
+    elseif isStarted(QBExport) or isStarted(QBXExport) or isStarted(RSGExport) then
        local Player = Core.Functions.GetPlayer(src)
        Player.Functions.SetMetaData('hunger', hunger)
-        TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
+        TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)

-    elseif isStarted(RSGExport) then
-        local Player = Core.Functions.GetPlayer(src)
-        Player.Functions.SetMetaData('hunger', hunger)
-        TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
    end
 end

@@ -153,6 +150,18 @@ end
 -- Economy Event Handlers
 -------------------------------------------------------------

+--- BillPlayer
+function billPlayer(data)
+    if not Config.System.Billing or Config.System.Billing == "jim" then
+        TriggerEvent("jim-payments:client:Charge", {
+            job = data.job,
+            gang = data.gang,
+            coords = data.coords.xyz,
+            img = data.img
+        })
+    end
+end
+
 --- Charges a player by removing money from their account.
 ---
 --- @param cost number The amount to charge.
--- a/shared/shops.lua
+++ b/shared/shops.lua
@@ -164,12 +164,16 @@ function openShop(data)
    elseif isStarted(OXInv) then
        exports[OXInv]:openInventory('shop', { type = data.shop })

-    elseif isStarted(QSInv) or isStarted(CodeMInv) then
+    elseif isStarted(QSInv) then
        TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)

    elseif isStarted(TgiannInv) then
        TriggerServerEvent(getScript()..':server:openServerShop', data.shop)

+    elseif isStarted(CodeMInv) then
+        --print(data.shop)
+        TriggerEvent("codem-inventory:openshop", data.shop)
+
    elseif isStarted(QBInv) then
        if QBInvNew then
            TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
--- a/shared/stashcontrol.lua
+++ b/shared/stashcontrol.lua
@@ -151,6 +151,22 @@ function openStash(data)
            slots = data.slots or 40
        })

+    elseif isStarted(JPRInv) then
+        if QBInvNew then
+            TriggerServerEvent(getScript()..':server:openServerStash', {
+                stashName = data.stash,
+                label = data.label,
+                maxweight = data.maxWeight or 600000,
+                slots = data.slots or 40
+            })
+        else
+            TriggerEvent("inventory:client:SetCurrentStash", data.stash)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
+        end
+
    elseif isStarted(QBInv) then
        if QBInvNew then
            TriggerServerEvent(getScript()..':server:openServerStash', {
@@ -211,6 +227,9 @@ RegisterNetEvent(getScript()..":server:openServerStash", function(data)
    if isStarted(TgiannInv) then
        exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data)
    end
+    if isStarted(JPRInv) then
+        exports[JPRInv]:OpenInventory(source, data.stashName, data)
+    end
    if isStarted(QBInv) then
        exports[QBInv]:OpenInventory(source, data.stashName, data)
    end
@@ -223,7 +242,18 @@ RegisterNetEvent(getScript()..":server:openServerStash", function(data)
 end)

 function clearStash(stashId)
-    if isStarted(QBInv) then
+    if isStarted(JPRInv) then
+        debugPrint("^5Bridge^7: ^2Cleared ^3"..JPRInv.."^2 Stash^7", stashId)
+        if QBInvNew then
+            exports[JPRInv]:ClearStash(stashId)
+        else
+            MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
+                ['stash'] = stashId,
+                ['items'] = json.encode({})
+            })
+        end
+
+    elseif isStarted(QBInv) then
        debugPrint("^5Bridge^7: ^2Cleared ^3"..QBInv.."^2 Stash^7", stashId)
        if QBInvNew then
            exports[QBInv]:ClearStash(stashId)
@@ -241,7 +271,7 @@ function clearStash(stashId)
    elseif isStarted(PSInv) then
        debugPrint("^5Bridge^7: ^2Cleared ^3"..PSInv.."^2 Stash^7", stashId)
        if QBInvNew then
-            exports[QBInv]:ClearStash(stashId)
+            exports[PSInv]:ClearStash(stashId)
        else
            MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
                ['stash'] = stashId,
@@ -249,6 +279,7 @@ function clearStash(stashId)
            })
        end

+
    elseif isStarted(QSInv) then
        debugPrint("^5Bridge^7: ^2Cleared ^3"..QSInv.."^2 Stash^7", stashId)
        exports[QSInv]:ClearOtherInventory('stash', stashId)
@@ -331,6 +362,11 @@ function getStash(stashName)
        local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
 		if result then stashItems = json.decode(result) end

+    elseif isStarted(JPRInv) then
+        stashResource = JPRInv
+        local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
+		if result then stashItems = json.decode(result) end
+
    elseif isStarted(QBInv) then
        stashResource = QBInv
        if QBInvNew then
@@ -449,6 +485,29 @@ function stashRemoveItem(stashItems, stashName, items)
            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
        end

+    elseif isStarted(JPRInv) then
+        if not stashItems or not next(stashItems) then
+            stashItems = getStash(stashName[1])
+        end
+        for k, v in pairs(items) do
+            for l in pairs(stashItems) do
+                if stashItems[l].name == k then
+                    if (stashItems[l].amount - v) <= 0 then
+                        debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
+                        stashItems[l] = nil
+                    else
+                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with "..JPRInv, k, v)
+                        stashItems[l].amount -= v
+                    end
+                end
+            end
+        end
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3JPR^2 stash '^6"..stashName[1].."^7'")
+        MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
+            ['stash'] = stashName[1],
+            ['items'] = json.encode(stashItems)
+        })
+
    elseif isStarted(QBInv) then
        if QBInvNew then
            for k, v in pairs(items) do
@@ -531,7 +590,7 @@ RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
 --- local hasAll, details = stashhasItem(currentStashItems, { iron = 2, wood = 5 })
 --- ```
 function stashhasItem(stashItems, items, amount)
-    local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, QBInv, PSInv, RSGInv }
+    local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, JPRInv, QBInv, PSInv, RSGInv }
    local foundInv = ""
    for _, inv in ipairs(invs) do
        if isStarted(inv) then
--- a/starter.lua
+++ b/starter.lua
@@ -14,6 +14,7 @@ Exports = {
    CodeMInv = "codem-inventory",
    OrigenInv = "origen_inventory",
    TgiannInv = "tgiann-inventory",
+    JPRInv = "jpr-inventory",

    OXLibExport = "ox_lib",

@@ -188,4 +189,18 @@ for _, v in pairs({ -- This is a specific load order
    if debugMode then
        print("^5CoreLoader^7: ^2loaded file^7: ^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
    end
-end
+end
+
+if isStarted(QBInv) then
+    if not checkExportExists(QBInv, "HasItem") then
+        print("^6Bridge^7: ^2Can^7'^2t ^2find new QBInv export^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+        QBInvNew = false
+    end
+end
+
+if isStarted(PSInv) then
+    if not checkExportExists(PSInv, "HasItem") then
+        print("^6Bridge^7: ^2Can^7't ^2find new PSInv export^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+        QBInvNew = false
+    end
+end
--- a/version.txt
+++ b/version.txt
@@ -1,12 +1,14 @@
-2.0.15
+2.0.16

- Fix old PSInv/QBInv stashes being wiped when it should be updating them
- Better breakout from opening inventory while crafting
- Unify isInventoryOpen() function to simply check for IsNuiFocused()
- Add clearStash() and doesItemExist() functions for future use
- Add warmenu.lua file for gta scaleform menus (loading is disabled by default)
- Move custom GTA native notify, skillcheck, target to separate files, can be used outside the script
- Complete refactor of framework shared info loading, now only does it once and then shares to scripts
- Added extra checks for ESX loading, should hopefully stop the coreloader line 317 error
+- Fix weapon item caching for ox_inv
+- add checkExportExist() function
+- Start adding a `billPlayer()` function for multi-billing script support
+- Add support for sending mails to npwd_qbx_mail addon
+- Add "support" for CoreM's shop integration
+- Add Auto check for QBInvNew variable for older inventories
+- Add warnings for if theres an error in your shared vehicles, items or jobs file
+- Add full support for JPR-Inventory
+- Changes to crafting menu ui
+- Fixes to setThirst() and setHunger() functions

 https://github.com/jimathy/jim_bridge
Author	SHA1	Message	Date
Jim Shield	b4aa1b3eda	Version Bump `2.0.15 - 2.0.16`	2025-06-16 11:05:46 +01:00
Jim Shield	0f9bab00ef	add openBossmenu() function	2025-06-16 00:10:32 +01:00
Jim Shield	9d8706e8c6	Tidy up setThirst() and setHunger() functions added debug print and fixed non-esx functions setting needs wrong	2025-06-14 22:32:58 +01:00
Jim Shield	6ba1e14888	Change crafting menu slightly to make it more readable	2025-06-14 14:44:16 +01:00
Jim Shield	0454f8c0a9	Add full support for JPR-Inventory Thanks to JPR for providing access to make this possible https://jpresources.tebex.io/package/5284060	2025-06-13 23:25:32 +01:00
Jim Shield	e17d8f2b93	Merge pull request #46 from oosayeroo/main	2025-06-13 18:43:21 +01:00
oosayeroo	b44dfa91e5	Merge branch 'jimathy:main' into main	2025-06-11 18:44:49 +01:00
oosayeroo	51d4c88694	light fix (in case of missing Crafting Var) - added check for missing Config.Crafting variables - reduces errors in scripts if not added to config	2025-06-11 18:43:31 +01:00
Jim Shield	f5f502875e	Comment out a couple debug prints for now	2025-06-11 16:30:51 +01:00
Jim Shield	9c769f4e8e	Update frameworkCache.lua	2025-06-11 16:30:29 +01:00
Jim Shield	87cdd5502e	Change QBInvNew export because i forgor I forgot that it needed to check the client side too for the change, but I set it to check for a server only export got lucky and realised `HasItem` is an export on both client and server	2025-06-10 21:47:12 +01:00
Jim Shield	68d713a8dc	Add warnings for QB if theres an error in shared files If `jim_bridge` attempts to find shared files, and it returns `nil` it will print an error message stating it couldn't find them. So..people can stop blaming me for my script not working when its an error in their vehicles.lua	2025-06-10 18:29:10 +01:00
Jim Shield	dd34f8aab1	Add auto checkers for QBInvNew I had to add a checker for if old qbinv was being used or new qbinv This was made into a variable, but this update makes the script auto set it if it can't find an export. Automating the process	2025-06-10 18:26:57 +01:00
Jim Shield	4a3fb8db4d	Add "support" for CodeM shops This is a tricky one to support They handle their shops inside their script with no way to add one from the outside They give the ability to trigger a shop from outside the script, but not create one This just adds that trigger for now	2025-06-07 19:50:34 +01:00
Jim Shield	59733de08e	support for npwd_qbx_mail addon for sending mail	2025-06-07 19:48:18 +01:00
Jim Shield	2b7a1c2e6d	Start working on billPlayer() function The intention here is to try and add multiple "billing" script functions, so the user can pre-set it for scripts that use `jim_bridge` Currently only handles `jim-payments`	2025-06-07 18:14:53 +01:00
Jim Shield	5db9e88bb9	add function checkExportExists() Workaround function made to detect if new QB Inventory functions are available This can be used in other situations like checking if a script is working correctly or not and the export has been registered	2025-06-07 18:13:06 +01:00
Jim Shield	a5b1f750dd	Fix weapons caching for ox_inv I completely overlooked the fact that when ox_inv shows weapon info, it does it with the upper case version `WEAPON_PISTOL` while my scripts were looking for `weapon_pistol` making my scripts think they didn't exist This fixes that	2025-06-06 19:36:12 +01:00