diff --git a/bridge/qb/server/main.lua b/bridge/qb/server/main.lua index fa2153288..fcbb25a50 100644 --- a/bridge/qb/server/main.lua +++ b/bridge/qb/server/main.lua @@ -4,7 +4,7 @@ require 'bridge.qb.server.debug' require 'bridge.qb.server.events' local convertItems = require 'bridge.qb.shared.compat'.convertItems -convertItems(require '@ox_inventory.data.items', require 'data.items') +convertItems(require '@ox_inventory.data.items', require 'config.shared.items') qbCoreCompat = {} diff --git a/client/groups.lua b/client/groups.lua index 718d4d60e..c1afcb4b8 100644 --- a/client/groups.lua +++ b/client/groups.lua @@ -1,5 +1,5 @@ -local jobs = require 'data.jobs' -local gangs = require 'data.gangs' +local jobs = require 'config.shared.jobs' +local gangs = require 'config.shared.gangs' ---@return table function GetJobs() diff --git a/data/gangs.lua b/config/shared/gangs.lua similarity index 100% rename from data/gangs.lua rename to config/shared/gangs.lua diff --git a/data/items.lua b/config/shared/items.lua similarity index 100% rename from data/items.lua rename to config/shared/items.lua diff --git a/data/jobs.lua b/config/shared/jobs.lua similarity index 100% rename from data/jobs.lua rename to config/shared/jobs.lua diff --git a/data/locations.lua b/config/shared/locations.lua similarity index 100% rename from data/locations.lua rename to config/shared/locations.lua diff --git a/data/vehicles.lua b/config/shared/vehicles.lua similarity index 100% rename from data/vehicles.lua rename to config/shared/vehicles.lua diff --git a/data/weapons.lua b/config/shared/weapons.lua similarity index 100% rename from data/weapons.lua rename to config/shared/weapons.lua diff --git a/server/groups.lua b/server/groups.lua index 25f6f7f47..384f20c9d 100644 --- a/server/groups.lua +++ b/server/groups.lua @@ -5,10 +5,10 @@ GroupType = { } ---@type table -local jobs = require 'data.jobs' +local jobs = require 'config.shared.jobs' ---@type table -local gangs = require 'data.gangs' +local gangs = require 'config.shared.gangs' ---Adds or overwrites jobs in shared/jobs.lua ---@param newJobs table diff --git a/shared/main.lua b/shared/main.lua index b3195195f..5b36bfc76 100644 --- a/shared/main.lua +++ b/shared/main.lua @@ -1,8 +1,8 @@ local qbShared = {} qbShared.ForceJobDefaultDutyAtLogin = true -- true: Force duty state to jobdefaultDuty | false: set duty state from database last saved -qbShared.Locations = require 'data.locations' -qbShared.Vehicles = require 'data.vehicles' -qbShared.Weapons = require 'data.weapons' +qbShared.Locations = require 'config.shared.locations' +qbShared.Vehicles = require 'config.shared.vehicles' +qbShared.Weapons = require 'config.shared.weapons' ---@type table qbShared.VehicleHashes = {}