Version Bump v1.0.7

1.0.6

crafting.lua

@@ -43,7 +43,7 @@ function craftingMenu(data) local hasjob = false
                 if Recipes[i].job then hasjob = false
 					for l, b in pairs(Recipes[i].job) do
 						hasjob = hasJob(l, nil, b)
-                        if hasJob == true then break end
+                        if hasjob == true then break end
 					end
 				end
                 local setheader, settext = "", ""
@@ -139,7 +139,8 @@ function makeItem(data)
     startTempCam(cam)
 
     for i = 1, amount do
-        for _, v in pairs(data.craft) do
+        for k, v in pairs(data.craft) do
+            if k ~= "amount" and k ~= "job" then
                 if type(v) == "table" then
                     for l, b in pairs(v) do
                         if crafting and progressBar({
@@ -177,6 +178,7 @@ function makeItem(data)
                     end
                 end
             end
+        end
         Wait(500)
     end
     stopTempCam()
@@ -240,10 +242,29 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
         else grabInv = exports[QSInv]:getUserInventory()
         end
 
+    elseif GetResourceState(OrigenInv):find("start") then
+        foundInv = OrigenInv
+        if src then
+            grabInv = exports[OrigenInv]:getPlayerInventory(src)
+        else
+            grabInv = exports[OrigenInv]:getPlayerInventory()
+        end
+
     elseif GetResourceState(CoreInv):find("start") then
         foundInv = CoreInv
-        if src then grabInv = exports['core_inventory']:getInventory('primary-'..src)
+        if src then
-        else grabInv = exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))
+            if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
+                grabInv = Core.Functions.GetPlayer(src).PlayerData.items
+            elseif GetResourceState(ESXExport):find("start") then
+                local Player = ESX.GetPlayerFromId(src)
+                grabInv = Player.getInventory(false)
+            end
+        else
+            local p = promise.new()
+            Core.Functions.TriggerCallback('core_inventory:server:getInventory', function(cb) p:resolve(cb) end)
+            local result = Citizen.Await(p)
+            if type(result) == "string" then result = json.decode(result) end
+            grabInv = result
         end
 
     elseif GetResourceState(CodeMInv):find("start") then
@@ -303,16 +324,27 @@ end
 function getStash(stashName)
     local stashItems, items = {}, {}
     if GetResourceState(OXInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7ox_inventory") end
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..OXInv) end
         stashItems = exports[OXInv]:Inventory(stashName).items
+
     elseif GetResourceState(QSInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qs-inventory") end
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..QSInv) end
         stashItems = exports[QSInv]:GetStashItems(stashName)
+
+    elseif GetResourceState(CoreInv):find("start") then
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..CoreInv) end
+        stashItems = exports[CoreInv]:getInventory(stashName)
+
     elseif GetResourceState(CodeMInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qs-inventory") end
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..CodeMInv) end
         stashItems = exports[CodeMInv]:GetInventoryItems('Stash', stashName)
+
+    elseif GetResourceState(OrigenInv):find("start") then
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..OrigenInv) end
+        stashItems = exports[OrigenInv]:GetStash(stashName)
+
     elseif GetResourceState(QBInv):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7qb-inventory") end
+        if Config.System.Debug then print("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..QBInv) end
         local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
 		if result then stashItems = json.decode(result) end
     end
@@ -320,18 +352,18 @@ function getStash(stashName)
         for _, item in pairs(stashItems) do
             local itemInfo = Items[item.name:lower()]
             if itemInfo then
-                items[item.slot] = {
+                items[#items+1] = {
-                    name = itemInfo["name"],
+                    name = itemInfo["name"] ~= nil and itemInfo["slot"] or nil,
                     amount = tonumber(item.amount) or tonumber(item.count),
                     info = item.info ~= nil and item.info or "",
-                    label = itemInfo["label"],
+                    label = itemInfo["label"] ~= nil and itemInfo["slot"] or nil,
                     description = itemInfo["description"] ~= nil and itemInfo["description"] or "",
-                    weight = itemInfo["weight"],
+                    weight = itemInfo["weight"] ~= nil and itemInfo["slot"] or nil,
-                    type = itemInfo["type"],
+                    type = itemInfo["type"] ~= nil and itemInfo["slot"] or nil,
-                    unique = itemInfo["unique"],
+                    unique = itemInfo["unique"] ~= nil and itemInfo["slot"] or nil,
-                    useable = itemInfo["useable"],
+                    useable = itemInfo["useable"] ~= nil and itemInfo["slot"] or nil,
-                    image = itemInfo["image"],
+                    image = itemInfo["image"] ~= nil and itemInfo["slot"] or nil,
-                    slot = item.slot,
+                    slot = itemInfo["slot"] ~= nil and itemInfo["slot"] or nil,
                 }
             end
         end
@@ -348,9 +380,29 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
         end
     elseif GetResourceState(QSInv):find("start") then
             for k, v in pairs(items) do
-            exports[QSInv]:RemoveItemIntoStash(stashName, k, v)
+                for l in pairs(stashItems) do
-            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v) end
+                    if stashItems[l].name == k then
+                        if (stashItems[l].amount - v) <= 0 then
+                            if Config.System.Debug then
+                                print("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
                             end
+                            stashItems[l] = nil
+                        else
+                            if Config.System.Debug then
+                                print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
+                            end
+                            exports[QSInv]:RemoveItemIntoStash(stashName, k, v, l)
+                        end
+                    end
+                end
+            end
+
+    elseif GetResourceState(CoreInv):find("start") then
+        for k, v in pairs(items) do
+            exports[CoreInv]:removeItemExact(stashName, k, v)
+            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v) end
+        end
+
     elseif GetResourceState(CodeMInv):find("start") then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do
@@ -372,6 +424,13 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and
         if Config.System.Debug then
             print("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
         end
+
+    elseif GetResourceState(OrigenInv):find("start") then
+        for k, v in pairs(items) do
+            exports[OrigenInv]:RemoveItem(stashName, k, v)
+            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v) end
+        end
+
     elseif GetResourceState(QBInv):find("start") then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do

exports.lua

@@ -7,8 +7,9 @@ Exports = {
     OXInv = "ox_inventory",
     QBInv = "qb-inventory",
     QSInv = "qs-inventory",
-    CoreInv = "core-inventory",
+    CoreInv = "core_inventory",
     CodeMInv = "codem-inventory",
+    OrigenInv = "origen_inventory",
 
     OXLibExport = "ox_lib",
 

functions.lua

@@ -513,7 +513,7 @@ function setThirst(src, thirst)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('thirst', thirst)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
 	end
@@ -523,7 +523,7 @@ function setHunger(src, hunger)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('hunger', hunger)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
 	end
@@ -586,21 +586,35 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
 				if Config.System.Debug then
 					print("^6Bridge^7: ^3"..addremove.."^7[^6"..OXInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
             elseif GetResourceState(QSInv):find("start") then
                 local success = exports[QSInv]:RemoveItem(src, item, amount)
 				if Config.System.Debug then
 					print("^6Bridge^7: ^3"..addremove.."^7[^6"..QSInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
 			elseif GetResourceState(CoreInv):find("start") then
-                local success = exports[CoreInv]:removeItemExact('primary-'..src, item, amount)
+				if GetResourceState(QBExport):find("start") then
+					Core.Functions.GetPlayer(src).Functions.RemoveItem(item, amount, nil)
+				elseif GetResourceState(ESXExport):find("start") then
+					ESX.GetPlayerFromId(src).removeInventoryItem(item, count)
+				end
 				if Config.System.Debug then
 					print("^6Bridge^7: ^3"..addremove.."^7[^6"..CoreInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
+            elseif GetResourceState(OrigenInv):find("start") then
+                local success = exports[OrigenInv]:RemoveItem(src, item, amount)
+				if Config.System.Debug then
+					print("^6Bridge^7: ^3"..addremove.."^7[^6"..OrigenInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
+				end
+
 			elseif GetResourceState(CodeMInv):find("start") then
                 local success = exports[CodeMInv]:RemoveItem(src, item, amount)
 				if Config.System.Debug then
 					print("^6Bridge^7: ^3"..addremove.."^7[^6"..CodeMInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
 				end
+
             elseif GetResourceState(QBInv):find("start") then
 				while remamount > 0 do
                     if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1) then end
@@ -625,21 +639,35 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
 			if Config.System.Debug then
 				print("^6Bridge^7: ^3"..addremove.."^7[^6"..OXInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		elseif GetResourceState(QSInv):find("start") then
             local success = exports[QSInv]:AddItem(src, item, amount)
             if Config.System.Debug then
 				print("^6Bridge^7: ^3"..addremove.."^7[^6"..QSInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		elseif GetResourceState(CoreInv):find("start") then
-            local success = exports[CoreInv]:addItem('primary-'..src, item, amount)
+			if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
+				Core.Functions.GetPlayer(src).Functions.AddItem(item, amount, nil, nil)
+			elseif GetResourceState(ESXExport):find("start") then
+				ESX.GetPlayerFromId(src).addInventoryItem(item, amount)
+			end
 			if Config.System.Debug then
 				print("^6Bridge^7: ^3"..addremove.."^7[^6"..CoreInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
         elseif GetResourceState(CodeMInv):find("start") then
             local success = exports[CodeMInv]:AddItem(src, item, amount)
 			if Config.System.Debug then
 				print("^6Bridge^7: ^3"..addremove.."^7[^6"..CodeMInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
+		elseif GetResourceState(OrigenInv):find("start") then
+			local success = exports[OrigenInv]:AddItem(src, item, amount)
+			if Config.System.Debug then
+				print("^6Bridge^7: ^3"..addremove.."^7[^6"..OrigenInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
+			end
+
 		elseif GetResourceState(QBInv):find("start") then
 			if Core.Functions.GetPlayer(src).Functions.AddItem(item, amount or 1) then
 				--if Config.Crafting.showItemBox then
@@ -649,6 +677,7 @@ RegisterNetEvent(GetCurrentResourceName()..":server:toggleItem", function(give,
 			if Config.System.Debug then
 				print("^6Bridge^7: ^3"..addremove.."^7[^6"..QBInv.."^7] ^2Player^7("..src..") ^6"..Items[item].label.."^7("..item..") x^5"..(amount and amount or "1").."^7")
             end
+
 		else
 			print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
 		end
@@ -685,12 +714,12 @@ local function CheckVersion()
 				PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..GetCurrentResourceName()..'/master/version.txt', function(err, freeVersion, headers)
 					if not freeVersion then print("^1Currently unable to run a version check for ^7'^3"..GetCurrentResourceName().."^7' ("..currentVersion.."^7)") return end
 					local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7"
-					freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3").."^7"
+					freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
 					print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..freeVersion)
 					print(freeVersion == currentVersion and "^7'^3"..GetCurrentResourceName().."^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3"..GetCurrentResourceName().."^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
 				end)
 			else
-				newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7"
+				newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
 				print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..newestVersion)
 				print(newestVersion == currentVersion and '^6You are running the latest version.^7 ('..currentVersion..')' or "^1You are currently running an outdated version^7, ^1please update^7!")
 			end

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "1.0.4"
+version "1.0.7"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 game "gta5"

version.txt

@@ -1 +1 @@
-1.0.5
+1.0.7

wrapper.lua

@@ -1,5 +1,8 @@
 Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
 
+if GetResourceState("ps-inventory"):find("start") then Exports.QBInv = "ps-inventory" end
+if GetResourceState("lj-inventory"):find("start") then Exports.QBInv = "lj-inventory" end
+
 OXLibExport = Exports and Exports.OXLibExport or ""
 
 QBXExport = Exports and Exports.QBXExport or ""
@@ -12,6 +15,7 @@ QBInv = Exports and Exports.QBInv or ""
 QSInv = Exports and Exports.QSInv or ""
 CoreInv = Exports and Exports.CoreInv or ""
 CodeMInv = Exports and Exports.CodeMInv or ""
+OrigenInv = Exports and Exports.OrigenInv or ""
 
 QBMenuExport = Exports and Exports.QBMenuExport or ""
 
@@ -23,7 +27,7 @@ function CheckBridgeVersion()
         local currentVersion = "^3"..GetResourceMetadata("jim_bridge", 'version'):gsub("%.", "^7.^3").."^7"
         PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, newestVersion, headers)
             if not newestVersion then print("^1Currently unable to run a version check for ^7'^3jim_bridge^7' ("..currentVersion.."^7)") return end
-            newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7"
+            newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
             print(newestVersion == currentVersion and "^7'^3jim_bridge^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3jim_bridge^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
 		end)
 	end
@@ -223,16 +227,19 @@ end
 
 function openMenu(Menu, data)
     if Config.System.Menu == "ox" then
-        if data.onBack then
+        local index = nil
+        if data.onBack and not data.onSelected then
             table.insert(Menu, 1, { icon = "fas fa-circle-arrow-left",
                 title = "Return",
                 onSelect = data.onBack,
+                label = "Return"
             })
         end
         for k in pairs(Menu) do
             if not Menu[k].title then
                 if Menu[k].header ~= nil and Menu[k].header ~= "" then
                     Menu[k].title = Menu[k].header
+                    Menu[k].label = Menu[k].header
                     if Menu[k].txt then Menu[k].description = Menu[k].txt else Menu[k].description = "" end
                 else
                     Menu[k].title = Menu[k].txt
@@ -246,8 +253,22 @@ function openMenu(Menu, data)
                 Menu[k].disabled = true
             end
         end
-        lib.registerContext({id = 'Menu', title = data.header..br..br..(data.headertxt and data.headertxt or ""), position = 'top-right', options = Menu, canClose = data.canClose and data.canClose or nil, onExit = data.onExit and data.onExit or nil, })
+        local menuID = 'Menu'
-        lib.showContext("Menu")
+        (data.onSelected and lib.registerMenu or lib.registerContext)({
+            id = menuID,
+            title = data.header..br..br..(data.headertxt and data.headertxt or ""),
+            position = 'top-right',
+            options = Menu,
+            canClose = data.canClose and data.canClose or nil,
+            onClose = (data.onBack and data.onBack) or (data.onExit and data.onExit) or nil,
+            onExit = data.onExit and data.onExit or nil,
+            onSelected = data.onSelected and (function(selected) index = selected end) or nil,
+        }, (data.onSelected and (function(x, y, args) Menu[x].onSelect() end) or nil))
+        if data.onSelected then
+            lib.showMenu(menuID, 1)
+        else
+            lib.showContext(menuID)
+        end
     elseif Config.System.Menu == "qb" then
         if data.onBack then
             table.insert(Menu, 1, { icon = "fas fa-circle-arrow-left",
@@ -750,7 +771,7 @@ function createInput(title, opts)
                     isRequired = opts[i].isRequired,
                     label = opts[i].label or opts[i].text,
                     name = opts[i].name,
-                    default = opts[i].options[1].value,
+                    default = opts[i].default or opts[i].options[1].value,
                     options = opts[i].options,
                 }
             end
@@ -1240,6 +1261,8 @@ function invImg(item)
             imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
         elseif GetResourceState(CoreInv and CoreInv or ""):find("start") then
             imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
+        elseif GetResourceState(OrigenInv and OrigenInv or ""):find("start") then
+            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
         elseif GetResourceState(QBInv and QBInv or ""):find("start") then
             imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
         else