Commit Graph
791 Commits
Author SHA1 Message Date
MrNewb 08c3d937d6 Round hunger and thirst values to nearest integer
Updated GetHunger and GetThirst functions to return rounded integer values using math.floor(value + 0.5) for consistency and to avoid floating point results.
2025-09-10 11:29:42 -04:00
MrNewb 8bf02f6372 Fix hunger and thirst status retrieval
Changed Framework.GetHunger and Framework.GetThirst to fetch the 'status' instead of 'hunger' or 'thirst' directly. This ensures the functions correctly iterate over the status table to find the relevant values.
2025-09-10 11:29:42 -04:00
MrNewb aae3d540ff Update server.lua 2025-09-10 11:29:42 -04:00
MrNewb 943f86d47b Add nil check for player data in GetStatusData
Prevents errors by returning 0 if player data is unavailable when calling Framework.GetStatusData.
2025-09-10 11:29:42 -04:00
MrNewb cfd746d889 Refactor hunger and thirst retrieval logic
Introduced Framework.GetStatusData to centralize status lookup. Updated GetHunger and GetThirst to use the new function, improving code reuse and maintainability.
2025-09-10 11:29:41 -04:00
MrNewb 87345fafce Add GetHunger and GetThirst functions to frameworks
Introduced GetHunger and GetThirst functions to client and server files for es_extended, qb-core, and qbx_core frameworks. These functions return the player's hunger and thirst values rounded to the nearest integer, improving consistency in status retrieval.
2025-09-10 11:29:41 -04:00
MrNewb 371ee19445 Merge pull request #151 from TheOrderFivem/vehicle-module
Vehicle module
2025-09-10 11:15:06 -04:00
MrNewb f472232273 Add vehicle properties system and update attributions
Introduces a comprehensive vehicle properties handler in lib/vehicles/client.lua, inspired by ESX, QB-Core, and ox_lib frameworks. Updates Attributions.md to document the new vehicle system, clarify licensing, and improve formatting. Registers Vehicles in lib/init.lua for client use.
2025-09-10 11:07:58 -04:00
MrNewb 66df77cc3f fix manifest warning 2025-09-10 10:42:15 -04:00
MrNewb 9fb5927a57 Merge pull request #150 from StrixLuca/patch-1
Update README.md
2025-09-07 09:00:34 -04:00
MrNewb de0f7b9492 Update Community Bridge Documentation link 2025-09-07 08:59:24 -04:00
StrixLuca 46574bef95 Update README.md 2025-09-06 09:30:01 +01:00
MrNewb 5b7e7bb06e Merge pull request #149 from TheOrderFivem/crowleys-branch
Crowleys branch
2025-09-04 22:32:41 -04:00
Mr.Crowley 18748bd775 Refactor entity movement and add Math.Nearest function
Simplifies entity movement logic in client_entity.lua by improving coordinate comparison and updating behavior triggers. Adds a new Math.Nearest function in math.lua to round values to the nearest whole number.
2025-09-04 11:42:59 -05:00
Mr.Crowley debfb06231 Refactor stash and targets behavior logic
Simplifies stash target assignment by returning early when registering a stash, ensuring consistent target setup. Enhances target update logic to check for removed targets and removes debug print statement.
2025-09-04 08:21:48 -05:00
MrNewb 0186815079 Merge pull request #146 from solaire-fivem/fix-issue-with-the-GetHunger-and-GetThirst-server-sided-functions
Fix issue with GetThirst and GetHunger not working in ESX
2025-09-04 04:45:49 -04:00
Solaire 18ac3ce0ca Round the result 2025-09-03 22:58:17 +01:00
Mr.Crowley 7443695254 Improve entity spawning and target behaviors
Refactored client entity spawning to handle missing models and improved coordinate update sensitivity. Removed model assertion from server entity creation. Enhanced resource start event handling for both server and client. Updated stash and target behaviors to support additional properties and better zone handling for entities without spawned objects.
2025-09-03 08:57:39 -05:00
Mr.Crowley dff4622a94 Refactor entity behavior to use Bridge.Entity
Replaces all usage of Bridge.ClientEntity and Bridge.ServerEntity with Bridge.Entity across shared behavior modules. Updates initialization in lib/init.lua to use cLib.Entity and marks cLib.ClientEntity and cLib.ServerEntity as deprecated for consistency and future maintainability.
2025-09-03 04:06:31 -05:00
Mr.Crowley cb9dbdf610 Adjust entity movement threshold and follow behavior
Increased the movement threshold for entity updates from 0.05 to 1.0 to reduce unnecessary position updates. Modified follow behavior to offset the entity's coordinates by -1 on the Z axis when updating, possibly to account for ground level or animation adjustments.
2025-09-03 01:23:01 -05:00
Mr.Crowley dd08f058c3 Refactor client entity management functions
Added freeze position handling in UpdateEntity and ensured OnDestroy behavior is triggered on entity destruction. Removed unused and commented-out Update function, and improved code clarity in Set and Destroy methods.
2025-09-03 01:04:04 -05:00
Mr.Crowley 8346130b00 Add modular entity behaviors and update entity logic
Introduces modular behaviors for entities, including anim, attach, clothing, follow, particles, scenarios, shop, stash, targets, and weapon, each in their own files. Updates client_entity.lua and behaviors.lua to support dynamic behavior registration, initialization, and triggering. Refactors entity update logic to improve movement handling and behavior invocation.
2025-09-03 00:28:17 -05:00
MrNewb facffe26c5 Merge pull request #148 from TheOrderFivem/JobCounts
Job counts
2025-09-03 01:25:02 -04:00
MrNewb 209d257f1c Merge pull request #147 from TheOrderFivem/loggs
Loggs
2025-09-03 01:13:43 -04:00
MrNewb 9c61f7967d Update callback module import paths
Changed all references from 'lib/utility/shared/callbacks.lua' to 'lib/callback/shared/callback.lua' in client and server files for framework, inventory, and phone modules to reflect new file structure or module location.

Commit#f900bc5 did not adjust these, correcting.
2025-09-01 17:05:34 -04:00
solaire-fivem 71cd1e0676 Fix issue with GetThirst and GetHunger not working in ESX 2025-09-01 14:22:03 +01:00
MrNewb 63d2f675f6 Buffer and batch Discord log messages
Introduces a queue and timer to batch log messages before sending them to Discord, reducing the number of HTTP requests. Refactors the built-in log handler to use the new queuing system and improves code consistency. Looks gross but works.
2025-09-01 03:33:29 -04:00
MrNewb e9fa5a2891 Fix type annotation for job count function
Updated the type annotation for the 'tbl' parameter in Framework.GetJobCountTotal from 'any' to 'table' for improved clarity and correctness.
2025-09-01 02:31:14 -04:00
MrNewb 7f14eef82b Refactor logging system and centralize config
Reworked the logging system to use a unified handler approach supporting built-in, qb, ox_lib, and Fivemerr log systems. Deprecated Logs.Send and Logs.Notify in favor of Logs.CreateLog. Centralized all logging configuration options in serverConfig.lua for easier management and extensibility.
2025-09-01 02:29:15 -04:00
MrNewb 014dba1012 Add job count tracking to framework
Introduces job count tracking and retrieval functions to both client and server modules. The server now maintains and updates a global state of job counts, synchronizing changes to clients. Refactors job registration logic for accuracy and consistency, and adds utility functions for total job counts and player source retrieval.

This usage with the state may be a problem on initial start for highly populated servers as 200 players load in for example...
2025-08-31 22:49:31 -04:00
MrNewb 9fdb41e9f6 Add job count management on player events
Introduces event handlers to update job counts when players load, change jobs, or unload across multiple framework modules. Ensures job count tracking stays accurate by adding or removing counts based on player actions. (would like to update this to have some client event tables?)
2025-08-31 22:49:29 -04:00
Mr.Crowley c399fbaca4 Refactor behavior and entity invocation handling
Standardizes the use of the 'invoked' property for entities and behaviors, ensuring behaviors are scoped per invoking resource. Updates behavior registration, retrieval, removal, and cleanup logic to support resource-specific behavior tables, improving modularity and preventing cross-resource conflicts.
2025-08-31 20:50:46 -05:00
MrNewb b532e33fc7 Merge pull request #145 from solaire-fivem/solaire-improving-readability
ESX: Cleanup the client and server lua files in the framework module
2025-08-31 14:33:50 -04:00
solaire-fivem f5017792e3 es_extended framework code cleanup 2025-08-31 18:41:12 +01:00
Mr.Crowley b0f5cd85a9 Add dialogue example script
Introduces a Lua script demonstrating a simple NPC dialogue interaction using Bridge.Dialogue. The script spawns a ped, opens a dialogue menu, and handles user selections with follow-up actions.
2025-08-31 03:23:09 -05:00
MrNewb c0e8b7e447 Merge pull request #144 from TheOrderFivem/crowleys-branch
prep for behaviors
2025-08-31 03:12:26 -04:00
Mr.Crowley f2ff03734e prep for behaviors
readded behaviors
2025-08-30 19:12:56 -05:00
MrNewb 26bd9e1cad Update server_entity.lua 2025-08-30 03:43:01 -04:00
MrNewb a435a4a75c Restore stash registration return values
Reverts stash registration to return a boolean and id, undoing a breaking change from commit #e06e04a. This restores compatibility with multiple resources and inventories that rely on the previous behavior. Also returning a success status on registration has many uses.
2025-08-29 23:53:44 -04:00
MrNewb 9062e5b2a8 Restore shop opening logic to pre-e06e04a behavior
Reverts breaking changes from commit #e06e04a by restoring the previous shop opening logic. This fixes compatibility issues with multiple resources that were affected by the change.
2025-08-29 23:49:59 -04:00
MrNewb ac9f0ae777 Restore legacy shop logic
Reverts shop registration to pre-commit #e06e04a behavior, removing the CreateShop function and restoring RegisterShop. This fixes breaking changes affecting multiple resources and inventories without any deprecation path.
2025-08-29 23:47:52 -04:00
MrNewb 996339f0bc Update init.lua 2025-08-28 12:47:40 -04:00
Mr.Crowley 495b24e53f fixed last mess 2025-08-27 06:13:02 -05:00
Mr.Crowley e06e04a2c6 hope this works 2025-08-27 05:47:44 -05:00
Mr.Crowley 5b6641fc60 silly me
woopsies
2025-08-24 20:02:47 -05:00
MrNewb 7693648c32 yeeeeet 2025-08-24 17:32:16 -04:00
Mr.Crowley 8c309e248e Added behaviors and documentation to oxlibs zones
Will provide file in example when more features are implimented
2025-08-23 22:53:49 -05:00
Mr.Crowley 59fa75a618 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-08-22 16:49:24 -05:00
Mr.Crowley fcd279b30a Zones compatibility
Createzone, remove zone, cleanup on resource stop, cleanup on invoked resource stop,
2025-08-22 16:49:17 -05:00
MrNewb b81ea486ff Merge pull request #142 from solaire-fivem/fix-minor-typo
Fix typo "platerData" to "playerData"
2025-08-22 17:25:43 -04:00