Merge pull request #17 from jimathy/1.0.9

1.0.9

crafting.lua

@@ -6,49 +6,45 @@ if IsDuplicityVersion() then
     end
 end
 
-local timeout = 0
-local timing = false
-local stashItems = {}
+local timeout, timing, stashItems = 0, false, {}
 function GetStashTimeout(stashName, stop)
-	if stop then stashItems = {} timing = false timeout = 0 return end
-	if stashItems[1] then return true else
-		if timeout <= 0 then
-			stashItems = triggerCallback(GetCurrentResourceName()..':server:GetStashItems', stashName)
-			timeout = 15000
-			if not timing then
-				CreateThread(function()
-					timing = true
-					while timeout > 0 do timeout -= 1000 Wait(1000) end
-					timing = false stashItems = {} timeout = 0
-				end)
-			end
-		end
-		return false
-	end
+    if stop then stashItems, timing, timeout = {}, false, 0 return end
+    if #stashItems > 0 then return true end
+    if timeout <= 0 then
+        stashItems = triggerCallback(GetCurrentResourceName()..':server:GetStashItems', stashName)
+        timeout = 10000
+        if not timing then
+            CreateThread(function()
+                timing = true
+                while timeout > 0 do timeout -= 1000 Wait(1000) end
+                timing, stashItems, timeout = false, {}, 0
+            end)
+        end
+    end
+    return false
 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
-	local Menu = {}
+    if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
+    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 not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
-                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
 					end
-				end
-                local setheader, settext = "", ""
-				local disable = false
-                if Recipes[i].job and hasjob == false then else
+				else hasjob = true end
+                local setheader, settext, disable = "", "", false
+                if hasjob then
                     local itemTable = {}
                     for l, b in pairs(Recipes[i][tostring(k)]) do
                         settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
@@ -58,23 +54,19 @@ function craftingMenu(data) local hasjob = false
                     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 data.stashName then disable = not stashhasItem(stashItems, itemTable)
                     else disable = not hasItem(itemTable) end
-
-                    setheader = Items[tostring(k)].label..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")..(not disable and " ✔️" or "")
+                    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 "")
                     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
-                                multiCraft(transdata)
-                            else
-                                makeItem(transdata)
-                            end
+                            if Config.Crafting.MultiCraft then 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,  })
@@ -118,25 +110,18 @@ function multiCraft(data) local Menu = {}
 end
 
 function makeItem(data)
-	if not CraftLock then CraftLock = true else return end
-    local bartime, bartext, animDict, anim = nil, nil, nil, nil
-    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"
+	if CraftLock then return end
+	CraftLock = true
 
-    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 crafting = true
-
-    local cam = createTempCam(PlayerPedId(), data.coords)
-    startTempCam(cam)
+	local crafted, crafting = true, true
+	local cam = createTempCam(PlayerPedId(), data.coords)
+	startTempCam(cam)
 
     for i = 1, amount do
         for k, v in pairs(data.craft) do
@@ -154,9 +139,8 @@ function makeItem(data)
                         }) then
                             --TriggerEvent('inventory:client:ItemBox', Items[l], "use", b) -- Show item box for each item
                         else
-                            crafted = false
-                            crafting = false
-                            break
+							crafted, crafting = false, false
+							break
                         end
                         Wait(200)
                     end
@@ -189,29 +173,25 @@ function makeItem(data)
 end
 
 RegisterNetEvent(GetCurrentResourceName()..":Crafting:GetItem", function(ItemMake, craftable, stashName)
-	local src = source
-	local amount = 1
+    local src, amount, stashItems = source, craftable and craftable.amount or 1, stashName and getStash(stashName)
+
     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 l, b in pairs(stashItems) do
-                if k == b.name then
-                    itemRemove[k] = v
-                end
+        for k, v in pairs(craftable[ItemMake] or {}) do
+            for _, b in pairs(stashItems or {}) do
+                if k == b.name then itemRemove[k] = v end
             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]) do
+            for k, v in pairs(craftable[ItemMake] or {}) 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]]--
@@ -232,23 +212,15 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
     if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
     if GetResourceState(OXInv):find("start") then
         foundInv = OXInv
-        if src then grabInv = exports.ox_inventory:GetInventoryItems(src)
-        else grabInv = exports[OXInv]:GetPlayerItems()
-        end
+        grabInv = src and exports.ox_inventory:GetInventoryItems(src) or exports[OXInv]:GetPlayerItems()
 
     elseif GetResourceState(QSInv):find("start") then
         foundInv = QSInv
-        if src then grabInv = exports[QSInv]:GetInventory(src)
-        else grabInv = exports[QSInv]:getUserInventory()
-        end
+        grabInv = src and exports[QSInv]:GetInventory(src) or exports[QSInv]:getUserInventory()
 
     elseif GetResourceState(OrigenInv):find("start") then
         foundInv = OrigenInv
-        if src then
-            grabInv = exports[OrigenInv]:getPlayerInventory(src)
-        else
-            grabInv = exports[OrigenInv]:getPlayerInventory()
-        end
+        grabInv = src and exports[OrigenInv]:getPlayerInventory(src) or exports[OrigenInv]:getPlayerInventory()
 
     elseif GetResourceState(CoreInv):find("start") then
         foundInv = CoreInv
@@ -269,15 +241,11 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
 
     elseif GetResourceState(CodeMInv):find("start") then
         foundInv = CodeMInv
-        if src then grabInv = exports[CodeMInv]:GetUserInventory(src)
-        else grabInv = exports[CodeMInv]:GetClientPlayerInventory()
-        end
+        grabInv = src and exports[CodeMInv]:GetUserInventory(src) or exports[CodeMInv]:GetClientPlayerInventory()
 
     elseif GetResourceState(QBInv):find("start") then
         foundInv = QBInv
-        if src then grabInv = Core.Functions.GetPlayer(src).PlayerData.items
-        else grabInv = Core.Functions.GetPlayerData().items
-        end
+        grabInv = src and Core.Functions.GetPlayer(src).PlayerData.items or Core.Functions.GetPlayerData().items
 
     else
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
@@ -289,20 +257,15 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
             if not Items[item] then print("^4ERROR^7: ^2Script can't find ingredient item in Shared Items - ^1"..item.."^7") end
             local count = 0
             for _, itemData in pairs(grabInv) do
-                if itemData and (itemData.name == item) then
-                    --if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^2Item^7: '^3"..tostring(item).."^7' ^2Slot^7: ^3"..itemData.slot.." ^7x(^3"..tostring(itemData.count or itemData.amount).."^7)", foundInv) end
-                    count += ((itemData.count or itemData.amount) or 1)
-                end
-            end
-            if count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7[^6"..foundInv.."^7]: "..tostring(item).." ^3"..count.."^7/^3"..amount.." ^5FOUND^7") end
-                hasTable[item] = { hasItem = true, count = count, }
-            else
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7[^6"..foundInv.."^7]: "..tostring(item).." ^1"..count.."^7/^3"..amount.." ^1NOT FOUND^7") end
-                hasTable[item] = { hasItem = false, count = count, }
+                if itemData and (itemData.name == item) then count += (itemData.count or itemData.amount or 1) end
             end
+            foundInv = foundInv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
+            local foundMessage = "^6Bridge^7: ^3hasItem^7[^6"..foundInv.."^7]: "..tostring(item).." ^3"..count.."^7/^3"..amount
+            if count >= amount then foundMessage = foundMessage.." ^5FOUND^7" else foundMessage = foundMessage .." ^1NOT FOUND^7" end
+            if Config.System.Debug then print(foundMessage) 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
+        for k, v in pairs(hasTable) do if not v.hasItem then return false, hasTable end end
         return true, hasTable
     end
 end
@@ -321,49 +284,46 @@ function openStash(data)
     lookEnt(data.coords)
 end
 
-function getStash(stashName)
+function getStash(stashName) local stashResource = ""
     local stashItems, items = {}, {}
-    if GetResourceState(OXInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..OXInv) end
+    if GetResourceState(OXInv):find("start") then stashResource = OXInv
         stashItems = exports[OXInv]:Inventory(stashName).items
 
-    elseif GetResourceState(QSInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..QSInv) end
+    elseif GetResourceState(QSInv):find("start") then stashResource = QSInv
         stashItems = exports[QSInv]:GetStashItems(stashName)
 
-    elseif GetResourceState(CoreInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..CoreInv) end
+    elseif GetResourceState(CoreInv):find("start") then stashResource = CoreInv
         stashItems = exports[CoreInv]:getInventory(stashName)
 
-    elseif GetResourceState(CodeMInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..CodeMInv) end
+    elseif GetResourceState(CodeMInv):find("start") then stashResource = CodeMInv
         stashItems = exports[CodeMInv]:GetInventoryItems('Stash', stashName)
 
-    elseif GetResourceState(OrigenInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..OrigenInv) end
-        stashItems = exports[OrigenInv]:GetStash(stashName)
+    elseif GetResourceState(OrigenInv):find("start") then stashResource = OrigenInv
+        stashItems = exports[OrigenInv]:GetStashItems(stashName)
 
-    elseif GetResourceState(QBInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..QBInv) end
+    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[#items+1] = {
-                    name = itemInfo["name"] ~= nil and itemInfo["slot"] or nil,
+                local indexNum = #items+1 -- Added to help recreate missing slot numbers
+                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 "",
-                    label = itemInfo["label"] ~= nil and itemInfo["slot"] or nil,
-                    description = itemInfo["description"] ~= nil and itemInfo["description"] or "",
-                    weight = itemInfo["weight"] ~= nil and itemInfo["slot"] or nil,
-                    type = itemInfo["type"] ~= nil and itemInfo["slot"] or nil,
-                    unique = itemInfo["unique"] ~= nil and itemInfo["slot"] or nil,
-                    useable = itemInfo["useable"] ~= nil and itemInfo["slot"] or nil,
-                    image = itemInfo["image"] ~= nil and itemInfo["slot"] or nil,
-                    slot = itemInfo["slot"] ~= nil and itemInfo["slot"] or nil,
+                    info = item.info or "",
+                    label = itemInfo.label or nil,
+                    description = itemInfo.description or "",
+                    weight = itemInfo.weight or nil,
+                    type = itemInfo.type or nil,
+                    unique = itemInfo.unique or nil,
+                    useable = itemInfo.useable or nil,
+                    image = itemInfo.image or nil,
+                    slot = (item.slot and item.slot) or indexNum,
                 }
             end
         end
@@ -378,6 +338,7 @@ 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
@@ -460,7 +421,15 @@ end
 RegisterNetEvent(GetCurrentResourceName()..":server:stashRemoveItem", stashRemoveItem)
 
 function stashhasItem(stashItems, items, amount)
+    local invs = {OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, QBInv}
     local foundInv = ""
+    for _, inv in ipairs(invs) do
+        if GetResourceState(inv):find("start") then
+            foundInv = inv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
+            break
+        end
+    end
+
     if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
     local hasTable = {}
     for item, amount in pairs(items) do
@@ -470,13 +439,11 @@ function stashhasItem(stashItems, items, amount)
                 count += (itemData.amount or 1)
             end
         end
-        if count >= amount then
-            if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^5FOUND '"..item.."' ^3"..count.."^7/^3"..amount.."^7") end
-            hasTable[item] = { hasItem = true, count = count, }
-        else
-            if Config.System.Debug then print("^6Bridge^7: ^3stashHasItem^7: ^1NOT FOUND^7 '"..item.."' ^1"..count.."^7/^3"..amount.."^7") end
-            hasTable[item] = { hasItem = false, count = count, }
-        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

functions.lua

@@ -193,22 +193,12 @@ 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
+	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
+	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
 

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "1.0.7"
+version "1.0.9"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 game "gta5"

version.txt

@@ -1 +1 @@
-1.0.7
+1.0.9

wrapper.lua

@@ -1,26 +1,14 @@
 Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
 
-if GetResourceState("ps-inventory"):find("start") then Exports.QBInv = "ps-inventory" end
-if GetResourceState("lj-inventory"):find("start") then Exports.QBInv = "lj-inventory" end
+Exports.QBInv = GetResourceState("ps-inventory"):find("start") and "ps-inventory" or GetResourceState("lj-inventory"):find("start") and "lj-inventory" or Exports.QBInv
 
-OXLibExport = Exports and Exports.OXLibExport or ""
+OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport = Exports.OXLibExport or "", Exports.QBXExport or "", Exports.QBExport or "", Exports.ESXExport or "", Exports.OXCoreExport or ""
 
-QBXExport = Exports and Exports.QBXExport or ""
-QBExport = Exports and Exports.QBExport or ""
-ESXExport = Exports and Exports.ESXExport or ""
-OXCoreExport = Exports and Exports.OXCoreExport 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 ""
 
-OXInv = Exports and Exports.OXInv 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 ""
-OrigenInv = Exports and Exports.OrigenInv or ""
+QBMenuExport = Exports.QBMenuExport or ""
 
-QBMenuExport = Exports and Exports.QBMenuExport or ""
-
-QBTargetExport = Exports and Exports.QBTargetExport or ""
-OXTargetExport = Exports and Exports.OXTargetExport or ""
+QBTargetExport, OXTargetExport = Exports.QBTargetExport or "", Exports.OXTargetExport or ""
 
 function CheckBridgeVersion()
 	if IsDuplicityVersion() then
@@ -38,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
-    print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..OXInv)
+if GetResourceState(OXInv):find("start") then itemResource = OXInv
     Items = exports[OXInv]:Items()
     for k, v in pairs(Items) do
-        if v.client then
-            if v.client.image then Items[k].image = (Items[k].client.image):gsub("nui://"..OXInv.."/web/images/","")
-            else Items[k].image = k..".png" end
-            if v.client.hunger then Items[k].hunger = v.client.hunger end
-            if v.client.thirst then Items[k].thirst = v.client.thirst end
+        if v.client and v.client.image then
+            Items[k].image = (v.client.image):gsub("nui://"..OXInv.."/web/images/", "")
+        else
+            Items[k].image = k..".png"
         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
-elseif GetResourceState(ESXExport):find("start") then
-    print("^6Bridge^7: ^2Loading ^3Items^2 from ^7"..ESXExport)
+    Items = Core and Core.Shared.Items or nil
+
+elseif GetResourceState(ESXExport):find("start") then itemResource = ESXExport
     ESX = exports[ESXExport]:getSharedObject()
-    Items = ESX.Items
-else
+    Items = ESX and ESX.Items or nil
+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)
-    Vehicles = exports[QBXExport]:GetVehiclesByHash()
-elseif GetResourceState(QBExport):find("start") then
-    print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..QBExport)
-    Core = Core or exports[QBExport]:GetCoreObject()
-    RegisterNetEvent('QBCore:Client:UpdateObject', function()
-        Core = Core or exports[QBExport]:GetCoreObject()
-    end)
-    Vehicles = Core.Shared.Vehicles
+    if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
+        RegisterNetEvent('QBCore:Client:UpdateObject', function()
+            Core = Core or exports[QBExport]:GetCoreObject()
+        end)
+    end
+    Vehicles = Core and Core.Shared.Vehicles
+    print("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..QBExport)
 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
@@ -102,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 = exports[QBXExport]:GetJobs()
-    Gangs = exports[QBXExport]:GetGangs()
+    Jobs, Gangs = exports[QBXExport]:GetJobs(), exports[QBXExport]:GetGangs()
 
-elseif GetResourceState(OXCoreExport):find("start") then
-    print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..OXCoreExport)
+elseif GetResourceState(OXCoreExport):find("start") then  jobResource = OXExport
     CreateThread(function()
         if IsDuplicityVersion() then
             createCallback(GetCurrentResourceName()..":getOxGroups", function(source)
-                Jobs = MySQL.query.await('SELECT * FROM `ox_groups`')
-                return Jobs
+                Jobs = MySQL.query.await('SELECT * FROM `ox_groups`') 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
-                Jobs = Jobs or {}
-                Jobs[v.name] = { label = v.label, grades = grades, }
+                for i = 1, #v.grades do grades[i] = { name = v.grades[i], isboss = (i == #v.grades)} end
+                Jobs[v.name] = { label = v.label, grades = grades }
             end
+            Gangs = Jobs
         end
     end)
 
-elseif GetResourceState(QBExport):find("start") then
-    print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..QBExport)
+elseif GetResourceState(QBExport):find("start") then jobResource = 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
-    Gangs = Core.Shared.Gangs
+    Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
 
 elseif GetResourceState(ESXExport):find("start") then
     print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..ESXExport)
@@ -157,29 +146,21 @@ elseif GetResourceState(ESXExport):find("start") then
             Gangs = Jobs
         end
     end)
-else
-    print("^4ERROR^7: ^2No Job/Gang ifo detected ^7- ^2Check ^3exports^1.^2lua^7")
+end
+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 = {}
-	if Jobs and Jobs[role] then
-		for grade in pairs(Jobs[role].grades) do
-			if Jobs[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
-	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
+    local boss = {}
+    local data = Jobs and Jobs[role] or Gangs and Gangs[role]
+    if data then
+        for grade, info in pairs(data.grades) do
+            if info.isboss then
+                boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
+            end
+        end
+    end
     return boss
 end
 
@@ -195,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
-                data.onEnter()
-            else
-                data.onExit()
-            end
+            if isPointInside then data.onEnter() else data.onExit() end
         end)
     else
         print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7")
@@ -236,6 +213,9 @@ function openMenu(Menu, data)
             })
         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
@@ -243,6 +223,7 @@ function openMenu(Menu, data)
                     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
@@ -263,7 +244,20 @@ function openMenu(Menu, data)
             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) Menu[x].onSelect() 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
@@ -1257,13 +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(OrigenInv and OrigenInv or ""):find("start") then
+        elseif GetResourceState(OrigenInv):find("start") then
             imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
-        elseif GetResourceState(QBInv and QBInv or ""):find("start") then
+        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")
@@ -1281,4 +1275,4 @@ function registerStash(name, label)
         exports[QSInv]:RegisterStash(name, 50, 4000000)
     end
 end
--- IN NO WAY PERFECT --
+-- IN NO WAY PERFECT --