Version Bump

`2.0.11` - `2.0.12`

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.09"
+version "2.0.12"
 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/_loaders.lua

@@ -50,7 +50,13 @@ function onPlayerLoaded(func, onStart)
             AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
         elseif isStarted(ESXExport) then
             onPlayerFramework = ESXExport
-            AddEventHandler('esx:playerLoaded', tempFunc)
+            AddEventHandler('esx:playerLoaded', function()
+                if waitForSharedLoad() then
+                    if isStarted(ESXExport) then Wait(11000) end
+                    tempFunc()
+                end
+            end
+        )
         elseif isStarted(OXCoreExport) then
             onPlayerFramework = OXCoreExport
             AddEventHandler('ox:playerLoaded', tempFunc)
@@ -103,7 +109,11 @@ function onResourceStart(func, thisScript)
     debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^7()")
     AddEventHandler('onResourceStart', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
-            func()
+            if waitForSharedLoad() then
+                debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
+                if isStarted(ESXExport) then Wait(10000) end
+                func()
+            end
         end
     end)
 end
@@ -174,4 +184,26 @@ function waitForLogin()
         debugPrint("^6Bridge^7: ^2Player Login Detected^7.")
         return true
     end
+end
+
+function waitForSharedLoad()
+    local timeout = 100000  -- 10 seconds in milliseconds
+    local startTime = GetGameTimer()
+    local loaded = true
+    while ((not Jobs or not next(Jobs)) and (not Items or not next(Items)) and (not Vehicles or not next(Vehicles))) and (GetGameTimer() - startTime) < timeout do
+        print((GetGameTimer() - startTime) < timeout)
+        Wait(1000)
+        debugPrint("Waiting for Jobs, Items, and Vehicles to be loaded")
+        if Jobs and Items and Vehicles then
+            print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+            loaded = true
+            break
+        end
+    end
+    if not loaded then
+        print("^4Error^7: ^2Timeout reached while waiting for shared load^7.")
+        return false
+    else
+        return true
+    end
 end

shared/coreloader.lua

@@ -87,6 +87,12 @@ elseif isStarted(QBExport) then
     itemResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
     Items = Core and Core.Shared.Items or nil
+    CreateThread(function()
+        while not Items or not next(Items) do
+            Items = exports[QBExport]:GetCoreObject().Shared.Items
+            Wait(1000)
+        end
+    end)
     if isStarted(QBExport) and not isStarted(QBXExport) then
         RegisterNetEvent('QBCore:Client:UpdateObject', function()
             Core = Core or exports[QBExport]:GetCoreObject()
@@ -189,10 +195,8 @@ end
 if vehResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    CreateThread(function()
+    while not Vehicles do Wait(1000) end
-        while not Vehicles do Wait(1000) end
+    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-        debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-    end)
 end
 
 -------------------------------------------------------------
@@ -246,15 +250,37 @@ elseif isStarted(ESXExport) then
         end)
         -- Populate jobs table with ESX.GetJobs()
         Jobs = ESX.GetJobs()
+        --jsonPrint(Jobs)
         --If retreived jobs is empty, wait for ESX to load
         while countTable(Jobs) == 0 do
             Jobs = ESX.GetJobs()
             Wait(100)
         end
         -- Organise into a table the script can use
-        for k, v in pairs(Jobs) do
+        for Role, Grades in pairs(Jobs) do
-            local count = countTable(Jobs[k].grades) - 1
+
-            Jobs[k].grades[tostring(count)].isBoss = true
+            -- Check for "Boss" in name of grades
+            for grade, info in pairs(Grades.grades) do
+                --print(grade)
+                --jsonPrint(info)
+
+                if info.label then
+                    --print(info)
+                    if info.label:find("boss") or info.label:find("Boss") then
+                        --print("Found Boss label for:", Grades.label)
+                        Jobs[Role].grades[grade].isBoss = true
+                        goto continue
+                    end
+                end
+            end
+
+            -- If no roles with "boss" in the name, revert to max grade
+
+            -- Count grades
+            local count = countTable(Grades.grades)
+            Jobs[Role].grades[tostring(count-1)].isBoss = true
+            --print(Grades.label.." Grade: "..count.." is Boss")
+            ::continue::
         end
         -- ESX Default doesn't have gangs, so copy jobs to gangs
         Gangs = Jobs

shared/crafting.lua

@@ -353,8 +353,8 @@ function makeItem(data)
                         Wait(200)
                     end
                     if isInventoryOpen() then
-                        print("^1Error^7: ^2Inventory is open, you tried to break things")
+                        --print("^1Error^7: ^2Inventory is open, you tried to break things")
-                        crafted, crafting = false, false
+                        crafted, crafting, CraftLock = false, false, false
                         return
                     end
                     if crafted then
@@ -368,8 +368,9 @@ function makeItem(data)
                             PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
                         end
                         if isInventoryOpen() then
-                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            --print("^1Error^7: ^2Inventory is open, you tried to break things")
                             crafted, crafting = false, false
+                            crafted, crafting, CraftLock = false, false, false
                             return
                         end
                         if crafting and progressBar({

shared/helpers.lua

@@ -262,7 +262,7 @@ end
 --- ```
 function countTable(tbl)
     local i = 0
-    for _ in pairs(tbl) do i = i + 1 end
+    for _ in pairs(tbl) do i += 1 end
     return i
 end
 

shared/inventories.lua

@@ -50,8 +50,9 @@ function hasItem(items, amount, src)
 
             local count = 0
             for _, itemData in pairs(grabInv) do
+                jsonPrint(itemData)
                 if itemData and itemData.name == item then
-                    count += (itemData.count or itemData.amount or 1)
+                    count += (itemData.amount or itemData.count or 1)
                 end
             end
             foundInv = foundInv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
@@ -67,6 +68,9 @@ function hasItem(items, amount, src)
         end
         return true, hasTable
     end
+    -- if can't find inventory, return false
+    print("^1Error^7: ^1Can't find players inventory for some reason")
+    return false, {}
 end
 
 --- Retrieves a player's inventory based on the active inventory system.
@@ -171,7 +175,6 @@ function getPlayerInv(src)
     return grabInv, foundInv
 end
 
-
 function isInventoryOpen()
     if isStarted(OXInv) then
         return LocalPlayer.state.invBusy

shared/itemcontrol.lua

@@ -252,6 +252,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
     else
         local amountToAdd = amount or 1
         if isStarted(OXInv) then invName = OXInv
+            jsonPrint(info)
             exports[OXInv]:AddItem(src, item, amountToAdd, info, slot)
 
         elseif isStarted(QSInv) then invName = QSInv

shared/jobfunctions.lua

@@ -46,7 +46,7 @@ function makeBossRoles(role)
     local data = (Jobs and Jobs[role]) or (Gangs and Gangs[role])
     if data then
         for grade, info in pairs(data.grades) do
-            if info.isboss or info.bankAuth then
+            if info.isboss or info.bankAuth or info.isBoss then
                 boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
             end
         end

shared/shops.lua

@@ -30,15 +30,17 @@ function sellMenu(data)
         for k, v in pairs(data.sellTable.Items) do itemList[k] = 1 end
         local _, hasTable = hasItem(itemList)
         for k, v in pairsByKeys(data.sellTable.Items) do
-            Menu[#Menu + 1] = {
+            if Items[k] then
-                isMenuHeader = not hasTable[k].hasItem,
+                Menu[#Menu + 1] = {
-                icon = invImg(k),
+                    isMenuHeader = not hasTable[k].hasItem,
-                header = Items[k].label..(hasTable[k].hasItem and "💰 (x"..hasTable[k].count..")" or ""),
+                    icon = invImg(k),
-                txt = Loc[Config.Lan].info["sell_all"]..v.." "..Loc[Config.Lan].info["sell_each"],
+                    header = Items[k].label..(hasTable[k].hasItem and "💰 (x"..hasTable[k].count..")" or ""),
-                onSelect = function()
+                    txt = Loc[Config.Lan].info["sell_all"]..v.." "..Loc[Config.Lan].info["sell_each"],
-                    sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end })
+                    onSelect = function()
-                end,
+                        sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end })
-            }
+                    end,
+                }
+            end
         end
     else
         for k, v in pairsByKeys(data.sellTable) do
@@ -48,7 +50,9 @@ function sellMenu(data)
                     header = k,
                     txt = "Amount of items: "..countTable(v.Items),
                     onSelect = function()
-                        v.onBack = function() sellMenu(origData) end
+                        v.onBack = function()
+                            sellMenu(origData)
+                        end
                         v.sellTable = data.sellTable[k]
                         sellMenu(v)
                     end,
@@ -57,8 +61,8 @@ function sellMenu(data)
         end
     end
     openMenu(Menu, {
-        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items),
+        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
-        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items) or "",
+        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
         canClose = true,
         onBack = data.onBack,
     })
@@ -105,12 +109,14 @@ function sellAnim(data)
     TriggerServerEvent(getScript().."Sellitems", data)
     lookEnt(data.ped)
     local dict = "mp_common"
-    playAnim(dict, "givetake2_a", 0.3, 2)
+    playAnim(dict, "givetake2_a", 0.3, 48)
-    playAnim(dict, "givetake2_b", 0.3, 2, data.ped)
+    playAnim(dict, "givetake2_b", 0.3, 48, data.ped)
     Wait(2000)
     StopAnimTask(PlayerPedId(), dict, "givetake2_a", 0.5)
     StopAnimTask(data.ped, dict, "givetake2_b", 0.5)
-    if data.onBack then data.onBack() end
+    if data.onBack then
+        data.onBack()
+    end
 end
 
 --- Server event handler for processing item sales.

shared/stashcontrol.lua

@@ -161,7 +161,10 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
         end
 
     elseif isStarted(PSInv) then
@@ -174,7 +177,10 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
         end
 
     elseif isStarted(RSGInv) then
@@ -188,7 +194,10 @@ function openStash(data)
     else
         --Fallback to these commands
         TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
     end
 
     lookEnt(data.coords)
@@ -565,3 +574,18 @@ if isServer() then
         registerStash(name, label, slots, weight, owner, coords)
     end)
 end
+
+RegisterNetEvent(getScript()..":openGrabBox", function(data)
+	if isStarted(OXInv) then
+		return
+	end
+	local id = ""
+	if data.metadata then
+		id = data.metadata.id
+	elseif data.info then
+		id = data.info.id
+	end
+	openStash({
+		stash = id,
+	})
+end)

starter.lua

@@ -86,10 +86,12 @@ for Type, ScriptTable in pairs(filesToLoad) do
                     files = { files }
                 end
                 for _, file in pairs(files) do
-                    --print("^5CoreLoader^7: '"..k.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+                    --print("^5CoreLoader^7: '"..scriptName.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
                     local fileLoader = assert(load(LoadResourceFile(scriptName, (file)), ('@@'..scriptName..'/'..file)))
                     fileLoader()
-                    print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    if debugMode then
+                        print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    end
                 end
             end
 
@@ -118,7 +120,7 @@ for _, v in pairs({ -- This is a specific load order
 
     '_eventDebug.lua',
     'callback.lua',
-    'coreloader.lua',   -- needs to be second to load all core related stuff before everything else
+    'coreloader.lua',
 
     'duifunctions.lua',
 

version.txt

@@ -1 +1 @@
-2.0.09
+2.0.12