Version Bump - v1.0.4

Merge pull request #7 from jimathy/1.0.3
1.0.3
2026-08-17 05:56:02 +01:00 · 2024-01-20 13:01:26 +00:00 · 2024-01-19 23:58:42 +00:00 · 2024-01-19 23:57:22 +00:00 · 2024-01-19 22:33:35 +00:00 · 2024-01-19 20:25:44 +00:00
6 changed files with 191 additions and 216 deletions
--- a/README.md
+++ b/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]`
--- a/crafting.lua
+++ b/crafting.lua
@@ -39,6 +39,7 @@ function craftingMenu(data) local hasjob = false
 	for i = 1, #Recipes do
 		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
 					for l, b in pairs(Recipes[i].job) do
 						hasjob = hasJob(l, nil, b)
@@ -47,21 +48,17 @@ function craftingMenu(data) local hasjob = false
 				end
                local setheader, settext = "", ""
 				local disable = false
-				local checktable = {}
                if Recipes[i].job and hasjob == false then else
+                    local itemTable = {}
                    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].label..(b > 1 and " x"..b or "")
-                        if data.stashName then checktable[l] = stashhasItem(stashItems, l, b)
-                        else checktable[l] = hasItem(l, b) end
+                        settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
+                        itemTable[l] = b
                        Wait(0)
                    end
-                    for _, v in pairs(checktable) do
-                        if not v then
-                            disable = true
-                            break
-                        end
-                    end
+                    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 "")
                    Menu[#Menu + 1] = {
                        isMenuHeader = disable,
@@ -96,17 +93,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
-                success[k] = stashhasItem(stashItems, l, (b * k))
-            else
-                success[k] = hasItem(l, (b * k))
-            end
+            itemTable[l] = (b * k)
            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 ()
@@ -224,149 +224,65 @@ function openShop(data)
 end

 -- Client & Server side
-function hasItem(items, amount, src) local amount, count = amount and amount or 1, 0
-    if src then
-        if GetResourceState(OXInv):find("start") then
-            local item = exports[OXInv]:GetItem(src, items)
-            local amount = (amount or 1)
-            if item.count >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.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
-            for _, itemData in pairs(exports[QSInv]:GetInventory(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
-
-        elseif GetResourceState(CoreInv):find("start") then
-            local item = exports[CoreInv]:getItems('primary-'..src, items)
-
-            if item.amount >= amount then
-                if Config.System.Debug then print("^6Bridge^7: ^3HasItem^7: ^5FOUND^7 ^3"..item.amount.."^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["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
-                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
+function hasItem(items, amount, src) local amount = amount and amount or 1
+    local grabInv = nil
+    local foundInv = ""
+    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
+
+    elseif GetResourceState(QSInv):find("start") then
+        foundInv = QSInv
+        if src then grabInv = exports[QSInv]:GetInventory(src)
+        else grabInv = exports[QSInv]:getUserInventory()
+        end
+
+    elseif GetResourceState(CoreInv):find("start") then
+        foundInv = CoreInv
+        if src then grabInv = exports['core_inventory']:getInventory('primary-'..src)
+        else grabInv = exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))
+        end
+
+    elseif GetResourceState(CodeMInv):find("start") then
+        foundInv = CodeMInv
+        if src then grabInv = exports[CodeMInv]:GetUserInventory(src)
+        else grabInv = exports[CodeMInv]:GetClientPlayerInventory()
+        end
+
+    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
+
    else
-        if GetResourceState(OXInv):find("start") then
-            local count = tonumber(exports[OXInv]:Search('count', items))
-            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
+        print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
+    end

-        elseif GetResourceState(QSInv):find("start") then
-            for _, itemData in pairs(exports[QSInv]:getUserInventory()) 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)
+    if grabInv then
+        local hasTable = {}
+        for item, amount in pairs(items) do
+            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: ^5FOUND^7 ^3"..count.."^7/^3"..amount.." "..tostring(items)) end
-                return true
+                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: ^2"..tostring(items).." ^1NOT FOUND^7") end
-                return false
+                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, }
            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 v.hasItem == false then return false, hasTable end end
+        return true, hasTable
    end
 end

@@ -379,7 +295,7 @@ 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
@@ -456,7 +372,7 @@ 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(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 +394,31 @@ 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
-	for k, itemData in pairs(stashItems) do
-		if itemData and (itemData.name == item) then
-			--if Config.System.Debug then
-            --    print("^6Bridge^7: ^3stashHasItem^7: ^2Item^7: '^3"..tostring(item).."^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: ^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
+function stashhasItem(stashItems, items, amount)
+    local foundInv = ""
+    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
+        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
    end
+    for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
+    return true, hasTable
 end
--- a/functions.lua
+++ b/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
@@ -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 IsEntityAttachedToEntity(entity, PlayerPedId()) then
-		SetEntityAsMissionEntity(entity)
-		DetachEntity(entity, true, true)
+	if entity then
+		if Config.System.Debug then print("^6Bridge^7: ^2Destroying Prop^7: '^6"..entity.."^7'") end
+		if IsEntityAttachedToEntity(entity, PlayerPedId()) then
+			SetEntityAsMissionEntity(entity)
+			DetachEntity(entity, true, true)
+		end
+		DeleteObject(entity)
 	end
-	DeleteObject(entity)
 end

 function pushVehicle(entity)
@@ -188,6 +190,28 @@ 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)
@@ -549,8 +573,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,22 +584,22 @@ 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
                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
                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
@@ -585,10 +610,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,22 +623,22 @@ 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 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"..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
            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(QBInv):find("start") then
 			if Core.Functions.GetPlayer(src).Functions.AddItem(item, amount or 1) then
@@ -622,10 +647,10 @@ 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 +679,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
-			local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
-			newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^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!")
+			if not newestVersion then
+				PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..GetCurrentResourceName()..'/master/version.txt', function(err, freeVersion, headers)
+					if not freeVersion then print("^1Currently unable to run a version check for ^7'^3"..GetCurrentResourceName().."^7' ("..currentVersion.."^7)") return end
+					local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
+					freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3").."^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").."^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 +888,4 @@ function StopEffects() -- Used to clear up any effects stuck on screen
    AnimpostfxStop('RaceTurbo')
    AnimpostfxStop('FocusIn')
    AnimpostfxStop('Rampage')
-end
+end
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "1.0"
+version "1.0.4"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 game "gta5"
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0
+1.0.4
--- a/wrapper.lua
+++ b/wrapper.lua
@@ -21,7 +21,7 @@ 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"
            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!")
@@ -560,12 +560,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(
-                        v.coords.x,
-                        v.coords.y,
-                        v.coords.z + 1.0,
-                        v.buttontext
-                    )
+                    DrawText3D(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 +735,6 @@ function onPlayerLoaded(func)
    end
 end

-
 -- INPUT --
 function createInput(title, opts)
    local dialog = nil
@@ -929,10 +923,10 @@ end
 function getVehicleProperties(vehicle)
    local properties = {}
    if vehicle == nil then return nil end
-    if GetResourceState(OXLibExport):find("start") then
-        properties = lib.getVehicleProperties(vehicle)
-    elseif GetResourceState(QBExport):find("start") then
+    if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
        properties = Core.Functions.GetVehicleProperties(vehicle)
+    elseif GetResourceState(OXLibExport):find("start") then
+        properties = lib.getVehicleProperties(vehicle)
    end
    return properties
 end
@@ -942,13 +936,33 @@ function setVehicleProperties(vehicle, props)
        print(("Unable to set vehicle properties for '%s' (entity does not exist)"):
        format(vehicle))
    end
-    if GetResourceState(OXLibExport):find("start") then
-        lib.setVehicleProperties(vehicle, props)
-    elseif GetResourceState(QBExport):find("start") then
+    if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
+        if Config.System.Debug then print("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7] - [^3"..props.plate.."^7]") end
        Core.Functions.SetVehicleProperties(vehicle, props)
+    else
+        TriggerServerEvent(GetCurrentResourceName()..":ox:setVehicleProperties", VehToNet(vehicle), props)
    end
 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 +1004,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 +1026,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 +1048,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 +1077,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 +1090,8 @@ function hasJob(job, source, grade) local hasJob = false
                info = PlayerData
            end)
            local jobinfo = info.job
-            if jobinfo.name == job then
-                hasJob = true
+            if jobinfo.name == job then hasJob = true
+                duty = jobinfo.onduty
                if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
            end
            local ganginfo = info.gang
@@ -1084,7 +1103,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 = {}
@@ -1214,4 +1233,4 @@ function registerStash(name, label)
        exports[QSInv]:RegisterStash(name, 50, 4000000)
    end
 end
-- IN NO WAY PERFECT --
+-- IN NO WAY PERFECT --
Author	SHA1	Message	Date
Jim Shield	370c77433b	Version Bump - v1.0.4	2024-01-20 13:01:26 +00:00
Jim Shield	ac85d35097	Merge pull request #7 from jimathy/1.0.3 1.0.3	2024-01-19 23:58:42 +00:00
Jim Shield	85c3e06910	update addItem/removeItem prints	2024-01-19 23:57:22 +00:00
Jim Shield	7d0736bfc2	Change how bridge decides what get/setvehicleproperties to use	2024-01-19 22:33:35 +00:00
Jim Shield	b0b011ac56	update readme -main	2024-01-19 20:25:44 +00:00
Jim Shield	23091c2e73	add spam free ensureNetToVeh()	2024-01-19 20:25:04 +00:00
Jim Shield	ef2ba3ea7a	tidy up new prints more	2024-01-19 20:24:25 +00:00
Jim Shield	df60f3b2b1	tidy prints for setVehicleProperties	2024-01-19 18:13:22 +00:00
Jim Shield	4cc001d2f0	fix typo in stashhasitem	2024-01-19 18:10:05 +00:00
Jim Shield	e2bb32d9de	Optimize Crafting/Multicraft Menu + better hasItem prints	2024-01-19 14:46:45 +00:00
Jim Shield	725125a274	add debug prints to new ox setVehicleProperties call	2024-01-19 14:46:09 +00:00
Jim Shield	dcf2018ec6	check for destroyProp if received any info	2024-01-19 13:02:09 +00:00
Jim Shield	e5316f45aa	Rewrite + Optimize hasItem() & stashhasItem()	2024-01-19 13:00:50 +00:00
Jim Shield	02c202d075	Version Bump - v1.0.3	2024-01-19 12:53:45 +00:00
Jim Shield	9e9fb14f55	Merge pull request #3 from bandgeekndb/stashoptions Allow for passing through stash options when opening a stash	2024-01-19 12:50:10 +00:00
Jim Shield	61e0d777a8	Attempt to fix ox_lib's setVehicleProperites + 1.0.2	2024-01-18 20:21:22 +00:00
Jim Shield	78c3e33d38	version bump 1.0.1	2024-01-18 17:50:42 +00:00
Jim Shield	3be5b5e1ee	Merge pull request #6 from jimathy/1.0.1 1.0.1	2024-01-18 17:49:05 +00:00
Jim Shield	f550479298	Revert "version bump" This reverts commit `d82366b59f`.	2024-01-18 17:48:14 +00:00
Jim Shield	5fe0ab8815	Revert "Resolve merge conflict" This reverts commit `56ccb43c2b`.	2024-01-18 17:48:03 +00:00
Jim Shield	56ccb43c2b	Resolve merge conflict	2024-01-18 17:44:25 +00:00
Jim Shield	93d0754935	Make qbx use correct export for getCoreObject This should be fine as qbox takes over the export but just to be sure	2024-01-18 17:41:28 +00:00
Jim Shield	d82366b59f	version bump	2024-01-18 15:38:28 +00:00
Jim Shield	35202f7000	add fix for recipes having no final amount added	2024-01-18 15:33:51 +00:00
Jim Shield	bc5aadc394	add export error check to stashRemoveItem	2024-01-18 15:14:38 +00:00
Jim Shield	181c480ba6	return duty check for hasJob	2024-01-18 15:06:20 +00:00
Jim Shield	b973c71638	Update version.txt(?)	2024-01-18 14:45:41 +00:00
Jim Shield	ede0a44251	fix version.txt?	2024-01-18 14:42:23 +00:00
Jim Shield	e4b0f8601a	fix bridge version check looking in wrong place	2024-01-18 14:17:01 +00:00
Jim Shield	d12c615f0b	Merge pull request #4 from jimathy/duty-fixes Duty fixes + CheckVersion + better debug	2024-01-18 13:16:45 +00:00
Jim Shield	e58163d631	CheckVersion supports free script checking	2024-01-18 13:08:16 +00:00
Nicholas Blew	63c2d5d83d	Allow for passing through stash options when opening a stash	2024-01-18 02:20:20 -05:00
@@ -1 +1 @@
 .0
 .0.4