Version Bump

`2.0.11` - `2.0.12`
People were asking how to remove a print
2026-08-17 05:56:02 +01:00 · 2025-05-18 22:34:08 +01:00 · 2025-05-18 16:32:29 +01:00 · 2025-05-18 16:31:30 +01:00 · 2025-05-17 20:38:21 +01:00 · 2025-05-17 20:23:32 +01:00
16 changed files with 501 additions and 315 deletions
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.06"
+version "2.0.12"
 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/_loaders.lua
+++ b/shared/_loaders.lua
@@ -40,6 +40,7 @@ function onPlayerLoaded(func, onStart)

    if not loaded then
        local tempFunc = function()
+            Wait(2000)
            debugPrint("^6Bridge^7: ^2Executing onPlayerLoaded")
            func()
        end
@@ -49,7 +50,13 @@ function onPlayerLoaded(func, onStart)
            AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
        elseif isStarted(ESXExport) then
            onPlayerFramework = ESXExport
-            AddEventHandler('esx:playerLoaded', tempFunc)
+            AddEventHandler('esx:playerLoaded', function()
+                if waitForSharedLoad() then
+                    if isStarted(ESXExport) then Wait(11000) end
+                    tempFunc()
+                end
+            end
+        )
        elseif isStarted(OXCoreExport) then
            onPlayerFramework = OXCoreExport
            AddEventHandler('ox:playerLoaded', tempFunc)
@@ -99,10 +106,14 @@ end
 --- end, true)
 --- ```
 function onResourceStart(func, thisScript)
-    debugPrint("^6Bridge^7: Registering ^3onResourceStart^7()")
+    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^7()")
    AddEventHandler('onResourceStart', function(resourceName)
        if getScript() == resourceName and (thisScript or true) then
-            func()
+            if waitForSharedLoad() then
+                debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
+                if isStarted(ESXExport) then Wait(10000) end
+                func()
+            end
        end
    end)
 end
@@ -138,9 +149,7 @@ function waitForLogin()
    local loggedIn = false

    if isStarted(ESXExport) then
-        debugPrint("^6Bridge^7: ^3ESX waitForLogin^7() ^2running^7")
        while (GetGameTimer() - startTime) < timeout do
-            while not ESX do Wait(100) end
            local playerData = ESX.GetPlayerData()
            if playerData and playerData.job then
                loggedIn = true
@@ -175,4 +184,26 @@ function waitForLogin()
        debugPrint("^6Bridge^7: ^2Player Login Detected^7.")
        return true
    end
+end
+
+function waitForSharedLoad()
+    local timeout = 100000  -- 10 seconds in milliseconds
+    local startTime = GetGameTimer()
+    local loaded = true
+    while ((not Jobs or not next(Jobs)) and (not Items or not next(Items)) and (not Vehicles or not next(Vehicles))) and (GetGameTimer() - startTime) < timeout do
+        print((GetGameTimer() - startTime) < timeout)
+        Wait(1000)
+        debugPrint("Waiting for Jobs, Items, and Vehicles to be loaded")
+        if Jobs and Items and Vehicles then
+            print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+            loaded = true
+            break
+        end
+    end
+    if not loaded then
+        print("^4Error^7: ^2Timeout reached while waiting for shared load^7.")
+        return false
+    else
+        return true
+    end
 end
--- a/shared/_scriptversioncheck.lua
+++ b/shared/_scriptversioncheck.lua
@@ -30,7 +30,7 @@ local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil)
 print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")

 function CheckVersion()
-    if isServer() then
+    if isServer() and GetResourceMetadata(getScript(), 'author', nil) == "Jimathy" then
        CreateThread(function()
            Wait(4000)

--- a/shared/coreloader.lua
+++ b/shared/coreloader.lua
@@ -9,13 +9,13 @@
 -------------------------------------------------------------
 -- Global Variable Initialization
 -------------------------------------------------------------
-Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
+Items, Vehicles, Jobs, Gangs, Core = {}, nil, nil, nil, nil

 -------------------------------------------------------------
 -- Correct QB Inventory Export
 -------------------------------------------------------------
-- Ensure that the QB inventory export is corrected from 'qb-inventory' to 'ps-inventory' or 'lj-inventory' if needed.
-Exports.QBInv = (isStarted("ps-inventory") and "ps-inventory") or (isStarted("lj-inventory") and "lj-inventory") or Exports.QBInv
+-- Correct ps-invetory to ls-inventory if somehow you still have that
+Exports.PSInv = isStarted("lj-inventory") and "lj-inventory" or Exports.PSInv

 -------------------------------------------------------------
 -- Framework Exports and Inventory Identifiers
@@ -87,6 +87,12 @@ elseif isStarted(QBExport) then
    itemResource = QBExport
    Core = Core or exports[QBExport]:GetCoreObject()
    Items = Core and Core.Shared.Items or nil
+    CreateThread(function()
+        while not Items or not next(Items) do
+            Items = exports[QBExport]:GetCoreObject().Shared.Items
+            Wait(1000)
+        end
+    end)
    if isStarted(QBExport) and not isStarted(QBXExport) then
        RegisterNetEvent('QBCore:Client:UpdateObject', function()
            Core = Core or exports[QBExport]:GetCoreObject()
@@ -96,13 +102,7 @@ elseif isStarted(QBExport) then

 elseif isStarted(ESXExport) then
    itemResource = ESXExport
-    ESX = exports[ESXExport]:getSharedObject()
-    while ESX == nil do
-        print("Waiting for ESX")
-        Wait(0)
-    end
    CreateThread(function()
-        while not ESX do Wait(0) end
        if isServer() then
            Items = ESX.GetItems()
            while not createCallback do Wait(100) end
@@ -140,6 +140,7 @@ end
 -------------------------------------------------------------
 -- Compile vehicles from the detected frameworks into a unified table.
 if isStarted(QBXExport) or isStarted(QBExport) then
+    vehResource = QBExport
    Core = Core or exports[QBExport]:GetCoreObject()
    Vehicles = Core and Core.Shared.Vehicles
    if isStarted(QBExport) and not isStarted(QBXExport) then
@@ -148,26 +149,23 @@ if isStarted(QBXExport) or isStarted(QBExport) then
            Vehicles = Core and Core.Shared.Vehicles
        end)
    end
-    vehResource = QBExport

 elseif isStarted(OXCoreExport) then
+    vehResource = OXCoreExport
    Vehicles = {}
    for k, v in pairs(Ox.GetVehicleData()) do
        Vehicles[k] = { model = k, hash = GetHashKey(k), price = v.price, name = v.name, brand = v.make }
    end
-    vehResource = OXCoreExport

 elseif isStarted(ESXExport) then
+    vehResource = ESXExport
    CreateThread(function()
        if isServer() then
-            vehResource = ESXExport
            createCallback(getScript()..":getVehiclesPrices", function(source)
                return Vehicles
            end)
            while not MySQL do Wait(2000) print("^1Waiting for MySQL to exist") end
            Vehicles = MySQL.query.await('SELECT model, price, name FROM vehicles')
-            --jsonPrint(Vehicles)
-            --while not createCallback do print("waiting") Wait(100) end
        end
        if not isServer() then
            --while not triggerCallback do print("waiting") Wait(100) end
@@ -186,21 +184,19 @@ elseif isStarted(ESXExport) then
    end)

 elseif isStarted(RSGExport) then
+    vehResource = RSGExport
    Core = Core or exports[RSGExport]:GetCoreObject()
    Vehicles = Core and Core.Shared.Vehicles
    RegisterNetEvent('RSGCore:Client:UpdateObject', function()
        Core = Core or exports[RSGExport]:GetCoreObject()
        Vehicles = Core and Core.Shared.Vehicles
    end)
-    vehResource = RSGExport
 end
 if vehResource == nil then
    print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    CreateThread(function()
-        while not Vehicles do Wait(1000) print("Waiting") end
-        debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-    end)
+    while not Vehicles do Wait(1000) end
+    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
 end

 -------------------------------------------------------------
@@ -246,27 +242,54 @@ elseif isStarted(QBExport) then
    end

 elseif isStarted(ESXExport) then
-    ESX = exports[ESXExport]:getSharedObject()
+    jobResource = ESXExport
    if isServer() then
+        -- If server, create callback to get jobs
+        createCallback(getScript()..":getESXJobs", function(source)
+            return Jobs
+        end)
+        -- Populate jobs table with ESX.GetJobs()
        Jobs = ESX.GetJobs()
-        for k, v in pairs(Jobs) do
-            local count = countTable(Jobs[k].grades) - 1
-            Jobs[k].grades[tostring(count)].isBoss = true
+        --jsonPrint(Jobs)
+        --If retreived jobs is empty, wait for ESX to load
+        while countTable(Jobs) == 0 do
+            Jobs = ESX.GetJobs()
+            Wait(100)
        end
+        -- Organise into a table the script can use
+        for Role, Grades in pairs(Jobs) do
+
+            -- Check for "Boss" in name of grades
+            for grade, info in pairs(Grades.grades) do
+                --print(grade)
+                --jsonPrint(info)
+
+                if info.label then
+                    --print(info)
+                    if info.label:find("boss") or info.label:find("Boss") then
+                        --print("Found Boss label for:", Grades.label)
+                        Jobs[Role].grades[grade].isBoss = true
+                        goto continue
+                    end
+                end
+            end
+
+            -- If no roles with "boss" in the name, revert to max grade
+
+            -- Count grades
+            local count = countTable(Grades.grades)
+            Jobs[Role].grades[tostring(count-1)].isBoss = true
+            --print(Grades.label.." Grade: "..count.." is Boss")
+            ::continue::
+        end
+        -- ESX Default doesn't have gangs, so copy jobs to gangs
+        Gangs = Jobs
+    end
+    -- If client side, trigger callback to get jobs
+    if not isServer() then
+        Jobs = triggerCallback(getScript()..":getESXJobs")
        Gangs = Jobs
    end
-    CreateThread(function()
-        while not ESX do Wait(0) end
-        if isServer() then
-            createCallback(getScript()..":getJobs", function(source)
-                return Jobs
-            end)
-        end
-        if not isServer() then
-            Jobs = triggerCallback(getScript()..":getJobs")
-            Gangs = Jobs
-        end
-    end)

 elseif isStarted(RSGExport) then
    jobResource = RSGExport
@@ -281,7 +304,7 @@ end
 if jobResource == nil then
    print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    while not Jobs do Wait(100) end
+    while not Jobs do Wait(1000) end
    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource)
    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
 end
--- a/shared/crafting.lua
+++ b/shared/crafting.lua
@@ -353,8 +353,8 @@ function makeItem(data)
                        Wait(200)
                    end
                    if isInventoryOpen() then
-                        print("^1Error^7: ^2Inventory is open, you tried to break things")
-                        crafted, crafting = false, false
+                        --print("^1Error^7: ^2Inventory is open, you tried to break things")
+                        crafted, crafting, CraftLock = false, false, false
                        return
                    end
                    if crafted then
@@ -368,8 +368,9 @@ function makeItem(data)
                            PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
                        end
                        if isInventoryOpen() then
-                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            --print("^1Error^7: ^2Inventory is open, you tried to break things")
                            crafted, crafting = false, false
+                            crafted, crafting, CraftLock = false, false, false
                            return
                        end
                        if crafting and progressBar({
@@ -462,7 +463,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
                stashItems = getStash(name)
                for k, v in pairs(craftable[ItemMake] or {}) do
                    for _, b in pairs(stashItems or {}) do
-                        if k == b.name then itemRemove[k] = v end
+                        if k == b.name then
+                            itemRemove[k] = v
+                        end
                    end
                end
            end
@@ -470,7 +473,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
            stashItems = getStash(stashName)
            for k, v in pairs(craftable[ItemMake] or {}) do
                for _, b in pairs(stashItems or {}) do
-                    if k == b.name then itemRemove[k] = v end
+                    if k == b.name then
+                        itemRemove[k] = v
+                    end
                end
            end
        end
--- a/shared/helpers.lua
+++ b/shared/helpers.lua
@@ -21,6 +21,10 @@
 --- end
 --- ```
 function isStarted(script)
+    if not script then
+        print("^1Error^7: ^1Tried to check if ^3nil^2 was started^7, ^1returning ^4false^7")
+        return false
+    end
    return GetResourceState(script):find("start") ~= nil
 end

@@ -258,7 +262,7 @@ end
 --- ```
 function countTable(tbl)
    local i = 0
-    for _ in pairs(tbl) do i = i + 1 end
+    for _ in pairs(tbl) do i += 1 end
    return i
 end

--- a/shared/inventories.lua
+++ b/shared/inventories.lua
@@ -50,8 +50,9 @@ function hasItem(items, amount, src)

            local count = 0
            for _, itemData in pairs(grabInv) do
+                jsonPrint(itemData)
                if itemData and itemData.name == item then
-                    count += (itemData.count or itemData.amount or 1)
+                    count += (itemData.amount or itemData.count or 1)
                end
            end
            foundInv = foundInv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
@@ -67,6 +68,9 @@ function hasItem(items, amount, src)
        end
        return true, hasTable
    end
+    -- if can't find inventory, return false
+    print("^1Error^7: ^1Can't find players inventory for some reason")
+    return false, {}
 end

 --- Retrieves a player's inventory based on the active inventory system.
@@ -171,7 +175,6 @@ function getPlayerInv(src)
    return grabInv, foundInv
 end

-
 function isInventoryOpen()
    if isStarted(OXInv) then
        return LocalPlayer.state.invBusy
@@ -206,4 +209,55 @@ function isInventoryOpen()
        return LocalPlayer.state.inv_busy

    end
+end
+
+-------------------------------------------------------------
+-- Item Image Retrieval
+-------------------------------------------------------------
+
+--- Retrieves the NUI link for an item's image from the active inventory system.
+---
+--- @param item string The item name.
+--- @return string string A `nui://` link to the item's image, or an empty string if not found.
+---
+--- @usage
+--- ```lua
+--- local imageLink = invImg("health_potion")
+--- if imageLink ~= "" then print(imageLink) end
+--- ```
+function invImg(item)
+    local imgLink = ""
+    if item ~= "" and Items[item] then
+        if isStarted(OXInv) then
+            imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
+
+        elseif isStarted(QSInv) then
+            imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
+
+        elseif isStarted(CoreInv) then
+            imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
+
+        elseif isStarted(CodeMInv) then
+            imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
+
+        elseif isStarted(OrigenInv) then
+            imgLink = "nui://"..OrigenInv.."/html/img/"..(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 "")
+
+        elseif isStarted(RSGInv) then
+            imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
+
+        else
+            print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
+        end
+    end
+    return imgLink
 end
--- a/shared/itemcontrol.lua
+++ b/shared/itemcontrol.lua
@@ -52,53 +52,6 @@ function createUseableItem(item, funct)
    end
 end

-------------------------------------------------------------
-- Item Image Retrieval
-------------------------------------------------------------
-
--- Retrieves the NUI link for an item's image from the active inventory system.
---
--- @param item string The item name.
--- @return string string A `nui://` link to the item's image, or an empty string if not found.
---
--- @usage
--- ```lua
--- local imageLink = invImg("health_potion")
--- if imageLink ~= "" then print(imageLink) end
--- ```
-function invImg(item)
-    local imgLink = ""
-    if item ~= "" and Items[item] then
-        if isStarted(OXInv) then
-            imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
-
-        elseif isStarted(QSInv) then
-            imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
-
-        elseif isStarted(CoreInv) then
-            imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
-
-        elseif isStarted(CodeMInv) then
-            imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
-
-        elseif isStarted(OrigenInv) then
-            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
-
-        elseif isStarted(QBInv) then
-            imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
-
-        elseif isStarted(TgiannInv) then
-            imgLink = "nui://inventory_images/images/"..(Items[item].image or "")
-
-        elseif isStarted(RSGInv) then
-            imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
-
-        else
-            print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
-        end
-    end
-    return imgLink
-end

 -------------------------------------------------------------
 -- Adding and Removing Items
@@ -209,25 +162,32 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
            dupeWarn(src, item, amount)

        else
-            if isStarted(OXInv) then invName = OXInv
+            if isStarted(OXInv) then
+                invName = OXInv
                exports[OXInv]:RemoveItem(src, item, remamount, nil)

-            elseif isStarted(QSInv) then invName = QSInv
+            elseif isStarted(QSInv) then
+                invName = QSInv
                exports[QSInv]:RemoveItem(src, item, remamount)

-            elseif isStarted(CoreInv) then invName = CoreInv
+            elseif isStarted(CoreInv) then
+                invName = CoreInv
                exports[CoreInv]:removeItem(src, item, remamount)

-            elseif isStarted(OrigenInv) then invName = OrigenInv
+            elseif isStarted(OrigenInv) then
+                invName = OrigenInv
                exports[OrigenInv]:removeItem(src, item, remamount)

-            elseif isStarted(CodeMInv) then invName = CodeMInv
+            elseif isStarted(CodeMInv) then
+                invName = CodeMInv
                exports[CodeMInv]:RemoveItem(src, item, remamount)

-            elseif isStarted(TgiannInv) then invName = TgiannInv
+            elseif isStarted(TgiannInv) then
+                invName = TgiannInv
                exports[TgiannInv]:RemoveItem(src, item, remamount)

-            elseif isStarted(QBInv) then invName = QBInv
+            elseif isStarted(QBInv) then
+                invName = QBInv
                while remamount > 0 do
                    if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
                        remamount -= 1
@@ -239,7 +199,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                if Config.Crafting.showItemBox then
                    TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
                end
-            elseif isStarted(PSInv) then invName = PSInv
+
+            elseif isStarted(PSInv) then
+                invName = PSInv
                while remamount > 0 do
                    if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
                        remamount -= 1
@@ -290,6 +252,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
    else
        local amountToAdd = amount or 1
        if isStarted(OXInv) then invName = OXInv
+            jsonPrint(info)
            exports[OXInv]:AddItem(src, item, amountToAdd, info, slot)

        elseif isStarted(QSInv) then invName = QSInv
@@ -312,17 +275,18 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
            end

+        elseif isStarted(PSInv) then invName = PSInv
+            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
+                if Config.Crafting.showItemBox then
+                    TriggerClientEvent("ps-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
+                end
+            end
+
        elseif isStarted(RSGInv) then invName = RSGInv
            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
                TriggerClientEvent("rsg-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
            end

-        elseif isStarted(PSInv) then invName = PSInv
-            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
-                if Config.Crafting.showItemBox then
-                    TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
-                end
-            end
        end

        if invName == "" then
@@ -663,8 +627,25 @@ function canCarry(itemTable, src)
            end

        elseif isStarted(QBInv) then
-            for k, v in pairs(itemTable) do
-                resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
+            if QBInvNew then
+                for k, v in pairs(itemTable) do
+                    resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
+                end
+            else
+                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 and not Player.Offline then
+                        resultTable[k] = true
+                    else
+                        resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight
+                    end
+                end
            end

        elseif isStarted(PSInv) then
--- a/shared/jobfunctions.lua
+++ b/shared/jobfunctions.lua
@@ -46,7 +46,7 @@ function makeBossRoles(role)
    local data = (Jobs and Jobs[role]) or (Gangs and Gangs[role])
    if data then
        for grade, info in pairs(data.grades) do
-            if info.isboss or info.bankAuth then
+            if info.isboss or info.bankAuth or info.isBoss then
                boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
            end
        end
--- a/shared/make/makeProp.lua
+++ b/shared/make/makeProp.lua
@@ -23,7 +23,7 @@ local Props = {}
 function makeProp(data, freeze, synced)
    loadModel(data.prop)
    local prop = CreateObject(data.prop, data.coords.x, data.coords.y, data.coords.z-1.03, synced and synced or false, synced and synced or false, false)
-    SetEntityHeading(prop, data.coords.w + 180.0)
+    SetEntityHeading(prop, (data.coords.w or 0) + 180.0)
    FreezeEntityPosition(prop, freeze or false)

    debugPrint("^6Bridge^7: ^1Prop ^2Created^7: '^6"..prop.."^7' | ^2Hash^7: ^7'^6"..data.prop.."^7' | ^2Coord^7: "..formatCoord(data.coords))
--- a/shared/playerfunctions.lua
+++ b/shared/playerfunctions.lua
@@ -301,17 +301,17 @@ function ConsumeSuccess(itemName, type, data)

    if isStarted(ESXExport) then
        if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", hunger * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
        end
        if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", thirst * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
        end
    else
        if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + hunger)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
        end
        if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + thirst)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
        end
    end

@@ -325,7 +325,9 @@ function ConsumeSuccess(itemName, type, data)
        end
    end

-    getRandomReward(itemName)
+    if Config.Reward then
+        getRandomReward(itemName)
+    end
 end

 -------------------------------------------------------------
--- a/shared/shops.lua
+++ b/shared/shops.lua
@@ -30,15 +30,17 @@ function sellMenu(data)
        for k, v in pairs(data.sellTable.Items) do itemList[k] = 1 end
        local _, hasTable = hasItem(itemList)
        for k, v in pairsByKeys(data.sellTable.Items) do
-            Menu[#Menu + 1] = {
-                isMenuHeader = not hasTable[k].hasItem,
-                icon = invImg(k),
-                header = Items[k].label..(hasTable[k].hasItem and "💰 (x"..hasTable[k].count..")" or ""),
-                txt = Loc[Config.Lan].info["sell_all"]..v.." "..Loc[Config.Lan].info["sell_each"],
-                onSelect = function()
-                    sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end })
-                end,
-            }
+            if Items[k] then
+                Menu[#Menu + 1] = {
+                    isMenuHeader = not hasTable[k].hasItem,
+                    icon = invImg(k),
+                    header = Items[k].label..(hasTable[k].hasItem and "💰 (x"..hasTable[k].count..")" or ""),
+                    txt = Loc[Config.Lan].info["sell_all"]..v.." "..Loc[Config.Lan].info["sell_each"],
+                    onSelect = function()
+                        sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end })
+                    end,
+                }
+            end
        end
    else
        for k, v in pairsByKeys(data.sellTable) do
@@ -48,7 +50,9 @@ function sellMenu(data)
                    header = k,
                    txt = "Amount of items: "..countTable(v.Items),
                    onSelect = function()
-                        v.onBack = function() sellMenu(origData) end
+                        v.onBack = function()
+                            sellMenu(origData)
+                        end
                        v.sellTable = data.sellTable[k]
                        sellMenu(v)
                    end,
@@ -57,8 +61,8 @@ function sellMenu(data)
        end
    end
    openMenu(Menu, {
-        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items),
-        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items) or "",
+        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
+        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
        canClose = true,
        onBack = data.onBack,
    })
@@ -105,12 +109,14 @@ function sellAnim(data)
    TriggerServerEvent(getScript().."Sellitems", data)
    lookEnt(data.ped)
    local dict = "mp_common"
-    playAnim(dict, "givetake2_a", 0.3, 2)
-    playAnim(dict, "givetake2_b", 0.3, 2, data.ped)
+    playAnim(dict, "givetake2_a", 0.3, 48)
+    playAnim(dict, "givetake2_b", 0.3, 48, data.ped)
    Wait(2000)
    StopAnimTask(PlayerPedId(), dict, "givetake2_a", 0.5)
    StopAnimTask(data.ped, dict, "givetake2_b", 0.5)
-    if data.onBack then data.onBack() end
+    if data.onBack then
+        data.onBack()
+    end
 end

 --- Server event handler for processing item sales.
@@ -161,31 +167,41 @@ function openShop(data)
        TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)

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

    elseif isStarted(QBInv) then
        if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenShopNewQB', data.shop)
+            TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
+        else
+            TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
+        end
+
+    elseif isStarted(PSInv) then
+        if QBInvNew then
+            TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
        else
            TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
        end

    elseif isStarted(RSGInv) then
-        TriggerServerEvent(getScript()..':server:OpenShopRSG', data.shop)
+        TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
    end
    lookEnt(data.coords)
 end

-RegisterNetEvent(getScript()..':server:OpenShopNewQB', function(data)
-    exports[QBInv]:OpenShop(source, data)
-end)
-
-RegisterNetEvent(getScript()..':server:OpenShopTgiann', function(data)
-    exports[TgiannInv]:OpenShop(source, data)
-end)
-
-RegisterNetEvent(getScript()..':server:OpenShopRSG', function(data)
-    exports[RSGInv]:OpenShop(source, data)
+RegisterNetEvent(getScript()..':server:openServerShop', function(data)
+    if isStarted(QBInv) then
+        exports[QBInv]:OpenShop(source, data)
+    end
+    if isStarted(PSInv) then
+        exports[PSInv]:OpenShop(source, data)
+    end
+    if isStarted(TgiannInv) then
+        exports[TgiannInv]:OpenShop(source, data)
+    end
+    if isStarted(RSGInv) then
+        exports[RSGInv]:OpenShop(source, data)
+    end
 end)

 --- Registers a shop with the active inventory system.
@@ -222,6 +238,16 @@ function registerShop(name, label, items, society)
            society = society,
        })

+    elseif isStarted(PSInv) and QBInvNew then
+        debugPrint("^6Bridge^7: ^2Registering ^3PS ^2Store^7:", name, label)
+        exports[PSInv]:CreateShop({
+            name = name,
+            label = label,
+            slots = #items,
+            items = items,
+            society = society,
+        })
+
    elseif isStarted(RSGInv) then
        debugPrint("^6Bridge^7: ^2Registering ^3RSG ^2Store^7:", name, label)
        exports[RSGInv]:CreateShop({
--- a/shared/stashcontrol.lua
+++ b/shared/stashcontrol.lua
@@ -59,7 +59,7 @@ function GetStashTimeout(stashName, stop)
    -- If timeout has expired, update the stash items from the server.
    if stashCache[stashName].timeout <= 0 then
        stashCache[stashName].items = triggerCallback(getScript()..':server:GetStashItems', stashName)
-        stashCache[stashName].timeout = 15000  -- Timeout in milliseconds.
+        stashCache[stashName].timeout = 10000  -- Timeout in milliseconds.
        CreateThread(function()
            while stashCache[stashName] and stashCache[stashName].timeout > 0 do
                stashCache[stashName].timeout -= 1000
@@ -144,7 +144,7 @@ function openStash(data)
        exports[OrigenInv]:openInventory('stash', data.stash, { label = data.label })

    elseif isStarted(TgiannInv) then
-        TriggerServerEvent(getScript()..':server:OpenStashTgiann', {
+        TriggerServerEvent(getScript()..':server:openServerStash', {
            stashName = data.stash,
            label = data.label,
            maxweight = data.maxWeight or 600000,
@@ -153,7 +153,7 @@ function openStash(data)

    elseif isStarted(QBInv) then
        if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenStashQB', {
+            TriggerServerEvent(getScript()..':server:openServerStash', {
                stashName = data.stash,
                label = data.label,
                maxweight = data.maxWeight or 600000,
@@ -161,11 +161,30 @@ function openStash(data)
            })
        else
            TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
+        end
+
+    elseif isStarted(PSInv) 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(RSGInv) then
-        TriggerServerEvent(getScript()..':server:OpenStashRSG', {
+        TriggerServerEvent(getScript()..':server:openServerStash', {
            stashName = data.stash,
            label = data.label,
            maxweight = data.maxWeight or 600000,
@@ -175,22 +194,32 @@ function openStash(data)
    else
        --Fallback to these commands
        TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
    end

    lookEnt(data.coords)
 end

-RegisterNetEvent(getScript()..':server:OpenStashTgiann', function(data)
-    exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data)
-end)

-RegisterNetEvent(getScript()..':server:OpenStashQB', function(data)
-    exports[QBInv]:OpenInventory(source, data.stashName, data)
-end)
-
-RegisterNetEvent(getScript()..':server:OpenStashRSG', function(data)
-    exports[RSGInv]:OpenInventory(source, data.stashName, data)
+-- Wrapper function for opening stash from the server.
+-- Messy but not much else I can do about it.
+RegisterNetEvent(getScript()..":server:openServerStash", function(data)
+    local src = source
+    if isStarted(TgiannInv) then
+        exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data)
+    end
+    if isStarted(QBInv) then
+        exports[QBInv]:OpenInventory(source, data.stashName, data)
+    end
+    if isStarted(PSInv) then
+        exports[PSInv]:OpenInventory(source, data.stashName, data)
+    end
+    if isStarted(RSGInv) then
+        exports[RSGInv]:OpenInventory(source, data.stashName, data)
+    end
 end)


@@ -250,8 +279,13 @@ function getStash(stashName)

    elseif isStarted(QBInv) then
        stashResource = QBInv
-        local result = MySQL.scalar.await("SELECT items FROM "..(QBInvNew and "inventories" or "stashitem").." WHERE identifier = ?", { stashName })
-        if result then stashItems = json.decode(result) end
+        if QBInvNew then
+            local result = exports[QBInv]:GetInventory(stashName) or {}
+            stashItems = result.items or {}
+        else
+            local result = MySQL.scalar.await("SELECT items FROM stashitems WHERE stash = ?", { stashName })
+            if result then stashItems = json.decode(result) end
+        end

    elseif isStarted(RSGInv) then
        stashResource = RSGInv
@@ -307,34 +341,22 @@ function stashRemoveItem(stashItems, stashName, items)
    if type(stashName) ~= "table" then
        stashName = { stashName }
    end
+
    if isStarted(OXInv) then
        for k, v in pairs(items) do
-            if type(stashName) == "table" then
-                for _, name in pairs(stashName) do
-                    local success = exports[OXInv]:RemoveItem(name, k, v)
-                    if success then
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
-                        break
-                    end
+            for _, name in pairs(stashName) do
+                local success = exports[OXInv]:RemoveItem(name, k, v)
+                if success then
+                    debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
+                    break
                end
-            else
-                exports[OXInv]:RemoveItem(stashName, k, v)
            end
        end

    elseif isStarted(QSInv) then
        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 ^7"..QBInv, k, v)
-                        exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v, l)
-                    end
-                end
-            end
+            exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v)
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
        end

    elseif isStarted(CoreInv) then
@@ -368,42 +390,17 @@ function stashRemoveItem(stashItems, stashName, items)

    elseif isStarted(TgiannInv) then
        for k, v in pairs(items) do
-            local itemData = exports["tgiann-inventory"]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
+            local itemData = exports[TgiannInv]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
            exports[TgiannInv]:RemoveItemFromSecondaryInventory("stash", stashName[1], k, v, itemData.slot, nil)
            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
        end

-    elseif isStarted(PSInv) then
-        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 ^7"..QBInv, k, v)
-                        stashItems[l].amount -= v
-                    end
-                end
-            end
-        end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
-        MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName,
-            ['items'] = json.encode(stashItems)
-        })
-
    elseif isStarted(QBInv) then
        if QBInvNew then
            for k, v in pairs(items) do
                exports[QBInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
                debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
            end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-            MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName[1],
-                ['items'] = json.encode(stashItems)
-            })
        else
            for k, v in pairs(items) do
                for l in pairs(stashItems) do
@@ -418,23 +415,38 @@ function stashRemoveItem(stashItems, stashName, items)
                    end
                end
            end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName.."^7'")
+            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^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,
+                ['stash'] = stashName[1],
                ['items'] = json.encode(stashItems)
            })
        end

+    elseif isStarted(PSInv) then
+        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 ^7"..PSInv, k, v)
+                        stashItems[l].amount -= v
+                    end
+                end
+            end
+        end
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3PS^2 stash ^7'^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(RSGInv) then
        for k, v in pairs(items) do
            exports[RSGInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..RSGInv, k, v)
        end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-        MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName[1],
-            ['items'] = json.encode(stashItems)
-        })
    else
        print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
    end
@@ -490,3 +502,90 @@ function stashhasItem(stashItems, items, amount)

    return true, hasTable
 end
+
+
+--- Registers a stash with the active inventory system.
+--- Supports either OXInv or QSInv.
+---
+--- @param name string Unique stash identifier.
+--- @param label string Display name for the stash.
+--- @param slots number|nil (Optional) Number of slots (default 50).
+--- @param weight number|nil (Optional) Maximum weight (default 4000000).
+--- @param owner string|nil (Optional) Owner identifier for personal stashes.
+--- @param coords table|nil (Optional) Coordinates for the stash location.
+--- @usage
+--- ```lua
+--- registerStash(
+---     "playerStash",
+---     "Player Stash",
+---     100,
+---     8000000,
+---     "player123",
+---     { x = 100.0, y = 200.0, z = 30.0 }
+--- )
+--- ```
+function registerStash(name, label, slots, weight, owner, coords)
+    if isStarted(OXInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Stash^7:", name, label, owner or nil)
+        exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
+
+    elseif isStarted(QSInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3QS ^2Stash^7:", name, label)
+        exports[QSInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
+
+    --elseif isStarted(CoreInv) then
+    --    debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
+    --    exports[CoreInv]:openHolder(nil, name, 'stash', nil, nil, false, nil)
+
+    elseif isStarted(OrigenInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
+        exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
+
+    elseif isStarted(TgiannInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3TgiannInv ^2Stash^7:", name, label)
+        exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
+
+    end
+end
+
+if isServer() then
+    --- Registers an event to create an OX stash from the server.
+    --- When triggered, it calls registerStash with the provided parameters.
+    ---
+    --- @event server:makeOXStash
+    --- @param name string Unique stash identifier.
+    --- @param label string Display name for the stash.
+    --- @param slots number|nil (Optional) Number of slots.
+    --- @param weight number|nil (Optional) Maximum weight.
+    --- @param owner string|nil (Optional) Owner identifier.
+    --- @param coords table|nil (Optional) Stash coordinates.
+    --- @usage
+    --- ```lua
+    --- TriggerEvent(getScript()..":server:makeOXStash", name, label, slots, weight, owner, coords, token)
+    --- ```
+    RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords, token)
+        local src = source or nil
+        if src then
+            if not checkToken(src, token, "stash", name) then
+                return
+            end
+        end
+
+        registerStash(name, label, slots, weight, owner, coords)
+    end)
+end
+
+RegisterNetEvent(getScript()..":openGrabBox", function(data)
+	if isStarted(OXInv) then
+		return
+	end
+	local id = ""
+	if data.metadata then
+		id = data.metadata.id
+	elseif data.info then
+		id = data.info.id
+	end
+	openStash({
+		stash = id,
+	})
+end)
--- a/shared/wrapperfunctions.lua
+++ b/shared/wrapperfunctions.lua
@@ -41,75 +41,4 @@ function registerCommand(command, options)
        end, false, { help = options[1] })

    end
-end
-
--- Registers a stash with the active inventory system.
--- Supports either OXInv or QSInv.
---
--- @param name string Unique stash identifier.
--- @param label string Display name for the stash.
--- @param slots number|nil (Optional) Number of slots (default 50).
--- @param weight number|nil (Optional) Maximum weight (default 4000000).
--- @param owner string|nil (Optional) Owner identifier for personal stashes.
--- @param coords table|nil (Optional) Coordinates for the stash location.
--- @usage
--- ```lua
--- registerStash(
---     "playerStash",
---     "Player Stash",
---     100,
---     8000000,
---     "player123",
---     { x = 100.0, y = 200.0, z = 30.0 }
--- )
--- ```
-function registerStash(name, label, slots, weight, owner, coords)
-    if isStarted(OXInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Stash^7:", name, label, owner or nil)
-        exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
-
-    elseif isStarted(QSInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3QS ^2Stash^7:", name, label)
-        exports[QSInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
-
-    --elseif isStarted(CoreInv) then
-    --    debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
-    --    exports[CoreInv]:openHolder(nil, name, 'stash', nil, nil, false, nil)
-
-    elseif isStarted(OrigenInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
-        exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
-
-    elseif isStarted(TgiannInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3TgiannInv ^2Stash^7:", name, label)
-        exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
-
-    end
-end
-
-if isServer() then
-    --- Registers an event to create an OX stash from the server.
-    --- When triggered, it calls registerStash with the provided parameters.
-    ---
-    --- @event server:makeOXStash
-    --- @param name string Unique stash identifier.
-    --- @param label string Display name for the stash.
-    --- @param slots number|nil (Optional) Number of slots.
-    --- @param weight number|nil (Optional) Maximum weight.
-    --- @param owner string|nil (Optional) Owner identifier.
-    --- @param coords table|nil (Optional) Stash coordinates.
-    --- @usage
-    --- ```lua
-    --- TriggerEvent(getScript()..":server:makeOXStash", name, label, slots, weight, owner, coords, token)
-    --- ```
-    RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords, token)
-        local src = source or nil
-        if src then
-            if not checkToken(src, token, "stash", name) then
-                return
-            end
-        end
-
-        registerStash(name, label, slots, weight, owner, coords)
-    end)
-end
+end
--- a/starter.lua
+++ b/starter.lua
@@ -47,38 +47,70 @@ if Config and Config.System then
    end

    Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
-    Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify)
-    Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar)
-    Config.System.drawText = GetConvar("jim_drawTextScript", Config.System.drawText)
-    Config.System.skillCheck = GetConvar("jim_skillCheckScript", Config.System.skillCheck)
+    Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
+    Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
+    Config.System.drawText = GetConvar("jim_drawTextScript", Config.System.drawText or "gta")
+    Config.System.skillCheck = GetConvar("jim_skillCheckScript", Config.System.skillCheck or "gta")

    if GetConvar("jim_dontUseTarget", "false") == "true" then
        Config.System.DontUseTarget = true
    end
 end

-- Testing loading the core files here instead of in fxmanifests
-- Forcefully loads the files and quietly, compared to fxmanifest complaining if they don't exist
-- This may be better button would require more refinement maybe
--[[
-for k, v in pairs({ -- This is a specific load order
-    [Exports.OXLibExport] = "init.lua",
-    [Exports.OXCoreExport] = "lib/init.lua",
-    [Exports.ESXExport] = "imports.lua",
-    [Exports.QBXExport] = "modules/playerdata.lua",
-}) do
-    if GetResourceState(k) == "started" then
-        print("^5Loading^7: '"..k.."/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
-        local fileLoader = assert(load(LoadResourceFile(k, (v)), ('@@'..k..'/'..v)))
-        fileLoader()
-        print("^2Success^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
+-- Load the core files here instead of in fxmanifests
+-- Forcefully loads the files and quietly, compared to fxmanifest complaining if they don't exist when you don't need them all
+local filesToLoad = {
+    Shared = {
+        [Exports.OXLibExport] = { "init.lua" },
+        [Exports.OXCoreExport] = { "lib/init.lua" },
+        [Exports.ESXExport] = { "imports.lua" },
+        [Exports.QBXExport] = { "modules/playerdata.lua" },
+    },
+    Client = {
+        ["PolyZone"] = { "client.lua", "BoxZone.lua", "EntityZone.lua", "CircleZone.lua", "ComboZone.lua" },
+        ["warmenu"] = { "warmenu.lua", },
+    },
+}
+
+-- Shared framework file loader
+for Type, ScriptTable in pairs(filesToLoad) do
+    if Type == "Client" and IsDuplicityVersion() then
+        goto continue
    else
-        if debugMode then
-            print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
+        for scriptName, files in pairs(ScriptTable) do
+            local state = GetResourceState(scriptName)
+            -- if the resource is started, load the file
+            if state == "started" then
+                -- Force items into a table if they are not
+                if type(files) == "string" then
+                    files = { files }
+                end
+                for _, file in pairs(files) do
+                    --print("^5CoreLoader^7: '"..scriptName.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+                    local fileLoader = assert(load(LoadResourceFile(scriptName, (file)), ('@@'..scriptName..'/'..file)))
+                    fileLoader()
+                    if debugMode then
+                        print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    end
+                end
+            end
+
+            -- if script is in server, but not started warn the user
+            if state == "uninitialized" or state == "stopped" then
+                print("^5CoreLoader^7: ^3"..scriptName.." ^1 found but it wasn't started^7.")
+                print("^1Check your ^3server^7.^3cfg ^1load order^7")
+            end
+
+            -- debugging only, if the script is missing, warn the user
+            if state == "missing" then
+                if debugMode then
+                    print("^5CoreLoader^7: ^3"..scriptName.." ^2not found^7, ^2skipping")
+                end
+            end
        end
    end
+    ::continue::
 end
-]]

 -- Load files here into the invoking script
 for _, v in pairs({ -- This is a specific load order
@@ -88,7 +120,7 @@ for _, v in pairs({ -- This is a specific load order

    '_eventDebug.lua',
    'callback.lua',
-    'coreloader.lua',   -- needs to be second to load all core related stuff before everything else
+    'coreloader.lua',

    'duifunctions.lua',

--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.06
+2.0.12
Author	SHA1	Message	Date
Jim Shield	4d04682b33	Version Bump `2.0.11` - `2.0.12`	2025-05-18 22:34:08 +01:00
Jim Shield	cb38d275d1	People were asking how to remove a print I kept getting people asking how to remove prints because it "was filling up their f8 menu and looked like errors" So I've made the "success" coreloader prints to be debugmode only.	2025-05-18 16:32:29 +01:00
Jim Shield	84cfe1c97d	Fix stash stash opening for some inventories Mainly older inventories may have had issues with custom stash sizes when opening them This should fix compatibility with changing slots and max weight with them on trigger	2025-05-18 16:31:30 +01:00
Jim Shield	47b01df621	Remove coords from openGrabBox	2025-05-17 20:38:21 +01:00
Jim Shield	7e073b16ec	Update starter.lua	2025-05-17 20:23:32 +01:00
Jim Shield	ab4298fa2d	Change coreloader prints to a `debugPrint`	2025-05-17 19:19:15 +01:00
Jim Shield	7997ea45b7	change "Shared Load Detected" to a `debugPrint`	2025-05-17 19:16:24 +01:00
Jim Shield	7aa9d90d0d	Improve ESX Job cache builder When collecting Jobs from the server it tries it's best to determine which role is the "Boss" It checks first of the Job Grade label containing the word "Boss" If it can't find it, it then uses the highest number grade and adds `.isBoss = true` to it	2025-05-17 16:48:23 +01:00
Jim Shield	520758b355	Version Bump `2.0.10` - `2.0.11`	2025-05-15 20:20:47 +01:00
Jim Shield	e4e9ef0fb2	add openGrabBox event for items like `murderbag`	2025-05-15 20:02:39 +01:00
Jim Shield	ada724069b	Revert qs-inv server inv grab Found the real issue that was causing the scripts to not think you had items, basically reverting this change as i didn't like having it in the first place	2025-05-15 19:59:51 +01:00
Jim Shield	9198068a19	Adjust `hasItem` function for QS-Inv Apparently qs-inv reports two variables on the item data for how you have `count` and `amount` while other inventories appear to only have one of those I'm assuming for compatibility sake Apparently the `count` is updated differently, and `hasItem()` was checking for this first I've swapped round the checks and appears to work better	2025-05-15 19:55:14 +01:00
Jim Shield	263d5160aa	Add delay for checking for inventory items on qb Custom inventories apparently load items separately/later into qbshared so the script starts thinking there is definitely 0 items but its checking too early, this forces it to wait until its available to continue	2025-05-15 15:31:41 +01:00
Jim Shield	65137207ae	add fallback for hasItem if no inventory is found	2025-05-14 23:38:34 +01:00
Jim Shield	3bd9935346	Skip item for sellmenu if item isn't in shared Adds an item check before creating the sellmenu as to avoid errors	2025-05-14 23:36:46 +01:00
Jim Shield	23e2488cd1	fix typo for qs-inv callback for inventory	2025-05-14 16:09:02 +01:00
Jim Shield	e9bbdd4ce0	Version Bump `2.0.09` - `2.0.10`	2025-05-13 22:02:37 +01:00
Jim Shield	f5a7ec9291	fix inventory exploit trigger blocking crafting The inventory exploit check when crafting never released crafting so you couldn't craft again until reconnecting or script restart	2025-05-13 21:57:19 +01:00
Jim Shield	d80ea38a39	Fix sell menu throwing errors on openning It was checking the wrong table name for amounts and getting `nil`	2025-05-13 21:56:18 +01:00
Jim Shield	e64912622b	Testing a fix with QS-INV item checks So..from what I can gather, QS-Inv doesn't seem to be updating the client cache of the players inventory correctly This is all speculation, I can't check this myself When `hasItem()` is used, its essentially reading from the client's cache. This seemingly is only updated when there is a new item in a slot, not when the amount of an item in that slot changes The only way to circumvent this is a workaround to the players inventory from the server side using a callback. This is painful to do because it can increase server load when checking multiples of items	2025-05-13 17:57:27 +01:00
Jim Shield	04b25e2c06	create `waitForSharedLoad()` function This my attempt to aid ESX loading, essentially my scripts server side now need to be locked behind `onResourceStart()` because of ESX Loading ESX into my scripts was delaying half of it and breaking the other half This function forcibly waits until everythings loaded and then continues This shouldn't affect other frameworks loading ability My tests so far have been a success with it	2025-05-12 22:59:31 +01:00
Jim Shield	51473bf0b8	Version Bump `2.0.08` - `2.0.09`	2025-05-12 13:52:14 +01:00
Jim Shield	921b973f81	Try and fix ESX loading So information and request for help. The issue here is that my scripts require Job and Vehicle information when the script starts, to do a debug check if the job exists for the location. ESX doesn't share this with the client for some reason, so this requires me to request it from the server side at script ensure. This is causing issues because it delays loading of the rest of `jim_bridge` while it slowly requests `ESX.GetJobs()` table from server side This is delayed even more when the script is placed towards the top of the server load order and it needs to load other things like MLO's As its trying to load this the rest of the script carries on loading with missing information. So it loads the script thinking there are 0 jobs and breaks it. If anyone knows of a better way of doing this then please help. The only partial solution is to start my scripts last in the server load order	2025-05-12 13:51:32 +01:00
Jim Shield	42d08ccf4c	Tidy up the stashRemoveItem function	2025-05-12 13:44:37 +01:00
Jim Shield	68412d8006	Enforce numbers when changing stats if the value ends up being `nil` this should force it to 0 Also added a check for if it can actually give `randomReward` before trying to	2025-05-11 14:16:02 +01:00
Jim Shield	4c89ec3190	Version Bump `2.0.07` - `2.0.08`	2025-05-10 19:55:51 +01:00
Jim Shield	b2fa1ef247	Update starter.lua Updated and putting into use the core file loader function in starter.lua	2025-05-10 19:54:31 +01:00
Jim Shield	9872c77591	Only allow script version checks for my scripts Added a check to version check for if "Jimathy" is the author, this then stops it and doesn't check for the versions on my github repositories	2025-05-10 19:20:47 +01:00
Jim Shield	7ecb2f18e9	Refactor ESX Core loading I realised I was loading ESX the stupidest way I think I was loading ESX object, then instantly clearing it and then used workarounds to try and reload it (thinking is hard ok) It should now load correctly and faster also I realised my custom `onPlayerLoaded()` function was loading too fast, so I've added a delay to it but removed the while loops for esx checks that could potentially break the script	2025-05-07 23:01:29 +01:00
Jim Shield	d0c09f3e00	switch old ps-inv stash call back to old event older ps didn't call `ps-inventory` for stash, just `inventory`	2025-05-07 21:12:38 +01:00
Jim Shield	c1e38a93bd	Version Bump `2.0.06` - `2.0.07`	2025-05-07 16:42:00 +01:00
Jim Shield	6a3041524a	Re-add old qb-inv support for `canCarry()` When updating to use the new export for qb-inv, I accidently removed the old functions, this readds them and fixes support for it	2025-05-07 16:38:57 +01:00
Jim Shield	f069db5c61	Update QBInv stash retrieval Now uses GetInventory to grab the stash from its cache instead of directly from database Also fixes old qb inv support for stash retrieval	2025-05-07 16:36:18 +01:00
Jim Shield	3b768d5c7d	update isStarted() fuction Add fallback for if somehow the script name being checked was sent as `nil`, if `nil` it returns false	2025-05-07 13:56:26 +01:00
Jim Shield	6b8698353b	Expand on the core file loading system This is still not in use for now, but it WILL be used in the future I'm getting too many support tickets about the "Failed to load" warning in console about files they don't have/need (if you don't run `ox_core` don't worry about `ox_core` not loading) This system is intended to load it through the script instead of `fxmanifest.lua` It is intended to check if the user has the required script and also warn them if it's not started (load order issue), or just load it as if it were told to in the fxmanifest	2025-05-07 13:55:12 +01:00
Jim Shield	5868312388	fix ps-inv/lj-inv check If you didn't have either PS-Inventory or LJ-Inventory, this ended up breaking loading as it ended up checking is `nil` was started	2025-05-07 13:32:54 +01:00
Jim Shield	b0b139b179	Rework ps-inventory support PS-Inv used to be exactly the same as QB-Inv so alot of the function calls were shared This separates them and makes it easier to make changes to support their inventory Also unified the calls for server side functions into single functions instead of having separate per inventory Also moves: - `invImg()` to inventories.lua - `registerStash()` to stashcontrol.lua	2025-05-07 12:58:39 +01:00
Jim Shield	4bf4806b9e	workaround for a prop claiming it couldn't find W this is just a quick workaround, if a prop is created without a heading, it auto sets it to 0	2025-05-07 12:54:23 +01:00
Jim Shield	826e745fc3	fallback for the fallback Not having the server convars added to the server.cfg was causing issues for some users it should have worked, but this forces things to gta if you don't have any values set for them anywhere I've added fallbacks to "gta" settings to hopefully stop fivem errors	2025-05-07 01:59:03 +01:00
@@ -1 +1 @@
 .0.06
 .0.12