feat(client): Utilize ox_lib cache system (#263)

* Utilize ox lib cache system * idk what happened here * update stuff * Reverse this again idk why this one dont like me * Update client.lua
iLLeniumStudios · Mar 4, 2023 · c2c73df · c2c73df
1 parent 37974ae
commit c2c73df
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 144 deletions.
diff --git a/client/blips.lua b/client/blips.lua
@@ -54,7 +54,7 @@ local function ShowNearestShopBlip()
         Blips[k] = 0
     end
     while true do
-        local coords = GetEntityCoords(PlayerPedId())
+        local coords = GetEntityCoords(cache.ped)
         for shopType, blipConfig in pairs(Config.Blips) do
             local closest = 1000000
             local closestCoords

diff --git a/client/client.lua b/client/client.lua
@@ -217,7 +217,7 @@ end
 function SetInitialClothes(initial)
     client.setPlayerModel(initial.Model)
     -- Fix for tattoo's appearing when creating a new character
-    local ped = PlayerPedId()
+    local ped = cache.ped
     client.setPedTattoos(ped, {})
     client.setPedComponents(ped, initial.Components)
     client.setPedProps(ped, initial.Props)
@@ -393,7 +393,7 @@ RegisterNetEvent("illenium-appearance:client:saveOutfit", function()
     end
 
     local outfitName = response[1]
-    if outfitName ~= nil then
+    if outfitName then
         Wait(500)
         lib.callback("illenium-appearance:server:getOutfits", false, function(outfits)
             local outfitExists = false
@@ -414,10 +414,9 @@ RegisterNetEvent("illenium-appearance:client:saveOutfit", function()
                 return
             end
 
-            local playerPed = PlayerPedId()
-            local pedModel = client.getPedModel(playerPed)
-            local pedComponents = client.getPedComponents(playerPed)
-            local pedProps = client.getPedProps(playerPed)
+            local pedModel = client.getPedModel(cache.ped)
+            local pedComponents = client.getPedComponents(cache.ped)
+            local pedProps = client.getPedProps(cache.ped)
 
             TriggerServerEvent("illenium-appearance:server:saveOutfit", outfitName, pedModel, pedComponents, pedProps)
         end)
@@ -426,7 +425,7 @@ end)
 
 RegisterNetEvent('illenium-appearance:client:updateOutfit', function(outfitID)
     if not outfitID then return end
-    
+
     lib.callback("illenium-appearance:server:getOutfits", false, function(outfits)
         local outfitExists = false
         for i = 1, #outfits, 1 do
@@ -446,10 +445,9 @@ RegisterNetEvent('illenium-appearance:client:updateOutfit', function(outfitID)
             return
         end
 
-        local playerPed = PlayerPedId()
-        local pedModel = client.getPedModel(playerPed)
-        local pedComponents = client.getPedComponents(playerPed)
-        local pedProps = client.getPedProps(playerPed)
+        local pedModel = client.getPedModel(cache.ped)
+        local pedComponents = client.getPedComponents(cache.ped)
+        local pedProps = client.getPedProps(cache.ped)
 
         TriggerServerEvent("illenium-appearance:server:updateOutfit", outfitID, pedModel, pedComponents, pedProps)
     end)
@@ -481,7 +479,7 @@ local function RegisterChangeOutfitMenu(id, parent, outfits, mType)
     table.sort(changeOutfitMenu.options, function(a, b)
         return a.title < b.title
     end)
-    
+
     lib.registerContext(changeOutfitMenu)
 end
 
@@ -504,7 +502,7 @@ local function RegisterUpdateOutfitMenu(id, parent, outfits)
     table.sort(updateOutfitMenu.options, function(a, b)
         return a.title < b.title
     end)
-    
+
     lib.registerContext(updateOutfitMenu)
 end
 
@@ -597,12 +595,11 @@ RegisterNetEvent("illenium-appearance:client:OutfitManagementMenu", function(arg
 end)
 
 RegisterNetEvent("illenium-appearance:client:SaveManagementOutfit", function(mType)
-    local playerPed = PlayerPedId()
     local outfitData = {
         Type = mType,
-        Model = client.getPedModel(playerPed),
-        Components = client.getPedComponents(playerPed),
-        Props = client.getPedProps(playerPed)
+        Model = client.getPedModel(cache.ped),
+        Components = client.getPedComponents(cache.ped),
+        Props = client.getPedProps(cache.ped)
     }
 
     local rankValues
@@ -791,8 +788,7 @@ RegisterNetEvent("illenium-appearance:client:OpenSurgeonShop", function()
 end)
 
 RegisterNetEvent("illenium-appearance:client:changeOutfit", function(data)
-    local playerPed = PlayerPedId()
-    local pedModel = client.getPedModel(playerPed)
+    local pedModel = client.getPedModel(cache.ped)
     local appearanceDB
     if pedModel ~= data.model then
         local p = promise.new()
@@ -813,21 +809,20 @@ RegisterNetEvent("illenium-appearance:client:changeOutfit", function(data)
         end, data.model)
         appearanceDB = Citizen.Await(p)
     else
-        appearanceDB = client.getPedAppearance(playerPed)
+        appearanceDB = client.getPedAppearance(cache.ped)
     end
     if appearanceDB then
-        playerPed = PlayerPedId()
-        client.setPedComponents(playerPed, data.components)
-        client.setPedProps(playerPed, data.props)
-        client.setPedHair(playerPed, appearanceDB.hair, appearanceDB.tattoos)
+        client.setPedComponents(cache.ped, data.components)
+        client.setPedProps(cache.ped, data.props)
+        client.setPedHair(cache.ped, appearanceDB.hair, appearanceDB.tattoos)
 
         if data.disableSave then
             TriggerServerEvent("illenium-appearance:server:syncUniform", {
                 type = data.type,
                 name = data.name
             }) -- Is a uniform
         else
-            local appearance = client.getPedAppearance(playerPed)
+            local appearance = client.getPedAppearance(cache.ped)
             TriggerServerEvent("illenium-appearance:server:saveAppearance", appearance)
         end
         Framework.CachePed()
@@ -863,9 +858,7 @@ local function InCooldown()
 end
 
 RegisterNetEvent("illenium-appearance:client:reloadSkin", function()
-    local playerPed = PlayerPedId()
-
-    if InCooldown() or Framework.CheckPlayerMeta() or IsPedInAnyVehicle(playerPed, true) or IsPedFalling(playerPed) then
+    if InCooldown() or Framework.CheckPlayerMeta() or cache.vehicle or IsPedFalling(cache.ped) then
         lib.notify({
             title = _L("commands.reloadskin.failure.title"),
             description = _L("commands.reloadskin.failure.description"),
@@ -902,10 +895,9 @@ RegisterNetEvent("illenium-appearance:client:ClearStuckProps", function()
     end
 
     reloadSkinTimer = GetGameTimer()
-    local playerPed = PlayerPedId()
 
     for _, v in pairs(GetGamePool("CObject")) do
-      if IsEntityAttachedToEntity(playerPed, v) then
+      if IsEntityAttachedToEntity(cache.ped, v) then
         SetEntityAsMissionEntity(v, true, true)
         DeleteObject(v)
         DeleteEntity(v)

diff --git a/client/framework/esx/compatibility.lua b/client/framework/esx/compatibility.lua
@@ -42,12 +42,11 @@ RegisterNetEvent("skinchanger:loadSkin", function(skin, cb)
 end)
 
 RegisterNetEvent("skinchanger:loadClothes", function(_, clothes)
-    local playerPed = PlayerPedId()
-    local components = Framework.ConvertComponents(clothes, client.getPedComponents(playerPed))
-    local props = Framework.ConvertProps(clothes, client.getPedProps(playerPed))
+    local components = Framework.ConvertComponents(clothes, client.getPedComponents(cache.ped))
+    local props = Framework.ConvertProps(clothes, client.getPedProps(cache.ped))
 
-    client.setPedComponents(playerPed, components)
-    client.setPedProps(playerPed, props)
+    client.setPedComponents(cache.ped, components)
+    client.setPedProps(cache.ped, props)
 end)
 
 RegisterNetEvent("esx_skin:openSaveableMenu", function(onSubmit, onCancel)

diff --git a/client/framework/esx/main.lua b/client/framework/esx/main.lua
@@ -67,7 +67,7 @@ function Framework.GetGangGrade()
 end
 
 function Framework.CachePed()
-    ESX.SetPlayerData("ped", PlayerPedId())
+    ESX.SetPlayerData("ped", cache.ped)
 end
 
 function Framework.RestorePlayerArmour()

diff --git a/client/framework/framework.lua b/client/framework/framework.lua
@@ -3,7 +3,7 @@ function Framework.GetGender(isNew)
         return Framework.GetPlayerGender()
     end
 
-    local model = client.getPedModel(PlayerPedId())
+    local model = client.getPedModel(cache.ped)
     if model == "mp_f_freemode_01" then
         return "Female"
     end

diff --git a/client/framework/qb/compatibility.lua b/client/framework/qb/compatibility.lua
@@ -23,9 +23,8 @@ end)
 RegisterNetEvent("qb-clothing:client:loadOutfit", LoadJobOutfit)
 
 RegisterNetEvent("qb-multicharacter:client:chooseChar", function()
-    local ped = PlayerPedId()
-    client.setPedTattoos(ped, {})
-    ClearPedDecorations(ped)
+    client.setPedTattoos(cache.ped, {})
+    ClearPedDecorations(cache.ped)
 
     TriggerServerEvent("illenium-appearance:server:resetOutfitCache")
 end)
diff --git a/client/framework/qb/main.lua b/client/framework/qb/main.lua
@@ -101,7 +101,6 @@ end
 function Framework.RestorePlayerArmour()
     if PlayerData then
         Wait(1000)
-        local playerPed = PlayerPedId()
-        SetPedArmour(playerPed, PlayerData.metadata["armor"])
+        SetPedArmour(cache.ped, PlayerData.metadata["armor"])
     end
 end
diff --git a/client/framework/qb/migrate.lua b/client/framework/qb/migrate.lua
@@ -21,20 +21,17 @@ RegisterNetEvent("illenium-appearance:client:migration:load-qb-clothing-skin", f
     local model = playerSkin.model
     model = model ~= nil and tonumber(model) or false
     Citizen.CreateThread(function()
-        RequestModel(model)
-        while not HasModelLoaded(model) do
-            RequestModel(model)
-            Citizen.Wait(0)
-        end
-        SetPlayerModel(PlayerId(), model)
-        SetPedComponentVariation(PlayerPedId(), 0, 0, 0, 2)
-        TriggerEvent("illenium-appearance:client:migration:load-qb-clothing-clothes", playerSkin, PlayerPedId())
+        lib.requestModel(model, 1000)
+        SetPlayerModel(cache.playerId, model)
+        SetPedComponentVariation(cache.ped, 0, 0, 0, 2)
+        TriggerEvent("illenium-appearance:client:migration:load-qb-clothing-clothes", playerSkin, cache.ped)
+        SetModelAsNoLongerNeeded(model)
     end)
 end)
 
 RegisterNetEvent("illenium-appearance:client:migration:load-qb-clothing-clothes", function(playerSkin, ped)
     local data = json.decode(playerSkin.skin)
-    if ped == nil then ped = PlayerPedId() end
+    if ped == nil then ped = cache.ped end
 
     for i = 0, 11 do
         SetPedComponentVariation(ped, i, 0, 0, 0)

diff --git a/client/outfits.lua b/client/outfits.lua
@@ -12,7 +12,7 @@ local function typeof(var)
 end
 
 function LoadJobOutfit(oData)
-    local ped = PlayerPedId()
+    local ped = cache.ped
 
     local data = oData.outfitData
 

diff --git a/client/props.lua b/client/props.lua
@@ -1,14 +1,5 @@
-if Config.AlwaysKeepProps then
-    local lastped = nil
-
-    CreateThread(function()
-        SetPedCanLosePropsOnDamage(PlayerPedId(), false, 0)
-        while true do
-            if PlayerPedId() ~= lastped then
-                lastped = PlayerPedId()
-                SetPedCanLosePropsOnDamage(PlayerPedId(), false, 0)
-            end
-            Wait(1000)
-        end
-    end)
-end
+lib.onCache('ped', function(value)
+    if Config.AlwaysKeepProps then
+        SetPedCanLosePropsOnDamage(value, false, 0)
+    end
+end)
diff --git a/client/stats.lua b/client/stats.lua
@@ -1,26 +1,23 @@
 local stats = nil
 
 local function ResetRechargeMultipliers()
-    local player = PlayerId()
-    SetPlayerHealthRechargeMultiplier(player, 0.0)
-    SetPlayerHealthRechargeLimit(player, 0.0)
+    SetPlayerHealthRechargeMultiplier(cache.playerId, 0.0)
+    SetPlayerHealthRechargeLimit(cache.playerId, 0.0)
 end
 
 function BackupPlayerStats()
-    local playerPed = PlayerPedId()
     stats = {
-        health = GetEntityHealth(playerPed),
-        armour = GetPedArmour(playerPed)
+        health = GetEntityHealth(cache.ped),
+        armour = GetPedArmour(cache.ped)
     }
 end
 
 function RestorePlayerStats()
     if stats then
-        local playerPed = PlayerPedId()
-        SetEntityMaxHealth(playerPed, 200)
+        SetEntityMaxHealth(cache.ped, 200)
         Wait(1000) -- Safety Delay
-        SetEntityHealth(playerPed, stats.health)
-        SetPedArmour(playerPed, stats.armour)
+        SetEntityHealth(cache.ped, stats.health)
+        SetPedArmour(cache.ped, stats.armour)
         ResetRechargeMultipliers()
         stats = nil
         return