From dd6f0533ff77d1db62e1ed66d5d96f9b8ffe9645 Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:31:18 +0100
Subject: [PATCH] refactor!(es_extended): move Items into core

---
 .../es_extended/server/bridge/inventory/oxinventory.lua   | 4 ++--
 [core]/es_extended/server/classes/player.lua              | 4 ++--
 [core]/es_extended/server/common.lua                      | 4 ++--
 [core]/es_extended/server/functions.lua                   | 8 ++++----
 [core]/es_extended/server/main.lua                        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[core]/es_extended/server/bridge/inventory/oxinventory.lua b/[core]/es_extended/server/bridge/inventory/oxinventory.lua
index 62b4c2af..f3771968 100644
--- a/[core]/es_extended/server/bridge/inventory/oxinventory.lua
+++ b/[core]/es_extended/server/bridge/inventory/oxinventory.lua
@@ -3,12 +3,12 @@ if Config.CustomInventory ~= "ox" then return end
 MySQL.ready(function()
     TriggerEvent("__cfx_export_ox_inventory_Items", function(ref)
         if ref then
-            ESX.Items = ref()
+            Core.Items = ref()
         end
     end)
 
     AddEventHandler("ox_inventory:itemList", function(items)
-        ESX.Items = items
+        Core.Items = items
     end)
 end)
 
diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index c20948c0..5a4463e9 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -464,8 +464,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
     ---@param count number
     ---@return boolean
     function self.canCarryItem(itemName, count)
-        if ESX.Items[itemName] then
-            local currentWeight, itemWeight = self.weight, ESX.Items[itemName].weight
+        if Core.Items[itemName] then
+            local currentWeight, itemWeight = self.weight, Core.Items[itemName].weight
             local newWeight = currentWeight + (itemWeight * count)
 
             return newWeight <= self.maxWeight
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index a53588ee..993d44bc 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -1,6 +1,6 @@
 ESX.Players = {}
-ESX.Items = {}
 Core = {}
+Core.Items = {}
 Core.Jobs = {}
 Core.JobsPlayerCount = {}
 Core.UsableItemsCallbacks = {}
@@ -37,7 +37,7 @@ MySQL.ready(function()
     if not Config.CustomInventory then
         local items = MySQL.query.await("SELECT * FROM items")
         for _, v in ipairs(items) do
-            ESX.Items[v.name] = { label = v.label, weight = v.weight, rare = v.rare, canRemove = v.can_remove }
+            Core.Items[v.name] = { label = v.label, weight = v.weight, rare = v.rare, canRemove = v.can_remove }
         end
     end
 
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 54ebd5b8..d03ccec7 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -116,7 +116,7 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion)
                                     error = TranslateCap("commanderror_argumentmismatch_string", k)
                                 end
                             elseif v.type == "item" then
-                                if ESX.Items[args[k]] then
+                                if Core.Items[args[k]] then
                                     newArgs[v.name] = args[k]
                                 else
                                     error = TranslateCap("commanderror_invaliditem")
@@ -513,7 +513,7 @@ end
 ---@param ... any
 ---@return nil
 function ESX.UseItem(source, item, ...)
-    if ESX.Items[item] then
+    if Core.Items[item] then
         local itemCallback = Core.UsableItemsCallbacks[item]
 
         if itemCallback then
@@ -549,8 +549,8 @@ end
 ---@return string?
 ---@diagnostic disable-next-line: duplicate-set-field
 function ESX.GetItemLabel(item)
-    if ESX.Items[item] then
-        return ESX.Items[item].label
+    if Core.Items[item] then
+        return Core.Items[item].label
     else
         print(("[^3WARNING^7] Attemting to get invalid Item -> ^5%s^7"):format(item))
     end
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 27b62151..2c2ec406 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -191,7 +191,7 @@ function loadESXPlayer(identifier, playerId, isNew)
     if not Config.CustomInventory then
         local inventory = (result.inventory and result.inventory ~= "") and json.decode(result.inventory) or {}
 
-        for name, item in pairs(ESX.Items) do
+        for name, item in pairs(Core.Items) do
             local count = inventory[name] or 0
             userData.weight += (count * item.weight)