Commit Graph
100 Commits
Author SHA1 Message Date
MrNewb 98b883950d Add ZSX_UIV2 support for helptext, notify, and progressbar
Introduced new client modules for helptext, notify, and progressbar using ZSX_UIV2. Updated client and shared configuration files to include ZSX_UIV2 as an option for ProgressBarSystem, Notify, and HelpText. Bumped fxmanifest version to 0.13.2.
2026-01-24 18:08:34 -05:00
MrNewb 80dd16efa8 Merge pull request #176 from TheOrderFivem/behavior-replacement
Stripped away inefficient behavior system
2026-01-24 18:00:39 -05:00
MrNewb 7d16eb3cc9 Merge pull request #174 from SinapsDev/main
IsVehicleOwnedByPlayer method
2025-12-28 16:28:38 -05:00
MrNewb 24061d8343 Merge pull request #173 from TheOrderFivem/dev
Remove cache and batch event libraries, update locales
2025-12-27 18:44:00 -05:00
MrNewb 48f8122197 Remove cache and batch event libraries, update locales
Deleted the cache and batch event libraries from the codebase, including all related client, server, and shared files. Removed server-side particle library and associated client event handlers. Updated utility and clothing modules to remove cache dependencies. Improved utility logging and deprecated point functions with notices. Updated all locales to use a consistent 'PurchasedItem' message format and added Bulgarian (bg) translation. Bumped version to 0.13.1 in fxmanifest.
2025-12-23 19:27:27 -05:00
MrNewb 5fd0744ca5 Merge pull request #170 from TheOrderFivem/dev
Dev
2025-12-14 16:23:45 -05:00
MrNewb 343af95794 Remove example scripts and update core logic
Deleted all files in the examples directory to clean up unused or test scripts. Updated fxmanifest.lua to enable ox_lib initialization. Improved error handling and entity tracking in utility functions, added prop removal, and made minor localization and code style adjustments throughout the codebase. Significant reword of inventory module, notification module, and framework module. Added support for wasabi_uikit, added support for keep-progressbars,
2025-12-14 16:22:35 -05:00
MrNewb 5791f89598 Merge pull request #165 from TheOrderFivem/crowleys
This was crowleys commit and work - Refactor entity behaviors and imp…
2025-10-31 18:43:23 -04:00
MrNewb 444040dd39 This was crowleys commit and work - Refactor entity behaviors and improve particle handling
Refactored entity behavior triggers to simplify argument passing and added OnSet handler for particle behaviors. Improved particle effect management and event handling, updated locale and lib initialization in several modules, and fixed skill metadata access. Also streamlined point zone logic and menu/zone system initialization for better reliability.
2025-10-26 16:20:27 -04:00
MrNewb 179c3bad85 Add vehicle key integration modules
Introduces client-side modules for various vehicle key resources, each providing standardized GiveKeys and RemoveKeys functions. This enables compatibility with multiple vehicle key systems by abstracting their APIs behind a common interface.
2025-10-26 15:20:45 -04:00
MrNewb 266697b1fe Remove all vehicle key client modules
Deleted all client-side vehicle key integration modules from both 'vehicleKey' and 'vehiclekey' directories. This change likely reflects a refactor, migration, or deprecation of the vehicle key system integrations.
2025-10-26 15:20:31 -04:00
MrNewb 1d9431f88e folder name changes 2025-10-26 15:19:35 -04:00
MrNewb b42219f0a3 Merge pull request #163 from divide29/main
add integration for emergencydispatch
2025-10-21 09:06:42 -04:00
MrNewb b165bf35a1 Bump version to 0.13.0 in fxmanifest.lua
Updated the version number in fxmanifest.lua from 0.12.1 to 0.13.0 to reflect new changes or improvements.
2025-10-19 23:18:57 -04:00
MrNewb 3a9424659b Refactor Dispatch.SendAlert for clarity
Assigns alert data to a local variable before passing it to exports.tk_dispatch:addCall, improving readability and maintainability.
2025-10-19 23:04:54 -04:00
MrNewb 664b397404 Refactor Target resource name function placement
Moved the GetResourceName function definition to the top of both ox_target and qb-target client modules for consistency and clarity. Also performed minor code cleanup and reordering for improved readability.
2025-10-19 22:59:18 -04:00
MrNewb 7b18956cbf Fix number generation in CreateUniqueId function
Replaces direct number insertion with string formatting to ensure numbers are appended as strings when generating unique IDs.
2025-10-19 22:43:55 -04:00
MrNewb 529c597585 Add input submit_text translations to locales
Introduces the 'input.submit_text' key with appropriate translations for all supported languages. Also updates and expands some placeable_object and clipboard strings in af.json for improved clarity and consistency.
2025-10-19 22:43:07 -04:00
MrNewb 61f4d05f0a Add descriptions to framework job count functions
Added @description annotations to all relevant functions and event handlers in both client and server framework modules for improved code documentation and clarity.
2025-10-19 22:21:22 -04:00
MrNewb 19911d9173 Refactor target system client logic and zone functions
Simplifies debug flag initialization and resource state checks in both ox_target and qb-target client scripts. Updates Target.FixOptions to streamline option handling and canInteract logic. Target.AddBoxZone and Target.AddSphereZone now return the zone name for improved usability.
2025-10-15 18:05:56 -04:00
MrNewb 15e5249927 Add fivemanage log system support
Introduces a new 'fivemanage' log system option in serverConfig and implements its handler in logs.lua. Also refactors log handler functions for consistency and updates the default LogSystem to 'none'.
2025-10-12 22:13:33 -04:00
MrNewb a7b3a34998 Add LuaDoc @description to fuel API functions
Replaced comment blocks with LuaDoc @description tags for GetResourceName, GetFuel, and SetFuel functions across all fuel module client files. This improves code documentation consistency and supports better tooling integration.
2025-10-12 21:54:52 -04:00
MrNewb c73faa43db Add checks for alternative inventory resources
Added resource state checks for 'codem-inventory' and 'origen_inventory' in both client and server scripts to ensure compatibility and prevent conflicts when those resources are present.
2025-10-12 21:53:27 -04:00
MrNewb c582ce69e9 Add check for 17mov_CharacterSystem resource
Added a conditional check for the '17mov_CharacterSystem' resource in all clothing module scripts. This prevents the modules from loading if '17mov_CharacterSystem' is present, improving compatibility and avoiding conflicts.
2025-10-12 21:52:12 -04:00
MrNewb 91e295947b Merge pull request #162 from solaire-fivem/qb-core-code-cleanup
Enforcing consistent annotations and fixing spelling mistakes
2025-10-05 18:56:23 -04:00
MrNewb 3498011103 Merge pull request #161 from Mustachedom/dev
`feature` Prints now auto formats json to go downwards in prints so its easier to read
2025-09-29 04:58:23 -04:00
MrNewb d7c58b6bf4 Merge pull request #159 from ONyambura/dev
FIX - QB-Core - Framework/Inventory - Item properties fix
2025-09-26 14:27:47 -04:00
MrNewb 582ce9e640 Refactor item info retrieval in inventory modules
Updated Inventory.GetItemInfo to use the full items table for lookups instead of fetching individual items. Added Inventory.Items function to both client and server for consistent access to the items table. Improved handling of missing data and streamlined code for better maintainability.
2025-09-13 18:04:05 -04:00
MrNewb 41c90f9082 Add wasabi_mdt dispatch integration
Introduces client and server modules for dispatch integration with the wasabi_mdt resource. Provides functions to send alerts and retrieve the resource name, enabling compatibility with the wasabi_mdt dispatch system.
2025-09-11 17:34:54 -04:00
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 a15a79603b **HOTFIX** 0.12.1 2025-09-10 18:53:33 -04:00
MrNewb 5e321867e6 Merge pull request #157 from TheOrderFivem/crowleys-branch
Add deprecated args field to Point.Register

**HOTFIX**
2025-09-10 18:53:05 -04:00
MrNewb bc3558c622 Merge pull request #156 from TheOrderFivem/dev
Release v0.12.0 - Major Framework Enhancements and Entity System Overhaul
2025-09-10 13:46:59 -04:00
MrNewb 8bf18220a1 Merge pull request #155 from TheOrderFivem/crowleys-branch
Crowleys branch
2025-09-10 13:39:36 -04:00
MrNewb 96d311c4d3 Bump version to 0.12.0 in fxmanifest.lua
Updated the resource version from 0.11.2 to 0.12.0 to reflect new changes or improvements in the community_bridge project.
2025-09-10 13:23:02 -04:00
MrNewb d669f7ba16 Remove debug print from UpdateEntity event
Eliminated unnecessary json-encoded print statement from the UpdateEntity event handler to clean up console output.
2025-09-10 12:42:19 -04:00
MrNewb 3531349971 Merge pull request #153 from TheOrderFivem/GetResourceName
Add GetResourceName function to all modules
2025-09-10 12:31:39 -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 cd16291038 Merge pull request #152 from TheOrderFivem/hunger/thirst
Hunger/thirst
2025-09-10 11:38:04 -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 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
MrNewb 5b7e7bb06e Merge pull request #149 from TheOrderFivem/crowleys-branch
Crowleys branch
2025-09-04 22:32: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
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
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
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
MrNewb c0e8b7e447 Merge pull request #144 from TheOrderFivem/crowleys-branch
prep for behaviors
2025-08-31 03:12:26 -04: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
MrNewb 7693648c32 yeeeeet 2025-08-24 17:32:16 -04: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
MrNewb f2fad0cb5b Update server.lua 2025-08-21 05:37:44 -04:00
MrNewb b896b94001 sync 2025-08-20 23:38:22 -04: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
MrNewb 718214d135 This is busted, should be removed.
Should be removed as not working for external resources.
It will work in the bridge itself but could lead to bloat/misuse and we shouldn't be responsible.
2025-08-20 16:59:04 -04:00
MrNewb 957e2e2ff6 Merge pull request #140 from TheOrderFivem/dev
feat: major system refactor, feature patches, and compatibility improvements
2025-08-19 07:30:39 -04:00
MrNewb 75f431e3ac Merge pull request #139 from PiotreeQ/patch-1
Update server.lua
2025-08-19 07:29:13 -04:00
MrNewb ec8067828f prep for version bump 2025-08-19 06:30:52 -04: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
MrNewb 58242b4213 possible fix
Before only one point could exist per cell.
This corrects that but im unsure on the impact to performance or grids
2025-08-16 07:04:00 -04:00
MrNewb 0fc872a102 patch for vector4 2025-08-16 05:56:25 -04:00
MrNewb defc7c0e8b blip tweak 2025-08-16 01:03:45 -04:00
MrNewb d6cb8ece6c Merge branch 'dev' of https://github.com/TheOrderFivem/community_bridge into dev 2025-08-12 21:32:20 -04:00
MrNewb 1a2e780eff Lithuanian support 2025-08-12 21:32:17 -04:00
MrNewb 29c19f3cb4 Update client_entity.lua 2025-08-12 20:20:49 -04: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 35d18972e6 Update points.lua 2025-08-09 23:40:27 -04:00
MrNewb b914f0ffeb Merge pull request #136 from RandomZFx/patch-1
Patch 1
2025-08-09 12:56:10 -04:00
MrNewb 249f1c4032 Update server_entity.lua 2025-08-07 02:19:20 -04:00
MrNewb a63837bd1f Refactored model/anim checks, utility functions, and text rendering
Modified EnsureModelLoaded to skip validation and request loops if the model is already loaded

Condensed SafeAddBlip, SafeRemoveBlip, etc. into dedicated utility functions

Removed AddTextEntryOnce and SafeAddTextEntry — native existence checks were redundant

Replaced repetitive table inserts with keyed tables using tostring(number) to avoid unnecessary loops

Added HasAnimDictLoaded check to RequestAnimDict to prevent redundant request loops

Introduced FloatingHelpText in utilities (aesthetic improvement)

Updated DrawText: replaced outdated logic, switched 1 to true for clarity/preference
2025-08-07 01:50:50 -04:00
MrNewb b1556d13fb draft GetPlayerSourcesByJob 2025-08-07 00:47:51 -04:00
MrNewb d0f9fb7ca3 Update VersionChecker.lua
comment out old
2025-08-05 16:05:47 -04:00
MrNewb e1a43ed918 Restore original version checker for compatibility; refactor export logic with reduced variable passing
- Reinstated the original version checker to maintain compatibility.
- Reworked the export approach: the new export method and the legacy one are now split rather than merged.
- Patch‑note data is handled separately, as seen in the example structure at resources.json (e.g. https://github.com/MrNewb/patchnotes/blob/main/resources.json).
- Minimized variable passing by leveraging JSON template references directly, reducing redundancy.
2025-08-05 15:55:49 -04:00
MrNewb d8f1599052 Update points.lua 2025-08-05 00:01:32 -04:00
MrNewb 4d6958aa86 community_bridge:Server:OnPlayerJobChange
job change serverside event
2025-08-04 01:32:30 -04:00
MrNewb 5abebe13c6 image pathing fixed on tgiann
this -- "nui://inventory_images/html/images/%s.png"
Is not the path, it its instead
nui://inventory_images/images/%s.png"

Also strip webp function added. And indexing itemdata was required.
2025-08-03 16:23:19 -04:00