Merge pull request #17 from jimathy/1.0.9

1.0.9

README.md

@@ -21,6 +21,7 @@ But I want this script to grow with help of others who know more about other cor
 ---
 
 The installation of this script is simple
+- REMOVE `-main` from the folder name, like any other github hosted script
 - it just needs to start before any script that requires it
 - it can start before core scripts if you want
 - for `qb-core` I personally place this script in `resources > [standalone]`

crafting.lua

@@ -6,78 +6,67 @@ if IsDuplicityVersion() then
     end
 end
 
-local timeout = 0
+local timeout, timing, stashItems = 0, false, {}
-local timing = false
-local stashItems = {}
 function GetStashTimeout(stashName, stop)
-	if stop then stashItems = {} timing = false timeout = 0 return end
+    if stop then stashItems, timing, timeout = {}, false, 0 return end
-	if stashItems[1] then return true else
+    if #stashItems > 0 then return true end
-		if timeout <= 0 then
+    if timeout <= 0 then
-			stashItems = triggerCallback(GetCurrentResourceName()..':server:GetStashItems', stashName)
+        stashItems = triggerCallback(GetCurrentResourceName()..':server:GetStashItems', stashName)
-			timeout = 15000
+        timeout = 10000
-			if not timing then
+        if not timing then
-				CreateThread(function()
+            CreateThread(function()
-					timing = true
+                timing = true
-					while timeout > 0 do timeout -= 1000 Wait(1000) end
+                while timeout > 0 do timeout -= 1000 Wait(1000) end
-					timing = false stashItems = {} timeout = 0
+                timing, stashItems, timeout = false, {}, 0
-				end)
+            end)
-			end
+        end
-		end
+    end
-		return false
+    return false
-	end
 end
 
 local CraftLock = false
-function craftingMenu(data) local hasjob = false
+function craftingMenu(data)
     if CraftLock then return end
     if data.stashName and not GetStashTimeout(data.stashName) then
 		--triggerNotify(nil, "Chacking", "success")
     end
-	if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
+    if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
-	local Menu = {}
+    local Menu, hasjob = {}, false
     local Recipes = data.craftable.Recipes
 	for i = 1, #Recipes do
-		for k, v in pairs(Recipes[i]) do
+        if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
+        for k, v in pairs(Recipes[i]) do
 			if k ~= "amount" and k ~= "job" and k ~= "gang" then
-                if Recipes[i].job then hasjob = false
+                if Recipes[i].job then
 					for l, b in pairs(Recipes[i].job) do
 						hasjob = hasJob(l, nil, b)
-                        if hasJob == true then break end
+                        if hasjob == true then break end
 					end
-				end
+				else hasjob = true end
-                local setheader, settext = "", ""
+                local setheader, settext, disable = "", "", false
-				local disable = false
+                if hasjob then
-				local checktable = {}
+                    local itemTable = {}
-                if Recipes[i].job and hasjob == false then else
                     for l, b in pairs(Recipes[i][tostring(k)]) do
-                        if not Items[l] then print("^3Error^7: ^2Script can't find ingredient item in Shared Items - ^1"..l.."^7") return end
+                        settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
-                        settext = settext..(settext ~= "" and br or "")..Items[l].label..(b > 1 and " x"..b or "")
+                        itemTable[l] = b
-                        if data.stashName then checktable[l] = stashhasItem(stashItems, l, b)
-                        else checktable[l] = hasItem(l, b) end
                         Wait(0)
                     end
-                    for _, v in pairs(checktable) do
+                    if Config.System.Debug then print("^6Bridge^7: ^2Checking"..(data.stashName and " ^7'^6"..data.stashName.."^7'" or "").." ^2ingredients^7 - ^6"..k.."^7") end
-                        if not v then
+                    if data.stashName then disable = not stashhasItem(stashItems, itemTable)
-                            disable = true
+                    else disable = not hasItem(itemTable) end
-                            break
+                    setheader = (Items[tostring(k)] and Items[tostring(k)].label or "error - "..tostring(k))..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")..(not disable and " ✔️" or "")
-                        end
-                    end
-                    setheader = Items[tostring(k)].label..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")..(not disable and " ✔️" or "")
                     Menu[#Menu + 1] = {
                         isMenuHeader = disable,
                         icon = invImg(tostring(k)),
                         header = setheader, txt = settext,
                         onSelect = function()
                             local transdata = { item = k, craft = data.craftable.Recipes[i], craftable = data.craftable, coords = data.coords, stashName = data.stashName, onBack = data.onBack }
-                            if Config.Crafting.MultiCraft then
+                            if Config.Crafting.MultiCraft then multiCraft(transdata) else makeItem(transdata) end
-                                multiCraft(transdata)
-                            else
-                                makeItem(transdata)
-                            end
                         end,
                     }
                 end
             end
+            Wait(0)
 		end
 	end
 	openMenu(Menu, { header = data.craftable.Header, onBack = data.onBack or nil, canClose = true, onExit = function() end,  })
@@ -96,17 +85,20 @@ function multiCraft(data) local Menu = {}
     }
 	for k in pairsByKeys(success) do
         local settext = ""
+        local itemTable = {}
         for l, b in pairs(data.craft[data.item]) do
-            if data.stashName then
+            itemTable[l] = (b * k)
-                success[k] = stashhasItem(stashItems, l, (b * k))
-            else
-                success[k] = hasItem(l, (b * k))
-            end
             settext = settext..(settext ~= "" and br or "")..Items[l].label..(b*k > 1 and "- x"..b*k or "")
             Wait(0)
         end
+        local disable = false
+        if Config.System.Debug then print("^6Bridge^7: ^2Checking "..(data.stashName and "^7'^6"..data.stashName.."^7'" or "inventory").."^7x^5"..k.." ^2ingredients^7 - ^6"..data.item.."^7") end
+        if data.stashName then disable = not stashhasItem(stashItems, itemTable)
+        else disable = not hasItem(itemTable) end
+
 		Menu[#Menu + 1] = {
-			isMenuHeader = not success[k],
+			isMenuHeader = disable,
+            arrow = not disable,
             header = "Craft - x"..k * data.craft.amount,
             txt = settext,
             onSelect = function ()
@@ -118,61 +110,55 @@ function multiCraft(data) local Menu = {}
 end
 
 function makeItem(data)
-	if not CraftLock then CraftLock = true else return end
+	if CraftLock then return end
-    local bartime, bartext, animDict, anim = nil, nil, nil, nil
+	CraftLock = true
-    if data.craftable.progressBar then
-        bartime = data.craftable.progressBar.time
-        bartext = data.craftable.progressBar.label
-    else
-        bartime = 5000
-        bartext = Loc[Config.Lan].progressbar["progress_make"]
-    end
-    animDict = data.craftable.Anims.animDict or "amb@prop_human_parking_meter@male@idle_a"
-    anim = data.craftable.Anims.anim or "idle_a"
 
-    local amount = (data.amount and data.amount ~= 1) and data.amount or 1
+	local bartime = data.craftable.progressBar and data.craftable.progressBar.time or 5000
+	local bartext = data.craftable.progressBar and data.craftable.progressBar.label or Loc[Config.Lan].progressbar["progress_make"]
+	local animDict = data.craftable.Anims.animDict or "amb@prop_human_parking_meter@male@idle_a"
+	local anim = data.craftable.Anims.anim or "idle_a"
+	local amount = data.amount and (data.amount ~= 1) and data.amount or 1
 
-    local crafted = true
+	local crafted, crafting = true, true
-    local crafting = true
+	local cam = createTempCam(PlayerPedId(), data.coords)
-
+	startTempCam(cam)
-    local cam = createTempCam(PlayerPedId(), data.coords)
-    startTempCam(cam)
 
     for i = 1, amount do
-        for _, v in pairs(data.craft) do
+        for k, v in pairs(data.craft) do
-            if type(v) == "table" then
+            if k ~= "amount" and k ~= "job" then
-                for l, b in pairs(v) do
+                if type(v) == "table" then
-                    if crafting and progressBar({
+                    for l, b in pairs(v) do
-                        label = "Using "..b.." "..Items[l].label,
+                        if crafting and progressBar({
-                        time = 1000,
+                            label = "Using "..b.." "..Items[l].label,
-                        cancel = true,
+                            time = 1000,
-                        dict = 'pickup_object',
+                            cancel = true,
-                        anim = "putdown_low",
+                            dict = 'pickup_object',
-                        flag = 48,
+                            anim = "putdown_low",
-                        icon = l,
+                            flag = 48,
-                    }) then
+                            icon = l,
-                        --TriggerEvent('inventory:client:ItemBox', Items[l], "use", b) -- Show item box for each item
+                        }) then
-                    else
+                            --TriggerEvent('inventory:client:ItemBox', Items[l], "use", b) -- Show item box for each item
-                        crafted = false
+                        else
-                        crafting = false
+							crafted, crafting = false, false
-                        break
+							break
+                        end
+                        Wait(200)
                     end
-                    Wait(200)
+                    if crafted then
-                end
+                        if crafting and progressBar({
-                if crafted then
+                            label = bartext..Items[data.item].label,
-                    if crafting and progressBar({
+                            time = bartime,
-                        label = bartext..Items[data.item].label,
+                            cancel = true,
-                        time = bartime,
+                            dict = animDict,
-                        cancel = true,
+                            anim = anim,
-                        dict = animDict,
+                            flag = 8,
-                        anim = anim,
+                            icon = data.item,
-                        flag = 8,
+                        }) then
-                        icon = data.item,
+                            TriggerServerEvent(GetCurrentResourceName()..":Crafting:GetItem", data.item, data.craft, data.stashName)
-                    }) then
+                        else
-                        TriggerServerEvent(GetCurrentResourceName()..":Crafting:GetItem", data.item, data.craft, data.stashName)
+                            crafting = false
-                    else
+                            break
-                        crafting = false
+                        end
-                        break
                     end
                 end
             end
@@ -187,29 +173,25 @@ function makeItem(data)
 end
 
 RegisterNetEvent(GetCurrentResourceName()..":Crafting:GetItem", function(ItemMake, craftable, stashName)
-	local src = source
+    local src, amount, stashItems = source, craftable and craftable.amount or 1, stashName and getStash(stashName)
-	local amount = 1
+
     if stashName then
-        local stashItems = getStash(stashName)
-        if craftable["amount"] then amount = craftable["amount"] end
         local itemRemove = {}
-        for k, v in pairs(craftable[ItemMake]) do
+        for k, v in pairs(craftable[ItemMake] or {}) do
-            for l, b in pairs(stashItems) do
+            for _, b in pairs(stashItems or {}) do
-                if k == b.name then
+                if k == b.name then itemRemove[k] = v end
-                    itemRemove[k] = v
-                end
             end
         end
         stashRemoveItem(stashItems, stashName, itemRemove)
     else
         if craftable then
-            if craftable["amount"] then amount = craftable["amount"] end
+            for k, v in pairs(craftable[ItemMake] or {}) do
-            for k, v in pairs(craftable[ItemMake]) do
                 TriggerEvent(GetCurrentResourceName()..":server:toggleItem", false, tostring(k), v, src)
             end
         end
     end
     TriggerEvent(GetCurrentResourceName()..":server:toggleItem", true, ItemMake, amount, src)
+    if GetResourceState("core_skills"):find("start") then exports["core_skills"]:AddExperience(src, 2) end
 end)
 
 --[[SHOPS]]--
@@ -224,149 +206,67 @@ function openShop(data)
 end
 
 -- Client & Server side
-function hasItem(items, amount, src) local amount, count = amount and amount or 1, 0
+function hasItem(items, amount, src) local amount = amount and amount or 1
-    if src then
+    local grabInv = nil
-        if GetResourceState(OXInv):find("start") then
+    local foundInv = ""
-            local item = exports[OXInv]:GetItem(src, items)
+    if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
-            local amount = (amount or 1)
+    if GetResourceState(OXInv):find("start") then
-            if item.count >= amount then
+        foundInv = OXInv
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.count.."^7/^3"..amount.." "..tostring(items)) end
+        grabInv = src and exports.ox_inventory:GetInventoryItems(src) or exports[OXInv]:GetPlayerItems()
-                return true
-            else if Config.System.Debug then
-                print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
-            end
 
-        elseif GetResourceState(QSInv):find("start") then
+    elseif GetResourceState(QSInv):find("start") then
-            for _, itemData in pairs(exports[QSInv]:GetInventory(src)) do
+        foundInv = QSInv
-                if itemData and (itemData.name == items) then
+        grabInv = src and exports[QSInv]:GetInventory(src) or exports[QSInv]:getUserInventory()
-                    --if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
-                    count += (itemData.amount or 1)
-                end
-            end
-            if count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
-                return true
-                else
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
-            end
 
-        elseif GetResourceState(CoreInv):find("start") then
+    elseif GetResourceState(OrigenInv):find("start") then
-            local item = exports[CoreInv]:getItems('primary-'..src, items)
+        foundInv = OrigenInv
+        grabInv = src and exports[OrigenInv]:getPlayerInventory(src) or exports[OrigenInv]:getPlayerInventory()
 
-            if item.amount >= amount then
+    elseif GetResourceState(CoreInv):find("start") then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.amount.."^7/^3"..amount.." "..tostring(items)) end
+        foundInv = CoreInv
-                return true
+        if src then
-            else if Config.System.Debug then
+            if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-                print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
+                grabInv = Core.Functions.GetPlayer(src).PlayerData.items
-                return false
+            elseif GetResourceState(ESXExport):find("start") then
+                local Player = ESX.GetPlayerFromId(src)
+                grabInv = Player.getInventory(false)
             end
-
-        elseif GetResourceState(CodeMInv):find("start") then
-            local success = exports["codem-inventory"]:CheckItemValid(src, items, amount)
-            if success then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..amount.." "..tostring(items)) end
-                return true
-            end
-
-        elseif GetResourceState(CodeMInv):find("start") then
-            for _, itemData in pairs(exports[CodeMInv]:GetUserInventory(src)) do
-                if itemData and (itemData.name == items) then
-                    if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
-                    count += (itemData.amount or 1)
-                end
-            end
-            if count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
-                return true
-            else
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
-            end
-
         else
-            for _, itemData in pairs(Core.Functions.GetPlayer(src).PlayerData.items) do
+            local p = promise.new()
-                if itemData and (itemData.name == items) then
+            Core.Functions.TriggerCallback('core_inventory:server:getInventory', function(cb) p:resolve(cb) end)
-                    if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
+            local result = Citizen.Await(p)
-                    count += (itemData.amount or 1)
+            if type(result) == "string" then result = json.decode(result) end
-                end
+            grabInv = result
-            end
-            if count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
-                return true
-            else
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
-            end
         end
+
+    elseif GetResourceState(CodeMInv):find("start") then
+        foundInv = CodeMInv
+        grabInv = src and exports[CodeMInv]:GetUserInventory(src) or exports[CodeMInv]:GetClientPlayerInventory()
+
+    elseif GetResourceState(QBInv):find("start") then
+        foundInv = QBInv
+        grabInv = src and Core.Functions.GetPlayer(src).PlayerData.items or Core.Functions.GetPlayerData().items
+
     else
-        if GetResourceState(OXInv):find("start") then
+        print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
-            local count = tonumber(exports[OXInv]:Search('count', items))
+    end
-            local amount = (amount or 1)
-            if count >= amount then if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end return true
-            else if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end return false end
 
-        elseif GetResourceState(QSInv):find("start") then
+    if grabInv then
-            for _, itemData in pairs(exports[QSInv]:getUserInventory()) do
+        local hasTable = {}
-                if itemData and (itemData.name == items) then
+        for item, amount in pairs(items) do
-                    if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
+            if not Items[item] then print("^4ERROR^7: ^2Script can't find ingredient item in Shared Items - ^1"..item.."^7") end
-                    count += (itemData.amount or 1)
+            local count = 0
-                end
+            for _, itemData in pairs(grabInv) do
+                if itemData and (itemData.name == item) then count += (itemData.count or itemData.amount or 1) end
             end
-            if count >= amount then
+            foundInv = foundInv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
+            local foundMessage = "^6Bridge^7: ^3hasItem^7[^6"..foundInv.."^7]: "..tostring(item).." ^3"..count.."^7/^3"..amount
-                return true
+            if count >= amount then foundMessage = foundMessage.." ^5FOUND^7" else foundMessage = foundMessage .." ^1NOT FOUND^7" end
-            else
+            if Config.System.Debug then print(foundMessage) end
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
+            hasTable[item] = { hasItem = count >= amount, count = count }
-                return false
-            end
-
-        elseif GetResourceState(CoreInv):find("start") then
-            for _, itemData in pairs(exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))) do
-                if itemData and (itemData.name == items) then
-                    if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
-                    count += (itemData.amount or 1)
-                end
-            end
-            if count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
-                return true
-                else
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
-            end
-
-        elseif GetResourceState(CodeMInv):find("start") then
-            local success = exports[CodeMInv]:CheckItemValid(items, amount)
-            if success then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..amount.." "..tostring(items)) end
-                return true
-            end
-
-        elseif GetResourceState(QBInv):find("start") then
-            --if tonumber(GetResourceMetadata(QBInv, 'version')) <= 1.2 then
-            --    return exports[QBInv]:HasItem(items, amount)
-            --else
-                for _, itemData in pairs(Core.Functions.GetPlayerData().items) do
-                    if itemData and (itemData.name == items) then
-                        if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(items).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)") end
-                        count += (itemData.amount or 1)
-                    end
-                end
-                if count >= amount then
-                    if Config.System.Debug then
-                        print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items))
-                    end
-                    return true
-                else
-                    if Config.System.Debug then
-                        print("^6Bridge^7: ^3HasItem^7: ^2"..tostring(items).." ^1NOT FOUND^7")
-                    end
-                    return false
-                end
-            -- end
         end
+        for k, v in pairs(hasTable) do if not v.hasItem then return false, hasTable end end
+        return true, hasTable
     end
 end
 
@@ -379,43 +279,51 @@ function openStash(data)
         exports[CodeMInv]:OpenStash(data.stash, 400000, 100)
     else
         TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash)
+        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
 	end
     lookEnt(data.coords)
 end
 
-function getStash(stashName)
+function getStash(stashName) local stashResource = ""
     local stashItems, items = {}, {}
-    if GetResourceState(OXInv):find("start") then
+    if GetResourceState(OXInv):find("start") then stashResource = OXInv
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7ox_inventory") end
         stashItems = exports[OXInv]:Inventory(stashName).items
-    elseif GetResourceState(QSInv):find("start") then
+
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qs-inventory") end
+    elseif GetResourceState(QSInv):find("start") then stashResource = QSInv
         stashItems = exports[QSInv]:GetStashItems(stashName)
-    elseif GetResourceState(CodeMInv):find("start") then
+
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qs-inventory") end
+    elseif GetResourceState(CoreInv):find("start") then stashResource = CoreInv
+        stashItems = exports[CoreInv]:getInventory(stashName)
+
+    elseif GetResourceState(CodeMInv):find("start") then stashResource = CodeMInv
         stashItems = exports[CodeMInv]:GetInventoryItems('Stash', stashName)
-    elseif GetResourceState(QBInv):find("start") then
+
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qb-inventory") end
+    elseif GetResourceState(OrigenInv):find("start") then stashResource = OrigenInv
+        stashItems = exports[OrigenInv]:GetStashItems(stashName)
+
+    elseif GetResourceState(QBInv):find("start") then stashResource = QBInv
         local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
 		if result then stashItems = json.decode(result) end
     end
+
+    if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..stashResource) end
     if stashItems then
         for _, item in pairs(stashItems) do
             local itemInfo = Items[item.name:lower()]
             if itemInfo then
-                items[item.slot] = {
+                local indexNum = #items+1 -- Added to help recreate missing slot numbers
-                    name = itemInfo["name"],
+                items[(item.slot and item.slot) or indexNum] = {
+                    name = itemInfo.name or nil,
                     amount = tonumber(item.amount) or tonumber(item.count),
-                    info = item.info ~= nil and item.info or "",
+                    info = item.info or "",
-                    label = itemInfo["label"],
+                    label = itemInfo.label or nil,
-                    description = itemInfo["description"] ~= nil and itemInfo["description"] or "",
+                    description = itemInfo.description or "",
-                    weight = itemInfo["weight"],
+                    weight = itemInfo.weight or nil,
-                    type = itemInfo["type"],
+                    type = itemInfo.type or nil,
-                    unique = itemInfo["unique"],
+                    unique = itemInfo.unique or nil,
-                    useable = itemInfo["useable"],
+                    useable = itemInfo.useable or nil,
-                    image = itemInfo["image"],
+                    image = itemInfo.image or nil,
-                    slot = item.slot,
+                    slot = (item.slot and item.slot) or indexNum,
                 }
             end
         end
@@ -430,11 +338,32 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
             exports[OXInv]:RemoveItem(stashName, k, v)
             if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v) end
         end
+
     elseif GetResourceState(QSInv):find("start") 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
+                            if Config.System.Debug then
+                                print("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
+                            end
+                            stashItems[l] = nil
+                        else
+                            if Config.System.Debug then
+                                print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
+                            end
+                            exports[QSInv]:RemoveItemIntoStash(stashName, k, v, l)
+                        end
+                    end
+                end
+            end
+
+    elseif GetResourceState(CoreInv):find("start") then
         for k, v in pairs(items) do
-            exports[QSInv]:RemoveItemIntoStash(stashName, k, v)
+            exports[CoreInv]:removeItemExact(stashName, k, v)
-            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v) end
+            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v) end
         end
+
     elseif GetResourceState(CodeMInv):find("start") then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do
@@ -456,7 +385,14 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
         if Config.System.Debug then
             print("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
         end
-    else
+
+    elseif GetResourceState(OrigenInv):find("start") then
+        for k, v in pairs(items) do
+            exports[OrigenInv]:RemoveItem(stashName, k, v)
+            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v) end
+        end
+
+    elseif GetResourceState(QBInv):find("start") then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do
                 if stashItems[l].name == k then
@@ -478,26 +414,37 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
             print("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
         end
         MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { ['stash'] = stashName, ['items'] = json.encode(stashItems) })
+    else
+        print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
     end
 end
 RegisterNetEvent(GetCurrentResourceName()..":server:stashRemoveItem", stashRemoveItem)
 
-function stashhasItem(stashItems, item, amount) local amount, count = amount and amount or 1, 0
+function stashhasItem(stashItems, items, amount)
-	for k, itemData in pairs(stashItems) do
+    local invs = {OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, QBInv}
-		if itemData and (itemData.name == item) then
+    local foundInv = ""
-			--if Config.System.Debug then
+    for _, inv in ipairs(invs) do
-            --    print("^6Bridge^7: ^3stashHasItem^7: ^2Item^7: '^3"..tostring(item).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.amount).."^7)")
+        if GetResourceState(inv):find("start") then
-            --end
+            foundInv = inv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
-			count += (itemData.amount or 1)
+            break
-		end
+        end
-	end
-	if count >= amount then
-        if Config.System.Debug then
-            print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^3"..item.." ^5FOUND^7 x^3"..count.."^7/^3"..amount.."^7") end
-            return
-            true
-	else
-        if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^2Items ^1NOT FOUND^7 "..json.encode(item)) end
-        return false
     end
+
+    if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
+    local hasTable = {}
+    for item, amount in pairs(items) do
+        local count = 0
+        for _, itemData in pairs(stashItems) do
+            if itemData and (itemData.name == item) then
+                count += (itemData.amount or 1)
+            end
+        end
+
+        local debugMsg = string.format("^6Bridge^7: ^3stashHasItem^7[^6%s^7]: %s '%s' ^3%d^7/^3%d^7", foundInv, (count >= amount and "^5FOUND^7" or "^1NOT FOUND^7"), item, count, amount)
+        if Config.System.Debug then print(debugMsg) end
+
+        hasTable[item] = { hasItem = (count >= amount), count = count }
+    end
+    for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
+    return true, hasTable
 end

exports.lua

@@ -7,8 +7,9 @@ Exports = {
     OXInv = "ox_inventory",
     QBInv = "qb-inventory",
     QSInv = "qs-inventory",
-    CoreInv = "core-inventory",
+    CoreInv = "core_inventory",
     CodeMInv = "codem-inventory",
+    OrigenInv = "origen_inventory",
 
     OXLibExport = "ox_lib",
 

functions.lua

@@ -11,7 +11,7 @@ end
 local time = 100
 function loadModel(model)
     if not HasModelLoaded(model) then if Config.System.Debug then print("^6Bridge^7: ^2Loading Model^7: '^6"..model.."^7'") end
-	while not HasModelLoaded(model) do if time > 0 then time = time - 1 RequestModel(model)
+	while not HasModelLoaded(model) do if time > 0 then time -= 1 RequestModel(model)
 		else time = 1000 print("^6Bridge^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'") break end
 		Wait(10) end
 	end
@@ -29,7 +29,7 @@ function pairsByKeys(t) local a = {} for n in pairs(t) do a[#a+1] = n end table.
 
 function playAnim(animDict, animName, duration, flag, ped)
 	loadAnimDict(animDict)
-	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, 1.0, -1.0, duration or 30000, flag or 50, 1, false, false, false)
+	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, 8.0, -8.0, duration or 30000, flag or 50, 1, false, false, false)
 end
 
 function stopAnim(animDict, animName)
@@ -154,12 +154,14 @@ function lookEnt(entity) local ped = PlayerPedId()
 end
 
 function destroyProp(entity)
-	if Config.System.Debug then print("^6Bridge^7: ^2Destroying Prop^7: '^6"..entity.."^7'") end
+	if entity then
-	if IsEntityAttachedToEntity(entity, PlayerPedId()) then
+		if Config.System.Debug then print("^6Bridge^7: ^2Destroying Prop^7: '^6"..entity.."^7'") end
-		SetEntityAsMissionEntity(entity)
+		if IsEntityAttachedToEntity(entity, PlayerPedId()) then
-		DetachEntity(entity, true, true)
+			SetEntityAsMissionEntity(entity)
+			DetachEntity(entity, true, true)
+		end
+		DeleteObject(entity)
 	end
-	DeleteObject(entity)
 end
 
 function pushVehicle(entity)
@@ -188,6 +190,18 @@ function pushVehicle(entity)
 	end
 end
 
+function ensureNetToVeh(vehNetID)
+	if Config.System.Debug then print("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)") end
+	local timeout = 100
+	while not NetworkDoesNetworkIdExist(vehNetID) and timeout > 0 do timeout -= 1 Wait(10) end
+	if not NetworkDoesNetworkIdExist(vehNetID) then return 0 end
+	timeout = 100
+	local vehicle = NetToVeh(vehNetID)
+	while not DoesEntityExist(vehicle) and vehicle ~= 0 and timeout > 0 do timeout -= 1 Wait(10) end
+	if not DoesEntityExist(vehicle) then return 0 end
+	return vehicle
+end
+
 function makeBlip(data)
 	local blip = AddBlipForCoord(data.coords)
 	SetBlipAsShortRange(blip, true)
@@ -489,7 +503,7 @@ function setThirst(src, thirst)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('thirst', thirst)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
 	end
@@ -499,7 +513,7 @@ function setHunger(src, hunger)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('hunger', hunger)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
 	end
@@ -549,8 +563,9 @@ end
 
 RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give, item, amount, newsrc)
     local src = newsrc or source
+	local addremove = (tostring(give) == "true" and "addItem" or "removeItem")
 	if Config.System.Debug then
-		print("^6Bridge^7: ^3toggleItem ^2triggered^7: ^6"..(tostring(give) == "true" and "addItem" or "removeItem").."^7 - ['^8"..tostring(item).."^7'] x"..(tostring(amount) or "1"))
+		print("^6Bridge^7: ^3toggleItem ^2triggered^7: ^6"..addremove.."^7 - '"..tostring(item).."' x"..(tostring(amount) or "1"))
 	end
 	local remamount = (amount and amount or 1)
 	if item == nil then return end
@@ -559,23 +574,37 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
             if GetResourceState(OXInv):find("start") then
                 local success = exports[OXInv]:RemoveItem(src, item, (amount and amount or 1), nil)
 				if Config.System.Debug then
-					print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..OXInv)
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..OXInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
             elseif GetResourceState(QSInv):find("start") then
                 local success = exports[QSInv]:RemoveItem(src, item, amount)
 				if Config.System.Debug then
-					print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..QSInv)
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..QSInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
+				end
+
+			elseif GetResourceState(CoreInv):find("start") then
+				if GetResourceState(QBExport):find("start") then
+					Core.Functions.GetPlayer(src).Functions.RemoveItem(item, amount, nil)
+				elseif GetResourceState(ESXExport):find("start") then
+					ESX.GetPlayerFromId(src).removeInventoryItem(item, count)
 				end
-            elseif GetResourceState(CoreInv):find("start") then
-                local success = exports[CoreInv]:removeItemExact('primary-'..src, item, amount)
 				if Config.System.Debug then
-					print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..CoreInv)
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..CoreInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
-            elseif GetResourceState(CodeMInv):find("start") then
+
+            elseif GetResourceState(OrigenInv):find("start") then
+                local success = exports[OrigenInv]:RemoveItem(src, item, amount)
+				if Config.System.Debug then
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..OrigenInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
+				end
+
+			elseif GetResourceState(CodeMInv):find("start") then
                 local success = exports[CodeMInv]:RemoveItem(src, item, amount)
 				if Config.System.Debug then
-					print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..CodeMInv)
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..CodeMInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
             elseif GetResourceState(QBInv):find("start") then
 				while remamount > 0 do
                     if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1) then end
@@ -585,10 +614,10 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
                     TriggerClientEvent('inventory:client:ItemBox', src, Items[item], "remove", (amount and amount or 1))
                 end
 				if Config.System.Debug then
-					print("^6Bridge^7: ^1Removing ^2from Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) - '"..QBInv)
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..QBInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
 			else
-				print("^4Error^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
+				print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
 			end
 		else
             dupeWarn(src, item) -- if not boot the player
@@ -598,23 +627,37 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
         if GetResourceState(OXInv):find("start") then
 			local success = exports[OXInv]:AddItem(src, item, amount or 1, nil)
 			if Config.System.Debug then
-                print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..OXInv)
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..OXInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		elseif GetResourceState(QSInv):find("start") then
             local success = exports[QSInv]:AddItem(src, item, amount)
             if Config.System.Debug then
-                print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..QSInv)
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..QSInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		elseif GetResourceState(CoreInv):find("start") then
-            local success = exports[CoreInv]:addItem('primary-'..src, item, amount)
+			if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-            if Config.System.Debug then
+				Core.Functions.GetPlayer(src).Functions.AddItem(item, amount, nil, nil)
-                print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..CoreInv)
+			elseif GetResourceState(ESXExport):find("start") then
+				ESX.GetPlayerFromId(src).addInventoryItem(item, amount)
+			end
+			if Config.System.Debug then
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..CoreInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
         elseif GetResourceState(CodeMInv):find("start") then
             local success = exports[CodeMInv]:AddItem(src, item, amount)
 			if Config.System.Debug then
-                print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..CodeMInv)
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..CodeMInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
+		elseif GetResourceState(OrigenInv):find("start") then
+			local success = exports[OrigenInv]:AddItem(src, item, amount)
+			if Config.System.Debug then
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..OrigenInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
+			end
+
 		elseif GetResourceState(QBInv):find("start") then
 			if Core.Functions.GetPlayer(src).Functions.AddItem(item, amount or 1) then
 				--if Config.Crafting.showItemBox then
@@ -622,10 +665,11 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
                 --end
 			end
 			if Config.System.Debug then
-                print("^6Bridge^7: ^4Giving ^2Player^7(^2"..src.."^7) '^6"..Items[item].label.."^7(^2x^6"..((amount and amount or "1")).."^7) ^7"..QBInv)
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..QBInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		else
-			print("^4Error^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
+			print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
 		end
 	end
 end)
@@ -654,12 +698,21 @@ end
 
 local function CheckVersion()
 	if IsDuplicityVersion() then
+		local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
 		PerformHttpRequest('https://raw.githubusercontent.com/jimathy/UpdateVersions/master/'..GetCurrentResourceName()..'.txt', function(err, newestVersion, headers)
-			if not newestVersion then print("Currently unable to run a version check.") return end
+			if not newestVersion then
-			local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
+				PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..GetCurrentResourceName()..'/master/version.txt', function(err, freeVersion, headers)
-			newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7"
+					if not freeVersion then print("^1Currently unable to run a version check for ^7'^3"..GetCurrentResourceName().."^7' ("..currentVersion.."^7)") return end
-			print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..newestVersion)
+					local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
-			print(newestVersion == currentVersion and '^6You are running the latest version.^7 ('..currentVersion..')' or "^1You are currently running an outdated version^7, ^1please update^7!")
+					freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
+					print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..freeVersion)
+					print(freeVersion == currentVersion and "^7'^3"..GetCurrentResourceName().."^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3"..GetCurrentResourceName().."^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
+				end)
+			else
+				newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
+				print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..newestVersion)
+				print(newestVersion == currentVersion and '^6You are running the latest version.^7 ('..currentVersion..')' or "^1You are currently running an outdated version^7, ^1please update^7!")
+			end
 		end)
 	end
 end
@@ -854,4 +907,4 @@ function StopEffects() -- Used to clear up any effects stuck on screen
     AnimpostfxStop('RaceTurbo')
     AnimpostfxStop('FocusIn')
     AnimpostfxStop('Rampage')
-end
+end

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "1.0"
+version "1.0.9"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 game "gta5"
@@ -11,4 +11,4 @@ files {
     'functions.lua',
     'wrapper.lua',
     'crafting.lua',
-}
+}

version.txt

@@ -1 +1 @@
-1.0
+1.0.9

wrapper.lua

@@ -1,29 +1,21 @@
 Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
 
-OXLibExport = Exports and Exports.OXLibExport or ""
+Exports.QBInv = GetResourceState("ps-inventory"):find("start") and "ps-inventory" or GetResourceState("lj-inventory"):find("start") and "lj-inventory" or Exports.QBInv
 
-QBXExport = Exports and Exports.QBXExport or ""
+OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport = Exports.OXLibExport or "", Exports.QBXExport or "", Exports.QBExport or "", Exports.ESXExport or "", Exports.OXCoreExport or ""
-QBExport = Exports and Exports.QBExport or ""
-ESXExport = Exports and Exports.ESXExport or ""
-OXCoreExport = Exports and Exports.OXCoreExport or ""
 
-OXInv = Exports and Exports.OXInv or ""
+OXInv, QBInv, QSInv, CoreInv, CodeMInv, OrigenInv = Exports.OXInv or "", Exports.QBInv or "", Exports.QSInv or "", Exports.CoreInv or "", Exports.CodeMInv or "", Exports.OrigenInv or ""
-QBInv = Exports and Exports.QBInv or ""
-QSInv = Exports and Exports.QSInv or ""
-CoreInv = Exports and Exports.CoreInv or ""
-CodeMInv = Exports and Exports.CodeMInv or ""
 
-QBMenuExport = Exports and Exports.QBMenuExport or ""
+QBMenuExport = Exports.QBMenuExport or ""
 
-QBTargetExport = Exports and Exports.QBTargetExport or ""
+QBTargetExport, OXTargetExport = Exports.QBTargetExport or "", Exports.OXTargetExport or ""
-OXTargetExport = Exports and Exports.OXTargetExport or ""
 
 function CheckBridgeVersion()
 	if IsDuplicityVersion() then
         local currentVersion = "^3"..GetResourceMetadata("jim_bridge", 'version'):gsub("%.", "^7.^3").."^7"
-        PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/duty-fixes/version.txt', function(err, newestVersion, headers)
+        PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, newestVersion, headers)
             if not newestVersion then print("^1Currently unable to run a version check for ^7'^3jim_bridge^7' ("..currentVersion.."^7)") return end
-            newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7"
+            newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
             print(newestVersion == currentVersion and "^7'^3jim_bridge^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3jim_bridge^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
 		end)
 	end
@@ -34,54 +26,59 @@ for k, v in pairs(Exports) do
     if GetResourceState(v):find("start") then print("^6Bridge^7: '^3"..v.."^7' ^2export found ^7") end
 end
 
+local itemResource, vehResource, jobResource = "", "", ""
+
 -- Load item lists
-if GetResourceState(OXInv):find("start") then
+if GetResourceState(OXInv):find("start") then itemResource = OXInv
-    print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..OXInv)
     Items = exports[OXInv]:Items()
     for k, v in pairs(Items) do
-        if v.client then
+        if v.client and v.client.image then
-            if v.client.image then Items[k].image = (Items[k].client.image):gsub("nui://"..OXInv.."/web/images/","")
+            Items[k].image = (v.client.image):gsub("nui://"..OXInv.."/web/images/", "")
-            else Items[k].image = k..".png" end
+        else
-            if v.client.hunger then Items[k].hunger = v.client.hunger end
+            Items[k].image = k..".png"
-            if v.client.thirst then Items[k].thirst = v.client.thirst end
         end
+        Items[k].hunger = v.client and v.client.hunger or nil
+        Items[k].thirst = v.client and v.client.thirst or nil
     end
-elseif GetResourceState(QBExport):find("start") then
+
-    print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..QBExport)
+elseif GetResourceState(QBExport):find("start") then itemResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
-    Items = Core.Shared.Items
+    Items = Core and Core.Shared.Items or nil
-elseif GetResourceState(ESXExport):find("start") then
+
-    print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..ESXExport)
+elseif GetResourceState(ESXExport):find("start") then itemResource = ESXExport
     ESX = exports[ESXExport]:getSharedObject()
-    Items = ESX.Items
+    Items = ESX and ESX.Items or nil
-else
+end
+if not Items then
     print("^4ERROR^7: ^2No Core Items detected ^7- ^2Check ^3exports^1.^2lua^7")
+else
+    print("^6Bridge^7: ^2Loading ^6"..countTable(Items).." ^3Items^2 from ^7" .. itemResource)
 end
 
 -- Load Vehicles
-if GetResourceState(QBXExport):find("start") then
+if GetResourceState(QBXExport):find("start") or GetResourceState(QBExport):find("start") then vehResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
-    print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..QBXExport)
+    if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
-    Vehicles = exports[QBXExport]:GetVehiclesByHash()
+        RegisterNetEvent('QBCore:Client:UpdateObject', function()
-elseif GetResourceState(QBExport):find("start") then
+            Core = Core or exports[QBExport]:GetCoreObject()
-    print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..QBExport)
+        end)
-    Core = Core or exports[QBExport]:GetCoreObject()
+    end
-    RegisterNetEvent('QBCore:Client:UpdateObject', function()
+    Vehicles = Core and Core.Shared.Vehicles
-        Core = Core or exports[QBExport]:GetCoreObject()
+    print("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..QBExport)
-    end)
-    Vehicles = Core.Shared.Vehicles
 elseif GetResourceState(OXCoreExport):find("start") then
-    print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..OXCoreExport)
+    Vehicles = {}
     for k, v in pairs(Ox.GetVehicleData()) do
-        Vehicles = Vehicles or {}
         Vehicles[k] = { model = k, price = v.price, name = v.name, brand = v.make }
     end
+    print("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..OXCoreExport)
 elseif GetResourceState(ESXExport):find("start") then
     print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..ESXExport)
+    --print("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..ESXExport)
     CreateThread(function()
         if IsDuplicityVersion() then
             createCallback(GetCurrentResourceName()..":getVehiclesPrices", function(source)
                 Vehicles = MySQL.query.await('SELECT model, price, name FROM vehicles')
+                print("^6Bridge^7: ^3Found ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..ESXExport)
                 return Vehicles
             end)
         end
@@ -98,37 +95,33 @@ else
 end
 
 -- Load Jobs
-if GetResourceState(QBXExport):find("start") then
+local jobResource = ""
+if GetResourceState(QBXExport):find("start") then jobResource = QBXExport
     Core = Core or exports[QBExport]:GetCoreObject()
-    print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..QBXExport)
+    Jobs, Gangs = exports[QBXExport]:GetJobs(), exports[QBXExport]:GetGangs()
-    Jobs = exports[QBXExport]:GetJobs()
-    Gangs = exports[QBXExport]:GetGangs()
 
-elseif GetResourceState(OXCoreExport):find("start") then
+elseif GetResourceState(OXCoreExport):find("start") then  jobResource = OXExport
-    print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..OXCoreExport)
     CreateThread(function()
         if IsDuplicityVersion() then
             createCallback(GetCurrentResourceName()..":getOxGroups", function(source)
-                Jobs = MySQL.query.await('SELECT * FROM `ox_groups`')
+                Jobs = MySQL.query.await('SELECT * FROM `ox_groups`') return Jobs
-                return Jobs
             end)
         else
             local TempJobs = triggerCallback(GetCurrentResourceName()..":getOxGroups")
+            Jobs = TempJobs and {}
             for k, v in pairs(TempJobs) do
                 local grades = {}
-                for i = 1, #v.grades do grades[i] = { name = grades[i], isboss = (i == #v.grades)} end
+                for i = 1, #v.grades do grades[i] = { name = v.grades[i], isboss = (i == #v.grades)} end
-                Jobs = Jobs or {}
+                Jobs[v.name] = { label = v.label, grades = grades }
-                Jobs[v.name] = { label = v.label, grades = grades, }
             end
+            Gangs = Jobs
         end
     end)
 
-elseif GetResourceState(QBExport):find("start") then
+elseif GetResourceState(QBExport):find("start") then jobResource = QBExport
-    print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..QBExport)
     Core = Core or Core or exports[QBExport]:GetCoreObject()
     RegisterNetEvent('QBCore:Client:UpdateObject', function() Core = Core or exports[QBExport]:GetCoreObject() end)
-    Jobs = Core.Shared.Jobs
+    Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
-    Gangs = Core.Shared.Gangs
 
 elseif GetResourceState(ESXExport):find("start") then
     print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..ESXExport)
@@ -153,29 +146,21 @@ elseif GetResourceState(ESXExport):find("start") then
             Gangs = Jobs
         end
     end)
-else
+end
-    print("^4ERROR^7: ^2No Job/Gang ifo detected ^7- ^2Check ^3exports^1.^2lua^7")
+if not GetResourceState(ESXExport):find("start") and Jobs then
+    print("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource, "^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
 end
 
 function makeBossRoles(role)
-	local boss = {}
+    local boss = {}
-	if Jobs and Jobs[role] then
+    local data = Jobs and Jobs[role] or Gangs and Gangs[role]
-		for grade in pairs(Jobs[role].grades) do
+    if data then
-			if Jobs[role].grades[grade].isboss then
+        for grade, info in pairs(data.grades) do
-				if boss[role] then
+            if info.isboss then
-					if boss[role] > tonumber(grade) then boss[role] = tonumber(grade) end
+                boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
-				else boss[role] = tonumber(grade) end
+            end
-			end
+        end
-		end
+    end
-	elseif Gangs and Gangs[role] then
-		for grade in pairs(Gangs[role].grades) do
-			if Gangs[role].grades[grade].isboss then
-				if boss[role] then
-					if boss[role] > tonumber(grade) then boss[role] = tonumber(grade) end
-				else boss[role] = tonumber(grade) end
-			end
-		end
-	end
     return boss
 end
 
@@ -191,11 +176,7 @@ function createPoly(data) local Location = nil
         if Config.System.Debug then print("^6Bridge^7: ^2Creating new poly with ^7PolyZone "..data.name) end
         Location = PolyZone:Create(data.points, { name = data.name, debugPoly = data.debug })
         Location:onPlayerInOut(function(isPointInside)
-            if isPointInside then
+            if isPointInside then data.onEnter() else data.onExit() end
-                data.onEnter()
-            else
-                data.onExit()
-            end
         end)
     else
         print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7")
@@ -223,19 +204,26 @@ end
 
 function openMenu(Menu, data)
     if Config.System.Menu == "ox" then
-        if data.onBack then
+        local index = nil
+        if data.onBack and not data.onSelected then
             table.insert(Menu, 1, { icon = "fas fa-circle-arrow-left",
                 title = "Return",
                 onSelect = data.onBack,
+                label = "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 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
             if Menu[k].params then
@@ -246,8 +234,35 @@ function openMenu(Menu, data)
                 Menu[k].disabled = true
             end
         end
-        lib.registerContext({id = 'Menu', title = data.header..br..br..(data.headertxt and data.headertxt or ""), position = 'top-right', options = Menu, canClose = data.canClose and data.canClose or nil, onExit = data.onExit and data.onExit or nil, })
+        local menuID = 'Menu'
-        lib.showContext("Menu")
+        (data.onSelected and lib.registerMenu or lib.registerContext)({
+            id = menuID,
+            title = data.header..br..br..(data.headertxt and data.headertxt or ""),
+            position = 'top-right',
+            options = Menu,
+            canClose = data.canClose and data.canClose or nil,
+            onClose = (data.onBack and data.onBack) or (data.onExit and data.onExit) or nil,
+            onExit = data.onExit and data.onExit or nil,
+            onSelected = data.onSelected and (function(selected) index = selected end) or nil,
+        }, (data.onSelected and (function(x, y, args)
+            if Menu[x].refresh then
+                if Menu[x].onSelect then
+                    Menu[x].onSelect()
+                end
+                lib.showMenu(menuID, index)
+            else
+                if Menu[x].onSelect then
+                    Menu[x].onSelect()
+                else
+                    lib.showMenu(menuID, index)
+                end
+            end
+        end) or nil))
+        if data.onSelected then
+            lib.showMenu(menuID, 1)
+        else
+            lib.showContext(menuID)
+        end
     elseif Config.System.Menu == "qb" then
         if data.onBack then
             table.insert(Menu, 1, { icon = "fas fa-circle-arrow-left",
@@ -560,12 +575,7 @@ if not GetResourceState(OXTargetExport):find("start") and not GetResourceState(Q
             local pedCoords = GetEntityCoords(PlayerPedId())
             for k, v in pairs (TextTargets) do
                 if #(pedCoords - v.coords) <= v.dist then
-                    DrawText3D(
+                    DrawText3D(v.coords.x, v.coords.y, v.coords.z + 1.0, v.buttontext)
-                        v.coords.x,
-                        v.coords.y,
-                        v.coords.z + 1.0,
-                        v.buttontext
-                    )
                     for i = 1, #v.options do
                         if IsControlJustPressed(0, v.options[i].key) then
                             if  v.options[i].onSelect then  v.options[i].onSelect() end
@@ -740,7 +750,6 @@ function onPlayerLoaded(func)
     end
 end
 
-
 -- INPUT --
 function createInput(title, opts)
     local dialog = nil
@@ -756,7 +765,7 @@ function createInput(title, opts)
                     isRequired = opts[i].isRequired,
                     label = opts[i].label or opts[i].text,
                     name = opts[i].name,
-                    default = opts[i].options[1].value,
+                    default = opts[i].default or opts[i].options[1].value,
                     options = opts[i].options,
                 }
             end
@@ -773,6 +782,7 @@ function createInput(title, opts)
                 options[i] = {
                     type = "input",
                     label = opts[i].text ..(opts[i].txt and " - "..opts[i].txt or ""),
+                    default = opts[i].default,
                     isRequired = opts[i].isRequired,
                 }
             end
@@ -929,26 +939,70 @@ end
 function getVehicleProperties(vehicle)
     local properties = {}
     if vehicle == nil then return nil end
-    if GetResourceState(OXLibExport):find("start") then
+    if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
-        properties = lib.getVehicleProperties(vehicle)
-    elseif GetResourceState(QBExport):find("start") then
         properties = Core.Functions.GetVehicleProperties(vehicle)
+        if Config.System.Debug then print("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]") end
+    elseif GetResourceState(OXLibExport):find("start") then
+        properties = lib.getVehicleProperties(vehicle)
+        if Config.System.Debug then print("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]") end
     end
     return properties
 end
 
 function setVehicleProperties(vehicle, props)
-    if not DoesEntityExist(vehicle) then
+    local oldProps = getVehicleProperties(vehicle)
-        print(("Unable to set vehicle properties for '%s' (entity does not exist)"):
+    if checkDifferences(vehicle, props) then
-        format(vehicle))
+        --if Config.System.Debug then debugDifferences(vehicle, props) end
-    end
+        if not DoesEntityExist(vehicle) then
-    if GetResourceState(OXLibExport):find("start") then
+            print(("Unable to set vehicle properties for '%s' (entity does not exist)"):
-        lib.setVehicleProperties(vehicle, props)
+            format(vehicle))
-    elseif GetResourceState(QBExport):find("start") then
+        end
-        Core.Functions.SetVehicleProperties(vehicle, props)
+        if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
+            Core.Functions.SetVehicleProperties(vehicle, props)
+            if Config.System.Debug then print("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]") end
+        else
+            TriggerServerEvent(GetCurrentResourceName()..":ox:setVehicleProperties", VehToNet(vehicle), props)
+        end
+    else
+        if Config.System.Debug then print("^6Bridge^7: ^2No Changes Found ^7 [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]") end
     end
 end
 
+function checkDifferences(vehicle, newProps)
+    local oldProps = getVehicleProperties(vehicle)
+    if Config.System.Debug then print("^6Bridge^7: ^2Finding differences in ^3Vehicle Properties^7") end
+    local allow = false
+    for k in pairs(oldProps) do
+        if json.encode(oldProps[k]) ~= json.encode(newProps[k]) then
+            allow = true
+            if Config.System.Debug then
+                print("^6Bridge^7: ^5Old ^7[^3"..k.."^7] - "..json.encode(oldProps[k], { indent = true }))
+                print("^6Bridge^7: ^5New ^7[^3"..k.."^7] - "..json.encode(newProps[k], { indent = true }))
+            end
+        end
+    end
+    return allow
+end
+
+RegisterNetEvent(GetCurrentResourceName()..":ox:setVehicleProperties", function(netId, props)
+    local vehicle = NetworkGetEntityFromNetworkId(netId)
+    local value = props
+    Entity(vehicle).state[GetCurrentResourceName()..':setVehicleProperties'] = value
+end)
+
+AddStateBagChangeHandler(GetCurrentResourceName()..':setVehicleProperties', '', function(bagName, _, value)
+    if not value or not GetEntityFromStateBagName then return end
+    local entity = GetEntityFromStateBagName(bagName)
+    local networked = not bagName:find('localEntity')
+    if Config.System.Debug then print("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..entity.."^7] - [^3"..GetEntityModel(entity).."^7] - [^3"..value.plate.."^7]") end
+
+    if networked and NetworkGetEntityOwner(entity) ~= cache.playerId then return end
+
+    if lib.setVehicleProperties(entity, value) then
+        Entity(entity).state:set('setVehicleProperties', nil, true)
+    end
+end)
+
 RegisterNetEvent(GetCurrentResourceName()..":server:ChargePlayer", function(cost, type) local src = source
     if Config.System.Debug then print("^6Bridge^7: ^2Charging ^2Player: '^6"..cost.."^7'", type) end
     if type == "cash" then
@@ -990,7 +1044,7 @@ function createUseableItem(item, funct)
     end
 end
 
-function hasJob(job, source, grade) local hasJob = false
+function hasJob(job, source, grade) local hasJob, duty = false, true
     if source then
         local src = tonumber(source)
         if GetResourceState(ESXExport):find("start") then
@@ -1012,16 +1066,19 @@ function hasJob(job, source, grade) local hasJob = false
         elseif GetResourceState(QBXExport):find("start") then
             local jobinfo = exports[QBXExport]:GetPlayer(src).PlayerData.job
             if jobinfo.name == job then hasJob = true
+                duty = exports[QBXExport]:GetPlayer(src).PlayerData.job.onduty
                 if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
             end
             local ganginfo = exports[QBXExport]:GetPlayer(src).PlayerData.gang
             if ganginfo.name == job then hasJob = true
                 if grade and not (grade <= ganginfo.grade.level) then hasJob = false end
             end
+
         elseif GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
             if Core.Functions.GetPlayer then -- support older qb-core functions
                 local jobinfo = Core.Functions.GetPlayer(src).PlayerData.job
                 if jobinfo.name == job then hasJob = true
+                    duty = Core.Functions.GetPlayer(src).PlayerData.job.onduty
                     if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
                 end
                 local ganginfo = Core.Functions.GetPlayer(src).PlayerData.gang
@@ -1031,6 +1088,7 @@ function hasJob(job, source, grade) local hasJob = false
             else -- support newer qb-core exports
                 local jobinfo = exports[QBExport]:GetPlayer(src).PlayerData.job
                 if jobinfo.name == job then hasJob = true
+                    duty = exports[QBExport]:GetPlayer(src).PlayerData.job.onduty
                     if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
                 end
                 local ganginfo = exports[QBExport]:GetPlayer(src).PlayerData.gang
@@ -1059,6 +1117,7 @@ function hasJob(job, source, grade) local hasJob = false
         elseif GetResourceState(QBXExport):find("start") then
             local jobinfo = QBX.PlayerData.job
             if jobinfo.name == job then hasJob = true
+                duty = QBX.PlayerData.job.onduty
                 if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
             end
             local ganginfo = QBX.PlayerData.gang
@@ -1071,8 +1130,8 @@ function hasJob(job, source, grade) local hasJob = false
                 info = PlayerData
             end)
             local jobinfo = info.job
-            if jobinfo.name == job then
+            if jobinfo.name == job then hasJob = true
-                hasJob = true
+                duty = jobinfo.onduty
                 if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
             end
             local ganginfo = info.gang
@@ -1084,7 +1143,7 @@ function hasJob(job, source, grade) local hasJob = false
             print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3exports^1.^2lua^7")
         end
     end
-    return hasJob
+    return hasJob, duty
 end
 
 function getPlayer(source) local Player = {}
@@ -1192,11 +1251,13 @@ function invImg(item)
     if item ~= "" and Items[item] then
         if GetResourceState(OXInv):find("start") then
             imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
-        elseif GetResourceState(QSInv and QSInv or ""):find("start") then
+        elseif GetResourceState(QSInv):find("start") then
             imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
-        elseif GetResourceState(CoreInv and CoreInv or ""):find("start") then
+        elseif GetResourceState(CoreInv):find("start") then
             imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
-        elseif GetResourceState(QBInv and QBInv or ""):find("start") then
+        elseif GetResourceState(OrigenInv):find("start") then
+            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
+        elseif GetResourceState(QBInv):find("start") then
             imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
         else
             print("^4ERROR^7: ^2No Inventory detected for invImg ^7- ^2Check ^3exports^1.^2lua^7")