diff --git a/lib/init.lua b/lib/init.lua index ac11ae4..b95fee8 100644 --- a/lib/init.lua +++ b/lib/init.lua @@ -41,11 +41,10 @@ cLib = { Require = Require, Callback = Callback or Require("lib/callback/shared/callback.lua"), Ids = Ids or Require("lib/utility/shared/ids.lua"), - ReboundEntities = ReboundEntities or Require("lib/utility/shared/rebound_entities.lua"), Tables = Table or Require("lib/utility/shared/tables.lua"), Prints = Prints or Require("lib/utility/shared/prints.lua"), Math = Math or Require("lib/utility/shared/math.lua"), - LA = LA or Require("lib/utility/shared/la.lua"), + LA = LA or Require("lib/utility/shared/la.lua") -- Zones = Poly or Require("lib/zones/shared/zones.lua"), -- Action = Action or Require("lib/entities/shared/actions.lua"), } @@ -56,8 +55,6 @@ if not IsDuplicityVersion() then goto client end cLib.SQL = SQL or Require("lib/sql/server/sqlHandler.lua") cLib.Logs = Logs or Require("lib/logs/server/logs.lua") -cLib.ItemsBuilder = ItemsBuilder or Require("lib/generators/server/ItemsBuilder.lua") -cLib.LootTables = LootTables or Require("lib/generators/server/lootTables.lua") cLib.Cache = Cache or Require("lib/cache/shared/cache.lua") cLib.Marker = Marker or Require("lib/markers/server/server.lua") cLib.Particle = Particle or Require("lib/particles/server/particles.lua") @@ -70,11 +67,10 @@ cLib.Placeable = Placeable or Require("lib/placers/client/object_placer.lua") cLib.Utility = Utility or Require("lib/utility/client/utility.lua") cLib.PlaceableObject = ObjectPlacer or Require("lib/placers/client/placeable_object.lua") cLib.Raycast = Raycast or Require("lib/raycast/client/raycast.lua") -cLib.Point = Point or Require("lib/points/client/pointsv2.lua") +cLib.Point = Point or Require("lib/points/client/points.lua") cLib.Particle = Particle or Require("lib/particles/client/particles.lua") cLib.Cache = Cache or Require("lib/cache/client/cache.lua") cLib.ClientEntity = ClientEntity or Require("lib/entities/client/client_entity.lua") -cLib.ClientStateBag = ClientStateBag or Require("lib/statebags/client/client.lua") cLib.Marker = Marker or Require("lib/markers/client/markers.lua") cLib.Anim = Anim or Require("lib/anim/client/client.lua") cLib.Cutscene = Cutscene or Require("lib/cutscenes/client/cutscene.lua") diff --git a/lib/points/client/pointsv2.lua b/lib/points/client/points.lua similarity index 100% rename from lib/points/client/pointsv2.lua rename to lib/points/client/points.lua diff --git a/lib/utility/client/utility.lua b/lib/utility/client/utility.lua index 050a058..0ebcf95 100644 --- a/lib/utility/client/utility.lua +++ b/lib/utility/client/utility.lua @@ -3,7 +3,7 @@ local blipIDs = {} local spawnedPeds = {} Locales = Locales or Require('modules/locales/shared.lua') -Point = Point or Require('lib/points/client/pointsv2.lua') +Point = Point or Require('lib/points/client/points.lua') ---Get the hash of a model (string or number) ---@param model string|number diff --git a/modules/clothing/_default/client.lua b/modules/clothing/_default/client.lua index abd882c..47f0380 100644 --- a/modules/clothing/_default/client.lua +++ b/modules/clothing/_default/client.lua @@ -2,7 +2,7 @@ Clothing = Clothing or {} ClothingBackup = {} -Callback = Callback or Require("lib/utility/shared/callbacks.lua") +Callback = Callback or Require("lib/callback/shared/callback.lua") Ultility = Utility or Require('lib/utility/client/utility.lua') Cache = Cache or Require('lib/cache/shared/cache.lua') diff --git a/modules/clothing/_default/server.lua b/modules/clothing/_default/server.lua index c6c2d0e..312df50 100644 --- a/modules/clothing/_default/server.lua +++ b/modules/clothing/_default/server.lua @@ -1,7 +1,7 @@ ---@diagnostic disable: duplicate-set-field Clothing = Clothing or {} Clothing.LastAppearance = Clothing.LastAppearance or {} -Callback = Callback or Require("lib/utility/shared/callbacks.lua") +Callback = Callback or Require("lib/callback/shared/callback.lua") function Clothing.IsMale(src) local ped = GetPlayerPed(src)