diff --git a/frameworkCache.lua b/frameworkCache.lua index f95f596..84643f7 100644 --- a/frameworkCache.lua +++ b/frameworkCache.lua @@ -1,10 +1,11 @@ --[[ Cached Resource Initialization Module -------------------------------------- - This module initializes shared data (Items, Vehicles, Jobs, Gangs) - only once and stores it in _G.__jimBridgeDataCache for reuse across scripts. + Initializes shared resource data (Items, Vehicles, Jobs, Gangs) once and caches it + to improve performance and reduce redundant data fetching across scripts. ]] +-- Define resource names used in different frameworks local Exports = { QBExport = "qb-core", QBXExport = "qbx_core", @@ -19,6 +20,7 @@ local Exports = { CodeMInv = "codem-inventory", OrigenInv = "origen_inventory", TgiannInv = "tgiann-inventory", + JPRInv = "jpr-inventory", OXLibExport = "ox_lib", @@ -32,17 +34,20 @@ local Exports = { RSGInv = "rsg-inventory" } --- Ensure cache only runs once +-- Prevent reloading if cache is already initialized if _G.__jimBridgeDataCache then return end _G.__jimBridgeDataCache = {} local cache = _G.__jimBridgeDataCache -function checkExists(resourceName) +-- Helper function to check if resource exists in server (instead of if it is already started) +local function checkExists(resourceName) return GetResourceState(resourceName):find("start") or GetResourceState(resourceName):find("stopped") end +-- Ensure oxmysql resource is loaded local fileLoader = assert(load(LoadResourceFile("oxmysql", ('lib/MySQL.lua')), ('@@oxmysql/lib/MySQL.lua'))) fileLoader() + if checkExists(Exports.OXCoreExport) then -- Detected OX_Core in server, wait for it to be started if needed while GetResourceState(Exports.OXCoreExport) ~= "started" do Wait(100) end @@ -56,7 +61,7 @@ if checkExists(Exports.ESXExport) then fileLoader() end --- Init variables +-- Initialize variables for caching local Items, Vehicles, Jobs, Gangs, Core = nil, nil, nil, nil, nil local itemResource, jobResource, vehResource = "", "", "" @@ -70,6 +75,7 @@ end --------------------- ---- Load Items ----- --------------------- +-- Items initialization based on detected inventory system if checkExists(Exports.OXInv) then -- Wait for OX Inventory to start if it's not already started while GetResourceState(Exports.OXInv) ~= "started" do Wait(100) end @@ -95,6 +101,7 @@ elseif checkExists(Exports.QBExport) then Items = Core.Shared.Items if Items == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Items ^1table^7, ^1possible error in that file^7?") + Items = {} -- Fallback to an empty table end elseif checkExists(Exports.ESXExport) then @@ -116,6 +123,7 @@ elseif checkExists(Exports.RSGExport) then Items = Core.Shared.Items if Items == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Items ^1table^7, ^1possible error in that file^7?") + Items = {} -- Fallback to an empty table end end @@ -123,12 +131,14 @@ end --------------------- --- Load Vehicles --- --------------------- +-- Vehicle loading depending on framework if checkExists(Exports.QBXExport) or checkExists(Exports.QBExport) then vehResource = Exports.QBExport Core = Core or exports[Exports.QBExport]:GetCoreObject() Vehicles = Core.Shared.Vehicles if Vehicles == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Vehicles ^1table^7, ^1possible error in that file^7?") + Vehicles = {} -- Fallback to an empty table end elseif checkExists(Exports.OXCoreExport) then @@ -162,6 +172,7 @@ elseif checkExists(Exports.RSGExport) then Vehicles = Core.Shared.Vehicles if Vehicles == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Vehicles ^1table^7, ^1possible error in that file^7?") + Vehicles = {} -- Fallback to an empty table end end @@ -169,12 +180,14 @@ end --------------------- ----- Load Jobs ----- --------------------- +-- Jobs loading based on framework if checkExists(Exports.QBXExport) then jobResource = Exports.QBXExport Core = Core or exports[Exports.QBXExport]:GetCoreObject() Jobs, Gangs = exports[Exports.QBXExport]:GetJobs(), exports[Exports.QBXExport]:GetGangs() if Jobs == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?") + Jobs = {} -- Fallback to an empty table end elseif checkExists(Exports.OXCoreExport) then @@ -241,6 +254,7 @@ elseif checkExists(Exports.RSGExport) then Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs if Jobs == nil then print("^1ERROR^7: ^1Can NOT find shared ^7Jobs ^1table^7, ^1possible error in that file^7?") + Jobs = {} -- Fallback to an empty table end end @@ -269,14 +283,11 @@ CreateThread(function() print("^6FrameworkCache^7: ^2Loaded ^5"..tostring(counts.Gangs).."^2 Gangs from ^7"..jobResource) end) ---print(json.encode(cache.Items , { indent = true})) - RegisterNetEvent("jim_bridge:requestCache", function() local src = source TriggerClientEvent("jim_bridge:receiveCache", src, _G.__jimBridgeDataCache) end) - exports("GetSharedData", function() -- Wait for data to be ready before returning it local timeout = GetGameTimer() + 5000 diff --git a/fxmanifest.lua b/fxmanifest.lua index a02c8d8..479a7ea 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,6 +1,6 @@ name "Jim_Bridge" author "Jimathy" -version "2.0.15" +version "2.0.16" 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.' diff --git a/shared/coreloader.lua b/shared/coreloader.lua index 5d32050..1ce8f57 100644 --- a/shared/coreloader.lua +++ b/shared/coreloader.lua @@ -10,7 +10,7 @@ OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport = Exports.ESXExport or "", Exports.OXCoreExport or "" -OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv = +OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, JPRInv = Exports.OXInv or "", Exports.QBInv or "", Exports.PSInv or "", @@ -18,7 +18,8 @@ OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv = Exports.CoreInv or "", Exports.CodeMInv or "", Exports.OrigenInv or "", - Exports.TgiannInv or "" + Exports.TgiannInv or "", + Exports.JPRInv or "" RSGExport, RSGInv = Exports.RSGExport or "", Exports.RSGInv or "" QBMenuExport = Exports.QBMenuExport or "" diff --git a/shared/crafting.lua b/shared/crafting.lua index f2507f3..bd42b10 100644 --- a/shared/crafting.lua +++ b/shared/crafting.lua @@ -88,6 +88,7 @@ function craftingMenu(data) -- Check if the player can carry the required items (server callback). local canCarryTable = triggerCallback(getScript()..':server:canCarry', tempCarryTable) + -- Process each recipe to create menu entries. for i = 1, #Recipes do if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end @@ -106,10 +107,13 @@ function craftingMenu(data) local metaTable = {} -- Build ingredient details. for l, b in pairs(Recipes[i][tostring(k)]) do - settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "") + local label = Items[l] and Items[l].label or "error - "..l + local hasItem = checkStashItem(data.stashName, { [l] = b }) + local missingMark = not hasItem and " ❌" or " " + settext = settext..(settext ~= "" and br or "").."[ x"..b.." ] - "..label..(b > 1 and " x"..b or "")..missingMark + metaTable[Items[l] and Items[l].label or "error - "..l] = b itemTable[l] = b - --Wait(0) end while not canCarryTable do Wait(0) end @@ -117,17 +121,17 @@ function craftingMenu(data) setheader = ((metadata and metadata.label) or (Items[tostring(k)] and Items[tostring(k)].label) or "error - "..tostring(k)) ..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "") - local statusEmoji = disable and " ❌" or not canCarryTable[k] and " 📦" 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 = not disable and canCarryTable[k], + 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 = (isStarted(QBMenuExport) or disable) and settext or nil, + txt = settext or nil, metadata = metaTable, onSelect = (not disable and canCarryTable[k]) and function() local transdata = { diff --git a/shared/helpers.lua b/shared/helpers.lua index e332138..482d99b 100644 --- a/shared/helpers.lua +++ b/shared/helpers.lua @@ -493,7 +493,7 @@ end --- end --- ``` function ensureNetToVeh(vehNetID) - debugPrint("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)") + --debugPrint("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)") local timeout = 100 while not NetworkDoesNetworkIdExist(vehNetID) and timeout > 0 do timeout -= 1 @@ -521,7 +521,7 @@ end --- end --- ``` function ensureNetToEnt(entNetID) - debugPrint("^6Bridge^7: ^3ensureNetToEnt^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..entNetID.."^7)") + --debugPrint("^6Bridge^7: ^3ensureNetToEnt^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..entNetID.."^7)") local timeout = 100 while not NetworkDoesNetworkIdExist(entNetID) and timeout > 0 do timeout -= 1 diff --git a/shared/inventories.lua b/shared/inventories.lua index 9e850a2..e6c4f47 100644 --- a/shared/inventories.lua +++ b/shared/inventories.lua @@ -50,7 +50,7 @@ function hasItem(items, amount, src) local count = 0 for _, itemData in pairs(grabInv) do - jsonPrint(itemData) + --jsonPrint(itemData) if itemData and itemData.name == item then count += (itemData.amount or itemData.count or 1) end @@ -138,6 +138,14 @@ function getPlayerInv(src) grabInv = exports[TgiannInv]:GetPlayerItems() end + elseif isStarted(JPRInv) then + foundInv = JPRInv + if src then + grabInv = Core.Functions.GetPlayer(src).PlayerData.items + else + grabInv = Core.Functions.GetPlayerData().items + end + elseif isStarted(QBInv) then foundInv = QBInv if src then @@ -148,8 +156,11 @@ function getPlayerInv(src) elseif isStarted(PSInv) then foundInv = PSInv - if src then grabInv = Core.Functions.GetPlayer(src).PlayerData.items - else grabInv = Core.Functions.GetPlayerData().items end + if src then + grabInv = Core.Functions.GetPlayer(src).PlayerData.items + else + grabInv = Core.Functions.GetPlayerData().items + end elseif ESX and isStarted(ESXExport) then foundInv = ESX @@ -179,41 +190,6 @@ function isInventoryOpen() return IsNuiFocused() - --if isStarted(OXInv) then - -- return LocalPlayer.state.invBusy - - --elseif isStarted(QSInv) then - -- return exports[QSInv]:inInventory() - - --elseif isStarted(OrigenInv) then - -- return exports[OrigenInv]:IsInventoryOpen() - - --elseif isStarted(CoreInv) then - -- return exports[CoreInv]:isInventoryOpen() - - --elseif isStarted(CodeMInv) then - -- return false - -- -- CodeM doesn't have a function to check if the inventory is open - -- -- No idea what it uses, so it just skips the check - - --elseif isStarted(TgiannInv) then - -- return IsNuiFocused() - - --elseif isStarted(QBInv) then - -- return LocalPlayer.state.inv_busy - - --elseif isStarted(PSInv) then - -- return LocalPlayer.state.inv_busy - - --elseif ESX and isStarted(ESXExport) then - -- return false - - --elseif isStarted(RSGInv) then - -- return LocalPlayer.state.inv_busy - - --end - - end ------------------------------------------------------------- @@ -248,12 +224,14 @@ function invImg(item) elseif isStarted(OrigenInv) then imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "") + elseif isStarted(JPRInv) then + imgLink = "nui://"..JPRInv.."/html/images/"..(Items[item].image or "") + elseif isStarted(QBInv) then imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "") elseif isStarted(PSInv) then imgLink = "nui://"..PSInv.."/html/images/"..(Items[item].image or "") - elseif isStarted(TgiannInv) then imgLink = "nui://inventory_images/images/"..(Items[item].image or "") diff --git a/shared/itemcontrol.lua b/shared/itemcontrol.lua index a258cd9..3c83a90 100644 --- a/shared/itemcontrol.lua +++ b/shared/itemcontrol.lua @@ -186,6 +186,20 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, invName = TgiannInv exports[TgiannInv]:RemoveItem(src, item, remamount) + elseif isStarted(JPRInv) then + invName = JPRInv + while remamount > 0 do + if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then + remamount -= 1 + else + print("^1Error removing "..item.." Amount left: "..remamount) + break + end + end + if Config.Crafting ~= nil and Config.Crafting.showItemBox then + TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "remove", amount or 1) + end + elseif isStarted(QBInv) then invName = QBInv while remamount > 0 do @@ -270,6 +284,13 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, elseif isStarted(TgiannInv) then invName = TgiannInv exports[TgiannInv]:AddItem(src, item, amountToAdd, slot, info) + elseif isStarted(JPRInv) then invName = JPRInv + if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then + if Config.Crafting ~= nil and Config.Crafting.showItemBox then + TriggerClientEvent("ps-inventory:client:ItemBox", src, Items[item], "add", amountToAdd) + end + end + elseif isStarted(QBInv) then invName = QBInv if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd) @@ -379,7 +400,7 @@ end function getDurability(item) local lowestSlot = 100 local durability = nil - if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) then + if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then local itemcheck = Core.Functions.GetPlayerData().items for k, v in pairs(itemcheck) do if v.name == item then @@ -488,7 +509,7 @@ end --- ``` RegisterNetEvent(getScript()..":server:setMetaData", function(data) local src = source - if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) then + if isStarted(QBInv) or isStarted(PSInv) or isStarted(RSGInv) or isStarted(JPRInv) then debugPrint(src, data.item, 1, data.slot) local Player = Core.Functions.GetPlayer(src) Player.PlayerData.items[data.slot].info = data.metadata @@ -626,6 +647,22 @@ function canCarry(itemTable, src) resultTable[k] = exports[TgiannInv]:CanCarryItem(source, k, v) end + elseif isStarted(JPRInv) then + 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 + elseif isStarted(QBInv) then if QBInvNew then for k, v in pairs(itemTable) do diff --git a/shared/jobfunctions.lua b/shared/jobfunctions.lua index 8b6a0c6..d4fafec 100644 --- a/shared/jobfunctions.lua +++ b/shared/jobfunctions.lua @@ -231,3 +231,16 @@ function useDoor(data) DoScreenFadeIn(1000) Wait(100) end + + +function openBossMenu(isGang, group) + if isStarted("qb-management") then + if isGang then + TriggerEvent("qb-gangmenu:client:OpenMenu") + else + TriggerEvent("qb-bossmenu:client:OpenMenu") + end + elseif isStarted("qbx_management") then + exports["qbx_management"]:OpenBossMenu(isGang and "gang" or "job") + end +end \ No newline at end of file diff --git a/shared/make/progressBars.lua b/shared/make/progressBars.lua index e9e6d4c..4459bc8 100644 --- a/shared/make/progressBars.lua +++ b/shared/make/progressBars.lua @@ -43,9 +43,10 @@ function progressBar(data) local result = nil if data.cam then startTempCam(data.cam) end if Config.System.ProgressBar == "ox" then - if exports[OXLibExport]:progressBar({ + local options = { duration = debugMode and 1000 or data.time, label = data.label, + position = data.position or "bottom", useWhileDead = data.dead or false, canCancel = data.cancel and data.cancel or true, anim = { @@ -55,12 +56,41 @@ function progressBar(data) scenario = data.task }, disable = { - combat = true + combat = data.combat or true, + move = data.movement or false, + car = data.carMovement or false, + mouse = data.mouse or false }, - }) then - result = true - else - result = false + } + if data.prop and data.prop.model then + options.prop = { + model = data.prop.model, + pos = data.prop.pos or vec3(0, 0, 0), + rot = data.prop.rot or vec3(0, 0, 0), + bone = data.prop.bone or 0 + } + end + if data.propTwo and data.propTwo.model then + options.propTwo = { + model = data.propTwo.model, + pos = data.propTwo.pos or vec3(0, 0, 0), + rot = data.propTwo.rot or vec3(0, 0, 0), + bone = data.propTwo.bone or 0 + } + end + if data.progressType == "circle" then + if exports[OXLibExport]:progressCircle(options) then + result = true + else + result = false + end + end + if not data.progressType or data.progressType == "bar" then + if exports[OXLibExport]:progressBar(options) then + result = true + else + result = false + end end elseif Config.System.ProgressBar == "qb" then @@ -179,7 +209,9 @@ function progressBar(data) inProgress = false end - while result == nil do Wait(10) end + while result == nil do + Wait(10) + end -- Cleanup FreezeEntityPosition(ped, false) @@ -256,7 +288,7 @@ function stopProgressBar() exports[OXLibExport]:cancelProgress() elseif Config.System.ProgressBar == "qb" then TriggerEvent("progressbar:client:cancel") - elseif Config.System.ProgressBar == "gta" then + elseif Config.System.ProgressBar == "gta" or Config.System.ProgressBar == "red" then inProgress = false end end diff --git a/shared/playerfunctions.lua b/shared/playerfunctions.lua index 5e8e275..9559b28 100644 --- a/shared/playerfunctions.lua +++ b/shared/playerfunctions.lua @@ -109,19 +109,18 @@ end) --- setThirst(playerId, 80) --- ``` function setThirst(src, thirst) + + debugPrint("^4Debug^7: ^2Adding thirst^7: ^3"..thirst.." ^2to player^7: ^3"..src.."^7") if isStarted(ESXExport) then TriggerClientEvent('esx_status:add', src, 'thirst', thirst) - elseif isStarted(QBExport) or isStarted(QBXExport) then + elseif isStarted(QBExport) or isStarted(QBXExport) or isStarted(RSGExport) then local Player = Core.Functions.GetPlayer(src) Player.Functions.SetMetaData('thirst', thirst) - TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst) + TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst) - elseif isStarted(RSGExport) then - local Player = Core.Functions.GetPlayer(src) - Player.Functions.SetMetaData('thirst', thirst) - TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst) end + end --- Sets the player's hunger level. @@ -134,18 +133,16 @@ end --- setHunger(playerId, 60) --- ``` function setHunger(src, hunger) + + debugPrint("^4Debug^7: ^2Adding hunger^7: ^3"..hunger.." ^2to player^7: ^3"..src.."^7") if isStarted(ESXExport) then TriggerClientEvent('esx_status:add', src, 'hunger', hunger) - elseif isStarted(QBExport) or isStarted(QBXExport) then + elseif isStarted(QBExport) or isStarted(QBXExport) or isStarted(RSGExport) then local Player = Core.Functions.GetPlayer(src) Player.Functions.SetMetaData('hunger', hunger) - TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger) + TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst) - elseif isStarted(RSGExport) then - local Player = Core.Functions.GetPlayer(src) - Player.Functions.SetMetaData('hunger', hunger) - TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger) end end diff --git a/shared/stashcontrol.lua b/shared/stashcontrol.lua index a7f2edd..324fa6a 100644 --- a/shared/stashcontrol.lua +++ b/shared/stashcontrol.lua @@ -151,6 +151,22 @@ function openStash(data) slots = data.slots or 40 }) + elseif isStarted(JPRInv) then + if QBInvNew then + TriggerServerEvent(getScript()..':server:openServerStash', { + stashName = data.stash, + label = data.label, + maxweight = data.maxWeight or 600000, + slots = data.slots or 40 + }) + else + TriggerEvent("inventory:client:SetCurrentStash", data.stash) + TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, { + slots = data.slots or 50, + maxWeight = data.maxWeight or 600000 + }) + end + elseif isStarted(QBInv) then if QBInvNew then TriggerServerEvent(getScript()..':server:openServerStash', { @@ -211,6 +227,9 @@ RegisterNetEvent(getScript()..":server:openServerStash", function(data) if isStarted(TgiannInv) then exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data) end + if isStarted(JPRInv) then + exports[JPRInv]:OpenInventory(source, data.stashName, data) + end if isStarted(QBInv) then exports[QBInv]:OpenInventory(source, data.stashName, data) end @@ -223,7 +242,18 @@ RegisterNetEvent(getScript()..":server:openServerStash", function(data) end) function clearStash(stashId) - if isStarted(QBInv) then + if isStarted(JPRInv) then + debugPrint("^5Bridge^7: ^2Cleared ^3"..JPRInv.."^2 Stash^7", stashId) + if QBInvNew then + exports[JPRInv]:ClearStash(stashId) + else + MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { + ['stash'] = stashId, + ['items'] = json.encode({}) + }) + end + + elseif isStarted(QBInv) then debugPrint("^5Bridge^7: ^2Cleared ^3"..QBInv.."^2 Stash^7", stashId) if QBInvNew then exports[QBInv]:ClearStash(stashId) @@ -241,7 +271,7 @@ function clearStash(stashId) elseif isStarted(PSInv) then debugPrint("^5Bridge^7: ^2Cleared ^3"..PSInv.."^2 Stash^7", stashId) if QBInvNew then - exports[QBInv]:ClearStash(stashId) + exports[PSInv]:ClearStash(stashId) else MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { ['stash'] = stashId, @@ -249,6 +279,7 @@ function clearStash(stashId) }) end + elseif isStarted(QSInv) then debugPrint("^5Bridge^7: ^2Cleared ^3"..QSInv.."^2 Stash^7", stashId) exports[QSInv]:ClearOtherInventory('stash', stashId) @@ -331,6 +362,11 @@ function getStash(stashName) local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName }) if result then stashItems = json.decode(result) end + elseif isStarted(JPRInv) then + stashResource = JPRInv + local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName }) + if result then stashItems = json.decode(result) end + elseif isStarted(QBInv) then stashResource = QBInv if QBInvNew then @@ -449,6 +485,29 @@ function stashRemoveItem(stashItems, stashName, items) debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v) end + elseif isStarted(JPRInv) then + if not stashItems or not next(stashItems) then + stashItems = getStash(stashName[1]) + end + 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 + debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v) + stashItems[l] = nil + else + debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with "..JPRInv, k, v) + stashItems[l].amount -= v + end + end + end + end + debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3JPR^2 stash '^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(QBInv) then if QBInvNew then for k, v in pairs(items) do @@ -531,7 +590,7 @@ RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem) --- local hasAll, details = stashhasItem(currentStashItems, { iron = 2, wood = 5 }) --- ``` function stashhasItem(stashItems, items, amount) - local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, QBInv, PSInv, RSGInv } + local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, JPRInv, QBInv, PSInv, RSGInv } local foundInv = "" for _, inv in ipairs(invs) do if isStarted(inv) then diff --git a/starter.lua b/starter.lua index 107a00e..7fc3c6f 100644 --- a/starter.lua +++ b/starter.lua @@ -14,6 +14,7 @@ Exports = { CodeMInv = "codem-inventory", OrigenInv = "origen_inventory", TgiannInv = "tgiann-inventory", + JPRInv = "jpr-inventory", OXLibExport = "ox_lib", diff --git a/version.txt b/version.txt index c315cf0..fd25847 100644 --- a/version.txt +++ b/version.txt @@ -1,12 +1,14 @@ -2.0.15 +2.0.16 -- Fix old PSInv/QBInv stashes being wiped when it should be updating them -- Better breakout from opening inventory while crafting -- Unify isInventoryOpen() function to simply check for IsNuiFocused() -- Add clearStash() and doesItemExist() functions for future use -- Add warmenu.lua file for gta scaleform menus (loading is disabled by default) -- Move custom GTA native notify, skillcheck, target to separate files, can be used outside the script -- Complete refactor of framework shared info loading, now only does it once and then shares to scripts -- Added extra checks for ESX loading, should hopefully stop the coreloader line 317 error +- Fix weapon item caching for ox_inv +- add checkExportExist() function +- Start adding a `billPlayer()` function for multi-billing script support +- Add support for sending mails to npwd_qbx_mail addon +- Add "support" for CoreM's shop integration +- Add Auto check for QBInvNew variable for older inventories +- Add warnings for if theres an error in your shared vehicles, items or jobs file +- Add full support for JPR-Inventory +- Changes to crafting menu ui +- Fixes to setThirst() and setHunger() functions https://github.com/jimathy/jim_bridge \ No newline at end of file