Commit Graph
108 Commits
Author SHA1 Message Date
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
MrNewb facffe26c5 Merge pull request #148 from TheOrderFivem/JobCounts
Job counts
2025-09-03 01:25:02 -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 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 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
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
solaire-fivem 48cba10ad2 fix minor typo, 'platerData' to 'playerData' 2025-08-22 22:08:41 +01:00
MrNewb fd3f62f288 playermetadata patch for qbx 2025-08-19 04:22:52 -04:00
MrNewb 9b2b7de2b4 fix job duty
Issue noticed by randomzz, pr did not use proper job.name so went ahead and corrected.
2025-08-17 02:32:07 -04:00
MrNewb b1556d13fb draft GetPlayerSourcesByJob 2025-08-07 00:47:51 -04:00
MrNewb 4d6958aa86 community_bridge:Server:OnPlayerJobChange
job change serverside event
2025-08-04 01:32:30 -04:00
MrNewb a280606c3d feat Framework.GetIsPlayerLoaded, locale tweaks 2025-07-10 13:50:47 -04:00
MrNewb 58ab40d14e cachedItemList 2025-07-09 22:17:24 -04:00
MrNewb 33a9b6ba69 Framework.ItemList for esx and a catchall for qbox 2025-07-09 22:08:44 -04:00
MrNewb 5dc2321d67 Remove all uses of ox_lib callbacks in favor of internal option
This seems fine, Crowley created the callback system in bridge so will need review
2025-06-28 16:52:01 -04:00
MrNewb 854482094a small tweaks 2025-06-21 07:53:49 -04:00
MrNewb 61f3f09c19 ESX.Game.SetVehicleProperties fix 2025-06-12 08:24:12 -04:00
MrNewb 50f822bf20 oops ESX.Game.SetVehicleProperties 2025-06-12 07:47:06 -04:00
MrNewb 395629af17 GetAccountBalace (client) fixed for esx
This will return the players money by type, I recommend not using this as its the client and not secure or to be trusted.
Use case is for a ui or a menu I guess?
2025-06-12 06:49:41 -04:00
MrNewb ebdaf5be94 Merge pull request #115 from harbiyelidev/dev
fix(returns): Fixed errors in many operations in the ESX Framework be…
2025-06-12 06:18:39 -04:00
MrNewb 4da73dbc48 GetAccountBalance 2025-06-11 23:15:15 -04:00
No.1 63349d32a8 fix(returns): Fixed errors in many operations in the ESX Framework because there is no return 2025-06-11 21:03:19 +03:00
MrNewb 33868c43c4 Get/Set vehicle props 2025-06-08 19:40:49 -04:00
gononono64 34d24cb6a9 Targets, entities and events, oh my!
Targets updated to have boxzone
Entities dont require a model and are effectively points with on spawn on despawn
onplayerloaded and onplayeriunloaded now pass source
2025-06-02 22:19:42 -05:00
MrNewb 3a141cb8f2 GetIsFrameworkAdmin 2025-06-01 23:12:32 -04:00
MrNewb 7fc9ee4956 docs: refine framework notes, params, and return documentation 2025-05-30 03:21:32 -04:00
MrNewb 68e81b720a should resolve start order issues 2025-05-18 23:45:37 -04:00
MrNewb 3652f2b1bd small patch for qbx when config not set 2025-05-15 11:16:37 -04:00
MrNewb 6b660d8084 feat: GetPlayerJobData
return {
        jobName = jobData.name,
        jobLabel = jobData.label,
        gradeName = jobData.grade_name,
        gradeLabel = jobData.grade_label,
        gradeRank = jobData.grade,
        boss = isBoss,
        onDuty = jobData.onduty,
    }
2025-05-14 04:48:23 -04:00
MrNewb 20c348824d fixfixfix 2025-05-14 03:47:28 -04:00
MrNewb 5629bab494 Update server.lua 2025-05-13 01:25:47 -04:00
MrNewb 99f82095d7 fuck 2025-05-13 01:06:52 -04:00
MrNewb 2a5fa897a9 Revert "psuh for crowley"
This reverts commit 0dc3d51319.
2025-05-13 00:22:49 -04:00
MrNewb 0dc3d51319 psuh for crowley 2025-05-12 23:13:08 -04:00
MrNewb 567bd7a824 TODO 2025-05-11 20:36:07 -04:00
MrNewb 5e016afc25 fix sharedConfig load order 2025-05-11 20:18:46 -04:00
JericoFX 78bb1f8c05 Add utility functions for player data retrieval and enhance existing functions 2025-05-11 12:16:49 -03:00
MrNewb 7e0124f02e returns added everywhere per crowleys request 2025-05-10 00:01:56 -04:00
Johann Kraus 1242d9ef7c Add GetPlayer functions to framework and New FUnctions to Utility 2025-05-09 23:06:01 -03:00
gononono64 69edf6f6ab forgot qbox and did some cleanup 2025-05-09 20:09:57 -05:00
gononono64 6f700ed7cf Update client.lua 2025-05-09 19:07:17 -05:00
gononono64 38d0d5527a New features and cleanup
Added Networked Markers
Added Anim module
Added framework default file for things that are native to game related to player
Started on a batch network event trigger to allow for single event call for multiple events

Updated params notation for ids
Removed prints from client_entity + actions + ext
2025-05-09 19:06:50 -05:00
MrNewb e1235dfc7c reorganized, notation 2025-05-09 06:03:09 -04:00
MrNewb 11114bf529 core_inventory compatibility
The current implementation isn’t the cleanest, but it gets the job done. I’ve had to rig parts of it together, and it hasn’t yet had a proper cleanup pass. This update adds support for core_inventory on both ESX and QB frameworks. Previously, the QB fallback worked fine, but an issue affecting ESX users was discovered.

To resolve this, a change was needed in how framework-registered usable items are handled—allowing us to pass the item’s ID as the slot when using core_inventory, while maintaining slot-based behavior otherwise. This approach ensures compatibility without requiring any modifications to other resources.

I've personally tested this on ESX, but since I haven’t been able to coordinate with the core_inventory team, QB Core users will essentially be the first wave of testers for this integration.
2025-05-06 14:39:29 -04:00
gononono64 93ebca8762 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-05-05 13:57:09 -05:00
MrNewb 3e6bc0dd81 account type for qb format to esx 2025-05-05 10:45:00 -04:00