Version Bump

`2.1.07` - `2.1.08`

.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.06"
+version "2.1.08"
 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/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,6 +648,9 @@ 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

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)
                 --
@@ -1377,7 +1421,6 @@ function getPlayerInv(src)
                 grabInv = triggerCallback(getScript()..":GetESXInv")
             end
         end
-        --jsonPrint(grabInv)
     end
 
     if grabInv == nil then
@@ -2247,6 +2290,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)
@@ -2316,7 +2369,7 @@ 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
 
@@ -2332,7 +2385,7 @@ function getStash(stashName)
         end
 
     end
-
+    ::skip::
     if stashItems then
         for _, item in pairs(stashItems) do
             local itemInfo = Items[item.name:lower()]
@@ -2356,7 +2409,6 @@ function getStash(stashName)
         end
         debugPrint("^6Bridge^7: ^3GetStashItems^7: ^2Stash information for '^6"..stashName.."^7' retrieved")
     end
-    --jsonPrint(items)
     return items
 end
 
@@ -2548,7 +2600,7 @@ 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 ""
 
@@ -2559,7 +2611,9 @@ RegisterNetEvent(getScript()..":openGrabBox", function(data)
 
 	openStash({
 		stash = id,
-        coords = GetEntityCoords(Ped)
+        coords = GetEntityCoords(Ped),
+        maxWeight = stashData and stashData.maxWeight or 100000,
+        slots = stashData and stashData.slots or 5,
 	})
 end)
 
@@ -2781,11 +2835,10 @@ 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
-    local exploitCheck = triggerCallback(getScript()..":getRegisteredShopLocation", data.originShop or data.shop)
+    local exploitCheck = triggerCallback(getScript()..":getRegisteredShopLocation", data.shop)
     if not exploitCheck then
         print("^3Warning^7: ^2This isn't a registered store^1, refusing call^7")
         return
@@ -2802,16 +2855,14 @@ function openShop(data)
     end
     if not data.items.items[1] then
         local shopMenu = {}
-        --jsonPrint(data.items)
         for k, v in pairs(data.items.items) do
-            print(v.header)
             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.originShop = data.shop
                     clonedTable.shop = data.shop.."_"..k
                     clonedTable.label = data.items.label.." - "..(v.header or k)
                     clonedTable.slots = #itemsTable
@@ -2847,7 +2898,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
@@ -2892,6 +2943,9 @@ function registerShop(name, label, items, society, coords)
             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

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/playerfunctions.lua

@@ -217,6 +217,10 @@ local billPlayerFunc = {
         function(data)
             TriggerEvent("okokBilling:ToggleCreateInvoice")
         end,
+    codem =
+        function(data)
+            TriggerEvent("codem-billing:client:OpenMenu")
+        end,
 }
 
 --- BillPlayer

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

@@ -369,6 +369,11 @@ function createPropTarget(data, opts, dist)
             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])

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")

version.txt

@@ -1,8 +1,10 @@
-2.1.06
+2.1.08
 
-- Fix stress calculations adding instead of taking away
-- Add basic support for fallback functions for inventory management (esx isn't very well supported currently)
-- Create ui_modules/alcohol.lua to handle alcohol and drug effects between scripts
-- Fix AnimSet loading for "AlienEffect()"
+- Fix getStash() always trying to use fallback functions
+- Start adding stashEditMetadata() function - wip
+- Add check for broken/missing config.lua in scripts
+- Add fix for debugMode breaking if no config file
+- Add a callback to check for society bank balances
+- Add player head movement for `lookEnt()` to continue looking after turning
 
 https://github.com/jimathy/jim_bridge/releases/latest