Version Bump

`2.0.20` - `2.0.21`
increase authToken timeout from 5 sec to 1 min
2026-08-17 05:56:02 +01:00 · 2025-07-14 11:29:29 +01:00 · 2025-07-13 17:41:06 +01:00 · 2025-07-12 22:24:28 +01:00 · 2025-07-12 13:05:10 +01:00 · 2025-07-12 11:31:16 +01:00
28 changed files with 904 additions and 497 deletions
--- a/README.md
+++ b/README.md
@@ -53,11 +53,11 @@ setr jim_DisableDebug true
 setr jim_DisableEventDebug true

 # Force the default setting for what framework scripts should be used
-setr jim_menuScript qb              # qb, ox, gta, jim
-setr jim_notifyScript gta           # qb, ox, gta, esx, okok, red
-setr jim_drawTextScript qb          # qb, ox, gta, esx
-setr jim_progressBarScript qb       # qb, ox, gta, esx
-setr jim_skillCheckScript qb        # qb, ox, gta
+setr jim_menuScript qb              # qb, ox, gta, lation
+setr jim_notifyScript gta           # qb, ox, gta, esx, okok, red, lation
+setr jim_drawTextScript qb          # qb, ox, gta, esx, lation
+setr jim_progressBarScript qb       # qb, ox, gta, esx, lation
+setr jim_skillCheckScript qb        # qb, ox, gta, lation
 setr jim_dontUseTarget false         # Set to true to disable target systems and use draw text 3d
 ```

--- a/clientFrameworkCache.lua
+++ b/clientFrameworkCache.lua
@@ -0,0 +1,32 @@
+if _G.__bridge_cache_loaded then return end
+_G.__bridge_cache_loaded = true
+
+_G.BridgeCache = {
+    hasCache = false,
+    data = nil,
+    queue = {},
+}
+
+RegisterNetEvent("jim_bridge:receiveCache", function(data)
+    if _G.BridgeCache.hasCache then return end
+    _G.BridgeCache.data = data
+    _G.BridgeCache.hasCache = true
+
+    for _, cb in ipairs(_G.BridgeCache.queue) do
+        cb(data)
+    end
+    _G.BridgeCache.queue = nil
+end)
+
+-- Only send the request ONCE per client session
+TriggerServerEvent("jim_bridge:requestCache")
+
+-- Exported async function
+function GetBridgeCache(callback)
+    if _G.BridgeCache.hasCache then
+        callback(_G.BridgeCache.data)
+    else
+        table.insert(_G.BridgeCache.queue, callback)
+    end
+end
+exports("GetBridgeCache", GetBridgeCache)
--- a/documentation/main_functions/metahandlers.md
+++ b/documentation/main_functions/metahandlers.md
@@ -21,12 +21,12 @@ This module provides access and control over player metadata, which is useful fo
    print("Player stress level:", stress)
    ```

- **SetMetadata(player, key, value)**
+- **setPlayerMetadata(player, key, value)**

  ⚠️ Server side only
  - Updates or assigns a value to a specific metadata key for a player.
  - The function updates the player's metadata using the active core export.
  - **Example:**
    ```lua
-    SetMetadata(player, "stress", 0)
+    setPlayerMetadata(player, "stress", 0)
    ```
--- a/frameworkCache.lua
+++ b/frameworkCache.lua
@@ -35,18 +35,33 @@ local Exports = {
 }

 -- Prevent reloading if cache is already initialized
-if _G.__jimBridgeDataCache then return end
-_G.__jimBridgeDataCache = {}
-local cache = _G.__jimBridgeDataCache
+local cache = {
+    Items = {},
+    Vehicles = {},
+    Jobs = {},
+    Gangs = {},
+}
+local cacheReady = false
+local timers = {}
+local function startTimer(label)
+    timers[label] = GetGameTimer()
+end

+local function endTimer(label)
+    timers[label] = GetGameTimer() - (timers[label] or GetGameTimer())
+    timers[label] = "("..(timers[label] / 1000).."s)"
+end
+startTimer("Cache") startTimer("Items") startTimer("Vehicles") startTimer("Jobs") startTimer("InvWeight") startTimer("InvSlots")
 -- 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) or checkExists(Exports.ESXExport) then
+    local fileLoader = assert(load(LoadResourceFile("oxmysql", ('lib/MySQL.lua')), ('@@oxmysql/lib/MySQL.lua')))
+    fileLoader()
+end

 if checkExists(Exports.OXCoreExport) then
    -- Detected OX_Core in server, wait for it to be started if needed
@@ -62,7 +77,6 @@ if checkExists(Exports.ESXExport) then
 end

 -- Initialize variables for caching
-local Items, Vehicles, Jobs, Gangs, Core = {}, {}, {}, {}, nil
 local itemResource, jobResource, vehResource = "N/A", "N/A", "N/A"

 -- Print just to announce it knows the exports/scripts exist in the server
@@ -85,22 +99,15 @@ if checkExists(Exports.OXInv) then
        return exports[Exports.OXInv]:Items()
    end)
    if success and result then
-        Items = result
-    end
-
-    if Items == nil or not next(Items) then
-        print("^1--------------------------------------------^7")
-        print("^1ERROR^7: ^1Can NOT find "..Exports.OXInv.." ^7Items ^1list^7, ^1possible error in that file^7?")
-        print("^1--------------------------------------------^7")
-        Items = {} -- Fallback to an empty table
+        cache.Items = result
    end

    -- 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
+    for k, v in pairs(cache.Items) do
        if type(k) == "string" then
            if k:find("WEAPON") then
-                Items[k:lower()] = Items[k]
+                cache.Items[k:lower()] = cache.Items[k]
            end
        else
            print("^1ERROR^7: ^1Possible table inside a table, check your items.lua^7?")
@@ -109,27 +116,48 @@ if checkExists(Exports.OXInv) then
        end
    end

+elseif checkExists(Exports.QBXExport) then
+    while GetResourceState(Exports.QBXExport) ~= "started" do Wait(100) end
+    itemResource = Exports.QBXExport
+    cache.Items = exports[Exports.QBExport]:GetCoreObject().Shared.Items
+    -- If this is nil, they need to update to qbx_core 1.23.0+
+    if not cache.Items then
+        -- if their inventory doesn't allow that (they refuse to update their butchered core replacement):
+        if GetResourceState(Exports.QSInv):find("start") then
+            itemResource = Exports.QSInv
+            cache.Items = exports[Exports.QSInv]:GetItemList()
+
+        elseif GetResourceState(Exports.OrigenInv):find("start") then
+            itemResource = Exports.OrigenInv
+            cache.Items = exports[Exports.OrigenInv]:Items()
+
+        elseif GetResourceState(Exports.CodeMInv):find("start") then
+            itemResource = Exports.CodeMInv
+            cache.Items = exports[Exports.CodeMInv]:GetItemList()
+
+        elseif GetResourceState(Exports.CoreInv):find("start") then
+            itemResource = Exports.CoreInv
+            cache.Items = exports[Exports.CoreInv]:getItemsList()
+
+        elseif GetResourceState(Exports.TgiannInv):find("start") then
+            itemResource = Exports.TgiannInv
+            cache.Items = exports[Exports.TgiannInv]:Items()
+        end
+    end
+
 elseif checkExists(Exports.QBExport) then
    while GetResourceState(Exports.QBExport) ~= "started" do Wait(100) end
    itemResource = Exports.QBExport
-    Core = exports[Exports.QBExport]:GetCoreObject()
-    Items = Core.Shared.Items
-
-    if Items == nil or not next(Items) then
-        print("^1--------------------------------------------^7")
-        print("^1ERROR^7: ^1Can NOT find "..Exports.QBExport.." ^7Items ^1list^7, ^1possible error in that file^7?")
-        print("^1--------------------------------------------^7")
-        Items = {} -- Fallback to an empty table
-    end
+    cache.Items = exports[Exports.QBExport]:GetCoreObject().Shared.Items

 elseif checkExists(Exports.ESXExport) then
    itemResource = Exports.ESXExport
    if GetResourceState(Exports.QSInv):find("start") then
-        Items = exports[Exports.QSInv]:GetItemList()
+        cache.Items = exports[Exports.QSInv]:GetItemList()
    else
-        Items = ESX.GetItems()
-        while not next(Items) do
-            Items = ESX.GetItems()
+        cache.Items = ESX.GetItems()
+        while not next(cache.Items) do
+            cache.Items = ESX.GetItems()
            Wait(1000)
        end
    end
@@ -137,37 +165,27 @@ elseif checkExists(Exports.ESXExport) then
 elseif checkExists(Exports.RSGExport) then
    while GetResourceState(Exports.RSGExport) ~= "started" do Wait(100) end
    itemResource = Exports.RSGExport
-    Core = exports[Exports.RSGExport]:GetCoreObject()
-    Items = Core.Shared.Items
-    if Items == nil or not next(Items) then
-        print("^1--------------------------------------------^7")
-        print("^1ERROR^7: ^1Can NOT find "..Exports.RSGExport.." ^7Items ^1list^7, ^1possible error in that file^7?")
-        print("^1--------------------------------------------^7")
-        Items = {} -- Fallback to an empty table
-    end
-
+    cache.Items = exports[Exports.RSGExport]:GetCoreObject().Shared.Items
 end
+endTimer("Items")

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

 elseif checkExists(Exports.OXCoreExport) then
    vehResource = Exports.OXCoreExport
-    Vehicles = {}
+    cache.Vehicles = {}
    for k, v in pairs(Ox.GetVehicleData()) do
-        Vehicles[k] = {
+        cache.Vehicles[k] = {
            model = k, hash = GetHashKey(k),
            price = v.price,
            name = v.name,
@@ -178,9 +196,8 @@ elseif checkExists(Exports.OXCoreExport) then
 elseif checkExists(Exports.ESXExport) then
    vehResource = Exports.ESXExport
    while not MySQL do Wait(1000) end
-    Vehicles = {}
    for _, v in pairs(MySQL.query.await('SELECT model, price, name FROM vehicles')) do
-        Vehicles[v.model] = {
+        cache.Vehicles[v.model] = {
            model = v.model,
            hash = GetHashKey(v.model),
            price = v.price,
@@ -190,16 +207,10 @@ elseif checkExists(Exports.ESXExport) then

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

 end
+endTimer("Vehicles")

 ---------------------
 ----- Load Jobs -----
@@ -207,18 +218,14 @@ end
 -- 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 or not next(Jobs) then
-        print("^1--------------------------------------------^7")
-        print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?")
-        print("^1--------------------------------------------^7")
-        Jobs = {} -- Fallback to an empty table
-    end
+    cache.Jobs, cache.Gangs = exports[Exports.QBXExport]:GetJobs(), exports[Exports.QBXExport]:GetGangs()
+
+elseif checkExists(Exports.QBExport) then
+    jobResource = Exports.QBExport
+    cache.Jobs, cache.Gangs = exports[Exports.QBExport]:GetCoreObject().Shared.Jobs, exports[Exports.QBExport]:GetCoreObject().Shared.Gangs

 elseif checkExists(Exports.OXCoreExport) then
    jobResource = Exports.OXCoreExport
-    Jobs = {}
    while not MySQL do Wait(1000) end
    local tempJobs = MySQL.query.await('SELECT * FROM `ox_groups`')
    local tempGrades = MySQL.query.await('SELECT * FROM `ox_group_grades`')
@@ -228,34 +235,29 @@ elseif checkExists(Exports.OXCoreExport) then
        gradeMap[grade.group][grade.grade] = { name = grade.label }
    end
    for _, job in pairs(tempJobs) do
-        Jobs[job.name] = {
+        cache.Jobs[job.name] = {
            label = job.label,
            grades = gradeMap[job.name] or {}
        }
    end
-    Gangs = Jobs
-
-elseif checkExists(Exports.QBExport) then
-    jobResource = Exports.QBExport
-    Core = Core or exports[Exports.QBExport]:GetCoreObject()
-    Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+    cache.Gangs = cache.Jobs

 elseif checkExists(Exports.ESXExport) then
    jobResource = Exports.ESXExport
    ESX = exports[Exports.ESXExport]:getSharedObject()
-    Jobs = ESX.GetJobs()
-    while not next(Jobs) do
+    cache.Jobs = ESX.GetJobs()
+    while not next(cache.Jobs) do
        Wait(100)
-        Jobs = ESX.GetJobs()
+        cache.Jobs = ESX.GetJobs()
    end
-    for Role, Grades in pairs(Jobs) do
+    for Role, Grades in pairs(cache.Jobs) do
        -- Check for if user has added grades
        if Grades.grades == nil or not next(Grades.grades) then
            goto continue
        end
        for grade, info in pairs(Grades.grades) do
            if info.label and info.label:find("[Bb]oss") then
-                Jobs[Role].grades[grade].isBoss = true
+                cache.Jobs[Role].grades[grade].isBoss = true
                goto continue
            end
        end
@@ -268,64 +270,190 @@ elseif checkExists(Exports.ESXExport) then
        end

        if highestGrade then
-            Jobs[Role].grades[tostring(highestGrade)].isBoss = true
+            cache.Jobs[Role].grades[tostring(highestGrade)].isBoss = true
        end
        ::continue::
    end
-    Gangs = Jobs
+    cache.Gangs = cache.Jobs

 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 or not next(Jobs) then
-        print("^1--------------------------------------------^7")
-        print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?")
-        print("^1--------------------------------------------^7")
-        Jobs = {} -- Fallback to an empty table
-    end
+    cache.Jobs, cache.Gangs = exports[Exports.RSGExport]:GetCoreObject().Shared.Jobs, exports[Exports.RSGExport]:GetCoreObject().Shared.Gangs

 end
+endTimer("Jobs")

-- Save to global cache
-cache.Items = Items
-cache.Vehicles = Vehicles
-cache.Jobs = Jobs
-cache.Gangs = Gangs
+-- Fallback if nil or empty
+if cache.Items == nil or not next(cache.Items) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..itemResource.." ^7Items ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Items = {} -- Fallback to an empty table
+end
+if cache.Vehicles == nil or not next(cache.Vehicles) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..vehResource.." ^7Vehicles ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Vehicles = {} -- Fallback to an empty table
+end
+if cache.Jobs == nil or not next(cache.Jobs) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..jobResource.." ^7job ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Jobs = {} -- Fallback to an empty table
+end
+
+-- Auto Detection of Inventory Weight -- **EXPERIMENTAL**
+-- Forcefully load the the specified config file from inventory scripts
+-- This allows to get information required for certain functions that need to detect how much space is left in a players inventory
+-- This is born from too many tickets of me needing to explain that they need to change "InventoryWeight" to match their inv setting
+local function getInventoryConfig(resource, data)
+    if data.convars then
+        return function(path)
+            local key = path[1]
+            local convar = key == "MaxWeight" and data.convars.weight or key == "MaxSlots" and data.convars.slots
+            return convar and GetConvarInt(convar.key, convar.default) or nil, "Unsupported convar path: " .. table.concat(path, ".")
+        end
+    end
+
+    local content = LoadResourceFile(resource, data.file)
+    if not content then return nil, "Failed to load file" end
+
+    local env = {
+        GetConvar = GetConvar,
+        vector3 = vector3,
+        vector4 = vector4,
+        Citizen = Citizen,
+        GetResourceState = GetResourceState,
+        exports = exports,
+        DependencyCheck = function() return nil end,
+    }
+
+    local fn, err = load(content, '@'..data.file, 't', env)
+    --local success, err = xpcall(fn, function(e)
+    --    print(debug.traceback("Error while executing qs-inventory config:\n" .. tostring(e), 2))
+    --end)
+    if not fn then return nil, "Failed to compile config: " .. err end
+    if not pcall(fn) then return nil, "Error executing config file" end
+
+    local cfg = env.Config or env.config
+    if not cfg then return nil, "Config table not found" end
+
+    return function(path)
+        local ref = cfg
+        for _, k in ipairs(path) do
+            if type(ref) ~= "table" then return nil, "Path invalid at: " .. tostring(k) end
+            ref = ref[k]
+        end
+        return ref
+    end
+end
+
+-- Inventory table
+local invWeightTable = {
+    [Exports.OXInv] = { convars = {
+        weight = { key = "inventory:weight", default = 30000 },
+        slots  = { key = "inventory:slots",  default = 40 }
+    }},
+    [Exports.QBInv] = {
+        fallback = {
+            { file = "config.lua",              path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } }, -- old version
+            { file = "config/config.lua",       path = { "MaxWeight" },       slotPath = { "MaxSlots" } },       -- new version
+        }
+    },
+    [Exports.JPRInv] =      { file = "configs/main_config.lua", path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
+    [Exports.PSInv] =       { file = "config.lua",              path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
+    [Exports.QSInv] =       { file = "config/config.lua",       path = { "InventoryWeight", "weight" }, slotPath = { "InventoryWeight", "slots" } },
+    [Exports.TgiannInv] =   { file = "configs/config.lua",      path = { "slotsMaxWeights", "player", "maxWeight" }, slotPath = { "slotsMaxWeights", "player", "slots" } },
+    [Exports.CodeMInv] =    { file = "config/config.lua",       path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
+    [Exports.RSGInv] =      { file = "config/config.lua",       path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
+    --[Exports.OrigenInv] = { file = "config.lua", path = { "MaxWeight" } },
+}
+
+-- Run config detection
+local invResource = ""
+for script, data in pairs(invWeightTable) do
+    if checkExists(script) then
+        if script == Exports.QBInv and GetResourceState(Exports.JPRInv):find("start") then goto skip end
+
+        while GetResourceState(script) ~= "started" do Wait(100) print("Waiting for script start") end
+        local attempts = data.fallback or { data }
+        local lookup, used, err
+
+        for _, option in ipairs(attempts) do
+            local try, e = getInventoryConfig(script, option)
+            if try then
+                lookup = try
+                used = option
+                break
+            end
+            err = e
+        end
+
+        if not lookup then
+            print(("^1ERROR^7: ^1Config loader failed from ^5%s^7: ^1%s^7"):format(script, err or "unknown"))
+            break
+        end
+
+        local function resolve(label, path)
+            local val, perr = lookup(path)
+            if val then
+                cache["Inventory"..label] = val
+                return
+            end
+            local warnType = label == "Weight" and "^1ERROR" or "^3WARNING"
+            print(("%s^7: ^1Failed to get ^7Inventory%s ^1from ^5%s^7: ^1%s^7"):format(warnType, label, script, perr or "unknown"))
+        end
+
+        resolve("Weight", used.path or { "MaxWeight" })
+        resolve("Slots",  used.slotPath or { "MaxSlots" })
+
+        invResource = script:gsub("-", "^7-^4"):gsub("_", "^7_^4")
+        break
+    end
+    ::skip::
+end
+endTimer("InvWeight")
+endTimer("InvSlots")

 CreateThread(function()
    local counts = {
-        Items = 0,
-        Vehicles = 0,
-        Jobs = 0,
-        Gangs = 0,
+        Items = 0, Vehicles = 0, Jobs = 0, Gangs = 0,
    }
    for k, v in pairs(cache) do
-        for count in pairs(v) do
-            counts[k] += 1
-        end
+        if type(v) ~= "number" then for count in pairs(v) do counts[k] += 1 end end
    end
-    print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Items).."^2 Items from ^7"..itemResource)
-    print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Vehicles).."^2 Vehicles from ^7"..vehResource)
-    print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Jobs).."^2 Jobs from ^7"..jobResource)
-    print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Gangs).."^2 Gangs from ^7"..jobResource)
+    if cache.InventoryWeight then
+        print("^6FrameWorkCache^7: ^4"..invResource.."^2 InventoryWeight^7: ^3"..cache.InventoryWeight.."^7 (^3"..(cache.InventoryWeight / 1000).."kg^7) ^7"..timers["InvWeight"])
+    end
+    if cache.InventorySlots then
+        print("^6FrameWorkCache^7: ^4"..invResource.."^2 InventorySlots^7: ^3"..cache.InventorySlots.." ^7"..timers["InvSlots"])
+    end
+    print("^6FrameworkCache^7: ^4"..itemResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Items).."^2 Items ^7"..timers["Items"])
+    print("^6FrameworkCache^7: ^4"..vehResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Vehicles).."^2 Vehicles ^7"..timers["Vehicles"])
+    print("^6FrameworkCache^7: ^4"..jobResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Jobs).."^2 Jobs ^7"..timers["Jobs"])
+    print("^6FrameworkCache^7: ^4"..jobResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Gangs).."^2 Gangs ^7"..timers["Jobs"])
+    endTimer("Cache")
+    print("^6FrameworkCache^7: ^2Cache Ready ^7"..timers["Cache"])
+    cacheReady = true
 end)

 RegisterNetEvent("jim_bridge:requestCache", function()
    local src = source
-    TriggerClientEvent("jim_bridge:receiveCache", src, _G.__jimBridgeDataCache)
+    TriggerClientEvent("jim_bridge:receiveCache", src, cache)
 end)

 exports("GetSharedData", function()
-    -- Wait for data to be ready before returning it
-    local timeout = GetGameTimer() + 5000
-    while (
-        not _G.__jimBridgeDataCache or
-        (not _G.__jimBridgeDataCache.Items or next(_G.__jimBridgeDataCache.Items) == nil) or
-        (not _G.__jimBridgeDataCache.Vehicles or next(_G.__jimBridgeDataCache.Vehicles) == nil) or
-        (not _G.__jimBridgeDataCache.Jobs or next(_G.__jimBridgeDataCache.Jobs) == nil)
-    ) and GetGameTimer() < timeout do
-        Wait(50)
+    -- Wait indefinitely (with periodic checks) until cacheReady is true
+    local timeout = GetGameTimer() + 20000  -- 20 second failsafe timeout
+    while not cacheReady and GetGameTimer() < timeout do
+        Wait(100)
    end
-    return _G.__jimBridgeDataCache
+
+    if not cacheReady then
+        print("^1ERROR^7: jim_bridge cache timed out waiting for data.")
+        return nil  -- Signal clearly if cache never became ready
+    end
+
+    return cache
 end)
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.18"
+version "2.0.21"
 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.'
@@ -18,9 +18,10 @@ files {
 -- Version checker
 server_scripts {
    'frameworkCache.lua',
-    '_versioncheck.lua'
+    '_versioncheck.lua',
 }

 client_scripts {
-    'ui_modules/*.lua'
+    'clientFrameworkCache.lua',
+    'ui_modules/*.lua',
 }
--- a/shared/_authToken.lua
+++ b/shared/_authToken.lua
@@ -53,13 +53,13 @@ if isServer() then

        if authCooldown[src] then
            debugPrint("^1Auth^7: ^3Cooldown active^7 for Player ^1"..src.."^7, ignoring additional auth request")
-            return ""
+            return AuthEvent
        end

        debugPrint("^1Auth^7: ^2Player Source^7: "..src.." ^2requested ^3AuthEvent^7", AuthEvent)

        authCooldown[src] = true
-        SetTimeout(5000, function() -- 5 second cooldown
+        SetTimeout(60000, function() -- 1 minute cooldown
            authCooldown[src] = nil
        end)

--- a/shared/_loaders.lua
+++ b/shared/_loaders.lua
@@ -117,7 +117,6 @@ function onResourceStart(func, thisScript)
                    debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
                    hasPrinted = true
                end
-                if isStarted(ESXExport) then Wait(10000) end
                func()
            end
        end
@@ -194,38 +193,35 @@ end

 local messageShown = false
 function waitForSharedLoad()
-    local timeout = 100000  -- 10 seconds in milliseconds
-    local startTime = GetGameTimer()
-    local loaded = true
-    --Wait(1000)
-    local count = {}
+    local timeout = GetGameTimer() + 900000 -- 15 minutes max wait (had to up this from 2 minutes because of slow servers)
    local loop = 0
-    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
-        if not messageShown then
+
+    while ((not Jobs or not next(Jobs)) or
+        (not Items or not next(Items)) or
+        (not Vehicles or not next(Vehicles))
+    ) and (timeout and GetGameTimer() < timeout) do
+        if loop >= 3 and not messageShown then
            if (not Jobs or not next(Jobs)) then
-                debugPrint("^4Debug^7: ^2Waiting for Jobs to be loaded")
+                print("^4Debug^7: ^2Waiting for ^7Jobs^2 to be loaded")
            end
            if (not Items or not next(Items)) then
-                debugPrint("^4Debug^7: ^2Waiting for Items to be loaded")
+                print("^4Debug^7: ^2Waiting for ^7Items^2 to be loaded")
            end
            if (not Vehicles or not next(Vehicles)) then
-                debugPrint("^4Debug^7: ^2Waiting for Vehicles to be loaded")
+                print("^4Debug^7: ^2Waiting for ^7Vehicles^2 to be loaded")
            end
+            messageShown = true
        end
-        messageShown = true
-        --print((GetGameTimer() - startTime) < timeout)
        Wait(1000)
-        if Jobs and Items and Vehicles then
-            --print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
-            loaded = true
-            break
-        end
+
        loop += 1
    end
-    if not loaded then
+
+    if Jobs and Items and Vehicles then
+        debugPrint("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+        return true
+    else
        print("^4Error^7: ^1Timeout reached while waiting for shared load^7.")
        return false
-    else
-        return true
    end
 end
--- a/shared/contextmenus.lua
+++ b/shared/contextmenus.lua
@@ -47,48 +47,7 @@
 --- })
 --- ```
 function openMenu(Menu, data)
-    if Config.System.Menu == "jim" then
-        if data.onBack then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-arrow-left",
-                header = " ",
-                txt = "Return",
-                params = {
-                    isAction = true,
-                    event = data.onBack,
-                },
-            })
-        elseif data.canClose then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-xmark",
-                header = " ",
-                txt = "Close",
-                params = {
-                    isAction = true,
-                    event = data.onExit and data.onExit or (function() exports[QBMenuExport]:closeMenu() end),
-                },
-            })
-        end
-        if data.header ~= nil then
-            local tempMenu = {}
-            for k, v in pairs(Menu) do tempMenu[k + 1] = v end
-            tempMenu[1] = { header = data.header, txt = data.headertxt or "", isMenuHeader = true }
-            Menu = tempMenu
-        end
-        for k in pairs(Menu) do
-            if not Menu[k].params or not Menu[k].params.event then
-                Menu[k].params = {
-                    isAction = true,
-                    event = Menu[k].onSelect or function() end,
-                }
-            end
-            if not Menu[k].header then Menu[k].header = " " end
-            if Menu[k].arrow then Menu[k].icon = "fas fa-angle-right" end
-            Menu[k].isMenuHeader = Menu[k].isMenuHeader or Menu[k].disable
-        end
-        TriggerEvent("jim_bridge:client:openMenu", Menu)
-
-    elseif Config.System.Menu == "ox" then
+    if Config.System.Menu == "ox" then
        local index = nil
        if data.onBack and not data.onSelected then
            table.insert(Menu, 1, {
@@ -286,11 +245,57 @@ function openMenu(Menu, data)
        function(data, menu)
            menu.close()
        end)
+
+    elseif Config.System.Menu == "lation" then
+        if data.onBack then
+            table.insert(Menu, 1, {
+                icon = "fas fa-circle-arrow-left",
+                onSelect = data.onBack,
+                header = "Return",
+            })
+        end
+
+        for k in pairs(Menu) do
+            if data.onSelected and Menu[k].arrow then
+                Menu[k].icon = "fas fa-angle-right"
+            end
+            -- If no title, use header or txt as title/label.
+            if not Menu[k].title then
+                if Menu[k].header ~= nil and Menu[k].header ~= "" then
+                    Menu[k].title = Menu[k].header
+                    Menu[k].label = Menu[k].header
+                    if Menu[k].txt then Menu[k].description = Menu[k].txt else Menu[k].description = "" end
+                else
+                    Menu[k].title = Menu[k].txt
+                    Menu[k].label = Menu[k].txt
+                end
+            end
+            -- Copy parameters from 'params' if available.
+            if Menu[k].params then
+                Menu[k].event = Menu[k].params.event
+                Menu[k].args = Menu[k].params.args or {}
+            end
+            if Menu[k].isMenuHeader then
+                Menu[k].readOnly = true
+            end
+        end
+
+        exports.lation_ui:registerMenu({
+            id = 'menu',
+            title = data.header,
+            onExit = data.onExit and data.onExit or nil,
+            subtitle = (data.headertxt and data.headertxt or ""),
+            options = Menu,
+        })
+
+        -- Show menu
+        exports.lation_ui:showMenu('menu')
+
    end
 end

 --- A line break constant used for menu header formatting.
-br = (Config.System.Menu == "ox" or Config.System.Menu == "gta") and "\n" or "<br>"
+br = (Config.System.Menu == "ox" or Config.System.Menu == "gta" or Config.System.Menu == "lation") and "\n" or "<br>"

 --- Checks if the current menu system is 'ox' or 'gta' for formatting purposes.
 --- @return boolean boolean True if using ox or gta menus, otherwise false.
--- a/shared/coreloader.lua
+++ b/shared/coreloader.lua
@@ -1,4 +1,4 @@
-Items, Vehicles, Jobs, Gangs, Core = {}, nil, nil, nil, nil
+Items, Vehicles, Jobs, Gangs = nil, nil, nil, nil

 -- Shared Exports Initialization
 Exports.PSInv = isStarted("lj-inventory") and "lj-inventory" or Exports.PSInv
@@ -33,80 +33,72 @@ end


 if IsDuplicityVersion() then
-    CreateThread(function()
-        local cache = nil
-        local timeout = GetGameTimer() + 5000 -- 5 seconds max wait
+    local cache = nil
+    local timeout = GetGameTimer() + 900000 -- 15 minutes max wait (had to up this from 2 minutes because of slow servers)

-        -- Wait until jim_bridge is started and export is available
-        while not cache and GetGameTimer() < timeout do
-            if GetResourceState("jim_bridge"):find("start") then
-                local success, result = pcall(function()
-                    return exports["jim_bridge"]:GetSharedData()
-                end)
-                if success and result then
-                    cache = result
-                    --print(json.encode(cache, {indent = true}))
-                end
+    -- Wait until jim_bridge is started and export is available
+    while not cache and (timeout and GetGameTimer() < timeout) do
+        if GetResourceState("jim_bridge"):find("start") then
+            local success, result = pcall(function()
+                return exports["jim_bridge"]:GetSharedData()
+            end)
+            if success and result then
+                cache = result
            end
-            Wait(100)
        end
+        Wait(100)
+    end

-        if not cache then
-            print("^1ERROR^7: ^2jim_bridge export not available after timeout^7.")
-            return
-        end
+    if timeout and not cache then
+        print("^1ERROR^7: ^2jim_bridge export not available after timeout^7.")
+        return
+    end

-        Items    = cache.Items
-        Vehicles = cache.Vehicles
-        Jobs     = cache.Jobs
-        Gangs    = cache.Gangs
+    Items    = cache.Items
+    Vehicles = cache.Vehicles
+    Jobs     = cache.Jobs
+    Gangs    = cache.Gangs
+    InventoryWeight = cache.InventoryWeight or InventoryWeight
+    InventorySlots = cache.InventorySlots or 40

-        debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
-    end)
+    debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
+    --print(countTable(Items), countTable(Vehicles), countTable(Jobs))
 else
-    local hasCache = false
-    -- 🔹 Client Side: Request from server
-    _G.__jimBridgeDataCache = {}
-
-    RegisterNetEvent("jim_bridge:receiveCache", function(data)
-        if not hasCache then
-            _G.__jimBridgeDataCache = data
-            hasCache = true
-        else
-            return
-        end
-    end)
-
-    TriggerServerEvent("jim_bridge:requestCache")
-
-    CreateThread(function()
-        while not _G.__jimBridgeDataCache or not next(_G.__jimBridgeDataCache) do Wait(50) end
-        local cache = _G.__jimBridgeDataCache
+    -- Shared bridge cache - prevent duplicate listeners
+    exports["jim_bridge"]:GetBridgeCache(function(cache)
        Items = cache.Items or {}
        Vehicles = cache.Vehicles or {}
        Jobs = cache.Jobs or {}
        Gangs = cache.Gangs or {}
+        InventoryWeight = cache.InventoryWeight or InventoryWeight
+        InventorySlots = cache.InventorySlots or 50

-        if isStarted(ESXExport) then
-            for _, v in pairs(Vehicles) do
-                Vehicles[v.model] = {
-                    model = v.model,
-                    hash = v.hash,
-                    price = v.price,
-                    name = v.name,
-                    brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper)
-                }
-            end
-        end
-        if isStarted(OXInv) then
-            for k, v in pairsByKeys(Items) do
-                local tempInfo = exports[OXInv]:Items(k)
-                if tempInfo and tempInfo.client then
-                    Items[k].image = (tempInfo.client and tempInfo.client.image) and tempInfo.client.image:gsub("nui://"..OXInv.."/web/images/", "") or k..".png"
-                    Items[k].hunger = tempInfo.client and tempInfo.client.hunger
-                    Items[k].thirst = tempInfo.client and tempInfo.client.thirst
+        CreateThread(function()
+            if isStarted(ESXExport) then
+                for _, v in pairs(Vehicles) do
+                    Vehicles[v.model] = {
+                        model = v.model,
+                        hash = v.hash,
+                        price = v.price,
+                        name = v.name,
+                        brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper)
+                    }
                end
            end
-        end
+
+            if isStarted(OXInv) then
+                for k, v in pairs(Items) do
+                    local tempInfo = exports[OXInv]:Items(k)
+                    Items[k].image = k..".png" -- Set default image
+                    if tempInfo and tempInfo.client then -- if client info, check for hard set image
+                        Items[k].image = (tempInfo.client.image) and tempInfo.client.image:gsub("nui://"..OXInv.."/web/images/", "") or Items[k].image
+                        Items[k].hunger = tempInfo.client.hunger
+                        Items[k].thirst = tempInfo.client.thirst
+                    end
+                end
+            end
+        end)
+
+        debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
    end)
 end
--- a/shared/crafting.lua
+++ b/shared/crafting.lua
@@ -89,6 +89,14 @@ function craftingMenu(data)
    -- Check if the player can carry the required items (server callback).
    local canCarryTable = triggerCallback(getScript()..':server:canCarry', tempCarryTable)

+    local usingStash = data.stashName ~= nil and data.stashName ~= ""
+
+    Menu[#Menu+1] = {
+        icon = usingStash and "fas fa-boxes-stacked" or "fas fa-person",
+        header = "Material Source: "..(usingStash and "Job Stash" or "Player Inventory"),
+        disabled = true,
+    }
+
    -- Process each recipe to create menu entries.
    for i = 1, #Recipes do
        if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
@@ -238,7 +246,7 @@ function multiCraft(data)
    })

    local dialog = createInput(data.craftable.Header..(Config.System.Menu == "qb" and ": "..br.."How many to craft? "..br.."Max: "..carryMax or ""), {
-        ((Config.System.Menu == "ox") and {
+        ((Config.System.Menu == "ox" or Config.System.Menu == "lation") and {
            type = "slider",
            label = "How many to craft? "..br.."Max: "..carryMax,
            required = true,
@@ -311,6 +319,7 @@ end
 ---     metadata = { label = "Custom Pistol", image = "custom_pistol.png" },
 --- })
 --- ```
+
 function makeItem(data)
    if CraftLock then return end
    CraftLock = true
@@ -330,117 +339,144 @@ function makeItem(data)
    local crafted, crafting = true, true
    local cam = createTempCam(PlayerPedId(), data.coords)
    startTempCam(cam)
+
+    -- Calculate total bartime if SingleProgress is enabled
+    local totalBartime = bartime * craftAmount
+
+    -- Run ingredient check and usage separately first
    for i = 1, craftAmount do
        for k, v in pairs(data.craft) do
-            if not excludeKeys[k] then
-                if type(v) == "table" then
-                    for l, b in pairs(v) do
-                        if isInventoryOpen() then
-                            print("^1Error^7: ^2Inventory is open, you tried to break things")
-                            crafted, crafting = false, false
-                            stopTempCam()
-                            ClearPedTasks(PlayerPedId())
-                            if canReturn then craftingMenu(data) end
-                            CraftLock = false
-                            return
-                        end
-                        if crafting and progressBar({
-                            label = "Using "..b.." "..Items[l].label,
-                            time = 1000,
-                            cancel = true,
-                            dict = 'pickup_object',
-                            anim = "putdown_low",
-                            flag = 49,
-                            icon = l,
-                        }) then
-                            TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
-                        else
-                            crafted, crafting = false, false
-                            break
-                        end
-                        Wait(200)
-                    end
+            if not excludeKeys[k] and type(v) == "table" then
+                for l, b in pairs(v) do
                    if isInventoryOpen() then
                        print("^1Error^7: ^2Inventory is open, you tried to break things")
-                        crafted, crafting = false, false
                        stopTempCam()
                        ClearPedTasks(PlayerPedId())
                        if canReturn then craftingMenu(data) end
                        CraftLock = false
                        return
                    end
-
-                    if crafted then
-                        local craftProp = nil
-                        if prop then
-                            craftProp = makeProp({ prop = prop.model, coords = vec4(0, 0, 0, 0), true, true })
-                            AttachEntityToEntity(craftProp, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), prop.bone), prop.pos.x, prop.pos.y, prop.pos.z, prop.rot.x, prop.rot.y, prop.rot.z, true, true, false, true, 1, true)
-                        end
-                        if data.sound then
-                            local s = data.sound
-                            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")
-                            crafted, crafting = false, false
-                            crafted, crafting, CraftLock = false, false, false
-                            return
-                        end
-                        if crafting and progressBar({
-                            label = bartext..((metadata and metadata.label) or Items[data.item].label),
-                            time = bartime,
-                            cancel = true,
-                            dict = animDict,
-                            anim = anim,
-                            flag = 49,
-                            icon = data.item,
-                            request = true,
-                        }) then
-                            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
-                            currentToken = nil -- clear client cached token
-                            CreateThread(function()
-                                if data.craft["hasCrafted"] ~= nil then
-                                    debugPrint("^5Bridge^7: ^3hasCrafted ^2Found^7, ^2marking ^7'^4"..data.item.."^7' ^2as crafted for player^7")
-                                    data.craftable.craftedItems[data.item] = true
-                                    triggerCallback(getScript()..":server:SetMetadata", "craftedItems", data.craftable.craftedItems)
-                                end
-                                Wait(100)
-                                if data.craft["exp"] ~= nil then
-                                    craftingLevel += data.craft["exp"].give
-                                    jsonPrint(data.craft["exp"])
-                                    debugPrint("^6Bridge^7: ^3EXP ^2found^7, ^2giving exp for ^7'^4"..data.item.."^7'")
-                                    triggerCallback(getScript()..":server:SetMetadata", "craftingLevel", craftingLevel)
-                                end
-                            end)
-                            if data.craftable.Recipes[1].oneUse == true then
-                                removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
-                                local breakId = GetSoundId()
-                                PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
-                                canReturn = false
-                            end
-                            if data.sound then
-                                StopSound(data.sound.soundId)
-                            end
-                            if data.requiredItemfunc then
-                                data.requiredItemfunc()
-                            end
-                        else
-                            crafting = false
-                            break
-                        end
-                        if craftProp then destroyProp(craftProp) end
+                    if crafting and progressBar({
+                        label = "Using "..b.." "..Items[l].label,
+                        time = 1000,
+                        cancel = true,
+                        dict = 'pickup_object',
+                        anim = "putdown_low",
+                        flag = 49,
+                        icon = l,
+                    }) then
+                        TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
+                    else
+                        crafted, crafting = false, false
+                        break
                    end
+                    Wait(200)
                end
            end
        end
-        Wait(500)
    end
+
+    if not crafted then
+        stopTempCam()
+        ClearPedTasks(PlayerPedId())
+        if canReturn then craftingMenu(data) end
+        CraftLock = false
+        return
+    end
+
+    -- Handle SingleProgress option
+    if Config.Crafting.SingleProgress then
+        local craftProp = nil
+        if prop then
+            craftProp = makeProp({ prop = prop.model, coords = vec4(0, 0, 0, 0), true, true })
+            AttachEntityToEntity(craftProp, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), prop.bone), prop.pos.x, prop.pos.y, prop.pos.z, prop.rot.x, prop.rot.y, prop.rot.z, true, true, false, true, 1, true)
+        end
+        if data.sound then
+            local s = data.sound
+            PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
+        end
+        if crafting and progressBar({
+            label = bartext..((metadata and metadata.label) or Items[data.item].label).." x"..craftAmount,
+            time = totalBartime,
+            cancel = true,
+            dict = animDict,
+            anim = anim,
+            flag = 49,
+            icon = data.item,
+            request = true,
+        }) then
+            data.craft.amount = craftAmount
+            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+            currentToken = nil -- clear client cached token
+            -- handle metadata and experience in a single go
+            if data.craft["hasCrafted"] ~= nil then
+                data.craftable.craftedItems[data.item] = true
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+            end
+            if data.craft["exp"] ~= nil then
+                craftingLevel += data.craft["exp"].give * craftAmount
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
+            end
+            if data.craftable.Recipes[1].oneUse == true then
+                removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
+                local breakId = GetSoundId()
+                PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+                canReturn = false
+            end
+            if data.sound then
+                StopSound(data.sound.soundId)
+            end
+            if data.requiredItemfunc then
+                data.requiredItemfunc()
+            end
+        end
+        if craftProp then destroyProp(craftProp) end
+    else
+        -- Run the original loop for multiple progress bars
+        for i = 1, craftAmount do
+            if crafting and progressBar({
+                label = bartext..((metadata and metadata.label) or Items[data.item].label),
+                time = bartime,
+                cancel = true,
+                dict = animDict,
+                anim = anim,
+                flag = 49,
+                icon = data.item,
+                request = true,
+            }) then
+                TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+                currentToken = nil
+                if data.craft["hasCrafted"] ~= nil then
+                    data.craftable.craftedItems[data.item] = true
+                    triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+                end
+                if data.craft["exp"] ~= nil then
+                    craftingLevel += data.craft["exp"].give
+                    triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
+                end
+                if data.craftable.Recipes[1].oneUse == true then
+                    removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
+                    local breakId = GetSoundId()
+                    PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+                    canReturn = false
+                end
+                if data.requiredItemfunc then
+                    data.requiredItemfunc()
+                end
+            else
+                break
+            end
+        end
+    end
+
+    Wait(500)
    stopTempCam()
    CraftLock = false
    if canReturn then craftingMenu(data) end
    ClearPedTasks(PlayerPedId())
 end

+
 -------------------------------------------------------------
 -- Server Event Handler: Crafted Item
 -------------------------------------------------------------
--- a/shared/drawText.lua
+++ b/shared/drawText.lua
@@ -35,11 +35,26 @@ function drawText(image, input, style, oxStyleTable)

    elseif Config.System.drawText == "ox" then
        -- Append newline spacing to each input line.
+        local inputnum = countTable(input)
        for k, v in pairs(input) do
-            input[k] = v.."   \n"
+            input[k] = v..(inputnum ~= k and "   \n" or "")
        end
        lib.showTextUI(table.concat(input), { icon = (image and radarTable[image] or image) or nil, position = 'left-center', style = oxStyleTable })

+    elseif Config.System.drawText == "lation" then
+        local inputnum = countTable(input)
+        for k, v in pairs(input) do
+            input[k] = v..(inputnum ~= k and "   \n" or "")
+        end
+        exports.lation_ui:showText({
+            --title = " ",
+            description = table.concat(input),
+            keybind = nil,
+            icon = (image and radarTable[image] or image) or nil,
+            iconColor = '#3B82F6',
+            position = 'center-left'
+        })
+
    elseif Config.System.drawText == "gta" then
        -- Concatenate input lines and apply GTA style formatting.
        for i = 1, #input do
@@ -88,6 +103,8 @@ function hideText()
        exports[QBExport]:HideText()
    elseif Config.System.drawText == "ox" then
        lib.hideTextUI()
+    elseif Config.System.drawText == "lation" then
+        exports.lation_ui:hideText()
    elseif Config.System.drawText == "gta" then
        ClearAllHelpMessages()
    elseif Config.System.drawText == "esx" then
--- a/shared/input.lua
+++ b/shared/input.lua
@@ -138,6 +138,98 @@ function createInput(title, opts)
        )
        return dialog

+    elseif Config.System.Menu == "lation" then
+
+        for i in pairs(opts) do
+            currentNum += 1
+            if opts[i] == nil then currentNum -= 1 goto skip end
+            if opts[i].type == "radio" then
+                for k in pairs(opts[i].options) do
+                    opts[i].options[k].label = opts[i].options[k].text
+                end
+                options[currentNum] = {
+                    type = "select",
+                    required = opts[i].isRequired,
+                    label = opts[i].label or opts[i].text,
+                    name = opts[i].name,
+                    default = opts[i].default or opts[i].options[1].value,
+                    options = opts[i].options,
+                }
+            end
+            if opts[i].type == "number" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label or opts[i].text,
+                    description = opts[i].txt and " - "..opts[i].txt or "",
+                    required = opts[i].isRequired,
+                    name = opts[i].name,
+                    options = opts[i].options,
+                }
+            end
+            if opts[i].type == "text" then
+                options[currentNum] = {
+                    type = "input",
+                    label = opts[i].label or opts[i].text,
+                    description = (opts[i].txt and " - "..opts[i].txt or ""),
+                    placeholder = opts[i].default,
+                    required = opts[i].isRequired,
+                }
+            end
+            if opts[i].type == "select" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label or opts[i].text,
+                    description = opts[i].txt and " - "..opts[i].txt or "",
+                    required = opts[i].isRequired,
+                    name = opts[i].name,
+                    options = opts[i].options,
+                    min = opts[i].min,
+                    max = opts[i].max,
+                    default = opts[i].default,
+                }
+            end
+
+            if opts[i].type == "checkbox" then
+                for k in pairs(opts[i].options) do
+                    if options[currentNum] then currentNum += 1 end
+                    options[currentNum] = {
+                        type = opts[i].type,
+                        label = opts[i].options[k].text..(opts[i].txt and " - "..opts[i].txt or ""),
+                        name = opts[i].options[k].value,
+                    }
+                end
+            end
+
+            if opts[i].type == "color" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    required = opts[i].isRequired,
+                    format = opts[i].format,
+                    default = opts[i].default,
+                }
+            end
+
+            if opts[i].type == "slider" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    required = opts[i].required,
+                    min = opts[i].min,
+                    max = opts[i].max,
+                    default = opts[i].default,
+                }
+            end
+            ::skip::
+        end
+
+        local dialog = exports.lation_ui:input({
+            title = title,
+            submitText = "Accept",
+            options = options
+        })
+        return dialog
+
    elseif Config.System.Menu == "gta" then
        WarMenu.CreateMenu(tostring(opts),
            title,
--- a/shared/itemcontrol.lua
+++ b/shared/itemcontrol.lua
@@ -275,7 +275,6 @@ 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
@@ -377,130 +376,73 @@ end
 --- ```lua
 --- breakTool({ item = "drill", damage = 10 })
 --- ```
-function breakTool(data) -- WIP
-    local durability, slot = getDurability(data.item)
-    if not durability then durability = 100 end
-    durability -= data.damage
-    if durability <= 0 then
-        removeItem(data.item, 1)
+function breakTool(data)
+    local metadata, slot = getItemMetadata(data.item)
+    metadata = metadata or {}
+    if not metadata.durability then metadata.durability = 100 end
+    metadata.durability -= data.damage
+    if metadata.durability <= 0 then
+        removeItem(data.item, 1, nil, slot)
        local breakId = GetSoundId()
        PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
    else
-        TriggerServerEvent(getScript()..":server:setMetaData", { item = data.item, slot = slot, metadata = { durability = durability } })
+        TriggerServerEvent(getScript()..":server:setItemMetaData", { item = data.item, slot = slot, metadata = metadata })
    end
 end

--- Retrieves the durability and slot number of an item in a player's inventory.
+
+--- Reduces the uses of a tool by a specified damage amount.
 ---
--- Searches through the player's inventory for the specified item.
+--- If uses reaches zero or below, the tool is removed and a break sound is played.
 ---
--- @param item string The item name.
--- @return number|nil number The durability, or nil if not found.
--- @return number|nil number The slot number, or nil if not found.
+--- @param data table Contains:
+---   - item (string): The tool's name.
+---   - damage (number): The damage % to apply.
 ---
 --- @usage
 --- ```lua
--- local durability, slot = getDurability("drill")
--- if durability then
---     print("Durability:", durability)
---     print("Slot:", slot)
--- end
+--- useToolDegrade({ item = "drill", maxUse = 10 })
 --- ```
-function getDurability(item)
+function useToolDegrade(data) -- WIP
+    local metadata, slot = getItemMetadata(data.item)
+    metadata = metadata or {}
+    if not metadata["Uses Left"] then metadata["Uses Left"] = data.maxUse end
+    metadata["Uses Left"] -= 1
+    if metadata["Uses Left"] <= 0 then
+        removeItem(data.item, 1, nil, slot)
+        local breakId = GetSoundId()
+        PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+    else
+        TriggerServerEvent(getScript()..":server:setItemMetaData", { item = data.item, slot = slot, metadata = metadata })
+    end
+end
+
+function getItemMetadata(item, slot, src)
    local lowestSlot = 100
-    local durability = nil
-    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then
-        local itemcheck = Core.Functions.GetPlayerData().items
+    local chosenSlot = slot
+    local metadata = {}
+
+    local itemcheck = getPlayerInv(src)
+
+    if chosenSlot then
+        for k, v in pairs(itemcheck) do
+            if v.name == item and v.slot == chosenSlot then
+                lowestSlot = v.slot
+                metadata = itemcheck[k].info or itemcheck[k].metadata or {}
+                debugPrint("^6Bridge^7: ^2Found metadata for item ^3"..item.." ^2in slot ^3"..lowestSlot.."^7")
+            end
+        end
+    else
        for k, v in pairs(itemcheck) do
            if v.name == item then
                if v.slot <= lowestSlot then
                    lowestSlot = v.slot
-                    durability = itemcheck[k].info and itemcheck[k].info.durability or nil
+                    metadata = itemcheck[k].info or itemcheck[k].metadata or {}
                end
            end
        end
    end
-
-    if isStarted(OXInv) then
-        local itemcheck = exports[OXInv]:Search('slots', item)
-        for k, v in pairs(itemcheck) do
-            if v.slot <= lowestSlot then
-                debugPrint(v.slot, itemcheck[k].metadata.durability)
-                lowestSlot = v.slot
-                durability = v.metadata and v.metadata.durability or nil
-            end
-        end
-    end
-
-    if isStarted(QSInv) then
-        local itemcheck = exports[QSInv]:getUserInventory()
-        for _, v in pairs(itemcheck) do
-            if v.name == item and v.slot <= lowestSlot then
-                lowestSlot = v.slot
-                durability = v.info and v.info.durability or nil
-            end
-        end
-    end
-
-    if isStarted(CoreInv) then
-        local itemcheck = exports[CoreInv]:getInventory()
-        for _, v in pairs(itemcheck) do
-            if v.name == item and v.slot <= lowestSlot then
-                lowestSlot = v.slot
-                durability = v.metadata and v.metadata.durability or nil
-            end
-        end
-    end
-
-    if isStarted(CodeMInv) then
-        local itemcheck = exports[CodeMInv]:GetClientPlayerInventory()
-        for _, v in pairs(itemcheck) do
-            if v.name == item and tonumber(v.slot) <= lowestSlot then
-                lowestSlot = tonumber(v.slot)
-                durability = v.info and v.info.durability or nil
-            end
-        end
-    end
-
-    if isStarted(OrigenInv) then
-        local itemcheck = exports[OrigenInv]:getPlayerInventory()
-        for _, v in pairs(itemcheck) do
-            if v.name == item and v.slot <= lowestSlot then
-                lowestSlot = v.slot
-                durability = v.metadata and v.metadata.durability or nil
-            end
-        end
-    end
-
-    if isStarted(TgiannInv) then
-        local itemcheck = exports[TgiannInv]:GetPlayerItems()
-        for _, v in pairs(itemcheck) do
-            if v.name == item and v.slot <= lowestSlot then
-                lowestSlot = v.slot
-                durability = v.metadata and v.metadata.durability or nil
-            end
-        end
-    end
-
-    -- For ESX default inventory (es_extended)
-    if ESX and isStarted(ESXExport) then
-        local xPlayer = ESX.GetPlayerData() or {}
-        if xPlayer.inventory then
-            for _, v in ipairs(xPlayer.inventory) do
-                if v.name == item then
-                    -- Optionally use a slot field if available; otherwise, use the index
-                    if v.slot and v.slot <= lowestSlot then
-                        lowestSlot = v.slot
-                    end
-                    if v.metadata and v.metadata.durability then
-                        durability = v.metadata.durability
-                    end
-                end
-            end
-        end
-    end
-
-    return durability, lowestSlot
+    return metadata, lowestSlot
 end

 --- Server event handler to set metadata for an item.
@@ -514,19 +456,21 @@ end
 ---
 --- @usage
 --- ```lua
--- TriggerServerEvent("script:server:setMetaData", { item = "drill", slot = 5, metadata = { durability = 80 } })
+--- TriggerServerEvent("script:server:setItemMetaData", { item = "drill", slot = 5, metadata = { durability = 80 } })
 --- ```
-RegisterNetEvent(getScript()..":server:setMetaData", function(data)
-    local src = source
+RegisterNetEvent(getScript()..":server:setItemMetaData", function(data, src)
+    local src = src or source
    if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then
-        debugPrint(src, data.item, 1, data.slot)
+        --debugPrint(src, data.item, 1, data.slot)
        local Player = Core.Functions.GetPlayer(src)
        Player.PlayerData.items[data.slot].info = data.metadata
-        Player.PlayerData.items[data.slot].description = "HP : "..data.metadata.durability
+        if data.metadata.durability then
+            Player.PlayerData.items[data.slot].description = "HP : "..data.metadata.durability
+        end
        Player.Functions.SetInventory(Player.PlayerData.items)

    elseif isStarted(OXInv) then
-        exports[OXInv]:SetDurability(src, data.slot, data.metadata.durability)
+        exports[OXInv]:SetMetadata(src, data.slot, data.metadata)

    elseif isStarted(QSInv) then
        exports[QSInv]:SetItemMetadata(src, data.slot, data.metadata)
@@ -653,7 +597,7 @@ function canCarry(itemTable, src)

        elseif isStarted(TgiannInv) then
            for k, v in pairs(itemTable) do
-                resultTable[k] = exports[TgiannInv]:CanCarryItem(source, k, v)
+                resultTable[k] = exports[TgiannInv]:CanCarryItem(src, k, v)
            end

        elseif isStarted(JPRInv) then
@@ -868,6 +812,14 @@ function getCurrentInvWeight()
    return weight
 end

+function hasFreeInventorySlots(slots, src)
+    local inv = getPlayerInv(src)
+    if (countTable(inv) + slots) <= InventorySlots then
+        return true
+    end
+    return false
+end
+
 -------------------------------------------------------------
 -- Check Item Existance - return boolean(true,false)
 -------------------------------------------------------------
@@ -882,9 +834,28 @@ end
 --- if doesItemExist(item) then print("item exists") end
 --- ```
 function doesItemExist(item)
-    if not item or item == "" then return false end
+    if not item or item == "" then
+        return false
+    end
+    if not Items or not next(Items) then
+        return item.." (Missing)"
+    end
    if Items[item] ~= nil then
-        return true
+        return Items[item]
    end
    return false
+end
+
+
+function getItemLabel(item)
+    if not item or item == "" then
+        return ""
+    end
+    if not Items or not next(Items) then
+        return item.." (Missing)"
+    end
+    if Items[item] ~= nil then
+        return Items[item].label
+    end
+    return item.." (Missing)"
 end
--- a/shared/jobfunctions.lua
+++ b/shared/jobfunctions.lua
@@ -104,16 +104,31 @@ function toggleDuty()
        TriggerServerEvent("QBCore:ToggleDuty")
        Wait(100)
        onDuty = getPlayer().onDuty
+
    elseif isStarted(RSGExport) then
        TriggerServerEvent("RSGCore:ToggleDuty")
        Wait(100)
        onDuty = getPlayer().onDuty
-    else
+
+    elseif isStarted(ESXExport) then
+        local tempJob = ESX.GetPlayerData().job
+        tempJob.onDuty = not onDuty
+        ESX.SetPlayerData("job", tempJob)
+        onDuty = getPlayer().onDuty
        if onDuty then
            triggerNotify(nil, "Now on duty", "success")
        else
            triggerNotify(nil, "Now off duty", "success")
        end
+
+    else
+        onDuty = not onDuty
+        if onDuty then
+            triggerNotify(nil, "Now on duty", "success")
+        else
+            triggerNotify(nil, "Now off duty", "success")
+        end
+
    end
 end

--- a/shared/make/loaders.lua
+++ b/shared/make/loaders.lua
@@ -187,7 +187,7 @@ end
 --- ```
 function playAnim(animDict, animName, duration, flag, ped, speed)
    loadAnimDict(animDict)
-    debugPrint("^6Bridge^7: ^3playAnim^7() ^2Triggered^7: ", animDict, animName)
+    debugPrint("^6Bridge^7: ^3playAnim^7() ^2Triggered^7: ", animDict, animName, flag)
 	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, speed or 8.0, speed or -8.0, duration or 30000, flag or 50, 1, false, false, false)
 end

@@ -238,4 +238,25 @@ function playGameSound(audioBank, soundSet, soundRef, coords, synced, range)
        PlaySoundFromEntity(soundId, soundRef, coords, soundSet, synced, 1.0)
    end
    ReleaseScriptAudioBank(audioBank)
+end
+
+-- Experimental, add fade in for spawned entities
+function fadeInEnt(ent, duration)
+    if not DoesEntityExist(ent) then return end
+    duration = duration or 500 -- in ms
+    local fadeSteps = 20
+    local stepTime = duration / fadeSteps
+
+    SetEntityAlpha(ent, 0, false)
+    SetEntityVisible(ent, true, false)
+    SetEntityLocallyInvisible(ent) -- sometimes helps prevent "pop-in" in early frames
+
+    for i = 1, fadeSteps do
+        Wait(stepTime)
+        local newAlpha = math.floor((i / fadeSteps) * 255)
+        SetEntityAlpha(ent, newAlpha, false)
+    end
+
+    -- Restore full visibility
+    ResetEntityAlpha(ent)
 end
--- a/shared/make/makePed.lua
+++ b/shared/make/makePed.lua
@@ -62,7 +62,7 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced)
        model = data.model
        loadModel(data.model)
        ped = CreatePed(0, model, coords.x, coords.y, coords.z - 1.03, coords.w, synced and synced or false, false)
-
+        SetEntityAlpha(ped, 0, false)
        -- Inheritance
        SetPedHeadBlendData(ped, data.custom.faceFather, data.custom.faceMother, data.custom.raceShape, data.custom.skinFather, data.custom.skinMother, data.custom.raceSkin, data.custom.faceMix or 0, data.custom.skinMix or 0, data.custom.raceMix or 0, false)

@@ -116,6 +116,7 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced)
        loadModel(model)
        if gameName == "rdr3" then
            ped = CreatePed(model, coords.x, coords.y, coords.z - 1.03, coords.w, synced or false, false)
+            SetEntityAlpha(ped, 0, false)
            SetEntityVisible(ped, 1) -- SetEntityVisible
            SetEntityAlpha(ped, 255, false) -- SetEntityAlpha
            SetRandomOutfitVariation(ped, true) -- Invisible without
@@ -141,6 +142,10 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced)
    end
    unloadModel(model)
    Peds[keyGen()..keyGen()] = ped
+
+    CreateThread(function()
+        fadeInEnt(ped)
+    end)
    return ped
 end

@@ -243,4 +248,4 @@ onResourceStop(function()
    for k in pairs(Peds) do
        DeletePed(Peds[k])
    end
-end, true)
+end, true)
--- a/shared/make/makeProp.lua
+++ b/shared/make/makeProp.lua
@@ -23,12 +23,16 @@ 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)
+    SetEntityAlpha(veh, 0, false)
    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))
    SetModelAsNoLongerNeeded(data.prop)
    Props[keyGen()..keyGen()] = prop
+    CreateThread(function()
+        fadeInEnt(prop)
+    end)
    return prop
 end

--- a/shared/make/makeVeh.lua
+++ b/shared/make/makeVeh.lua
@@ -18,18 +18,22 @@ function makeVeh(model, coords)
    local veh = CreateVehicle(model, coords.x, coords.y, coords.z, coords.w, true, false)
    SetVehicleHasBeenOwnedByPlayer(veh, true)
 	if gameName ~= "rdr3" then
-		SetNetworkIdCanMigrate(NetworkGetNetworkIdFromEntity(veh), true)
+        SetEntityAlpha(veh, 0, false)
+        SetNetworkIdCanMigrate(NetworkGetNetworkIdFromEntity(veh), true)
 		Wait(100)
 		SetVehicleNeedsToBeHotwired(veh, false)
 		SetVehRadioStation(veh, 'OFF')
 		SetVehicleFuelLevel(veh, 100.0)
 		SetVehicleModKit(veh, 0)
+
 	end
 	SetVehicleOnGroundProperly(veh)
-
 	debugPrint("^6Bridge^7: ^1Veh ^2Created^7: '^6"..veh.."^7' | ^2Hash^7: ^7'^6"..model.."^7' | ^2Coord^7: "..formatCoord(coords))
 	unloadModel(model)
 	Vehicles[#Vehicles + 1] = veh
+    CreateThread(function()
+        fadeInEnt(veh)
+    end)
 	return veh
 end

--- a/shared/make/progressBars.lua
+++ b/shared/make/progressBars.lua
@@ -135,6 +135,35 @@ function progressBar(data)
            end
        })

+    elseif Config.System.ProgressBar == "lation" then
+        if exports.lation_ui:progressBar({
+            label = data.label,
+            description = nil,
+            duration = debugMode and 1000 or data.time,
+            icon = data.icon,
+            useWhileDead = data.dead or false,
+            disable = {
+                combat = data.combat or true,
+                move = data.disableMovement or false,
+                car = data.disableMovement or false,
+            },
+            anim = {
+                dict = data.dict,
+                clip = data.anim,
+                flag = data.flag
+            },
+            prop = {
+                model = data.prop and data.prop.model,
+                pos = data.prop and (data.prop.pos or vec3(0, 0, 0)),
+                rot = data.prop and (data.prop.rot or vec3(0, 0, 0)),
+                bone = data.prop and (data.prop.bone or 0)
+            }
+        }) then
+            result = true
+        else
+            result = false
+        end
+
    elseif Config.System.ProgressBar == "red" then
        -- Currently only uses jim-redui if you choose this option
        if exports["jim_bridge"]:redProgressBar({
@@ -204,6 +233,8 @@ function stopProgressBar()
        exports[OXLibExport]:cancelProgress()
    elseif Config.System.ProgressBar == "qb" then
        TriggerEvent("progressbar:client:cancel")
+    elseif Config.System.ProgressBar == "lation" then
+        exports.lation_ui:cancelProgress()
    elseif Config.System.ProgressBar == "gta" or Config.System.ProgressBar == "red" then
        exports["jim_bridge"]:stopProgressBar()
    end
--- a/shared/metaHandlers.lua
+++ b/shared/metaHandlers.lua
@@ -58,9 +58,9 @@ end
 ---
 --- @usage
 --- ```lua
--- local myMeta = GetMetadata(player, "myKey")
+--- local myMeta = getPlayerMetadata(player, "myKey")
 --- ```
-function GetMetadata(player, key)
+function getPlayerMetadata(player, key)
    if not player then
        debugPrint("^6Bridge^7: ^3GetMetadata^7() calling server: "..key)
        return triggerCallback(getScript()..":server:GetMetadata", key)
@@ -98,11 +98,11 @@ createCallback(getScript()..":server:GetMetadata", function(source, key)
    if type(key) == "table" then
        local Metadata = {}
        for _, k in ipairs(key) do
-            Metadata[k] = GetMetadata(player, k)
+            Metadata[k] = getPlayerMetadata(player, k)
        end
        return Metadata
    elseif type(key) == "string" then
-        return GetMetadata(player, key)
+        return getPlayerMetadata(player, key)
    end
 end)

@@ -120,9 +120,9 @@ end)
 ---
 --- @usage
 --- ```lua
--- SetMetadata(player, "myKey", "newValue")
+--- setPlayerMetadata(player, "myKey", "newValue")
 --- ```
-function SetMetadata(player, key, value)
+function setPlayerMetadata(player, key, value)
    debugPrint("^6Bridge^7: ^3SetMetadata^7() setting metadata for key: "..key)
    if isStarted(QBExport) or isStarted(QBXExport) then
        debugPrint("^6Bridge^7: ^3SetMetadata^7() using QBExport/QBXExport")
@@ -144,14 +144,14 @@ function SetMetadata(player, key, value)
 end

 -- Register a server callback for setting metadata.
-createCallback(getScript()..":server:SetMetadata", function(source, key, value)
+createCallback(getScript()..":server:setPlayerMetadata", function(source, key, value)
    debugPrint("SetMetadata callback triggered for source:", source, "key:", key, "value:", value)
    local player = GetPlayer(source)
    --[[if not player then
        print("Error setting metadata: player not found for source "..tostring(source))
        return false
    end]]
-    SetMetadata(player, key, value)
+    setPlayerMetadata(player, key, value)
    print("Metadata set successfully.", key)
    return true
 end)
--- a/shared/notify.lua
+++ b/shared/notify.lua
@@ -62,6 +62,20 @@ function triggerNotify(title, message, type, src)
        else
            TriggerClientEvent(getScript()..":DisplayESXNotify", src, type, message)
        end
+    elseif Config.System.Notify == "lation" then
+        if not src then
+            exports.lation_ui:notify({
+                title = title,
+                message = message,
+                type = type or "success",
+            })
+        else
+            TriggerClientEvent("lation_ui:notify", src, {
+                title = title,
+                message = message,
+                type = type or "success",
+            })
+        end

    elseif Config.System.Notify == "red" then
        if isStarted("jim-redui") then
--- a/shared/playerfunctions.lua
+++ b/shared/playerfunctions.lua
@@ -412,7 +412,7 @@ function hasJob(job, source, grade)
        elseif isStarted(QBExport) and not isStarted(QBXExport) then
            if Core.Functions.GetPlayer then
                local player = Core.Functions.GetPlayer(src)
-                if not player then print("Player not found for src: "..src) end
+                if not player then goto skip end
                local jobinfo = player.PlayerData.job
                if jobinfo.name == job then
                    hasJobFlag = true
@@ -437,11 +437,10 @@ function hasJob(job, source, grade)
                    if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
                end
            end
-
        elseif isStarted(RSGExport) then
            if Core.Functions.GetPlayer then
                local player = Core.Functions.GetPlayer(src)
-                if not player then print("Player not found for src: "..src) end
+                if not player then goto skip end
                local jobinfo = player.PlayerData.job
                if jobinfo.name == job then
                    hasJobFlag = true
@@ -531,6 +530,7 @@ function hasJob(job, source, grade)
            print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3starter^1.^2lua^7")
        end
    end
+    ::skip::
    return hasJobFlag, duty
 end

--- a/shared/skillcheck.lua
+++ b/shared/skillcheck.lua
@@ -32,6 +32,25 @@ function skillCheck(data)
    elseif Config.System.skillCheck == "gta" then
        exports.jim_bridge:skillCheck()

+    elseif Config.System.skillCheck == "lation" then
+        local Skillbar = exports.lation_ui:skillCheck("",
+            {
+                "easy",
+                "easy",
+                "easy"
+            },
+            {
+                "1",
+                "2",
+                "3",
+                "4"
+            })
+
+        if Skillbar then
+            result = true
+        else
+            result = false
+        end
    else
        result = true
    end
--- a/shared/stashcontrol.lua
+++ b/shared/stashcontrol.lua
@@ -15,6 +15,9 @@ local stash
 -- If running on the server, create a callback to retrieve stash items.
 if isServer() then
    createCallback(getScript()..':server:GetStashItems', function(source, stashName)
+        if stashName == nil or stashName == "" then
+            return {}
+        end
        stash = getStash(stashName)
        return stash
    end)
@@ -35,9 +38,9 @@ local stashCache = {}
 --- local cached = GetStashTimeout("playerStash")
 --- ```
 function GetStashTimeout(stashName, stop)
-    if stop then
+    if stop or (stashName == nil or stashName == "") then
        stashCache = {}
-        return
+        return false
    end

    -- Retrieve cache for this stash, or initialize if not present.
@@ -85,7 +88,7 @@ end
 --- local found, stashName = checkStashItem({"playerStash", "storageStash"}, { iron = 2, wood = 5 })
 --- ```
 function checkStashItem(stashes, itemTable)
-    if not stashes then
+    if not stashes or stashes == "" then
        return hasItem(itemTable), nil
    end

@@ -317,7 +320,7 @@ end
 --- ```
 function getStash(stashName)
    local stashResource = ""
-    if type(stashName) ~= "string" then
+    if stashName == "" or type(stashName) ~= "string" then
        print("^6Bridge^7: ^2Stash name was not a string ^3"..stashName.."^7(^3"..type(stashName).."^7)")
        return {}
    end
@@ -420,6 +423,10 @@ end
 --- stashRemoveItem(currentItems, "playerStash", { iron = 2, wood = 5 })
 --- ```
 function stashRemoveItem(stashItems, stashName, items)
+    if stashName == "" or stashName == nil then
+        print("^1ERROR^7: ^1stashRemoveItem triggered but stashName was empty^7")
+        return
+    end
    if type(stashName) ~= "table" then
        stashName = { stashName }
    end
--- a/shared/vehicles.lua
+++ b/shared/vehicles.lua
@@ -53,6 +53,7 @@ function searchCar(vehicle)
            "Military",          --20
            "Commercial",        --21
            "Trains",            --22
+            "Open Wheel",        --23
        }
        if Vehicles then
            for k, v in pairs(Vehicles) do
--- a/starter.lua
+++ b/starter.lua
@@ -225,7 +225,7 @@ if isStarted(PSInv) then
            return true
        end

-        if versionCompare(GetResourceMetadata("ps-inventory", "version", 0), "1.0.6") then
+        if versionCompare(GetResourceMetadata(PSInv, "version", 0), "1.0.6") then
            print("^6Bridge^7: ^4"..PSInv.."^2 Version above ^31.0.6^7, ^2forcing ^1QBInvNew ^2to ^1true^7")
            QBInvNew = true
        else
@@ -233,4 +233,4 @@ if isStarted(PSInv) then
            QBInvNew = false
        end
    end
-end
+end
--- a/ui_modules/progressbar.lua
+++ b/ui_modules/progressbar.lua
@@ -6,6 +6,25 @@ local function loadTextureDict(dict)
 	end
 end

+local function loadAnimDict(animDict)
+	if not DoesAnimDictExist(animDict) then
+		print("^6Bridge^7: ^1ERROR^7: ^2Anim Dictionary^7 - '^6"..animDict.."^7' ^2does not exist in server") return
+	else
+		while not HasAnimDictLoaded(animDict) do RequestAnimDict(animDict) Wait(5) end
+	end
+end
+
+local function playAnim(animDict, animName, duration, flag, ped, speed)
+    loadAnimDict(animDict)
+	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, speed or 8.0, speed or -8.0, duration or 30000, flag or 50, 1, false, false, false)
+end
+
+local function stopAnim(animDict, animName, ped)
+    StopAnimTask(ped or PlayerPedId(), animDict, animName, 0.5)
+    StopAnimTask(ped or PlayerPedId(), animName, animDict, 0.5)
+    RemoveAnimDict(animDict)
+end
+
 function redProgressBar(data)
    local ped = PlayerPedId()

--- a/version.txt
+++ b/version.txt
@@ -1,17 +1,14 @@
-2.0.18
+2.0.21

- Fix ox_inv client item caching (images)
- Add better checks if errors in ox_inv items and add more prominent error messages all around
- Tidy up several debugPrints
- Move AuthEvents to new file
- Fix clearStash error with PSInv and JPRInv
- Add extra trigger event for PSInv when opening stash (hopefully fix missing items for some)
- Fix onPlayerUnloaded() not triggering
- Add support for esx_society in openBossMenu()
- Added support for okokbilling to billPlayer()
- Rework progressBar and ui_modules folder
- Rework isAnimal.lua to be more automated and smarter
- Rework/Fix auto detection of QBInvNew
- Add new functions to get players current Inventory Weight
+- Fix toggleDuty() for ESX users
+- Rename metadata handler functions
+- Add useToolDegrade() to force limited uses for items
+- Make breakTool() smarter
+- Fix getPlayer() not checking if player data exists yet on qbcore
+- Fix inbuilt gta progressbar error when stopping animations
+- lation_ui support fixes
+- Add fade in animations for created entities
+- Fix waitForSharedLoad() not announcing when an error occurs
+- Incrase authToken timeout from 5 seconds to 1 minute

 https://github.com/jimathy/jim_bridge
Author	SHA1	Message	Date
Jim Shield	880d2b0233	Version Bump `2.0.20` - `2.0.21`	2025-07-14 11:29:29 +01:00
Jim Shield	5865d2eeb2	increase authToken timeout from 5 sec to 1 min	2025-07-13 17:41:06 +01:00
Jim Shield	528735abd1	fix anim flag on lation_ui progressbars	2025-07-12 22:24:28 +01:00
Jim Shield	d4df995c71	fix lation_ui progressbars returning true when cancelled	2025-07-12 13:05:10 +01:00
Jim Shield	3b13fa663e	Merge pull request #49 from derTweaky/patch-1	2025-07-12 11:31:16 +01:00
derTweaky	e973c64ffd	Update makePed.lua Typo fix	2025-07-12 12:27:31 +02:00
Jim Shield	6ecf10c084	fix inventory config loading if vector4 is present	2025-07-11 21:16:45 +01:00
Jim Shield	79e765fbb0	Stop crafting trying to check blank stash names Skimmed through the stash checking and editing functions and added more "security" for handling nil or blank stash names	2025-07-11 13:33:44 +01:00
Jim Shield	d4a08d5e2b	Rewrite `waitForSharedLoad()` to fix issues	2025-07-10 22:41:28 +01:00
Jim Shield	eeb3f40018	fix break when trying to fade ents too far away	2025-07-10 22:16:26 +01:00
Jim Shield	e6b4c1d13c	Add fade in animations for entity spawning	2025-07-09 15:10:53 +01:00
Jim Shield	6ecbc3392a	make breaktool() smarter and add useToolDegrade()	2025-07-09 15:09:41 +01:00
Jim Shield	7f10c394de	make cache timeout optional	2025-07-09 15:09:14 +01:00
Jim Shield	fae099fd93	fix progressbar looking for missing function	2025-07-08 11:20:52 +01:00
Jim Shield	64d43b54e9	fix getPlayer() checking users not logged in yet	2025-07-08 00:48:39 +01:00
Jim Shield	d4abdbc93f	fix typo stopping mysql cache loading on esx	2025-07-07 17:56:23 +01:00
Jim Shield	b595453efe	Rename metahandler functions Realised I named the player and item metadata functions too closely and made it confusing, this separates them better	2025-07-07 17:47:04 +01:00
Jim Shield	d255034c02	Increase timer again on cache timeout Also moved around the cache timers to be a bit more accurate (timers start when the cache creation is triggered)	2025-07-07 02:11:36 +01:00
Jim Shield	d6fd2cc28c	Fix toggleDuty() for ESX	2025-07-07 00:09:34 +01:00
Jim Shield	7c47de5dc0	Version Bump `2.0.19` - `2.0.20`	2025-07-06 19:16:01 +01:00
Jim Shield	c1ab2b3505	Support only one progressBar when crafting	2025-07-06 19:13:10 +01:00
Jim Shield	1665ab41de	fix multicraft menu for lation_ui	2025-07-06 19:01:10 +01:00
Jim Shield	6d397b59bf	fix onExit support for lation_ui	2025-07-05 20:52:08 +01:00
Jim Shield	9dfbcbe878	fix typo breaking tgiann CanCarryItem export check	2025-07-05 13:24:19 +01:00
Jim Shield	ca0970b650	Add fallback config support for QBInv inventory Enhanced the inventory config loader to support both old and new config file structures for QBInv by introducing a fallback mechanism. The loader now attempts multiple config paths to improve compatibility with different versions.	2025-07-05 11:11:51 +01:00
Jim Shield	02218a4902	enhance dosItemExist() and add getItemLabel()	2025-07-05 00:33:26 +01:00
Jim Shield	a900044306	Fix hang when using jpr-inventory The script was randomly looping the config file check, if it hit qb-inventory first it would end the check and break the script, changed it to skip instead and fixed it	2025-07-04 23:44:37 +01:00
Jim Shield	7382a534a0	I THINK jim_bridge now fully supports lation_ui	2025-07-04 18:56:19 +01:00
Jim Shield	3b76b15bb4	Add starting support for lation_ui Added support for: - Menus - Draw Text - Notifications - Skillchecks - ProgressBar TODO: - Input dialogs	2025-07-04 15:20:02 +01:00
Jim Shield	f2eda0fef6	Add indicator of ingredient items check location	2025-07-04 15:17:56 +01:00
Jim Shield	61c1cce814	Increase cache export timeout to 2 minutes	2025-07-04 15:16:53 +01:00
Jim Shield	0f1660e3ed	remove debug print for ox_inv	2025-07-01 13:21:59 +01:00
Jim Shield	e5b55e49b7	Add missing functions for playing animations Forgot to include animation functions for progressbar ui_module when porting it over	2025-07-01 13:07:36 +01:00
Jim Shield	1ff01526bc	Add larger timeouts for caching	2025-06-30 23:19:23 +01:00
Jim Shield	1ed227080b	Add missing "Open Wheel" to searchCar() function	2025-06-30 23:18:43 +01:00
Jim Shield	b07c089946	Version Bump `2.0.18` - `2.0.19`	2025-06-28 20:08:51 +01:00
Jim Shield	d603067c77	Remove files i was testing with (forgot)	2025-06-28 20:04:50 +01:00
Jim Shield	5a97b8f83a	Fix script break stop if config file not found	2025-06-28 11:22:12 +01:00
Jim Shield	d0a09871c7	Fix for if using QBOX without ox_inventory Realised that if using older (and custom) versions of qbox, the item list can't be retrieved through `GetCoreObject()` This fixes that and also (if needed) grabs the item lists from inventories directly if needed	2025-06-27 13:35:28 +01:00
Jim Shield	e87aa8d74d	Fix server lag when loading scripts This was my bad, set up functions that requested the cache from server, didn't realise it was duplicating it and spamming it This moves the requests to a separate file and uses an export instead Also hopefully fixes ox_lib images being an arse	2025-06-26 23:15:33 +01:00
Jim Shield	e204e6153d	remove debug prints oops	2025-06-26 20:08:31 +01:00
Jim Shield	5c69f8dd28	add new function `hasFreeInventorySlots()` using the function to grab slot info, this can now check if you have enough inventory slots for items to be given, allowing it to check before TRYING to add them	2025-06-26 20:04:32 +01:00
Jim Shield	f3fa309dbf	Revamp framework caching People were reporting issues with scripts claiming items didn't exist, I believe this was due to their servers having slot starts (eg. alot of clothes or vehicles being loaded) I've rewritten it to fully delay loading until everything is correctly cached and let the scripts continue. Also hopefully reducing memory footprint for it too. --- Also slipped in an `experimental` function that grabs inventory config files to check their set InventoryWeight and InventorySlots to automatically apply it for other functions ---	2025-06-26 20:03:12 +01:00
Jim Shield	9d74e7cb46	Update setMetadata server event Before it was JUST for durability but fixed it to work for all item metadata	2025-06-26 19:57:03 +01:00