Commit Graph
456 Commits
Author SHA1 Message Date
MrNewb 3dfbaa8573 Localize target menu and interaction prompts
Replaced hardcoded target menu titles, descriptions, and interaction prompts with localized strings from en.json. Updated client.lua to use Language.Locale for menu and help text, improving internationalization and consistency.
2025-09-10 21:47:58 -04:00
MrNewb 90c65dc55e Add GetResourceName function to all modules
Introduces a standardized GetResourceName function to banking, clothing, dispatch, doorlock, framework, fuel, helptext, housing, and other modules. This function returns the name of the in-use resource, improving resource identification and interoperability across the codebase.
2025-09-10 12:27:12 -04:00
MrNewb f4e5d9485f Refactor hunger and thirst retrieval methods
Simplified Framework.GetHunger and Framework.GetThirst functions in both qb-core and qbx_core by using Framework.GetPlayerMetaData instead of accessing player data directly. This improves code readability and consistency.
2025-09-10 11:29:42 -04:00
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 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
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
Mr.Crowley e06e04a2c6 hope this works 2025-08-27 05:47:44 -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
solaire-fivem 48cba10ad2 fix minor typo, 'platerData' to 'playerData' 2025-08-22 22:08:41 +01:00
MrNewb f2fad0cb5b Update server.lua 2025-08-21 05:37:44 -04:00
Mr.Crowley a1181c2758 distance compatibility 2025-08-21 02:27:38 -05:00
Mr.Crowley d0d72bdba5 here we go again 2025-08-21 00:09:54 -05:00
Mr.Crowley f900bc5ce1 Clean up 2025-08-20 23:49:22 -05:00
Mr.Crowley b06d2fb49e Discarded entityactions and updated target
Discarded entityactions: was not used and bloat. Need a new system that handled networked entities static vs dynamic (non-moving non networked vs moving networked)

updated target to improve performance on canInteract. It seems that the target systems spam this function. Using a state and checking every second instead of allowing spamming

Added ClientEntity.ChangeModel
2025-08-20 22:23:07 -05:00
MrNewb cbd340326d Merge pull request #141 from XenoS-ITA/refactor-fuel-and-vehiclekey
Refactor fuel and vehiclekey
2025-08-20 21:44:49 -04:00
MrNewb c17b4e1fe6 Update client.lua 2025-08-20 19:38:47 -04:00
XenoS-ITA a289e6f1d2 refactor(vehicleKey): add client.lua for mVehicle 2025-08-21 01:24:41 +02:00
XenoS-ITA 783c15ad9c refactor(vehicleKey): remove obsolete client.lua file for mono_carkeys 2025-08-21 01:24:27 +02:00
XenoS-ITA 9e810d4b24 refactor(vehicleKey): enhance key management functions with assertions, improved documentation and remove vehicle keys where they was missing 2025-08-21 01:23:58 +02:00
XenoS-ITA 3289711297 refactor(fuel): more consistency, now SetFuel doesnt return and every SetFuel as type, that will be used only by ti_fuel 2025-08-21 00:34:00 +02:00
pScripts 28b616f72d Update server.lua 2025-08-19 11:08:43 +02:00
MrNewb fd3f62f288 playermetadata patch for qbx 2025-08-19 04:22:52 -04:00
MrNewb fd28d9a1a6 attempt to add piotreq_gpt (dispatch compatability) 2025-08-18 02:18: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
Mr.Crowley 7a598dd8d8 update for fivem appearance
should be working for esx now
2025-08-15 13:28:13 -05:00
MrNewb de5353b329 tweak dispatch for ps 2025-08-12 18:10:13 -04:00
MrNewb e30dceb540 CanCarryItem checks on additem 2025-08-12 18:08:49 -04:00
MrNewb af33909794 qs inv image path tweak 2025-08-11 00:46:26 -04:00
MrNewb b914f0ffeb Merge pull request #136 from RandomZFx/patch-1
Patch 1
2025-08-09 12:56:10 -04:00
randomz 4f9a4a06c8 Update server.lua
Converted String amount to Number to ensure AddItem was properly working. (tested on live server item was not being given due to that issue)
2025-08-08 23:47:13 -05:00