refactor(client): move itemCount event handler

+ other misc changes

client/framework/esx.lua

@@ -1,8 +1,9 @@
 if GetResourceState('es_extended') == 'missing' then return end
 
 local groups = { 'job', 'job2' }
-PlayerItems = {}
 local playerGroups = {}
+local usingOxInventory = GetResourceState('ox_inventory') ~= 'missing'
+PlayerItems = {}
 
 local function setPlayerData(playerData)
     if playerData.inventory then
@@ -30,7 +31,7 @@ SetTimeout(0, function()
         setPlayerData(ESX.PlayerData)
     end
 
-    if GetResourceState('ox_inventory') ~= 'missing' then
+    if usingOxInventory then
         setmetatable(PlayerItems, {
             __index = function(self, index)
                 self[index] = exports.ox_inventory:Search('count', index) or 0
@@ -55,6 +56,14 @@ RegisterNetEvent('esx:setJob2', function(job)
     playerGroups.job2 = job
 end)
 
+RegisterNetEvent('esx:addInventoryItem', function(name, count)
+    PlayerItems[name] = count
+end)
+
+RegisterNetEvent('esx:removeInventoryItem', function(name, count)
+    PlayerItems[name] = count
+end)
+
 function PlayerHasGroups(filter)
     local _type = type(filter)
     for i = 1, #groups do
@@ -90,11 +99,3 @@ function PlayerHasGroups(filter)
         end
     end
 end
-
-RegisterNetEvent('esx:addInventoryItem', function(name, count)
-    PlayerItems[name] = count
-end)
-
-RegisterNetEvent('esx:removeInventoryItem', function(name, count)
-    PlayerItems[name] = count
-end)

client/framework/ox.lua

@@ -5,6 +5,7 @@ local success, result = pcall(function()
 end)
 
 local playerGroups = success and result or {}
+PlayerItems = {}
 
 AddEventHandler('ox:playerLoaded', function(data)
     playerGroups = data.groups
@@ -47,9 +48,3 @@ function PlayerHasGroups(filter)
         end
     end
 end
-
-PlayerItems = {}
-
-AddEventHandler('ox_inventory:itemCount', function(name, count)
-    PlayerItems[name] = count
-end)

client/framework/qb.lua

@@ -7,11 +7,8 @@ end)
 
 local playerData = success and result or {}
 local usingOxInventory = GetResourceState('ox_inventory') ~= 'missing'
-
 PlayerItems = {}
 
-
-
 local function setPlayerItems()
     if not playerData?.items then return end
 
@@ -22,11 +19,7 @@ local function setPlayerItems()
     end
 end
 
-if usingOxInventory then
-    AddEventHandler('ox_inventory:itemCount', function(name, count)
-        PlayerItems[name] = count
-    end)
-else
+if not usingOxInventory then
     setPlayerItems()
 end
 

client/utils.lua

@@ -113,6 +113,10 @@ if playerItems and GetResourceState('ox_inventory') ~= 'missing' then
             return self[index]
         end
     })
+
+    AddEventHandler('ox_inventory:itemCount', function(name, count)
+        playerItems[name] = count
+    end)
 end
 
 function PlayerHasItems(filter, hasAny)