refactor: deprecate data function for lib.load

client.lua

@@ -109,7 +109,7 @@ local function closeTrunk()
 end
 
 local CraftingBenches = require 'modules.crafting.client'
-local Vehicles = data 'vehicles'
+local Vehicles = lib.load('data.vehicles')
 local Inventory = require 'modules.inventory.client'
 
 ---@param inv string?
@@ -331,7 +331,7 @@ RegisterNetEvent('ox_inventory:forceOpenInventory', function(left, right)
 	})
 end)
 
-local Animations = data 'animations'
+local Animations = lib.load('data.animations')
 local Items = require 'modules.items.client'
 local usingItem = false
 
@@ -1236,7 +1236,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
 		end
 	end
 
-	for id, data in pairs(data('licenses')) do
+	for id, data in pairs(lib.load('data.licenses')) do
 		lib.points.new({
 			coords = data.coords,
 			distance = 16,

init.lua

@@ -156,6 +156,7 @@ end)
 
 ---@param name string
 ---@return table
+---@deprecated
 function data(name)
     if shared.server and shared.ready == nil then return {} end
     local file = ('data/%s.lua'):format(name)

modules/crafting/client.lua

@@ -96,6 +96,6 @@ local function createCraftingBench(id, data)
 	end
 end
 
-for id, data in pairs(data('crafting')) do createCraftingBench(id, data) end
+for id, data in pairs(lib.load('data.crafting')) do createCraftingBench(id, data) end
 
 return CraftingBenches

modules/crafting/server.lua

@@ -43,7 +43,7 @@ local function createCraftingBench(id, data)
 	end
 end
 
-for id, data in pairs(data('crafting')) do createCraftingBench(id, data) end
+for id, data in pairs(lib.load('data.crafting')) do createCraftingBench(id, data) end
 
 ---falls back to player coords if zones and points are both nil
 ---@param source number

modules/inventory/client.lua

@@ -19,7 +19,7 @@ function Inventory.OpenDumpster(entity)
 end
 
 local Utils = require 'modules.utils.client'
-local Vehicles = data 'vehicles'
+local Vehicles = lib.load('data.vehicles')
 local backDoorIds = { 2, 3 }
 
 function Inventory.CanAccessTrunk(entity)
@@ -297,7 +297,7 @@ local function nearbyEvidence(point)
 	end
 end
 
-Inventory.Evidence = setmetatable(data('evidence'), {
+Inventory.Evidence = setmetatable(lib.load('data.evidence'), {
 	__call = function(self)
 		for _, evidence in pairs(self) do
 			if evidence.point then
@@ -339,7 +339,7 @@ local function nearbyStash(self)
 	DrawMarker(2, self.coords.x, self.coords.y, self.coords.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.2, 0.15, 30, 30, 150, 222, false, false, 0, true, false, false, false)
 end
 
-Inventory.Stashes = setmetatable(data('stashes'), {
+Inventory.Stashes = setmetatable(lib.load('data.stashes'), {
 	__call = function(self)
 		for id, stash in pairs(self) do
 			if stash.jobs then stash.groups = stash.jobs end

modules/inventory/server.lua

@@ -75,10 +75,10 @@ function OxInventory:syncSlotsWithClients(slots, syncOwner)
 	end
 end
 
-local Vehicles = data 'vehicles'
+local Vehicles = lib.load('data.vehicles')
 local RegisteredStashes = {}
 
-for _, stash in pairs(data 'stashes') do
+for _, stash in pairs(lib.load('data.stashes')) do
 	RegisteredStashes[stash.name] = {
 		name = stash.name,
 		label = stash.label,

modules/items/shared.lua

@@ -55,7 +55,7 @@ local function newItem(data)
 	ItemList[data.name] = data
 end
 
-for type, data in pairs(data('weapons')) do
+for type, data in pairs(lib.load('data.weapons')) do
 	for k, v in pairs(data) do
 		v.name = k
 		v.close = type == 'Ammo' and true or false
@@ -88,7 +88,7 @@ for type, data in pairs(data('weapons')) do
 	end
 end
 
-for k, v in pairs(data 'items') do
+for k, v in pairs(lib.load('data.items')) do
 	v.name = k
 	local success, response = pcall(newItem, v)
 

modules/shops/client.lua

@@ -4,7 +4,7 @@ local shopTypes = {}
 local shops = {}
 local createBlip = require 'modules.utils.client'.CreateBlip
 
-for shopType, shopData in pairs(data('shops') --[[@as table<string, OxShop>]]) do
+for shopType, shopData in pairs(lib.load('data.shops') --[[@as table<string, OxShop>]]) do
 	local shop = {
 		name = shopData.name,
 		groups = shopData.groups or shopData.jobs,

modules/shops/server.lua

@@ -108,7 +108,7 @@ local function createShop(shopType, id)
 	return shop[id]
 end
 
-for shopType, shopDetails in pairs(data('shops')) do
+for shopType, shopDetails in pairs(lib.load('data.shops')) do
 	registerShopType(shopType, shopDetails)
 end
 

server.lua

@@ -232,7 +232,7 @@ exports('forceOpenInventory', function(playerId, invType, data)
 	end
 end)
 
-local Licenses = data 'licenses'
+local Licenses = lib.load('data.licenses')
 
 lib.callback.register('ox_inventory:buyLicense', function(source, id)
 	local license = Licenses[id]