From 89858c6d73a92fd2126c37b58e086717f409bd74 Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:10:19 -0500 Subject: [PATCH] Cache and entities update added cache system similar to others that are readily available. Included beginings of reworked rebound entities --- init.lua | 5 +- lib/cache/client/cache.lua | 40 ++++ lib/cache/server/cache.lua | 0 lib/cache/shared/cache.lua | 73 +++++++ lib/entities/client/client_entity.lua | 200 ++++++++++++++++++ lib/entities/client/client_entity_actions.lua | 101 +++++++++ lib/entities/client/entity_base.lua | 51 ----- lib/entities/client/entity_object.lua | 71 ------- lib/entities/server/entity_relay.lua | 46 ---- lib/entities/server/server_entity.lua | 100 +++++++++ lib/init.lua | 8 +- lib/utility/client/utility.lua | 4 +- lib/utility/shared/la.lua | 12 +- lib/utility/shared/rebound_entities.lua | 2 +- .../shared/rebound_entitiy_actions.lua | 64 +++--- unit_tests/cache_test.lua | 19 ++ 16 files changed, 589 insertions(+), 207 deletions(-) create mode 100644 lib/cache/client/cache.lua create mode 100644 lib/cache/server/cache.lua create mode 100644 lib/cache/shared/cache.lua create mode 100644 lib/entities/client/client_entity.lua create mode 100644 lib/entities/client/client_entity_actions.lua delete mode 100644 lib/entities/client/entity_base.lua delete mode 100644 lib/entities/client/entity_object.lua delete mode 100644 lib/entities/server/entity_relay.lua create mode 100644 lib/entities/server/server_entity.lua create mode 100644 unit_tests/cache_test.lua diff --git a/init.lua b/init.lua index a13bd78..7de247a 100644 --- a/init.lua +++ b/init.lua @@ -68,6 +68,7 @@ Bridge.RegisterModule("ReboundEntities", cLib.ReboundEntities) Bridge.RegisterModule("LA", cLib.LA) Bridge.RegisterModule("Perlin", cLib.Perlin) Bridge.RegisterModule("Actions", cLib.Actions) +Bridge.RegisterModule("Cache", cLib.Cache) exports('Bridge', function() @@ -83,6 +84,7 @@ Bridge.RegisterModule("Logs", cLib.Logs) Bridge.RegisterModule("ItemsBuilder", cLib.ItemsBuilder) Bridge.RegisterModule("LootTables", cLib.LootTables) Bridge.RegisterModule("Version", Version) +Bridge.RegisterModule("ServerEntity", cLib.ServerEntity) -- ▄▀▀ █ █ ██▀ █▄ █ ▀█▀ @@ -111,7 +113,8 @@ Bridge.RegisterModule("PlaceableObject", cLib.PlaceableObject) Bridge.RegisterModule("Point", cLib.Point) Bridge.RegisterModule("Object", cLib.Object) Bridge.RegisterModule("Particle", cLib.Particle) - +Bridge.RegisterModule("ClientEntity", cLib.ClientEntity) +Bridge.RegisterModule("ClientEntityActions", cLib.ClientEntityActions) -- Fill the bridge tables with player data. function FillBridgeTables() diff --git a/lib/cache/client/cache.lua b/lib/cache/client/cache.lua new file mode 100644 index 0000000..add0124 --- /dev/null +++ b/lib/cache/client/cache.lua @@ -0,0 +1,40 @@ +Cache = Cache or Require("lib/cache/shared/cache.lua") + +-- Comparison functions for client-side state +local function GetPed() + return PlayerPedId() +end + +local function GetVehicle() + local ped = Cache.Get("Ped") -- Use cached ped for efficiency + if not ped then return end -- Or handle error/default case + return GetVehiclePedIsIn(ped, false) +end + +local function GetVehicleSeat() + local vehicle = Cache.Get("Vehicle") + if not vehicle then return end + local ped = Cache.Get("Ped") + if not ped then return end + for i = -1, GetVehicleMaxNumberOfPassengers(vehicle) - 1 do + if ped == GetPedInVehicleSeat(vehicle, i) then + return i + end + end +end + +local function GetWeapon() + local ped = Cache.Get("Ped") + if not ped then return end -- Return unarmed hash if no ped + return GetSelectedPedWeapon(ped) +end + +AddEventHandler('onResourceStart', function(resource) + if resource ~= GetCurrentResourceName() then return end + Cache.Create("Ped", GetPed, 1000) -- Check ped every second (adjust as needed) + Cache.Create("Vehicle", GetVehicle, 500) -- Check vehicle every 500ms + Cache.Create("Seat", GetVehicleSeat, 500) -- Check if in vehicle every 500ms + Cache.Create("Weapon", GetWeapon, 250) -- Check weapon every 250ms +end) + +return Cache \ No newline at end of file diff --git a/lib/cache/server/cache.lua b/lib/cache/server/cache.lua new file mode 100644 index 0000000..e69de29 diff --git a/lib/cache/shared/cache.lua b/lib/cache/shared/cache.lua new file mode 100644 index 0000000..df2ee0e --- /dev/null +++ b/lib/cache/shared/cache.lua @@ -0,0 +1,73 @@ +Cache = {} +Cache.Caches = {} + +Cache.LoopRunning = false + +local max = 5000 +local function StartLoop() + if Cache.LoopRunning then return end + Cache.LoopRunning = true + CreateThread(function() + while Cache.LoopRunning do + local now = GetGameTimer() + local minWait = nil + local caches = Cache.Caches + for name, cache in pairs(caches) do + if cache.Compare then + cache.LastChecked = cache.LastChecked or now + cache.WaitTime = cache.WaitTime or max + local elapsed = now - cache.LastChecked + local remaining = cache.WaitTime - elapsed + if remaining <= 0 then + local oldValue = cache.Value + cache.Value = cache.Compare() + if cache.Value ~= oldValue and cache.OnChange then + for _, onChange in pairs(cache.OnChange) do + onChange(cache.Value, oldValue) + end + end + cache.LastChecked = now + remaining = cache.WaitTime + end + if not minWait or remaining < minWait then + minWait = remaining + if minWait <= 0 then break end + end + end + end + if minWait then + Wait(math.max(0, minWait)) + else + Wait(max) + end + end + end) +end + +function Cache.Create(name, compare, waitTime) + Cache.Caches[name] = Cache.Caches[name] or {} + Cache.Caches[name].WaitTime = waitTime or max + Cache.Caches[name].Compare = compare + Cache.Caches[name].OnChange = Cache.Caches[name].OnChange or {} + Cache.Caches[name].Value = compare() + print("Cache created: " .. name .. " with initial value: " .. tostring(Cache.Caches[name].Value)) + for _, onChange in pairs(Cache.Caches[name].OnChange) do + onChange(Cache.Caches[name].Value, nil) + end + return StartLoop() +end + +function Cache.Get(name) + local cache = Cache.Caches[name] + return cache and cache.Value or nil +end + +function Cache.OnChange(name, onChange) + local cache = Cache.Caches[name] + assert(cache, "Cache with name '" .. name .. "' does not exist.") + table.insert(cache.OnChange, onChange) +end + +return Cache + + diff --git a/lib/entities/client/client_entity.lua b/lib/entities/client/client_entity.lua new file mode 100644 index 0000000..ec2f54a --- /dev/null +++ b/lib/entities/client/client_entity.lua @@ -0,0 +1,200 @@ +Utility = Utility or Require("lib/utility/client/utility.lua") +Ids = Ids or Require("lib/utility/shared/ids.lua") +Point = Point or Require("lib/points/client/points.lua") +ClientEntityActions = ClientEntityActions or Require("lib/entities/client/client_entity_actions.lua") -- Added + +local Entities = {} -- Stores entity data received from server +ClientEntity = {} -- Renamed from BaseEntity + +local function SpawnEntity(entityData) + entityData = entityData and entityData.args + if entityData.spawned and DoesEntityExist(entityData.spawned) then return end -- Already spawned + -- for k, v in pairs(entityData.args) do + -- print(string.format("SpawnEntity %s: %s", k, v)) + -- end + local model = entityData.model and type(entityData.model) == 'string' and GetHashKey(entityData.model) or entityData.model + if not Utility.LoadModel(model) then + print(string.format("[ClientEntity] Failed to load model %s for entity %s", entityData.model, entityData.id)) + return + end + + local entity = nil + local coords = entityData.coords + local rotation = entityData.rotation + + if entityData.entityType == 'object' then + entity = CreateObject(model, coords.x, coords.y, coords.z, false, false, false) + SetEntityRotation(entity, rotation.x, rotation.y, rotation.z, 2, true) + elseif entityData.entityType == 'ped' then + entity = CreatePed(4, model, coords.x, coords.y, coords.z, type(rotation) == 'number' and rotation or rotation.z, false, false) + -- Apply ped specific settings from entityData.meta if needed + elseif entityData.entityType == 'vehicle' then + entity = CreateVehicle(model, coords.x, coords.y, coords.z, type(rotation) == 'number' and rotation or rotation.z, false, false) + -- Apply vehicle specific settings from entityData.meta if needed + else + print(string.format("[ClientEntity] Unknown entity type '%s' for entity %s", entityData.entityType, entityData.id)) + end + if entity then + entityData.spawned = entity + SetModelAsNoLongerNeeded(model) + SetEntityAsMissionEntity(entity, true, true) -- Keep entity from being deleted by game engine + FreezeEntityPosition(entity, entityData.freeze or false) -- Optional freeze based on meta + if entityData.OnSpawn and type(entityData.OnSpawn) == 'function' then + entityData.OnSpawn(entityData) + end + -- print(string.format("[ClientEntity] Spawned %s entity %s (GameID: %s)", entityData.entityType, entityData.id, entity)) + else + SetModelAsNoLongerNeeded(model) + end +end + +local function RemoveEntity(entityData) + entityData = entityData and entityData.args + if not entityData then return end -- Added safety check + + ClientEntityActions.StopAction(entityData.id) -- Stop any ongoing action before despawning + + if entityData.spawned and DoesEntityExist(entityData.spawned) then + local entityHandle = entityData.spawned + entityData.spawned = nil -- Clear handle first + SetEntityAsMissionEntity(entityHandle, false, false) -- Allow game engine to delete if needed, though we delete manually + DeleteEntity(entityHandle) + -- print(string.format("[ClientEntity] Removed %s entity %s (GameID: %s)", entityData.entityType, entityData.id, entityHandle)) + end + if entityData.OnRemove and type(entityData.OnRemove) == 'function' then + entityData.OnRemove(entityData) + end +end + +--- Registers an entity received from the server and sets up proximity spawning. +-- @param entityData table Data received from the server via 'community_bridge:client:CreateEntity' +function ClientEntity.Register(entityData) + if Entities[entityData.id] then return end -- Already registered + + Entities[entityData.id] = entityData + -- print(string.format("[ClientEntity] Registering %s entity %s", entityData.entityType, entityData.id)) + + -- Use Point system for proximity checks + Point.Register(entityData.id, entityData.coords, entityData.spawnDistance or 50.0, entityData, SpawnEntity, RemoveEntity, function() end) +end + +--- Unregisters an entity and removes it from the world if spawned. +-- @param id string|number The ID of the entity to unregister. +function ClientEntity.Unregister(id) + local entityData = Entities[id] + if not entityData then return end + + -- print(string.format("[ClientEntity] Unregistering entity %s", id)) + Point.Remove(id) -- Remove from proximity checks (this will call RemoveEntity if currently in range) + RemoveEntity(entityData) -- Ensure it's removed even if Point.Remove didn't trigger it + Entities[id] = nil +end + +--- Updates the data for a registered entity. +-- @param id string|number The ID of the entity to update. +-- @param data table The data fields to update. +function ClientEntity.Update(id, data) + local entityData = Entities[id] + print(string.format("[ClientEntity] Updating entity %s", id)) + if not entityData then return end + + local needsPointUpdate = false + for key, value in pairs(data) do + if key == 'coords' and #(entityData.coords - value) > 0.1 then + print(string.format("[ClientEntity] Updating coords for entity %s", id)) + needsPointUpdate = true + end + if key == 'spawnDistance' and entityData.spawnDistance ~= value then + needsPointUpdate = true + end + entityData[key] = value + end + + -- If entity is currently spawned, apply updates + if entityData.spawned and DoesEntityExist(entityData.spawned) then + if data.coords then + SetEntityCoords(entityData.spawned, entityData.coords.x, entityData.coords.y, entityData.coords.z, false, false, false, true) + end + if data.rotation then + if entityData.entityType == 'object' then + SetEntityRotation(entityData.spawned, entityData.rotation.x, entityData.rotation.y, entityData.rotation.z, 2, true) + else -- Ped/Vehicle heading + SetEntityHeading(entityData.spawned, type(entityData.rotation) == 'number' and entityData.rotation or entityData.rotation.z) + end + end + if data.freeze ~= nil then + FreezeEntityPosition(entityData.spawned, data.freeze) + end + -- Add other updatable properties as needed + end + + -- Update Point registration if coords or distance changed + if needsPointUpdate then + Point.Remove(id) + Point.Register( + entityData.id, + entityData.coords, + entityData.spawnDistance or 50.0, + SpawnEntity, + RemoveEntity, + nil, + entityData + ) + end + + if entityData.OnUpdate and type(entityData.OnUpdate) == 'function' then + entityData.OnUpdate(entityData, data) + end +end + +function ClientEntity.Get(id) + return Entities[id] +end + +function ClientEntity.GetAll() + return Entities +end + +-- Network Event Handlers +RegisterNetEvent("community_bridge:client:CreateEntity", function(entityData) + ClientEntity.Register(entityData) +end) + +RegisterNetEvent("community_bridge:client:DeleteEntity", function(id) + ClientEntity.Unregister(id) +end) + +RegisterNetEvent("community_bridge:client:UpdateEntity", function(id, data) + ClientEntity.Update(id, data) +end) + +-- New handler for entity actions +RegisterNetEvent("community_bridge:client:TriggerEntityAction", function(entityId, actionName, ...) + local entityData = Entities[entityId] + -- Check if entity exists locally AND is currently spawned + if entityData and entityData.spawned and DoesEntityExist(entityData.spawned) then + local actionFunc = ClientEntityActions[actionName] + if actionFunc and type(actionFunc) == 'function' then + -- print(string.format("[ClientEntity] Executing action '%s' for entity %s", actionName, entityId)) + actionFunc(entityData, ...) -- Pass entityData and any additional arguments + else + print(string.format("[ClientEntity] Received unknown action '%s' for entity %s", actionName, entityId)) + end + -- else + -- Optional: Log if action received but entity not spawned locally + -- print(string.format("[ClientEntity] Received action '%s' for entity %s, but entity not spawned locally.", actionName, entityId)) + end +end) + +-- Resource Stop Cleanup +AddEventHandler('onResourceStop', function(resourceName) + if resourceName == GetCurrentResourceName() then + for id, entityData in pairs(Entities) do + Point.Remove(id) -- Clean up point registration + RemoveEntity(entityData) -- Clean up spawned game entity + end + Entities = {} -- Clear local cache + end +end) + +return ClientEntity diff --git a/lib/entities/client/client_entity_actions.lua b/lib/entities/client/client_entity_actions.lua new file mode 100644 index 0000000..e25d2dd --- /dev/null +++ b/lib/entities/client/client_entity_actions.lua @@ -0,0 +1,101 @@ +local LA = LA or Require("lib/utility/shared/la.lua") +local ActionThreads = {} -- Store running action threads { [entityId] = thread } + +ClientEntityActions = {} + +--- Makes a ped entity walk to specified coordinates. +-- @param entityData table The entity data containing the spawned ped handle. +-- @param coords vector3 The target coordinates. +-- @param speed number Movement speed. +-- @param timeout number Timeout in ms. +function ClientEntityActions.WalkTo(entityData, coords, speed, timeout) + local entity = entityData.spawned + if not entity or not DoesEntityExist(entity) or not IsEntityAPed(entity) then return end + + -- Clear any existing task for this entity + if ActionThreads[entityData.id] then + -- Potentially stop the old thread if needed, depending on desired behavior + ClearPedTasks(entity) + end + + local thread = CreateThread(function() + TaskGoToCoordAnyMeans(entity, coords.x, coords.y, coords.z, speed or 1.0, 0, false, 786603, timeout or -1) + -- Wait until task is completed or entity is despawned + while GetScriptTaskStatus(entity, 288358301) ~= 7 and entityData.spawned == entity and DoesEntityExist(entity) do + Wait(500) + end + ActionThreads[entityData.id] = nil -- Clear thread reference when done/stopped + end) + ActionThreads[entityData.id] = thread +end + +--- Lerps an entity's position over time. +-- @param entityData table The entity data containing the spawned entity handle. +-- @param targetCoords vector3 The target coordinates. +-- @param duration number Duration of the lerp in milliseconds. +-- @param easingType string (Optional) Easing function name from LA library (e.g., "linear", "sine"). +-- @param easingDirection string (Optional) "in", "out", or "inout". +function ClientEntityActions.LerpTo(entityData, targetCoords, duration, easingType, easingDirection) + local entity = entityData.spawned + if not entity or not DoesEntityExist(entity) then return end + + local startCoords = GetEntityCoords(entity) + local startTime = GetGameTimer() + easingType = easingType or "linear" + easingDirection = easingDirection or "inout" + + -- Clear any existing lerp for this entity + if ActionThreads[entityData.id] then + -- Stop the old thread if needed + end + + local thread = CreateThread(function() + while GetGameTimer() < startTime + duration do + -- Check if entity still exists and is the same one we started with + if not entityData.spawned or entityData.spawned ~= entity or not DoesEntityExist(entity) then + break -- Stop if entity despawned or changed + end + + local elapsed = GetGameTimer() - startTime + local t = LA.Clamp(elapsed / duration, 0.0, 1.0) + local easedT = LA.EaseInOut(t, easingType) -- Default to EaseInOut if direction not specified or invalid + + if easingDirection == "in" then + easedT = LA.EaseIn(t, easingType) + elseif easingDirection == "out" then + easedT = LA.EaseOut(t, easingType) + end + + local currentPos = LA.LerpVector(startCoords, targetCoords, easedT) + SetEntityCoordsNoOffset(entity, currentPos.x, currentPos.y, currentPos.z, false, false, false) + Wait(0) + end + + -- Ensure final position if completed fully + if entityData.spawned == entity and DoesEntityExist(entity) then + SetEntityCoordsNoOffset(entity, targetCoords.x, targetCoords.y, targetCoords.z, false, false, false) + end + ActionThreads[entityData.id] = nil -- Clear thread reference + end) + ActionThreads[entityData.id] = thread +end + +--- Stops any ongoing action for a specific entity. +-- @param entityId string|number The ID of the entity. +function ClientEntityActions.StopAction(entityId) + if ActionThreads[entityId] then + -- Stopping Lua threads directly isn't safe/possible. + -- Instead, rely on checks within the thread loops (e.g., entityData.spawned check) + -- For peds, we can clear tasks. + local entityData = ClientEntity.Get(entityId) -- Assumes ClientEntity is accessible or passed in + if entityData and entityData.spawned and DoesEntityExist(entityData.spawned) then + if IsEntityAPed(entityData.spawned) then + ClearPedTasks(entityData.spawned) + end + -- Other entity types might need different stop logic if applicable + end + ActionThreads[entityId] = nil -- Clear reference to let the thread terminate naturally + end +end + +return ClientEntityActions diff --git a/lib/entities/client/entity_base.lua b/lib/entities/client/entity_base.lua deleted file mode 100644 index 1ac6022..0000000 --- a/lib/entities/client/entity_base.lua +++ /dev/null @@ -1,51 +0,0 @@ --- Objects -Utility = Utility or Require("lib/utility/client/utility.lua") -Ids = Ids or Require("lib/utility/shared/ids.lua") -Point = Point or Require("lib/points/client/points.lua") - -local Entities = {} -BaseEntity = {} - -function BaseEntity.Create(id, model, coords, rotation, meta) - local self = meta or {} - if id and type(id) == "table" then - self = id - self.id = id.id or Ids.CreateUniqueId(Entities) - self.rotation = id.rotation or vector3(0.0, 0.0, 0.0) - else - self.id = id or Ids.CreateUniqueId(Entities) - self.model = model - self.coords = coords - self.rotation = rotation or vector3(0.0, 0.0, 0.0) - end - assert(self.id, "ID Failed to generate") - assert(self.model, "Model is required for entity creation") - assert(self.coords, "Coords are required for entity creation") - - self.Spawn = self.Spawn or function() end - self.Remove = self.Remove or function() end - - return Point.Register(self.id, self.coords, 50.0, self.Spawn, self.Remove, nil, self) -end - -function BaseEntity.GetAll() - return Entities -end - -function BaseEntity.Get(id) - return Entities[id] -end - -function BaseEntity.Add(self) - Entities[self.id] = self -end - -function BaseEntity.Remove(id) - Entities[id] = nil -end - -function BaseEntity.LoadModel(model) - return Utility.LoadModel(model) -end - -return BaseEntity \ No newline at end of file diff --git a/lib/entities/client/entity_object.lua b/lib/entities/client/entity_object.lua deleted file mode 100644 index ab6ee2d..0000000 --- a/lib/entities/client/entity_object.lua +++ /dev/null @@ -1,71 +0,0 @@ -BaseEntity = BaseEntity or Require("lib/entities/client/entity_base.lua") -local Objects = {} - -Object = {} - -function Object.Create(id, model, coords, rotation, meta) - local base = meta or {} - if id and type(id) == "table" then - base = id - base.id = id.id or Ids.CreateUniqueId(Objects) - base.rotation = id.rotation or vector3(0.0, 0.0, 0.0) - else - base.id = id or Ids.CreateUniqueId(Objects) - base.model = model - base.coords = coords - base.rotation = rotation or vector3(0.0, 0.0, 0.0) - end - assert(base.id, "ID Failed to generate") - assert(base.model, "Model is required for entity creation") - assert(base.coords, "Coords are required for entity creation") - - base.Spawn = function(self) - print("Spawning object", self) - if not BaseEntity.LoadModel(self.model) then return end - self.entity = CreateObject(self.model, self.coords.x, self.coords.y, self.coords.z, false, false, false) - SetEntityRotation(self.entity, self.rotation.x, self.rotation.y, self.rotation.z, 2, false) - SetEntityAsMissionEntity(self.entity, true, true) - SetModelAsNoLongerNeeded(self.model) - if self.OnSpawn then self.OnSpawn(self, self.entity, self.coords, self.rotation) end - return self.entity - end - base.Remove = function(self) - DeleteEntity(self.entity) - if self.OnRemove then self.OnRemove(self, self.entity) end - self.entity = nil - end - Object.Add(base) - return BaseEntity.Create(base) -end - -function Object.GetAll() - return Objects -end - -function Object.Get(id) - return Objects[id] -end - -function Object.Add(self) - Objects[self.id] = self -end - -function Object.Remove(id) - Objects[id] = nil -end - -function Object.SetOnSpawn(id, callback) - local obj = Object.Get(id) - if not obj then return end - obj.OnSpawn = callback - return true -end - -function Object.SetOnRemove(id, callback) - local obj = Object.Get(id) - if not obj then return end - obj.OnRemove = callback - return true -end - -return Object \ No newline at end of file diff --git a/lib/entities/server/entity_relay.lua b/lib/entities/server/entity_relay.lua deleted file mode 100644 index 5c75eb4..0000000 --- a/lib/entities/server/entity_relay.lua +++ /dev/null @@ -1,46 +0,0 @@ --- Objects -Ids = Ids or Require("lib/utility/shared/ids.lua") - -local Entities = {} -EntityRelay = {} - -function EntityRelay.Create(id, model, coords, rotation, meta) - local self = meta or {} - if id and type(id) == "table" then - self = id - self.id = id.id or Ids.CreateUniqueId(Entities) - self.rotation = id.rotation or vector3(0.0, 0.0, 0.0) - else - self.id = id or Ids.CreateUniqueId(Entities) - self.model = model - self.coords = coords - self.rotation = rotation or vector3(0.0, 0.0, 0.0) - end - assert(self.id, "ID Failed to generate") - assert(self.model, "Model is required for entity creation") - assert(self.coords, "Coords are required for entity creation") - EntityRelay.Add(self) - TriggerClientEvent(GetCurrentResourceName() .. "client:CreateEntity", -1, self) -end - -function EntityRelay.GetAll() - return Entities -end - -function EntityRelay.Get(id) - return Entities[id] -end - -function EntityRelay.Add(self) - Entities[self.id] = self -end - -function EntityRelay.Remove(id) - Entities[id] = nil -end - -function EntityRelay.LoadModel(model) - return Utility.LoadModel(model) -end - -return EntityRelay \ No newline at end of file diff --git a/lib/entities/server/server_entity.lua b/lib/entities/server/server_entity.lua new file mode 100644 index 0000000..663c556 --- /dev/null +++ b/lib/entities/server/server_entity.lua @@ -0,0 +1,100 @@ +Ids = Ids or Require("lib/utility/shared/ids.lua") + +local Entities = {} +ServerEntity = {} -- Renamed from EntityRelay + +--- Creates a server-side representation of an entity and notifies clients. +-- @param entityType string 'object', 'ped', or 'vehicle' +-- @param model string|number +-- @param coords vector3 +-- @param rotation vector3|number Heading for peds/vehicles, rotation for objects +-- @param meta table Optional additional data +-- @return table The created entity data +function ServerEntity.Create(id, entityType, model, coords, rotation, meta) + local self = meta or {} + self.id = id or Ids.CreateUniqueId(Entities) + self.entityType = entityType + self.model = model + self.coords = coords + self.rotation = rotation or (entityType == 'object' and vector3(0.0, 0.0, 0.0) or 0.0) -- Default rotation or heading + self.resource = GetInvokingResource() + + assert(self.id, "ID Failed to generate") + assert(self.entityType, "EntityType is required") + assert(self.model, "Model is required for entity creation") + assert(self.coords, "Coords are required for entity creation") + + ServerEntity.Add(self) + TriggerClientEvent("community_bridge:client:CreateEntity", -1, self) + return self +end + +--- Deletes a server-side entity representation and notifies clients. +-- @param id string|number The ID of the entity to delete. +function ServerEntity.Delete(id) + if Entities[id] then + ServerEntity.Remove(id) + TriggerClientEvent("community_bridge:client:DeleteEntity", -1, id) + end +end + +--- Updates data for a server-side entity and notifies clients. +-- @param id string|number The ID of the entity to update. +-- @param data table The data fields to update. +function ServerEntity.Update(id, data) + local entity = Entities[id] + print("Updating entity: ", id, entity) + if not entity then return false end + + for key, value in pairs(data) do + entity[key] = value + end + TriggerClientEvent("community_bridge:client:UpdateEntity", -1, id, data) + return true +end + +--- Triggers a specific action on the client-side entity. +-- Clients will only execute the action if the entity is currently spawned for them. +-- @param entityId string|number The ID of the entity. +-- @param actionName string The name of the action to trigger (must match a function in ClientEntityActions). +-- @param ... any Additional arguments for the action function. +function ServerEntity.TriggerAction(entityId, actionName, ...) + local entity = Entities[entityId] + if not entity then + print(string.format("[ServerEntity] Attempted to trigger action '%s' on non-existent entity %s", actionName, entityId)) + return + end + TriggerClientEvent("community_bridge:client:TriggerEntityAction", -1, entityId, actionName, ...) +end + +function ServerEntity.GetAll() + return Entities +end + +function ServerEntity.Get(id) + return Entities[id] +end + +function ServerEntity.Add(self) + Entities[self.id] = self +end + +function ServerEntity.Remove(id) + Entities[id] = nil +end + +-- Clean up entities associated with a stopped resource +AddEventHandler('onResourceStop', function(resourceName) + local toDelete = {} + for id, entity in pairs(Entities) do + if entity.resource == resourceName then + table.insert(toDelete, id) + end + end + for _, id in pairs(toDelete) do + ServerEntity.Delete(id) + end +end) + + +return ServerEntity diff --git a/lib/init.lua b/lib/init.lua index 408f616..7d8cc5a 100644 --- a/lib/init.lua +++ b/lib/init.lua @@ -45,7 +45,7 @@ cLib = { Math = Math or Require("lib/utility/shared/math.lua"), LA = LA or Require("lib/utility/shared/la.lua"), Perlin = Perlin or Require("lib/utility/shared/perlin.lua"), - -- Actions = Actions or Require("lib/shared/actions.lua"), + -- Action = Action or Require("lib/entities/shared/actions.lua"), } exports('cLib', cLib) @@ -56,6 +56,8 @@ 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.ServerEntity = ServerEntity or Require("lib/entities/server/server_entity.lua") if IsDuplicityVersion() then return cLib end ::client:: @@ -68,6 +70,8 @@ cLib.PlaceableObject = PlaceableObject or Require("lib/placers/client/placeable_ cLib.Raycast = Raycast or Require("lib/raycast/client/raycast.lua") cLib.Point = Point or Require("lib/points/client/points.lua") cLib.Particle = Particle or Require("lib/particles/client/particles.lua") -cLib.Object = Object or Require("lib/entities/client/entity_object.lua") +cLib.Cache = Cache or Require("lib/cache/client/cache.lua") +cLib.ClientEntity = ClientEntity or Require("lib/entities/client/client_entity.lua") +cLib.ClientEntityActions = ClientEntityActions or Require("lib/entities/client/client_entity_actions.lua") return cLib \ No newline at end of file diff --git a/lib/utility/client/utility.lua b/lib/utility/client/utility.lua index 2b7f62f..7fbf233 100644 --- a/lib/utility/client/utility.lua +++ b/lib/utility/client/utility.lua @@ -125,7 +125,7 @@ end ---@param model string | number ---@return boolean Utility.LoadModel = function(model) - if type(model) ~= 'number' then model = joaat(model) end + if type(model) ~= 'number' then model = GetHashKey(model) end -- Use GetHashKey instead of joaat for client if not IsModelValid(model) and not IsModelInCdimage(model) then return false end RequestModel(model) local count = 0 @@ -301,7 +301,7 @@ end ---@param model string | number ---@return number Utility.GetEntityHashFromModel = function(model) - if type(model) ~= 'number' then model = joaat(model) end + if type(model) ~= 'number' then model = GetHashKey(model) end -- Use GetHashKey instead of joaat for client return model end diff --git a/lib/utility/shared/la.lua b/lib/utility/shared/la.lua index 2539807..ff71cff 100644 --- a/lib/utility/shared/la.lua +++ b/lib/utility/shared/la.lua @@ -258,7 +258,7 @@ LA.EaseVector = function(inout, a, b, t, easingType) elseif inout == "inout" then return LA.EaseInOutVector(a, b, t, easingType) end - Assert(false, "Invalid type") + assert(false, "Invalid type") end LA.EaseOnAxis = function(inout, a, b, t, easingType, axis) @@ -293,15 +293,15 @@ LA.DistanceCheck = function(pointA, pointB) end LA.Chance = function(chance) - Assert(chance, "Chance must be passed") - Assert(type(chance) == "number", "Chance must be a number") - Assert(chance >= 0 and chance <= 100, "Chance must be between 0 and 100") + assert(chance, "Chance must be passed") + assert(type(chance) == "number", "Chance must be a number") + assert(chance >= 0 and chance <= 100, "Chance must be between 0 and 100") return math.random(1, 100) <= chance end LA.Vector4To3 = function(vector4) - Assert(vector4, "Vector4 must be passed") - Assert(type(vector4) == "vector4", "Vector4 must be a vector4") + assert(vector4, "Vector4 must be passed") + assert(type(vector4) == "vector4", "Vector4 must be a vector4") return vector3(vector4.x, vector4.y, vector4.z), vector4.w end diff --git a/lib/utility/shared/rebound_entities.lua b/lib/utility/shared/rebound_entities.lua index c1f3c26..ff4fc05 100644 --- a/lib/utility/shared/rebound_entities.lua +++ b/lib/utility/shared/rebound_entities.lua @@ -175,7 +175,7 @@ if isServer then return ReboundEntities end function ReboundEntities.LoadModel(model) assert(model, "Model is nil") - model = type(model) == "number" and model or GetHashKey(model) + model = type(model) == "number" and model or GetHashKey(model) -- Corrected to GetHashKey RequestModel(model) for i = 1, 100 do if HasModelLoaded(model) then return model end diff --git a/lib/utility/shared/rebound_entitiy_actions.lua b/lib/utility/shared/rebound_entitiy_actions.lua index 552bd8f..78bee35 100644 --- a/lib/utility/shared/rebound_entitiy_actions.lua +++ b/lib/utility/shared/rebound_entitiy_actions.lua @@ -1,35 +1,45 @@ --- local ReboundEntities = ReboundEntities or Require("shared/rebound_entities.lua") --- local Actions = Actions or Require("shared/actions.lua") --- local LA = LA or Require("shared/la.lua") +local ReboundEntities = ReboundEntities or Require("lib/utility/shared/rebound_entities.lua") -- Fixed path +local Action = Action or Require("lib/entities/shared/actions.lua") -- Fixed path and name +local LA = LA or Require("lib/utility/shared/la.lua") -- Fixed path --- REA = {} +REA = {} --- if not IsDuplicityVersion() then goto client end +if not IsDuplicityVersion() then goto client end --- if IsDuplicityVersion() then return end --- ::client:: +if IsDuplicityVersion() then return end +::client:: --- local ActionsInProgress = {} +local ActionsInProgress = {} --- Action.Create("LerpToPosition", function(reboundId, start, position, duration, shouldRepeat, overrideStartTime) --- local re = ReboundEntities.Get(reboundId) --- assert(re, "Rebound entity not found") --- local entity = re and re.entity --- if not entity then return end --- local startTime = GetGameTimer() --- local endTime = overrideStartTime or startTime + duration --- ActionsInProgress[reboundId] = {reboundId, start, position, duration, shouldRepeat, startTime} --- local t = 0 --- CreateThread(function() --- while shouldRepeat or t < 1 do --- t = (GetGameTimer() - startTime) / duration --- local lerpPosition = LA.LerpVector(start, position, t) --- SetEntityCoords(entity, lerpPosition) --- Wait(0) - --- end --- end) --- end) +Action.Create("LerpToPosition", function(reboundId, start, position, duration, shouldRepeat, overrideStartTime) + local re = ReboundEntities.GetById(reboundId) -- Use GetById + assert(re, "Rebound entity not found") + local entity = re and re.entity + if not entity or not DoesEntityExist(entity) then return end -- Check existence + local startTime = GetGameTimer() + local endTime = overrideStartTime or startTime + duration + ActionsInProgress[reboundId] = {reboundId, start, position, duration, shouldRepeat, startTime} + local t = 0 + CreateThread(function() + while shouldRepeat or t < 1 do + -- Check if entity still exists + if not re.entity or not DoesEntityExist(re.entity) then + ActionsInProgress[reboundId] = nil + break + end + entity = re.entity -- Update entity handle in case it changed (unlikely but safe) + t = (GetGameTimer() - startTime) / duration + local lerpPosition = LA.LerpVector(start, position, t) + SetEntityCoordsNoOffset(entity, lerpPosition.x, lerpPosition.y, lerpPosition.z, false, false, false) -- Use NoOffset + Wait(0) + end + -- Set final position if not repeating + if not shouldRepeat and re.entity and DoesEntityExist(re.entity) then + SetEntityCoordsNoOffset(re.entity, position.x, position.y, position.z, false, false, false) + end + ActionsInProgress[reboundId] = nil -- Clear when done + end) +end) diff --git a/unit_tests/cache_test.lua b/unit_tests/cache_test.lua new file mode 100644 index 0000000..c144bca --- /dev/null +++ b/unit_tests/cache_test.lua @@ -0,0 +1,19 @@ +AddEventHandler('onResourceStart', function(resource) + if resource == GetCurrentResourceName() then + Bridge.Cache.OnChange("Ped", function(newValue, oldValue) + print("Ped changed from " .. tostring(oldValue) .. " to " .. tostring(newValue)) + end) + end +end) + + +RegisterCommand("testcache", function(source, args, rawCommand) + -- local cache = Bridge.Cache.Get("Ped") + Bridge.Cache.Create("TestCache", function() + return math.random(1, 100) + end, 1000) + + Bridge.Cache.OnChange("TestCache", function(newValue, oldValue) + print("TestCache changed from " .. tostring(oldValue) .. " to " .. tostring(newValue)) + end) +end) \ No newline at end of file