Version Bump

`2.1.08` - `2.1.09`

.gitattributes

@@ -1,12 +1,16 @@
 # VCS / CI noise
-.gitattributes     export-ignore
-.gitignore         export-ignore
-.github/**         export-ignore
-.gitmodules        export-ignore
+/.gitattributes          export-ignore
+/.gitignore              export-ignore
+/.gitmodules             export-ignore
+/.github                 export-ignore
 
 # Dev tooling/config
-.vscode/**         export-ignore
-*.code-workspace   export-ignore
-.editorconfig      export-ignore
-.eslintrc*         export-ignore
-.prettier*         export-ignore
+/.vscode                 export-ignore
+*.code-workspace         export-ignore
+/.editorconfig           export-ignore
+/.eslintrc*              export-ignore
+/.prettier*              export-ignore
+
+# Omit release-only helpers
+/server/restaurantchecker.lua  export-ignore
+/server/installitems.lua       export-ignore

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.1.03"
+version "2.1.09"
 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.'
@@ -11,7 +11,11 @@ files {
     'starter.lua',
     'shared/*.lua',
     'shared/make/*.lua',
+    'shared/auth/*.lua',
+    'shared/make/*.lua',
+    'shared/modules/*.lua',
     'shared/scaleforms/*.lua',
+    'shared/wrappers/*.lua',
 }
 
 -- Version checker

shared/_authToken.lua

@@ -7,14 +7,22 @@ AuthEvent = nil
 currentToken = nil
 if isServer() then
 
+    local excludeRes = {
+        [Exports.QBExport] = true,
+        [Exports.ESXExport] = true,
+        [Exports.VorpExport] = true,
+    }
+
     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())
-        if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then
+        local invokingRes = GetInvokingResource()
+
+        debugPrint(invokingRes)
+        if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
             debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
             return  ""
         end
@@ -47,9 +55,9 @@ if isServer() then
 
     createCallback(getScript()..":callback:GetAuthEvent", function(source)
         local src = source
-        --debugPrint(GetInvokingResource())
+        local invokingRes = GetInvokingResource()
 
-        if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then
+        if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
             debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7")
             return ""
         end
@@ -129,21 +137,31 @@ function distExploitCheck(table, src)
         return false
     end
 
+    local maxDist = 10.0
+    local nearestDist = 999999.0
+    local nearestCoords = nil
+
     local ped = src and GetPlayerPed(src) or PlayerPedId()
     local srcCoords = GetEntityCoords(ped)
-    local allow = false
 
     for i = 1, #table do
-        if #(table[i].xy  - srcCoords.xy) <= 10 then
+
+        local dist2d = #(table[i].xy - srcCoords.xy)
+
+        -- Track the nearestDist
+        if dist2d < nearestDist then
+            nearestDist = dist2d
+            nearestCoords = table[i]
+        end
+
+        if dist2d <= maxDist then
+            debugPrint("^1Found location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
             return true
-        else
-            allow = false
         end
     end
 
-    if not allow then
-        print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
-        return false
-    end
+    print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
+    print("^1Nearest Possible Location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
+    return false
 
 end

shared/crafting.lua

@@ -17,7 +17,8 @@ local excludeKeys = {
     amount = true, metadata = true, description = true, info = true,
     job = true, gang = true, oneUse = true, slot = true,
     blueprintRef = true, craftingLevel = true, craftedItems = true,
-    hasCrafted = true, exp = true, anim = true, time = true,
+    hasCrafted = true, exp = true, anim = true, time = true, id = true,
+    ingredients = true,
 }
 
 -------------------------------------------------------------
@@ -40,9 +41,14 @@ local excludeKeys = {
 ---      craftable = {
 ---          Header = "Weapon Crafting",
 ---          Recipes = {
----              [1] = {
----                  ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 },
----                  amount = 1,
+---              weapon_pistol = {
+---                  id = 1,
+---                  ingredients = {
+---                      steel = 5, plastic = 5,
+---                  },
+---                  info = {
+---                      amount = 1,
+---                  },
 ---              },
 ---              -- More recipes...
 ---          },
@@ -56,9 +62,10 @@ local excludeKeys = {
 ---      job = "mechanic",
 ---      onBack = function() print("Returning to previous menu") end,
 --- })
+--- ```
 function craftingMenu(data)
     if CraftLock then return end
-
+    local data = cloneTable(data)
     -- Job or gang check; exit if not authorized.
     if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
 
@@ -72,16 +79,49 @@ function craftingMenu(data)
     -- Normalize stash name.
     data.stashName = data.stashTable or data.stashName
 
-    local Menu = {}
-    local Recipes = data.craftable.Recipes
-    local craftedItems = {}
-    local tempCarryTable = {}
+    -- Wrapper to convert old style crafting recipes to be handled by the menu properly
+    --if data.craftable.Recipes[1] then -- assume old style crafting table
+    --    local compatTable = {}
+    --    local id = 0
+    --    for k, v in ipairs(data.craftable.Recipes) do
+    --        local Recipe = v
+    --        for l, b in pairs(Recipe) do
+    --            if doesItemExist(l) then
+    --                id += 1
+    --                compatTable[l] = {
+    --                    ingredients = b,
+    --                    id = id,
+    --                    info = {
+    --                        amount = Recipe.amount or 1,
+    --                        metadata = Recipe.metadata or nil,
+    --                        job = Recipe.job or nil,
+    --                        gang = Recipe.gang or nil,
+    --                        hasCrafted = Recipe.hasCrafted or nil,
+    --                    },
+    --                }
+    --            end
+    --        end
+    --    end
+    --    data.craftable.Recipes = compatTable
+    --end
 
-    -- Build a table of all required ingredients (default quantity is 1).
+    -- Convert to array
+    --local RecipesArray = {}
+    --for k, v in pairs(data.craftable.Recipes) do
+    --    RecipesArray[v.id] = { [k] = v }
+    --end
+
+    local Menu = {}
+    local Recipes = cloneTable(data.craftable.Recipes)
+    local craftedItems = {}
+
+    local tempCarryTable = {}
+    -- Build a temporary table of all required ingredients (default quantity is 1).
     for i = 1, #Recipes do
-        for k in pairs(Recipes[i]) do
-            if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
-                tempCarryTable[k] = Recipes[i].amount or 1
+        for k, v in pairs(Recipes[i]) do
+            if not excludeKeys[k] then
+                if not Recipes[i].amount then Recipes[i].amount = 1 end
+                tempCarryTable[k] = math.max(tempCarryTable[k] or 0, Recipes[i].amount)
             end
         end
     end
@@ -96,76 +136,91 @@ function craftingMenu(data)
         header = "Material Source: "..(usingStash and "Job Stash" or "Player Inventory"),
         disabled = true,
     }
-
-    -- Process each recipe to create menu entries.
     for i = 1, #Recipes do
-        if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
-        for k, _ in pairs(Recipes[i]) do
+        local menuId = #Menu+1
+        local item = ""
+        local Recipe = {}
+        for k, v in pairs(Recipes[i]) do
             if not excludeKeys[k] then
-                local hasjob = true
-                if Recipes[i].job then
-                    for l, b in pairs(Recipes[i].job) do
-                        hasjob = hasJob(l, nil, b)
-                        if hasjob then break end
-                    end
-                end
-                if hasjob then
-                    local setheader, settext, disable, metadata = "", "", false, (Recipes[i]["metadata"] or Recipes[i]["info"] or nil)
-                    local itemTable = {}
-                    local metaTable = {}
-                    -- Build ingredient details.
-                    for l, b in pairs(Recipes[i][tostring(k)]) do
-                        local label = getItemLabel(l)
-                        local hasItem = checkStashItem(data.stashName, { [l] = b })
-                        local missingMark = not hasItem and " ❌" or " "
-                        settext = settext..(settext ~= "" and br or "").."[ x"..b.." ] - "..label..missingMark
-
-                        metaTable[label] = b
-                        itemTable[l] = b
-                    end
-
-                    while not canCarryTable do
-                        Wait(10)
-                    end
-                    disable = not checkStashItem(data.stashName, itemTable)
-                    setheader = ((metadata and metadata.label) or getItemLabel(k))
-                                ..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")
-
-                    local statusEmoji = disable and " " or not canCarryTable[k] and " 📦" or " ✔️"
-                    local isNew = (Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil) and "✨ " or ""
-                    setheader = isNew .. setheader .. statusEmoji
-
-                    Menu[#Menu + 1] = {
-                        arrow = isOx() and (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,
-                        txt = settext or nil,
-                        metadata = metaTable,
-                        onSelect = (not disable and canCarryTable[k]) and function()
-                            local transdata = {
-                                item = k,
-                                craft = data.craftable.Recipes[i],
-                                craftable = data.craftable,
-                                coords = data.coords,
-                                stashName = data.stashName,
-                                onBack = data.onBack,
-                                metadata = metadata,
-                            }
-                            if Config.Crafting.MultiCraft then
-                                multiCraft(transdata)
-                            else
-                                makeItem(transdata)
-                            end
-                        end or nil,
-                    }
-                end
+                item = k
+                Recipe = Recipes[i]
+                Recipe.amount = Recipe.amount or 1
+                break
             end
-            --Wait(0)
+        end
+
+        -- Job Check
+        local hasGroup = true
+        if Recipe.job then
+            for l, b in pairs(Recipe.job) do
+                hasGroup = hasJob(l, nil, b)
+                if hasGroup then goto skipcheck end
+            end
+        end
+        if Recipe.gang then
+            for l, b in pairs(Recipe.gang) do
+                hasGroup = hasJob(l, nil, b)
+                if hasGroup then goto skipcheck end
+            end
+        end
+        ::skipcheck::
+
+        -- if has group requirement, continue
+        if hasGroup then
+            local setheader, settext, disable, metadata = "", "", false, (Recipe.metadata or Recipe.info or nil)
+            local itemTable = {}
+            local metaTable = {}
+            -- Build ingredient details.
+            for l, b in pairs(Recipe[item]) do
+                local label = getItemLabel(l)
+                local hasItem = checkStashItem(data.stashName, { [l] = b })
+                local missingMark = not hasItem and " ❌" or " "
+                settext = settext..(settext ~= "" and br or "").."[ x"..b.." ] - "..label..missingMark
+
+                metaTable[label] = b
+                itemTable[l] = b
+            end
+
+            -- Make sure "canCarryTable" exists
+            while not canCarryTable do Wait(10) end
+            disable = not checkStashItem(data.stashName, itemTable)
+            setheader = ((metadata and metadata.label) or getItemLabel(item))
+                        ..(Recipe.amount > 1 and " x"..Recipe.amount or "")
+
+            local statusEmoji = disable and " " or not canCarryTable[item] and " 📦" or " ✔️"
+            local isNew = (Recipe.hasCrafted ~= nil and craftedItems[item] == nil) and "✨ " or ""
+            setheader = isNew .. setheader .. statusEmoji
+
+            -- Build menu option using info
+            Menu[menuId] = {
+                arrow = isOx() and (not disable and canCarryTable[item]),
+                isMenuHeader = disable or not canCarryTable[item],
+                icon = invImg((metadata and metadata.image) or item),
+                image = invImg((metadata and metadata.image) or item),
+                header = setheader,
+                txt = settext or nil,
+                metadata = metaTable,
+                onSelect = (not disable and canCarryTable[item]) and function()
+                    local transdata = {
+                        item = item,
+                        craft = Recipe,
+                        craftable = data.craftable,
+                        coords = data.coords,
+                        amount = Recipe.amount,
+                        stashName = data.stashName,
+                        onBack = data.onBack,
+                        metadata = metadata,
+                    }
+                    if Config.Crafting.MultiCraft then
+                        multiCraft(transdata)
+                    else
+                        makeItem(transdata)
+                    end
+                end or nil,
+            }
         end
     end
-
+    -- open context menu
     openMenu(Menu, {
         header = data.craftable.Header,
         headertxt = data.craftable.Headertxt,
@@ -322,7 +377,10 @@ end
 --- })
 --- ```
 
-function makeItem(data)
+function makeItem(origData)
+
+    local data = cloneTable(origData)
+
     local Ped = PlayerPedId()
     if CraftLock then return end
     CraftLock = true
@@ -337,112 +395,59 @@ function makeItem(data)
     local craftAmount = (data.amount and data.amount ~= 1) and data.amount or 1
     local metadata = data.metadata or nil
     local prop = data.craftable.Anims and data.craftable.Anims.prop or nil
+
     local canReturn = true
 
     local crafted, crafting = true, true
-    local cam = createTempCam(Ped, data.coords)
-    startTempCam(cam)
+    local cam = createCam(Ped, data.coords.xyz)
+    startCam(cam, 5000)
 
     -- Calculate total bartime if SingleProgress is enabled
     local totalBartime = (bartime * craftAmount)
 
+    local craftProp = nil
+    if prop then
+        craftProp = makeProp({ prop = prop.model, coords = GetEntityCoords(PlayerPedId()), true, true })
+        AttachEntityToEntity(craftProp, Ped, GetPedBoneIndex(Ped, prop.bone), prop.pos.x, prop.pos.y, prop.pos.z, prop.rot.x, prop.rot.y, prop.rot.z, true, true, false, true, 1, true)
+    end
+    if data.sound then
+        local s = data.sound
+        PlaySoundFromEntity(s.soundId, s.audioName, Ped, s.audioRef, true, 0)
+    end
     if not Config.Crafting.SingleProgress then -- if SingleProgress is disabled, dont do ingredient progressbars
         -- Run ingredient check and usage separately first
         for i = 1, craftAmount do
-            for k, v in pairs(data.craft) do
-                if not excludeKeys[k] and type(v) == "table" then
-                    for l, b in pairs(v) do
-                        if isInventoryOpen() then
-                            print("^1Error^7: ^2Inventory is open, you tried to break things")
-                            stopTempCam()
-                            ClearPedTasks(Ped)
-                            if canReturn then craftingMenu(data) end
-                            CraftLock = false
-                            return
-                        end
-                        if crafting and progressBar({
-                            label = "Using "..b.." "..getItemLabel(l),
-                            time = 800,
-                            cancel = true,
-                            dict = 'pickup_object',
-                            anim = "putdown_low",
-                            flag = 49,
-                            icon = l,
-                        }) then
-                            TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
-                        else
-                            crafted, crafting = false, false
-                            break
-                        end
-                        Wait(200)
-                    end
-                end
-            end
-        end
-    end
-
-    if not crafted then
-        stopTempCam()
-        ClearPedTasks(Ped)
-        if canReturn then craftingMenu(data) end
-        CraftLock = false
-        return
-    end
-
-    -- Handle SingleProgress option
-    if Config.Crafting.SingleProgress then
-        local craftProp = nil
-        if prop then
-            craftProp = makeProp({ prop = prop.model, coords = vec4(0, 0, 0, 0), true, true })
-            AttachEntityToEntity(craftProp, Ped, GetPedBoneIndex(Ped, prop.bone), prop.pos.x, prop.pos.y, prop.pos.z, prop.rot.x, prop.rot.y, prop.rot.z, true, true, false, true, 1, true)
-        end
-        if data.sound then
-            local s = data.sound
-            PlaySoundFromEntity(s.soundId, s.audioName, Ped, s.audioRef, true, 0)
-        end
-        if crafting and progressBar({
-            label = bartext..((metadata and metadata.label) or getItemLabel(data.item)).." x"..craftAmount,
-            time = totalBartime,
-            cancel = true,
-            dict = animDict,
-            anim = anim,
-            flag = 49,
-            icon = data.item,
-            request = true,
-        }) then
-            data.craft.amount = craftAmount
             for k, v in pairs(data.craft[data.item]) do
-                -- multiply igredient requirement in sent crafting table for removal
-                data.craft[data.item][k] = (v * craftAmount)
+                if isInventoryOpen() then
+                    print("^1Error^7: ^2Inventory is open, you tried to break things")
+                    stopCam(100)
+                    ClearPedTasks(Ped)
+                    if canReturn then craftingMenu(origData) end
+                    CraftLock = false
+                    return
+                end
+                if crafting and progressBar({
+                    label = "Using "..v.." "..getItemLabel(k),
+                    time = 800,
+                    cancel = true,
+                    dict = 'pickup_object',
+                    anim = "putdown_low",
+                    flag = 49,
+                    icon = k,
+                    disableMovement = true,
+                }) then
+                    TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[k], "use", v)
+                else
+                    crafted, crafting = false, false
+                    break
+                end
+                Wait(200)
             end
-            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
-            currentToken = nil -- clear client cached token
-            -- handle metadata and experience in a single go
-            if data.craft["hasCrafted"] ~= nil then
-                data.craftable.craftedItems[data.item] = true
-                triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+
+            if not crafted then
+                goto finishEarly
             end
-            if data.craft["exp"] ~= nil then
-                craftingLevel += data.craft["exp"].give * craftAmount
-                triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
-            end
-            if data.craftable.Recipes[1].oneUse == true then
-                removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
-                local breakId = GetSoundId()
-                PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
-                canReturn = false
-            end
-            if data.sound then
-                StopSound(data.sound.soundId)
-            end
-            if data.requiredItemfunc then
-                data.requiredItemfunc()
-            end
-        end
-        if craftProp then destroyProp(craftProp) end
-    else
-        -- Run the original loop for multiple progress bars
-        for i = 1, craftAmount do
+
             if crafting and progressBar({
                 label = bartext..((metadata and metadata.label) or getItemLabel(data.item)),
                 time = bartime,
@@ -451,16 +456,17 @@ function makeItem(data)
                 anim = anim,
                 flag = 49,
                 icon = data.item,
+                disableMovement = true,
                 request = true,
             }) then
                 TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
                 currentToken = nil
-                if data.craft["hasCrafted"] ~= nil then
+                if data.craft.hasCrafted ~= nil then
                     data.craftable.craftedItems[data.item] = true
                     triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
                 end
-                if data.craft["exp"] ~= nil then
-                    craftingLevel += data.craft["exp"].give
+                if data.craft.exp ~= nil then
+                    craftingLevel += data.craft.exp.give
                     triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
                 end
                 if data.craftable.Recipes[1].oneUse == true then
@@ -469,19 +475,61 @@ function makeItem(data)
                     PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
                     canReturn = false
                 end
-                if data.requiredItemfunc then
-                    data.requiredItemfunc()
-                end
             else
                 break
             end
+
+        end
+    else
+        if crafting and progressBar({
+            label = bartext..((metadata and metadata.label) or getItemLabel(data.item)).." x"..craftAmount,
+            time = totalBartime,
+            cancel = true,
+            dict = animDict,
+            anim = anim,
+            flag = 49,
+            icon = data.item,
+            disableMovement = true,
+            request = true,
+        }) then
+            data.craft.amount *= craftAmount
+            for k, v in pairs(data.craft[data.item]) do
+                -- multiply igredient requirement in sent crafting table for removal
+                data.craft[data.item][k] = (v * craftAmount)
+            end
+            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+            currentToken = nil -- clear client cached token
+            -- handle metadata and experience in a single go
+            if data.craft.hasCrafted ~= nil then
+                data.craftable.craftedItems[data.item] = true
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+            end
+            if data.craft.exp ~= nil then
+                craftingLevel += data.craft["exp"].give * craftAmount
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
+            end
+            --if data.craft.Recipes[1].oneUse == true then
+            --    removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
+            --    local breakId = GetSoundId()
+            --    PlaySoundFromEntity(breakId, "Drill_Pin_Break", Ped, "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+            --    canReturn = false
+            --end
         end
     end
+    ::finishEarly::
+    if craftProp then destroyProp(craftProp) end
 
-    Wait(500)
-    stopTempCam()
+    if data.sound then
+        StopSound(data.sound.soundId)
+    end
+    if data.requiredItemfunc then
+        data.requiredItemfunc()
+    end
+
+    --Wait(500)
+    stopCam(100)
     CraftLock = false
-    if canReturn then craftingMenu(data) end
+    if canReturn then craftingMenu(origData) end
     ClearPedTasks(Ped)
 end
 
@@ -512,14 +560,13 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
         return
     end
 
-
     local hasItems, hasTable = hasItem(ItemMake, 1, src)
     if stashName then
         local itemRemove = {}
         if type(stashName) == "table" then
             for _, name in pairs(stashName) do
                 stashItems = getStash(name)
-                for k, v in pairs(craftable[ItemMake] or {}) do
+                for k, v in pairs(craftable[ItemMake]) do
                     for _, b in pairs(stashItems or {}) do
                         if k == b.name then
                             itemRemove[k] = v
@@ -529,7 +576,7 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
             end
         else
             stashItems = getStash(stashName)
-            for k, v in pairs(craftable[ItemMake] or {}) do
+            for k, v in pairs(craftable[ItemMake]) do
                 for _, b in pairs(stashItems or {}) do
                     if k == b.name then
                         itemRemove[k] = v
@@ -539,8 +586,8 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
         end
         stashRemoveItem(stashItems, stashName, itemRemove)
     else
-        if craftable then
-            for k, v in pairs(craftable[ItemMake] or {}) do
+        if craftable[ItemMake] then
+            for k, v in pairs(craftable[ItemMake]) do
                 removeItem(tostring(k), v, src)
             end
         end
@@ -549,4 +596,5 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
     -- Optionally, add experience here:
     -- for example:
     -- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
-end)
+
+end)

shared/effects.lua

@@ -7,7 +7,10 @@ function AlienEffect()
     Wait(math.random(5000, 8000))
     local Ped = PlayerPedId()
     local animDict = "MOVE_M@DRUNK@VERYDRUNK"
-    loadAnimDict(animDict)
+    RequestAnimSet(animDict)
+    while not HasAnimSetLoaded(animDict) do
+        Wait(100)
+    end
     SetPedCanRagdoll(Ped, true)
     ShakeGameplayCam('DRUNK_SHAKE', 2.80)
     SetTimecycleModifier("Drunk")

shared/helpers.lua

@@ -638,6 +638,8 @@ function lookEnt(entity)
                 debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
                 Wait(1500)
             end
+            -- Make players head face the coord for 5 seconds
+            TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
         else
             if DoesEntityExist(entity) then
                 local entCoords = GetEntityCoords(entity)
@@ -646,11 +648,37 @@ function lookEnt(entity)
                     debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
                     Wait(1500)
                 end
+
+                -- Make players head face the coord for 5 seconds
+                TaskLookAtEntity(ped, entity, 5000, 1, 1)
             end
         end
     end
 end
 
+-- Function to clone tables, to use when referencing tables that need to be hard set
+function cloneTable(obj, opts, seen)
+    if type(obj) ~= "table" then return obj end
+    seen = seen or {}
+    if seen[obj] then return seen[obj] end
+
+    local copy = {}
+    seen[obj] = copy
+
+    -- Copy entries
+    for k, v in pairs(obj) do
+        local k2 = (opts and opts.copy_keys) and cloneTable(k, opts, seen) or k
+        copy[k2] = cloneTable(v, opts, seen)
+    end
+
+    -- Preserve metatable unless told not to
+    if not (opts and opts.strip_meta) then
+        local mt = getmetatable(obj)
+        if mt ~= nil then setmetatable(copy, mt) end
+    end
+
+    return copy
+end
 
 -------------------------------------------------------------
 -- Material and Prop Functions
@@ -933,4 +961,18 @@ end
 function GetEntityForwardVector(entity)
     local heading = math.rad(GetEntityHeading(entity) + 90)
     return vec3(math.cos(heading), math.sin(heading), 0.0)
+end
+
+function adjustMinMaxZ(coord, table)
+    local table = table
+    local adMinZ, adMaxZ = false, false
+    if table.minZ > (coord.z + 0.1) then
+        adMinZ = true
+        table.minZ = (coord.z - 1.05)
+    end
+    if table.maxZ < (coord.z - 0.1) then
+        adMinZ = true
+        table.maxZ = (coord.z + 0.80)
+    end
+    return table.minZ, table.maxZ, adMinZ, adMaxZ
 end

shared/input.lua

@@ -64,6 +64,7 @@ function createInput(title, opts)
                     label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""),
                     isRequired = opts[i].isRequired,
                     name = opts[i].name,
+                    default = opts[i].default,
                     options = opts[i].options,
                 }
             end

shared/itemcontrol.lua

@@ -103,6 +103,10 @@ local InvFunc = {
                 -- Add fallback if ox can't find the stash and returns a boolean
                 return type(stash) == "table" and stash.items or {}
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+                exports[OXInv]:SetMetadata(stash, slot, metadata)
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
 
@@ -207,6 +211,13 @@ local InvFunc = {
             function(stashName)
                 return exports[CoreInv]:getInventory(stashName)
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+                local itemData = exports[CoreInv]:getItemBySlot(stash, slot) or {}
+                if itemData then
+                    exports[CoreInv]:setItem(stash, itemData.item, itemData.count, metadata)
+                end
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -272,15 +283,15 @@ local InvFunc = {
             function(src)
                 local grabInv = nil
                 if src then
-                    grabInv = exports[OXInv]:GetInventoryItems(src)
+                    grabInv = exports[OrigenInv]:GetInventoryItems(src)
                 else
-                    grabInv = exports[OXInv]:GetPlayerItems()
+                    grabInv = exports[OrigenInv]:GetInventory()
                 end
                 return grabInv
             end,
         invImg =
             function(item)
-                return "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
+                return "nui://"..OrigenInv.."/html/images/"..(Items[item].image or "")
             end,
         openShop =
             function(name, label, items)
@@ -306,6 +317,10 @@ local InvFunc = {
             function(stashName)
                 return exports[OrigenInv]:getInventory(stashName)
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+                exports[OrigenInv]:setMetadata(stash, slot, metadata)
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -416,6 +431,10 @@ local InvFunc = {
             function(stashName)
                 return exports[CodeMInv]:GetStashItems(stashName)
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -529,6 +548,10 @@ local InvFunc = {
             function(stashName)
                 return exports[TgiannInv]:GetSecondaryInventoryItems("stash", stashName)
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -692,6 +715,10 @@ local InvFunc = {
                     return result and json.decode(result) or {}
                 end
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -880,6 +907,23 @@ local InvFunc = {
                     end
                 end
             end,
+        stashEditMetadata =
+            function(stash, slot, metadata)
+                local stashData = getStash(stash)
+                for i = 1, #stashData do
+                    if stashData[i].slot == slot then
+                        print("found slot")
+                        stashData[i].info = metadata
+                    end
+                    jsonPrint(stashData[i])
+                end
+
+                debugPrint("^6Bridge^7: ^3stashEditMetadata^7: ^2Saving ^3QB^2 stash '^6"..stash.."^7'")
+                MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
+                    ['stash'] = stash,
+                    ['items'] = json.encode(stashData)
+                })
+            end,
         stashAddItem =
             function(stashItems, stashName, items)
                 --
@@ -1147,7 +1191,7 @@ local InvFunc = {
             function(itemTable, src)
                 local resultTable = {}
                 for k, v in pairs(itemTable) do
-                    resultTable[k] = exports[OXInv]:CanCarryItem(src, k, v)
+                    resultTable[k] = exports[RSGInv]:CanCarryItem(src, k, v)
                 end
                 return resultTable
             end,
@@ -1301,6 +1345,32 @@ function hasItem(items, amount, src)
             end
         end
     end
+
+    -- Fallback to default hasItem function
+    if not hasTable or not next(hasTable) then
+        if isStarted(ESXExport) then
+            for item, amt in pairs(items) do
+                local count = 0
+                for itemName, amount in pairs(grabInv) do
+                    if itemName and itemName == item then
+                        count += (amount or 1)
+                    end
+                end
+                hasTable[item] = { hasItem = count >= amt, count = count }
+            end
+        else
+            for item, amt in pairs(items) do
+                local count = 0
+                for _, itemData in pairs(grabInv) do
+                    if itemData and itemData.name == item then
+                        count += (itemData.amount or itemData.count or 1)
+                    end
+                end
+                hasTable[item] = { hasItem = count >= amt, count = count }
+            end
+        end
+    end
+
     for _, v in pairs(hasTable) do
         if not v.hasItem then
             return false, hasTable
@@ -1334,12 +1404,40 @@ function getPlayerInv(src)
             break
         end
     end
-    if foundInv == "" then
+
+    -- Fallback to framework functions
+    if not grabInv then
+        if isStarted(QBExport) then
+            if src then
+                grabInv = Core.Functions.GetPlayer(src).PlayerData.items
+            else
+                grabInv = Core.Functions.GetPlayerData().items
+            end
+        elseif isStarted(ESXExport) then
+            if src then
+                local xPlayer = ESX.GetPlayerFromId(src)
+                grabInv = xPlayer and xPlayer.getInventory() or {}
+            else
+                grabInv = triggerCallback(getScript()..":GetESXInv")
+            end
+        end
+    end
+
+    if grabInv == nil then
         print("^4ERROR^7: ^2No Supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end
     return grabInv, foundInv
 end
 
+if isServer() then
+    createCallback(getScript()..":GetESXInv", function(source)
+        local src = source
+        local xPlayer = ESX.GetPlayerFromId(src)
+        local inv = xPlayer.getInventory()
+        return xPlayer.getInventory(src)
+    end)
+end
+
 function isInventoryOpen()
 
     return IsNuiFocused()
@@ -1423,6 +1521,17 @@ function createUseableItem(item, funct)
                 return
             end
         end
+
+        -- Fallback to framework functiosn
+        if isStarted(QBExport) then
+            debugPrint("^6Bridge^7: ^2Registering ^3UsableItem^2 with ^4"..QBExport.."^7:", item)
+            Core.Functions.CreateUseableItem(item, funct)
+        elseif isStarted(ESXExport) then
+            debugPrint("^6Bridge^7: ^2Registering ^3UsableItem^2 with ^4"..ESXExport.."^7:", item)
+            while not ESX do Wait(0) end
+            ESX.RegisterUsableItem(item, funct)
+        end
+
         debugPrint("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7")
     else
         print("^1ERROR^7: ^1Tried to make item usable but it didn't exist^7: "..item)
@@ -1448,7 +1557,7 @@ end
 --- addItem("health_potion", 2, { quality = "high" })
 --- ```
 function addItem(item, amount, info, src)
-    if not Items[item] then
+    if not doesItemExist(item) then
         print("^6Bridge^7: ^1Error^7 - ^2Tried to give ^7'^3"..item.."^7'^2 but it doesn't exist")
         return
     end
@@ -1477,7 +1586,7 @@ end
 --- removeItem("health_potion", 1)
 --- ```
 function removeItem(item, amount, src, slot)
-    if not Items[item] then
+    if not doesItemExist(item) then
         print("^6Bridge^7: ^1Error^7 - ^2Tried to remove ^7'^3"..item.."^7'^2 but it doesn't exist")
         return
     end
@@ -1513,14 +1622,21 @@ end
 
 
 RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token)
+    local excludeRes = {
+        [QBExport] = true,
+        [ESXExport] = true,
+        [VorpExport] = true,
+    }
+    local invokingRes = GetInvokingResource()
+
     --debugPrint(GetInvokingResource())
-	if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
+	if invokingRes and invokingRes ~= getScript() and not excludeRes[invokingRes] then
         debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
         return
     end
 
-    if not Items[item] then
-        print("^6Bridge^7: ^1Error^7 - ^2Tried to "..(tostring(give) == "true" and "add" or "remove").." '^3"..item.."^7' but it doesn't exist")
+    if not doesItemExist(item) then
+        print("^1Error^7 - ^2Tried to "..(tostring(give) == "true" and "add" or "remove").." '^3"..item.."^7' but it doesn't exist")
         return
     end
 
@@ -1540,6 +1656,10 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
 
     local invName = ""
     if give == 0 or give == false then
+        if remamount < 0 then
+            print("^1Error^7: ^7src - ^1Client tried to remove a minus number of item ^7- "..item)
+            return
+        end
         if not hasItem(item, amount or 1, src) then
             dupeWarn(src, item, amount)
 
@@ -1568,7 +1688,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
 
                 end
             else
-                debugPrint("^6Bridge^7: ^3"..action.."^7["..invName.."] Player("..src..") "..getItemLabel(item).."("..item..") x"..(amount or 1))
+                debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1))
             end
         end
     else
@@ -1593,7 +1713,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                 ESX.GetPlayerFromId(src).addInventoryItem(item, amountToAdd)
             end
         else
-            debugPrint("^6Bridge^7: ^3"..action.."^7["..invName.."] Player("..src..") "..getItemLabel(item).."("..item..") x"..(amount or 1))
+            debugPrint("^6Bridge^7: ^3"..action.."^7[^6"..invName.."^7] Player(^3"..src.."^7) "..getItemLabel(item).."("..item..") x"..(amount or 1))
         end
     end
 end)
@@ -1687,6 +1807,7 @@ function getItemMetadata(item, slot, src)
 
     if chosenSlot then
         for k, v in pairs(itemcheck) do
+            v.slot = tonumber(v.slot)
             if v.name == item and v.slot == chosenSlot then
                 lowestSlot = v.slot
                 metadata = itemcheck[k].info or itemcheck[k].metadata or {}
@@ -1695,6 +1816,7 @@ function getItemMetadata(item, slot, src)
         end
     else
         for k, v in pairs(itemcheck) do
+            v.slot = tonumber(v.slot)
             if v.name == item then
                 if v.slot <= lowestSlot then
                     lowestSlot = v.slot
@@ -1725,9 +1847,22 @@ RegisterNetEvent(getScript()..":server:setItemMetaData", function(data, src)
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
             inv.setItemMetadata(data, src)
-            break
+            return
         end
     end
+
+    -- Fallback functions
+    if isStarted(QBExport) or isStarted(QBXExport) then -- if qbcore or qbxcore, just use core functions
+        local Player = Core.Functions.GetPlayer(src)
+        Player.PlayerData.items[data.slot].info = data.metadata
+        if data.metadata.durability then
+            Player.PlayerData.items[data.slot].description = "HP : "..data.metadata.durability
+        end
+        Player.Functions.SetInventory(Player.PlayerData.items)
+
+    elseif ESX and isStarted(ESXExport) then  -- if esx then use core functions
+        --?
+    end
 end)
 
 -------------------------------------------------------------
@@ -1804,6 +1939,22 @@ function canCarry(itemTable, src)
             return inv.canCarry(itemTable, src)
         end
     end
+
+    -- Fallback to default canCarry function
+    local items = getPlayerInv(src)
+    local totalWeight = 0
+    if not items then return false end
+    for _, item in pairs(items) do
+        totalWeight += (item.weight * item.amount)
+    end
+    for k, v in pairs(itemTable) do
+        local itemInfo = Items[k]
+        if not itemInfo then
+            resultTable[k] = true
+        else
+            resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight
+        end
+    end
     return resultTable
 end
 
@@ -1855,6 +2006,11 @@ function getMaxInvWeight()
             break
         end
     end
+
+    -- Fallback function
+    if weight == 0 then
+        weight = InventoryWeight
+    end
     return weight
 end
 
@@ -1877,6 +2033,19 @@ function getCurrentInvWeight(src)
         end
     end
 
+    -- fallback function
+    if weight == 0 then
+        local itemcheck = getPlayerInv(src)
+        if isStarted(ESXExport) then
+            for _, amount in pairs(itemcheck) do
+                weight += (amount or 0)
+            end
+        else
+            for _, v in pairs(itemcheck) do
+                weight += ((v.weight * (v.amount or v.count)) or 0)
+            end
+        end
+    end
     return weight
 end
 
@@ -2127,6 +2296,16 @@ function openStash(data)
 end
 
 
+function stashEditMetadata(stash, slot, metadata)
+    for i = 1, #InvFunc do
+        local inv = InvFunc[i]
+        if isStarted(inv.invName) then
+            inv.stashEditMetadata(stash, slot, metadata)
+            return
+        end
+    end
+end
+
 -- Wrapper function for opening stash from the server.
 -- Messy but not much else I can do about it.
 RegisterNetEvent(getScript()..":server:openServerStash", function(data)
@@ -2185,7 +2364,6 @@ end
 --- local items = getStash("playerStash")
 --- ```
 function getStash(stashName)
-    local stashResource = ""
     if stashName == "" or type(stashName) ~= "string" then
         print("^6Bridge^7: ^2Stash name was not a string ^3"..stashName.."^7(^3"..type(stashName).."^7)")
         return {}
@@ -2197,10 +2375,23 @@ function getStash(stashName)
         if isStarted(inv.invName) then
             debugPrint("^6Bridge^7: ^2Retrieving ^3"..inv.invName.." ^2Stash^7:", stashName)
             stashItems = inv.getStash(stashName)
-            break
+            goto skip
         end
     end
 
+    -- Fallback to sql checks if no supported inventory found
+    if not stashItems or not next(stashItems) then
+        if isStarted(QBExport) or isStarted(QBXExport) then
+            local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
+            if result then
+                stashItems = json.decode(result)
+            end
+        elseif ESX and isStarted(ESXExport) then  -- if esx then use core functions
+            --?
+        end
+
+    end
+    ::skip::
     if stashItems then
         for _, item in pairs(stashItems) do
             local itemInfo = Items[item.name:lower()]
@@ -2224,7 +2415,6 @@ function getStash(stashName)
         end
         debugPrint("^6Bridge^7: ^3GetStashItems^7: ^2Stash information for '^6"..stashName.."^7' retrieved")
     end
-    jsonPrint(items)
     return items
 end
 
@@ -2261,10 +2451,37 @@ function stashRemoveItem(stashItems, stashName, items)
         end
     end
 
+    -- Fallback to core functions
+    if isStarted(QBExport) then
+        local stashItems = getStash(stashName[1])
+        for k, v in pairs(items) do
+            for l in pairs(stashItems) do
+                if stashItems[l].name == k then
+                    if (stashItems[l].amount - v) <= 0 then
+                        stashItems[l] = nil
+                    else
+                        debugPrint("^6Bridge^7: ^2Removing ^3"..PSInv.." ^2Stash item^7:", k, v)
+                        stashItems[l].amount -= v
+                    end
+                end
+            end
+        end
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QBCORE^2 stash ^7'^6"..stashName[1].."^7'")
+        MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
+            ['stash'] = stashName[1],
+            ['items'] = json.encode(stashItems)
+        })
+    elseif isStarted(ESXExport) then
+        --?
+    end
     print("^4ERROR^7: ^2No supported Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
 end
 RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
 
+function stashAddItem(stashItems, stashName, items)
+    -- wip
+end
+
 -------------------------------------------------------------
 -- Stash Item Availability Check
 -------------------------------------------------------------
@@ -2389,18 +2606,20 @@ if isServer() then
     end)
 end
 
-RegisterNetEvent(getScript()..":openGrabBox", function(data)
+RegisterNetEvent(getScript()..":openGrabBox", function(data, stashData)
     local Ped = PlayerPedId()
 	local id = data.metadata and data.metadata.id or data.info and data.info.id or ""
 
     if isStarted(OXInv) then
-
+        -- this SHOLD be handled within ox_inventory if set up right
         return
     end
 
 	openStash({
 		stash = id,
-        coords = GetEntityCoords(Ped)
+        coords = GetEntityCoords(Ped),
+        maxWeight = stashData and stashData.maxWeight or 100000,
+        slots = stashData and stashData.slots or 5,
 	})
 end)
 
@@ -2622,7 +2841,6 @@ end
 --- })
 --- ```
 function openShop(data)
-    --jsonPrint(data)
     if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
 
     -- If shop has registered coords, limit players from being too far away from it when opening
@@ -2631,6 +2849,7 @@ function openShop(data)
         print("^3Warning^7: ^2This isn't a registered store^1, refusing call^7")
         return
     end
+
     if not distExploitCheck(exploitCheck) then
         return
     end
@@ -2640,16 +2859,44 @@ function openShop(data)
         lookEnt(data.coords)
         return
     end
+    if not data.items.items[1] then
+        local shopMenu = {}
+        for k, v in pairs(data.items.items) do
+            local clonedTable = cloneTable(data)
+            local itemsTable = v.items or v.Items
+            shopMenu[#shopMenu+1] = {
+                header = v.header or k,
+                txt = countTable(itemsTable).." Products",
+                onSelect = function()
+                    --clonedTable.originShop = data.shop
+                    clonedTable.shop = data.shop.."_"..k
+                    clonedTable.label = data.items.label.." - "..(v.header or k)
+                    clonedTable.slots = #itemsTable
+                    clonedTable.items.items = itemsTable
+                    openShop(clonedTable)
+                end,
+            }
+        end
+        return openMenu(shopMenu, { header = data.items.label, canClose = true, })
+    end
+
 
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
             inv.openShop(data.shop, data.items.label, data.items)
             lookEnt(data.coords)
-            break
+            return
         end
     end
 
+    if isStarted(QBExport) then
+        TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
+        TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
+    elseif isStarted(ESXExport) then
+        --?
+    end
+
 end
 
 RegisterNetEvent(getScript()..':server:openServerShop', function(shopName)
@@ -2657,7 +2904,7 @@ RegisterNetEvent(getScript()..':server:openServerShop', function(shopName)
 
     -- If shop has registered coords, limit players from being too far away from it when opening
     if not shopExploitCheck[shopName] then
-        print("^3Warning^7: ^1Source^7: ^3"..src.." ^1Tried to open a shop^7: ^2This isn't a registered store^1, refusing call^7")
+        print("^3Warning^7: ^1Source^7: ^3"..src.." ^1Tried to open a shop ^7'"..shopName.."' ^2This isn't a registered store^7, ^1refusing call^7")
         return
     end
     if not distExploitCheck(shopExploitCheck[shopName], src) then
@@ -2699,8 +2946,18 @@ function registerShop(name, label, items, society, coords)
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
-            inv.registerShop(name, label, items, society)
-            debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
+            if not items[1] then
+                for k, v in pairs(items) do
+                    inv.registerShop(name.."_"..k, label.." - "..(v.header or k), v.items, society)
+                    shopExploitCheck[name.."_"..k] = shopExploitCheck[name.."_"..k] or {}
+                    shopExploitCheck[name.."_"..k][#shopExploitCheck[name.."_"..k]+1] = coords
+
+                    debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name.."_"..k, "^4Label^7: "..label.." - "..(v.header or k), coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
+                end
+            else
+                inv.registerShop(name, label, items, society)
+                debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
+            end
             break
         end
     end

shared/make/cameras.lua

@@ -19,7 +19,7 @@ local camCache = {}
 -- ```
 function createTempCam(ent, coords)
 	local camID = nil
-	if Config.Crafting?.craftCam or Config.System.enableCam then
+	if (Config.Crafting and Config.Crafting.craftCam) or Config.System.enableCam then
 
 		-- if not ent or coords are provided, make a basic camera to control later
 		if not ent and not coords then
@@ -171,7 +171,7 @@ function stopTempCam(renderTime)
 
 		clearLoadLocation()
 
-		Wait(renderTime or 0)
+		Wait(renderTime or 500)
 		for i = 1, #camCache do
 			DestroyCam(camCache[i], true)
 		end

shared/make/progressBars.lua

@@ -206,6 +206,52 @@ local progressFunc = {
                 exports.jim_bridge:stopProgressBar()
             end,
     },
+
+    ["17mov"] = {
+        start =
+            function(data)
+                if exports["17mov_Hud"]:StartProgress({
+                    duration = debugMode and 1000 or data.time,
+                    label = data.label,
+                    useWhileDead = data.dead or false,
+                    canCancel = data.cancel or true,
+                    controlDisables = {
+                        disableMovement = data.disableMovement or false,
+                        disableCarMovement = data.disableMovement or false,
+                        disableMouse = data.mouse or false,
+                        disableCombat = data.combat or true,
+                    },
+                    animation = {
+                        animDict = data.dict,
+                        anim = data.anim,
+                        flags = (data.flag == 8 and 32 or data.flag) or nil,
+                        task = data.task,
+                    },
+                    prop = data.prop and {
+                        model = data.prop.model,
+                        bone = data.prop.bone or 0,
+                        coords = data.prop.pos or vec3(0, 0, 0),
+                        rotation = data.prop.rot or vec3(0, 0, 0),
+
+                    } or nil,
+                    propTwo = data.propTwo and {
+                        model = data.propTwo.model,
+                        bone = data.propTwo.bone or 0,
+                        coords = data.propTwo.pos or vec3(0, 0, 0),
+                        rotation = data.propTwo.rot or vec3(0, 0, 0),
+                    } or nil,
+
+                }, nil, nil) then
+                    return true
+                else
+                    return false
+                end
+            end,
+        stop =
+            function()
+                exports["17mov_Hud"]:StopProgress()
+            end,
+    },
 }
 
 --- Displays a progress bar using the configured progress bar system.

shared/metaHandlers.lua

@@ -122,7 +122,7 @@ function GetPlayer(source)
             return framework.GetPlayer(source)
         end
     end
-    return nil
+    return {}
 end
 
 -------------------------------------------------------------

shared/notify.lua

@@ -111,7 +111,10 @@ local notifyFunc = {
 --- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId)
 --- ```
 function triggerNotify(title, message, type, src)
-    if not Config.System?.Notify then debugPrint("Notify triggered but not set up") return end
+    if not Config or not Config.System or not Config.System.Notify then
+        print("Notify triggered but not set up")
+        return
+    end
 
     if src then
         notifyFunc[Config.System.Notify].server(title, message, type, src)

shared/playerfunctions.lua

@@ -32,7 +32,7 @@ local hungerThirstFunc = {
         setStress =
             function(src, stress)
                 local Player = Core.Functions.GetPlayer(src)
-                local newStress = Player.PlayerData.metadata.stress + stress
+                local newStress = Player.PlayerData.metadata.stress - stress
                 newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress
                 Player.Functions.SetMetaData('stress', newStress)
                 TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -59,7 +59,7 @@ local hungerThirstFunc = {
         setStress =
             function(src, stress)
                 local Player = Core.Functions.GetPlayer(src)
-                local newStress = Player.PlayerData.metadata.stress + stress
+                local newStress = Player.PlayerData.metadata.stress - stress
                 newStress = (newStress >= 100.0 and 100.0)or (newStress <= 0 and 0) or newStress
                 Player.Functions.SetMetaData('stress', newStress)
                 TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -86,7 +86,7 @@ local hungerThirstFunc = {
         setStress =
             function(src, stress)
                 local Player = Core.Functions.GetPlayer(src)
-                local newStress = Player.PlayerData.metadata.stress + stress
+                local newStress = Player.PlayerData.metadata.stress - stress
                 newStress = (newStress >= 100.0 and 100.0) or (newStress <= 0 and 0) or newStress
                 Player.Functions.SetMetaData('stress', newStress)
                 TriggerClientEvent('hud:client:UpdateStress', src, newStress)
@@ -187,10 +187,10 @@ end)
 --- Server event handler for setting player needs (thirst or hunger).
 ---
 --- @event
---- @param type string "thirst" or "hunger".
+--- @param needType string "thirst" or "hunger".
 --- @param amount number New value to set.
 RegisterNetEvent(getScript()..":server:setNeed", function(needType, amount)
-    print("^1Deprecated function ':server:setNeed' called, please update your scripts^7")
+    print("^1Deprecated function ':server:setNeed' called, please update the scripts that use it^7")
 --    local src = source
 --    if needType == "thirst" then
 --        setThirst(src, amount)
@@ -217,6 +217,14 @@ local billPlayerFunc = {
         function(data)
             TriggerEvent("okokBilling:ToggleCreateInvoice")
         end,
+    codem =
+        function(data)
+            TriggerEvent("codem-billing:client:OpenMenu")
+        end,
+    tgg =
+        function(data)
+            exports["tgg-billing"]:OpenBillingMenu()
+        end,
 }
 
 --- BillPlayer
@@ -384,41 +392,6 @@ end
 --- ```
 function ConsumeSuccess(itemName, type, data)
     print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
-    --local hunger = data and data.hunger or Items[itemName].hunger
-    --local thirst = data and data.thirst or Items[itemName].thirst
-    --
-    --ExecuteCommand("e c")
-    --removeItem(itemName, 1)
-    --
-    --if isStarted(ESXExport) then
-    --    if hunger then
-    --        TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
-    --    end
-    --    if thirst then
-    --        TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
-    --    end
-    --else
-    --    if hunger then
-    --        TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
-    --    end
-    --    if thirst then
-    --        TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
-    --    end
-    --end
-    --
-    --if type == "alcohol" then
-    --    alcoholCount = (alcoholCount or 0) + 1
-    --    if alcoholCount > 1 and alcoholCount < 4 then
-    --        TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
-    --    elseif alcoholCount >= 4 then
-    --        TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
-    --        AlienEffect()
-    --    end
-    --end
-    --
-    --if Config.Reward then
-    --    getRandomReward(itemName)
-    --end
 end
 
 -------------------------------------------------------------
@@ -431,19 +404,26 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                     return hasJobFlag, duty
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                     return hasJobFlag, duty
@@ -457,21 +437,29 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
+                ::skip::
                 return hasJobFlag, duty
             end,
     },
@@ -500,9 +488,8 @@ local hasGroupFunc = {
         hasGroup =
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
-
                 local playerInfo = GetPlayer(src)
-                local info = playerInfo.job
+                local info = playerInfo and playerInfo.job
                 while not info do
                     info = GetPlayer(src).job
                     Wait(100)
@@ -510,7 +497,6 @@ local hasGroupFunc = {
                 if info.name == group then
                     hasJobFlag = true
                 end
-
                 return hasJobFlag, duty
             end,
     },
@@ -520,18 +506,25 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
@@ -585,6 +578,7 @@ local getPlayerFunc = {
                 local Player = {}
                 local info = ESX.GetPlayerFromId(src)
                 if not info then return {} end
+
                 Player = {
                     name = info.getName(),
                     cash = info.getMoney(),
@@ -601,6 +595,8 @@ local getPlayerFunc = {
                     onDuty = info.job.onDuty,
                     --account = info.charinfo.account,
                     citizenId = info.identifier,
+                    hunger = Player(src).state.hunger or 0,
+                    thirst = Player(src).state.thirst or 0,
                 }
                 return Player
             end,
@@ -616,6 +612,7 @@ local getPlayerFunc = {
                     if v.name == "money" then cash = v.money end
                     if v.name == "bank" then bank = v.money end
                 end
+
                 Player = {
                     firstname = info.firstName,
                     lastname = info.lastName,
@@ -631,7 +628,9 @@ local getPlayerFunc = {
                     --account = info.charinfo.account,
                     citizenId = info.identifier,
                     isDead = IsEntityDead(PlayerPedId()),
-                    isDown = IsPedDeadOrDying(PlayerPedId(), true)
+                    isDown = IsPedDeadOrDying(PlayerPedId(), true),
+                    hunger = LocalPlayer.state.hunger or 0,
+                    thirst = LocalPlayer.state.thirst or 0,
                 }
                 return Player
             end,
@@ -715,6 +714,8 @@ local getPlayerFunc = {
                     isDead = info.PlayerData.metadata["isdead"],
                     isDown = info.PlayerData.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.PlayerData.metadata["hunger"],
+                    thirst = info.PlayerData.metadata["thirst"],
                 }
                 return Player
             end,
@@ -743,6 +744,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -774,6 +777,8 @@ local getPlayerFunc = {
                         isDead = info.metadata["isdead"],
                         isDown = info.metadata["inlaststand"],
                         charInfo = info.charinfo,
+                        hunger = info.metadata["hunger"],
+                        thirst = info.metadata["thirst"],
                     }
                 end
                 return Player
@@ -805,6 +810,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -836,6 +843,8 @@ local getPlayerFunc = {
                         isDead = info.metadata["isdead"],
                         isDown = info.metadata["inlaststand"],
                         charInfo = info.charinfo,
+                        hunger = info.metadata["hunger"],
+                        thirst = info.metadata["thirst"],
                     }
                 end
                 return Player
@@ -867,6 +876,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -968,6 +979,12 @@ local wardrobeFunc = {
             TriggerEvent("illenium-appearance:client:openOutfitMenu")
         end,
     },
+    {
+        name = "rcore_clothing",
+        openWardrobe = function()
+            TriggerEvent('rcore_clothing:openChangingRoom')
+        end,
+    }
 }
 
 --- Opens the clothing customization menu
@@ -980,4 +997,5 @@ function openClothing()
             break
         end
     end
-end
+
+end

shared/societybank.lua

@@ -263,4 +263,14 @@ function fundSociety(society, amount)
     end
 
     print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
+end
+
+if isServer() then
+    createCallback(getScript()..":server:getAccount", function(source, society)
+        if society then
+            local getMoney = getSocietyAccount(society)
+            return getMoney
+        end
+        return 0
+    end)
 end

shared/targets.lua

@@ -252,7 +252,7 @@ function createEntityTarget(entity, opts, dist)
     -- Store the target entity for later cleanup.
     targetEntities[#targetEntities + 1] = entity
 
-    -- if force target off, use jim_bridge buiilt in target functions
+    -- if force target off, use jim_bridge built in target functions
     if Config.System.DontUseTarget then
         exports.jim_bridge:createEntityTarget(entity, opts, dist)
         debugPrint("^6Bridge^7: ^2Creating new ^3Entity ^2target with ^6jim_bridge ^2for entity ^7"..entity)
@@ -324,8 +324,7 @@ end
 ---}, 2.0)
 ---```
 function createBoxTarget(data, opts, dist)
-
-    -- if force target off, use jim_bridge buiilt in target functions
+    -- if force target off, use jim_bridge built in target functions
     if Config.System.DontUseTarget then
         debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
         return exports.jim_bridge:createZoneTarget(data, opts, dist)
@@ -336,6 +335,13 @@ function createBoxTarget(data, opts, dist)
         local script = targetFunc[i]
         if isStarted(script.targetName) then
             debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
+            if data[5].minZ or data[5].maxZ then
+                local adMinZ, adMaxZ
+                data[5].minZ, data[5].maxZ, adMinZ, adMaxZ = adjustMinMaxZ(data[2], { minZ = data[5].minZ, maxZ = data[5].maxZ })
+                if adMinZ or adMaxZ then
+                    print("^5Debug^7: ^2Auto adjusted ^7'^4"..data[1].."^7' ^2minZ and maxZ because ^1they weren't set correctly ^2remove or fix them for this target")
+                end
+            end
             local target = script.boxTarget(data, opts, dist)
             boxTargets[#boxTargets + 1] = target
             return target
@@ -344,6 +350,50 @@ function createBoxTarget(data, opts, dist)
     return nil
 end
 
+
+function createPropTarget(data, opts, dist)
+    -- Audo create a location based on a coord and a prop models dimensions
+    local width, depth, _ = GetPropDimensions(data[3])
+    local min, max = GetModelDimensions(data[3])
+    local coordAdjustment = data[2] - vec4(0, 0, 1.03, 0)
+    local newData = {
+        [1] = data[1],
+        [2] = coordAdjustment.xyz,
+        [3] = width + 0.1,
+        [4] = depth + 0.1,
+        [5] = {
+            name = data[1],
+            heading = coordAdjustment.w - 90.0,
+            debugPoly = debugMode,
+            minZ = coordAdjustment.z + (min.z) - 0.1,
+            maxZ = coordAdjustment.z + (max.z) + 0.1,
+        }
+    }
+
+    if data[3] then -- If spawning a prop, make entity target instead (ignores depth and width stuff)
+        makeDistProp({ prop = data[3], coords = data[2] }, true, false)
+    end
+
+    -- if force target off, use jim_bridge built in target functions
+    if Config.System.DontUseTarget then
+        debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
+        return exports.jim_bridge:createZoneTarget(newData, opts, dist)
+    end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
+            local target = script.boxTarget(newData, opts, dist)
+            boxTargets[#boxTargets + 1] = target
+            return target
+        end
+    end
+    return nil
+end
+
+
 -------------------------------------------------------------
 -- Circle Zone Target Creation
 -------------------------------------------------------------
@@ -382,7 +432,7 @@ end
 --- ```
 function createCircleTarget(data, opts, dist)
 
-    -- if force target off, use jim_bridge buiilt in target functions
+    -- if force target off, use jim_bridge built in target functions
     if Config.System.DontUseTarget then
         debugPrint("^6Bridge^7: ^2Creating new ^3Sphere ^2target with ^6jim_bridge ^7"..data[1])
         return exports.jim_bridge:createZoneTarget(data, opts, dist)
@@ -429,7 +479,7 @@ end
 ---```
 function createModelTarget(models, opts, dist)
 
-    -- if force target off, use jim_bridge buiilt in target functions
+    -- if force target off, use jim_bridge built in target functions
     if Config.System.DontUseTarget then
         debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6jim_bridge^7")
         return exports.jim_bridge:createModelTarget(models, opts, dist)

starter.lua

@@ -33,15 +33,51 @@ Exports = {
 }
 
 -- Required variables
-debugMode = Config.System.Debug
+debugMode = false
 
 QBInvNew = true
 
 InventoryWeight = 120000
 
+-- Corruptted transfer file Checks -- Not Ready Yet ⚠️
+
+--CreateThread(function()
+--    local res = GetCurrentResourceName()
+--    local ok, val = pcall(function()
+--        return exports[res]:ping_encrypted()
+--    end)
+--
+--    if not ok or val ~= "ok" then
+--        print("\n^6===============================================================================")
+--        print(("\n^1Corruption Warning^7: ^1[^7%s^1] Encrypted files failed to initialize.^7\n"):format(res))
+--        print("^3Common causes^7:")
+--        print("  • Possible corrupt files")
+--        print("  • Damaged or partial upload (FTP/zip/unzip issue).")
+--        print("  • Outdated artifact version\n")
+--        print("^2How To Fix^7:")
+--        print("  • Update your server artifact version")
+--        print("  • Re-download asset from Keymaster")
+--        print("  • Use WinSCP to upload")
+--        print("  • Avoid editing any encrypted files")
+--        print("  • Restart the server")
+--        print("\n^6===============================================================================^7\n")
+--    end
+--end)
+
+-- Missing/Broken Config file check
+if not Config or not Config.System then
+    print("\n^6=================================================================================")
+    print("^6=================================================================================\n")
+    print("  ^1ERROR^7: jim_bridge ^1can't find the ^7Config^1 table in ^7"..GetCurrentResourceName())
+    print("  ^1It is either missing, or there is an error inside it stopping it from loading^7\n")
+    print("^6=================================================================================")
+    print("^6=================================================================================^7\n")
+end
+
 -- [[ Server.Cfg Convar Check ]]--
 -- Check server convars for hard set defaults, otherwise it uses per script configurations
 if Config and Config.System then
+    debugMode = Config.System.Debug
     if Config.System.Debug then
         if GetConvar("jim_DisableDebug", "false") == "true" then
             debugMode = false
@@ -50,7 +86,6 @@ if Config and Config.System then
             Config.System.EventDebug = false
         end
     end
-
     Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
     Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
     Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")

ui_modules/alcohol.lua

@@ -0,0 +1,289 @@
+local alcoholCount = 0
+local drugCount = 0
+local purgeTimer = 300000
+
+local minDrugCount = 3
+local maxDrugCount = 7
+
+local minAlcoholCount = 2
+local midAlcoholCount = 4
+local maxAlcoholCount = 7
+
+local alcoholEffectData = {
+    levels = {
+        ["min"] = {
+            effect = "DrugsMichaelAliensFightIn",
+            movement = "move_m@drunk@slightlydrunk",
+            camShake = 0.5,
+            canStumble = false,
+        },
+        ["mid"] = {
+            effect = "DrugsMichaelAliensFightIn",
+            movement = "move_m@drunk@moderatedrunk",
+            canRagdoll = true,
+            camShake = 0.5,
+            canStumble = true,
+            stumbleChance = 0.8,
+            drunkDriving = true,
+        },
+        ["max"] = {
+            effect = "DrugsMichaelAliensFightIn",
+            movement = "move_m@drunk@verydrunk",
+            canRagdoll = true,
+            camShake = 2.8,
+            canStumble = true,
+            stumbleChance = 0.6,
+            drunkDriving = true,
+        },
+    },
+}
+
+local drugEffectData = {
+    levels = {
+        ["min"] = {
+            --effect = "SwitchHUDTrevorIn",
+            --movement = "move_m@drunk@slightlydrunk",
+        },
+        ["max"] = {
+            effect = "SwitchHUDTrevorIn",
+            movement = "move_m@drunk@slightlydrunk",
+            camShake = 0.2,
+        },
+    }
+
+}
+
+-- Alcohol Thread
+function addAlocholCount(count, canOD)
+    alcoholCount = alcoholCount + count
+    --print("Alcohol count increased, current amount:", alcoholCount)
+    CreateThread(function()
+        runAlcoholThread()
+    end)
+    if alcoholCount >= maxAlcoholCount then
+        -- max
+        startAlcoholEffect(alcoholEffectData.levels["max"], "max")
+        if canOD then
+            SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10, 15))
+        end
+    elseif alcoholCount < maxAlcoholCount and alcoholCount >= midAlcoholCount then
+        -- mid
+        startAlcoholEffect(alcoholEffectData.levels["mid"], "mid")
+        TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
+        if canOD then
+            SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(5, 10))
+        end
+    elseif alcoholCount >= 1 then
+        -- min
+        TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
+        startAlcoholEffect(alcoholEffectData.levels["min"], "min")
+    end
+end
+
+function getAlcoholCount()
+    return alcoholCount
+end
+
+function removeAlcoholCount(count)
+    alcoholCount = alcoholCount - count
+    if alcoholCount < minAlcoholCount then
+        clearCurrentAlcoholEffect()
+    end
+    --print("Alcohol count decreased, current amount:", alcoholCount)
+end
+
+local alcoholThreadRun = false
+function runAlcoholThread()
+    if alcoholThreadRun == true then
+        return
+    else
+        alcoholThreadRun = true
+    end
+    --print("Alcohol Thread triggered")
+    while alcoholCount > 0 do
+        Wait(purgeTimer)
+        removeAlcoholCount(1)
+        if alcoholCount <= 0 then
+            clearCurrentAlcoholEffect()
+            alcoholThreadRun = false
+            break
+        end
+	end
+end
+
+exports("getAlcoholCount",getAlcoholCount)
+exports("addAlocholCount", addAlocholCount)
+exports("removeAlcoholCount", removeAlcoholCount)
+
+
+-- EFFECT Management
+
+local currentAlcoholEffect = ""
+local alcoholEffect = ""
+
+function clearCurrentAlcoholEffect()
+    local Ped = PlayerPedId()
+    if alcoholEffect ~= "" then
+        AnimpostfxStop(alcoholEffect)
+        ResetPedMovementClipset(Ped, 0.0)
+        ClearTimecycleModifier()
+        ResetScenarioTypesEnabled()
+        SetPedIsDrunk(Ped, false)
+        SetPedMotionBlur(Ped, false)
+    end
+    currentAlcoholEffect = ""
+    alcoholEffect = ""
+end
+
+function startAlcoholEffect(data, level)
+    local Ped = PlayerPedId()
+    if currentAlcoholEffect == level then
+        return
+    else
+        clearCurrentAlcoholEffect()
+        currentAlcoholEffect = level
+    end
+
+    -- Start effect using sent data
+    if alcoholEffect ~= data.effect then
+        alcoholEffect = data.effect
+        AnimpostfxPlay(data.effect, 0, true)
+        if data.movement then
+            RequestAnimSet(data.movement)
+            while not HasAnimSetLoaded(data.movement) do
+                Wait(100)
+            end
+            SetPedMovementClipset(Ped, data.movement, 3.0)
+        end
+        SetPedCanRagdoll(Ped, true)
+        if data.camShake then
+            ShakeGameplayCam("DRUNK_SHAKE", data.camShake)
+        end
+        SetTimecycleModifier("Drunk")
+        SetPedMotionBlur(Ped, true)
+        SetPedIsDrunk(Ped, true)
+
+        if data.drivingEffect or data.canStumble then
+
+            CreateThread(function()
+                local effectCheck = level
+                local lastStumbleTime = GetGameTimer() + 1200
+                local lastDriveTime = GetGameTimer() + 6000
+                while effectCheck == currentAlcoholEffect do
+                    if data.camStumble and GetGameTimer() > lastStumbleTime and math.random() > (data.stumbleChance or 0.8) then
+                        lastStumbleTime = GetGameTimer() + 1200
+                        SetPedToRagdoll(Ped, 5000, 5000, 0, true, true, false)
+                    end
+                    if data.driving and GetGameTimer() > lastDriveTime then
+                        local inVeh, veh, seat = GetSeatPedIsIn()
+                        if inVeh then
+                            lastDriveTime = GetGameTimer() + 6000
+                            if seat == -1 then
+                                if math.random() < 0.62 then
+                                    StartVehicleHorn(veh, 1000, "NORMAL", false)
+                                end
+                            end
+                        end
+                    end
+                    Wait(1000)
+                end
+                --print("Effect loop broken")
+            end)
+
+        end
+    end
+end
+
+-- Helper
+function GetSeatPedIsIn()
+    local inVeh, veh, seat = false, 0, 0
+    local veh = GetVehiclePedIsIn(PlayerPedId(), false)
+    if veh ~= 0 then
+        if GetPedInVehicleSeat(veh, -1) == PlayerPedId() then
+            inVeh = true
+            seat = -1
+        end
+    end
+    return inVeh, veh, seat
+end
+
+
+-- Drug thread
+function addDrugCount(count, canOD)
+    drugCount = drugCount + count
+    --print("Drug count increased, current amount:", drugCount)
+    if drugCount >= minDrugCount and drugCount <= maxDrugCount then
+        startDrugEffect(drugEffectData.levels["min"], "min")
+    elseif drugCount > maxDrugCount then
+        if canOD then
+            SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10, 15))
+        end
+        startDrugEffect(drugEffectData.levels["max"], "max")
+    end
+end
+
+function getDrugCount()
+    return drugCount
+end
+
+function removeDrugCount(count)
+    --print("Drug count decreased, current amount:", drugCount)
+    drugCount = drugCount - count
+end
+
+local drugThreadRun = false
+function runDrugThread()
+    if drugThreadRun == true then
+        return
+    else
+        drugThreadRun = true
+    end
+    --print("Drug Thread triggered")
+    while drugCount > 0 do
+        Wait(purgeTimer)
+        removeDrugCount(1)
+        if drugCount <= 0 then
+            drugThreadRun = false
+            break
+        end
+	end
+end
+
+exports("getDrugCount", getDrugCount)
+exports("addDrugCount", addDrugCount)
+exports("removeDrugCount", removeDrugCount)
+
+
+-- EFFECT Management
+
+local currentDrugEffect = ""
+local drugEffect = ""
+function startDrugEffect(data, level)
+    local Ped = PlayerPedId()
+    if currentDrugEffect == level then
+        return
+    else
+        clearCurrentAlcoholEffect()
+        currentDrugEffect = level
+    end
+
+    -- Start effect using sent data
+    if drugEffect ~= data.effect then
+        drugEffect = data.effect
+        AnimpostfxPlay(data.effect, 0, true)
+        if data.movement then
+            RequestAnimSet(data.movement)
+            while not HasAnimSetLoaded(data.movement) do
+                Wait(100)
+            end
+            SetPedMovementClipset(Ped, data.movement, 3.0)
+        end
+        SetPedCanRagdoll(Ped, true)
+        if data.camShake then
+            ShakeGameplayCam("DRUNK_SHAKE", data.camShake)
+        end
+        SetTimecycleModifier("Drunk")
+        SetPedMotionBlur(Ped, true)
+        SetPedIsDrunk(Ped, true)
+    end
+end

ui_modules/progressbar.lua

@@ -231,7 +231,6 @@ function gtaProgressBar(data)
     while result == nil do Wait(10) end
     inProgress = false
 
-    print(tostring(result))
     -- Cleanup animations/tasks
     if data.dict then
         stopAnim(data.dict, data.anim, ped)
@@ -240,7 +239,6 @@ function gtaProgressBar(data)
         ClearPedTasks(ped)
     end
 
-
     -- Cleanup
     FreezeEntityPosition(ped, false)
 

version.txt

@@ -1,13 +1,14 @@
-2.1.03
+2.1.09
 
-- Fix hunger and thirst math (add instead of set)
-- Fix cleanup of targets qb-targets on unload
-- Add support for new jim-shops exploit protection
-- Add full support for esx_society (fixes esx bossmenu errors)
-- Fix possible issue with qb-core /command registering
-- Make ox_lib progressbars return false correctly
-- Fix ox_inv players current weight checks
-- User alternate function for inventory retreival for CodeM Inv
-- Rework _loaders.lua tobe more organised/optimizied
+- Add 100 wait for stopCam to reduce slow movement
+- Add support for rcore_clothing in openClothing() - Thanks desypher
+- Add hunger and thirst calls to getPlayer() - Thanks oosayeroo
+- Add support for tgg-billing - Thanks GhostInLowGear
+- Fix hasJob() checking players who haven't logged in yet
+- Add exploit possibility for removeItem with minus numbers
+- Fix movement being allowed when crafting
+- Make distExploitCheck() more verbose
+- CodeM slot fix, force to number (because numbers are apparently strings)
+- ESX change to check statebag for hunger and thirst info
 
 https://github.com/jimathy/jim_bridge/releases/latest