Version Bump

`2.0.05` - `2.0.06`

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.05"
+version "2.0.06"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

shared/crafting.lua

@@ -80,11 +80,6 @@ function craftingMenu(data)
     -- Build a table of all required ingredients (default quantity is 1).
     for i = 1, #Recipes do
         for k in pairs(Recipes[i]) do
-            if k == "hasCrafted" and not data.craftable.craftedItems then
-                -- Retreive list of already crafted items from playermetadata to see if we should class this recipe as "new"
-                craftedItems = GetMetadata(nil, "craftedItems") or {}
-                data.craftable.craftedItems = craftedItems
-            end
             if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
                 tempCarryTable[k] = Recipes[i].amount or 1
             end
@@ -114,7 +109,7 @@ function craftingMenu(data)
                         settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
                         metaTable[Items[l] and Items[l].label or "error - "..l] = b
                         itemTable[l] = b
-                        Wait(0)
+                        --Wait(0)
                     end
 
                     while not canCarryTable do Wait(0) end
@@ -122,25 +117,16 @@ function craftingMenu(data)
                     setheader = ((metadata and metadata.label) or (Items[tostring(k)] and Items[tostring(k)].label) or "error - "..tostring(k))
                                ..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")
 
-                    if not disable then
+                    local statusEmoji = disable and " ❌" or not canCarryTable[k] and " 📦" or " ✔️"
-                        if not canCarryTable[k] then
+                    local isNew = (Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil) and "✨ " or ""
-                            setheader = setheader.." 📦"
+                    setheader = isNew .. setheader .. statusEmoji
-                        else
-                            setheader = setheader.." ✔️"
-                        end
-                    elseif not canCarryTable[k] then
-                        setheader = setheader.." 📦"
-                    end
-                    if Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil then
-                        setheader = "✨ "..setheader
-                    end
 
                     Menu[#Menu + 1] = {
                         arrow = not disable and canCarryTable[k],
                         isMenuHeader = disable or not canCarryTable[k],
                         icon = invImg((metadata and metadata.image) or tostring(k)),
                         image = invImg((metadata and metadata.image) or tostring(k)),
-                        header = setheader..((disable or not canCarryTable[k]) and " ❌" or ""),
+                        header = setheader,
                         txt = (isStarted(QBMenuExport) or disable) and settext or nil,
                         metadata = metaTable,
                         onSelect = (not disable and canCarryTable[k]) and function()
@@ -162,7 +148,7 @@ function craftingMenu(data)
                     }
                 end
             end
-            Wait(0)
+            --Wait(0)
         end
     end
 
@@ -208,16 +194,23 @@ end
 function multiCraft(data)
     local max = 0
     local stashName = nil
-    for i = 1, 100 do
+    local maxCreation = 100
-        local itemTable = {}
-        for l, b in pairs(data.craft[data.item]) do
-            debugPrint("")
-            itemTable[l] = (b * i)
-        end
 
+    -- Generate item table to check against stash or inventory
+    -- takes into account the ingredients needed for multiple items
+    local multiItemTable = {}
+
+    for i = 1, maxCreation do
+        multiItemTable[i] = {}
+        for l, b in pairs(data.craft[data.item]) do
+            multiItemTable[i][l] = (b * i)
+        end
+    end
+
+    for i = 1, maxCreation do
+        -- if its received a stash name, check if the items are in the stash
         if data.stashName then
-            debugPrint("")
+            local hasItems, stashname = checkStashItem(data.stashName, multiItemTable[i])
-            local hasItems, stashname = checkStashItem(data.stashName, itemTable)
             if hasItems == true then
                 max += 1
                 stashName = stashname
@@ -225,31 +218,34 @@ function multiCraft(data)
                 break
             end
         else
-            debugPrint("")
+            -- if not check the players inventory for the items
-            local has, _ = hasItem(itemTable, nil, nil)
+            local has, _ = hasItem(multiItemTable[i], nil, nil)
             if has then
                 max += 1
             else
                 break
             end
         end
-        Wait(10)
     end
 
-    local dialog = createInput(data.craftable.Header, {
+    local carryMax = triggerCallback(getScript()..":server:getMaxCarryCraft", {
+        item = data.item,
+        max = max
+    })
+
+    local dialog = createInput(data.craftable.Header..(Config.System.Menu == "qb" and ": "..br.."How many to craft? "..br.."Max: "..carryMax or ""), {
         ((Config.System.Menu == "ox") and {
             type = "slider",
-            label = "How many to craft?",
+            label = "How many to craft? "..br.."Max: "..carryMax,
             required = true,
             default = 1,
             min = 1,
-            max = max
+            max = carryMax
         }) or nil,
         ((Config.System.Menu == "qb") and {
             type = "number",
-            label = "How many to craft?"..br.."Max: "..max,
             name = "amount",
-            isRecuired = true,
+            isRequired = true,
             default = 1,
         }) or nil,
     })
@@ -259,14 +255,14 @@ function multiCraft(data)
 
         end
         if Config.System.Menu == "qb" then
-            if dialog["amount"] > max or dialog["amount"] < 1 or dialog["amount"] == nil or dialog["amount"] == "" then
+            dialog["amount"] = tonumber(dialog["amount"])
+            if dialog["amount"] > carryMax or dialog["amount"] < 1 or dialog["amount"] == nil or dialog["amount"] == "" then
                 triggerNotify(nil, "Invalid Amount", "error")
                 craftingMenu(data)
                 return
             end
         end
 
-
         makeItem({
             item = data.item,
             craft = data.craft,
@@ -274,7 +270,6 @@ function multiCraft(data)
             amount = dialog["amount"] or dialog[1],
             coords = data.coords,
             stashName = stashName or nil,
-            --stashTable = data.stashName,
             onBack = data.onBack,
             metadata = data.metadata,
         })
@@ -331,19 +326,23 @@ function makeItem(data)
     local crafted, crafting = true, true
     local cam = createTempCam(PlayerPedId(), data.coords)
     startTempCam(cam)
-
     for i = 1, craftAmount do
         for k, v in pairs(data.craft) do
             if not excludeKeys[k] then
                 if type(v) == "table" then
                     for l, b in pairs(v) do
+                        if isInventoryOpen() then
+                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            crafted, crafting = false, false
+                            return
+                        end
                         if crafting and progressBar({
                             label = "Using "..b.." "..Items[l].label,
                             time = 1000,
                             cancel = true,
                             dict = 'pickup_object',
                             anim = "putdown_low",
-                            flag = 48,
+                            flag = 49,
                             icon = l,
                         }) then
                             TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
@@ -353,6 +352,11 @@ function makeItem(data)
                         end
                         Wait(200)
                     end
+                    if isInventoryOpen() then
+                        print("^1Error^7: ^2Inventory is open, you tried to break things")
+                        crafted, crafting = false, false
+                        return
+                    end
                     if crafted then
                         local craftProp = nil
                         if prop then
@@ -363,6 +367,11 @@ function makeItem(data)
                             local s = data.sound
                             PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
                         end
+                        if isInventoryOpen() then
+                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            crafted, crafting = false, false
+                            return
+                        end
                         if crafting and progressBar({
                             label = bartext..((metadata and metadata.label) or Items[data.item].label),
                             time = bartime,
@@ -414,7 +423,6 @@ function makeItem(data)
     end
     stopTempCam()
     CraftLock = false
-    lockInv(false)
     if canReturn then craftingMenu(data) end
     ClearPedTasks(PlayerPedId())
 end
@@ -441,17 +449,8 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
         return
     end
 
-    if token == nil then
+    if not checkToken(src, token, "item", ItemMake) then
-        debugPrint("^1Auth^7: ^1No token recieved^7")
+        return
-        dupeWarn(src, item, "Auth: Player "..src.." attempted to spawn "..item.." without an auth token")
-    else
-        if token ~= validTokens[src] then
-            debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
-            dupeWarn(src, item, "Auth: "..src.." attempted to trigger server only events with an incorrect auth token")
-        else
-            debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
-            validTokens[src] = nil
-        end
     end
 
 

shared/inventories.lua

@@ -15,6 +15,7 @@
 function lockInv(toggle)
     FreezeEntityPosition(PlayerPedId(), toggle)
     LocalPlayer.state:set("inv_busy", toggle, true)
+    LocalPlayer.state:set("invBusy", toggle, true)
     TriggerEvent('inventory:client:busy:status', toggle)
     TriggerEvent('canUseInventoryAndHotbar:toggle', not toggle)
 end
@@ -168,4 +169,41 @@ function getPlayerInv(src)
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end
     return grabInv, foundInv
+end
+
+
+function isInventoryOpen()
+    if isStarted(OXInv) then
+        return LocalPlayer.state.invBusy
+
+    elseif isStarted(QSInv) then
+        return exports[QSInv]:inInventory()
+
+    elseif isStarted(OrigenInv) then
+        return exports[OrigenInv]:IsInventoryOpen()
+
+    elseif isStarted(CoreInv) then
+        return exports[CoreInv]:isInventoryOpen()
+
+    elseif isStarted(CodeMInv) then
+        return false
+        -- CodeM doesn't have a function to check if the inventory is open
+        -- No idea what it uses, so it just skips the check
+
+    elseif isStarted(TgiannInv) then
+        return exports[TgiannInv]:IsInventoryActive()
+
+    elseif isStarted(QBInv) then
+        return LocalPlayer.state.inv_busy
+
+    elseif isStarted(PSInv) then
+        return LocalPlayer.state.inv_busy
+
+    elseif ESX and isStarted(ESXExport) then
+        return false
+
+    elseif isStarted(RSGInv) then
+        return LocalPlayer.state.inv_busy
+
+    end
 end

shared/itemcontrol.lua

@@ -179,7 +179,7 @@ end
 --- TriggerServerEvent(getScript()..":server:toggleItem", true, "health_potion", 1)
 --- ```
 RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token)
-    debugPrint(GetInvokingResource())
+    --debugPrint(GetInvokingResource())
 	if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
         debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
         return
@@ -191,21 +191,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
 
     local src = newsrc or source
     if (give == true or give == 1) then
-        if newsrc == nil then -- must be coming from client this would be blank
+        if newsrc == nil then -- this must be coming from client this would be blank
-            if token == nil then
+            if not checkToken(src, token, "item", item) then
-                debugPrint("^1Auth^7: ^1No token recieved^7")
+                return
-                dupeWarn(src, item, "Auth: Player "..src.." attempted to spawn "..item.." without an auth token")
-            else
-                if type(token) ~= "number" then -- checks if the newsrc is a source or token, if number its coming form the server itself
-                    debugPrint("^1Auth^7: ^2Auth token received^7, ^2checking against server cache^7..")
-                    if token ~= validTokens[src] then
-                        debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
-                        dupeWarn(src, item, "Auth: "..src.." attempted to spawn "..item.." with an incorrect auth token")
-                    else
-                        debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
-                        validTokens[src] = nil
-                    end
-                end
             end
         end
     end
@@ -370,13 +358,13 @@ end)
 --- ```lua
 --- dupeWarn(playerId, "health_potion")
 --- ```
-function dupeWarn(src, item, amount)
+function dupeWarn(src, item, message)
     local name = getPlayer(src).name
-    print("^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7")
+    print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7")
     if not debugMode then
-        DropPlayer(src, name.."("..tostring(src)..") Kicked for suspected duplicating items: "..item)
+        DropPlayer(src, name.."("..tostring(src)..") kicked by exploit protection")
     end
-    print("^5DupeWarn^7: "..name.."(^1"..tostring(src).."^7) ^2Dropped from server - exploit protection detected an item not being found in players inventory^7")
+    print("^5DupeWarn^7: "..name.."(^1"..tostring(src).."^7) ^2Dropped from server - exploit protection^7")
 end
 
 -------------------------------------------------------------
@@ -710,13 +698,33 @@ if isServer() then
         return result
     end)
 
+    createCallback(getScript()..":server:getMaxCarryCraft", function(source, data)
+        local src = source
+        local item = data.item
+        local max = data.max or 100
+
+        local maxCanCarry = 0
+        for i = 1, max do
+            local checkTable = {
+                [item] = i
+            }
+            local result = canCarry(checkTable, src)
+            if result[item] == true then
+                maxCanCarry = i
+            else
+                break
+            end
+        end
+        return maxCanCarry
+    end)
+
     local AuthEvent = getScript()..":"..keyGen()..keyGen()..keyGen()..keyGen()..":"..keyGen()..keyGen()..keyGen()..keyGen()
     validTokens = validTokens or {}
 
     createCallback(AuthEvent, function(source)
         local src = source
         local token = keyGen()..keyGen()..keyGen()..keyGen()  -- Use a secure random generator here
-        debugPrint(GetInvokingResource())
+        --debugPrint(GetInvokingResource())
         if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
             debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
             return  ""
@@ -748,22 +756,63 @@ if isServer() then
     receivedEvent = {}
     createCallback(getScript()..":callback:GetAuthEvent", function(source)
         local src = source
-        debugPrint(GetInvokingResource())
+        --debugPrint(GetInvokingResource())
         if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
             debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7")
             return ""
         end
         debugPrint("^1Auth^7: ^2Player Source^7: "..src.." ^2requested ^3AuthEvent^7", AuthEvent)
-        if not receivedEvent[src] then receivedEvent[src] = true
+        if not receivedEvent[src] then
+            receivedEvent[src] = true
             return AuthEvent
         else
             print("^1Auth^7: ^1Player ^7"..src.." ^1tried to request auth token more than once^7")
             return ""
         end
     end)
+
+    RegisterNetEvent(getScript()..":clearAuthEventRequest", function()
+        local src = source
+        debugPrint("^1Auth^7: ^2Manually clearing Auth Event for Player Source^7:", src, AuthEvent)
+        receivedEvent[src] = nil
+    end)
+
+    -- Multiuse function to check if the generated client token is valid
+    function checkToken(src, token, genType, name)
+        if token == nil then
+            debugPrint("^1Auth^7: ^1No token recieved^7")
+            if genType == "stash" then
+                dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1create a stash ^7"..name.." ^1without an auth token^7")
+            elseif genType == "item" then
+                dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1attempted to spawn an item ^7"..name.." ^1without an auth token^7")
+            end
+            return false
+        else
+            debugPrint("^1Auth^7: ^2Auth token received^7, ^2checking against server cache^7..")
+            if token ~= validTokens[src] then
+                debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
+                if genType == "stash" then
+                    dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1create a stash ^7"..name.." ^1with an incorrect auth token^7")
+                elseif genType == "item" then
+                    dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1attempted to spawn an item ^7"..name.." ^1with an incorrect auth token^7")
+                end
+                return false
+            else
+                debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
+                validTokens[src] = nil
+                return true
+            end
+        end
+    end
 else
     onPlayerLoaded(function()
         debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7")
         AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent")
     end, true)
+
+    onPlayerUnload(function()
+        debugPrint("^1Auth^7: ^2Clearing Auth Event^7")
+        TriggerServerEvent(getScript()..":clearAuthEventRequest")
+    end, true)
 end
+

shared/stashcontrol.lua

@@ -47,12 +47,12 @@ function GetStashTimeout(stashName, stop)
         stashCache[stashName] = { items = {}, timeout = 0 }
         stash = stashCache[stashName]
     else
-        debugPrint("^6Bridge^7: ^2Local Stash ^7'^3"..stashName.."^7'^2 cache found^7")
+        debugPrint("^6Bridge^7: ^2Local Stash for ^7'^3"..stashName.."^7'^2 cache found^7")
     end
 
     -- If there are already items in cache, skip recheck.
     if countTable(stashCache[stashName].items) > 0 then
-        debugPrint("^6Bridge^7: '^3"..stashName.." ^2Items found in cache, skipping recheck")
+        debugPrint("^6Bridge^7: '^3"..stashName.."^7' ^2Items found in local cache, skipping server recheck")
         return true
     end
 
@@ -90,20 +90,12 @@ function checkStashItem(stashes, itemTable)
     end
 
     if type(stashes) == "table" then
-        local successes = 0
+        debugPrint("^6Bridge^7: ^2Checking multiple stashes for ingredients^7")
-        local itemCount = countTable(itemTable)
         -- Iterate over each provided stash name.
         for _, name in pairs(stashes) do
-            Wait(10)  -- Delay to avoid multiple callbacks issues.
             GetStashTimeout(name)
-            for item, amount in pairs(itemTable) do
+            if stashhasItem(stashCache[name].items, itemTable, nil) then
-                debugPrint("^6Bridge^7: ^2Checking "..(name and " '^3"..name.."^7'" or "").." ingredients - ^6"..item.."^7")
+                return true, name
-                if stashhasItem(stashCache[name].items, item, amount) then
-                    successes += 1
-                    if successes == itemCount then
-                        return true, name
-                    end
-                end
             end
         end
     else

shared/wrapperfunctions.lua

@@ -105,14 +105,8 @@ if isServer() then
     RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords, token)
         local src = source or nil
         if src then
-            debugPrint("^1Auth^7: ^2Auth token received^7, ^2checking against server cache^7..")
+            if not checkToken(src, token, "stash", name) then
-            if token == nil then
+                return
-                debugPrint("^1Auth^7: ^1Token not received^7")
-            elseif token ~= validTokens[src] then
-                debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
-            else
-                debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
-                validTokens[src] = nil
             end
         end
 

version.txt

@@ -1 +1 @@
-2.0.05
+2.0.06