refactor!: move shared to data

Qbox-project · Aug 19, 2024 · acc885b · acc885b
1 parent 81390de
commit acc885b
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 14 deletions.
diff --git 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 'shared.items')
+convertItems(require '@ox_inventory.data.items', require 'data.items')
 
 qbCoreCompat = {}
 

diff --git a/client/groups.lua b/client/groups.lua
@@ -1,5 +1,5 @@
-local jobs = require 'shared.jobs'
-local gangs = require 'shared.gangs'
+local jobs = require 'data.jobs'
+local gangs = require 'data.gangs'
 
 ---@return table<string, Job>
 function GetJobs()

diff --git a/shared/gangs.lua → data/gangs.lua b/shared/gangs.lua → data/gangs.lua
diff --git a/shared/items.lua → data/items.lua b/shared/items.lua → data/items.lua
diff --git a/shared/jobs.lua → data/jobs.lua b/shared/jobs.lua → data/jobs.lua
diff --git a/shared/locations.lua → data/locations.lua b/shared/locations.lua → data/locations.lua
diff --git a/shared/vehicles.lua → data/vehicles.lua b/shared/vehicles.lua → data/vehicles.lua
diff --git a/shared/weapons.lua → data/weapons.lua b/shared/weapons.lua → data/weapons.lua
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -41,13 +41,8 @@ server_scripts {
 
 files {
     'modules/*.lua',
-    'shared/gangs.lua',
-    'shared/items.lua',
-    'shared/jobs.lua',
-    'shared/locations.lua',
+    'data/*.lua',
     'shared/main.lua',
-    'shared/vehicles.lua',
-    'shared/weapons.lua',
     'bridge/qb/client/functions.lua',
     'bridge/qb/client/drawtext.lua',
     'bridge/qb/client/events.lua',

diff --git a/server/groups.lua b/server/groups.lua
@@ -5,10 +5,10 @@ GroupType = {
 }
 
 ---@type table<string, Job>
-local jobs = require 'shared.jobs'
+local jobs = require 'data.jobs'
 
 ---@type table<string, Gang>
-local gangs = require 'shared.gangs'
+local gangs = require 'data.gangs'
 
 ---Adds or overwrites jobs in shared/jobs.lua
 ---@param newJobs table<string, Job>

diff --git 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 'shared.locations'
-qbShared.Vehicles = require 'shared.vehicles'
-qbShared.Weapons = require 'shared.weapons'
+qbShared.Locations = require 'data.locations'
+qbShared.Vehicles = require 'data.vehicles'
+qbShared.Weapons = require 'data.weapons'
 
 ---@type table<number, Vehicle>
 qbShared.VehicleHashes = {}