Merge pull request #124 from Mustachedom/main

Fix for new qb and new features

Author: TheMajorMayhem

client/main.lua

@@ -15,31 +15,41 @@ local isHotbar = false
 local WeaponAttachments = {}
 local showBlur = true
 
+local function Notify(text, type) 
+    if Config.Notify =='ox' then
+        lib.notify({title = text, type = type})
+    elseif Config.Notify == 'qb' then
+        QBCore.Functions.Notify(text, type)
+    end
+end
+
 local function HasItem(items, amount)
     local isTable = type(items) == 'table'
     local isArray = isTable and table.type(items) == 'array' or false
     local totalItems = #items
     local count = 0
     local kvIndex = 2
-	if isTable and not isArray then
+    if isTable and not isArray then
         totalItems = 0
         for _ in pairs(items) do totalItems += 1 end
         kvIndex = 1
     end
-    for _, itemData in pairs(PlayerData.items) do
-        if isTable then
-            for k, v in pairs(items) do
-                local itemKV = {k, v}
-                if itemData and itemData.name == itemKV[kvIndex] and ((amount and itemData.amount >= amount) or (not isArray and itemData.amount >= v) or (not amount and isArray)) then
-                    count += 1
+    if next(PlayerData.items) and PlayerData.items ~= nil then
+        for _, itemData in pairs(PlayerData.items) do
+            if isTable then
+                for k, v in pairs(items) do
+                    local itemKV = {k, v}
+                    if itemData and itemData.name == itemKV[kvIndex] and ((amount and itemData.amount >= amount) or (not isArray and itemData.amount >= v) or (not amount and isArray)) then
+                        count += 1
+                    end
+                end
+                if count == totalItems then
+                    return true
+                end
+            else 
+                if itemData and itemData.name == items and (not amount or (itemData and amount and itemData.amount >= amount)) then
+                    return true
                 end
-            end
-            if count == totalItems then
-                return true
-            end
-        else -- Single item as string
-            if itemData and itemData.name == items and (not amount or (itemData and amount and itemData.amount >= amount)) then
-                return true
             end
         end
     end
@@ -398,6 +408,16 @@ RegisterNetEvent('ps-inventory:client:CheckOpenState', function(type, id, label)
 end)
 
 RegisterNetEvent('ps-inventory:client:ItemBox', function(itemData, type, amount)
+    --amount = amount or 1
+    --SendNUIMessage({
+    --    action = "itemBox",
+    --    item = itemData,
+    --    type = type,
+    --    itemAmount = amount
+    --})
+end)
+
+RegisterNetEvent('ps-inventory:client:ItemBox2', function(itemData, type, amount)
     amount = amount or 1
     SendNUIMessage({
         action = "itemBox",
@@ -538,7 +558,7 @@ RegisterNetEvent('ps-inventory:client:CraftItems', function(itemName, itemCosts,
         isCrafting = false
 	end, function() -- Cancel
 		StopAnimTask(ped, "mini@repair", "fixing_a_player", 1.0)
-        QBCore.Functions.Notify("Failed", "error")
+        Notify("Failed", "error")
         isCrafting = false
 	end)
 end)
@@ -565,7 +585,7 @@ RegisterNetEvent('ps-inventory:client:CraftAttachment', function(itemName, itemC
         isCrafting = false
 	end, function() -- Cancel
 		StopAnimTask(ped, "mini@repair", "fixing_a_player", 1.0)
-        QBCore.Functions.Notify("Failed", "error")
+        Notify("Failed", "error")
         isCrafting = false
 	end)
 end)
@@ -585,7 +605,7 @@ RegisterNetEvent('ps-inventory:client:PickupSnowballs', function()
         TriggerEvent('ps-inventory:client:ItemBox', QBCore.Shared.Items["snowball"], "add")
     end, function() -- Cancel
         ClearPedTasks(ped)
-        QBCore.Functions.Notify("Canceled", "error")
+        Notify("Canceled", "error")
     end)
 end)
 
@@ -741,7 +761,7 @@ RegisterCommand('inventory', function()
                             curVeh = vehicle
                             CurrentGlovebox = nil
                         else
-                            QBCore.Functions.Notify("Vehicle locked.", "error")
+                            Notify("Vehicle locked.", "error")
                             return
                         end
                     else
@@ -829,7 +849,7 @@ RegisterNUICallback('RobMoney', function(data, cb)
 end)
 
 RegisterNUICallback('Notify', function(data, cb)
-    QBCore.Functions.Notify(data.message, data.type)
+    Notify(data.message, data.type)
     cb('ok')
 end)
 
@@ -937,7 +957,7 @@ RegisterNUICallback('combineWithAnim', function(data, cb)
         TriggerServerEvent('ps-inventory:server:combineItem', combineData.reward, data.requiredItem, data.usedItem)
     end, function() -- Cancel
         StopAnimTask(ped, aDict, aLib, 1.0)
-        QBCore.Functions.Notify("Failed", "error")
+        Notify("Failed", "error")
     end)
     cb('ok')
 end)
@@ -965,10 +985,10 @@ RegisterNUICallback("GiveItem", function(data, cb)
             SetCurrentPedWeapon(PlayerPedId(),'WEAPON_UNARMED',true)
             TriggerServerEvent("ps-inventory:server:GiveItem", playerId, data.item.name, data.amount, data.item.slot)
         else
-            QBCore.Functions.Notify("You do not own this item!", "error")
+            Notify("You do not own this item!", "error")
         end
     else
-        QBCore.Functions.Notify("No one nearby!", "error")
+        Notify("No one nearby!", "error")
     end
     cb('ok')
 end)

config.lua

@@ -10,12 +10,18 @@ Config.MaxDropViewDistance = 12.5 -- The distance in GTA Units that a drop can b
 Config.UseItemDrop = false -- This will enable item object to spawn on drops instead of markers
 Config.ItemDropObject = `sf_prop_sf_backpack_01a` -- if Config.UseItemDrop is true, this will be the prop that spawns for the item
 
+Config.Notify = 'qb' -- Notifications for either qb/ox
 Config.Progressbar = {
     Enable = false,         -- True to Enable the progressbar while opening inventory
     minT = 350,             -- Min Time for Inventory to open
     maxT = 500              -- Max Time for Inventory to open
 }
 
+Config.Lang = {
+    noaccess = "You Can Not Access This Inventory!",
+    itemexist = "This Item Does Not Exist",
+}
+
 Config.VendingObjects = {
     "prop_vend_soda_01",
     "prop_vend_soda_02",

fxmanifest.lua

@@ -6,7 +6,8 @@ version '1.0.6'
 
 shared_scripts {
 	'config.lua',
-	'@qb-weapons/config.lua'
+	'@qb-weapons/config.lua',
+	'@ox_lib/init.lua',
 }
 
 server_scripts {