Version Bump

`2.0.23` - `2.1.0`

.gitattributes

@@ -0,0 +1,12 @@
+# VCS / CI noise
+.gitattributes     export-ignore
+.gitignore         export-ignore
+.github/**         export-ignore
+.gitmodules        export-ignore
+
+# Dev tooling/config
+.vscode/**         export-ignore
+*.code-workspace   export-ignore
+.editorconfig      export-ignore
+.eslintrc*         export-ignore
+.prettier*         export-ignore

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: jixelpatterns
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://jimathy666.tebex.io/']

.github/workflows/notify-discord.yml

@@ -0,0 +1,20 @@
+name: Discord Commit Notifier
+on:
+  push:
+    branches: ['*']
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate event JSON (sanity check)
+        run: jq -e . "$GITHUB_EVENT_PATH" >/dev/null
+
+      - name: Send commit payload to Discord Bot
+        env:
+          URL: http://${{ secrets.DISCORDBOT }}:3000/github-commits
+        shell: bash
+        run: |
+          curl -sS --fail-with-body -X POST "$URL" \
+            -H 'Content-Type: application/json' \
+            --data-binary "@$GITHUB_EVENT_PATH"

.github/workflows/release.yml

@@ -0,0 +1,88 @@
+name: Package & Release
+
+on:
+  push:
+    tags:
+      - "v*"
+      - "*.*.*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (full history)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Derive vars
+        id: vars
+        shell: bash
+        run: |
+          echo "name=${GITHUB_REPOSITORY##*/}" >> $GITHUB_OUTPUT              # e.g. jim_bridge
+          echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT               # strip leading v
+
+      - name: Build zip with folder prefix
+        shell: bash
+        run: |
+          NAME='${{ steps.vars.outputs.name }}'
+          VER='${{ steps.vars.outputs.version }}'
+          git archive --format=zip --prefix="${NAME}/" -o "${NAME}-${VER}.zip" "$GITHUB_REF_NAME"
+          ls -lh "${NAME}-${VER}.zip"
+
+      # --- Patch notes generation (commit titles + links) -------------------
+      - name: Find previous tag (SemVer aware)
+        id: prev
+        shell: bash
+        run: |
+          CUR="${GITHUB_REF_NAME}"
+          # Sort tags by version desc, drop the current, take the next newest
+          PREV=$(git tag --sort=-v:refname | grep -v -x "$CUR" | head -n 1 || true)
+          echo "prev=$PREV" >> $GITHUB_OUTPUT
+          echo "Previous tag: ${PREV:-<none>}"
+
+      - name: Generate RELEASE_NOTES.md from commits
+        shell: bash
+        run: |
+          REPO="${{ github.repository }}"
+          CUR="${GITHUB_REF_NAME}"
+          PREV='${{ steps.prev.outputs.prev }}'
+
+          if [ -n "$PREV" ]; then
+            RANGE="$PREV..$CUR"
+            HEADER="## Changes in $CUR"
+          else
+            # First release: include all commits
+            ROOT=$(git rev-list --max-parents=0 HEAD | tail -n 1)
+            RANGE="$ROOT..$CUR"
+            HEADER="## Changes"
+          fi
+
+          {
+            echo "$HEADER"
+            echo
+            # Oldest → newest, subject only, skip merge commits
+            # Escape '[' and ']' so markdown doesn't break on rare titles
+            git log --reverse --no-merges --pretty=format:'- ['%h'] - %s' "$RANGE" \
+              | perl -pe 's/([\[\]])/\\$1/g'
+          } > RELEASE_NOTES.md
+
+          echo "--- RELEASE_NOTES.md ---"
+          cat RELEASE_NOTES.md
+          echo "------------------------"
+
+      - name: Create / Update GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          files: |
+            *.zip
+          body_path: RELEASE_NOTES.md   # attach our generated notes
+          # If you wanted GitHub's auto notes instead, set:
+          # generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -0,0 +1,88 @@
+# Jim_Bridge
+
+This script is intended to be used with my all my scripts (soon)
+
+It was started due to wanting to bring the same features from some scripts into others with minimal work and without multiple updates fer script
+
+It BRIDGES frameworks and cores together through this script and does it best to detect what is being used to automate the process
+- Having certain functions in one place makes it easier to update, enchance and fix things already in place
+- This brings the possibility of branching to mutliple frameworks as I've added some already:
+    - `"qb-core"`
+    - `"qbx-core"`
+    - `"ox_core"`
+    - `"es_extended"` - requires ox_lib and ox_inventory
+    - `"rsg-core"` - basic support for RedM's RSG Core
+
+All of my scripts will use this script and be added as a dependancy
+
+This was originally designed to be used for my scripts but has grown into a whole framework of unified functions that anyone can use for their own, I encourage it
+
+------
+
+## I want this script to grow with help of others who know more about other cores, I'm not a book of framework knowledge
+This script was designed by me through over a year of research and testing.
+Some of it of it hasn't been personally tested but the information has been gathered through documentation on other scripts
+I hope it works as well I intend, but feel free to do pull requests if you know how to fix an issue
+
+(Please also keep it to a similar format to prevent breakages in other scripts)
+
+------
+
+## Installation
+
+The installation of this script is simple
+- REMOVE `-main` from the folder name, like any other github hosted script
+- It just needs to start before any script that requires it
+- It can start before core scripts if you want
+- For example with `qb-core` I personally place this script in `resources > [standalone]`
+
+### Optional
+
+I've added the ability to add override server convars to your server.cfg
+- This can be used to ensure you don't have silly mistakes like forgetting to change what inventory system you use
+- Also it can force debug mode off, to ensure your live server doesn't accidently get polyzones and debug information showing
+- This isn't required but helpful if you are like me
+
+```
+# Jim Config Settings
+# These optional but forces settings for all jim scripts
+#-------
+# Add this to your live server.cfg and set to true to force debug mode off
+# Set to false if to dev server to allow debug mode
+setr jim_DisableDebug true
+setr jim_DisableEventDebug true
+
+# Force the default setting for what framework scripts should be used
+setr jim_menuScript qb              # qb, ox, gta, lation
+setr jim_notifyScript gta           # qb, ox, gta, esx, okok, red, lation
+setr jim_drawTextScript qb          # qb, ox, gta, esx, lation
+setr jim_progressBarScript qb       # qb, ox, gta, esx, lation
+setr jim_skillCheckScript qb        # qb, ox, gta, lation
+setr jim_dontUseTarget false         # Set to true to disable target systems and use draw text 3d
+```
+
+-----
+
+## Support for different frameworks and scripts
+
+In `starter.lua` is the list of script folder names, this is already setup but this is for people who have customised/renamed their cores or scripts
+
+# WIP
+## Documentation
+
+For organised documentation please see the new `documentation` folder within this resource
+
+## Usage
+
+In your own resource, simply call the desired function exported from `jim_bridge`. Each function is built to work across multiple frameworks, offering compatibility and consistency.
+
+```lua
+-- Example usage:
+createCallback("myCallback", function(data)
+    print("Callback received:", data)
+end)
+
+triggerCallback("myCallback", "Hello World")
+```
+
+---

_versioncheck.lua

@@ -0,0 +1,78 @@
+local function readBoolMeta(key, default)
+    local val = GetResourceMetadata(GetCurrentResourceName(), key, 0)
+    if not val then return default end
+    val = tostring(val):lower()
+    return (val == 'true' or val == '1' or val == 'yes' or val == 'on')
+end
+
+local SUPPRESS_UPDATES = readBoolMeta('suppress_updates', false)
+
+if not SUPPRESS_UPDATES then
+    local function parseVersion(version)
+        local parts = {}
+        for num in version:gmatch("%d+") do
+            table.insert(parts, tonumber(num))
+        end
+        return parts
+    end
+
+    local function compareVersions(current, newest)
+        local currentParts = parseVersion(current)
+        local newestParts = parseVersion(newest)
+        for i = 1, math.max(#currentParts, #newestParts) do
+            local c = currentParts[i] or 0
+            local n = newestParts[i] or 0
+            if c < n then return -1
+            elseif c > n then return 1 end
+        end
+        return 0 -- equal
+    end
+
+    function CheckBridgeVersion()
+        if IsDuplicityVersion() then
+            CreateThread(function()
+                Wait(4000)
+                local currentVersionRaw = GetResourceMetadata("jim_bridge", 'version')
+                --PerformHttpRequest('https://raw.githubusercontent.com/jimathy/UpdateVersions/master/test.txt', function(err, body, headers)
+                PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, body, headers)
+                    if not body then
+                        print("^1Unable to run version check for ^7'^3jim_bridge^7' (^3"..currentVersionRaw.."^7)")
+                        return
+                    end
+
+                    local lines = {}
+                    for line in body:gmatch("[^\r\n]+") do
+                        table.insert(lines, line)
+                    end
+
+                    local newestVersionRaw = lines[1] or "0.0.0"
+                    local changelog = {}
+                    for i = 2, #lines do
+                        table.insert(changelog, lines[i])
+                    end
+
+                    local compareResult = compareVersions(currentVersionRaw, newestVersionRaw)
+
+                    if compareResult == 0 then
+                        print("^7'^3jim_bridge^7' - ^2You are running the latest version^7. ^7(^3"..currentVersionRaw.."^7)")
+                    elseif compareResult < 0 then
+                        print("^1----------------------------------------------------------------------^7")
+                        print("^7'^3jim_bridge^7' - ^1You are running an outdated version^7! ^7(^3"..currentVersionRaw.."^7 → ^3"..newestVersionRaw.."^7)")
+                        for _, line in ipairs(changelog) do
+                            print((line:find("http") and "^7" or "^5")..line)
+                        end
+                        print("^1----------------------------------------------------------------------^7")
+                        SetTimeout(3600000, function()
+                            CheckBridgeVersion()
+                        end)
+                    else
+                        print("^7'^3jim_bridge^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersionRaw.."^7) (^1Expect Errors^7)")
+                    end
+                end)
+            end)
+        end
+    end
+
+
+    CheckBridgeVersion()
+end

clientFrameworkCache.lua

@@ -0,0 +1,32 @@
+if _G.__bridge_cache_loaded then return end
+_G.__bridge_cache_loaded = true
+
+_G.BridgeCache = {
+    hasCache = false,
+    data = nil,
+    queue = {},
+}
+
+RegisterNetEvent("jim_bridge:receiveCache", function(data)
+    if _G.BridgeCache.hasCache then return end
+    _G.BridgeCache.data = data
+    _G.BridgeCache.hasCache = true
+
+    for _, cb in ipairs(_G.BridgeCache.queue) do
+        cb(data)
+    end
+    _G.BridgeCache.queue = nil
+end)
+
+-- Only send the request ONCE per client session
+TriggerServerEvent("jim_bridge:requestCache")
+
+-- Exported async function
+function GetBridgeCache(callback)
+    if _G.BridgeCache.hasCache then
+        callback(_G.BridgeCache.data)
+    else
+        table.insert(_G.BridgeCache.queue, callback)
+    end
+end
+exports("GetBridgeCache", GetBridgeCache)

documentation/animal_ped_support.md

@@ -0,0 +1,58 @@
+## Animal Ped Support
+### isAnimal.lua
+This module provides logic to detect if a Ped or model is an animal and classify it into specific categories (cat, dog, coyote, etc.). Useful for wildlife, animal roles, or pet systems.
+
+❔At player load in, it attempts to get what kind of ped/animal you are but there are functions to double check in scripts
+
+❔Alot of this is used to determine what models/animations are available
+
+Global flags:
+- `isCat`, `isDog`, `isBigDog`, `isSmallDog`, `isCoyote`, `isAnimal` — used to store classification of the player's current ped.
+
+- **isPedAnimal(ped?)**
+
+  - Checks if a ped is an animal based on predefined animal models.
+  - Sets global `isAnimal` to true if matched.
+  - **Example:**
+    ```lua
+    local isPlayerAnimal = isPedAnimal()
+    local isOtherPedAnimal = isPedAnimal(GetPedInVehicleSeat(vehicle, -1))
+    ```
+
+- **isCat(ped)**
+
+  - Returns true if the ped model matches a cat.
+  - **Example:**
+    ```lua
+    if isCat() then print("You're a cat!") end
+    ```
+
+- **isDog(ped)**
+
+  - Returns two values:
+    - `true`, `true` — if ped is a big dog
+    - `true`, `false` — if ped is a small dog
+    - `false`, `nil` — if not a dog
+  - **Example:**
+    ```lua
+    local isDog, isBig = isDog()
+    if isDog then print(isBig and "Big Dog" or "Small Dog") end
+    ```
+
+- **getAnimalModels()**
+
+  - Returns a flat list of all registered animal model hashes.
+  - Can be used to check ped models against
+  - **Example:**
+    ```lua
+    for _, model in pairs(getAnimalModels()) do print(model) end
+    ```
+
+- **getAnimalAnims(ped)**
+
+  - Returns the animation set defined for the given animal model.
+  - **Example:**
+    ```lua
+    local anims = getAnimalAnims(PlayerPedId())
+    if anims then playAnim(anims.sitDict, anims.sitAnim) end
+    ```

documentation/helper_functions/helpers.md

@@ -0,0 +1,177 @@
+### helpers.lua
+This utility module provides functions for resource checks, debugging, formatting, coordinate math, vector calculations, progress bars, and drawing tools.
+
+- **isStarted(script)**
+  - Returns `true` if a resource is started.
+  - **Example:**
+    ```lua
+    if isStarted("myResource") then print("Resource is running") end
+    ```
+
+- **getScript()**
+  - Caches and returns the name of the current resource.
+  - Easier than typing `GetCurrentResourceName()` over and over
+  - **Example:**
+    ```lua
+    print("Current script:", getScript())
+    ```
+
+- **isServer()**
+  - Returns true if running on the server.
+  - This was mainly made becuase `IsDuplicityVersion()` kept confusing me
+  - **Example:**
+    ```lua
+    if isServer() then print("Server-side!") end
+    ```
+
+- **debugPrint(...)** / **eventPrint(...)**
+  - Prints messages with debug context if debugMode is enabled.
+  - **Example:**
+    ```lua
+    debugPrint("Loaded object:", objName)
+    ```
+
+- **jsonPrint(table)**
+  - Pretty-prints a table with colorized JSON if debugMode is enabled.
+  - **Example:**
+    ```lua
+    jsonPrint(myData)
+    ```
+
+- **keyGen()**
+  - Generates a 3-character unique ID.
+  - Good grabbing randomly generated strings
+  - **Example:**
+    ```lua
+    print("Generated Key:", keyGen())
+    ```
+
+- **cv(amount)**
+  - Comma-separates a number (e.g., `1000000` to `1,000,000`).
+  - **Example:**
+    ```lua
+    print(cv(1000000)) -- "1,000,000"
+    ```
+
+- **formatCoord(vec)**
+  - Outputs a formatted string from vector types.
+  - Compacts and adds console colours to the vector to be printed
+  - **Example:**
+    ```lua
+    print(formatCoord(vector3(123.45, 678.9, 10.0)))
+    ```
+
+- **getCenterOfZones(coords)**
+  - Returns average center position of a vector3 list.
+  - A few use cases, but I used it to see how well spaced blips were together
+  - **Example:**
+    ```lua
+    local center = getCenterOfZones({vector3(0,0,0), vector3(10,10,0)})
+    ```
+
+- **countTable(tbl)**
+  - Returns the number of entries in a table.
+  - Simple function to print how many "entires" are in a table
+  - **Example:**
+    ```lua
+    print(countTable({a=1,b=2,c=3})) -- 3
+    ```
+
+- **pairsByKeys(tbl)**
+  - Iterator for sorted keys.
+  - **Example:**
+    ```lua
+    for k, v in pairsByKeys(myTable) do print(k, v) end
+    ```
+
+- **concatenateText(tbl)**
+  - Joins string table entries with newlines.
+  - **Example:**
+    ```lua
+    print(concatenateText({"Line 1", "Line 2"}))
+    ```
+
+- **RotationToDirection(rot)**
+  - Converts a heading vector to a directional vector.
+  - **Example:**
+    ```lua
+    local dir = RotationToDirection(rotation)
+    ```
+
+- **basicBar(percent)**
+  - Returns a bar like `████░░░░░` at 50%.
+  - Basically a progress bar but as a string, I use this in drawTexts when progressbars aren't able to be used
+  - **Example:**
+    ```lua
+    print(basicBar(50))
+    ```
+
+- **normalizeVector(vec)**
+  - Returns a normalized version of a vector3.
+  - **Example:**
+    ```lua
+    local norm = normalizeVector(vector3(3,4,0))
+    ```
+
+- **drawLine(start, end, color)** / **drawSphere(pos, color)**
+  - Debug drawing helpers.
+  - Stays visible for more than one frame
+  - **Example:**
+    ```lua
+    drawLine(vector3(0,0,0), vector3(10,10,10), vector4(255,0,0,255))
+    drawSphere(vector3(5,5,5), vector4(0,255,0,255))
+    ```
+
+- **PerformRaycast(start, end, entity?, flags?)**
+  - Raycast with material detection. Returns ray hit data.
+  - **Example:**
+    ```lua
+    local hit, hitPos, material = PerformRaycast(startVec, endVec, playerPed, 1)
+    if hit == 1 then
+        print("Hit at position:", hitPos)
+        print("Material:", material)
+    end
+    ```
+
+- **adjustForGround(coords)**
+  - Adjusts a z-coordinate to ground height.
+  - **Example:**
+    ```lua
+    coords = adjustForGround(vector3(100, 200, 300))
+    ```
+
+- **ensureNetToVeh(id)** / **ensureNetToEnt(id)**
+  - Resolves net ID to entity safely.
+  - **Example:**
+    ```lua
+    local veh = ensureNetToVeh(netId)
+    ```
+
+- **sendLog(text)** / **sendServerLog(data)**
+  - Logging helpers, includes player name, coords, script source.
+  - **Example:**
+    ```lua
+    sendLog("Suspicious activity detected")
+    ```
+
+- **GetGroundMaterialAtPosition(coords)**
+  - Returns the material hash + readable name from the surface below coords.
+  - **Example:**
+    ```lua
+    local hash, name = GetGroundMaterialAtPosition(vector3(0,0,0))
+    ```
+
+- **GetPropDimensions(model)**
+  - Loads a model and returns width, depth, height.
+  - I use this to parse a model to create a box target instead of entity target when creating distProps/distPeds
+  - **Example:**
+    ```lua
+    local w,d,h = GetPropDimensions("prop_barrel_01a")
+    ```
+
+- **GetEntityForwardVector(entity)**
+  - Returns the forward direction vector based on entity heading.
+  - **Example:**
+    ```lua
+    local fwd = GetEntityForwardVector(PlayerPedId())
+    ```

documentation/helper_functions/loaders.md

@@ -0,0 +1,89 @@
+### loaders.lua
+This module provides loading utilities for common asset types such as models, animations, texture dictionaries, and audio banks. It also provides animation and sound helpers.
+
+- **loadModel(model)**
+  - Loads a model into memory if valid and not already loaded.
+  - **Example:**
+    ```lua
+    loadModel('prop_chair_01a')
+    ```
+
+- **unloadModel(model)**
+  - Unloads a model from memory.
+  - **Example:**
+    ```lua
+    unloadModel('prop_chair_01a')
+    ```
+
+- **loadAnimDict(animDict)**
+  - Loads an animation dictionary into memory.
+  - **Example:**
+    ```lua
+    loadAnimDict('amb@world_human_hang_out_street@male_c@base')
+    ```
+
+- **unloadAnimDict(animDict)**
+  - Removes an animation dictionary from memory.
+  - **Example:**
+    ```lua
+    unloadAnimDict('amb@world_human_hang_out_street@male_c@base')
+    ```
+
+- **loadPtfxDict(ptFxName)**
+  - Loads a particle effect (ptfx) dictionary.
+  - **Example:**
+    ```lua
+    loadPtfxDict('core')
+    ```
+
+- **unloadPtfxDict(dict)**
+  - Unloads a particle effect dictionary from memory.
+  - **Example:**
+    ```lua
+    unloadPtfxDict('core')
+    ```
+
+- **loadTextureDict(dict)**
+  - Loads a streamed texture dictionary.
+  - **Example:**
+    ```lua
+    loadTextureDict('commonmenu')
+    ```
+
+- **loadScriptBank(bank)**
+  - Loads a script audio bank.
+  - Returns true on success.
+  - **Example:**
+    ```lua
+    local success = loadScriptBank('DLC_HEISTS_GENERAL_FRONTEND_SOUNDS')
+    ```
+
+- **loadAmbientBank(bank)**
+  - Loads an ambient audio bank.
+  - Returns true on success.
+  - **Example:**
+    ```lua
+    local success = loadAmbientBank('AMB_REVERB_GENERIC')
+    ```
+
+- **playAnim(animDict, animName, duration?, flag?, ped?, speed?)**
+  - Plays an animation on a ped.
+  - Loads the dictionary if not already loaded.
+  - **Example:**
+    ```lua
+    playAnim('amb@world_human_hang_out_street@male_c@base', 'base', 5000, 1, PlayerPedId(), 1.0)
+    ```
+
+- **stopAnim(animDict, animName, ped?)**
+  - Stops an animation and unloads the dictionary.
+  - **Example:**
+    ```lua
+    stopAnim('amb@world_human_hang_out_street@male_c@base', 'base', PlayerPedId())
+    ```
+
+- **playGameSound(audioBank, soundSet, soundRef, coords, synced, range?)**
+  - Plays a game sound from a coordinate or entity.
+  - **Example:**
+    ```lua
+    playGameSound('DLC_HEIST_HACKING_SNAKE_SOUNDS', 'Beep', vector3(0, 0, 0), false, 15.0)
+    ```

documentation/main_functions/callbacks.md

@@ -0,0 +1,38 @@
+### callback.lua
+
+These functions wrap the native callback handling of the selected framework (e.g., OX, QBCore, ESX) instead of implementing a standalone callback system, ensuring full compatibility.
+
+- **createCallback(callbackName, funct)**
+
+  - Registers a callback function with the appropriate framework.
+  - This function checks which framework is started (e.g., OX, QB, ESX) and registers the callback accordingly.
+  - It adapts the callback function to match the expected signature for the framework.
+  - **Example:**
+    ```lua
+    local table = { ["info"] = "HI" }
+    createCallback('myCallback', function(source, ...)
+        return table
+    end)
+
+    createCallback("callback:checkVehicleOwned", function(source, plate)
+        local result = isVehicleOwned(plate)
+        if result then
+            return true
+        else
+            return false
+        end
+    end)
+    ```
+
+- **triggerCallback(callbackName, ...)**
+
+  - Triggers a server callback and returns the result.
+  - This function uses the appropriate framework's method to call the server-side callback and awaits the result.
+  - **Example:**
+    ```lua
+    local result = triggerCallback('myCallback')
+    jsonPrint(result)
+
+    local result = triggerCallback("callback:checkVehicleOwned", plate)
+    print(result)
+    ```

documentation/main_functions/cameras.md

@@ -0,0 +1,28 @@
+### cameras.lua
+This module provides utilities for managing temporary in-game cameras, useful for cutscenes, cinematic views, or scripted perspectives.
+
+- **createTempCam(ent, coords)**
+
+  - Creates a temporary camera at the specified coordinates or relative to an entity.
+  - If `ent` is an entity, the camera position is calculated as an offset from the entity's position using `GetOffsetFromEntityInWorldCoords`.
+  - If `ent` is a `vector3`, it is used directly as the camera's position.
+  - **Example:**
+    ```lua
+    local cam = createTempCam(PlayerPedId(), GetEntityCoords(PlayerPedId()) + vector3(0, 2.0, 1.0))
+    ```
+
+- **startTempCam(cam)**
+
+  - Activates and renders the temporary camera.
+  - **Example:**
+    ```lua
+    startTempCam(cam)
+    ```
+
+- **stopTempCam()**
+
+  - Deactivates and deletes all currently running custom camera, restoring normal view.
+  - **Example:**
+    ```lua
+    stopTempCam()
+    ```

documentation/main_functions/contextmenus.md

@@ -0,0 +1,45 @@
+### contextmenus.lua
+
+These functions provide a unified way to interact with different context menu systems, such as OX and WarMenu, depending on what's available on the server.
+
+- **openMenu(Menu, data)**
+
+  - Opens a context menu using the preferred menu system.
+  - Automatically selects between supported systems like OX or WarMenu based on availability.
+  - The `Menu` parameter should be a list of menu entries, and the `data` parameter can be used to set headers, subtexts, and actions like `onBack`, `onExit`, and `canClose`.
+  - **Example:**
+    ```lua
+    openMenu({
+        { header = "Option 1", txt = "Description 1", onSelect = function() print("Option 1 selected") end },
+        { header = "Option 2", txt = "Description 2", onSelect = function() print("Option 2 selected") end },
+    }, {
+        header = "Main Menu",
+        headertxt = "Select an option",
+        onBack = function() print("Return selected") end,
+        onExit = function() print("Menu closed") end,
+        canClose = true,
+    })
+    ```
+
+- **isOx()**
+
+  - Checks whether the OX context menu system is available on the server.
+  - Allows to do specific things if ox_lib menu is in use
+  - **Example:**
+    ```lua
+    if isOx() then
+        print("OX Context Menu is available")
+    end
+    ```
+
+- **isWarMenuOpen()**
+
+  - Returns whether WarMenu is currently open.
+  - Useful to prevent opening a new menu if one is already active.
+  - **Example:**
+    ```lua
+    if not isWarMenuOpen() then
+        openMenu("main_menu", menuData)
+    end
+    ```
+  - Returns whether the WarMenu is currently open.

documentation/main_functions/crafting.md

@@ -0,0 +1,39 @@
+### crafting.lua
+
+These functions support crafting logic, such as opening crafting menus, handling multi-craft operations, and creating item data from recipes.
+
+- **craftingMenu(data)**
+
+  - Opens a menu for selecting the quantity to craft.
+  - Presents the player with multiple crafting quantities based on `Config.Crafting.MultiCraftAmounts`.
+  - **Parameters:**
+    - `item` (`string`): The item to craft.
+    - `craft` (`table`): The crafting recipe.
+    - `craftable` (`table`): Crafting options.
+    - `coords` (`vector3`): Where crafting occurs.
+    - `stashName` (`string`): The stash name(s) for item availability.
+    - `onBack` (`function`): Callback when returning.
+    - `metadata` (`table`, optional): Metadata for the crafted item.
+  - **Example:**
+    ```lua
+    craftingMenu({
+         craftable = {
+             Header = "Weapon Crafting",
+             Recipes = {
+                 [1] = {
+                     ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 },
+                     amount = 1,
+                 },
+                 -- More recipes...
+             },
+             Anims = {
+                 animDict = "amb@prop_human_parking_meter@male@idle_a",
+                 anim = "idle_a",
+             },
+         },
+         coords = vector3(100.0, 200.0, 300.0),
+         stashTable = "crafting_stash",
+         job = "mechanic",
+         onBack = function() print("Returning to previous menu") end,
+    })
+    ```

documentation/main_functions/drawtext.md

@@ -0,0 +1,25 @@
+### drawText.lua
+
+These functions handle drawing and hiding styled on-screen prompts or UI overlays, compatible with different styling frameworks such as OX Lib.
+
+- **drawText(image, input, style, oxStyleTable)**
+
+  - Displays styled text or prompts on screen.
+  - Designed to adapt styling depending on which UI system (e.g., OX) is in use.
+  - **Parameters:**
+    - `image` (`string`): Optional icon or image path.
+    - `input` (`string`): The main text to display.
+    - `style` (`string|table`): Preset or custom styling.
+    - `oxStyleTable` (`table`, optional): Extended style options if using OX UI.
+  - **Example:**
+    ```lua
+    drawText("img_link", { "Test line 1", "Test Line 2" }, "~g~")
+    ```
+
+- **hideText()**
+
+  - Hides any active text or UI element previously drawn with `drawText()`.
+  - **Example:**
+    ```lua
+    hideText()
+    ```

documentation/main_functions/duifunctions.md

@@ -0,0 +1,31 @@
+### duifunctions.lua
+
+These functions support dynamic UI image rendering in 3D environments using runtime texture dictionaries. Ideal for integrating `nui://` or external `http://` image URLs into MLOs or world props.
+
+- **createDui(name, http, size, txd))**
+
+  - Sets up a runtime texture dictionary and links an image from a `nui://` or `http://` URL.
+  - This function should be used once to create the texture dictionary needed for rendering Dui images.
+  - **Example:**
+    ```lua
+    createDui("logo", "https://example.com/logo.png", { x = 512, y = 256 }, scriptTxd)
+    ```
+
+- **DuiSelect(data)**
+
+  - Updates the URL on an existing texture dictionary to change the rendered image.
+  - Can be used at runtime to swap out visuals in MLOs or props.
+  - **Parameters:**
+    - `textureDict` (`string`): The texture dictionary to target.
+    - `texture` (`string`): The specific texture name to override.
+    - `url` (`string`): The new image URL.
+    - `width`, `height` (`number`): The texture resolution.
+  - **Example:**
+    ```lua
+    DuiSelect({
+        name = "logo",
+        texn = "logoTex",
+        texd = "someTxd",
+        size = { x = 512, y = 256 }
+    })
+    ```

documentation/main_functions/input.md

@@ -0,0 +1,25 @@
+### input.lua
+
+This function displays a customizable input dialog for user text or number entry. It supports both simple and complex input structures.
+
+- **createInput(title, opts)**
+  - Opens a styled input dialog with configurable fields, labels, input types, and validation.
+  - Supports multiple field types including `text`, `number`, `password`, `checkbox`, `color`, `slider`, and more.
+  - **Parameters:**
+    - `title` (`string`): Title displayed at the top of the input box.
+    - `opts` (`table`): A table of fields with attributes like `label`, `name`, `type`, `value`, and more.
+  - **Example:**
+    ```lua
+    local userInput = createInput("Enter Details", {
+        { type = "text", text = "Name", name = "playerName", isRequired = true },
+        { type = "number", text = "Age", name = "playerAge", min = 18, max = 99 },
+        { type = "radio", label = "Gender", name = "playerGender", options = {
+            { text = "Male", value = "male" },
+            { text = "Female", value = "female" },
+            { text = "Other", value = "other" },
+        }},
+    })
+    if userInput then
+        print(json.encode(userInput))
+    end
+    ```

documentation/main_functions/inventories.md

@@ -0,0 +1,144 @@
+### inventories.lua
+
+These functions manage inventory locking, item checking, and player inventory retrieval.
+
+- **lockInv(toggle)**
+
+  - Locks or unlocks the player's inventory.
+  - Freezes/unfreezes movement and toggles hotbar state.
+  - **Example:**
+    ```lua
+    lockInv(true)  -- Lock inventory
+    lockInv(false) -- Unlock inventory
+    ```
+
+- **hasItem(items, amount, src)**
+
+  - Checks if a player has the specified item(s) in sufficient quantity.
+  - **Returns:**
+    - `boolean`: Whether the player has the item(s).
+    - `table`: Details of available item counts.
+  - **Example:**
+    ```lua
+    local hasAll, details = hasItem({"health_potion", "mana_potion"}, 2, playerId)
+    if hasAll then
+        -- Proceed with action
+    else
+        -- Inform the player about missing items
+    end
+    ```
+
+- **getPlayerInv(src)**
+
+  - Retrieves the player’s current inventory.
+  - May be used for inventory UI, logging, or crafting systems.
+  - **Example:**
+    ```lua
+    local inventory = getPlayerInv(playerId)
+    for k, item in pairs(inventory) do
+        print(item.name, item.amount)
+    end
+    ```
+
+### itemcontrol.lua
+
+This module includes a variety of utility functions for managing items in player inventories, including giving, removing, durability, and use logic.
+
+- **createUseableItem(item, funct)**
+
+  ⚠️ This doesn't work for `ox_inv`, you will need to add the event info to it's `items.lua`
+  - Registers a useable item and binds it to a callback function.
+  - **Example:**
+    ```lua
+    createUseableItem("bandage", function(source)
+        -- Heal logic here
+    end)
+    ```
+
+- **invImg(item)**
+
+  - Returns the inventory image path for an item.
+  - Automatically grabs the inventory image link based on inventory script
+  - **Example:**
+    ```lua
+    local imagePath = invImg("water_bottle")
+    print(imagePath)
+    ```
+
+- **addItem(item, amount, info, src)**
+
+  ⚠️ Requires Auth callback if called from client side
+  - Adds a specific amount of an item to a player's inventory.
+  - Automatically attempts to add items using detected inventory script
+  - **Example:**
+    ```lua
+    -- Client Side
+    addItem("lockpick", 3, {})
+
+    -- Server Side
+    addItem("lockpick", 3, {}, source)
+    ```
+
+- **removeItem(item, amount, src, slot)**
+
+  - Removes a specific amount of an item from a player’s inventory.
+  - Automatically attempts to remove item using detected inventory script
+  - **Example:**
+    ```lua
+    -- Client Side
+    removeItem(
+        "ammo_pistol",
+        30,
+        nil,
+        slot --[[optional]]--
+    )
+
+    -- Server Side
+    removeItem(
+        "ammo_pistol",
+        30,
+        source,
+        slot --[[optional]]--
+    )
+    ```
+
+- **dupeWarn(src, item, amount)**
+
+  - Logs or handles a potential duplication exploit involving an item.
+  - This is called automatically if a player has been triggered exploit detection
+  - Disabled if debugMode is enabled
+
+- **breakTool(data)**
+
+  - Breaks a tool or item, often due to exceeding durability.
+  - **Example:**
+    ```lua
+    breakTool({ item = "drill", damage = 10 })
+    ```
+
+- **getDurability(item)**
+
+  - Returns the current durability value of a given item.
+  - Searched for the lowest slot number (eg. slot 1) and retreives that items durability
+  - **Example:**
+    ```lua
+    local durability, slot = getDurability("drill")
+    if durability then
+        print("Durability:", durability)
+        print("Slot:", slot)
+    end
+    ```
+
+- **canCarry(itemTable, src)**
+
+  ⚠️ Currently server side only
+  - Checks if a player can carry the item(s) specified in `itemTable`.
+  - **Example:**
+    ```lua
+    local carryCheck = canCarry({ ["health_potion"] = 2, ["mana_potion"] = 3 }, playerId)
+    if carryCheck["health_potion"] and carryCheck["mana_potion"] then
+        -- Player can carry items.
+    else
+        -- Notify player.
+    end
+    ```

documentation/main_functions/jobfunctions.md

@@ -0,0 +1,64 @@
+### jobfunctions.lua
+
+This module provides functions for managing job-based logic, such as checking player roles, toggling duty status, and simulating job-related interactions.
+
+- **makeBossRoles(role)**
+
+  - Sets up boss-level permissions or access for the specified job role.
+  - Often used to determine if a player can access job menus or perform administrative actions.
+  - Used mainly for creating boss locked target tables
+  - **Example:**
+    ```lua
+    makeBossRoles("police")
+    ```
+
+- **jobCheck(job)**
+
+  - Simple check if the player has the specified job.
+  - **Example:**
+    ```lua
+    if jobCheck("mechanic") then
+        -- Allow mechanic features.
+    else
+        -- Deny access.
+    end
+    ```
+
+- **toggleDuty()**
+
+  - Toggles the player’s on/off duty status, typically used for jobs like police, EMS, etc.
+  - **Example:**
+    ```lua
+    toggleDuty()
+    ```
+
+- **washHands(data)**
+
+  - Simulates the action of washing hands, used in job scripts or medical job logic.
+  - Currently only animation and a notfication
+  - **Example:**
+    ```lua
+    washHands({ coords = vector3(200.0, 300.0, 40.0) })
+    ```
+
+- **useToilet(data)**
+
+  - Triggers toilet-use interaction, likely includes animation or sound.
+  - Currently only animation and a notfication
+  - **Example:**
+    ```lua
+    useToilet({ urinal = true })
+    -- Player uses a urinal with corresponding animations and notifications
+
+    useToilet({ urinal = false, sitcoords = vector4(215.76, -810.12, 29.73, 90.0) })
+    -- Player sits down to use a toilet with corresponding animations and notifications
+    ```
+
+- **useDoor(data)**
+
+  - Handles interactions with doors that aren't openable and teleports the player
+  - eg. Recycle Center, it's used to teleport the player from outside a building to the IPL
+  - **Example:**
+    ```lua
+    useDoor({ telecoords = vector4(215.76, -810.12, 29.73, 90.0) })
+    ```

documentation/main_functions/makefunctions.md

@@ -0,0 +1,156 @@
+### makeBlip.lua
+
+This module provides simple utilities for adding static or entity-based blips to the minimap.
+
+❔ This has basic support for RedM too
+- **makeBlip(data)**
+
+  - This function adds a map blip at the provided coordinates and sets various display properties such as sprite, color, scale, and more.
+  - It also handles attaching a preview image to the blip if certain resources are running and a preview is provided.
+  - **Example:**
+    ```lua
+    local blipData = {
+        coords = vector3(123.4, 567.8, 90.1),
+        sprite = 1,
+        col = 2,
+        scale = 0.8,
+        disp = 4,
+        category = 7,
+        name = "My Blip",
+        preview = "http://example.com/preview.png"
+    }
+    local blip = makeBlip(blipData)
+    ```
+
+- **makeEntityBlip(data)**
+
+  - This function adds a map blip attached to the provided entity and sets various display properties such as sprite, color, scale, and more.
+  - It also handles attaching a preview image to the blip if certain resources are running and a preview is provided.
+  - **Example:**
+    ```lua
+    local blipData = {
+        entity = myEntity,
+        sprite = 1,
+        col = 2,
+        scale = 0.8,
+        disp = 4,
+        category = 7,
+        name = "Entity Blip",
+        preview = "http://example.com/preview.png"
+    }
+    local blip = makeEntityBlip(blipData)
+    ```
+
+### makePed.lua
+This module provides tools to create persistent or distance-based NPCs with optional animations, scenarios, and config randomization.
+
+- **makeDistPed(data, coords, freeze, collision, scenario, anim, synced)**
+
+  - Creates a ped that only spawns when nearby (performance optimization).
+  - **Example:**
+    ```lua
+    makeDistPed({model = "a_m_y_business_03" },                                 -- model data
+        vector4(450.0, -980.0, 30.0, 100.0),                                    -- coords
+        true,                                                                   -- freeze entity
+        false,                                                                  -- collision
+        'WORLD_HUMAN_STAND_IMPATIENT',                                          -- Scenario Animation
+        { dict = "amb@world_human_clipboard@male@idle_a", anim = "idle_c" },    -- Anim Table
+        true                                                                    -- Network Synced
+    )
+    ```
+
+- **makePed(data, coords, freeze, collision, scenario, anim, synced)**
+
+  - Spawns a ped with more persistent behavior at the given location.
+  - Supports animation playback and freezing.
+  - **Example:**
+    ```lua
+    makePed({model = "a_m_y_business_03" },                                 -- model data
+        vector4(450.0, -980.0, 30.0, 100.0),                                    -- coords
+        true,                                                                   -- freeze entity
+        false,                                                                  -- collision
+        'WORLD_HUMAN_STAND_IMPATIENT',                                          -- Scenario Animation
+        { dict = "amb@world_human_clipboard@male@idle_a", anim = "idle_c" },    -- Anim Table
+        true                                                                    -- Network Synced
+    )
+    ```
+
+- **GenerateRandomPedData(data)**
+
+  - Returns randomized ped model/configuration based on input table.
+  - Useful for dynamic NPC generation.
+  - **Example:**
+    ```lua
+    local pedData = GenerateRandomPedData({ model = `MP_M_Freemode_01`, custom = {} })
+    ```
+
+### makeProp.lua
+This module allows you to spawn static or distance-loaded props in the world.
+
+- **makeProp(data, freeze, synced)**
+
+  - This function loads the model, creates the object, sets its heading, and freezes it if specified.
+  - **Example:**
+    ```lua
+    local propData = {
+        prop = 'prop_chair_01a',
+        coords = vector4(123.4, 567.8, 90.1, 180.0)
+    }
+    local prop = makeProp(propData, true, false)
+    ```
+
+- **makeDistProp(data, freeze, synced, range)**
+  - Same as `makeProp`, but only spawns if the player is within the specified range.
+  - **Example:**
+    ```lua
+    local propData = {
+        prop = 'prop_chair_01a',
+        coords = vector4(123.4, 567.8, 90.1, 180.0)
+    }
+    makeDistProp(propData, true, false)
+    ```
+
+- **destroyProp(entity)**
+  - Removes a previously created or targeted prop from the world.
+  - **Example:**
+    ```lua
+    destroyProp(barrel)
+    ```
+
+### makeVeh.lua
+This module provides functionality for spawning vehicles, including distance-based optimization and entity management.
+
+- **makeVeh(model, coords)**
+
+  - This function loads the vehicle model, creates the vehicle in the world at the given coordinates, sets initial properties, and returns the vehicle handle.
+  - **Example:**
+    ```lua
+    local vehicle = makeVeh("adder", vector3(250.0, -1000.0, 30.0))
+    ```
+
+- **makeDistVehicle(data, radius, onEnter, onExit)**
+
+  - Creates a vehicle that spawns when the player enters a designated polyzone area.
+  - This is used for `jim-parking` to create a static vehicle that can't move
+  - **Example:**
+    ```lua
+    makeDistVehicle({
+        model = "blista",
+        coords = vector3(400.0, -800.0, 30.0),
+        heading = 180.0
+    }, 50.0)
+    ```
+
+- **removeDistVehicleZone(zoneId)**
+  - Removes a previously created distance-based vehicle zone.
+  - **Example:**
+    ```lua
+    removeDistVehicleZone("garage_zone_1")
+    ```
+
+- **deleteVehicle(vehicle)**
+  - Deletes a specified vehicle entity.
+  - **Example:**
+    ```lua
+    deleteVehicle(vehicle)
+    ```

documentation/main_functions/metahandlers.md

@@ -0,0 +1,32 @@
+### metaHandlers.lua
+
+This module provides access and control over player metadata, which is useful for storing temporary or persistent player-specific values like stats, states, or tags.
+
+- **GetPlayer(source)**
+
+  ⚠️ Server side only
+  - Retrieves the player object (as defined by the framework in use) from the given `source` ID.
+  - **Example:**
+    ```lua
+    local player = GetPlayer(playerId)
+    ```
+
+- **GetMetadata(player, key)**
+
+  - Retrieves the value of a metadata field from the given player.
+  - If called client-side (player is nil), it triggers a server callback to retrieve metadata.
+  - **Example:**
+    ```lua
+    local stress = GetMetadata(player, "stress")
+    print("Player stress level:", stress)
+    ```
+
+- **setPlayerMetadata(player, key, value)**
+
+  ⚠️ Server side only
+  - Updates or assigns a value to a specific metadata key for a player.
+  - The function updates the player's metadata using the active core export.
+  - **Example:**
+    ```lua
+    setPlayerMetadata(player, "stress", 0)
+    ```

documentation/main_functions/notify.md

@@ -0,0 +1,21 @@
+### notify.lua
+
+This module provides a unified interface to trigger styled notifications across supported frameworks.
+
+- **triggerNotify(title, message, type, src)**
+
+  - Sends a notification to a player (or to the entire client if `src` is `nil`).
+  - The notification style is determined by `type` (e.g., `success`, `error`, `info`).
+  - **Parameters:**
+    - `title` (`string`): The title or header of the notification.
+    - `message` (`string`): The body or detail text.
+    - `type` (`string`): Type of message (e.g., "success", "error", "info").
+    - `src` (`number`, optional): Server ID of the player to notify (omit to notify locally).
+  - **Example:**
+    ```lua
+    -- Client-side usage without specifying a player (shows to the current player)
+    triggerNotify("Success", "You have completed the task!", "success")
+
+    -- Server-side usage specifying a player by their server ID
+    triggerNotify("Alert", "You have been warned for misconduct.", "error", source)
+    ```

documentation/main_functions/phones.md

@@ -0,0 +1,21 @@
+### phones.lua
+
+This module allows you to send in-game mail/messages to player phones, depending on the phone system integrated (e.g., QB, NPWD).
+
+- **sendPhoneMail(data)**
+
+  - Sends a mail message to a player's in-game phone app.
+  - Typically used to notify players about deliveries, missions, or reminders.
+  - **Parameters:**
+    - `data` (`table`): Must contain phone/mail system-compatible fields like `sender`, `subject`, `message`, and `receiver`.
+  - **Example:**
+    ```lua
+    sendPhoneMail({
+        subject = "Welcome!",
+        sender = "Admin",
+        message = "Thank you for joining our server.",
+        actions = {
+            { label = "Reply", action = replyFunction }
+        }
+    })
+    ```

documentation/main_functions/playerfunctions.md

@@ -0,0 +1,115 @@
+### playerfunctions.lua
+
+This module contains helper functions for manipulating player states, interactions, and utility checks.
+
+- **instantLookEnt(ent, ent2)**
+
+  - Instantly turns an entity to face a target (entity or coordinates) without animation.
+  - **Example:**
+    ```lua
+    instantLookEnt(nil, vector3(200.0, 300.0, 40.0))
+    instantLookEnt(ped1, ped2)
+    ```
+
+- **lookEnt(entity)**
+
+  - Makes the current player look toward the given entity.
+  - Usually called after when opening a menu or something similar to make the player visually face the location
+  - **Example:**
+    ```lua
+    lookEnt(vector3(200.0, 300.0, 40.0))
+    lookEnt(pedEntity)
+    ```
+
+- **setThirst(src, thirst)**
+
+  ⚠️ Server Side Only
+  - Sets the thirst level of a player.
+  - **Example:**
+    ```lua
+    setThirst(source, 75)
+    ```
+
+- **setHunger(src, hunger)**
+
+  ⚠️ Server Side Only
+  - Sets the hunger level of a player.
+  - **Example:**
+    ```lua
+    setHunger(source, 50)
+    ```
+
+- **chargePlayer(cost, moneyType, newsrc)**
+
+  ⚠️ Server Side Only
+  - Deducts money from a player of the specified type (`cash`, `bank`, etc).
+  - **Example:**
+    ```lua
+    chargePlayer(100, "cash", source)
+    ```
+
+- **fundPlayer(fund, moneyType, newsrc)**
+
+  ⚠️ Server Side Only
+  - Adds money to a player's balance of a given type.
+  - **Example:**
+    ```lua
+    fundPlayer(250, "bank", source)
+    ```
+
+- **ConsumeSuccess(itemName, type, data)**
+
+  - Handles logic when an item is successfully consumed (e.g., food, drink, etc).
+  - Supports hunger and thirst info directly from table eg. `{ hunger = 10, thirst = 20 }`
+  - **Example:**
+    ```lua
+    ConsumeSuccess("health_pack", "food", { hunger = 10 })
+
+    ConsumeSuccess("beer", "alcohol", { thirst = 20 })
+    ```
+
+- **hasJob(job, source, grade)**
+
+  - Checks if a player has a certain job and optionally checks for a specific grade.
+  - Similar to `jobCheck()` but also retrieves as much player job info as possible
+  - **Example:**
+    ```lua
+    -- Check if the player has the 'police' job and is on duty
+    local hasPoliceJob, isOnDuty = hasJob("police")
+    if hasPoliceJob and isOnDuty then
+        -- Grant access to police-specific features
+    end
+
+    -- Check if a specific player has the 'gang_leader' job with at least grade 2
+    local hasGangLeaderJob, _ = hasJob("gang_leader", playerId, 2)
+    if hasGangLeaderJob then
+        -- Allow gang leader actions
+    end
+    ```
+
+- **getPlayer(source)**
+
+  - Retrieves basic player information (name, cash, bank, job, etc.) based on the active core/inventory system.
+  - Can be called server-side (passing a player source) or client-side (for current player).
+  - Called often in my scripts as its makes use of frameworks "GetPlayerData" etc.
+  - **Example:**
+    ```lua
+    -- Get information for a specific player
+    local playerInfo = getPlayer(playerId)
+    print(playerInfo.name, playerInfo.cash, playerInfo.bank)
+
+    -- Get information for the current player (client-side)
+    local myInfo = getPlayer()
+    print(myInfo.name, myInfo.cash, myInfo.bank)
+    ```
+
+- **GetPlayersFromCoords(coords, radius)**
+
+  - Returns a list of players within a specified radius of a set of coordinates.
+  - **Example:**
+    ```lua
+    local nearby = GetPlayersFromCoords(GetEntityCoords(PlayerPedId()), 10.0)
+    for _, playerId in pairs(nearby) do
+        print("Nearby player ID:", playerId)
+    end
+    ```

documentation/main_functions/polyzone.md

@@ -0,0 +1,44 @@
+### polyZone.lua
+
+This module provides helpers for creating and removing polygon or circular zones using PolyZone-compatible data structures.
+
+- **createPoly(data)**
+
+  - Creates a polygonal zone using the detected polyzone library (ox_lib or PolyZone).
+  - Automatically checks which polyzone script is active. When using ox_lib, it converts the provided 2D points to 3D (setting a constant z value) and sets a thickness value.
+  - For PolyZone, it creates the zone and attaches onEnter and onExit callbacks for ease of use.
+  - **Example:**
+    ```lua
+    createPoly({
+        name = 'testZone',
+        debug = true,
+        points = { vec2(100.0, 100.0), vec2(200.0, 100.0), vec2(200.0, 200.0), vec2(100.0, 200.0) },
+        onEnter = function() print("Entered Test Zone") end,
+        onExit = function() print("Exited Test Zone") end,
+    })
+    ```
+
+- **createCirclePoly(data)**
+
+ - When using ox_lib, it creates a sphere zone. For PolyZone, it creates a CircleZone and attaches onEnter and onExit callbacks.
+  - **Example:**
+    ```lua
+    createCirclePoly({
+        name = 'circleZone',
+        coords = vector3(150.0, 150.0, 20.0),
+        radius = 50.0,
+        onEnter = function() print("Entered Circle Zone") end,
+        onExit = function() print("Exited Circle Zone") end,
+    })
+    ```
+
+- **removePolyZone(Location)**
+
+  - Removes a previously created polygon or circle zone by name.
+  - Detects the active polyzone library and calls the appropriate removal method.
+  - **Example:**
+    ```lua
+    local zone = createPoly({...})
+    ---
+    removePolyZone(zone)
+    ```

documentation/main_functions/progressbars.md

@@ -0,0 +1,23 @@
+### progressBars.lua
+This module provides a unified progress bar system compatible with various UI frameworks.
+
+❔It also contains an experimental "Shared Progressbar" system which was created for things like "giving an item to another player"
+
+- **progressBar(data)**
+  - Displays a progress bar using the current configured system (e.g., ox_lib, qb, etc).
+  - **Example:**
+    ```lua
+    local success = progressBar({
+        label = "Processing...",
+        time = 5000,
+        dict = "amb@world_human_hang_out_street@female_hold_arm@base",
+        anim = "base",
+        flag = 49,
+        cancel = true,
+    })
+    if success then
+        print("Success!")
+    else
+        print("Cancelled")
+    end
+    ```

documentation/main_functions/scaleentity.md

@@ -0,0 +1,24 @@
+### scaleEntity.lua
+
+This utility provides a simple interface to scale an entity (ped, object, vehicle) in the world.
+
+⚠️ **Important:** Unless the model's collision is removed or modified, the scale will reset when interacted with by other entities (e.g., walking into it, driving over it).
+
+- **scaleEntity(entity, scale)**
+
+  - Scales the specified entity by the given factor.
+  - **Parameters:**
+    - `entity` (`number`): Entity handle (ped, object, vehicle).
+    - `scale` (`number`): Scale factor (e.g., `1.0` is normal size, `0.5` is half size).
+  - **Example:**
+    ```lua
+    scaleEntity(PlayerPedId(), 0.8) -- Shrinks player slightly
+    ```
+
+- **resetScale(entity)**
+
+  - Resets the entity's scale back to its original default.
+  - **Example:**
+    ```lua
+    resetScale(PlayerPedId()) -- Return to default size
+    ```

documentation/main_functions/shops.md

@@ -0,0 +1,63 @@
+### shops.lua
+
+This module provides functions to open, sell to, and register in-game shops and markets.
+
+- **sellMenu(data)**
+
+  - Opens a UI menu for selling items to a vendor or market system.
+  - A simple system for the ability to sell all of an item in a players inventory
+  - Good for money making eg. pawn shops
+  - **Example:**
+    ```lua
+    sellMenu({
+        sellTable = {
+            Header = "Sell Items",
+            Items = {
+                ["gold_ring"] = 100,
+                ["diamond"] = 500,
+            },
+        },
+        ped = pedEntity,
+        onBack = function() print("Returning to previous menu") end,
+    })
+    ```
+
+- **sellAnim(data)**
+
+  - Plays an animation during the selling process for immersion.
+  - Used in sellMenu, but can be called externally if needed
+  - **Example:**
+    ```lua
+    sellAnim({
+       item = "gold_ring",
+       price = 100,
+       ped = pedEntity,
+       onBack = function() print("Sold Items") end,
+    )
+    ```
+
+- **openShop(data)**
+
+  - Opens a shop interface for purchasing items.
+  - Checks job/gang restrictions, then uses the active inventory system to open the shop.
+  - **Example:**
+    ```lua
+    openShop({
+        shop = "weapon_shop",
+        items = weaponShopItems,
+        coords = vector3(100.0, 200.0, 300.0),
+        job = "police",
+    })
+    ```
+
+- **registerShop(name, label, items, society)**
+
+  - Registers a named shop with associated items and an optional society for fund handling.
+  - Supports either OXInv or QBInv (with QBInvNew flag).
+  - **Example:**
+    ```lua
+    registerShop("fishing_shop", "Bait & Tackle", {
+        { item = "fishing_rod", price = 50 },
+        { item = "bait", price = 5 }
+    }, "fishing_society")
+    ```

documentation/main_functions/skillcheck.md

@@ -0,0 +1,16 @@
+### skillcheck.lua
+
+This module provides a UI-based skill check system, useful for crafting, hacking, or other interactive gameplay scenarios.
+
+- **skillCheck()**
+
+  - Starts a skill check minigame sequence using the provided configuration.
+  - Configuration may define speed, difficulty, bar size, or success zones.
+  - **Example:**
+    ```lua
+    if skillCheck() then
+        print("Success!")
+    else
+        print("Failed :(")
+    end
+    ```

documentation/main_functions/societybank.md

@@ -0,0 +1,28 @@
+### societybank.lua
+
+This module handles financial operations for society accounts, typically used for jobs or organizations.
+
+- **getSocietyAccount(society)**
+
+  - Retrieves the current balance for the specified society.
+  - **Example:**
+    ```lua
+    local balance = getSocietyAccount("police")
+    print("Police account balance: $"..balance)
+    ```
+
+- **chargeSociety(society, amount)**
+
+  - Deducts a specified amount from the society's account.
+  - **Example:**
+    ```lua
+    chargeSociety("police", 500)
+    ```
+
+- **fundSociety(society, amount)**
+
+  - Adds funds to a society’s account.
+  - **Example:**
+    ```lua
+    fundSociety("ambulance", 1200)
+    ```

documentation/main_functions/stashcontrol.md

@@ -0,0 +1,44 @@
+### stashcontrol.lua
+
+This module handles logic for interacting with stashes—shared inventories for crafting, jobs, or storage systems.
+
+- **checkStashItem(stashes, itemTable)**
+
+  - Retrieves (or updates) a local stash cache entry with a timeout.
+  - **Example:**
+    ```lua
+    local found, foundinStash = checkStashItem({"crafting_stash"}, { item = "steel", amount = 2 })
+    if found then print("Found item in "..foundInStash) end
+    ```
+
+- **openStash(data)**
+
+  - Opens a stash using the active inventory system.
+  - Checks for job or gang restrictions before opening the stash.
+  - **Example:**
+    ```lua
+    openStash({
+        stash = "playerStash",
+        label = "Player Stash",
+        coords = vector3(100, 200, 30)
+    })
+    ```
+
+- **getStash(stashName)**
+
+  - Retrieves the stash data by name (usually used for querying contents).
+  - **Example:**
+    ```lua
+    local items = getStash("playerStash")
+    for k, v in pairs(items) do
+        print(k)
+    end
+    ```
+
+- **stashRemoveItem(stashItems, stashName, items)**
+
+  - Removes specified items from a stash. Used during crafting or transfers.
+  - **Example:**
+    ```lua
+    stashRemoveItem(currentItems, "playerStash", { iron = 2, wood = 5 })
+    ```

documentation/main_functions/targets.md

@@ -0,0 +1,108 @@
+### targets.lua
+
+⚠️ This module provides utility functions for adding and removing interaction targets with entities, models, zones, and coordinates. Supports common targeting frameworks like `ox_target`, `qb-target`, and more.
+
+- **createEntityTarget(entity, opts, dist)**
+
+  - Adds interaction targets to a specific in-world entity.
+  - **Example:**
+    ```lua
+    createEntityTarget(entityId, {
+       {
+           action = function()
+               openStorage()
+           end,
+           icon = "fas fa-box",
+           job = "police",
+           label = "Open Storage",
+       },
+    }, 2.0)
+    ```
+
+- **createBoxTarget(data, opts, dist)**
+
+  - Creates an interactable box zone with configurable options.
+  - **Example:**
+    ```lua
+    createBoxTarget(
+       {
+           'storageBox',
+           vector3(100.0, 200.0, 30.0),
+           2.0,
+           2.0,
+           {
+               name = 'storageBox',
+               heading = 100.0,
+               debugPoly = true,
+               minZ = 27.0,
+               maxZ = 32.0,
+           },
+       },
+    {
+       {
+           action = function()
+               openStorage()
+           end,
+           icon = "fas fa-box",
+           job = "police",
+           label = "Open Storage",
+       },
+    }, 2.0)
+    ```
+
+- **createCircleTarget(data, opts, dist)**
+
+  - Creates an interactable circular zone.
+  - **Example:**
+    ```lua
+    createCircleTarget({
+        name = 'centralPark',
+        coords = vector3(200.0, 300.0, 40.0),
+        radius = 50.0,
+        options = { debugPoly = false }
+    }, {
+        { icon = "fas fa-tree", label = "Relax", action = relaxAction }
+    }, 2.0)
+    ```
+
+- **createModelTarget(models, opts, dist)**
+
+  - Adds interactions to all matching models globally.
+  - **Example:**
+    ```lua
+    createModelTarget({ model1, model2 },
+    {
+       {
+           action = function()
+               openStorage()
+           end,
+           icon = "fas fa-box",
+           job = "police",
+           label = "Open Storage",
+       },
+    }, 2.0)
+    ```
+
+- **removeEntityTarget(entity)**
+
+  - Removes all targets linked to the specified entity.
+  - **Example:**
+    ```lua
+    removeEntityTarget(vehicle)
+    ```
+
+- **removeZoneTarget(target)**
+
+  - Removes a named zone-based target.
+  - **Example:**
+    ```lua
+    removeZoneTarget("shop_box")
+    ```
+
+- **removeModelTarget(model)**
+
+  - Removes interactions tied to a model globally.
+  - **Example:**
+    ```lua
+    removeModelTarget("prop_vend_soda")
+    ```

documentation/main_functions/vehicles.md

@@ -0,0 +1,63 @@
+### vehicles.lua
+
+This module provides utilities for reading, modifying, and interacting with vehicle properties and positioning.
+
+- **searchCar(vehicle)**
+
+  - Searches the 'Vehicles' table for a specific vehicle's details.
+  - If the vehicle differs from the last searched, it retrieves its model and updates the carInfo table.
+  - The table includes the vehicle's name, price, and class information.
+  - **Example:**
+    ```lua
+    local info = searchCar(vehicleEntity)
+    print(info.name, info.price, info.class.name, info.class.index)
+    ```
+
+- **getVehicleProperties(vehicle)**
+
+  - Retrieves the properties of a given vehicle using the active framework.
+  - **Example:**
+    ```lua
+    local props = getVehicleProperties(vehicle)
+    if props then
+        print(json.encode(props))
+    end
+    ```
+
+- **setVehicleProperties(vehicle, props)**
+
+  - Sets the properties of a given vehicle if changes are detected.
+  - It compares the current properties with the new ones and applies the update using the active framework.
+  - **Example:**
+    ```lua
+    setVehicleProperties(vehicle, props)
+    ```
+
+- **checkDifferences(vehicle, newProps)**
+
+  - Checks for differences between the current and new vehicle properties.
+  - Compares properties using JSON encoding for deep comparison and logs differences.
+  - **Example:**
+    ```lua
+    if checkDifferences(vehicleEntity, newProperties) then
+        setVehicleProperties(vehicleEntity, newProperties)
+    end
+    ```
+
+- **pushVehicle(entity)**
+
+  - This function ensures that the vehicle is controlled by the current player and is set as a mission entity.
+  - It requests network control and sets the vehicle accordingly to synchronize changes across clients.
+  - **Example:**
+    ```lua
+    pushVehicle(vehicle)
+    ```
+
+- **getClosestVehicle(coords, src)**
+
+  - Finds the closest vehicle to the specified coordinates.
+  - The function uses different APIs based on whether a source is provided.
+  - **Example:**
+    ```lua
+    local closestVeh, distance = getClosestVehicle({ x = 100, y = 200, z = 30 }, source)
+    ```

documentation/main_functions/wrapperfunctions.md

@@ -0,0 +1,37 @@
+### wrapperfunctions.lua
+
+Provides wrapper compatibility functions for command and inventory stash systems across different frameworks (OX, QB, ESX, etc).
+
+- **registerCommand(command, options)**
+
+  ⚠️ Server Side Only
+  - Registers a command using the appropriate framework's API.
+  - **Parameters:**
+    - `command`: Command name (string)
+    - `options`: Table including help, params, callback, autocomplete, restrictedGroup
+  - **Example:**
+    ```lua
+    registerCommand("greet", {
+        "Greets the player",
+        { name = "name", help = "Name of the player to greet" },
+        function(source, args) print("Hello, "..args[1].."!") end,
+        nil,
+        "admin"
+    })
+    ```
+
+- **registerStash(name, label, slots?, weight?, owner?, coords?)**
+
+  ⚠️ Server Side Only
+  - Registers a stash using OX, or Origen inventory systems.
+  - **Example:**
+    ```lua
+    registerStash(
+        "playerStash",
+        "Player Stash",
+        100,
+        8000000,
+        "player123",
+        { x = 100.0, y = 200.0, z = 30.0 }
+    )
+    ```

documentation/scaleforms.md

@@ -0,0 +1,129 @@
+## Scaleforms
+### debugScaleform.lua
+This module renders debug text in-game when `debugMode` is enabled. Useful for live diagnostics or UI placement feedback.
+
+- **debugScaleForm(textTable, loc)**
+  - Displays an overlay of lines of text at the specified screen location.
+  - **Note:** This only works if `debugMode` is set to `true`.
+  - **Parameters:**
+    - `textTable` (`table`): A list of strings to display.
+    - `loc` (`vector2`, optional): Top-left anchor point on screen (default: `vec2(0.05, 0.65)`).
+  - **Example:**
+    ```lua
+    CreateThread(function()
+        while true do
+            debugScaleForm({
+                "Line 1: Debug info",
+                "Line 2: More info"
+            })
+            Wait(0)
+        end
+    end)
+    ```
+
+### instructionalButtons.lua
+This module renders instructional button prompts using native scaleforms in GTA V and RedM.
+
+⚠️ **Note:** Because it uses native scaleforms, it must be run inside a `while` loop to remain visible.
+
+- **makeInstructionalButtons(info)**
+  - Draws instructional buttons using the GTA scaleform `instructional_buttons`.
+  - **Parameters:**
+    - `info` (`table`): An array of tables, where each entry contains:
+      - `keys` (`table`): Control key codes (e.g., `{38, 29}`).
+      - `text` (`string`): The label for the button.
+  - **Example:**
+    ```lua
+    CreateThread(function()
+        while true do
+            makeInstructionalButtons({
+                { keys = {38, 29}, text = "Open Menu" },
+                { keys = {45}, text = "Close Menu" }
+            })
+            Wait(0)
+        end
+    end)
+    ```
+
+- **makeRedInstructionalButtons(info, title)**
+  - Experimental: Displays prompts using RedM-style `PromptSetGroup` API.
+  - **Note:** Still must be run in a loop for visibility.
+  - **Example:**
+    ```lua
+    CreateThread(function()
+        while true do
+            makeRedInstructionalButtons({
+                { keys = {0x760A9C6F}, text = "Mount Horse" },
+                { keys = {0x4CC0E2FE}, text = "Dismount" }
+            }, "Horse Controls")
+            Wait(0)
+        end
+    end)
+    ```
+
+### scaleform_basic.lua
+This module includes helper functions for 3D text rendering and UI overlays using basic native scaleform techniques.
+
+- **DrawText3D(coord, text, highlight)**
+
+  - Draws 3D text in the world at the given coordinates, with optional highlight.
+  - Includes a semi-transparent black background box for visibility.
+  - **Parameters:**
+    - `coord` (`vector3`): World position to draw text.
+    - `text` (`string`): Text content.
+    - `highlight` (`boolean`, optional): Highlights `~w~` sections with yellow.
+  - **Example:**
+    ```lua
+    CreateThread(function()
+        while true do
+            DrawText3D(vector3(100, 200, 300), "Hello World", true)
+            Wait(0)
+        end
+    end)
+    ```
+
+- **DisplayHelpMsg(text)**
+  - Shows a help message in the top-left corner of the screen.
+  - **Example:**
+    ```lua
+    DisplayHelpMsg("Press E to interact")
+    ```
+
+- **displaySpinner(text)**
+  - Shows a busy spinner with a message (e.g., "Saving...").
+  - **Example:**
+    ```lua
+    displaySpinner("Saving data...")
+    ```
+
+- **stopSpinner()**
+  - Hides any active busy spinner (client-only).
+  - **Example:**
+    ```lua
+    stopSpinner()
+    ```
+
+### timerBars.lua
+This module provides a native scaleform-based timer bar HUD. Ideal for displaying tasks, loading indicators, or time-sensitive objectives.
+
+- **createTimerHud(title, data, alpha)**
+
+  ⚠️ This was an attempt to recreate the gta native shooting ranges )fairly specific use case)
+  - Draws a timer bar with custom label and right-aligned values using the native GTA HUD system.
+  - **Parameters:**
+    - `title` (`string`): Title/header displayed on the bar.
+    - `data` (`table`): List of `label = value` entries to display (max 4 rows).
+    - `alpha` (`number`, optional): Opacity of the bar (0-255).
+  - **Example:**
+    ```lua
+    CreateThread(function()
+        while true do
+            createTimerHud("Timer Bar", {
+                { stat = "Health", value = "85%" },
+                { stat = "Armor", value = "50%", multi = 2 },
+                { stat = "Stamina", value = "100%" },
+            }, 180)
+            Wait(0)
+        end
+    end)
+    ```

frameworkCache.lua

@@ -0,0 +1,556 @@
+--[[
+    Cached Resource Initialization Module
+    --------------------------------------
+    Initializes shared resource data (Items, Vehicles, Jobs, Gangs) once and caches it
+    to improve performance and reduce redundant data fetching across scripts.
+]]
+
+-- Define resource names used in different frameworks
+local Exports = {
+    QBExport = "qb-core",
+    QBXExport = "qbx_core",
+    ESXExport = "es_extended",
+    OXCoreExport = "ox_core",
+
+    OXInv = "ox_inventory",
+    QBInv = "qb-inventory",
+    PSInv = "ps-inventory",
+    CoreInv = "core_inventory",
+    CodeMInv = "codem-inventory",
+    OrigenInv = "origen_inventory",
+    TgiannInv = "tgiann-inventory",
+    JPRInv = "jpr-inventory",
+
+    OXLibExport = "ox_lib",
+
+    QBMenuExport = "qb-menu",
+
+    QBTargetExport = "qb-target",
+    OXTargetExport = "ox_target",
+
+    -- REDM
+    RSGExport = "rsg-core",
+    RSGInv = "rsg-inventory",
+
+    VorpExport = "vorp_core",
+    VorpInv = "vorp_inventory",
+    VorpMenu = "vorp_menu",
+}
+
+-- Prevent reloading if cache is already initialized
+local cache = { Items = {}, Vehicles = {}, Jobs = {}, Gangs = {}, }
+local cacheReady = false
+
+-- Timer info, for debugging more then anything
+local timers = {}
+local function startTimer(label)
+    timers[label] = GetGameTimer()
+end
+
+local function endTimer(label)
+    timers[label] = GetGameTimer() - (timers[label] or GetGameTimer())
+    timers[label] = "("..(timers[label] / 1000).."s)"
+end
+startTimer("Cache") startTimer("Items") startTimer("Vehicles") startTimer("Jobs") startTimer("InvWeight") startTimer("InvSlots")
+
+-- Helper functions --
+local function checkExists(resourceName)
+    local state = GetResourceState(resourceName)
+    return state and (state:find("start") or state:find("stopped"))
+end
+
+local function waitStarted(resourceName)
+    while GetResourceState(resourceName) ~= "started" do Wait(100) end
+end
+
+local function waitStartedOrStopped(resourceName)
+    local state = GetResourceState(resourceName)
+    while state ~= "started" and state ~= "stopped" do
+        Wait(100)
+        state = GetResourceState(resourceName)
+    end
+end
+
+local function dupLowercaseWeapons(items)
+    for k, v in pairs(items or {}) do
+        if type(k) == "string" then
+            if k:find("WEAPON") then
+                items[k:lower()] = v
+            end
+        else
+            print("^1ERROR^7: ^1Possible table inside a table, check your items.lua^7?")
+            print("^1Possible Issue found^7:")
+            print(json.encode(items[k], { indent = true }))
+        end
+    end
+end
+
+-- Forceload libs --
+
+-- Ensure oxmysql resource is loaded for jim_bridge internally
+-- For some core's it needs to get data from the database
+if checkExists(Exports.OXCoreExport) or checkExists(Exports.ESXExport) or checkExists(Exports.VorpExport) then
+    local fileLoader = assert(load(LoadResourceFile("oxmysql", ('lib/MySQL.lua')), ('@@oxmysql/lib/MySQL.lua')))
+    fileLoader()
+end
+
+if checkExists(Exports.OXCoreExport) then
+    -- Detected OX_Core in server, wait for it to be started if needed
+    waitStartedOrStopped(Exports.OXCoreExport)
+    local fileLoader = assert(load(LoadResourceFile(Exports.OXCoreExport, ('lib/init.lua')), ('@@'..Exports.OXCoreExport..'/lib/init.lua')))
+    fileLoader()
+end
+if checkExists(Exports.ESXExport) then
+    -- Detected ESX in server, wait for it to be started if needed
+    waitStarted(Exports.ESXExport)
+    local fileLoader = assert(load(LoadResourceFile(Exports.ESXExport, ('/imports.lua')), ('@@'..Exports.ESXExport..'/imports.lua')))
+    fileLoader()
+end
+
+-- Initialize variables for caching
+local itemResource, jobResource, vehResource = "N/A", "N/A", "N/A"
+
+-- Print just to announce it knows the exports/scripts exist in the server
+for _, v in pairs(Exports) do
+    if checkExists(v) then
+        print("^6Bridge^7: '^3"..v.."^7' detected")
+    end
+end
+
+---------------------
+---- Load Items -----
+---------------------
+
+local itemFunc = {
+    {   script = Exports.OXInv,
+        cacheItem = function()
+            local success, result = pcall(function()
+                return exports[Exports.OXInv]:Items()
+            end)
+            if success and result then
+                cache.Items = result
+            end
+        end,
+    },
+    {   script = Exports.TgiannInv,
+        cacheItem = function()
+            local success, result = pcall(function()
+                return exports[Exports.TgiannInv]:Items()
+            end)
+            if success and result then
+                cache.Items = result
+            end
+        end,
+    },
+    {   script = Exports.QBXExport,
+        cacheItem = function()
+            cache.Items = exports[Exports.QBExport]:GetCoreObject().Shared.Items
+            -- If this is nil, they need to update to qbx_core 1.23.0+
+            if not cache.Items then
+                -- if their inventory doesn't allow that (they refuse to update their butchered core replacement):
+
+                if GetResourceState(Exports.OrigenInv):find("start") then
+                    itemResource = Exports.OrigenInv
+                    cache.Items = exports[Exports.OrigenInv]:Items()
+
+                elseif GetResourceState(Exports.CodeMInv):find("start") then
+                    itemResource = Exports.CodeMInv
+                    cache.Items = exports[Exports.CodeMInv]:GetItemList()
+
+                elseif GetResourceState(Exports.CoreInv):find("start") then
+                    itemResource = Exports.CoreInv
+                    cache.Items = exports[Exports.CoreInv]:getItemsList()
+
+                elseif GetResourceState(Exports.TgiannInv):find("start") then
+                    itemResource = Exports.TgiannInv
+                    cache.Items = exports[Exports.TgiannInv]:Items()
+                end
+            end
+        end,
+    },
+    {   script = Exports.QBExport,
+        cacheItem = function()
+            cache.Items = exports[Exports.QBExport]:GetCoreObject().Shared.Items
+        end,
+    },
+    {   script = Exports.ESXExport,
+        cacheItem = function()
+            cache.Items = ESX.GetItems()
+            while not next(cache.Items) do
+                cache.Items = ESX.GetItems()
+                Wait(1000)
+            end
+        end,
+    },
+    {   script = Exports.RSGExport,
+        cacheItem = function()
+            cache.Items = exports[Exports.RSGExport]:GetCoreObject().Shared.Items
+        end,
+    },
+    {   script = Exports.VorpInv,
+        cacheItem = function()
+            local dbItems = MySQL.query.await('SELECT * FROM `items`')
+            local tempItems = {}
+            for i = 1, #dbItems do
+                local v = dbItems[i]
+                tempItems[v.item] = {
+                    name = v.item,
+                    label = v.label,
+                    weight = v.weight,
+                    info = v.metadata,
+                    usable = v.usable,
+                    type = v.type,
+                    description = v.desc,
+                }
+            end
+            cache.Items = tempItems
+        end,
+    },
+}
+
+for i = 1, #itemFunc do
+    local data = itemFunc[i]
+    if checkExists(data.script) then
+        waitStarted(data.script)            -- Wait for detected script to start fully
+        data.cacheItem()                    -- run tablized function for core/inv
+        dupLowercaseWeapons(cache.Items)    -- make usable weapon item names for jim_bridge
+        itemResource = data.script          -- Grab script name to announce later
+        endTimer("Items")                   -- end timer
+        break                               -- break loop so it doesn't keep checking
+    end
+end
+
+---------------------
+--- Load Vehicles ---
+---------------------
+---
+local vehicleFunc = {
+
+    {   script = Exports.QBXExport,
+        cacheVehicle = function()
+            cache.Vehicles = exports[Exports.QBExport]:GetCoreObject().Shared.Vehicles
+        end,
+    },
+    {   script = Exports.QBExport,
+        cacheVehicle = function()
+            cache.Vehicles = exports[Exports.QBExport]:GetCoreObject().Shared.Vehicles
+        end,
+    },
+    {   script = Exports.OXCoreExport,
+        cacheVehicle = function()
+            cache.Vehicles = {}
+            for k, v in pairs(Ox.GetVehicleData()) do
+                cache.Vehicles[k] = {
+                    model = k, hash = joaat(k),
+                    price = v.price,
+                    name = v.name,
+                    brand = v.make
+                }
+            end
+        end,
+    },
+    {   script = Exports.ESXExport,
+        cacheVehicle = function()
+            while not MySQL do Wait(100) end
+            for _, v in pairs(MySQL.query.await('SELECT model, price, name FROM vehicles')) do
+                cache.Vehicles[v.model] = {
+                    model = v.model,
+                    hash = joaat(v.model),
+                    price = v.price,
+                    name = v.name,
+                }
+            end
+        end,
+    },
+    {   script = Exports.RSGExport,
+        cacheVehicle = function()
+            cache.Vehicles = exports[Exports.RSGExport]:GetCoreObject().Shared.Vehicles
+        end,
+    },
+    {   script = Exports.VorpExport,
+        cacheVehicle = function()
+            cache.Vehicles = { ["unkown"] = {} }
+        end,
+    },
+}
+
+for i = 1, #vehicleFunc do
+    local data = vehicleFunc[i]
+    if checkExists(data.script) then
+        waitStarted(data.script)            -- Wait for detected script to start fully
+        data.cacheVehicle()                    -- run tablized function for core
+        vehResource = data.script          -- Grab script name to announce later
+        endTimer("Vehicles")                   -- end timer
+        break                               -- break loop so it doesn't keep checking
+    end
+end
+
+---------------------
+----- Load Jobs -----
+---------------------
+
+local jobFunc = {
+
+    {   script = Exports.QBXExport,
+        cacheJob = function()
+            cache.Jobs, cache.Gangs = exports[Exports.QBXExport]:GetJobs(), exports[Exports.QBXExport]:GetGangs()
+        end,
+    },
+    {   script = Exports.QBExport,
+        cacheJob = function()
+            Core = exports[Exports.QBExport]:GetCoreObject()
+            cache.Jobs, cache.Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+        end,
+    },
+    {   script = Exports.OXCoreExport,
+        cacheJob = function()
+            while not MySQL do Wait(100) end
+            local tempJobs = MySQL.query.await('SELECT * FROM `ox_groups`')
+            local tempGrades = MySQL.query.await('SELECT * FROM `ox_group_grades`')
+            local gradeMap = {}
+            for _, grade in pairs(tempGrades) do
+                gradeMap[grade.group] = gradeMap[grade.group] or {}
+                gradeMap[grade.group][grade.grade] = { name = grade.label }
+            end
+            for _, job in pairs(tempJobs) do
+                cache.Jobs[job.name] = {
+                    label = job.label,
+                    grades = gradeMap[job.name] or {}
+                }
+            end
+            cache.Gangs = cache.Jobs
+        end,
+    },
+    {   script = Exports.ESXExport,
+        cacheJob = function()
+            ESX = ESX or exports[Exports.ESXExport]:getSharedObject()
+            cache.Jobs = ESX.GetJobs()
+            while not next(cache.Jobs) do
+                Wait(100)
+                cache.Jobs = ESX.GetJobs()
+            end
+            for Role, Grades in pairs(cache.Jobs) do
+                -- Check for if user has added grades
+                if Grades.grades == nil or not next(Grades.grades) then
+                    goto continue
+                end
+                for grade, info in pairs(Grades.grades) do
+                    if info.label and info.label:find("[Bb]oss") then
+                        cache.Jobs[Role].grades[grade].isBoss = true
+                        goto continue
+                    end
+                end
+                local highestGrade = nil
+                for k in pairs(Grades.grades) do
+                    local num = tonumber(k)
+                    if num and (not highestGrade or num > highestGrade) then
+                        highestGrade = num
+                    end
+                end
+
+                if highestGrade then
+                    cache.Jobs[Role].grades[tostring(highestGrade)].isBoss = true
+                end
+                ::continue::
+            end
+            cache.Gangs = cache.Jobs
+        end,
+    },
+    {   script = Exports.RSGExport,
+        cacheJob = function()
+            Core = exports[Exports.RSGExport]:GetCoreObject()
+            cache.Jobs, cache.Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+        end,
+    },
+    {   script = Exports.VorpExport,
+        cacheJob = function()
+            cache.Jobs = { ["unkown"] = {} }
+            cache.Gangs = cache.Jobs
+        end,
+    },
+}
+
+for i = 1, #jobFunc do
+    local data = jobFunc[i]
+    if checkExists(data.script) then
+        waitStarted(data.script)            -- Wait for detected script to start fully
+        data.cacheJob()                    -- run tablized function for core
+        jobResource = data.script          -- Grab script name to announce later
+        endTimer("Jobs")                   -- end timer
+        break                               -- break loop so it doesn't keep checking
+    end
+end
+
+
+-- Fallback if nil or empty
+if cache.Items == nil or not next(cache.Items) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..itemResource.." ^7Items ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Items = {} -- Fallback to an empty table
+end
+if cache.Vehicles == nil or not next(cache.Vehicles) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..vehResource.." ^7Vehicles ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Vehicles = {} -- Fallback to an empty table
+end
+if cache.Jobs == nil or not next(cache.Jobs) then
+    print("^1--------------------------------------------^7")
+    print("^1ERROR^7: ^1Can NOT find "..jobResource.." ^7job ^1list^7, ^1possible error in that file or is it empty^7?")
+    print("^1--------------------------------------------^7")
+    cache.Jobs = {} -- Fallback to an empty table
+end
+
+-- Auto Detection of Inventory Weight -- **EXPERIMENTAL**
+-- Forcefully load the the specified config file from inventory scripts
+-- This allows to get information required for certain functions that need to detect how much space is left in a players inventory
+-- This is born from too many tickets of me needing to explain that they need to change "InventoryWeight" to match their inv setting
+local function getInventoryConfig(resource, data)
+    if data.convars then
+        return function(path)
+            local key = path[1]
+            local convar = key == "MaxWeight" and data.convars.weight or key == "MaxSlots" and data.convars.slots
+            return convar and GetConvarInt(convar.key, convar.default) or nil, "Unsupported convar path: " .. table.concat(path, ".")
+        end
+    end
+
+    local content = LoadResourceFile(resource, data.file)
+    if not content then return nil, "Failed to load file" end
+
+    local env = {
+        GetConvar = GetConvar,
+        vector3 = vector3,
+        vector4 = vector4,
+        Citizen = Citizen,
+        GetResourceState = GetResourceState,
+        exports = exports,
+        DependencyCheck = function() return nil end,
+    }
+
+    local fn, err = load(content, '@'..data.file, 't', env)
+
+    if not fn then return nil, "Failed to compile config: " .. err end
+    if not pcall(fn) then return nil, "Error executing config file" end
+
+    local cfg = env.Config or env.config
+    if not cfg then return nil, "Config table not found" end
+
+    return function(path)
+        local ref = cfg
+        for _, k in ipairs(path) do
+            if type(ref) ~= "table" then return nil, "Path invalid at: " .. tostring(k) end
+            ref = ref[k]
+        end
+        return ref
+    end
+end
+
+-- Inventory table
+local invWeightTable = {
+    [Exports.OXInv] = { convars = {
+        weight = { key = "inventory:weight", default = 30000 },
+        slots  = { key = "inventory:slots",  default = 40 }
+    }},
+    [Exports.QBInv] = {
+        fallback = {
+            { file = "config.lua",              path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } }, -- old version
+            { file = "config/config.lua",       path = { "MaxWeight" },       slotPath = { "MaxSlots" } },       -- new version
+        }
+    },
+    [Exports.JPRInv] =      { file = "configs/main_config.lua", path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
+    [Exports.PSInv] =       { file = "config.lua",              path = { "MaxInventoryWeight" }, slotPath = { "MaxInventorySlots" } },
+    [Exports.TgiannInv] =   { file = "configs/config.lua",      path = { "slotsMaxWeights", "player", "maxWeight" }, slotPath = { "slotsMaxWeights", "player", "slots" } },
+    [Exports.CodeMInv] =    { file = "config/config.lua",       path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
+    [Exports.RSGInv] =      { file = "config/config.lua",       path = { "MaxWeight" }, slotPath = { "MaxSlots" } },
+    --[Exports.OrigenInv] = { file = "config.lua", path = { "MaxWeight" } },
+}
+
+-- Run config detection
+local invResource = ""
+for script, data in pairs(invWeightTable) do
+    if checkExists(script) then
+        if script == Exports.QBInv and GetResourceState(Exports.JPRInv):find("start") then goto skip end
+
+        waitStartedOrStopped(script)
+
+        local attempts = data.fallback or { data }
+        local lookup, used, err
+
+        for _, option in ipairs(attempts) do
+            local try, e = getInventoryConfig(script, option)
+            if try then
+                lookup = try
+                used = option
+                break
+            end
+            err = e
+        end
+
+        if not lookup then
+            print(("^1ERROR^7: ^1Config loader failed from ^5%s^7: ^1%s^7"):format(script, err or "unknown"))
+            break
+        end
+
+        local function resolve(label, path)
+            local val, perr = lookup(path)
+            if val then
+                cache["Inventory"..label] = val
+                return
+            end
+            local warnType = label == "Weight" and "^1ERROR" or "^3WARNING"
+            print(("%s^7: ^1Failed to get ^7Inventory%s ^1from ^5%s^7: ^1%s^7"):format(warnType, label, script, perr or "unknown"))
+        end
+
+        resolve("Weight", used.path or { "MaxWeight" })
+        resolve("Slots",  used.slotPath or { "MaxSlots" })
+
+        invResource = script:gsub("-", "^7-^4"):gsub("_", "^7_^4")
+        break
+    end
+    ::skip::
+end
+endTimer("InvWeight")
+endTimer("InvSlots")
+
+CreateThread(function()
+    local counts = {
+        Items = 0, Vehicles = 0, Jobs = 0, Gangs = 0,
+    }
+    for k, v in pairs(cache) do
+        if type(v) ~= "number" then for count in pairs(v) do counts[k] += 1 end end
+    end
+    if cache.InventoryWeight then
+        print("^6FrameWorkCache^7: ^4"..invResource.."^2 InventoryWeight^7: ^3"..cache.InventoryWeight.."^7 (^3"..(cache.InventoryWeight / 1000).."kg^7) ^7"..timers["InvWeight"])
+    end
+    if cache.InventorySlots then
+        print("^6FrameWorkCache^7: ^4"..invResource.."^2 InventorySlots^7: ^3"..cache.InventorySlots.." ^7"..timers["InvSlots"])
+    end
+    print("^6FrameworkCache^7: ^4"..itemResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Items).."^2 Items ^7"..timers["Items"])
+    print("^6FrameworkCache^7: ^4"..vehResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Vehicles).."^2 Vehicles ^7"..timers["Vehicles"])
+    print("^6FrameworkCache^7: ^4"..jobResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Jobs).."^2 Jobs ^7"..timers["Jobs"])
+    print("^6FrameworkCache^7: ^4"..jobResource:gsub("-", "^7-^4"):gsub("_", "^7_^4").."^2 Loaded ^3"..tostring(counts.Gangs).."^2 Gangs ^7"..timers["Jobs"])
+    endTimer("Cache")
+    print("^6FrameworkCache^7: ^2Cache Ready ^7"..timers["Cache"])
+    cacheReady = true
+end)
+
+RegisterNetEvent("jim_bridge:requestCache", function()
+    local src = source
+    TriggerClientEvent("jim_bridge:receiveCache", src, cache)
+end)
+
+exports("GetSharedData", function()
+    -- Wait indefinitely (with periodic checks) until cacheReady is true
+    local timeout = GetGameTimer() + 20000  -- 20 second failsafe timeout
+    while not cacheReady and GetGameTimer() < timeout do
+        Wait(100)
+    end
+
+    if not cacheReady then
+        print("^1ERROR^7: jim_bridge cache timed out waiting for data.")
+        return nil  -- Signal clearly if cache never became ready
+    end
+
+    return cache
+end)

fxmanifest.lua

@@ -1,9 +1,10 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0"
+version "2.1.0"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
-game "gta5"
+rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
+games { 'gta5', 'rdr3' }
 lua54 'yes'
 
 files {
@@ -12,3 +13,16 @@ files {
     'shared/make/*.lua',
     'shared/scaleforms/*.lua',
 }
+
+-- Version checker
+server_scripts {
+    'frameworkCache.lua',
+    '_versioncheck.lua',
+}
+
+client_scripts {
+    'clientFrameworkCache.lua',
+    'ui_modules/*.lua',
+}
+
+suppress_updates 'false'   -- set to 'true' to disable update pings

shared/_authToken.lua

@@ -0,0 +1,150 @@
+-------------------------------------------------------------
+-- Exploit Auth System
+-------------------------------------------------------------
+
+forceDisableExplotProtection = false -- dangerous, this allows exploits
+AuthEvent = nil
+currentToken = nil
+if isServer() then
+
+    local AuthEvent = getScript()..":"..keyGen()..keyGen()..keyGen()..keyGen()..":"..keyGen()..keyGen()..keyGen()..keyGen()
+    validTokens = validTokens or {}
+
+    createCallback(AuthEvent, function(source)
+        local src = source
+        local token = keyGen()..keyGen()..keyGen()..keyGen()  -- Use a secure random generator here
+        --debugPrint(GetInvokingResource())
+        if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then
+            debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
+            return  ""
+        end
+        debugPrint("^1Auth^7:^2 Player Source^7: "..src.." ^2requested new token^7:", token)
+        validTokens[src] = token
+        timeOutAuth(validTokens[src], src) -- Give script 10 seconds, then clear token
+        return token
+    end)
+
+    function timeOutAuth(token, src)
+        local token = token
+        SetTimeout(10000, function()
+            if token == validTokens[src] then
+                print("^1--------------------------------------------^7")
+                print("^7Clearing token for player ^1"..src.."^7", token)
+                print("^7This shouldn't happen unless a token has been called by a player or script and it hasn't been used")
+                print("^1--------------------------------------------^7")
+            end
+        end)
+    end
+
+    RegisterNetEvent(getScript()..":clearAuthToken", function()
+        local src = source
+        debugPrint("^1Auth^7: ^2Manually removing token for Player Source^7:", src, validTokens[src])
+        validTokens[src] = nil
+    end)
+
+    receivedEvent = {}
+    authCooldown = {}
+
+    createCallback(getScript()..":callback:GetAuthEvent", function(source)
+        local src = source
+        --debugPrint(GetInvokingResource())
+
+        if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= Exports.QBExport and GetInvokingResource() ~= Exports.VorpExport then
+            debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7")
+            return ""
+        end
+
+        if authCooldown[src] then
+            debugPrint("^1Auth^7: ^3Cooldown active^7 for Player ^1"..src.."^7, ignoring additional auth request")
+            return AuthEvent
+        end
+
+        debugPrint("^1Auth^7: ^2Player Source^7: "..src.." ^2requested ^3AuthEvent^7", AuthEvent)
+
+        authCooldown[src] = true
+        SetTimeout(60000, function() -- 1 minute cooldown
+            authCooldown[src] = nil
+        end)
+
+        if not receivedEvent[src] then
+            receivedEvent[src] = true
+            return AuthEvent
+        else
+            print("^1Auth^7: ^1Player ^7"..src.." ^1tried to request auth token more than once^7")
+            return ""
+        end
+    end)
+
+    RegisterNetEvent(getScript()..":clearAuthEventRequest", function()
+        local src = source
+        debugPrint("^1Auth^7: ^2Manually clearing Auth Event for Player Source^7:", src, AuthEvent)
+        receivedEvent[src] = nil
+    end)
+
+    -- Multiuse function to check if the generated client token is valid
+    function checkToken(src, token, genType, name)
+        if forceDisableExplotProtection == true then return true end
+
+        if token == nil then
+            debugPrint("^1Auth^7: ^1No token recieved^7")
+            if genType == "stash" then
+                dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1create a stash ^7"..name.." ^1without an auth token^7")
+            elseif genType == "item" then
+                dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1attempted to spawn an item ^7"..name.." ^1without an auth token^7")
+            end
+            return false
+        else
+            debugPrint("^1Auth^7: ^2Auth token received^7, ^2checking against server cache^7..")
+            if token ~= validTokens[src] then
+                debugPrint("^1Auth^7: ^1Tokens don't match! ^7", token, validTokens[src])
+                if genType == "stash" then
+                    dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1create a stash ^7"..name.." ^1with an incorrect auth token^7")
+                elseif genType == "item" then
+                    dupeWarn(src, name, "^1Auth Error^7: ^3"..src.." ^1attempted to spawn an item ^7"..name.." ^1with an incorrect auth token^7")
+                end
+                return false
+            else
+                debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
+                validTokens[src] = nil
+                return true
+            end
+        end
+    end
+else
+    onPlayerLoaded(function()
+        debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7")
+        AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent")
+    end, true)
+
+    onPlayerUnload(function()
+        debugPrint("^1Auth^7: ^2Clearing Auth Event^7")
+        TriggerServerEvent(getScript()..":clearAuthEventRequest")
+    end, true)
+end
+
+function distExploitCheck(table, src)
+    if forceDisableExplotProtection == true then return true end
+
+    if not table then
+        print("^1Error^7: ^1This wasn^7'^1t reigstered correctly or this is an exploit attempt^1")
+        return false
+    end
+
+    local ped = src and GetPlayerPed(src) or PlayerPedId()
+    local srcCoords = GetEntityCoords(ped)
+    local allow = false
+
+    for i = 1, #table do
+        if #(table[i].xyz  - srcCoords) <= 10 then
+            return true
+        else
+            allow = false
+        end
+    end
+
+    if not allow then
+        print(src and ("^1Src ^3"..src.." ").."^1Tried to open a registered shop/stash from over the distance limit^7")
+        return false
+    end
+
+end

shared/_loaders.lua

@@ -1,110 +1,250 @@
---- Executes a function when the player character is loaded into the game.
+--[[
----
+    Player & Resource Event Utility Functions
---- This function sets up event listeners for player loading based on the game framework detected (e.g., QB, ESX, OX).
+    -------------------------------------------
----
+    This module provides functions to:
---- If `onStart` is `true`, it will also attempt to execute the function on resource start after ensuring the player is logged in. (Helpful for debugging)
+      • Execute code when the player character is loaded or unloaded.
+      • Execute code on resource start and stop.
+      • Wait for the player to be logged in before proceeding.
+]]
+
+local onLoadLast = {} -- keyed by tostring(func)
+
+local function _debouncedRun(func)
+    local key  = tostring(func)
+    local now  = GetGameTimer()
+    local last = onLoadLast[key] or -1e12
+
+    if (now - last) < 5000 then
+        debugPrint(("^6Bridge^7 ^3onPlayerLoaded^7 skipped — cooldown %dms remaining"):format(5000 - (now - last)))
+        return
+    end
+
+    onLoadLast[key] = now
+    CreateThread(function()
+        Wait(2000) -- keep your small delay
+        debugPrint("^6Bridge^7: ^2Executing onPlayerLoaded callback")
+        func()
+    end)
+end
+
+-------------------------------------------------------------
+-- Player Loaded and Unloaded Events
+-------------------------------------------------------------
+
+--- Executes a function when the player character is loaded.
+--- If onStart is true, the function will also run on resource start (after ensuring the player is logged in).
 ---
 --- @param func function The function to execute when the player is loaded.
---- @param onStart boolean (optional) If `true`, the function will also execute on resource start. Default is `false`.
+--- @param onStart boolean (optional) If true, also execute on resource start. Default is false.
----
 --- @usage
 --- ```lua
 --- onPlayerLoaded(function()
----     -- Your code here
+---     print("Player logged in")
+---     -- Your initialization code here.
 --- end, true)
 --- ```
 function onPlayerLoaded(func, onStart)
-    local onPlayerName = ""
+    local onPlayerFramework = ""
     local loaded = false
+
     if onStart then
         onResourceStart(function()
-            if not LocalPlayer.state.isLoggedIn then
+            if not waitForLogin() then return end
-                Wait(3000)
+            debugPrint("^6Bridge^7: ^3onResourceStart^7()^2 routed through ^3onPlayerLoaded^7()")
-                if not LocalPlayer.state.isLoggedIn then -- If the player is not logged in after waiting, skip execution
+            _debouncedRun(func)
-                    return
-                end
-            end
-            loaded = true -- Mark as already loaded
-            debugPrint("^6Bridge^7: ^2Loading ^3onResourceStart^7() ^2through ^3onPlayerLoaded^7()")
-            Wait(2000)
-            func()
         end, true)
     end
-    if not loaded then
+
-        local tempFunc = function()
+    local handler = function()
-            debugPrint("^6Bridge^7: ^2Executing ^3onPlayerLoaded^7()")
+        _debouncedRun(func)
-            func()
+    end
-        end
+
-        if isStarted(QBExport) or isStarted(QBXExport) then onPlayerName = QBExport
+    if isStarted(QBExport) or isStarted(QBXExport) then
-            AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
+        onPlayerFramework = QBExport
-        elseif isStarted(ESXExport) then onPlayerName = ESXExport
+        RegisterNetEvent('QBCore:Client:OnPlayerLoaded', handler)
-            AddEventHandler('esx:playerLoaded', tempFunc)
+
-        elseif isStarted(OXCoreExport) then onPlayerName = OXCoreExport
+    elseif isStarted(ESXExport) then
-            AddEventHandler('ox:playerLoaded', tempFunc)
+        onPlayerFramework = ESXExport
-        end
+        RegisterNetEvent('esx:playerLoaded', function()
-        if onPlayerName ~= "" then
+            if waitForSharedLoad() then handler() end
-            debugPrint("^6Bridge^7: ^2Registering ^3onPlayerLoaded^2 with ^7"..onPlayerName)
+        end)
-        else
+
-            print("^4ERROR^7: ^2No Core detected for onPlayerLoaded ^7- ^2Check ^3exports^1.^2lua^7")
+    elseif isStarted(OXCoreExport) then
-        end
+        onPlayerFramework = OXCoreExport
+        RegisterNetEvent('ox:playerLoaded', handler)
+
+    elseif isStarted(RSGExport) then
+        onPlayerFramework = RSGExport
+        RegisterNetEvent('RSGCore:Client:OnPlayerLoaded', handler)
+
+    elseif isStarted(VorpExport) then
+        onPlayerFramework = VorpExport
+        RegisterNetEvent('vorp_core:Client:OnPlayerSpawned', handler)
+    end
+
+    if onPlayerFramework ~= "" then
+        debugPrint("^6Bridge^7: ^2Registering ^3onPlayerLoaded^7()^2 with ^3" .. onPlayerFramework .. "^7")
+    else
+        print("^4ERROR^7: No supported core detected for onPlayerLoaded - Check starter.lua")
     end
 end
 
+--- Executes a function when the player character is unloaded.
+--- @param func function The function to execute when the player unloads.
+--- @usage
+--- ```lua
+--- onPlayerUnload(function()
+---     print("Player has logged out of their character")
+---     -- Your cleanup code here.
+--- end)
+--- ```
+function onPlayerUnload(func)
+    debugPrint("^6Bridge^7: ^2Registering ^3onPlayerUnload^7()")
+    RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() func() end)
+
+    RegisterNetEvent('ox:playerLogout', function() func() end)
+
+    RegisterNetEvent('RSGCore:Client:OnPlayerUnload', function() func() end)
+
+    RegisterNetEvent('esx:onPlayerLogout', function() func() end)
+
+end
+
+-------------------------------------------------------------
+-- Resource Start and Stop Events
+-------------------------------------------------------------
+
 --- Executes a function when the resource starts.
----
+--- @param func function The function to execute.
---- This function wraps the `onResourceStart` event, allowing you to execute code when the resource starts.
+--- @param thisScript boolean (optional) If true, only runs when this resource starts (default true).
----
---- @param func function The function to execute on resource start.
---- @param thisScript boolean (optional) If `true`, only runs the function when this resource starts. Default is `true`.
----
 --- @usage
 --- ```lua
 --- onResourceStart(function()
----     -- Your code here
+---     print("Script ensured")
+---     -- Initialization code on resource start.
 --- end, true)
 --- ```
+local hasPrinted = false
 function onResourceStart(func, thisScript)
-    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^2")
+    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^7()")
     AddEventHandler('onResourceStart', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
-            func()
+            if waitForSharedLoad() then
+                if not hasPrinted then
+                    debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
+                    hasPrinted = true
+                end
+                func(resourceName)
+            end
         end
     end)
 end
 
 --- Executes a function when the resource stops.
----
+--- @param func function The function to execute.
---- This function wraps the `onResourceStop` event, allowing you to execute code when the resource stops.
+--- @param thisScript boolean (optional) If true, only runs when this resource stops (default true).
----
---- @param func function The function to execute on resource stop.
---- @param thisScript boolean (optional) If `true`, only runs the function when this resource stops. Default is `true`.
----
 --- @usage
 --- ```lua
 --- onResourceStop(function()
----     -- Cleanup code here
+---     -- Cleanup code here.
 --- end, true)
 --- ```
 function onResourceStop(func, thisScript)
-    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStop^2")
+    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStop^7()")
     AddEventHandler('onResourceStop', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
-            func()
+            func(resourceName)
         end
     end)
 end
 
---- Waits until the player is logged in before continuing execution.
+-------------------------------------------------------------
----
+-- Wait for Login
---- This function blocks execution until `LocalPlayer.state.isLoggedIn` is `true`.
+-------------------------------------------------------------
----
+
----@usage
+--- Blocks execution until the player is logged in.
---- ```lua
+--- @usage
 --- waitForLogin()
---- ```
 function waitForLogin()
-    while not LocalPlayer.state.isLoggedIn do
+    local timeout = 10000  -- 10 seconds in milliseconds
-        debugPrint("Waiting")
+    local startTime = GetGameTimer()
-        Wait(100)
+    local loggedIn = false
+
+    if isStarted(ESXExport) then
+        while (GetGameTimer() - startTime) < timeout do
+            local playerData = ESX.GetPlayerData()
+            if playerData and playerData.job then
+                loggedIn = true
+                break
+            end
+            Wait(100)
+        end
+    elseif isStarted(OXCoreExport) then
+        if OxPlayer["stateId"] then
+            loggedIn = true
+        end
+        while not OxPlayer["stateId"] do
+            Wait(1000)
+            debugPrint("Waiting for stateId to class as logged in")
+            if OxPlayer.get["stateId"] then
+                loggedIn = true
+                break
+            end
+        end
+    elseif isStarted(VorpExport) then
+        -- For other frameworks, use LocalPlayer.state.isLoggedIn.
+        while not LocalPlayer.state.IsInSession and (GetGameTimer() - startTime) < timeout do
+            Wait(100)
+        end
+        loggedIn = LocalPlayer.state.IsInSession
+    else
+        -- For other frameworks, use LocalPlayer.state.isLoggedIn.
+        while not LocalPlayer.state.isLoggedIn and (GetGameTimer() - startTime) < timeout do
+            Wait(100)
+        end
+        loggedIn = LocalPlayer.state.isLoggedIn
+    end
+
+    if not loggedIn then
+        print("^4Error^7: ^2Timeout reached while waiting for player login^7.")
+        return false
+    else
+        debugPrint("^6Bridge^7: ^2Player Login Detected^7.")
+        return true
+    end
+end
+
+local messageShown = false
+function waitForSharedLoad()
+    local timeout = GetGameTimer() + 900000 -- 15 minutes max wait (had to up this from 2 minutes because of slow servers)
+    local loop = 0
+
+    while ((not Jobs or not next(Jobs)) or
+        (not Items or not next(Items)) or
+        (not Vehicles or not next(Vehicles))
+    ) and (timeout and GetGameTimer() < timeout) do
+        if loop >= 3 and not messageShown then
+            if (not Jobs or not next(Jobs)) then
+                print("^4Debug^7: ^2Waiting for ^7Jobs^2 to be loaded")
+            end
+            if (not Items or not next(Items)) then
+                print("^4Debug^7: ^2Waiting for ^7Items^2 to be loaded")
+            end
+            if (not Vehicles or not next(Vehicles)) then
+                print("^4Debug^7: ^2Waiting for ^7Vehicles^2 to be loaded")
+            end
+            messageShown = true
+        end
+        Wait(1000)
+
+        loop += 1
+    end
+
+    if Jobs and Items and Vehicles then
+        debugPrint("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+        return true
+    else
+        print("^4Error^7: ^1Timeout reached while waiting for shared load^7.")
+        return false
     end
 end

shared/_scriptversioncheck.lua

@@ -0,0 +1,111 @@
+local function readBoolMeta(key, default)
+    local val = GetResourceMetadata("jim_bridge", key, 0)
+    if not val then return default end
+    val = tostring(val):lower()
+    return (val == 'true' or val == '1' or val == 'yes' or val == 'on')
+end
+
+local SUPPRESS_UPDATES = readBoolMeta('suppress_updates', false)
+
+if not SUPPRESS_UPDATES then
+    function parseVersion(version)
+        local parts = {}
+        for num in version:gmatch("%d+") do
+            table.insert(parts, tonumber(num))
+        end
+        return parts
+    end
+
+    function compareVersions(current, newest)
+        local currentParts = parseVersion(current)
+        local newestParts = parseVersion(newest)
+        for i = 1, math.max(#currentParts, #newestParts) do
+            local c = currentParts[i] or 0
+            local n = newestParts[i] or 0
+            if c < n then return -1
+            elseif c > n then return 1 end
+        end
+        return 0
+    end
+
+    function capitalize(str)
+        return (str:gsub("^%l", string.upper):gsub("%-%l", function(letter) return "-" .. string.upper(letter:sub(2)) end))
+    end
+
+    local scriptName = ("^2"..capitalize(getScript()):gsub("%-", "^7-^2"):gsub("%_", "^7_^2")) or ""
+    local scriptVersion = ("^5"..GetResourceMetadata(getScript(), 'version', nil):gsub("%.", "^7.^5")) or ""
+    local scriptDescription = ("^2"..GetResourceMetadata(getScript(), 'description', nil)) or ""
+    local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil):gsub("%and", "^7and^4")) or ""
+
+    print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
+
+    function CheckVersion()
+        if isServer() and GetResourceMetadata(getScript(), 'author', nil) == "Jimathy" then
+            CreateThread(function()
+                Wait(4000)
+                local script = getScript()
+                local currentVersionRaw = GetResourceMetadata(script, 'version')
+
+                PerformHttpRequest('https://raw.githubusercontent.com/jimathy/UpdateVersions/master/'..script..'.txt', function(err, newestVersionRaw, headers)
+                    if not newestVersionRaw then
+                        -- fallback
+                        PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..script..'/master/version.txt', function(err, fallbackVersionRaw, headers)
+                            if not fallbackVersionRaw then
+                                print("^1Currently unable to run a version check for ^7'^3"..script.."^7' (^3"..currentVersionRaw.."^7)")
+                                return
+                            end
+
+                            local lines = {}
+                            for line in fallbackVersionRaw:gmatch("[^\r\n]+") do table.insert(lines, line) end
+                            local fallbackVersion = (lines[1] or "0.0.0"):gsub("v", "")
+                            local changelog = {}
+                            for i = 2, #lines do table.insert(changelog, lines[i]) end
+
+                            local compareResult = compareVersions(currentVersionRaw, fallbackVersion)
+                            if compareResult == 0 then
+                                print("^7'^3"..script.."^7' - ^2You are running the latest version^7. (^3"..currentVersionRaw.."^7)")
+                            elseif compareResult < 0 then
+                                print("^1----------------------------------------------------------------------^7")
+                                print("^7'^3"..script.."^7' - ^1You are currently running an outdated version^7! (^3"..currentVersionRaw.."^7 → ^3"..fallbackVersion.."^7)")
+                                if #changelog > 0 then
+                                    for _, line in ipairs(changelog) do
+                                        print((line:find("http") and "^7" or "^5")..line)
+                                    end
+                                end
+                                print("^1----------------------------------------------------------------------^7")
+                                SetTimeout(1200000, function() CheckVersion() end)
+                            else
+                                print("^7'^3"..script.."^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..fallbackVersion.."^7)")
+                            end
+                        end)
+                    else
+                        local lines = {}
+                        for line in newestVersionRaw:gmatch("[^\r\n]+") do table.insert(lines, line) end
+                        local newestVersion = (lines[1] or "0.0.0"):gsub("v", "")
+                        local changelog = {}
+                        for i = 2, #lines do table.insert(changelog, lines[i]) end
+
+                        local compareResult = compareVersions(currentVersionRaw, newestVersion)
+                        if compareResult == 0 then
+                            print("^7'^3"..script.."^7' - ^2You are running the latest version^7. (^3"..currentVersionRaw.."^7)")
+                        elseif compareResult < 0 then
+                            print("^1----------------------------------------------------------------------^7")
+                            print("^7'^3"..script.."^7' - ^1You are currently running an outdated version^7! (^3"..currentVersionRaw.."^7 → ^3"..newestVersion.."^7)")
+                            if #changelog > 0 then
+                                for _, line in ipairs(changelog) do
+                                    print((line:find("http") and "^7" or "^5")..line)
+                                end
+                            end
+                            print("^1----------------------------------------------------------------------^7")
+                            SetTimeout(3600000, function() CheckVersion() end)
+                        else
+                            print("^7'^3"..script.."^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersion.."^7)")
+                        end
+                    end
+                end)
+            end)
+        end
+    end
+
+    CheckVersion()
+end

shared/callback.lua

@@ -1,3 +1,30 @@
+local CALLBACK_RETRIES    = 0
+
+-- Internal: await a callback with a timeout
+local function awaitWithTimeout(registerFn, timeoutMs)
+    local p = promise.new()
+    local finished = false
+
+    registerFn(function(result)
+        if finished then return end
+        finished = true
+        p:resolve(result)
+    end)
+
+    -- timeout watchdog
+    CreateThread(function()
+        Wait(5000)
+        if not finished then
+            finished = true
+            p:reject('timeout')
+        end
+    end)
+
+    local ok, res = pcall(function() return Citizen.Await(p) end)
+    if ok then return res, nil end
+    return nil, res
+end
+
 --- Registers a callback function with the appropriate framework.
 ---
 --- This function checks which framework is started (e.g., OX, QB, ESX) and registers the callback accordingly.
@@ -8,26 +35,45 @@
 ---
 ---@usage
 --- ```lua
+--- local table = { ["info"] = "HI" }
 --- createCallback('myCallback', function(source, ...)
----     -- Your callback code here
+---     return table
+--- end)
+---
+--- createCallback("callback:checkVehicleOwned", function(source, plate)
+--- 	local result = isVehicleOwned(plate)
+--- 	if result then
+---         return true
+---      else
+---         return false
+---     end
 --- end)
 --- ```
 function createCallback(callbackName, funct)
-    if isStarted(OXLibExport) then
+    if isServer() then
-        lib.callback.register(callbackName, funct)
+        if isStarted(OXLibExport) then
-    else
+            debugPrint("^6Bridge^7: ^2Registering ^4"..OXLibExport.." ^3Callback^7:", callbackName)
-        local adaptedFunction = function(source, cb, ...)
+            lib.callback.register(callbackName, funct)
-            local result = funct(source, ...)
-            cb(result)
-        end
-
-        if isStarted(QBExport) then
-            Core = Core or exports[QBExport]:GetCoreObject()
-            Core.Functions.CreateCallback(callbackName, adaptedFunction)
-        elseif isStarted(ESXExport) then
-            ESX.RegisterServerCallback(callbackName, adaptedFunction)
         else
-            print("^6Bridge^7: ^1ERROR^7: ^3Can't find any script to register callback with", callbackName)
+            local adaptedFunction = function(source, cb, ...)
+                local result = funct(source, ...)
+                cb(result)
+            end
+
+            if isStarted(QBExport) then
+                debugPrint("^6Bridge^7: ^2Registering ^4"..QBExport.." ^3Callback^7:", callbackName)
+                Core = Core or exports[QBExport]:GetCoreObject()
+                Core.Functions.CreateCallback(callbackName, adaptedFunction)
+            elseif isStarted(VorpExport) then
+                debugPrint("^6Bridge^7: ^2Registering ^4"..VorpExport.." ^3Callback^7:", callbackName)
+                Core = Core or exports.vorp_core:GetCore()
+                Core.Callback.Register(callbackName, adaptedFunction)
+            elseif isStarted(ESXExport) then
+                debugPrint("^6Bridge^7: ^2Registering ^4"..ESXExport.." ^3Callback^7:", callbackName)
+                ESX.RegisterServerCallback(callbackName, adaptedFunction)
+            else
+                print("^1ERROR^7: ^1Can't find any supported framework to register callback with^7: "..callbackName)
+            end
         end
     end
 end
@@ -40,29 +86,65 @@ end
 ---@param ... any Additional arguments to pass to the callback.
 ---
 ---@return any any The result returned by the callback function.
+---@return string string The error/success message returned by the callback function.
 ---
 ---@usage
 --- ```lua
---- local result = triggerCallback('myCallback', arg1, arg2)
+--- local result = triggerCallback('myCallback')
+--- jsonPrint(result)
+---
+--- local result = triggerCallback("callback:checkVehicleOwned", plate)
+--- print(result)
 --- ```
 function triggerCallback(callbackName, ...)
-    local result = nil
+    debugPrint("^6Bridge^7: ^2Triggering ^3Callback^7:", callbackName)
+    local args = {...}
+
     if isStarted(OXLibExport) then
-        result = lib.callback.await(callbackName, false, ...)
+        local ok, res = pcall(function()
-    elseif isStarted(QBExport) then
+            return lib.callback.await(callbackName, false, table.unpack(args))
-        local p = promise.new()
+        end)
-        Core.Functions.TriggerCallback(callbackName, function(cbResult)
+        if ok then return res, "nil" end
-            p:resolve(cbResult)
+        return nil, tostring(res)
-        end, ...)
-        result = Citizen.Await(p)
-    elseif isStarted(ESXExport) then
-        local p = promise.new()
-        ESX.TriggerServerCallback(callbackName, function(cbResult)
-            p:resolve(cbResult)
-        end, ...)
-        result = Citizen.Await(p)
-    else
-        print("^6Bridge^7: ^1ERROR^7: ^3Can't find any script to trigger callback with", callbackName)
     end
-    return result
+
+    local attempts = 0
+    local lastErr
+
+    repeat
+        attempts = attempts + 1
+
+        if isStarted(QBExport) then
+            local res, err = awaitWithTimeout(function(cb)
+                Core.Functions.TriggerCallback(callbackName, cb, table.unpack(args))
+            end, 5000)
+            if res ~= nil then return res, "nil" end
+            lastErr = err
+            debugPrint(("^6Bridge^7: ^3Callback^7 %s ^1failed^7 (QB) attempt %d: %s"):format(callbackName, attempts, tostring(err)))
+
+        elseif isStarted(VorpExport) then
+            local res, err = awaitWithTimeout(function(cb)
+                Core.Callback.TriggerAwait(callbackName, cb, table.unpack(args))
+            end, 5000)
+            if res ~= nil then return res, "nil" end
+            lastErr = err
+            debugPrint(("^6Bridge^7: ^3Callback^7 %s ^1failed^7 (Vorp) attempt %d: %s"):format(callbackName, attempts, tostring(err)))
+
+        elseif isStarted(ESXExport) then
+            local res, err = awaitWithTimeout(function(cb)
+                ESX.TriggerServerCallback(callbackName, cb, table.unpack(args))
+            end, 5000)
+            if res ~= nil then return res, "nil" end
+            lastErr = err
+            debugPrint(("^6Bridge^7: ^3Callback^7 %s ^1failed^7 (ESX) attempt %d: %s"):format(callbackName, attempts, tostring(err)))
+
+        else
+            print("^6Bridge^7: ^1ERROR^7: ^3Can't find any script to trigger callback with^7:", callbackName)
+            return nil, "no_framework"
+        end
+
+        Wait(10)
+    until attempts > (1 + CALLBACK_RETRIES)
+
+    return nil, lastErr or "timeout"
 end

shared/contextmenus.lua

@@ -1,25 +1,294 @@
+--[[
+    Menu Opening Module
+    ---------------------
+    This module provides a unified function to open menus using the configured menu system.
+    Supported systems include:
+      • jim_bridge (built-in nui menu that works on any framework)
+      • ox (or ox_context)
+      • qb (using QBMenuExport)
+      • gta (using WarMenu)
+      • esx (using ESX.UI.Menu)
+]]
+
+local contextFunc = {
+    ["ox"] =
+        function(Menu, data)
+            local index = nil
+            if data.onBack and not data.onSelected then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-arrow-left",
+                    title = "Return",
+                    onSelect = data.onBack,
+                    label = "Return",
+                })
+            end
+            for k in pairs(Menu) do
+                if data.onSelected and Menu[k].arrow then
+                    Menu[k].icon = "fas fa-angle-right"
+                end
+                -- If no title, use header or txt as title/label.
+                if not Menu[k].title then
+                    if Menu[k].header ~= nil and Menu[k].header ~= "" then
+                        Menu[k].title = Menu[k].header
+                        Menu[k].label = Menu[k].header
+                        if Menu[k].txt then Menu[k].description = Menu[k].txt else Menu[k].description = "" end
+                    else
+                        Menu[k].title = Menu[k].txt
+                        Menu[k].label = Menu[k].txt
+                    end
+                end
+                -- Copy parameters from 'params' if available.
+                if Menu[k].params then
+                    Menu[k].event = Menu[k].params.event
+                    Menu[k].args = Menu[k].params.args or {}
+                end
+                if Menu[k].isMenuHeader then
+                    Menu[k].readOnly = true
+                end
+            end
+            local menuID = 'Menu'
+            (data.onSelected and lib.registerMenu or lib.registerContext)({
+                id = menuID,
+                title = data.header..br..br..(data.headertxt and data.headertxt or ""),
+                position = 'top-right',
+                options = Menu,
+                canClose = data.canClose and data.canClose or nil,
+                onClose = (data.onBack and data.onBack) or (data.onExit and data.onExit) or nil,
+                onExit = data.onExit and data.onExit or nil,
+                onSelected = data.onSelected and (function(selected) index = selected end) or nil,
+            }, data.onSelected and (function(x, y, args)
+                if Menu[x].refresh then
+                    if Menu[x].onSelect then
+                        Menu[x].onSelect()
+                    end
+                    lib.showMenu(menuID, index)
+                else
+                    if Menu[x].onSelect then
+                        Menu[x].onSelect()
+                    else
+                        lib.showMenu(menuID, index)
+                    end
+                end
+            end) or nil)
+            if data.onSelected then
+                lib.showMenu(menuID, 1)
+            else
+                lib.showContext(menuID)
+            end
+        end,
+
+    ["qb"] =
+        function(Menu, data)
+            if data.onBack then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-arrow-left",
+                    header = " ",
+                    txt = "Return",
+                    params = {
+                        isAction = true,
+                        event = data.onBack,
+                    },
+                })
+            elseif data.canClose then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-xmark",
+                    header = " ",
+                    txt = "Close",
+                    params = {
+                        isAction = true,
+                        event = data.onExit and data.onExit or (function() exports[QBMenuExport]:closeMenu() end),
+                    },
+                })
+            end
+            if data.header ~= nil then
+                local tempMenu = {}
+                for k, v in pairs(Menu) do tempMenu[k + 1] = v end
+                tempMenu[1] = { header = data.header, txt = data.headertxt or "", isMenuHeader = true }
+                Menu = tempMenu
+            end
+            for k in pairs(Menu) do
+                if not Menu[k].params or not Menu[k].params.event then
+                    Menu[k].params = {
+                        isAction = true,
+                        event = Menu[k].onSelect or function() end,
+                    }
+                end
+                if not Menu[k].header then Menu[k].header = " " end
+                if Menu[k].arrow then Menu[k].icon = "fas fa-angle-right" end
+                Menu[k].isMenuHeader = Menu[k].isMenuHeader or Menu[k].disable
+            end
+            exports[QBMenuExport]:openMenu(Menu)
+        end,
+
+    ["gta"] =
+        function(Menu, data)
+            WarMenu.CreateMenu(tostring(Menu), data.header, " ", {
+                titleColor = { 222, 255, 255 },
+                maxOptionCountOnScreen = 15,
+                width = 0.25,
+                x = 0.7,
+            })
+            if WarMenu.IsAnyMenuOpened() then return end
+            WarMenu.OpenMenu(tostring(Menu))
+            CreateThread(function()
+                local close = true
+                while true do
+                    if WarMenu.Begin(tostring(Menu)) then
+                        if data.onBack then
+                            if WarMenu.SpriteButton("Return", 'commonmenu', "arrowleft", 127, 127, 127) then
+                                WarMenu.CloseMenu()
+                                Wait(10)
+                                data.onBack()
+                            end
+                        end
+                        for k in pairs(Menu) do
+                            local pressed = WarMenu.Button(Menu[k].header)
+                            if not Menu[k].header then
+                                Menu[k].header = Menu[k].txt
+                                Menu[k].txt = nil
+                            end
+                            if Menu[k].txt and Menu[k].txt ~= "" and WarMenu.IsItemHovered() then
+                                if Menu[k].disabled or Menu[k].isMenuHeader then
+                                    WarMenu.ToolTip("~r~"..Menu[k].txt, 0.18, true)
+                                else
+                                    WarMenu.ToolTip(
+                                        (Menu[k].blip and "~BLIP_".."8".."~ " or "")..
+                                        Menu[k].txt:gsub("%:", ":~g~"):gsub("%\n", "\n~s~"), 0.18,
+                                        true)
+                                end
+                            end
+                            if pressed and not Menu[k].isMenuHeader then
+                                WarMenu.CloseMenu()
+                                close = false
+                                Wait(10)
+                                Menu[k].onSelect()
+                            end
+                        end
+                        WarMenu.End()
+                    else
+                        return
+                    end
+                    if not WarMenu.IsAnyMenuOpened() and close then
+                        stopTempCam(cam)
+                        if data.onExit then data.onExit() end
+                    end
+                    Wait(0)
+                end
+            end)
+        end,
+
+    ["esx"] =
+        function(Menu, data)
+            for k in pairs(Menu) do
+                Menu[k].label = Menu[k].header
+                Menu[k].name = "button"..k
+            end
+            if data.canClose then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-xmark",
+                    label = "Close",
+                    name = "close",
+                    onSelect = data.onExit,
+                })
+            end
+            if data.onBack then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-arrow-left",
+                    label = "Return",
+                    name = "return",
+                    onSelect = data.onBack,
+                })
+            end
+            ESX.UI.Menu.Open("default", getScript(), "Example_Menu", {
+                title = data.header,
+                align = 'top-right',
+                elements = Menu,
+            },
+            function(menuData, menu)
+                for k in pairs(Menu) do
+                    if menuData.current.name == Menu[k].name then
+                        menu.close()
+                        Wait(10)
+                        Menu[k].onSelect()
+                    end
+                end
+            end,
+            function(data, menu)
+                menu.close()
+            end)
+        end,
+
+    ["lation"] =
+        function(Menu, data)
+            if data.onBack then
+                table.insert(Menu, 1, {
+                    icon = "fas fa-circle-arrow-left",
+                    onSelect = data.onBack,
+                    header = "Return",
+                })
+            end
+
+            for k in pairs(Menu) do
+                if data.onSelected and Menu[k].arrow then
+                    Menu[k].icon = "fas fa-angle-right"
+                end
+                -- If no title, use header or txt as title/label.
+                if not Menu[k].title then
+                    if Menu[k].header ~= nil and Menu[k].header ~= "" then
+                        Menu[k].title = Menu[k].header
+                        Menu[k].label = Menu[k].header
+                        if Menu[k].txt then Menu[k].description = Menu[k].txt else Menu[k].description = "" end
+                    else
+                        Menu[k].title = Menu[k].txt
+                        Menu[k].label = Menu[k].txt
+                    end
+                end
+                -- Copy parameters from 'params' if available.
+                if Menu[k].params then
+                    Menu[k].event = Menu[k].params.event
+                    Menu[k].args = Menu[k].params.args or {}
+                end
+                if Menu[k].isMenuHeader then
+                    Menu[k].readOnly = true
+                end
+            end
+
+            exports.lation_ui:registerMenu({
+                id = 'menu',
+                title = data.header,
+                onExit = data.onExit and data.onExit or nil,
+                subtitle = (data.headertxt and data.headertxt or ""),
+                options = Menu,
+            })
+
+            -- Show menu
+            exports.lation_ui:showMenu('menu')
+        end,
+}
+
+
 --- Opens a menu using the configured menu system.
 ---
 --- This function translates code and creates menus in several different menu scripts, depending on the configured menu system specified in `Config.System.Menu`.
 ---
 ---@param Menu table A table containing the menu options to display.
 --- Each menu item can include:
---- - **header** (`string`): The text to display for the menu item.
+---     - header (`string`): The text to display for the menu item.
---- - **txt** (`string`, optional): Additional text or description.
+---     - txt (`string`, optional): Additional text or description.
---- - **icon** (`string`, optional): Icon to display with the menu item.
+---     - icon (`string`, optional): Icon to display with the menu item.
---- - **onSelect** (`function`, optional): Function to execute when the menu item is selected.
+---     - onSelect (`function`, optional): Function to execute when the menu item is selected.
---- - **arrow** (`boolean`, optional): Whether to display an arrow next to the item (for certain menus).
+---     - arrow (`boolean`, optional): Whether to display an arrow next to the item (for certain menus).
---- - **params** (`table`, optional): Additional parameters, such as events and arguments.
+---     - params (`table`, optional): Additional parameters, such as events and arguments.
---- - **isMenuHeader** (`boolean`, optional): Marks the item as a header.
+---     - isMenuHeader (`boolean`, optional): Marks the item as a header.
---- - **disabled** (`boolean`, optional): Disables the menu item if `true`.
+---     - disabled (`boolean`, optional): Disables the menu item if `true`.
 ---
 ---@param data table A table containing configuration data for the menu.
---- - **header** (`string`): The header/title of the menu.
+---     - header (`string`): The header/title of the menu.
---- - **headertxt** (`string`, optional): Additional header text.
+---     - headertxt (`string`, optional): Additional header text.
---- - **onBack** (`function`, optional): Function to call when the "Return" option is selected.
+---     - onBack (`function`, optional): Function to call when the "Return" option is selected.
---- - **onExit** (`function`, optional): Function to call when the menu is exited.
+---     - onExit (`function`, optional): Function to call when the menu is exited.
---- - **onSelected** (`function`, optional): Function to call when a menu item is selected (for certain menu systems).
+---     - onSelected (`function`, optional): Function to call when a menu item is selected (for certain menu systems).
---- - **canClose** (`boolean`, optional): Whether the menu can be closed by the user.
+---     - canClose (`boolean`, optional): Whether the menu can be closed by the user.
 ---
 ---@usage
 --- ```lua
@@ -35,239 +304,25 @@
 --- })
 --- ```
 function openMenu(Menu, data)
-    if Config.System.Menu == "jim" then
+    contextFunc[Config.System.Menu](Menu, data)
-        if data.onBack then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-arrow-left",
-                title = "Return",
-                onSelect = data.onBack,
-            })
-        end
-        exports["jim-nui"]:openMenu({
-            title = data.header..(data.headertxt and " -- "..data.headertxt or ""),
-            canClose = data.canClose and data.canClose or nil,
-            onClose = (data.onBack and data.onBack) or (data.onExit and data.onExit) or nil,
-            onExit = data.onExit and data.onExit or nil,
-            options = Menu,
-        })
-
-    elseif Config.System.Menu == "ox" then
-        local index = nil
-        if data.onBack and not data.onSelected then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-arrow-left",
-                title = "Return",
-                onSelect = data.onBack,
-                label = "Return",
-            })
-        end
-        for k in pairs(Menu) do
-            if data.onSelected and Menu[k].arrow then
-                Menu[k].icon = "fas fa-angle-right"
-            end
-            if not Menu[k].title then
-                if Menu[k].header ~= nil and Menu[k].header ~= "" then
-                    Menu[k].title = Menu[k].header
-                    Menu[k].label = Menu[k].header
-                    if Menu[k].txt then Menu[k].description = Menu[k].txt else Menu[k].description = "" end
-                else
-                    Menu[k].title = Menu[k].txt
-                    Menu[k].label = Menu[k].txt
-                end
-            end
-            if Menu[k].params then
-                Menu[k].event = Menu[k].params.event
-                Menu[k].args = Menu[k].params.args or {}
-            end
-            if Menu[k].isMenuHeader then
-                Menu[k].disabled = true
-            end
-        end
-        local menuID = 'Menu'
-        (data.onSelected and lib.registerMenu or lib.registerContext)({
-            id = menuID,
-            title = data.header..br..br..(data.headertxt and data.headertxt or ""),
-            position = 'top-right',
-            options = Menu,
-            canClose = data.canClose and data.canClose or nil,
-            onClose = (data.onBack and data.onBack) or (data.onExit and data.onExit) or nil,
-            onExit = data.onExit and data.onExit or nil,
-            onSelected = data.onSelected and (function(selected) index = selected end) or nil,
-        }, data.onSelected and (function(x, y, args)
-            if Menu[x].refresh then
-                if Menu[x].onSelect then
-                    Menu[x].onSelect()
-                end
-                lib.showMenu(menuID, index)
-            else
-                if Menu[x].onSelect then
-                    Menu[x].onSelect()
-                else
-                    lib.showMenu(menuID, index)
-                end
-            end
-        end) or nil)
-        if data.onSelected then
-            lib.showMenu(menuID, 1)
-        else
-            lib.showContext(menuID)
-        end
-
-    elseif Config.System.Menu == "qb" then
-        if data.onBack then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-arrow-left",
-                header = " ",
-                txt = "Return",
-                params = {
-                    isAction = true,
-                    event = data.onBack,
-                },
-            })
-        elseif data.canClose then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-xmark",
-                header = " ",
-                txt = "Close",
-                params = {
-                    isAction = true,
-                    event = data.onExit and data.onExit or (function() exports[QBMenuExport]:closeMenu() end),
-                },
-            })
-        end
-        if data.header ~= nil then
-            local tempMenu = {}
-            for k, v in pairs(Menu) do tempMenu[k + 1] = v end
-            tempMenu[1] = { header = data.header, txt = data.headertxt or "", isMenuHeader = true }
-            Menu = tempMenu
-        end
-        for k in pairs(Menu) do
-            if not Menu[k].params or not Menu[k].params.event then
-                if Menu[k].onSelect then
-                    Menu[k].params = {
-                        isAction = true,
-                        event = Menu[k].onSelect,
-                    }
-                else
-                    Menu[k].params = {
-                        isAction = true,
-                        event = function() end,
-                    }
-                end
-            end
-            if not Menu[k].header then Menu[k].header = " " end
-            if Menu[k].arrow then Menu[k].icon = "fas fa-angle-right" end
-        end
-        exports[QBMenuExport]:openMenu(Menu)
-
-    elseif Config.System.Menu == "gta" then
-        WarMenu.CreateMenu(tostring(Menu),
-            data.header,
-            data.headertxt or " ",
-            {
-                titleColor = { 222, 255, 255 },
-                maxOptionCountOnScreen = 15,
-                width = 0.25,
-                x = 0.7,
-            })
-        if WarMenu.IsAnyMenuOpened() then return end
-        WarMenu.OpenMenu(tostring(Menu))
-        CreateThread(function()
-            local close = true
-            while true do
-                if WarMenu.Begin(tostring(Menu)) then
-                    if data.onBack then
-                        if WarMenu.SpriteButton("Return", 'commonmenu', "arrowleft", 127, 127, 127) then
-                            WarMenu.CloseMenu()
-                            Wait(10)
-                            data.onBack()
-                        end
-                    end
-                    for k in pairs(Menu) do
-                        local pressed = WarMenu.Button(Menu[k].header)
-                        if not Menu[k].header then
-                            Menu[k].header = Menu[k].txt
-                            Menu[k].txt = nil
-                        end
-                        if Menu[k].txt and Menu[k].txt ~= "" and WarMenu.IsItemHovered() then
-                            if Menu[k].disabled or Menu[k].isMenuHeader then
-                                WarMenu.ToolTip("~r~"..Menu[k].txt, 0.18, true)
-                            else
-                                WarMenu.ToolTip(
-                                    (Menu[k].blip and "~BLIP_".."8".."~ " or "")..
-                                    Menu[k].txt:gsub("%:", ":~g~"):gsub("%\n", "\n~s~"), 0.18,
-                                    true)
-                            end
-                        end
-                        if pressed and not Menu[k].isMenuHeader then
-                            WarMenu.CloseMenu()
-                            close = false
-                            Menu[k].onSelect()
-                        end
-                    end
-                    WarMenu.End()
-                else
-                    return
-                end
-                if not WarMenu.IsAnyMenuOpened() and close then
-                    stopTempCam(cam)
-                    if data.onExit then data.onExit() end
-                end
-                Wait(0)
-            end
-        end)
-
-    elseif Config.System.Menu == "esx" then
-        for k in pairs(Menu) do
-            Menu[k].label = Menu[k].header
-            Menu[k].name = "button"..k
-        end
-        if data.canClose then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-xmark",
-                label = "Close",
-                name = "close",
-                onSelect = data.onExit,
-            })
-        end
-        if data.onBack then
-            table.insert(Menu, 1, {
-                icon = "fas fa-circle-arrow-left",
-                label = "Return",
-                name = "return",
-                onSelect = data.onBack,
-            })
-        end
-
-        ESX.UI.Menu.Open("default", getScript(), "Example_Menu", {
-            title = data.header,
-            align = 'top-right',
-            elements = Menu,
-        },
-        function(menuData, menu)
-            for k in pairs(Menu) do
-                if menuData.current.name == Menu[k].name then
-                    menu.close()
-                    Wait(10)
-                    Menu[k].onSelect()
-                end
-            end
-        end,
-        function(data, menu)
-            menu.close()
-        end)
-    end
 end
 
---- A line break constant used for formatting menu headers.
+-- Line break conversion table, basically, to automate the linebreak in functions `br`
-br = (Config.System.Menu == "ox" or Config.System.Menu == "gta") and "\n" or "<br>"
+-- This is declared and automatically sets it for what menu you are using (depends if one is uding MD formatting or HTML formatting)
+local lineBreakConversion = {
+    ["ox"] = "\n",
+    ["gta"] = "\n",
+    ["lation"] = "\n",
 
---- Checks if the menu system is classified as 'ox' or 'gta'.
+    ["qb"] = "<br>",
----
+    ["esx"] = "<br>",
---- This function is used to decide how to make line breaks in menu headers.
+}
----
+
---- @return boolean Returns `true` if the menu system is 'ox' or 'gta'; otherwise, `false`.
+--- A line break constant used for menu header formatting.
----
+br = lineBreakConversion[Config.System.Menu]
+
+--- Checks if the current menu system is 'ox' or 'gta' for formatting purposes.
+--- @return boolean boolean True if using ox or gta menus, otherwise false.
 --- @usage
 --- ```lua
 --- if isOx() then
@@ -279,7 +334,7 @@ function isOx() return (Config.System.Menu == "ox" or Config.System.Menu == "gta
 
 --- Checks if any WarMenu menu is currently open.
 ---
---- @return boolean Returns `true` if a WarMenu menu is open; otherwise, `false`.
+--- @return boolean boolean Returns `true` if a WarMenu menu is open; otherwise, `false`.
 ---
 --- @usage
 --- ```lua

shared/coreloader.lua

@@ -1,170 +1,108 @@
--- Create empty Variables --
+Items, Vehicles, Jobs, Gangs = nil, nil, nil, nil
-Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
 
--- Correct QB inventory export (if needed) from 'qb-inventory' to 'ps-inventory' or 'lj-inventory' --
+-- Shared Exports Initialization
-Exports.QBInv = (isStarted("ps-inventory") and "ps-inventory") or (isStarted("lj-inventory") and "lj-inventory") or Exports.QBInv
+Exports.PSInv = isStarted("lj-inventory") and "lj-inventory" or Exports.PSInv
 
--- Create simple variables based on the corresponding framework exports --
+OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport =
-OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport = Exports.OXLibExport or "", Exports.QBXExport or "", Exports.QBExport or "", Exports.ESXExport or "", Exports.OXCoreExport or ""
+    Exports.OXLibExport or "",
+    Exports.QBXExport or "",
+    Exports.QBExport or "",
+    Exports.ESXExport or "",
+    Exports.OXCoreExport or ""
+
+OXInv, QBInv, PSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, JPRInv =
+    Exports.OXInv or "",
+    Exports.QBInv or "",
+    Exports.PSInv or "",
+    Exports.CoreInv or "",
+    Exports.CodeMInv or "",
+    Exports.OrigenInv or "",
+    Exports.TgiannInv or "",
+    Exports.JPRInv or ""
+
+RSGExport, RSGInv = Exports.RSGExport or "", Exports.RSGInv or ""
+VorpExport, VorpInv = Exports.VorpExport or "", Exports.VorpInv or ""
 
--- Create simple variables based on the corresponding inventory names --
-OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv = Exports.OXInv or "", Exports.QBInv or "", Exports.PSInv or "", Exports.QSInv or "", Exports.CoreInv or "", Exports.CodeMInv or "", Exports.OrigenInv or ""
 
--- QB-Menu export name grabbed from exports.lua --
 QBMenuExport = Exports.QBMenuExport or ""
-
--- Target exports based on what is loaded --
 QBTargetExport, OXTargetExport = Exports.QBTargetExport or "", Exports.OXTargetExport or ""
 
--- If Debug mode is on in the loading script, print the list of found exports --
--- Some may "lie", 'ox_target' attempts to use 'qb-target' exports and this print will say its loaded (which is technically true) --
-for _, v in pairs(Exports) do
-    if isStarted(v) then debugPrint("^6Bridge^7: '^3"..v.."^7' ^2export found ^7") end
-end
-
-local itemResource, jobResource, vehResource = "", "", ""
-
--- Load item lists --
--- Complies the items from ox_inventory, qb-core or esx into 'Items' and loads them in a layout similar to qb-core's Shared items.lua --
--- For example this makes it so instead of QBCore.Shared.Items[item], you can load 'Item[item]' in the script --
-if isStarted(OXInv) then itemResource = OXInv
-    Items = exports[OXInv]:Items()
-    for k, v in pairs(Items) do
-        if v.client and v.client.image then
-            Items[k].image = (v.client.image):gsub("nui://"..OXInv.."/web/images/", "")
-        else
-            Items[k].image = k..".png"
-        end
-        Items[k].hunger = v.client and v.client.hunger or nil
-        Items[k].thirst = v.client and v.client.thirst or nil
-    end
-
-elseif isStarted(QBExport) then itemResource = QBExport
-    Core = Core or exports[QBExport]:GetCoreObject()
-    Items = Core and Core.Shared.Items or nil
-    if isStarted(QBExport) and not isStarted(QBXExport) then
-        RegisterNetEvent('QBCore:Client:UpdateObject', function()
-            Core = Core or exports[QBExport]:GetCoreObject()
-            Items = Core and Core.Shared.Items or nil
-        end)
-    end
-
-elseif isStarted(ESXExport) then itemResource = ESXExport
-    ESX = exports[ESXExport]:getSharedObject()
-    Items = ESX and ESX.Items or nil
-end
--- If it fails to load items, then it will print the error below --
--- If it loads them and debug is on, print how many items and where from --
-if not Items then
-    print("^4ERROR^7: ^2No Core Items detected ^7- ^2Check ^3exports^1.^2lua^7")
-else
-    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Items).." ^3Items^2 from ^7" .. itemResource)
-end
-
--- Load Vehicles --
--- Complies the vehicles from the detected frameworks into a table in the style of qb-cores shared vehicles.lua --
--- For example, instead of using QBCore.Shared.Vehicles[vehicle] you can load 'Vehicles[vehicle]' in the script --
 if isStarted(QBXExport) or isStarted(QBExport) then
     Core = Core or exports[QBExport]:GetCoreObject()
-    Vehicles = Core and Core.Shared.Vehicles
+elseif isStarted(RSGExport) then
-    if isStarted(QBExport) and not isStarted(QBXExport) then
+    Core = Core or exports[RSGExport]:GetCoreObject()
-        RegisterNetEvent('QBCore:Client:UpdateObject', function()
+elseif isStarted(VorpExport) then
-            Core = Core or exports[QBExport]:GetCoreObject()
+    Core = Core or exports[VorpExport]:GetCore()
-            Vehicles = Core and Core.Shared.Vehicles
+end
-        end)
+
-    end
+
-    vehResource = QBExport
+if IsDuplicityVersion() then
-elseif isStarted(OXCoreExport) then
+    local cache = nil
-    Vehicles = {}
+    local timeout = GetGameTimer() + 900000 -- 15 minutes max wait (had to up this from 2 minutes because of slow servers)
-    for k, v in pairs(Ox.GetVehicleData()) do
+
-        Vehicles[k] = { model = k, price = v.price, name = v.name, brand = v.make }
+    -- Wait until jim_bridge is started and export is available
-    end
+    while not cache and (timeout and GetGameTimer() < timeout) do
-    vehResource = OXCoreExport
+        if GetResourceState("jim_bridge"):find("start") then
-elseif isStarted(ESXExport) then
+            local success, result = pcall(function()
-    -- print("^6Bridge^7: ^2Loading ^3Vehicles^2 from ^7"..ESXExport)
+                return exports["jim_bridge"]:GetSharedData()
-    -- print("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..ESXExport)
-    CreateThread(function()
-        if isServer() then
-            createCallback(getScript()..":getVehiclesPrices", function(source)
-                Vehicles = MySQL.query.await('SELECT model, price, name FROM vehicles')
-                vehResource = ESXExport
-                return Vehicles
             end)
-        end
+            if success and result then
-        if not isServer() then
+                cache = result
-            local TempVehicles = triggerCallback(getScript()..":getVehiclesPrices")
-            for _, v in pairs(TempVehicles) do
-                Vehicles = Vehicles or {}
-                Vehicles[v.model] = { model = v.model, price = v.price, name = v.name, brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper) }
             end
         end
-    end)
+        Wait(100)
-end
+    end
-if vehResource == nil then
+
-    print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3exports^1.^2lua^7")
+    if timeout and not cache then
+        print("^1ERROR^7: ^2jim_bridge export not available after timeout^7.")
+        return
+    end
+
+    Items    = cache.Items
+    Vehicles = cache.Vehicles
+    Jobs     = cache.Jobs
+    Gangs    = cache.Gangs
+    InventoryWeight = cache.InventoryWeight or InventoryWeight
+    InventorySlots = cache.InventorySlots or 40
+
+    debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
+    --print(countTable(Items), countTable(Vehicles), countTable(Jobs))
 else
-    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
+    -- Shared bridge cache - prevent duplicate listeners
-end
+    exports["jim_bridge"]:GetBridgeCache(function(cache)
+        Items = cache.Items or {}
+        Vehicles = cache.Vehicles or {}
+        Jobs = cache.Jobs or {}
+        Gangs = cache.Gangs or {}
+        InventoryWeight = cache.InventoryWeight or InventoryWeight
+        InventorySlots = cache.InventorySlots or 50
 
--- Load Jobs --
+        CreateThread(function()
--- Attempts to load the details of jobs and gangs and compile into tables --
+            if isStarted(ESXExport) then
--- For example, instead of using QBCore.Shared.Jobs[job] you can load 'Jobs[job]' in the script --
+                for _, v in pairs(Vehicles) do
-if isStarted(QBXExport) then jobResource = QBXExport
+                    Vehicles[v.model] = {
-    Core = Core or exports[QBExport]:GetCoreObject()
+                        model = v.model,
-    Jobs, Gangs = exports[QBXExport]:GetJobs(), exports[QBXExport]:GetGangs()
+                        hash = v.hash,
-
+                        price = v.price,
-elseif isStarted(OXCoreExport) then  jobResource = OXExport
+                        name = v.name,
-    CreateThread(function()
+                        brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper)
-        if isServer() then
+                    }
-            createCallback(getScript()..":getOxGroups", function(source)
+                end
-                Jobs = MySQL.query.await('SELECT * FROM `ox_groups`') return Jobs
-            end)
-        else
-            local TempJobs = triggerCallback(getScript()..":getOxGroups")
-            Jobs = TempJobs or {}
-            for k, v in pairs(TempJobs) do
-                local grades = {}
-                for i = 1, #v.grades do grades[i] = { name = v.grades[i], isboss = (i == #v.grades)} end
-                Jobs[v.name] = { label = v.label, grades = grades }
             end
-            Gangs = Jobs
-        end
-    end)
 
-elseif isStarted(QBExport) then jobResource = QBExport
+            if isStarted(OXInv) then
-    Core = Core or exports[QBExport]:GetCoreObject()
+                for k, v in pairs(Items) do
-    Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+                    local tempInfo = exports[OXInv]:Items(k)
-    if isStarted(QBExport) and not isStarted(QBXExport) then
+                    Items[k].image = k..".png" -- Set default image
-        RegisterNetEvent('QBCore:Client:UpdateObject', function()
+                    if tempInfo and tempInfo.client then -- if client info, check for hard set image
-            Core = exports[QBExport]:GetCoreObject()
+                        Items[k].image = (tempInfo.client.image) and tempInfo.client.image:gsub("nui://"..OXInv.."/web/images/", "") or Items[k].image
-            Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+                        Items[k].hunger = tempInfo.client.hunger
+                        Items[k].thirst = tempInfo.client.thirst
+                    end
+                end
+            end
         end)
-    end
 
-elseif isStarted(ESXExport) then
+        debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
-    --print("^6Bridge^7: ^2Loading ^3Jobs^7/^3Gangs^2 from ^7"..ESXExport)
-    ESX = exports[ESXExport]:getSharedObject()
-    if isServer() then
-        Jobs = ESX.GetJobs()
-        for k, v in pairs(Jobs) do
-            local count = countTable(Jobs[k].grades)-1
-            Jobs[k].grades[tostring(count)].isBoss = true
-        end
-        Gangs = Jobs
-    end
-    CreateThread(function()
-        while not ESX do Wait(0) end
-        if isServer() then
-            createCallback(getScript()..":getJobs", function(source)
-                return Jobs
-            end)
-        end
-        if not isServer() then
-            Jobs = triggerCallback(getScript()..":getJobs")
-            Gangs = Jobs
-        end
     end)
 end
-if not isStarted(ESXExport) and Jobs then
-    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource, "^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
-end

shared/crafting.lua

@@ -1,56 +1,83 @@
-local CraftLock = false
+--[[
+    Crafting, Selling, and Shop Module
+    -----------------------------------
+    This module provides functions for opening crafting menus, handling multi-crafting,
+    performing the crafting process (with animations and progress bars), selling items,
+    and opening shop interfaces. It integrates with various inventory and menu systems,
+    and uses server callbacks to check item carry capacity.
+]]
 
---- Opens a crafting menu based on the provided data.
+-------------------------------------------------------------
+-- Global Variables
+-------------------------------------------------------------
+CraftLock = false
+
+-- helper filter table for crafting menus
+local excludeKeys = {
+    amount = true, metadata = true, description = true, info = true,
+    job = true, gang = true, oneUse = true, slot = true,
+    blueprintRef = true, craftingLevel = true, craftedItems = true,
+    hasCrafted = true, exp = true, anim = true, time = true,
+}
+
+-------------------------------------------------------------
+-- Crafting Menu
+-------------------------------------------------------------
+
+--- Opens the crafting menu based on provided data.
+--- Checks job restrictions, builds the recipe menu, and opens the menu.
 ---
---- This function checks job requirements, prepares the menu options, and opens the crafting menu.
+--- @param data table Crafting menu configuration containing:
---- It handles item availability, crafting recipes, and displays appropriate icons and labels.
+---     - craftable (`table`) Table with Header, Recipes, Anims, and (optionally) craftedItems.
+---     - coords (`vector3`) The coordinates where the crafting menu is being opened.
+---     - stashTable|stashName (`string\table`) Name(s) of the stash for checking item availability.
+---     - job|gang (`string`) Job or gang requirements.
+---     - onBack (optional): Function to call when returning.
 ---
----@param data table A table containing crafting menu data.
+--- @usage
---- - **craftable** (`table`): The crafting options and settings.
----   - **Header** (`string`): The header/title of the crafting menu.
----   - **Recipes** (`table`): A list of crafting recipes.
---- - **coords** (`vector3`): The coordinates where the crafting menu is being opened.
---- - **stashTable** (`string` or `table`, optional): The stash name(s) to check for item availability.
---- - **stashName** (`string` or `table`, optional): Alias for `stashTable`.
---- - **job** (`string` or `table`, optional): Job(s) required to access the crafting menu.
---- - **gang** (`string` or `table`, optional): Gang(s) required to access the crafting menu.
---- - **onBack** (`function`, optional): Function to call when returning from the menu.
----
----@usage
 --- ```lua
 --- craftingMenu({
----     craftable = {
+---      craftable = {
----         Header = "Weapon Crafting",
+---          Header = "Weapon Crafting",
----         Recipes = {
+---          Recipes = {
----             [1] = {
+---              [1] = {
----                 ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 },
+---                  ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 },
----                 amount = 1,
+---                  amount = 1,
----             },
+---              },
----             -- More recipes...
+---              -- More recipes...
----         },
+---          },
----         Anims = {
+---          Anims = {
----             animDict = "amb@prop_human_parking_meter@male@idle_a",
+---              animDict = "amb@prop_human_parking_meter@male@idle_a",
----             anim = "idle_a",
+---              anim = "idle_a",
----         },
+---          },
----     },
+---      },
----     coords = vector3(100.0, 200.0, 300.0),
+---      coords = vector3(100.0, 200.0, 300.0),
----     stashTable = "crafting_stash",
+---      stashTable = "crafting_stash",
----     job = "mechanic", -- Optional
+---      job = "mechanic",
----     onBack = function() print("Returning to previous menu") end,
+---      onBack = function() print("Returning to previous menu") end,
 --- })
---- ```
 function craftingMenu(data)
     if CraftLock then return end
+
+    -- Job or gang check; exit if not authorized.
     if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
+
+    -- Display a temporary "thinking" notification.
     if Config.System.Menu == "jim" then
         triggerNotify(nil, "Thinking", "info")
     else
         openMenu({ { header = "Thinking...", icon = "fas fa-hourglass-end", isMenuHeader = true } }, { header = "Crafting Menu" } )
     end
-    if data.stashTable then data.stashName = data.stashTable end
+
-    local Menu, hasjob = {}, false
+    -- Normalize stash name.
+    data.stashName = data.stashTable or data.stashName
+
+    local Menu = {}
     local Recipes = data.craftable.Recipes
+    local craftedItems = {}
     local tempCarryTable = {}
+
+    -- Build a table of all required ingredients (default quantity is 1).
     for i = 1, #Recipes do
         for k in pairs(Recipes[i]) do
             if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
@@ -59,223 +86,427 @@ function craftingMenu(data)
         end
     end
 
+    -- Check if the player can carry the required items (server callback).
     local canCarryTable = triggerCallback(getScript()..':server:canCarry', tempCarryTable)
+
+    local usingStash = data.stashName ~= nil and data.stashName ~= ""
+
+    Menu[#Menu+1] = {
+        icon = usingStash and "fas fa-boxes-stacked" or "fas fa-person",
+        header = "Material Source: "..(usingStash and "Job Stash" or "Player Inventory"),
+        disabled = true,
+    }
+
+    -- Process each recipe to create menu entries.
     for i = 1, #Recipes do
         if not Recipes[i]["amount"] then Recipes[i]["amount"] = 1 end
-        for k, v in pairs(Recipes[i]) do
+        for k, _ in pairs(Recipes[i]) do
-            if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
+            if not excludeKeys[k] then
+                local hasjob = true
                 if Recipes[i].job then
                     for l, b in pairs(Recipes[i].job) do
                         hasjob = hasJob(l, nil, b)
-                        if hasjob == true then break end
+                        if hasjob then break end
                     end
-                else hasjob = true end
+                end
-                local setheader, settext, disable, metadata = "", "", false, (Recipes[i]["metadata"] or nil)
                 if hasjob then
+                    local setheader, settext, disable, metadata = "", "", false, (Recipes[i]["metadata"] or Recipes[i]["info"] or nil)
                     local itemTable = {}
                     local metaTable = {}
+                    -- Build ingredient details.
                     for l, b in pairs(Recipes[i][tostring(k)]) do
-                        settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
+                        local label = getItemLabel(l)
-                        metaTable[Items[l] and Items[l].label or "error - "..l] = b
+                        local hasItem = checkStashItem(data.stashName, { [l] = b })
+                        local missingMark = not hasItem and " ❌" or " "
+                        settext = settext..(settext ~= "" and br or "").."[ x"..b.." ] - "..label..missingMark
+
+                        metaTable[label] = b
                         itemTable[l] = b
-                        Wait(0)
                     end
-                    while not canCarryTable do Wait(0) end
+
-                    disable = not checkHasItem(data.stashName, itemTable)
+                    while not canCarryTable do
-                    setheader = ((metadata and metadata.label) or (Items[tostring(k)] and Items[tostring(k)].label) or "error - " .. tostring(k)) .. (Recipes[i]["amount"] > 1 and " x" .. Recipes[i]["amount"] or "")
+                        Wait(10)
-                    if not disable then
+                    end
-                        if not canCarryTable[k] then setheader = setheader .. " 📦"
+                    disable = not checkStashItem(data.stashName, itemTable)
-                        else setheader = setheader .. " ✔️" end
+                    setheader = ((metadata and metadata.label) or getItemLabel(k))
-                    elseif not canCarryTable[k] then setheader = setheader .. " 📦" end
+                                ..(Recipes[i]["amount"] > 1 and " x"..Recipes[i]["amount"] or "")
+
+                    local statusEmoji = disable and " " or not canCarryTable[k] and " 📦" or " ✔️"
+                    local isNew = (Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil) and "✨ " or ""
+                    setheader = isNew .. setheader .. statusEmoji
+
                     Menu[#Menu + 1] = {
-                        arrow = not disable and canCarryTable[k],
+                        arrow = isOx() and (not disable and canCarryTable[k]),
-                        disable = isStarted(QBMenuExport) and disable and not canCarryTable[k],
+                        isMenuHeader = disable or not canCarryTable[k],
                         icon = invImg((metadata and metadata.image) or tostring(k)),
                         image = invImg((metadata and metadata.image) or tostring(k)),
-                        header = setheader..((disable or not canCarryTable[k]) and " ❌" or ""),
+                        header = setheader,
-                        txt = isStarted(QBMenuExport) and settext or nil,
+                        txt = settext or nil,
-                        --metadata = debugMode and Recipes[i]["metadata"] or nil,
                         metadata = metaTable,
-                        onSelect = ((not disable and canCarryTable[k]) and (function()
+                        onSelect = (not disable and canCarryTable[k]) and function()
-                            local transdata = { item = k, craft = data.craftable.Recipes[i], craftable = data.craftable, coords = data.coords, stashName = data.stashName, onBack = data.onBack, metadata = Recipes[i]["metadata"] }
+                            local transdata = {
-                            if Config.Crafting.MultiCraft then multiCraft(transdata) else makeItem(transdata) end
+                                item = k,
-                        end) or nil),
+                                craft = data.craftable.Recipes[i],
+                                craftable = data.craftable,
+                                coords = data.coords,
+                                stashName = data.stashName,
+                                onBack = data.onBack,
+                                metadata = metadata,
+                            }
+                            if Config.Crafting.MultiCraft then
+                                multiCraft(transdata)
+                            else
+                                makeItem(transdata)
+                            end
+                        end or nil,
                     }
                 end
             end
-            Wait(0)
+            --Wait(0)
         end
     end
-    openMenu(Menu, { header = data.craftable.Header, onBack = data.onBack or nil, canClose = true, onExit = function() end, })
+
+    openMenu(Menu, {
+        header = data.craftable.Header,
+        headertxt = data.craftable.Headertxt,
+        onBack = data.onBack or nil,
+        canClose = true,
+        onExit = data.onExit or (function() end),
+    })
     lookEnt(data.coords)
 end
 
+-------------------------------------------------------------
+-- Multi-Craft Menu
+-------------------------------------------------------------
+
 --- Opens a menu for selecting the quantity to craft.
 ---
---- This function presents the player with options to craft multiple quantities of an item, based on `Config.Crafting.MultiCraftAmounts`.
+--- Presents the player with multiple crafting quantities based on Config.Crafting.MultiCraftAmounts.
 ---
----@param data table A table containing crafting data.
+--- @param data table Crafting configuration containing:
---- - **item** (`string`): The item to craft.
+---     - item `string`) The item to craft.
---- - **craft** (`table`): The crafting recipe for the item.
+---     - craft (`table`) The crafting recipe.
---- - **craftable** (`table`): The crafting options and settings.
+---     - craftable (`table`)  Crafting options.
---- - **coords** (`vector3`): The coordinates where the crafting is taking place.
+---     - coords (`vector3`) where crafting occurs.
---- - **stashName** (`string` or `table`, optional): The stash name(s) to check for item availability.
+---     - stashName (`string`) The stash name(s) for item availability.
---- - **onBack** (`function`, optional): Function to call when returning from the menu.
+---     - onBack (`function`) Callback when returning.
---- - **metadata** (`table`, optional): Metadata for the crafted item.
+---     - metadata (`table`) (optional): Metadata for the crafted item.
 ---
----@usage
+--- @usage
 --- ```lua
 --- multiCraft({
 ---     item = "weapon_pistol",
 ---     craft = { ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 }, amount = 1 },
 ---     craftable = craftingOptions,
----     coords = vector3(100.0, 200.0, 300.0),
+---     coords = vector3(100,200,300),
 ---     stashName = "crafting_stash",
 ---     onBack = function() craftingMenu(data) end,
 ---     metadata = { label = "Custom Pistol", image = "custom_pistol.png" },
 --- })
 --- ```
 function multiCraft(data)
-    local Menu = {}
+    local max = 0
-    local success = Config.Crafting.MultiCraftAmounts
+    local stashName = nil
-    local metadata = data.metadata or nil
+    local maxCreation = 100
-    Menu[#Menu+1] = {
+
-        isMenuHeader = true,
+    -- Generate item table to check against stash or inventory
-        icon = invImg(metadata and metadata.image or data.item),
+    -- takes into account the ingredients needed for multiple items
-        header = metadata and metadata.label or Items[data.item].label,
+    local multiItemTable = {}
-    }
+
-    for k in pairsByKeys(success) do
+    for i = 1, maxCreation do
-        local settext = ""
+        multiItemTable[i] = {}
-        local itemTable = {}
         for l, b in pairs(data.craft[data.item]) do
-            itemTable[l] = (b * k)
+            multiItemTable[i][l] = (b * i)
-            settext = settext..(settext ~= "" and br or "")..Items[l].label..(b*k > 1 and "- x"..b*k or "")
-            Wait(0)
         end
-        local disable, stashname = checkHasItem(data.stashName, itemTable)
-        Menu[#Menu + 1] = {
-            isMenuHeader = not disable,
-            arrow = disable,
-            header = "Craft - x"..k * data.craft.amount,
-            txt = settext,
-            onSelect = function ()
-                makeItem({item = data.item, craft = data.craft, craftable = data.craftable, amount = k, coords = data.coords, stashName = stashname, stashTable = data.stashName, onBack = data.onBack, metadata = data.metadata })
-            end,
-        }
     end
-    openMenu(Menu, { header = data.craftable.Header, onBack = function() craftingMenu(data) end, })
+
+    for i = 1, maxCreation do
+        -- if its received a stash name, check if the items are in the stash
+        if data.stashName then
+            local hasItems, stashname = checkStashItem(data.stashName, multiItemTable[i])
+            if hasItems == true then
+                max += 1
+                stashName = stashname
+            else
+                break
+            end
+        else
+            -- if not check the players inventory for the items
+            local has, _ = hasItem(multiItemTable[i], nil, nil)
+            if has then
+                max += 1
+            else
+                break
+            end
+        end
+    end
+
+    local carryMax = triggerCallback(getScript()..":server:getMaxCarryCraft", {
+        item = data.item,
+        max = max
+    })
+
+    local dialog = createInput(data.craftable.Header..(Config.System.Menu == "qb" and ": "..br.."How many to craft? "..br.."Max: "..carryMax or ""), {
+        ((Config.System.Menu == "ox" or Config.System.Menu == "lation") and {
+            type = "slider",
+            label = "How many to craft? "..br.."Max: "..carryMax,
+            required = true,
+            default = 1,
+            min = 1,
+            max = carryMax
+        }) or nil,
+        ((Config.System.Menu == "qb") and {
+            type = "number",
+            name = "amount",
+            isRequired = true,
+            default = 1,
+        }) or nil,
+    })
+
+    if dialog then
+        if Config.System.Menu == "ox" then
+
+        end
+        if Config.System.Menu == "qb" then
+            dialog["amount"] = tonumber(dialog["amount"])
+            if dialog["amount"] > carryMax or dialog["amount"] < 1 or dialog["amount"] == nil or dialog["amount"] == "" then
+                triggerNotify(nil, "Invalid Amount", "error")
+                craftingMenu(data)
+                return
+            end
+        end
+
+        makeItem({
+            item = data.item,
+            craft = data.craft,
+            craftable = data.craftable,
+            amount = dialog["amount"] or dialog[1],
+            coords = data.coords,
+            stashName = stashName or nil,
+            onBack = data.onBack,
+            metadata = data.metadata,
+        })
+    end
 end
 
+-------------------------------------------------------------
+-- Crafting Process
+-------------------------------------------------------------
+
 --- Initiates the crafting process for a specified item.
 ---
---- This function handles the crafting animation, progress bar, item removal, and item creation.
+--- Plays crafting animations, shows progress bars, removes ingredients, and triggers item creation.
 ---
----@param data table A table containing crafting data.
+--- @param data table Crafting configuration containing:
---- - **item** (`string`): The item to craft.
+---     - item `string`) The item to craft.
---- - **craft** (`table`): The crafting recipe for the item.
+---     - craft (`table`) The crafting recipe.
---- - **craftable** (`table`): The crafting options and settings.
+---     - craftable (`table`)  Crafting options.
---- - **amount** (`number`, optional): The quantity to craft. Default is `1`.
+---     - amount (`number`) (optional): Quantity to craft (default 1).
---- - **coords** (`vector3`): The coordinates where the crafting is taking place.
+---     - coords (`vector3`) where crafting occurs.
---- - **stashName** (`string` or `table`, optional): The stash name(s) to remove items from.
+---     - stashName (`string`) The stash name(s) for item availability.
---- - **stashTable** (`string` or `table`, optional): Alias for `stashName`.
+---     - onBack (`function`) Callback when returning.
---- - **onBack** (`function`, optional): Function to call when returning from the menu.
+---     - metadata (`table`) (optional): Metadata for the crafted item.
---- - **metadata** (`table`, optional): Metadata for the crafted item.
 ---
----@usage
+--- @usage
 --- ```lua
 --- makeItem({
 ---     item = "weapon_pistol",
 ---     craft = { ["weapon_pistol"] = { ["steel"] = 5, ["plastic"] = 2 }, amount = 1 },
 ---     craftable = craftingOptions,
 ---     amount = 2,
----     coords = vector3(100.0, 200.0, 300.0),
+---     coords = vector3(100,200,300),
 ---     stashName = "crafting_stash",
 ---     onBack = function() craftingMenu(data) end,
 ---     metadata = { label = "Custom Pistol", image = "custom_pistol.png" },
 --- })
 --- ```
+
 function makeItem(data)
     if CraftLock then return end
     CraftLock = true
-    if data.stashTable then data.stashName = data.stashTable end
+    data.stashName = data.stashTable or data.stashName
-    local bartime = data.craftable.progressBar and data.craftable.progressBar.time or 5000
+
-    local bartext = (data.craftable.progressBar and data.craftable.progressBar.label) or (Loc[Config.Lan].progressbar and Loc[Config.Lan].progressbar["progress_make"]) or "Making a"
+    local bartime = (data.craftable.progressBar and data.craftable.progressBar.time) or 5000
-    local animDict = data.craftable.Anims and data.craftable.Anims.animDict or "amb@prop_human_parking_meter@male@idle_a"
+    local bartext = (data.craftable.progressBar and data.craftable.progressBar.label)
-    local anim = data.craftable.Anims and data.craftable.Anims.anim or "idle_a"
+                    or (Loc[Config.Lan].progressbar and Loc[Config.Lan].progressbar["progress_make"])
-    local amount = data.amount and (data.amount ~= 1) and data.amount or 1
+                    or "Making "
+    local animDict = (data.craftable.Anims and data.craftable.Anims.animDict) or "amb@prop_human_parking_meter@male@idle_a"
+    local anim = (data.craftable.Anims and data.craftable.Anims.anim) or "idle_a"
+    local craftAmount = (data.amount and data.amount ~= 1) and data.amount or 1
     local metadata = data.metadata or nil
     local prop = data.craftable.Anims and data.craftable.Anims.prop or nil
+    local canReturn = true
 
     local crafted, crafting = true, true
     local cam = createTempCam(PlayerPedId(), data.coords)
     startTempCam(cam)
 
-    for i = 1, amount do
+    -- Calculate total bartime if SingleProgress is enabled
+    local totalBartime = bartime * craftAmount
+
+    -- Run ingredient check and usage separately first
+    for i = 1, craftAmount do
         for k, v in pairs(data.craft) do
-            if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
+            if not excludeKeys[k] and type(v) == "table" then
-                if type(v) == "table" then
+                for l, b in pairs(v) do
-                    for l, b in pairs(v) do
+                    if isInventoryOpen() then
-                        if crafting and progressBar({
+                        print("^1Error^7: ^2Inventory is open, you tried to break things")
-                            label = "Using "..b.." "..Items[l].label,
+                        stopTempCam()
-                            time = 1000,
+                        ClearPedTasks(PlayerPedId())
-                            cancel = true,
+                        if canReturn then craftingMenu(data) end
-                            dict = 'pickup_object',
+                        CraftLock = false
-                            anim = "putdown_low",
+                        return
-                            flag = 48,
-                            icon = l,
-                        }) then
-                            TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", Items[l], "use", b) -- Show item box for each item
-                        else
-                            crafted, crafting = false, false
-                            break
-                        end
-                        Wait(200)
                     end
-                    if crafted then
+                    if crafting and progressBar({
-                        local craftProp = nil
+                        label = "Using "..b.." "..getItemLabel(l),
-                        if prop then
+                        time = 1000,
-                            local model, pos, rot, bone = prop.model, prop.pos, prop.rot, prop.bone
+                        cancel = true,
-                            craftProp = makeProp({ prop = model, coords = vec4(0, 0, 0, 0), true, true })
+                        dict = 'pickup_object',
-                            AttachEntityToEntity(craftProp, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), bone), pos.x, pos.y, pos.z, rot.x, rot.y, rot.z, true, true, false, true, 1, true)
+                        anim = "putdown_low",
-                        end
+                        flag = 49,
-                        if crafting and progressBar({
+                        icon = l,
-                            label = bartext..((metadata and metadata.label) or Items[data.item].label),
+                    }) then
-                            time = bartime,
+                        TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
-                            cancel = true,
+                    else
-                            dict = animDict,
+                        crafted, crafting = false, false
-                            anim = anim,
+                        break
-                            flag = 49,
-                            icon = data.item,
-                        }) then
-                            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata)
-                        else
-                            crafting = false
-                            break
-                        end
-                        if craftProp then destroyProp(craftProp) end
                     end
+                    Wait(200)
                 end
             end
         end
-        Wait(500)
     end
+
+    if not crafted then
+        stopTempCam()
+        ClearPedTasks(PlayerPedId())
+        if canReturn then craftingMenu(data) end
+        CraftLock = false
+        return
+    end
+
+    -- Handle SingleProgress option
+    if Config.Crafting.SingleProgress then
+        local craftProp = nil
+        if prop then
+            craftProp = makeProp({ prop = prop.model, coords = vec4(0, 0, 0, 0), true, true })
+            AttachEntityToEntity(craftProp, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), prop.bone), prop.pos.x, prop.pos.y, prop.pos.z, prop.rot.x, prop.rot.y, prop.rot.z, true, true, false, true, 1, true)
+        end
+        if data.sound then
+            local s = data.sound
+            PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
+        end
+        if crafting and progressBar({
+            label = bartext..((metadata and metadata.label) or getItemLabel(data.item)).." x"..craftAmount,
+            time = totalBartime,
+            cancel = true,
+            dict = animDict,
+            anim = anim,
+            flag = 49,
+            icon = data.item,
+            request = true,
+        }) then
+            data.craft.amount = craftAmount
+            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+            currentToken = nil -- clear client cached token
+            -- handle metadata and experience in a single go
+            if data.craft["hasCrafted"] ~= nil then
+                data.craftable.craftedItems[data.item] = true
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+            end
+            if data.craft["exp"] ~= nil then
+                craftingLevel += data.craft["exp"].give * craftAmount
+                triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
+            end
+            if data.craftable.Recipes[1].oneUse == true then
+                removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
+                local breakId = GetSoundId()
+                PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+                canReturn = false
+            end
+            if data.sound then
+                StopSound(data.sound.soundId)
+            end
+            if data.requiredItemfunc then
+                data.requiredItemfunc()
+            end
+        end
+        if craftProp then destroyProp(craftProp) end
+    else
+        -- Run the original loop for multiple progress bars
+        for i = 1, craftAmount do
+            if crafting and progressBar({
+                label = bartext..((metadata and metadata.label) or getItemLabel(data.item)),
+                time = bartime,
+                cancel = true,
+                dict = animDict,
+                anim = anim,
+                flag = 49,
+                icon = data.item,
+                request = true,
+            }) then
+                TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+                currentToken = nil
+                if data.craft["hasCrafted"] ~= nil then
+                    data.craftable.craftedItems[data.item] = true
+                    triggerCallback(getScript()..":server:setPlayerMetadata", "craftedItems", data.craftable.craftedItems)
+                end
+                if data.craft["exp"] ~= nil then
+                    craftingLevel += data.craft["exp"].give
+                    triggerCallback(getScript()..":server:setPlayerMetadata", "craftingLevel", craftingLevel)
+                end
+                if data.craftable.Recipes[1].oneUse == true then
+                    removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
+                    local breakId = GetSoundId()
+                    PlaySoundFromEntity(breakId, "Drill_Pin_Break", PlayerPedId(), "DLC_HEIST_FLEECA_SOUNDSET", 1, 0)
+                    canReturn = false
+                end
+                if data.requiredItemfunc then
+                    data.requiredItemfunc()
+                end
+            else
+                break
+            end
+        end
+    end
+
+    Wait(500)
     stopTempCam()
     CraftLock = false
-    lockInv(false)
+    if canReturn then craftingMenu(data) end
-    craftingMenu(data)
     ClearPedTasks(PlayerPedId())
 end
 
+
+-------------------------------------------------------------
+-- Server Event Handler: Crafted Item
+-------------------------------------------------------------
+
 --- Server event handler for giving the crafted item to the player.
 ---
---- This event is triggered when the crafting process is completed successfully.
+--- Removes required ingredients from the player's inventory or stash,
+--- then adds the crafted item to their inventory.
 ---
 --- @param ItemMake string The item being crafted.
 --- @param craftable table The crafting recipe and details.
---- @param stashName string|table The stash name(s) to remove items from.
+--- @param stashName string|table The stash name(s) to remove ingredients from.
 --- @param metadata table (optional) Metadata for the crafted item.
-RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata)
+--- @usage
-    local src, amount, stashItems = source, craftable and craftable.amount or 1, nil
+RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata, token)
+    local src = source
+    -- debugPrint("^6Bridge^7: ^4"..getScript().."^7:^4Crafting^7:^4GetItem ^2invoked by^7: "..GetInvokingResource())
+	if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
+        debugPrint("^1ERROR^7: ^1Possible exploit^7, ^1vital function was called from an external resource^7")
+        return
+    end
+
+    if not checkToken(src, token, "item", ItemMake) then
+        return
+    end
+
+
+    local hasItems, hasTable = hasItem(ItemMake, 1, src)
     if stashName then
         local itemRemove = {}
         if type(stashName) == "table" then
@@ -283,7 +514,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
                 stashItems = getStash(name)
                 for k, v in pairs(craftable[ItemMake] or {}) do
                     for _, b in pairs(stashItems or {}) do
-                        if k == b.name then itemRemove[k] = v end
+                        if k == b.name then
+                            itemRemove[k] = v
+                        end
                     end
                 end
             end
@@ -291,7 +524,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
             stashItems = getStash(stashName)
             for k, v in pairs(craftable[ItemMake] or {}) do
                 for _, b in pairs(stashItems or {}) do
-                    if k == b.name then itemRemove[k] = v end
+                    if k == b.name then
+                        itemRemove[k] = v
+                    end
                 end
             end
         end
@@ -299,183 +534,12 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
     else
         if craftable then
             for k, v in pairs(craftable[ItemMake] or {}) do
-                TriggerEvent(getScript()..":server:toggleItem", false, tostring(k), v, src)
+                removeItem(tostring(k), v, src)
             end
         end
     end
-    TriggerEvent(getScript()..":server:toggleItem", true, ItemMake, amount, src, metadata)
+    addItem(ItemMake, craftable.amount or 1, metadata, src)
-    --if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
+    -- Optionally, add experience here:
+    -- for example:
+    -- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
 end)
-
---- Opens a selling menu based on the provided data.
----
---- This function checks available items to sell, prepares the menu options, and opens the selling menu.
----
----@param data table A table containing selling menu data.
---- - **sellTable** (`table`): The selling options and settings.
----   - **Items** (`table`): A list of items that can be sold with their prices.
----   - **Header** (`string`, optional): The header/title of the selling menu.
---- - **ped** (`number`, optional): The ped entity involved in the selling interaction.
---- - **onBack** (`function`, optional): Function to call when returning from the menu.
----
----@usage
---- ```lua
---- sellMenu({
----     sellTable = {
----         Header = "Sell Items",
----         Items = {
----             ["gold_ring"] = 100,
----             ["diamond"] = 500,
----         },
----     },
----     ped = pedEntity,
----     onBack = function() print("Returning to previous menu") end,
---- })
---- ```
-function sellMenu(data)
-    local origData = data
-    local Menu = {}
-    if data.sellTable.Items then
-        local itemList = {}
-        for k, v in pairs(data.sellTable.Items) do itemList[k] = 1 end
-        local _, hasTable = hasItem(itemList)
-        for k, v in pairsByKeys(data.sellTable.Items) do
-            Menu[#Menu +1] = {
-                isMenuHeader = not hasTable[k].hasItem,
-                icon = invImg(k),
-                header = Items[k].label.. (hasTable[k].hasItem and "💰 (x"..hasTable[k].count..")" or ""),
-                txt = Loc[Config.Lan].info["sell_all"]..v.." "..Loc[Config.Lan].info["sell_each"],
-                onSelect = function()
-                    sellAnim({ item = k, price = v, ped = data.ped, onBack = function() sellMenu(data) end })
-                end,
-            }
-        end
-    else
-        for k, v in pairsByKeys(data.sellTable) do
-            if type(v) == "table" then
-                Menu[#Menu +1] = {
-                    arrow = true,
-                    header = k,
-                    txt = "Amount of items: "..countTable(v.Items),
-                    onSelect = function()
-                        v.onBack = function() sellMenu(origData) end
-                        v.sellTable = data.sellTable[k]
-                        sellMenu(v)
-                    end,
-                }
-            end
-        end
-    end
-    openMenu(Menu, { header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items), headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items) or "", canClose = true, onBack = data.onBack })
-end
-
---- Handles the selling animation and item transaction.
----
---- This function plays the selling animation, removes the item from the player's inventory, and gives the player money.
----
----@param data table A table containing selling data.
---- - **item** (`string`): The item to sell.
---- - **price** (`number`): The price per item.
---- - **ped** (`number`, optional): The ped entity involved in the selling interaction.
---- - **onBack** (`function`, optional): Function to call when returning from the menu.
----
----@usage
---- ```lua
---- sellAnim({
----     item = "gold_ring",
----     price = 100,
----     ped = pedEntity,
----     onBack = function() sellMenu(data) end,
---- })
---- ```
-function sellAnim(data)
-    if not hasItem(data.item, 1) then
-        triggerNotify(nil, Loc[Config.Lan].error["dont_have"].." "..Items[data.item].label, "error")
-        return
-    end
-    for k, v in pairs(GetGamePool('CObject')) do
-        for _, model in pairs({`p_cs_clipboard`}) do
-            if GetEntityModel(v) == model then
-                if IsEntityAttachedToEntity(data.ped, v) then
-                    DeleteObject(v) DetachEntity(v, 0, 0) SetEntityAsMissionEntity(v, true, true)
-                    Wait(100) DeleteEntity(v)
-                end
-            end
-        end
-    end
-    TriggerServerEvent(getScript().."Sellitems", data)
-    lookEnt(data.ped)
-    local dict = "mp_common"
-    playAnim(dict, "givetake2_a", 0.3, 2)
-    playAnim(dict, "givetake2_b", 0.3, 2, data.ped)
-    Wait(2000)
-    StopAnimTask(PlayerPedId(), dict, "givetake2_a", 0.5)
-    StopAnimTask(data.ped, dict, "givetake2_b", 0.5)
-    if data.onBack then data.onBack() end
-end
-
---- Server event handler for processing the item sale.
----
---- This event removes the sold item from the player's inventory and adds money to their account.
----
----@param data table The data containing item and price information.
-RegisterNetEvent(getScript().."Sellitems", function(data)
-    local src = source
-    local hasItems, hasTable = hasItem(data.item, 1, src)
-    if hasItems then
-        TriggerEvent(getScript()..":server:toggleItem", false, data.item, hasTable[data.item].count, src)
-        TriggerEvent(getScript()..":server:FundPlayer", (hasTable[data.item].count * data.price), "cash", src)
-    else
-        triggerNotify(nil, Loc[Config.Lan].error["dont_have"].." "..Items[data.item].label, "error", src)
-    end
-end)
-
---- Opens a shop interface for the player.
----
---- This function checks job requirements and opens the shop using the appropriate inventory system.
----
----@param data table A table containing shop data.
---- - **shop** (`string`): The shop identifier.
---- - **items** (`table`): The items available in the shop.
---- - **coords** (`vector3`): The coordinates where the shop interaction is happening.
---- - **job** (`string` or `table`, optional): Job(s) required to access the shop.
---- - **gang** (`string` or `table`, optional): Gang(s) required to access the shop.
----
----@usage
---- ```lua
---- openShop({
----     shop = "weapon_shop",
----     items = weaponShopItems,
----     coords = vector3(100.0, 200.0, 300.0),
----     job = "police",
---- })
---- ```
-function openShop(data)
-    if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
-    if isStarted(OXInv) then
-        exports[OXInv]:openInventory('shop', { type = data.shop })
-    elseif isStarted(QBInv) then
-        if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenShopNewQB', data.shop) -- i hate qb-inv
-        else
-            TriggerServerEvent(Config.General.JimShops and "jim-shops:ShopOpen" or "inventory:server:OpenInventory", "shop", data.items.label, data.items)
-        end
-    else
-        TriggerServerEvent(Config.General.JimShops and "jim-shops:ShopOpen" or "inventory:server:OpenInventory", "shop", data.items.label, data.items)
-    end
-    lookEnt(data.coords)
-end
-
---- Server event handler for opening a new QB inventory shop.
----
---- This event is triggered when using the new QB inventory system.
----
----@param data table The shop data to open.
-RegisterNetEvent(getScript()..':server:OpenShopNewQB', function(data)
-    exports[QBInv]:OpenShop(source, data)
-end)
-
---- Server-side callback registration for checking if the player can carry items.
-if isServer() then
-    createCallback(getScript()..':server:canCarry', function(source, itemTable) local result = canCarry(itemTable, source) return result end)
-end

shared/drawText.lua

@@ -1,61 +1,174 @@
-local radarTable = {}
+--[[
+    Text Drawing Module
+    ---------------------
+    This module provides functions to display and hide text on screen using
+    various frameworks: QB, OX, GTA, and ESX.
+]]
+
+-- Text system handlers
+local textHandlers = {
+    qb = {
+        show =
+            function(text, image)
+                if image then
+                    text = '<img src="'..(radarTable[image] or "")..'" style="width:12px;height:12px">'..text
+                end
+                exports[QBExport]:DrawText(text, 'left')
+            end,
+        hide =
+            function()
+                exports[QBExport]:HideText()
+            end,
+    },
+
+    ox = {
+        show =
+            function(input, image, oxStyleTable)
+                local inputCount = #input
+                for i = 1, inputCount do
+                    input[i] = input[i] .. (i ~= inputCount and "   \n" or "")
+                end
+                lib.showTextUI(table.concat(input), {
+                    icon = (image and radarTable[image] or image) or nil,
+                    position = 'left-center',
+                    style = oxStyleTable
+                })
+            end,
+        hide =
+            function()
+                lib.hideTextUI()
+            end,
+    },
+
+    lation = {
+        show =
+            function(input, image)
+                local inputCount = #input
+                for i = 1, inputCount do
+                    input[i] = input[i] .. (i ~= inputCount and "   \n" or "")
+                end
+                exports.lation_ui:showText({
+                    description = table.concat(input),
+                    keybind = nil,
+                    icon = (image and radarTable[image] or image) or nil,
+                    iconColor = '#3B82F6',
+                    position = 'left-center'
+                })
+            end,
+        hide =
+            function()
+                exports.lation_ui:hideText()
+            end,
+    },
+
+    esx = {
+        show =
+            function(text, image)
+                if image then
+                    text = '<img src="'..(radarTable[image] or "")..'" style="width:12px;height:12px">'..text
+                end
+                ESX.TextUI(text, nil)
+            end,
+        hide =
+            function()
+                ESX.HideUI()
+            end,
+    },
+
+    gta = {
+        show =
+            function(input, image, style)
+                local text = ""
+                for i = 1, #input do
+                    if input[i] ~= "" then
+                        text = text .. input[i] .. "\n~s~"
+                    end
+                end
+                if image then
+                    text = "~BLIP_" .. image .. "~ " .. text
+                end
+                DisplayHelpMsg(text:gsub("%:", ":~" .. (style or "g") .. "~"))
+            end,
+        hide =
+            function()
+                ClearAllHelpMessages()
+            end,
+    },
+
+    red = {
+        show =
+            function(input)
+                local text = ""
+                for i = 1, #input do
+                    if input[i] ~= "" then
+                        text = text .. input[i] .. "\n~q~"
+                    end
+                end
+                TriggerEvent("jim-redui:DrawText", text)
+            end,
+        hide =
+            function()
+                TriggerEvent("jim-redui:HideText")
+            end,
+    }
+}
 
 --- Displays text on the screen using the configured draw text system.
 ---
---- This function handles displaying text with optional images or icons using different frameworks like 'qb', 'ox', 'gta', and 'esx'.
+--- Depending on Config.System.drawText, this function will use different methods to
+--- display text along with optional images/icons.
 ---
----@param image string|nil An optional image or icon to display with the text. Can be a URL, path, or a reference to an icon.
+--- @param image string|nil Optional image/icon identifier to display with the text.
----@param input table A table of strings, each representing a line of text to display.
+--- @param input table An array of strings; each string is a line of text to display.
----@param style string|nil An optional style code for default GTA popups (e.g., '~g~' for green text).
+--- @param style string|nil Optional style code for default GTA popups (e.g., "~g~" for green).
----@param oxStyleTable table|nil An optional table specifying style parameters for the 'ox' draw text system.
+--- @param oxStyleTable table|nil Optional table specifying style parameters for the OX text UI.
 ---
 ---@usage
 --- ```lua
 --- drawText("img_link", { "Test line 1", "Test Line 2" }, "~g~")
 --- ```
-function drawText(image, input, style, oxStyleTable) local text = ""
+function drawText(image, input, style, oxStyleTable)
-	if Config.System.drawText == "qb" then
+    if not radarTable then radarTable = {} end
-		for i = 1, #input do
-			text = text..input[i].."</span>"..(input[i+1] ~= nil and "<br>" or "") end
-		local text = text:gsub("%:", ":<span style='color:yellow'>")
-		if image then
-			text = '<img src="'..(radarTable[image] or nil)..'" style="width:12px;height:12px">'..text
-		end
-		exports[QBExport]:DrawText(text, 'left')
 
-	elseif Config.System.drawText == "ox" then
+    local systemType = Config.System.drawText
-		for k, v in pairs(input) do
+    local handler = textHandlers[systemType]
-			input[k] = v.."   \n"
-		end
-		lib.showTextUI(table.concat(input), { icon = (image and radarTable[image] or image) or nil, position = 'left-center', style = oxStyleTable})
 
-	elseif Config.System.drawText == "gta" then
+    if not handler then return end
-		for i = 1, #input do if input[i] ~= "" then text = text..input[i].."\n~s~" end end
-		if image then text = "~BLIP_"..image.."~ "..text end
 
-		DisplayHelpMsg(text:gsub("%:", ":~"..(style or "g").."~"))
+    if systemType == "qb" or systemType == "esx" then
-    elseif Config.System.drawText == "esx" then
+        -- Concatenate lines for QB/ESX system with HTML line breaks.
+        local text = ""
         for i = 1, #input do
-			text = text..input[i].."</span>"..(input[i+1] ~= nil and "<br>" or "") end
+            text = text .. input[i] .. "</span>" .. (input[i + 1] and "<br>" or "")
-		local text = text:gsub("%:", ":<span style='color:yellow'>")
+        end
-		if image then
+        text = text:gsub("%:", ":<span style='color:yellow'>")
-			text = '<img src="'..radarTable[image]..'" style="width:12px;height:12px">'..text
+        handler.show(text, image)
-		end
-		ESX.TextUI(text, nil)
-	end
-end
 
---- Hides any text currently being displayed on the screen.
+    elseif systemType == "ox" then
----
+        handler.show(input, image, oxStyleTable)
---- This function clears the text displayed by the `drawText` function, using the appropriate method based on the configured draw text system.
+
-function hideText()
+    elseif systemType == "lation" then
-    if Config.System.drawText == "qb" then
+        handler.show(input, image)
-        exports[QBExport]:HideText()
+
-    elseif Config.System.drawText == "ox" then
+    elseif systemType == "gta" then
-        lib.hideTextUI()
+        handler.show(input, image, style)
-    elseif Config.System.drawText == "gta" then
+
-        ClearAllHelpMessages()
+    elseif systemType == "red" then
-    elseif Config.System.drawText == "esx" then
+        handler.show(input)
-        ESX.HideUI()
+    end
+end
+
+--- Hides any text currently displayed on the screen.
+---
+--- Clears the text using the appropriate method for the configured draw text system.
+---
+---	@usage
+--- ```lua
+--- hideText()
+--- ```
+function hideText()
+    local handler = textHandlers[Config.System.drawText]
+    if handler and handler.hide then
+        handler.hide()
     end
 end

shared/duifunctions.lua

@@ -1,122 +1,161 @@
--- DUI STUFF -- * Experimental * --
+if gameName ~= "rdr3" then
+    --[[
+            DUI Module (Experimental)
+            --------------------------
+            This module handles the creation, modification, and removal of custom DUI (Display UI)
+            elements using runtime textures. It supports both client and server functionality to update DUI
+            images dynamically.
+        ]]
 
-scriptTxd = not isServer() and CreateRuntimeTxd(getScript()..'scriptTxd') or nil
+        -- Create a runtime texture dictionary on the client if not running on the server.
-customDUIList = {}
+        scriptTxd = not isServer() and CreateRuntimeTxd(getScript()..'scriptTxd') or nil
+        customDUIList = {}
 
--- DUI CLIENT
+        -------------------------------------------------------------
-function createDui(name, http, size, txd)
+        -- DUI Client Functions
-	--print(name, http, size, txd)
+        -------------------------------------------------------------
-	if not customDUIList[name] then
+
-		local newTxt = CreateDui(http, math.floor(size.x), math.floor(size.y))
+        --- Creates or updates a DUI element.
-		while not GetDuiHandle(newTxt) do Wait(0) end
+        ---
-		CreateRuntimeTextureFromDuiHandle(txd, name, GetDuiHandle(newTxt))
+        --- @param name string The unique name for the DUI element.
-		customDUIList[name] = newTxt
+        --- @param http string The URL to load into the DUI.
-		SetDuiUrl(customDUIList[name], http)
+        --- @param size table A table with .x and .y fields specifying the DUI dimensions.
-	else
+        --- @param txd table The runtime texture dictionary where the DUI texture will be created.
-		SetDuiUrl(customDUIList[name], http)
+        --- @usage
-	end
+        --- ```lua
-end
+        --- createDui("logo", "https://example.com/logo.png", { x = 512, y = 256 }, scriptTxd)
+        --- ```
+        function createDui(name, http, size, txd)
+            if not customDUIList[name] then
+                local newDui = CreateDui(http, math.floor(size.x), math.floor(size.y))
+                while not GetDuiHandle(newDui) do Wait(0) end
+                CreateRuntimeTextureFromDuiHandle(txd, name, GetDuiHandle(newDui))
+                customDUIList[name] = newDui
+                SetDuiUrl(customDUIList[name], http)
+            else
+                SetDuiUrl(customDUIList[name], http)
+            end
+        end
+
+        --- Opens a DUI selection input allowing the user to change the DUI image URL.
+        ---
+        --- @param data table A table containing DUI data:
+        ---   - name: The key name in the DUI list.
+        ---   - texn: The texture name.
+        ---   - texd: The texture dictionary.
+        ---   - size: A table with .x and .y dimensions.
+        ---
+        --- @usage
+        --- ```lua
+        --- DuiSelect({ name = "logo", texn = "logoTex", texd = "someTxd", size = { x = 512, y = 256 } })
+        --- ```
+        function DuiSelect(data)
+            local imagePreview = "![test]("..data.url..")"
+            --local imagePreview = "<center>- Current Image -<br>" ..
+            --                "<img src="..data.url.." width=150px><br>" ..
+            --                "Size: ["..math.floor(data.size.x)..", "..math.floor(data.size.y).."]<br><br>"
+
+            local dialog = createInput(imagePreview, {
+                { type = "text", text = "dui_url", name = "url", isRequired = true },
+            })
+
+            if dialog then
+                data.url = dialog.url or dialog[1]
+                -- Scan URL for valid image extension and banned words.
+                local searchList = { "png", "jpg", "jpeg", "gif", "webp", "bmp" }
+                local banList = { "porn" }
+                local searchFound = false
+                for _, ext in pairs(searchList) do
+                    if string.find(tostring(data.url), ext) then
+                        searchFound = true
+                        break
+                    end
+                end
+                for _, banned in pairs(banList) do
+                    if string.find(tostring(data.url), banned) then
+                        searchFound = false
+                        print("BANNED WORD: "..banned)
+                        break
+                    end
+                end
+                if searchFound then
+                    TriggerServerEvent(getScript()..":Server:ChangeDUI", data)
+                end
+            end
+        end
+
+        --- Client event handler to update DUI elements.
+        RegisterNetEvent(getScript()..":Client:ChangeDUI", function(data)
+            debugPrint("^6Bridge^7: ^2Receiving new DUI ^7- ^6"..data.url.."^7")
+            if tostring(data.url) ~= "-" then
+                createDui(data.texn, tostring(data.url), data.size, scriptTxd)
+                AddReplaceTexture(tostring(data.texd), tostring(data.texn), getScript().."scriptTxd", tostring(data.texn))
+            end
+        end)
+
+        --- Client event handler to clear DUI elements.
+        RegisterNetEvent(getScript()..":Client:ClearDUI", function(data)
+            if customDUIList[tostring(data.texn)] then
+                RemoveReplaceTexture(tostring(data.texd), tostring(data.texn))
+                if IsDuiAvailable(customDUIList[tostring(data.texn)]) then
+                    SetDuiUrl(customDUIList[data.name], nil)
+                end
+            end
+        end)
+
+        -------------------------------------------------------------
+        -- DUI Server Functions
+        -------------------------------------------------------------
+
+        --- Server event handler to change DUI settings.
+        --- If no URL is provided, resets to the preset value.
+        RegisterNetEvent(getScript()..":Server:ChangeDUI", function(data)
+            if not data.url then
+                debugPrint("^6Bridge^7: ^2Preset: ^6"..tostring(data.preset).."^7")
+                data.url = data.preset
+            else
+                for k, v in pairs(Locations[data.name].duiList) do
+                    if v.tex.texn == data.texn then
+                        Locations[data.name].duiList[k].url = data.url
+                    end
+                end
+            end
+            debugPrint("^6Bridge^7: ^3DUI^2 Sending new DUI to all players^7 - ^6"..data.url.."^7")
+            TriggerClientEvent(getScript()..":Client:ChangeDUI", -1, data)
+        end)
+
+        --- Server event handler to clear DUI settings.
+        RegisterNetEvent(getScript()..":Server:ClearDUI", function(data)
+            if data.url == "-" then
+                for k, v in pairs(Locations[data.name].duiList) do
+                    if v.tex.texn == data.texn then
+                        Locations[data.name].duiList[k].url = "-"
+                    end
+                end
+            end
+            TriggerClientEvent(getScript()..":Client:ClearDUI", -1, data)
+        end)
+
+        -------------------------------------------------------------
+        -- Resource Cleanup
+        -------------------------------------------------------------
+
+        onResourceStop(function()
+            for k, v in pairs(duiList or {}) do
+                for i = 1, #v do
+                    RemoveReplaceTexture(tostring(v[i].tex.texd), tostring(v[i].tex.texn))
+                end
+            end
+        end, true)
+
+        -------------------------------------------------------------
+        -- DUI List Callback (Server)
+        -------------------------------------------------------------
+
+        if isServer() then
+            createCallback(getScript()..":Server:duiList", function(source)
+                return duiList
+            end)
+        end
 
-function DuiSelect(data)
-    local image = ""
-	for k, v in pairs(duiList[data.name]) do
-		if v.tex.texn == data.texn then
-			if duiList[data.name][k] then
-				image = "<center>- Current Image -<br>"..
-						"<img src="..duiList[data.name][k].url.." width=150px><br>"..
-						"Size: ["..math.floor(data.size.x)..", "..math.floor(data.size.y).."]<br><br>"
-			end
-		end
-	end
-    local dialog = exports['qb-input']:ShowInput({
-        header = image..Loc[Config.Lan].menu["dui_new"],
-        submitText = Loc[Config.Lan].menu["dui_change"],
-        inputs = { { type = 'text', isRequired = true, name = 'url', text = Loc[Config.Lan].menu["dui_url"] } } })
-    if dialog then
-        if not dialog.url then return end
-        data.url = dialog.url
-        --Scan the link to see if it has an image extention otherwise, stop here.
-        local searchList = { "png", "jpg", "jpeg", "gif", "webp", "bmp" }
-        --Scan the link for certain terms that will flag it and refuse to show it
-        local banList = { "porn" } -- I dunno, let me know what links people manage to find
-        local searchFound = false
-        for k, v in pairs(searchList) do
-			if string.find(tostring(data.url), tostring(v))then
-				searchFound = true
-			end
-		end
-        for k, v in pairs(banList) do
-			if string.find(tostring(data.url), tostring(v)) then
-				searchFound = false print("BANNED WORD: "..v)
-			end
-		end
-        if searchFound then
-			TriggerServerEvent(getScript()..":Server:ChangeDUI", data)
-		end
     end
-end
-
-RegisterNetEvent(getScript()..":Client:ChangeDUI", function(data)
-    debugPrint("^6Bridge^7: ^2Recieving new DUI ^7- ^6"..data.url.."^7")
-    if tostring(data.url) ~= "-" then
-		createDui(data.texn, tostring(data.url), data.size, scriptTxd)
-        AddReplaceTexture(tostring(data.texd), tostring(data.texn), getScript()..'scriptTxd', tostring(data.texn))
-    end
-end)
-
-RegisterNetEvent(getScript()..":Client:ClearDUI", function(data)
-    if customDUIList[tostring(data.texn)] then
-        RemoveReplaceTexture(tostring(data.texd), tostring(data.texn))
-        if IsDuiAvailable(customDUIList[tostring(data.texn)]) then
-			SetDuiUrl(customDUIList[data.name], nil)
-		end
-    end
-end)
-
--- DUI SERVER
-RegisterNetEvent(getScript()..":Server:ChangeDUI", function(data)
-    -- if no url given, "reset" it back to preset
-    if not data.url then
-		for k, v in pairs(duiList[data.name]) do
-			if v.tex.texn == data.texn then
-				debugPrint("^6Bridge^7: ^2Preset^7: ^6"..tostring(duiList[data.name][k].preset).."^7")
-				data.url = duiList[data.name][k].preset
-			end
-		end
-    end
-    -- if it has a url, update server DUI list and send to players
-	for k, v in pairs(duiList[data.name]) do
-		if v.tex.texn == data.texn then
-			duiList[data.name][k].url = data.url
-		end
-	end
-	debugPrint("^6Bridge^7: ^3DUI^2 Sending new DUI to all players^7 - ^6"..data.url.."^7")
-	TriggerClientEvent(getScript()..":Client:ChangeDUI", -1, data)
-end)
-
-RegisterNetEvent(getScript()..":Server:ClearDUI", function(data)
-    if data.url == "-" then
-		for k, v in pairs(duiList[data.name]) do
-			if v.tex.texn == data.texn then
-				duiList[data.name][k].url = "-"
-			end
-		end
-	end
-    -- Clear the DUI from loading
-    TriggerClientEvent(getScript()..":Client:ClearDUI", -1, data)
-    --duiList[tostring(data.tex)].url = ""
-end)
-
-AddEventHandler('onResourceStop', function(r) if r ~= getScript() then return end
-    for k, v in pairs(duiList or {}) do
-		for i = 1, #v do
-			RemoveReplaceTexture(tostring(v[i].tex.texd), tostring(v[i].tex.texn))
-		end
-    end
-end)
-
-if isServer() then
-    createCallback(getScript()..":Server:duiList", function(source)
-            return duiList
-    end)
-end

shared/helpers.lua

@@ -1,15 +1,19 @@
---- Utility Functions for Resource Management and Debugging
+--[[
----
+    Utility Functions for Resource Management and Debugging
---- This script provides a set of utility functions for managing resources, debugging, and handling various common tasks within the game environment.
+    ----------------------------------------------------------
---- It includes functions for checking resource states, generating unique keys, formatting numbers and coordinates, handling JSON data, and more.
+    This script provides a set of utility functions for managing resources,
+    debugging, and handling common tasks in the game environment.
+    It includes functions to check resource states, generate unique keys,
+    format numbers and coordinates, handle JSON data, perform raycasts, and more.
+]]
 
---[[ Resource and Environment Checks ]]--
+-------------------------------------------------------------
+-- Resource and Environment Checks
+-------------------------------------------------------------
 
 --- Checks if a specific resource is started.
----
+--- @param script string The name of the resource.
----@param script string The name of the resource to check.
+--- @return boolean boolean True if the resource state contains "start", false otherwise.
----@return boolean `true` if the resource state contains "start", otherwise `false`.
----
 ---@usage
 --- ```lua
 --- if isStarted("myResource") then
@@ -17,17 +21,17 @@
 --- end
 --- ```
 function isStarted(script)
-    return GetResourceState(script):find("start")
+    if not script then
+        print("^1Error^7: ^1Tried to check if ^3nil^2 was started^7, ^1returning ^4false^7")
+        return false
+    end
+    return GetResourceState(script):find("start") ~= nil
 end
 
 local scriptName = nil
 
---- Retrieves the current resource name.
+--- Retrieves the current resource name, caching it for efficiency.
----
+--- @return string string The current resource name.
---- Caches the resource name after the first call for efficiency.
----
---- @return string scriptName The name of the current resource.
----
 --- @usage
 --- ```lua
 --- local currentScript = getScript()
@@ -38,12 +42,8 @@ function getScript()
     return scriptName
 end
 
---- Determines if the current execution context is the server.
+--- Determines if the current context is the server.
----
+--- @return boolean boolean True if running on the server, false otherwise.
---- Very helpful for shared files complaining about client functions running on server or vice versa
----
---- @return boolean Returns `true` if running on the server, otherwise `false`.
----
 ---@usage
 --- ```lua
 --- if isServer() then
@@ -56,14 +56,38 @@ function isServer()
     return IsDuplicityVersion()
 end
 
---[[ Debugging Functions ]]--
+--- Allows the user to check if an export exists before trying to call it
+--- @return boolean boolean True if it exists
+---@usage
+--- ```lua
+--- if checkExportExists("qb-inventory", "OpenInventory") then
+---     exports["qb-inventory"]:OpenInventory()
+--- end
+--- ```
+function checkExportExists(resource, export)
+    if not resource or not export then return false end
 
---- Prints debug messages if debugging mode is enabled.
+    local exists = false
----
+    local ok, result = pcall(function()
---- Concatenates all arguments and prints them along with debug information.
+        exists = type(exports[resource][export]) == "function"
----
+    end)
---- @param ... any Multiple arguments to be concatenated and printed.
+
----
+    if ok and exists then
+        debugPrint(("^3Export Check^7: ^5exports^7['^5%s^7']:^5%s^7() ^2Exists^7"):format(resource, export))
+        return true
+    else
+        debugPrint(("^3Export Check^7: ^5exports^7['^5%s^7']:^5%s^7() ^1Doesn^7'^1t Exist^7"):format(resource, export))
+        return false
+    end
+end
+
+-------------------------------------------------------------
+-- Debugging and JSON Utilities
+-------------------------------------------------------------
+
+--- Prints debug messages if debugMode is enabled.
+--- Concatenates all arguments and prints them with debug info.
+--- @param ... any One or more values to print.
 --- @usage
 --- ```lua
 --- debugPrint("Player has joined:", playerName)
@@ -71,15 +95,13 @@ end
 function debugPrint(...)
     if debugMode then
         local args = {...}
-        local output = table.concat(args, " ")  -- Concatenate all arguments with a space
+        local output = table.concat(args, " ")
         print(output, getDebugInfo(debug.getinfo(2, "nSl")))
     end
 end
 
 --- Prints event-related debug messages if event debugging is enabled.
----
+--- @param ... any One or more values to print.
---- @param ... any Multiple arguments to be printed.
----
 --- @usage
 --- ```lua
 --- eventPrint("Event triggered:", eventName)
@@ -90,24 +112,22 @@ function eventPrint(...)
     end
 end
 
--- Function to recursively colorize the JSON data
+--- Returns the keys of a table in sorted order.
+--- @param tbl table The table to sort keys for.
+--- @return table table A sorted array of keys.
 function getSortedKeys(tbl)
     local keys = {}
     for k in pairs(tbl) do keys[#keys + 1] = k end
     table.sort(keys, function(a, b)
         local numA, numB = tonumber(a), tonumber(b)
-        if numA and numB then return numA < numB
+        if numA and numB then return numA < numB else return tostring(a) < tostring(b) end
-        else return tostring(a) < tostring(b) end
     end)
     return keys
 end
 
 --- Recursively colorizes a table for debug printing.
----
 --- @param tbl table The table to colorize.
---- @return table colourizedTable The colorized table.
+--- @return table table A new table with colorized keys and values.
----
---- @usage
 --- ```lua
 --- local colorizedData = colorizeTable(myTable)
 --- jsonPrint(colorizedData)
@@ -116,18 +136,19 @@ function colorizeTable(tbl)
     local newData, sortedKeys = {}, getSortedKeys(tbl)
     for _, k in ipairs(sortedKeys) do
         local v = tbl[k]
-        newData["^6"..tostring(k).."^7"] = ((type(v) == "table") and colorizeTable(v)) or (type(v):find("vector") and formatCoord(v)) or "^2"..tostring(v).."^7"
+        newData["^6"..tostring(k).."^7"] =
+            (type(v) == "table" and colorizeTable(v))
+            or (tostring(type(v)):find("vector") and formatCoord(v))
+            or "^2"..tostring(v).."^7"
     end
     return newData
 end
 
 --- Encodes a table into an ordered JSON string with indentation.
----
 --- @param data table The table to encode.
---- @param indent string The string used for indentation (e.g., "  ").
+--- @param indent string The indentation string (e.g., "  ").
---- @param level number The current indentation level.
+--- @param level number The current level of indentation.
 --- @return string The formatted JSON string.
----
 --- @usage
 --- ```lua
 --- local jsonString = encodeOrderedJSON(myTable, "  ", 0)
@@ -143,10 +164,8 @@ function encodeOrderedJSON(data, indent, level)
     return table.concat(jsonParts)
 end
 
---- Prints a table as a colorized and ordered JSON string if debugging mode is enabled.
+--- Prints a table as a colorized and ordered JSON string if debugMode is enabled.
----
 --- @param data table The table to print.
----
 --- @usage
 --- ```lua
 --- jsonPrint(myTable)
@@ -158,9 +177,7 @@ function jsonPrint(data)
 end
 
 --- Retrieves the current time formatted for debug prints.
----
 --- @return string string The formatted time string, e.g., "^7(14:23:45)".
----
 --- @usage
 --- ```lua
 --- local currentTime = GetPrintTime()
@@ -171,15 +188,14 @@ function GetPrintTime()
         local hour, min, sec = os.date('%H'), os.date('%M'), os.date('%S')
         return "^7("..string.format("%02d", hour)..":"..string.format("%02d", min)..":"..string.format("%02d", sec)..")"
     else
+        if gameName == "rdr3" then return "" end
         local _, _, _, hour, min, sec = GetLocalTime()
         return "^7("..string.format("%02d", hour)..":"..string.format("%02d", min)..":"..string.format("%02d", sec)..")"
     end
 end
 
 --- Generates a unique 3-character alphanumeric key.
----
+--- @return string string The generated key.
---- @return string GeneratedString A randomly generated 3-character string.
----
 --- @usage
 --- ```lua
 --- local uniqueKey = keyGen()
@@ -187,20 +203,28 @@ end
 --- ```
 function keyGen()
     local charset = {
-        "q","w","e","r","t","y","u","i","o","p","a","s","d","f","g","h","j","k","l","z","x","c","v","b","n","m",
+        "q","w","e","r","t","y","u","i","o","p",
-        "Q","W","E","R","T","Y","U","I","O","P","A","S","D","F","G","H","J","K","L","Z","X","C","V","B","N","M",
+        "a","s","d","f","g","h","j","k","l",
+        "z","x","c","v","b","n","m",
+        "Q","W","E","R","T","Y","U","I","O","P",
+        "A","S","D","F","G","H","J","K","L",
+        "Z","X","C","V","B","N","M",
         "1","2","3","4","5","6","7","8","9","0"
     }
     local GeneratedID = ""
-	for i = 1, 3 do GeneratedID = GeneratedID..charset[math.random(1, #charset)] end
+    for i = 1, 3 do
+        GeneratedID = GeneratedID..charset[math.random(1, #charset)]
+    end
     return GeneratedID
 end
 
+-------------------------------------------------------------
+-- Formatting and Vector Math Functions
+-------------------------------------------------------------
+
 --- Formats a number with commas as thousand separators.
----
 --- @param amount number The number to format.
---- @return string commaValue The formatted number string with commas.
+--- @return string string The formatted number.
----
 --- @usage
 --- ```lua
 --- local formattedNumber = cv(1000000)  -- "1,000,000"
@@ -208,15 +232,17 @@ end
 --- ``
 function cv(amount)
     local formatted = tostring(amount or "0")
-    while true do formatted, k = string.gsub(formatted, "^(-?%d+)(%d%d%d)", '%1,%2') if (k==0) then break end Wait(0) end
+    while true do
+        local newFormatted, count = formatted:gsub("^(-?%d+)(%d%d%d)", '%1,%2')
+        if count == 0 then break end
+        formatted = newFormatted
+    end
     return formatted
 end
 
 --- Formats a coordinate vector for debug printing.
----
+--- @param coord table A vector3 or vector4 with x, y, z (and optional w).
---- @param coord table A vector3 or vector4 table with `x`, `y`, `z`, and optional `w` components.
+--- @return string string The formatted coordinate string.
---- @return string The formatted coordinate string with color codes.
----
 --- @usage
 --- ```lua
 --- local formattedCoord = formatCoord(vector3(100.0, 200.0, 300.0))
@@ -224,56 +250,56 @@ end
 --- ```
 function formatCoord(coord)
     local vecType = type(coord):gsub("tor", "")
-    local components = {
+    local parts = {}
-        [1] = coord.x and ("^6"..string.format("%.1f", coord.x)) or "",
+
-        [2] = coord.y and ("^7, ^6"..string.format("%.1f", coord.y)) or "",
+    if coord.x then parts[#parts + 1] = string.format("^6%.1f", coord.x) end
-        [3] = coord.z and ("^7, ^6"..string.format("%.1f", coord.z)) or "",
+    if coord.y then parts[#parts + 1] = string.format("^6%.1f", coord.y) end
-        [4] = coord.w and ("^7, ^6"..string.format("%.1f", coord.w)) or "",
+    if coord.z then parts[#parts + 1] = string.format("^6%.1f", coord.z) end
-    }
+    if coord.w then parts[#parts + 1] = string.format("^6%.1f", coord.w) end
-    return "^5"..vecType.."^7("..components[1]..components[2]..components[3]..components[4].."^7)"
+
+    return string.format("^5%s^7(%s^7)", vecType, table.concat(parts, "^7, "))
 end
 
---- Calculates the center point of a list of zones (coordinates).
+--- Calculates the center point of a list of coordinates.
----
+--- @param tbl table An array of vector3 coordinates.
---- @param table table A table of vector3 coordinates.
 --- @return vector3 vector3 The center coordinate.
----
 --- @usage
 --- ```lua
 --- local center = getCenterOfZones({vector3(100, 200, 300), vector3(110, 210, 310)})
 --- print("Center of Zones:", center)
 --- ```
-function getCenterOfZones(table)
+function getCenterOfZones(tbl)
-    local totalX, totalY, totalZ = 0, 0, 0
+    local count = #tbl
+    if count == 0 then return vector3(0, 0, 0) end
 
-    for _, coord in ipairs(table) do
+    local totalX, totalY, totalZ = 0, 0, 0
+    for i = 1, count do
+        local coord = tbl[i]
         totalX = totalX + coord.x
         totalY = totalY + coord.y
         totalZ = totalZ + coord.z
     end
 
-    local count = #table
     return vector3(totalX / count, totalY / count, totalZ / count)
 end
 
 --- Counts the number of keys in a table.
----
+--- @param tbl table The table to count.
---- @param table table The table to count keys in.
+--- @return number number The key count.
---- @return number number The number of keys in the table.
----
 --- @usage
 --- ```lua
 --- local count = countTable(myTable)
 --- print("Number of keys:", count)
 --- ```
-function countTable(table) local i = 0 for keys in pairs(table) do i += 1 end return i end
+function countTable(tbl)
+    local count = 0
+    for _ in pairs(tbl) do count = count + 1 end
+    return count
+end
 
-
+--- Returns an iterator over a table's keys in sorted order.
---- Returns an iterator that iterates over a table's keys in sorted order.
----
 --- @param t table The table to iterate over.
---- @return function function An iterator function.
+--- @return function An iterator function for sorted keys.
----
 --- @usage
 --- ```lua
 --- for k, v in pairsByKeys(myTable) do
@@ -281,184 +307,99 @@ function countTable(table) local i = 0 for keys in pairs(table) do i += 1 end re
 --- end
 --- ```
 function pairsByKeys(t)
-    local t = t
     if not t then
         print("^1Error^7: ^3Nil ^2table recieved for ^3pairsByKeys^7(), ^2setting to ^7{} ^2to prevent break^7")
         t = {}
     end
-    local a = {} for n in pairs(t) do a[#a+1] = n end table.sort(a) local i = 0 local iter = function() i += 1 if a[i] == nil then return nil else return a[i], t[a[i]] end end return iter
+
+    local keys = {}
+    for key in pairs(t) do
+        keys[#keys + 1] = key
+    end
+    table.sort(keys)
+
+    local index = 0
+    return function()
+        index = index + 1
+        local key = keys[index]
+        return key, t[key]
+    end
 end
 
---- Creates a new table with consecutive numerical indices sorted by the `id` field.
+--- Creates a new table with consecutive numerical indices sorted by the 'id' field.
----
+--- @param originalTable table The table containing entries with an 'id' field.
---- @param originalTable table The original table with entries containing an `id` field.
+--- @return table table A sorted table with consecutive indices.
---- @return table The new table with sorted entries and consecutive `id` values.
----
 --- @usage
+--- ```lua
 --- local sortedTable = createConsecutiveTable(originalTable)
 --- for i, entry in ipairs(sortedTable) do
 ---     print(i, entry)
 --- end
+--- ```
 function createConsecutiveTable(originalTable)
-    local sortedEntries = {}
+    local entries = {}
     for _, entry in pairs(originalTable) do
-        table.insert(sortedEntries, entry)
+        entries[#entries + 1] = entry
     end
-    table.sort(sortedEntries, function(a, b)
+
-        return a.id < b.id
+    table.sort(entries, function(a, b) return a.id < b.id end)
-    end)
+
-    local newTable = {}
+    for index, entry in ipairs(entries) do
-    for newIndex, entry in ipairs(sortedEntries) do
+        entry.id = index
-        entry.id = newIndex
-        newTable[newIndex] = entry
     end
-    return newTable
-end
 
---[[ Drawing Functions ]]--
+    return entries
-
---- Draws 3D text at specified coordinates.
----
---- @param coord table A vector3 table with `x`, `y`, and `z` coordinates.
---- @param text string The text to display.
---- @param highlight boolean (optional) Whether to highlight certain parts of the text.
----
---- @usage
---- ```lua
---- CreateThread(function()
----     while true do
----         DrawText3D(vector3(100, 200, 300), "Hello World", true)
----         Wait(0)
----     end
---- end)
---- ```
-function DrawText3D(coord, text, highlight)
-    SetTextScale(0.30, 0.30)
-    SetTextFont(0)
-    SetTextProportional(1)
-    SetTextColour(255, 255, 255, 215)
-    SetTextEntry("STRING")
-    SetTextCentre(true)
-    local totalLength = string.len(text)
-    local textMaxLength = textMaxLength or 99 -- max 99
-    local text = totalLength > textMaxLength and text:sub(1, totalLength - (totalLength - textMaxLength)) or text
-    AddTextComponentString(highlight and text:gsub("%~w~", "~y~") or text)
-    SetDrawOrigin(coord.x, coord.y, coord.z, 0)
-    DrawText(0.0, 0.0)
-    local count, length = GetLineCountAndMaxLength(text)
-
-    local padding = 0.005
-    local heightFactor = (count / 43) + padding
-    local weightFactor = (length / 150) + padding
-
-    local height = (heightFactor / 2) - padding / 1
-    local width = (weightFactor / 2) - padding / 1
-
-    DrawRect(0.0, height, width, heightFactor, 0, 0, 0, 150)
-    ClearDrawOrigin()
-end
-
---- Displays a help message on the screen.
----
---- @param text string The text to display as a help message.
----
---- @usage
---- DisplayHelpMsg("Press E to interact")
-function DisplayHelpMsg(text)
-    BeginTextCommandDisplayHelp("STRING")
-    AddTextComponentScaleform(text)
-    EndTextCommandDisplayHelp(0, true, false, -1)
-end
-
---- Displays a "Saving/Loading" spinner with a custom message.
----
---- @param text string The message to display alongside the spinner.
----
---- @usage
---- ```lua
---- displaySpinner("Saving data...")
---- ```
-function displaySpinner(text)
-    BeginTextCommandBusyspinnerOn('STRING')
-    AddTextComponentSubstringPlayerName(text)
-    EndTextCommandBusyspinnerOn(4)
-end
-
---- Stops the "Saving/Loading" spinner.
----
---- This function is client-side only.
----
---- @usage
---- ```lua
---- stopSpinner()
---- ```
-function stopSpinner()
-    if not isServer() then
-        BusyspinnerOff()
-    end
 end
 
 --- Concatenates a table of strings into a single string separated by newlines.
----
+--- @param tbl table The table containing strings.
---- @param tbl table A table containing string elements.
+--- @return string string The concatenated string.
---- @return string string The concatenated string with newline separators.
----
 --- @usage
 --- ```lua
 --- local combinedText = concatenateText({"Line 1", "Line 2", "Line 3"})
 --- print(combinedText)
 --- ```
 function concatenateText(tbl)
-    local result = ""
+    return table.concat(tbl, "\n")
-    for i = 1, #tbl do
-        result = result..tbl[i]
-        if i < #tbl then
-            result = result.."\n"  -- Add newline only if it's not the last element
-        end
-    end
-    return result
 end
 
---- Converts rotation to a direction vector.
+--- Converts a rotation (degrees) to a direction vector.
----
+--- @param rot vector3 A vector3 with rotation values.
---- @param rot vector3 A vector3 containing rotation values
+--- @return vector3 vector3  The forward direction vector.
---- @return vector3 vector3 A vector3 representing the direction.
----
 --- @usage
 --- ```lua
 --- local direction = RotationToDirection({ z = 90 })
 --- print(direction)
 --- ```
 function RotationToDirection(rot)
-    local adjust = (math.pi / 180)
+    local radianConvert = math.pi / 180
-    return vec3(-math.sin(adjust * rot.z) * math.abs(math.cos(adjust * rot.x)), math.cos(adjust * rot.z) * math.abs(math.cos(adjust * rot.x)), math.sin(adjust * rot.x))
+    local rotX, rotZ = radianConvert * rot.x, radianConvert * rot.z
+    local cosX = math.abs(math.cos(rotX))
+
+    return vec3(
+        -math.sin(rotZ) * cosX,
+        math.cos(rotZ) * cosX,
+        math.sin(rotX)
+    )
 end
 
---- Creates a simple text-based progress bar.
+--- Creates a basic progress bar string.
----
+--- @param percentage number Completion percentage (0-100).
---- @param percentage number The completion percentage (0-100).
+--- @return string string The progress bar (e.g., "█████░░░░░").
---- @return string string A string representing the progress bar, e.g., "█████░░░░░".
----
 --- @usage
 --- ```lua
 --- local bar = basicBar(50)  -- "█████░░░░░"
 --- print(bar)
 --- ```
 function basicBar(percentage)
-    local percentage = math.ceil(percentage)
+    local total = 10
-    local totalBlocks = 10
+    local filled = math.floor(math.min(math.max(percentage, 0), 100) / 100 * total)
-    local filledBlocks = math.floor((percentage / 100) * totalBlocks)
+    return string.rep("█", filled) .. string.rep("░", total - filled)
-    local emptyBlocks = totalBlocks - filledBlocks
-
-    local bar = string.rep("█", filledBlocks)..string.rep("░", emptyBlocks)
-    return bar
 end
 
 --- Normalizes a 3D vector.
----
+--- @param vec vector3 A vector3 table.
---- @param vec vector3 A vector3 table with `x`, `y`, and `z` components.
+--- @return vector3 vector3 A normalized vector.
---- @return vector3 vector3 The normalized vector3.
----
 --- @usage
 --- ```lua
 --- local normalizedVec = normalizeVector(vector3(1, 2, 3))
@@ -466,66 +407,58 @@ end
 --- ```
 function normalizeVector(vec)
     local length = math.sqrt(vec.x * vec.x + vec.y * vec.y + vec.z * vec.z)
-    if length ~= 0 then
+    return length > 0 and vec3(vec.x / length, vec.y / length, vec.z / length) or vec3(0, 0, 0)
-        return vec3(vec.x / length, vec.y / length, vec.z / length)
-    else
-        return vec3(0, 0, 0)
-    end
 end
 
---- Draws a line between two coordinates for debugging purposes.
+-------------------------------------------------------------
----
+-- Drawing and Raycasting Functions
---- @param startCoords vector3 A vector3 table representing the start point.
+-------------------------------------------------------------
---- @param endCoords vector3 A vector3 table representing the end point.
+
---- @param col vector4 A table with `x`, `y`, `z`, `w` representing the color and opacity.
+--- Draws a line between two coordinates (for debugging).
----
+--- @param startCoords vector3 The starting coordinate.
+--- @param endCoords vector3 The ending coordinate.
+--- @param col vector4 A vector4 specifying color and opacity.
 --- @usage
 --- ```lua
 --- drawLine(vector3(100, 200, 300), vector3(150, 250, 350), vector4(255, 0, 0, 255))
 --- ```
 function drawLine(startCoords, endCoords, col)
-    if debugMode then
+    if not debugMode then return end
-        CreateThread(function()
+
-            local showCount = 1000
+    local col = col or vec4(255, 255, 255, 150)
-            while showCount >= 0 do
+    CreateThread(function()
-                DrawLine(startCoords.x, startCoords.y, startCoords.z, endCoords.x, endCoords.y, endCoords.z, col.x, col.y, col.z, col.w)
+        for i = 100, 0, -1 do
-                showCount -= 10
+            DrawLine(startCoords.x, startCoords.y, startCoords.z, endCoords.x, endCoords.y, endCoords.z, col.x, col.y, col.z, col.w)
-                Wait(0)
+            Wait(0)
-            end
+        end
-        end)
+    end)
-    end
 end
 
---- Draws a sphere at specified coordinates for debugging purposes.
+--- Draws a sphere at the specified coordinates (for debugging).
----
+--- @param coords vector3 The center of the sphere.
---- @param coords vector3 A vector3 table representing the center of the sphere.
+--- @param col vector4 A vector4 specifying color and opacity.
---- @param col vector4 A table with `x`, `y`, `z`, `w` representing the color and opacity.
----
 --- @usage
 --- ```lua
 --- drawSphere(vector3(100, 200, 300), vector4(0, 255, 0, 255))
 --- ```
 function drawSphere(coords, col)
-    if debugMode then
+    if not debugMode then return end
-        CreateThread(function()
+
-            local showCount = 1000
+    local col = col or vec4(255, 255, 255, 150)
-            while showCount >= 0 do
+    CreateThread(function()
-                DrawSphere(coords.x, coords.y, coords.z, 0.5, col.x, col.y, col.z, col.w)
+        for i = 100, 0, -1 do
-                showCount -= 1
+            DrawSphere(coords.x, coords.y, coords.z, 0.5, col.x, col.y, col.z, col.w)
-                Wait(10)
+            Wait(10)
-            end
+        end
-        end)
+    end)
-    end
 end
 
---- Performs a raycast between two coordinates and returns the result.
+--- Performs a raycast between two coordinates and returns the results.
----
+--- @param startCoords vector3 The starting coordinate.
---- @param startCoords table A vector3 table representing the start point.
+--- @param endCoords vector3 The ending coordinate.
---- @param endCoords table A vector3 table representing the end point.
+--- @param entity number|nil An entity to ignore.
---- @param entity number|nil The entity to ignore during the raycast.
+--- @param flags number|nil Optional raycast flags (default: 4294967295).
---- @param flags number|nil Raycast flags to customize the raycast behavior. Defaults to `4294967295`.
+--- @return multiple Multiple values returned by GetShapeTestResultIncludingMaterial.
---- @return multiple multiple Returns multiple values from `GetShapeTestResultIncludingMaterial`.
----
 --- @usage
 --- ```lua
 --- local hit, hitPos, material = PerformRaycast(startVec, endVec, playerPed, 1)
@@ -536,46 +469,58 @@ end
 --- ```
 function PerformRaycast(startCoords, endCoords, entity, flags)
     drawLine(startCoords, endCoords, vec4(0, 0, 255, 255))
-    local val1, val2, val3, val4, val5, val6 = GetShapeTestResult(StartExpensiveSynchronousShapeTestLosProbe(startCoords.x, startCoords.y, startCoords.z, endCoords.x, endCoords.y, endCoords.z, flags or 4294967295, entity, 0))
+
-    if val2 then
+    local shapeTest = StartExpensiveSynchronousShapeTestLosProbe(
-        --drawSphere(val3, vec4(255, 0, 255, 0.5))
+        startCoords.x, startCoords.y, startCoords.z,
-    end
+        endCoords.x, endCoords.y, endCoords.z,
-    return val1, val2, val3, val4, val5, val6
+        flags or 4294967295, entity, 4
+    )
+
+    return GetShapeTestResult(shapeTest)
 end
 
---- Adjusts the Z-coordinate of a position to align with the ground.
+--- Adjusts the Z-coordinate of a position to the ground level.
----
+--- @param coords vector4 A vector3 or vector4 with x, y, z (and optional w).
---- @param coords vector4 A vector3 or vector4 table with `x`, `y`, `z`, and optional `w` components.
+--- @return vector3|vector4 vector The coordinates adjusted for ground level.
---- @return vector3|vector4 vector  adjusted coordinate with the Z value set to the ground level.
----
 --- @usage
 --- ```lua
 --- local groundCoords = adjustForGround(playerCoords)
 --- print("Ground Position:", groundCoords)
 --- ```
 function adjustForGround(coords)
-    local coords = coords
+    local foundGround, groundZ = GetGroundZFor_3dCoord(coords.x, coords.y, coords.z + 1.0)
-    local foundGround, zPos = GetGroundZFor_3dCoord(coords.x, coords.y, coords.z + 1.0)
 
     if foundGround then
-        if coords.w then
+        return coords.w and vec4(coords.x, coords.y, groundZ, coords.w) or vec3(coords.x, coords.y, groundZ)
-            coords = vec4(coords.x, coords.y, zPos, coords.w)
-        else
-            coords = vec3(coords.x, coords.y, zPos)
-        end
-        --debugPrint("^6Bridge^7: Adjusting for ground pos ", coords.z, zPos)
-
-        return coords
-    else
-        return coords
     end
+
+    return coords
 end
 
---- Ensures that a network vehicle exists by verifying its network ID.
+local function waitForNetworkEntity(netId, converter, timeout)
----
+    timeout = timeout or 100
---- @param vehNetID number The network ID of the vehicle.
+
---- @return number number The vehicle entity if it exists, otherwise `0`.
+    while not NetworkDoesNetworkIdExist(netId) and timeout > 0 do
----
+        timeout = timeout - 1
+        Wait(10)
+    end
+
+    if not NetworkDoesNetworkIdExist(netId) then return 0 end
+
+    local entity = converter(netId)
+    timeout = 100
+
+    while not DoesEntityExist(entity) and entity ~= 0 and timeout > 0 do
+        timeout = timeout - 1
+        Wait(10)
+    end
+
+    return DoesEntityExist(entity) and entity or 0
+end
+
+--- Ensures a network vehicle exists from its network ID.
+--- @param vehNetID number The network ID.
+--- @return number number The vehicle entity, or 0 if not found.
 --- @usage
 --- ```lua
 --- local vehicle = ensureNetToVeh(netID)
@@ -584,52 +529,132 @@ end
 --- end
 --- ```
 function ensureNetToVeh(vehNetID)
-    debugPrint("^6Bridge^7: ^3ensureNetToVeh^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..vehNetID.."^7)")
+    return waitForNetworkEntity(vehNetID, NetToVeh)
-    local timeout = 100
-    while not NetworkDoesNetworkIdExist(vehNetID) and timeout > 0 do
-        timeout -= 1
-        Wait(10)
-    end
-    if not NetworkDoesNetworkIdExist(vehNetID) then return 0 end
-    timeout = 100
-    local vehicle = NetToVeh(vehNetID)
-    while not DoesEntityExist(vehicle) and vehicle ~= 0 and timeout > 0 do
-        timeout -= 1
-        Wait(10)
-    end
-    if not DoesEntityExist(vehicle) then return 0 end
-    return vehicle
 end
 
---- Ensures that a network entity exists by verifying its network ID.
+--- Ensures a network entity exists from its network ID.
----
+--- @param entNetID number The network ID.
---- @param entNetID number The network ID of the entity.
+--- @return number number The entity, or 0 if not found.
---- @return number The entity if it exists, otherwise `0`.
----
 --- @usage
+--- ```lua
 --- local entity = ensureNetToEnt(netID)
 --- if entity ~= 0 then
 ---     print("Entity exists:", entity)
 --- end
+--- ```
 function ensureNetToEnt(entNetID)
-    debugPrint("^6Bridge^7: ^3ensureNetToEnt^7: ^2Requesting NetworkDoesNetworkIdExist^7(^6"..entNetID.."^7)")
+    return waitForNetworkEntity(entNetID, NetworkGetEntityFromNetworkId)
-    local timeout = 100
-    while not NetworkDoesNetworkIdExist(entNetID) and timeout > 0 do
-        timeout -= 1
-        Wait(10)
-    end
-    if not NetworkDoesNetworkIdExist(entNetID) then return 0 end
-    timeout = 100
-    local entity = NetworkGetEntityFromNetworkId(entNetID)
-    while not DoesEntityExist(entity) and entity ~= 0 and timeout > 0 do
-        timeout -= 1
-        Wait(10)
-    end
-    if not DoesEntityExist(entity) then return 0 end
-    return entity
 end
 
---[[ Material Definitions ]]--
+function sendLog(text)
+	local Player = getPlayer()
+	local coords = GetEntityCoords(PlayerPedId())
+	local _, _, _, hour, min, sec = GetLocalTime()
+	local data = {
+		script = debug.getinfo(2, "nSl"),
+		coords = coords,
+		localTime = { hour = hour, min = min, sec = sec },
+		firstname = Player.firstname,
+		lastname = Player.lastname,
+		source = Player.source,
+		id = Player.citizenId,
+		text = text,
+	}
+
+    debugPrint("^5Log Message^7: "..getScript().." - "..Player.firstname.." "..Player.lastname.."("..Player.source..") ["..Player.citizenId.."]", text)
+	TriggerServerEvent(getScript()..":server:sendlog", data)
+end
+
+function sendServerLog(data)
+	local hour, min, sec = os.date('%H'), os.date('%M'), os.date('%S')
+	data.serverTime = { house = hour, min = min, sec = sec }
+    --jsonPrint(data)
+	debugPrint("^5Log Message^7: "..getScript().." - "..data.firstname.." "..data.lastname.."("..data.source..") ["..data.id.."]", data.text)
+
+    -- Add your logger here
+
+end
+
+RegisterNetEvent(getScript()..":server:sendlog", sendServerLog)
+
+
+-- This function was created to help create random numbers
+-- When you create a table of items with a random hunger value for example
+-- `hunger = math.random(10, 20)` this will be set at script start and never change
+-- using `hunger = {10, 20}` and then calling this function will make it generate a random number every time
+-- It also fallsback if it simply recieved a number instead of a table
+-- For example:
+-- local hunger = {10, 20}
+-- local hungerAmount = GetRandomTiming(hunger)
+-- print(hungerAmount) -- number between 10, 20
+function GetRandomTiming(tbl)
+    return type(tbl) == "table" and math.random(tbl[1], tbl[2]) or tbl
+end
+
+-------------------------------------------------------------
+-- Player Movement
+-------------------------------------------------------------
+
+--- Instantly turns an entity to face a target (entity or coordinates) without animation.
+---
+--- @param ent number|nil The Ped to turn (defaults to player's Ped if nil).
+--- @param ent2 number|vector3|nil The target entity or coordinates to face.
+---
+--- @usage
+--- ```lua
+--- instantLookEnt(nil, vector3(200.0, 300.0, 40.0))
+--- instantLookEnt(ped1, ped2)
+--- ```
+function instantLookEnt(ent, ent2)
+    local ped = ent or PlayerPedId()
+    local p1 = GetEntityCoords(ped, true)
+    local p2 = type(ent2) == "vector3" and ent2 or GetEntityCoords(ent2, true)
+
+    local dx = p2.x - p1.x
+    local dy = p2.y - p1.y
+    local heading = GetHeadingFromVector_2d(dx, dy)
+
+    debugPrint("^6Bridge^7: ^1Forced ^2Turning Player to^7: '^6"..formatCoord(p2).."^7'")
+    SetEntityHeading(ped, heading)
+end
+
+--- Makes the player look towards a specific target with an animated turn.
+---
+--- If the player is not already facing the target (entity or coordinates), a turning animation is triggered.
+---
+--- @param entity number|vector3|vector4|nil The target to look at.
+---
+--- @usage
+--- ```lua
+--- lookEnt(vector3(200.0, 300.0, 40.0))
+--- lookEnt(pedEntity)
+--- ```
+function lookEnt(entity)
+    local ped = PlayerPedId()
+    if entity then
+        if type(entity) == "vector3" or type(entity) == "vector4" then
+            if not IsPedHeadingTowardsPosition(ped, entity.xyz, 30.0) then
+                TaskTurnPedToFaceCoord(ped, entity.xyz, 1500)
+                debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
+                Wait(1500)
+            end
+        else
+            if DoesEntityExist(entity) then
+                local entCoords = GetEntityCoords(entity)
+                if not IsPedHeadingTowardsPosition(ped, entCoords, 30.0) then
+                    TaskTurnPedToFaceCoord(ped, entCoords, 1500)
+                    debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
+                    Wait(1500)
+                end
+            end
+        end
+    end
+end
+
+
+-------------------------------------------------------------
+-- Material and Prop Functions
+-------------------------------------------------------------
 
 --- A table mapping material names to their corresponding hash values.
 ---
@@ -851,23 +876,18 @@ local materials = {
     temp_30 = 13626292
 }
 
---- Retrieves the ground material at a specified position.
+--- Retrieves the ground material at a given position.
----
+--- @param coords vector3 The coordinate to test.
---- This function performs a raycast downwards from the given coordinates to determine the material type of the ground.
+--- @return number|nil number The material hash if hit, nil otherwise.
----
+--- @return string string The material name.
---- @param coords vector3 The coordinates from which to perform the raycast.
---- @return number|nil number The material hash if found; otherwise, `nil`.
---- @return string string The name of the material.
----
 --- @usage
 --- ```lua
---- local materialHash, materialName = GetGroundMaterialAtPosition(vector3(100, 200, 300))
+--- local matHash, matName = GetGroundMaterialAtPosition(vector3(100,200,300))
---- print("Ground material:", materialName)
+--- print("Material:", matName)
 --- ```
-function GetGroundMaterialAtPosition(coords)
+function GetGroundMaterialAtPosition(coords, Ped)
-    local endX, endY, endZ = coords.x, coords.y, coords.z - 1.0
+    local endCoords = vec3(coords.x, coords.y, coords.z - 1.1)
-
+    local rayHandle = StartShapeTestCapsule(coords.x, coords.y, coords.z, endCoords.x, endCoords.y, endCoords.z, 1.0, 1, Ped or PlayerPedId(), 7)
-    local rayHandle = StartShapeTestCapsule(coords.x, coords.y, coords.z, endX, endY, endZ, 1.0, 1, playerPed, 7)
     local _, hit, _, _, materialHash, _ = GetShapeTestResultIncludingMaterial(rayHandle)
     local materialName = "Unknown"
     for k, v in pairs(materials) do
@@ -876,14 +896,10 @@ function GetGroundMaterialAtPosition(coords)
             break
         end
     end
-    if hit then return materialHash, materialName
+    if hit then return materialHash, materialName else return nil, materialName end
-    else return nil, materialName end
 end
 
---- Retrieves the dimensions of a prop/model.
+--- Retrieves the dimensions (width, depth, height) of a prop/model.
----
---- This function loads the specified model and returns its width, depth, and height based on its bounding box.
----
 --- @param model string The name or hash of the model.
 --- @return number number The width of the prop.
 --- @return number number The depth of the prop.

shared/input.lua

@@ -1,25 +1,28 @@
--- INPUT --
+--[[
--- Multiscript input script function to create simple input text boxes --
+    Input Dialog Module
+    ---------------------
+    This module provides a function to create a simple input dialog compatible with
+    multiple menu systems (OX, QB, GTA/WarMenu, and ESX). It supports various input
+    types such as radio buttons, numbers, text, and select dropdowns.
 
---- Creates a simple input dialog compatible with multiple menu systems.
+]]
+
+--- Creates a simple input dialog using the configured menu system.
 ---
---- This function generates input dialogs for different frameworks (OX, QB, GTA) based on the configuration.
+--- @param title string The title or header of the input dialog.
---- It supports various input types such as radio buttons, numbers, text, and select dropdowns.
+--- @param opts table A table of input option definitions. Each option should include:
+---     - type (string): The input type ("radio", "number", "text", "select").
+---     - label (string, optional): A label for the input (used in radio/select for OX).
+---     - text (string, optional): The text prompt for the input.
+---     - name (string): The identifier for the input.
+---     - isRequired (boolean, optional): Whether input is mandatory.
+---     - default (any, optional): The default value.
+---     - options (table, optional): A table of choices for "radio" and "select" types.
+---     - min (number, optional): Minimum value (for "number" and "select").
+---     - max (number, optional): Maximum value.
+---     - txt (string, optional): Additional description.
 ---
----@param title string The title/header of the input dialog.
+--- @return table|nil table Returns the user's input as a table if submitted, otherwise nil.
----@param opts table A table containing input options. Each option should have a `type` and other relevant fields based on the type.
----   - **type** (`string`): The type of input. Supported types: "radio", "number", "text", "select".
----   - **label** (`string`, optional): The label for the input (used for "radio" and "select" types in OX).
----   - **text** (`string`, optional): The text prompt for the input.
----   - **name** (`string`): The identifier name for the input.
----   - **isRequired** (`boolean`, optional): Whether the input is required.
----   - **default** (`any`, optional): The default value for the input.
----   - **options** (`table`, optional): A table of options for "radio" and "select" types.
----   - **min** (`number`, optional): The minimum value (used for "select" type).
----   - **max** (`number`, optional): The maximum value (used for "number" and "select" types).
----   - **txt** (`string`, optional): Additional text or description for the input.
----
----@return table|nil table Returns the user's input as a table if the dialog is submitted, otherwise returns `nil`.
 ---
 ---@usage
 --- ```lua
@@ -36,15 +39,17 @@
 function createInput(title, opts)
     local dialog = nil
     local options = {}
-
+    local currentNum = 0
     if Config.System.Menu == "ox" then
         for i = 1, #opts do
+            currentNum += 1
+            if opts[i] == nil then currentNum -= 1 goto skip end
             if opts[i].type == "radio" then
                 -- Convert radio options to select type for OX
                 for k in pairs(opts[i].options) do
                     opts[i].options[k].label = opts[i].options[k].text
                 end
-                options[i] = {
+                options[currentNum] = {
                     type = "select",
                     isRequired = opts[i].isRequired,
                     label = opts[i].label or opts[i].text,
@@ -54,16 +59,16 @@ function createInput(title, opts)
                 }
             end
             if opts[i].type == "number" then
-                options[i] = {
+                options[currentNum] = {
-                    type = "number",
+                    type = opts[i].type,
-                    label = opts[i].text..(opts[i].txt and " - "..opts[i].txt or ""),
+                    label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""),
                     isRequired = opts[i].isRequired,
                     name = opts[i].name,
                     options = opts[i].options,
                 }
             end
             if opts[i].type == "text" then
-                options[i] = {
+                options[currentNum] = {
                     type = "input",
                     label = opts[i].text..(opts[i].txt and " - "..opts[i].txt or ""),
                     default = opts[i].default,
@@ -71,8 +76,8 @@ function createInput(title, opts)
                 }
             end
             if opts[i].type == "select" then
-                options[i] = {
+                options[currentNum] = {
-                    type = "select",
+                    type = opts[i].type,
                     label = opts[i].text..(opts[i].txt and " - "..opts[i].txt or ""),
                     isRequired = opts[i].isRequired,
                     name = opts[i].name,
@@ -82,17 +87,150 @@ function createInput(title, opts)
                     default = opts[i].default,
                 }
             end
+
+            if opts[i].type == "checkbox" then
+                jsonPrint(opts[i])
+                for k in pairs(opts[i].options) do
+                    if options[currentNum] then currentNum += 1 end
+                    options[currentNum] = {
+                        type = opts[i].type,
+                        label = opts[i].options[k].text..(opts[i].txt and " - "..opts[i].txt or ""),
+                        name = opts[i].options[k].value,
+                    }
+
+                end
+            end
+
+            if opts[i].type == "color" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    isRequired = opts[i].isRequired,
+                    format = opts[i].format,
+                    default = opts[i].default,
+                }
+            end
+            if opts[i].type == "slider" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    isRequired = opts[i].required,
+                    min = opts[i].min,
+                    max = opts[i].max,
+                    default = opts[i].default,
+                }
+            end
+            ::skip::
         end
         dialog = exports[OXLibExport]:inputDialog(title, options)
         return dialog
-    end
+    elseif Config.System.Menu == "qb" then
-
+        for k, v in pairs(opts) do
-    if Config.System.Menu == "qb" then
+            currentNum += 1
-        dialog = exports['qb-input']:ShowInput({ header = title, submitText = "Accept", inputs = opts })
+            if opts[k] == nil then
+                currentNum -= 1
+            else
+                options[currentNum] = opts[k]
+            end
+        end
+        dialog = exports['qb-input']:ShowInput(
+            { header = title, submitText = "Accept", inputs = options }
+        )
         return dialog
-    end
 
-    if Config.System.Menu == "gta" then
+    elseif Config.System.Menu == "lation" then
+
+        for i in pairs(opts) do
+            currentNum += 1
+            if opts[i] == nil then currentNum -= 1 goto skip end
+            if opts[i].type == "radio" then
+                for k in pairs(opts[i].options) do
+                    opts[i].options[k].label = opts[i].options[k].text
+                end
+                options[currentNum] = {
+                    type = "select",
+                    required = opts[i].isRequired,
+                    label = opts[i].label or opts[i].text,
+                    name = opts[i].name,
+                    default = opts[i].default or opts[i].options[1].value,
+                    options = opts[i].options,
+                }
+            end
+            if opts[i].type == "number" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label or opts[i].text,
+                    description = opts[i].txt and " - "..opts[i].txt or "",
+                    required = opts[i].isRequired,
+                    name = opts[i].name,
+                    options = opts[i].options,
+                }
+            end
+            if opts[i].type == "text" then
+                options[currentNum] = {
+                    type = "input",
+                    label = opts[i].label or opts[i].text,
+                    description = (opts[i].txt and " - "..opts[i].txt or ""),
+                    placeholder = opts[i].default,
+                    required = opts[i].isRequired,
+                }
+            end
+            if opts[i].type == "select" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label or opts[i].text,
+                    description = opts[i].txt and " - "..opts[i].txt or "",
+                    required = opts[i].isRequired,
+                    name = opts[i].name,
+                    options = opts[i].options,
+                    min = opts[i].min,
+                    max = opts[i].max,
+                    default = opts[i].default,
+                }
+            end
+
+            if opts[i].type == "checkbox" then
+                for k in pairs(opts[i].options) do
+                    if options[currentNum] then currentNum += 1 end
+                    options[currentNum] = {
+                        type = opts[i].type,
+                        label = opts[i].options[k].text..(opts[i].txt and " - "..opts[i].txt or ""),
+                        name = opts[i].options[k].value,
+                    }
+                end
+            end
+
+            if opts[i].type == "color" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    required = opts[i].isRequired,
+                    format = opts[i].format,
+                    default = opts[i].default,
+                }
+            end
+
+            if opts[i].type == "slider" then
+                options[currentNum] = {
+                    type = opts[i].type,
+                    label = opts[i].label,
+                    required = opts[i].required,
+                    min = opts[i].min,
+                    max = opts[i].max,
+                    default = opts[i].default,
+                }
+            end
+            ::skip::
+        end
+
+        local dialog = exports.lation_ui:input({
+            title = title,
+            submitText = "Accept",
+            options = options
+        })
+        return dialog
+
+    elseif Config.System.Menu == "gta" then
         WarMenu.CreateMenu(tostring(opts),
             title,
             " ",
@@ -152,5 +290,44 @@ function createInput(title, opts)
             end
             Wait(0)
         end
+    elseif Config.System.Menu == "esx" then -- horrible input dialog, not even worth using, get OX
+
+        local results = {}
+        for i, opt in ipairs(opts) do
+            local prompt = opt.text or opt.label or "Enter value"
+            -- For radio/select types, append available options in the prompt.
+            if (opt.type == "radio" or opt.type == "select") and opt.options then
+                local choices = ""
+                for j, choice in ipairs(opt.options) do
+                    choices = choices .. choice.text .. " (" .. tostring(choice.value) .. ")"
+                    if j < #opt.options then choices = choices .. ", " end
+                end
+                prompt = prompt .. " [" .. choices .. "]"
+            elseif opt.type == "number" then
+                prompt = prompt .. " (number between " .. (opt.min or 0) .. " and " .. (opt.max or 100) .. ")"
+            end
+
+            local value = nil
+            ESX.UI.Menu.Open('dialog', getScript(), 'input_' .. i, {
+                title = prompt
+            }, function(data, menu)
+                value = data.value
+                menu.close()
+            end, function(data, menu)
+                menu.close()
+            end)
+
+            -- Wait until the player submits a value.
+            while value == nil do
+                Wait(0)
+            end
+
+            -- Convert to a number if needed.
+            if opt.type == "number" then
+                value = tonumber(value)
+            end
+            results[opt.name or i] = value
+        end
+        return results
     end
 end

shared/isAnimal.lua

@@ -1,69 +1,98 @@
-isCat, isDog, isBigDog, isSmallDog, isCoyote, isAnimal = false, false, false, false, false, false
+--[[
+    Animal Detection Module
+    -------------------------
+    This module determines whether a Ped is an animal and categorizes it as a cat, dog,
+    or other type (e.g., coyote). It uses predefined model hashes stored in the AnimalPeds table.
+
+    Global Flags:
+      - isCat, isPedDog, isBigDog, isSmallDog, isCoyote, isAnimal: Booleans to track the player's
+        current animal classification.
+
+    When running client-side (not on the server), the module checks the player's Ped after they load.
+
+    Usage Examples:
+      -- Check if the player's Ped is an animal:
+      local animalStatus = isPedAnimal()
+
+      -- Check if a given Ped is a cat:
+      if isCat(somePed) then print("This is a cat!") end
+
+      -- Determine if a Ped is a dog and whether it's big or small:
+      local isDogFlag, isBig = isDog(somePed)
+
+      -- Retrieve a flat list of all animal model hashes:
+      local allAnimalModels = getAnimalModels()
+
+]]
+
+-- Global animal classification flags.
+isPedCat, isPedDog, isBigDog, isSmallDog, isCoyote, isAnimal = false, false, false, false, false, false
 
 if not isServer() then
     onPlayerLoaded(function()
-        Wait(2000)
+        Wait(1000)
-        isCat, isDog, isBigDog, isSmallDog, isCoyote = false, false, false, false, false
+        -- Reset classification flags
+        isPedCat, isPedDog, isBigDog, isSmallDog, isCoyote = false, false, false, false, false
+        -- Check if the player's Ped is an animal.
         isPedAnimal()
         if isAnimal then
             local ped = PlayerPedId()
             local pedModel = GetEntityModel(ped)
 
-            isCat = (isCat(ped) or pedModel == `ft-raccoon`) and (pedModel ~= `ft-sphynx`)
+            -- Determine if the Ped is a cat:
+            -- Also treat 'ft-raccoon' as a cat unless it is 'ft-sphynx'
+            isPedCat = (isCat(ped) == true or pedModel == `ft-raccoon`) and (pedModel ~= `ft-sphynx`)
 
-            isDog, isBigDog = isDog(ped)
+            -- Determine if the Ped is a dog and whether it's big:
+            isPedDog, isBigDog = isDog(ped)
             isSmallDog = not isBigDog
-            if isDog and pedModel == `a_c_coyote` then isDog = false end
+            if isPedDog and pedModel == `a_c_coyote` then isPedDog = false end
 
+            -- Determine if the Ped is a coyote (special case):
             isCoyote = (pedModel == `ft-sphynx` or pedModel == `a_c_coyote`)
 
-            if pedModel == `ft-capmonkey2` then isDog = true end
+            -- Special override: if model is 'ft-capmonkey2', treat as a dog.
+            if pedModel == `ft-capmonkey2` then isPedDog = true end
         end
     end, true)
 
 
-    --- Determines if a given Ped is classified as an animal.
+    -------------------------------------------------------------
+    -- Animal Classification Functions
+    -------------------------------------------------------------
+
+    --- Determines whether a given Ped is classified as an animal.
     ---
-    --- This function checks whether the specified Ped (or the player's Ped if none is provided)
+    --- Checks if the Ped's model hash appears in any of the animal categories defined in AnimalPeds.
-    --- is listed within the predefined `AnimalPeds` tables. It iterates through all animal types
-    --- to verify if the Ped's model hash matches any known animal models.
     ---
-    ---@param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped (`PlayerPedId()`).
+    --- @param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped.
-    ---
+    --- @return boolean boolean True if the Ped is an animal, otherwise false.
-    ---@return boolean `true` if the Ped is an animal, otherwise `false`.
     ---
     --- @usage
     --- ```lua
     --- local isPlayerAnimal = isAnimal()
     --- local isSpecificPedAnimal = isAnimal(somePedEntity)
     --- ```
-    function isPedAnimal(ped)
+    function isPedAnimal(Ped)
-        local PedModel = GetEntityModel(ped or PlayerPedId())
+        local PedModel = GetEntityModel(Ped or PlayerPedId())
-
+        for _, animalCategory in pairs(AnimalPeds) do
-        for _, animalTypeTable in pairs(AnimalPeds) do
+            for animalModelHash, _ in pairs(animalCategory) do
-            for animalModelHash, _ in pairs(animalTypeTable) do
                 if PedModel == animalModelHash then
                     isAnimal = true
-                    break
+                    debugPrint("^4isAnimal^7: ^2Ped is ^4Animal")
+                    return true
                 end
             end
-            if isAnimal then
-                debugPrint("^6Debug^7: ^2Ped is Animal^1")
-                break
-            end
         end
-
+        return false
-        return isAnimal
     end
 
-    --- Checks if a given Ped is classified specifically as a cat.
+    --- Checks if a given Ped is classified as a cat.
     ---
-    --- This function verifies whether the specified Ped (or the player's Ped if none is provided)
+    --- Iterates through the CatPeds table and returns true if the Ped's model matches.
-    --- matches any of the model hashes listed under `AnimalPeds.CatPeds`. It returns `true` if a match is found.
     ---
-    ---@param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped (`PlayerPedId()`).
+    --- @param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped.
-    ---
+    --- @return boolean True if the Ped is a cat, otherwise false.
-    ---@return boolean `true` if the Ped is a cat, otherwise `false`.
     ---
     ---@usage
     --- ```lua
@@ -76,33 +105,30 @@ if not isServer() then
     ---     print("Driver is a cat!")
     --- end
     --- ```
-    function isCat(ped)
+    function isCat(Ped)
-        local PedModel = GetEntityModel(ped or PlayerPedId())
+        local PedModel = GetEntityModel(Ped or PlayerPedId())
-        for k, v in pairs(AnimalPeds.CatPeds) do
+        for modelHash, _ in pairs(AnimalPeds.CatPeds) do
-            if PedModel == k then
+            if PedModel == modelHash then
+                debugPrint("^4isAnimal^7: ^2Ped is ^4Cat")
                 return true
             end
         end
         return false
     end
 
-    --- Determines if a given Ped is classified as a dog and identifies its size category.
+    --- Determines if a given Ped is a dog and identifies its size category.
     ---
-    --- This function checks whether the specified Ped (or the player's Ped if none is provided)
+    --- Checks the BigDogs and SmallDogs tables to see if the Ped's model matches any dog model.
-    --- matches any model hashes listed under `AnimalPeds.BigDogs` or `AnimalPeds.SmallDogs`. It returns
-    --- two values: the first indicates if the Ped is a dog, and the second specifies whether it's a
-    --- large dog (`true`) or a small dog (`false`). If the Ped is not a dog, the second return value is `nil`.
     ---
-    ---@param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped (`PlayerPedId()`).
+    --- @param ped number|nil Optional. The Ped entity to check. Defaults to the player's Ped.
-    ---
+    ---@return boolean, boolean|nil boolean Returns `true` and `true` if the Ped is a big dog,
-    ---@return boolean, boolean|nil Returns `true` and `true` if the Ped is a big dog,
     ---                            `true` and `false` if it's a small dog,
     ---                            or `false` and `nil` if it's not a dog.
     ---
     ---@usage
     --- ```lua
-    --- local isDog, isBigDog = isDog()
+    --- local isPedDog, isBigDog = isDog()
-    --- if isDog then
+    --- if isPedDog then
     ---     if isBigDog then
     ---         print("Player is a big dog!")
     ---     else
@@ -122,29 +148,28 @@ if not isServer() then
     ---     end
     --- end
     --- ```
-    function isDog(ped)
+    function isDog(Ped)
-        local PedModel = GetEntityModel(ped or PlayerPedId())
+        local PedModel = GetEntityModel(Ped or PlayerPedId())
-        for k, v in pairs(AnimalPeds.BigDogs) do
+        for modelHash, _ in pairs(AnimalPeds.BigDogs) do
-            if PedModel == k then
+            if PedModel == modelHash then
+                debugPrint("^4isAnimal^7: ^2Ped is ^4Dog")
                 return true, true
             end
         end
-
+        for modelHash, _ in pairs(AnimalPeds.SmallDogs) do
-        for k, v in pairs(AnimalPeds.SmallDogs) do
+            if PedModel == modelHash then
-            if PedModel == k then
+                debugPrint("^4isAnimal^7: ^2Ped is ^4Small Dog")
                 return true, false
             end
         end
         return false, nil
     end
 
-    --- Retrieves a list of all animal model hashes.
+    --- Compiles and returns a flat table of all animal model hashes.
     ---
-    --- This function compiles and returns a flat table containing all model hashes
+    --- Iterates through every category in AnimalPeds and collects all model hashes.
-    --- from the various animal categories defined within the `AnimalPeds` table.
-    --- It's useful for iterating over or performing bulk operations on all animal models.
     ---
-    ---@return table table A table containing all animal model hashes.
+    --- @return table table A table containing all animal model hashes.
     ---
     ---@usage
     --- ```lua
@@ -154,289 +179,109 @@ if not isServer() then
     --- end
     --- ```
     function getAnimalModels()
+        local animalModels = {}
+        for _, animalCategory in pairs(AnimalPeds) do
+            for modelHash, _ in pairs(animalCategory) do
+                table.insert(animalModels, modelHash)
+            end
+        end
+        return animalModels
+    end
+
+    --- Compiles and returns a table of animal animations for the ped model.
+    ---
+    --- Iterates through every category in AnimalPeds and collects all anims.
+    ---
+    --- @return table table A table containing all current model anims.
+    ---
+    ---@usage
+    --- ```lua
+    --- local getAnim = getAnimalAnims(ped)
+    --- playAnim(getAnim.sitDict, getAnim.sitAnim, -1, 1)
+    --- ```
+    function getAnimalAnims(Ped)
+        local model = GetEntityModel(Ped)
         local animalTable = {}
-        for k in pairs(AnimalPeds) do
+        for _, animalCategory in pairs(AnimalPeds) do
-            for v in pairs(AnimalPeds[k]) do
+            for k, v in pairs(animalCategory) do
-                animalTable[#animalTable+1] = v
+                if k == model then
+                    animalTable = v
+                    break
+                end
             end
         end
         return animalTable
     end
 end
 
+-------------------------------------------------------------
+-- Animal Models Data
+-------------------------------------------------------------
+-- Define the animal models and their associated animations.
 AnimalPeds = {
     BigDogs = {
-    -- Big Dogs
+        [`a_c_chop`] = { deathAnim = "dead_right", deathDict = "creatures@chop@move", exitAnim = "getup_r", exitDict = "creatures@chop@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        [`a_c_chop`] = {
+        [`a_c_k9`] = { deathAnim = "dead_right", deathDict = "creatures@chop@move", exitAnim = "getup_r", exitDict = "creatures@chop@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            deathAnim = "dead_right", deathDict = "creatures@chop@move",
+        [`a_c_husky`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            exitAnim = "getup_r", exitDict = "creatures@chop@getup",
+        [`a_c_retriever`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
+        [`a_c_shepherd`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        },
+        [`a_c_rottweiler`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        [`a_c_k9`] = {
+        [`ft-aushep`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            deathAnim = "dead_right", deathDict = "creatures@chop@move",
+        [`golden_r`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            exitAnim = "getup_r", exitDict = "creatures@chop@getup",
+        [`ft-dobermanv2`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
+        [`doberman`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        },
+        [`ft-gs`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        [`a_c_husky`] = {
+        [`k9_husky`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
+        [`ft-bloodhound`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
+        [`bernard`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
+        [`ft-pterrier`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        },
+        [`ft-labrador`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        [`a_c_retriever`] = {
+        [`dane`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
+        [`ft_malinois`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
+        [`abdog`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
+        [`dalmatian`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        },
+        [`a_c_dalmatian`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-        [`a_c_shepherd`] = {
+        [`ft-boxer`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
+        [`ft-bs`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
+        [`chowchow`] = { deathAnim = "dead_right", deathDict = "creatures@rottweiler@move", exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup", sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car" },
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
+        [`a_c_coyote`] = { deathAnim = "dead_right", deathDict = "creatures@coyote@move", exitAnim = "getup_r", exitDict = "creatures@coyote@getup", sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base" },
-        },
+        [`a_c_coyote_02`] = { deathAnim = "dead_right", deathDict = "creatures@coyote@move", exitAnim = "getup_r", exitDict = "creatures@coyote@getup", sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base" },
-        [`a_c_rottweiler`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-aushep`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`golden_r`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-dobermanv2`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`doberman`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-gs`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`k9_husky`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-bloodhound`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`bernard`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-pterrier`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-labrador`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`dane`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft_malinois`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`abdog`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`dalmatian`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`a_c_dalmatian`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-boxer`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`ft-bs`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`chowchow`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rottweiler@move",
-            exitAnim = "getup_r", exitDict = "creatures@rottweiler@getup",
-            sitAnim = "sit", sitDict = "creatures@rottweiler@in_vehicle@std_car"
-        },
-        [`a_c_coyote`] = {
-            deathAnim = "dead_right", deathDict = "creatures@coyote@move",
-            exitAnim = "getup_r", exitDict = "creatures@coyote@getup",
-            sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base"
-        },
-        [`a_c_coyote_02`] = {
-            deathAnim = "dead_right", deathDict = "creatures@coyote@move",
-            exitAnim = "getup_r", exitDict = "creatures@coyote@getup",
-            sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base"
-        },
     },
     SmallDogs = {
-    --   Small Dogs
+        [`a_c_poodle`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-        [`a_c_poodle`] = {
+        [`ft-chihuahua`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
+        [`a_c_pug`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
+        [`a_c_pug_02`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
+        [`a_c_westy`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-        },
+        [`ft-pretriever`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-        [`ft-chihuahua`] = {
+        [`ft-shepk9`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
-        [`a_c_pug`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
-        [`a_c_pug_02`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
-        [`a_c_westy`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
-        [`ft-pretriever`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
-        [`ft-shepk9`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
     },
     CatPeds = {
-        --   Cat
+        [`bshorthair`] = { deathAnim = "dead_right", deathDict = "creatures@cat@move", exitAnim = "getup_r", exitDict = "creatures@cat@getup", sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base" },
-        [`bshorthair`] = {
+        [`a_c_cat_01`] = { deathAnim = "dead_right", deathDict = "creatures@cat@move", exitAnim = "getup_r", exitDict = "creatures@cat@getup", sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base" },
-            deathAnim = "dead_right", deathDict = "creatures@cat@move",
+        [`ft-sphynx`] = { deathAnim = "dead_right", deathDict = "creatures@coyote@move", exitAnim = "getup_r", exitDict = "creatures@coyote@getup", sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base" },
-            exitAnim = "getup_r", exitDict = "creatures@cat@getup",
-            sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base"
-        },
-        [`a_c_cat_01`] = {
-            deathAnim = "dead_right", deathDict = "creatures@cat@move",
-            exitAnim = "getup_r", exitDict = "creatures@cat@getup",
-            sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base"
-        },
-        [`ft-sphynx`] = {
-            deathAnim = "dead_right", deathDict = "creatures@coyote@move",
-            exitAnim = "getup_r", exitDict = "creatures@coyote@getup",
-            sitAnim = "base", sitDict = "creatures@coyote@amb@world_coyote_howl@base"
-        },
     },
     OtherPeds = {
-        --   Other Animals
+        [`ft-raccoon`] = { deathAnim = "dead_right", deathDict = "creatures@cat@move", exitAnim = "getup_r", exitDict = "creatures@cat@getup", sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base" },
-        [`ft-raccoon`] = {
+        [`a_c_hen`] = { deathAnim = "dead_right", deathDict = "creatures@hen@move", exitAnim = "getup_r", exitDict = "creatures@hen@getup" },
-            deathAnim = "dead_right", deathDict = "creatures@cat@move",
+        [`a_c_rabbit_01`] = { deathAnim = "dead_right", deathDict = "creatures@rabbit@move", exitAnim = "getup_r", exitDict = "creatures@rabbit@getup", sitAnim = "idle_c", sitDict = "creatures@coyote@amb@world_coyote_howl@base" },
-            exitAnim = "getup_r", exitDict = "creatures@cat@getup",
+        [`a_c_rabbit_02`] = { deathAnim = "dead_right", deathDict = "creatures@rabbit@move", exitAnim = "getup_r", exitDict = "creatures@rabbit@getup", sitAnim = "idle_c", sitDict = "creatures@coyote@amb@world_coyote_howl@base" },
-            sitAnim = "base", sitDict = "creatures@cat@amb@world_cat_sleeping_ledge@base"
+        [`a_c_rat`] = { deathAnim = "dead_right", deathDict = "creatures@rat@move", exitAnim = "getup_r", exitDict = "creatures@rat@getup" },
-        },
+        [`a_c_deer`] = { deathAnim = "dead_right", deathDict = "creatures@deer@move", exitAnim = "getup_r", exitDict = "creatures@deer@getup" },
-        [`a_c_hen`] = {
+        [`a_c_boar`] = { deathAnim = "dead_right", deathDict = "creatures@boar@move", exitAnim = "getup_r", exitDict = "creatures@boar@getup" },
-            deathAnim = "dead_right", deathDict = "creatures@hen@move",
+        [`a_c_boar_02`] = { deathAnim = "dead_right", deathDict = "creatures@boar@move", exitAnim = "getup_r", exitDict = "creatures@boar@getup" },
-            exitAnim = "getup_r", exitDict = "creatures@hen@getup"
+        [`a_c_chicken`] = { deathAnim = "dead_right", deathDict = "creatures@chicken@move", exitAnim = "getup_r", exitDict = "creatures@chicken@getup" },
-        },
+        [`a_c_pig`] = { deathAnim = "dead_right", deathDict = "creatures@pig@move", exitAnim = "getup_r", exitDict = "creatures@pig@getup" },
-        [`a_c_rabbit_01`] = {
+        [`a_c_sharkhammer`] = { deathAnim = "dead_right", deathDict = "creatures@sharkhammer@move", exitAnim = "getup_r", exitDict = "creatures@sharkhammer@getup" },
-            deathAnim = "dead_right", deathDict = "creatures@rabbit@move",
+        [`a_c_sharktiger`] = { deathAnim = "dead_right", deathDict = "creatures@sharktiger@move", exitAnim = "getup_r", exitDict = "creatures@sharktiger@getup" },
-            exitAnim = "getup_r", exitDict = "creatures@rabbit@getup",
+        [`a_c_crow`] = { deathAnim = "dead_down", deathDict = "creatures@crow@move", exitAnim = "nill", exitDict = "creatures@pug@move" },
-            sitAnim = "idle_c", sitDict = "creatures@coyote@amb@world_coyote_howl@base"
+        [`a_c_pigeon`] = { deathAnim = "dead_down", deathDict = "creatures@pigeon@move", exitAnim = "nill", exitDict = "creatures@pug@move" },
-        },
-        [`a_c_rabbit_02`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rabbit@move",
-            exitAnim = "getup_r", exitDict = "creatures@rabbit@getup",
-            sitAnim = "idle_c", sitDict = "creatures@coyote@amb@world_coyote_howl@base"
-        },
-        [`a_c_rat`] = {
-            deathAnim = "dead_right", deathDict = "creatures@rat@move",
-            exitAnim = "getup_r", exitDict = "creatures@rat@getup"
-        },
-        [`a_c_deer`] = {
-            deathAnim = "dead_right", deathDict = "creatures@deer@move",
-            exitAnim = "getup_r", exitDict = "creatures@deer@getup"
-        },
-        [`a_c_boar`] = {
-            deathAnim = "dead_right", deathDict = "creatures@boar@move",
-            exitAnim = "getup_r", exitDict = "creatures@boar@getup"
-        },
-        [`a_c_boar_02`] = {
-            deathAnim = "dead_right", deathDict = "creatures@boar@move",
-            exitAnim = "getup_r", exitDict = "creatures@boar@getup"
-        },
-        [`a_c_chicken`] = {
-            deathAnim = "dead_right", deathDict = "creatures@chicken@move",
-            exitAnim = "getup_r", exitDict = "creatures@chicken@getup"
-        },
-        [`a_c_pig`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pig@move",
-            exitAnim = "getup_r", exitDict = "creatures@pig@getup"
-        },
-        [`a_c_sharkhammer`] = {
-            deathAnim = "dead_right", deathDict = "creatures@sharkhammer@move",
-            exitAnim = "getup_r", exitDict = "creatures@sharkhammer@getup"
-        },
-        [`a_c_sharktiger`] = {
-            deathAnim = "dead_right", deathDict = "creatures@sharktiger@move",
-            exitAnim = "getup_r", exitDict = "creatures@sharktiger@getup"
-        },
-        [`a_c_crow`] = {
-            deathAnim = "dead_down", deathDict = "creatures@crow@move",
-            exitAnim = "nill", exitDict = "creatures@pug@move", -- no get up anim
-        },
-        [`a_c_pigeon`] = {
-            deathAnim = "dead_down", deathDict = "creatures@pigeon@move",
-            exitAnim = "nill", exitDict = "creatures@pug@move", -- no get up anim
-        },
     },
     Monekys = {
-        [`ft-chimpanzee`] = {
+        [`ft-chimpanzee`] = { deathAnim = "dead", deathDict = "dead_a", exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0" },
-            deathAnim = "dead", deathDict = "dead_a",
+        [`a_c_chimp`] = { deathAnim = "dead", deathDict = "dead_a", exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0" },
-            exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0"
+        [`a_c_chimp_02`] = { deathAnim = "dead", deathDict = "dead_a", exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0" },
-        },
+        [`a_c_rhesus`] = { deathAnim = "dead", deathDict = "dead_a", exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0" },
-        [`a_c_chimp`] = {
+        [`ft-capmonkey2`] = { deathAnim = "dead_right", deathDict = "creatures@pug@move", exitAnim = "getup_r", exitDict = "creatures@pug@getup", sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base" },
-            deathAnim = "dead", deathDict = "dead_a",
-            exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0"
-        },
-        [`a_c_chimp_02`] = {
-            deathAnim = "dead", deathDict = "dead_a",
-            exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0"
-        },
-        [`a_c_rhesus`] = {
-            deathAnim = "dead", deathDict = "dead_a",
-            exitAnim = "get_up@sat_on_floor@to_stand", exitDict = "getup_0"
-        },
-        [`ft-capmonkey2`] = {
-            deathAnim = "dead_right", deathDict = "creatures@pug@move",
-            exitAnim = "getup_r", exitDict = "creatures@pug@getup",
-            sitAnim = "base", sitDict = "creatures@pug@amb@world_dog_sitting@base"
-        },
     }
 }

shared/jobfunctions.lua

@@ -1,17 +1,92 @@
--- Global variable to track duty status
+--[[
+    Duty & Interaction Utilities Module
+    --------------------------------------
+    This module provides functions related to:
+      • Determining boss roles from Jobs and Gangs tables.
+      • Checking a player's job and duty status.
+      • Toggling duty state.
+      • Simulating player interactions such as hand washing, using toilets/urinals,
+        and teleporting via doors.
+]]
+
+
+local bossMenuFunc = {
+    {   name = "qb-management",
+        openBossMenu = function(isGang, group)
+            if isGang then
+                TriggerEvent("qb-gangmenu:client:OpenMenu")
+            else
+                TriggerEvent("qb-bossmenu:client:OpenMenu")
+            end
+        end,
+    },
+
+    {   name = "qbx_management",
+        openBossMenu = function(isGang, group)
+            if isGang then
+                exports["qbx_management"]:OpenBossMenu("gang")
+            else
+                exports["qbx_management"]:OpenBossMenu("job")
+            end
+        end,
+    },
+
+    {   name = "esx_society",
+        openBossMenu = function(isGang, group)
+            TriggerEvent('esx_society:openBossMenu', group, function() end, { wash = false })
+        end,
+    },
+
+    {   name = "tss-bossmenu",
+        openBossMenu = function(isGang, group)
+            TriggerEvent("tss-bossmenu:client:OpenMenu")
+        end,
+    },
+
+    {   name = "okokBossMenu",
+        openBossMenu = function(isGang, group)
+            ExecuteCommand('openbossmenu')
+        end,
+    },
+}
+
+function openBossMenu(isGang, group)
+    for i = 1, #bossMenuFunc do
+        local bossmenu = bossMenuFunc[i]
+        if isStarted(bossmenu.name) then
+            bossmenu.openBossMenu(isGang, group)
+            return
+        end
+    end
+end
+
+
+-------------------------------------------------------------
+-- Global Duty Status
+-------------------------------------------------------------
+-- This attempts to sync up with the players framework onDuty variable
+-- This stops the script getting confused when one is false and one is true
 onDuty = false
 
---- Scans the 'Jobs' and 'Gangs' tables to identify roles classified as Bosses.
+if not isServer() then
+    onPlayerLoaded(function()
+        onDuty = getPlayer().onDuty
+    end, true)
+end
+
+-------------------------------------------------------------
+-- Boss Role Detection
+-------------------------------------------------------------
+
+--- Scans the 'Jobs' and 'Gangs' tables to identify roles classified as bosses.
 ---
---- This function iterates through the specified role's grades within the `Jobs` or `Gangs` tables.
+--- Iterates through the specified role's grades in the Jobs or Gangs table and returns
---- It identifies which grades are marked as bosses (`isboss`) or have bank authorization (`bankAuth`).
+--- a table mapping the role to the lowest grade number that qualifies as a boss (isboss or bankAuth).
---- The function returns a table where each role maps to the lowest grade number that qualifies as a boss.
 ---
----@param role string The name of the job or gang role to check for boss grades.
+--- @param role string The job or gang role to check.
+--- @return table table A table with the role mapped to its boss grade number.
 ---
----@return table table A table containing roles mapped to their respective boss grade numbers.
+--- @usage
----
----@usage
 --- ```lua
 --- local bosses = makeBossRoles("police")
 --- if bosses["police"] then
@@ -23,7 +98,7 @@ function makeBossRoles(role)
     local data = (Jobs and Jobs[role]) or (Gangs and Gangs[role])
     if data then
         for grade, info in pairs(data.grades) do
-            if info.isboss or info.bankAuth then
+            if info.isboss or info.bankAuth or info.isBoss then
                 boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
             end
         end
@@ -31,27 +106,30 @@ function makeBossRoles(role)
     return boss
 end
 
---- Checks if the player has a specific job and is on duty.
+-------------------------------------------------------------
+-- Job & Duty Checks
+-------------------------------------------------------------
+
+--- Checks if the player has a specific job (or gang) and is on duty.
 ---
---- This function verifies whether the player possesses the specified job and, if applicable,
+--- Verifies whether the player possesses the specified role. If the role is defined in the Jobs table,
---- whether they are currently on duty. It provides a notification if the player fails these checks.
+--- it also checks that the player is clocked in (onDuty). If the check fails, a notification is sent.
 ---
----@param job string The name of the job or gang to check.
+--- @param job string The job or gang to check.
+--- @return boolean Returns true if the player meets the criteria; false otherwise.
 ---
----@return boolean Returns `true` if the player has the job (and is on duty if required), otherwise `false`.
+--- @usage
----
----@usage
 --- ```lua
 --- if jobCheck("mechanic") then
----     -- Allow access to mechanic-related features
+---     -- Allow mechanic features.
 --- else
----     -- Deny access or notify the player
+---     -- Deny access.
 --- end
 --- ```
 function jobCheck(job)
-    canDo = true
+    local canDo = true
     if Jobs[job] then
-        if not hasJob(job) or not onDuty then
+        if not hasJob(job) or not getPlayer().onDuty then
             triggerNotify(nil, Loc[Config.Lan].error["not_clockedin"])
             canDo = false
         end
@@ -66,44 +144,95 @@ end
 
 --- Toggles the player's duty status.
 ---
---- This function switches the player's duty state between on-duty and off-duty.
+--- Switches the player's duty state between on-duty and off-duty. If using QBcore,
---- It integrates with QBcore's duty system if available; otherwise, it manually toggles the `onDuty` variable
+--- it triggers the appropriate server event. Otherwise, it manually toggles the onDuty variable and notifies the player.
---- and sends a notification to the player about their new duty status.
 ---
----@usage
+--- @usage
 --- ```lua
---- toggleDuty()
+--- toggleDuty()  -- Player receives a notification of their new duty status.
---- -- Player will receive a notification indicating their new duty status
 --- ```
 function toggleDuty()
-    if isStarted(QBExport) or isStarted(QBXExport) then
+    local dutyFunc = {
-        TriggerServerEvent("QBCore:ToggleDuty")
+        {   framework = QBExport,
-    else
+            func = function()
-        onDuty = not onDuty
+                TriggerServerEvent("QBCore:ToggleDuty")
-        if onDuty then
+                Wait(100)
-            triggerNotify(nil, "Now on duty", "success")
+                onDuty = getPlayer().onDuty
-        else
+            end
-            triggerNotify(nil, "Now off duty", "success")
+        },
+        {   framework = QBXExport,
+            func = function()
+                TriggerServerEvent("QBCore:ToggleDuty")
+                Wait(100)
+                onDuty = getPlayer().onDuty
+            end
+        },
+        {   framework = RSGExport,
+            func = function()
+                TriggerServerEvent("RSGCore:ToggleDuty")
+                Wait(100)
+                onDuty = getPlayer().onDuty
+            end
+        },
+        {   framework = ESXExport,
+            func = function()
+                local tempJob = ESX.GetPlayerData().job
+                tempJob.onDuty = not onDuty
+                ESX.SetPlayerData("job", tempJob)
+                onDuty = getPlayer().onDuty
+                if onDuty then
+                    triggerNotify(nil, "Now on duty", "success")
+                else
+                    triggerNotify(nil, "Now off duty", "success")
+                end
+            end
+        },
+    }
+
+    for i = 1, #dutyFunc do
+        local framework = dutyFunc[i]
+        if isStarted(framework.framework) then
+            framework.func()
+            return
         end
     end
+
+    -- fallback
+    onDuty = not onDuty
+    if onDuty then
+        triggerNotify(nil, "Now on duty", "success")
+    else
+        triggerNotify(nil, "Now off duty", "success")
+    end
 end
 
+-- Framework specific functions to keep duty status synced
+RegisterNetEvent("QBCore:Client:OnJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
+RegisterNetEvent("QBCore:Client:SetDuty", function(duty) onDuty = duty end)
+
+RegisterNetEvent("qbx_core:client:onJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
+
+RegisterNetEvent("RSGCore:Client:OnJobUpdate", function(JobInfo) onDuty = JobInfo.onduty end)
+RegisterNetEvent("RSGCore:Client:SetDuty", function(duty) onDuty = duty end)
+
+-------------------------------------------------------------
+-- Interaction Functions
+-------------------------------------------------------------
+
 --- Initiates the hand-washing action for the player.
 ---
---- This function triggers an animation and a progress bar to simulate the player washing their hands.
+--- Triggers an animation and a progress bar to simulate hand washing at the specified coordinates.
---- Upon completion, it sends a success notification. If the action is canceled, it notifies the player of the cancellation.
+--- On success, it notifies the player; if cancelled, it sends an error notification.
 ---
----@param data table A table containing the coordinates where the hand-washing action takes place.
+--- @param data table A table containing:
---- - **coords** (`vector3`): The position where the hand-washing animation and camera are focused.
+---     - coords (vector3): The location where the hand-washing action occurs.
 ---
----@return void
+--- @usage
----
----@usage
 --- ```lua
 --- washHands({ coords = vector3(200.0, 300.0, 40.0) })
---- -- Player will perform the hand-washing animation at the specified location
 --- ```
-function washHands(data) local ped = PlayerPedId()
+function washHands(data)
+    local ped = PlayerPedId()
     lookEnt(data.coords)
     local cam = createTempCam(ped, data.coords)
     if progressBar({
@@ -118,22 +247,21 @@ function washHands(data) local ped = PlayerPedId()
     }) then
         triggerNotify(nil, Loc[Config.Lan].success["washed_hands"], "success")
     else
-        triggerNotify(nil, Loc[Config.Lan].error["cancel"], 'error')
+        triggerNotify(nil, Loc[Config.Lan].error["cancel"], "error")
     end
     ClearPedTasks(ped)
 end
 
 --- Handles the player's interaction with a toilet or urinal.
 ---
---- This function manages the animations and progress bars associated with using a toilet or urinal.
+--- Manages animations and progress bars for using a urinal or a toilet. If the action is successful,
---- Depending on whether the interaction is with a urinal (`data.urinal`), it plays the appropriate animation
+--- it triggers the appropriate server event (urinal usage) or notifies the player if cancelled.
---- and triggers server events upon successful completion. If the action is canceled, it notifies the player.
 ---
----@param data table A table containing data about the toilet interaction.
+--- @param data table A table containing:
---- - **urinal** (`boolean`): Indicates whether the interaction is with a urinal (`true`) or a toilet (`false`).
+---     - urinal (boolean): `true if using a urinal; false for a toilet.`
---- - **sitcoords** (`vector4`): The coordinates and heading for the seating animation when using a toilet.
+---     - sitcoords (vector4): `Coordinates and heading for seating when using a toilet.`
 ---
----@usage
+--- @usage
 --- ```lua
 --- useToilet({ urinal = true })
 --- -- Player uses a urinal with corresponding animations and notifications
@@ -154,7 +282,7 @@ function useToilet(data)
             TriggerServerEvent(getScript().."server:Urinal")
         else
             lockInv(false)
-            triggerNotify(nil, Loc[Config.Lan].error["cancelled"], 'error')
+            triggerNotify(nil, Loc[Config.Lan].error["cancelled"], "error")
         end
     else
         TaskStartScenarioAtPosition(PlayerPedId(), "PROP_HUMAN_SEAT_CHAIR_MP_PLAYER", data.sitcoords.x, data.sitcoords.y, data.sitcoords.z, data.sitcoords[4], 0, 1, true)
@@ -167,24 +295,22 @@ function useToilet(data)
             ClearPedTasks(PlayerPedId())
         else
             lockInv(false)
-            triggerNotify(nil, Loc[Config.Lan].error["cancelled"], 'error')
+            triggerNotify(nil, Loc[Config.Lan].error["cancelled"], "error")
         end
     end
 end
 
 --- Teleports the player to specified coordinates with a fade effect.
 ---
---- This function fades the screen out, moves the player to the target coordinates (`data.telecoords`),
+--- Fades the screen out, moves the player to the target coordinates, sets the player's heading,
---- sets the player's heading, and then fades the screen back in. It's commonly used for door interactions
+--- then fades the screen back in. Commonly used for door interactions or teleportation points.
---- or teleportation points within the game.
 ---
----@param data table A table containing teleportation data.
+--- @param data table A table containing:
---- - **telecoords** (`vector4`): The target coordinates and heading for the teleportation.
+---   - telecoords (vector4): The target coordinates and heading.
 ---
----@usage
+--- @usage
 --- ```lua
 --- useDoor({ telecoords = vector4(215.76, -810.12, 29.73, 90.0) })
---- -- Player is teleported to the specified coordinates with a fade effect
 --- ```
 function useDoor(data)
     DoScreenFadeOut(500)

shared/make/cameras.lua

@@ -1,3 +1,5 @@
+local camCache = {}
+
 --- Creates a temporary camera at a specified position, pointing towards given coordinates.
 --
 -- This function creates a camera at a position relative to an entity or at a specified position and orients it to look at the target coordinates.
@@ -7,52 +9,136 @@
 -- If `ent` is an entity, the camera position is calculated as an offset from the entity's position using `GetOffsetFromEntityInWorldCoords`.
 -- If `ent` is a `vector3`, it is used directly as the camera's position.
 --
----@param coords vector3 The target `vector3` coordinates that the camera will point at.
+---@param coords vector3|entityId The target `vector3` coordinates that the camera will point at.
 --
----@return cam camID The handle of the created camera, or `nil` if the camera was not created (e.g., if `Config.Crafting.craftCam` is `false`).
+---@return camID number The handle of the created camera, or `nil` if the camera was not created (e.g., if `Config.Crafting.craftCam` is `false`).
 --
 ---@usage
 -- ```lua
 -- local cam = createTempCam(entity, targetCoords)
 -- ```
 function createTempCam(ent, coords)
-	local cam = nil
+	local camID = nil
-	if Config.Crafting.craftCam then
+	if Config.Crafting?.craftCam or Config.System.enableCam then
-		if debugMode then
+
-			triggerNotify(nil, "ModCam Created", "success")
+		-- if not ent or coords are provided, make a basic camera to control later
+		if not ent and not coords then
+			camID = CreateCam("DEFAULT_SCRIPTED_CAMERA", true)
+			camCache[#camCache+1] = camID
+			return camID
 		end
-		local camCoords = nil
+
-		if type(ent) ~= "vector3" then
+		-- if received a vector3 or vector4 use those coords for origin point, otherwrise get offset from entity
-			camCoords = GetOffsetFromEntityInWorldCoords(ent, 1.0, -0.3, 0.8)
+		local camCoords = type(ent) ~= "number" and ent or GetOffsetFromEntityInWorldCoords(ent, 1.0, -0.3, 0.8)
-		else
+
-			camCoords = ent
+		-- Create the camera
+		camID = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", camCoords.x, camCoords.y, camCoords.z + 0.5, 1.0, 0.0, 0.0, 60.00, false, 0)
+		camCache[#camCache+1] = camID
+
+		debugPrint("^6Bridge^7: ^2Custom Camera Created", camID)
+
+		--if type(coords) == "number" then
+		--	SetCamCoord(camID, GetCamCoord(camID) + vec3(0, 0, 1.0))
+		--end
+		if coords then
+			camLookAt(camID, coords)
 		end
-		-- Create the camera with specified parameters
+
-		cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", camCoords.x, camCoords.y, camCoords.z + 0.5, 1.0, 0.0, 0.0, 60.00, false, 0)
-		-- Point the camera at the target coordinates
-		PointCamAtCoord(cam, coords)
 	end
-	return cam
+	return camID
 end
 
+
+local cacheCameraEffect = {}
+local cachePrevCam = nil
 --- Activates and starts rendering the temporary camera.
 --
 -- This function sets the specified camera as active and begins rendering it with a smooth transition.
 -- The camera is only activated if `Config.Crafting.craftCam` is enabled in the configuration.
 --
----@param cam camID The handle of the camera to activate and render.
+---@param cam number The handle of the camera to activate and render.
+---@param renderTime number The handle of the camera to activate and render.
+---@param loadScene boolean The handle of the camera to activate and render.
+---@param filter table The filter or postFx to render when starting the camera.
 --
 ---@usage
 -- ```lua
--- startTempCam(cam)
+-- startTempCam(camID, 1000, true, { postFx = "HeistCelebEnd" })
 -- ```
-function startTempCam(cam)
+function startTempCam(cam, renderTime, loadScene, filter, switchCam)
-	if Config.Crafting.craftCam then
+	if cam and DoesCamExist(cam) then
-		SetCamActive(cam, true)
+		debugPrint("Starting camera")
-		RenderScriptCams(true, true, 1000, true, true)
+		-- if moving from a cached previous cam, or you've sent a camre id for it to switch from, interpolate to it
+		if switchCam or cachePrevCam then
+			SetCamActiveWithInterp(cam, cachePrevCam, renderTime or 1000, 0, 0)
+		else
+			SetCamActive(cam, true)
+		end
+		cachePrevCam = cam
+
+		-- Clear previous filters
+		if cacheCameraEffect.postFx then
+            AnimpostfxStop(cacheCameraEffect.postFx)
+            cacheCameraEffect.postFx = nil
+        end
+        if cacheCameraEffect.timecycle then
+            ClearTimecycleModifier()
+            cacheCameraEffect.timecycle = nil
+        end
+
+		-- Apply filters (timecycle) here as requested
+		if filter and filter.modifier then
+			SetTimecycleModifier(filter.modifier)
+			SetTimecycleModifierStrength((filter.strength or 1.0) + 0.0)
+			cacheCameraEffect.timecycle = true
+		end
+
+		if filter and filter.postFx then
+			AnimpostfxPlay(filter.postFx, 0, filter.loop and true or false)
+			cacheCameraEffect.postFx = filter.postFx
+		end
+
+		if loadScene then
+			loadLocation(cam, nil, 100.0)
+		end
+
+		RenderScriptCams(true, true, renderTime or 1000, true, true)
 	end
 end
 
+-- Follow cam or coords
+function camLookAt(cam, entCoords)
+	if cam and DoesCamExist(cam) and entCoords then
+		if type(entCoords) ~= "number" then
+			PointCamAtCoord(cam, entCoords.xyz)
+		else
+			PointCamAtEntity(cam, entCoords)
+		end
+	end
+end
+
+function loadLocation(cam, pos, radius)
+	local pos = pos or GetCamCoord(cam)
+
+	SetFocusPosAndVel(pos.x, pos.y, pos.z, 0.0, 0.0, 0.0)
+	RequestCollisionAtCoord(pos.x, pos.y, pos.z)
+	NewLoadSceneStart(pos.x, pos.y, pos.z, 0.0, 0.0, 0.0, radius or 100.0, 0)
+
+	local t0 = GetGameTimer()
+	while not IsNewLoadSceneLoaded() and (GetGameTimer() - t0) < 2000 do
+		RequestCollisionAtCoord(pos.x, pos.y, pos.z)
+		Wait(0)
+	end
+
+	NewLoadSceneStop()
+end
+
+function clearLoadLocation()
+	ClearFocus()
+	NewLoadSceneStop()
+end
+
+
 --- Deactivates the temporary camera and stops rendering.
 --
 -- This function waits for one second, then stops rendering script cameras and destroys all cameras.
@@ -64,12 +150,34 @@ end
 -- ```lua
 -- stopTempCam()
 -- ```
-function stopTempCam()
+function stopTempCam(renderTime)
-	if Config.Crafting.craftCam then
+	CreateThread(function()
-		CreateThread(function()
+		Wait(1000)
-			Wait(1000)
+
-			RenderScriptCams(false, true, 500, true, true)
+		cachePrevCam = nil
-			DestroyAllCams()
+
-		end)
+		-- Clear previous filters
-	end
+		if cacheCameraEffect.postFx then
+            AnimpostfxStop(cacheCameraEffect.postFx)
+            cacheCameraEffect.postFx = nil
+        end
+        if cacheCameraEffect.timecycle then
+            ClearTimecycleModifier()
+            cacheCameraEffect.timecycle = nil
+        end
+
+		RenderScriptCams(false, true, renderTime or 500, true, true)
+
+		clearLoadLocation()
+
+		Wait(renderTime or 0)
+		for i = 1, #camCache do
+			DestroyCam(camCache[i], true)
+		end
+		camCache = {}
+	end)
 end
+
+function createCam(...) return createTempCam(...) end
+function startCam(...) return startTempCam(...) end
+function stopCam(...) return stopTempCam(...) end

shared/make/loaders.lua

@@ -137,11 +137,11 @@ end
 --- ```
 function loadScriptBank(bank)
     local timeout = 2000
-    debugPrint("^6Debug^7: ^2Loading ^3Script ^2AudioBank^7...")
+    debugPrint("^6Bridge^7: ^2Loading ^3Script ^2AudioBank^7...")
-    while not RequestScriptAudioBank(bank, 0) do Wait(10) timeout -= 10 if timeout <= 0 then break end end
+    while not RequestScriptAudioBank(bank, false) do Wait(10) timeout -= 10 if timeout <= 0 then break end end
 
-    local success = RequestScriptAudioBank(bank, 0)
+    local success = RequestScriptAudioBank(bank, false)
-    debugPrint("^6Debug^7: "..(success and "^3Successfully ^2loaded^7: '^4" or "^1Failed to ^2load^7: '^4")..bank.."^7'")
+    debugPrint("^6Bridge^7: "..(success and "^3Successfully ^2loaded^7: '^4" or "^1Failed to ^2load^7: '^4")..bank.."^7'")
     return success
 end
 
@@ -159,14 +159,14 @@ end
 --- ```
 function loadAmbientBank(bank)
     local timeout = 2000
-    debugPrint("^6Debug^7: ^2Loading ^3Ambient ^2AudioBank^7...")
+    debugPrint("^6Bridge^7: ^2Loading ^3Ambient ^2AudioBank^7...")
     while not RequestAmbientAudioBank(bank, 0) do
         Wait(10)
         timeout -= 10
         if timeout <= 0 then break end
     end
     local success = RequestAmbientAudioBank(bank, 0)
-    debugPrint("^6Debug^7: "..(success and "^3Successfully ^2loaded^7: '^4" or "^1Failed to ^2load^7: '^4")..bank.."^7'")
+    debugPrint("^6Bridge^7: "..(success and "^3Successfully ^2loaded^7: '^4" or "^1Failed to ^2load^7: '^4")..bank.."^7'")
     return success
 end
 
@@ -187,7 +187,7 @@ end
 --- ```
 function playAnim(animDict, animName, duration, flag, ped, speed)
     loadAnimDict(animDict)
-    debugPrint("Attempting to make player play anim", animDict, animName)
+    debugPrint("^6Bridge^7: ^3playAnim^7() ^2Triggered^7: ", animDict, animName, flag)
 	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, speed or 8.0, speed or -8.0, duration or 30000, flag or 50, 1, false, false, false)
 end
 
@@ -204,7 +204,7 @@ end
 --- stopAnim('amb@world_human_hang_out_street@male_c@base', 'base', PlayerPedId())
 --- ```
 function stopAnim(animDict, animName, ped)
-    debugPrint("Stopping anim for "..(ped or PlayerPedId()))
+    debugPrint("^6Bridge^7: ^3stopAnim^7() ^2Triggered^7: ", animDict, animName)
     StopAnimTask(ped or PlayerPedId(), animDict, animName, 0.5)
     StopAnimTask(ped or PlayerPedId(), animName, animDict, 0.5)
     unloadAnimDict(animDict)
@@ -224,16 +224,39 @@ end
 --- ```lua
 --- playGameSound('DLC_HEIST_HACKING_SNAKE_SOUNDS', 'Beep', vector3(0, 0, 0), false, 15.0)
 --- ```
-function playGameSound(bank, sound, coords, synced, range)
+function playGameSound(audioBank, soundSet, soundRef, coords, synced, range)
-    debugPrint("^6Debug^7: ^2Attempting to play: ^3"..sound.." ^7(^4"..bank.."^7')")
+    debugPrint("^6Bridge^7: ^2Attempting to play: ^3"..soundRef.." ^7('^4"..audioBank.."^7')")
+    loadScriptBank(audioBank)
     local range = range or 10.0
     local soundId = GetSoundId()
     while not soundId do Wait(10) end
     if type(coords) == "vector3" or type(coords) == "vector4" then
-        debugPrint("^6Debug^7: ^2Playing sound from Coord^7: "..formatCoord(coords.xyz))
+        debugPrint("^6Bridge^7: ^2Playing sound from Coord^7: "..formatCoord(coords.xyz))
-        PlaySoundFromCoord(soundId, sound, coords.x, coords.y, coords.z, bank, synced, range, 0)
+        PlaySoundFromCoord(soundId, soundRef, coords.x, coords.y, coords.z, soundSet, synced, range, 0)
     else
-        debugPrint("^6Debug^7: ^2Playing sound from Entity^7: ^4"..coords.."^7")
+        debugPrint("^6Bridge^7: ^2Playing sound from Entity^7: ^4"..coords.."^7")
-        PlaySoundFromEntity(soundId, sound, coords, bank, synced, 0)
+        PlaySoundFromEntity(soundId, soundRef, coords, soundSet, synced, 1.0)
     end
+    ReleaseScriptAudioBank(audioBank)
+end
+
+-- Experimental, add fade in for spawned entities
+function fadeInEnt(ent, duration)
+    if not DoesEntityExist(ent) then return end
+    duration = duration or 500 -- in ms
+    local fadeSteps = 20
+    local stepTime = duration / fadeSteps
+
+    SetEntityAlpha(ent, 0, false)
+    SetEntityVisible(ent, true, false)
+    SetEntityLocallyInvisible(ent) -- sometimes helps prevent "pop-in" in early frames
+
+    for i = 1, fadeSteps do
+        Wait(stepTime)
+        local newAlpha = math.floor((i / fadeSteps) * 255)
+        SetEntityAlpha(ent, newAlpha, false)
+    end
+
+    -- Restore full visibility
+    ResetEntityAlpha(ent)
 end

shared/make/makeBlip.lua

@@ -1,3 +1,5 @@
+local blipTable = {}
+
 --- Creates a blip at specified coordinates with given properties.
 --
 -- This function adds a map blip at the provided coordinates and sets various display properties such as sprite, color, scale, and more.
@@ -30,31 +32,51 @@
 -- local blip = makeBlip(blipData)
 -- ```
 function makeBlip(data)
-    local blip = AddBlipForCoord(vec3(data.coords.x, data.coords.y, data.coords.z))
+    local blip = nil
-    SetBlipCoords(blip, data.coords.x, data.coords.y, data.coords.z) -- Manually set blip coordinates again as sometimes it just refuses
+    if gameName == "rdr3" then
-    SetBlipAsShortRange(blip, true)
+        blip = BlipAddForCoords(1664425300, data.coords.x, data.coords.y, data.coords.z)
-    SetBlipSprite(blip, data.sprite or 106)
+        SetBlipSprite(blip, data.sprite or `blip_shop_market_stall`)
-    SetBlipColour(blip, data.col or 5)
+        SetBlipScale(blip, data.scale or 0.2)
-    SetBlipScale(blip, data.scale or 0.7)
+        SetBlipName(blip, data.name)
-    SetBlipDisplay(blip, data.disp or 6)
+        --BlipSetStyle(blip, data.col or `BLIP_STYLE_CREATOR_DEFAULT`)
-    if data.category then SetBlipCategory(blip, data.category) end
+    else
-    BeginTextCommandSetBlipName('STRING')
+        blip = AddBlipForCoord(vec3(data.coords.x, data.coords.y, data.coords.z))
-    AddTextComponentString(tostring(data.name))
+        SetBlipCoords(blip, data.coords.x, data.coords.y, data.coords.z) -- Manually set blip coordinates again as sometimes it just refuses
-    EndTextCommandSetBlipName(blip)
+        SetBlipAsShortRange(blip, true)
-    -- Handle preview image if certain resources are running
+        SetBlipSprite(blip, data.sprite or 106)
-    if isStarted("fs_smallresources") or isStarted("blip_info") or isStarted("blipinfo") then
+        SetBlipColour(blip, data.col or 5)
-        if data.preview then
+        SetBlipScale(blip, data.scale or 0.7)
-            local txname = string.gsub(tostring(data.name..'preview'..string.gsub(data.coords.z, "%.", "")), "[ ()~]", "")
+        SetBlipDisplay(blip, data.disp or 6)
-            if data.preview:find("http") or data.preview:find("nui") then
+        if data.category then
-                createDui(txname, data.preview, vec2(512, 256), scriptTxd)
+            SetBlipCategory(blip, data.category)
-            else
+        end
-                CreateRuntimeTextureFromImage(scriptTxd, txname, data.preview)
+        BeginTextCommandSetBlipName('STRING')
+        AddTextComponentString(tostring(data.name))
+        EndTextCommandSetBlipName(blip)
+        -- Handle preview image if certain resources are running
+        if isStarted("jim-blipcontroller") then
+            if data.preview then
+                local txname = string.gsub(tostring(data.name..'preview'..string.gsub(data.coords.z, "%.", "")), "[ ()~]", "")
+                if data.preview:find("http") or data.preview:find("nui") then
+                    createDui(txname, data.preview, vec2(512, 256), scriptTxd)
+                else
+                    CreateRuntimeTextureFromImage(scriptTxd, txname, data.preview)
+                end
+                exports["jim-blipcontroller"]:ShowBlipInfo(blip, {
+                    title = data.name,
+                    dict = getScript()..'scriptTxd',
+                    tex = txname,
+                })
             end
-            exports["fs_smallresources"]:SetBlipInfoImage(blip, getScript()..'scriptTxd', txname)
-            exports["fs_smallresources"]:SetBlipInfoTitle(blip, data.name, false)
         end
     end
-    debugPrint("^6Bridge^7: ^6Blip ^2created^7: '^6"..data.name.."^7' - '"..formatCoord(data.coords).."'")
+    blipTable[blip] = blip
+
+    if DoesBlipExist(blip) then
+        debugPrint("^6Bridge^7: ^6Blip ^2created^7: '^6"..data.name.."^7' - '"..formatCoord(data.coords).."'")
+    else
+        print("Error making blip")
+    end
     return blip
 end
 
@@ -90,30 +112,57 @@ end
 -- local blip = makeEntityBlip(blipData)
 -- ```
 function makeEntityBlip(data)
-    AddBlipForEntity(data.entity)
+    local blip = nil
-    local blip = GetBlipFromEntity(data.entity)
+    if gameName == "rdr3" then
-    SetBlipAsShortRange(blip, true)
+        blip = BlipAddForEntity(1664425300, data.entity)
-    SetBlipSprite(blip, data.sprite or 106)
+        SetBlipSprite(blip, data.sprite or `blip_ambient_coach`)
-    SetBlipColour(blip, data.col or 5)
+        SetBlipScale(blip, data.scale or 0.2)
-    SetBlipScale(blip, data.scale or 0.7)
+        SetBlipName(blip, data.name)
-    SetBlipDisplay(blip, data.disp or 6)
+
-    if data.category then SetBlipCategory(blip, data.category) end
+    else
-    BeginTextCommandSetBlipName('STRING')
+        AddBlipForEntity(data.entity)
-    AddTextComponentString(tostring(data.name))
+        blip = GetBlipFromEntity(data.entity)
-    EndTextCommandSetBlipName(blip)
+        blipTable[blip] = blip
-    -- Handle preview image if certain resources are running
+        SetBlipAsShortRange(blip, true)
-    if isStarted("fs_smallresources") or isStarted("blip-info") or isStarted("blipinfo") then
+        SetBlipSprite(blip, data.sprite or 106)
-        if data.preview then
+        SetBlipColour(blip, data.col or 5)
-            local txname = string.gsub(tostring(data.name..'preview'), "[ ()~]", "")
+        SetBlipScale(blip, data.scale or 0.7)
-            if data.preview:find("http") or data.preview:find("nui") then
+        SetBlipDisplay(blip, data.disp or 6)
-                createDui(txname, data.preview, vec2(512, 256), scriptTxd)
+        if data.category then SetBlipCategory(blip, data.category) end
-            else
+        BeginTextCommandSetBlipName('STRING')
-                CreateRuntimeTextureFromImage(scriptTxd, txname, data.preview)
+        AddTextComponentString(tostring(data.name))
+        EndTextCommandSetBlipName(blip)
+        -- Handle preview image if certain resources are running
+        if isStarted("jim-blipcontroller") then
+            if data.preview then
+                local txname = string.gsub(tostring(data.name..'preview'..string.gsub(data.coords.z, "%.", "")), "[ ()~]", "")
+                if data.preview:find("http") or data.preview:find("nui") then
+                    createDui(txname, data.preview, vec2(512, 256), scriptTxd)
+                else
+                    CreateRuntimeTextureFromImage(scriptTxd, txname, data.preview)
+                end
+                exports["jim-blipcontroller"]:ShowBlipInfo(blip, {
+                    title = data.name,
+                    dict = getScript()..'scriptTxd',
+                    tex = txname,
+                })
             end
-            exports["fs_smallresources"]:SetBlipInfoImage(blip, getScript()..'previewTxd', txname)
-            exports["fs_smallresources"]:SetBlipInfoTitle(blip, data.name, false)
         end
     end
-    debugPrint("^6Bridge^7: ^6Blip ^2created for Entity^7: '^6"..data.name.."^7'")
+    blipTable[blip] = blip
+
+    if DoesBlipExist(blip) then
+        debugPrint("^6Bridge^7: ^6Blip ^2created for Entity^7: '^6"..data.name.."^7'")
+    else
+        print("Error making blip")
+    end
     return blip
 end
+
+if gameName == "rdr3" then
+    onResourceStop(function()
+        for k in pairs(blipTable) do
+            RemoveBlip(k)
+        end
+    end, true)
+end

shared/make/makePed.lua

@@ -1,5 +1,6 @@
 --- A table to keep track of all created Peds.
 local Peds = {}
+local distPeds = {}
 
 --- Creates a distance-based Ped (pedestrian) that spawns when the player enters a specified area.
 --
@@ -18,16 +19,20 @@ local Peds = {}
 -- ```lua
 -- makeDistPed(pedData, pedCoords, true, false, 'WORLD_HUMAN_STAND_IMPATIENT', nil, true)
 -- ```
-function makeDistPed(data, coords, freeze, collision, scenario, anim, synced)
+function makeDistPed(data, coords, freeze, collision, scenario, anim, synced, func)
-    createCirclePoly({
+    local zoneCoords = type(data) == "table" and data.coords or coords
-        name = keyGen()..keyGen(),
+    local randName = keyGen()..keyGen()
-        coords = vec3(data.coords.x, data.coords.y, data.coords.z - 1.03),
+    distPeds[#distPeds+1] = createCirclePoly({
+        name = randName,
+        coords = vec3(zoneCoords.x, zoneCoords.y, zoneCoords.z - 1.03),
         radius = 50.0,
         onEnter = function()
-            Peds[#Peds + 1] = makePed(data, coords, freeze, collision, scenario, anim, synced)
+            Peds[randName] = makePed(data, coords, freeze, collision, scenario, anim, synced)
+            if func then func(Peds[randName]) end
         end,
         onExit = function()
-            DeletePed(Peds[#Peds])
+            DeletePed(Peds[randName])
+            Peds[randName] = nil
         end,
         debug = debugMode,
     })
@@ -53,14 +58,13 @@ end
 -- ```lua
 -- local ped = makePed(pedData, pedCoords, true, false, nil, {'animDict', 'animName'}, true)
 -- ```
-function makePed(data, coords, freeze, collision, scenario, anim, synced)
+function makePed(data, coords, freeze, collision, scenario, anim, synced, fade)
     local ped = nil
     local model = nil
     if type(data) == "table" then
         model = data.model
         loadModel(data.model)
         ped = CreatePed(0, model, coords.x, coords.y, coords.z - 1.03, coords.w, synced and synced or false, false)
-
         -- Inheritance
         SetPedHeadBlendData(ped, data.custom.faceFather, data.custom.faceMother, data.custom.raceShape, data.custom.skinFather, data.custom.skinMother, data.custom.raceSkin, data.custom.faceMix or 0, data.custom.skinMix or 0, data.custom.raceMix or 0, false)
 
@@ -112,7 +116,15 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced)
     else
         model = data
         loadModel(model)
-        ped = CreatePed(0, model, coords.x, coords.y, coords.z - 1.03, coords.w, synced or false, false)
+        if gameName == "rdr3" then
+            ped = CreatePed(model, coords.x, coords.y, coords.z - 1.03, coords.w, synced or false, false)
+            SetEntityAlpha(ped, 0, false)
+            SetEntityVisible(ped, 1) -- SetEntityVisible
+            SetEntityAlpha(ped, 255, false) -- SetEntityAlpha
+            SetRandomOutfitVariation(ped, true) -- Invisible without
+        else
+            ped = CreatePed(0, model, coords.x, coords.y, coords.z - 1.03, coords.w, synced or false, false)
+        end
     end
 
     SetEntityInvincible(ped, true)
@@ -125,10 +137,19 @@ function makePed(data, coords, freeze, collision, scenario, anim, synced)
         loadAnimDict(anim[1])
         TaskPlayAnim(ped, anim[1], anim[2], 0.5, 1.0, -1, 1, 0.2, 0, 0, 0)
     end
-
+    if DoesEntityExist(ped) then
-    debugPrint("^6Bridge^7: ^1Ped ^2Created^7: '^6"..ped.."^7' | ^2Hash^7: ^7'^5"..(model).."^7' | ^2Coord^7: "..formatCoord(coords))
+        debugPrint("^6Bridge^7: ^1Ped ^2Created^7: '^6"..ped.."^7' | ^2Hash^7: ^7'^5"..(model).."^7' | ^2Coord^7: "..formatCoord(coords))
+    else
+        print("error ped")
+    end
     unloadModel(model)
-    Peds[#Peds + 1] = ped
+    Peds[keyGen()..keyGen()] = ped
+    if fade ~= false and gameName ~= "rdr3" then
+        SetEntityAlpha(ped, 0, false)
+        CreateThread(function()
+            fadeInEnt(ped)
+        end)
+    end
     return ped
 end
 
@@ -226,5 +247,19 @@ function GenerateRandomPedData(data)
     return newTable
 end
 
+onPlayerUnload(function()
+    for k in pairs(Peds) do
+        DeletePed(Peds[k])
+    end
+    for i = 1, #distPeds do
+        removeZoneTarget(distPeds[i])
+    end
+    distPeds = {}
+end)
+
 --- Cleans up all created Peds when the resource stops.
-onResourceStop(function() for i = 1, #Peds do DeletePed(Peds[i]) end end, true)
+onResourceStop(function()
+    for k in pairs(Peds) do
+        DeletePed(Peds[k])
+    end
+end, true)

shared/make/makeProp.lua

@@ -1,4 +1,5 @@
 local Props = {}
+local distProps = {}
 
 --- Creates a prop (object) in the game world at specified coordinates.
 ---
@@ -20,15 +21,21 @@ local Props = {}
 --- }
 --- local prop = makeProp(propData, true, false)
 --- ```
-function makeProp(data, freeze, synced)
+function makeProp(data, freeze, synced, fade)
     loadModel(data.prop)
     local prop = CreateObject(data.prop, data.coords.x, data.coords.y, data.coords.z-1.03, synced and synced or false, synced and synced or false, false)
-    SetEntityHeading(prop, data.coords.w + 180.0)
+    SetEntityHeading(prop, (data.coords.w or 0) + 180.0)
     FreezeEntityPosition(prop, freeze or false)
 
     debugPrint("^6Bridge^7: ^1Prop ^2Created^7: '^6"..prop.."^7' | ^2Hash^7: ^7'^6"..data.prop.."^7' | ^2Coord^7: "..formatCoord(data.coords))
     SetModelAsNoLongerNeeded(data.prop)
-    Props[#Props + 1] = prop
+    Props[keyGen()..keyGen()] = prop
+    if fade ~= false and gameName ~= "rdr3" then
+        SetEntityAlpha(prop, 0, false)
+        CreateThread(function()
+            fadeInEnt(prop)
+        end)
+    end
     return prop
 end
 
@@ -51,17 +58,21 @@ end
 --- }
 --- makeDistProp(propData, true, false)
 --- ```
-function makeDistProp(data, freeze, synced)
+function makeDistProp(data, freeze, synced, range, func)
-    local prop = nil
+    local name = keyGen()..keyGen()
-    createCirclePoly({
+    distProps[#distProps + 1] = createCirclePoly({
-        name = keyGen()..keyGen(),
+        name = name,
         coords = vec3(data.coords.x, data.coords.y, data.coords.z - 1.03),
-        radius = 50.0,
+        radius = range or 50.0,
         onEnter = function()
-            prop = makeProp(data, freeze, synced)
+            Props[name] = makeProp(data, freeze, synced)
+            if func then
+                func(Props[name])
+            end
         end,
         onExit = function()
-            destroyProp(prop)
+            destroyProp(Props[name])
+            Props[name] = nil
         end,
         debug = debugMode,
     })
@@ -86,5 +97,19 @@ function destroyProp(entity)
     end
 end
 
+onPlayerUnload(function()
+    for k in pairs(Props) do
+        DeleteObject(Props[k])
+    end
+    for i = 1, #distProps do
+        removeZoneTarget(distProps[i])
+    end
+    distProps = {}
+end)
+
 --- Cleans up all created props when the resource stops.
-onResourceStop(function() for i = 1, #Props do destroyProp(Props[i]) end end, true)
+onResourceStop(function()
+    for k in pairs(Props) do
+        destroyProp(Props[k])
+    end
+end, true)

shared/make/makeVeh.lua

@@ -13,58 +13,98 @@ local Vehicles = {}
 --- ```lua
 --- local vehicle = makeVeh('adder', vector4(123.4, 567.8, 90.1, 180.0))
 --- ```
-function makeVeh(model, coords)
+function makeVeh(model, coords, synced, fade)
 	loadModel(model)
-    local veh = CreateVehicle(model, coords.x, coords.y, coords.z, coords.w, true, false)
+    local veh = CreateVehicle(model, coords.x, coords.y, coords.z, coords.w, synced ~= false, false)
     SetVehicleHasBeenOwnedByPlayer(veh, true)
-    SetNetworkIdCanMigrate(NetworkGetNetworkIdFromEntity(veh), true)
+	if gameName ~= "rdr3" then
-	Wait(100)
+        SetNetworkIdCanMigrate(NetworkGetNetworkIdFromEntity(veh), true)
-    SetVehicleNeedsToBeHotwired(veh, false)
+		Wait(100)
-    SetVehRadioStation(veh, 'OFF')
+		SetVehicleNeedsToBeHotwired(veh, false)
-    SetVehicleFuelLevel(veh, 100.0)
+		SetVehRadioStation(veh, 'OFF')
-	SetVehicleModKit(veh, 0)
+		SetVehicleFuelLevel(veh, 100.0)
-	SetVehicleOnGroundProperly(veh)
+		SetVehicleModKit(veh, 0)
 
+	end
+	SetVehicleOnGroundProperly(veh)
 	debugPrint("^6Bridge^7: ^1Veh ^2Created^7: '^6"..veh.."^7' | ^2Hash^7: ^7'^6"..model.."^7' | ^2Coord^7: "..formatCoord(coords))
 	unloadModel(model)
 	Vehicles[#Vehicles + 1] = veh
+    if fade ~= false and gameName ~= "rdr3" then
+        SetEntityAlpha(veh, 0, false)
+        CreateThread(function()
+            fadeInEnt(veh)
+        end)
+    end
 	return veh
 end
 
---- Attempts to gain network control of a vehicle and set it as a mission entity.
+local distanceVehicles = {}
+--- Creates a vehicle that spawns when the player enters a designated polyzone area.
 ---
---- This function forces synchronization of a vehicle with other players by requesting network control and setting the vehicle as a mission entity.
+--- This function sets up a circular polyzone; when the player enters the zone, the vehicle is spawned,
+--- and when the player exits, the vehicle is deleted.
 ---
----@param entity number The handle of the vehicle entity to push.
+---@param data table A table containing vehicle data.
----
+--- - **vehicle** `string`: The model name or hash of the vehicle to spawn.
----@usage
+--- - **coords** `vector4`: The coordinates where the vehicle will be placed. Should include x, y, z, and w (heading).
---- ```lua
+---@param freeze boolean (optional) Whether to freeze the vehicle in place. Defaults to `false`.
---- pushVehicle(vehicle)
+---@param synced boolean (optional) Whether the vehicle should be synced across clients. Defaults to `false`.
---- ```
+function makeDistVehicle(data, radius, onEnter, onExit)
-function pushVehicle(entity)
+    local vehicle = nil
-	SetVehicleModKit(entity, 0)
+	local zoneId = keyGen() .. keyGen()
-	if entity ~= 0 and DoesEntityExist(entity) then
+    local zone = createCirclePoly({
-		if not NetworkHasControlOfEntity(entity) then
+        name = zoneId,
-			debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Requesting network control of vehicle^7.")
+        coords = vec3(data.coords.x, data.coords.y, data.coords.z),
-			NetworkRequestControlOfEntity(entity)
+        radius = radius,
-			local timeout = 2000
+        onEnter = function()
-			while timeout > 0 and not NetworkHasControlOfEntity(entity) do
+            vehicle = makeVeh(data.model, data.coords, false)
-				Wait(100)
+			if onEnter then
-				timeout -= 100
+				debugPrint("^6Bridge^7: ^4makeDistVehicle ^3onEnter^7() ^2running^7")
+				onEnter(vehicle)
 			end
-			if NetworkHasControlOfEntity(entity) then debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Network has control of entity^7.") end
+        end,
-		end
+        onExit = function()
-		if not IsEntityAMissionEntity(entity) then
+            deleteVehicle(vehicle)
-			debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Setting vehicle as a ^7'^2mission^7' ^2entity^7.")
+			if onExit then
-			SetEntityAsMissionEntity(entity, true, true)
+				debugPrint("^6Bridge^7: ^4makeDistVehicle ^3onExit^7() ^2running^7")
-			local timeout = 2000
+				onExit(vehicle)
-			while timeout > 0 and not IsEntityAMissionEntity(entity) do
-				Wait(100)
-				timeout -= 100
 			end
-			if IsEntityAMissionEntity(entity) then debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Vehicle is a ^7'^2mission^7'^2 entity^7.") end
+        end,
+        debug = debugMode,
+    })
+	distanceVehicles[zoneId] = { zone = zone, vehicle = vehicle }
+	return zoneId
+end
+
+--- Removes a specific distance-based vehicle spawning zone.
+---
+---@param zoneId string The unique identifier of the zone to remove.
+function removeDistVehicleZone(zoneId)
+    if distanceVehicles[zoneId].zone then
+        removePolyZone(distanceVehicles[zoneId].zone) -- Adjust this if your polyzone library uses a different removal method.
+        if distanceVehicles[zoneId].vehicle then
+			deleteVehicle(distanceVehicles[zoneId].vehicle)
 		end
-	end
+		distanceVehicles[zoneId] = nil
+        print("Removed polyzone for zoneId: " .. zoneId)
+    else
+        print("No zone found with zoneId: " .. zoneId)
+    end
+end
+
+--- Deletes a spawned vehicle.
+---
+---@param vehicle number The handle of the vehicle entity to delete.
+function deleteVehicle(vehicle)
+    if vehicle then
+        debugPrint("^6Bridge^7: ^2Destroying Vehicle^7: '^6" .. vehicle .. "^7'")
+        if IsEntityAttachedToEntity(vehicle, PlayerPedId()) then
+            SetEntityAsMissionEntity(vehicle)
+            DetachEntity(vehicle, true, true)
+        end
+        DeleteVehicle(vehicle)
+    end
 end
 
 --- Cleans up all created vehicles when the resource stops.

shared/make/progressBars.lua

@@ -1,4 +1,212 @@
 local inProgress = false
+local storedPID = nil
+
+
+local progressFunc = {
+    ox = {
+        start =
+            function(data)
+                local options = {
+                    duration = debugMode and 1000 or data.time,
+                    label = data.label,
+                    position = data.position or "bottom",
+                    useWhileDead = data.dead or false,
+                    canCancel = data.cancel or true,
+                    anim = {
+                        dict = data.dict,
+                        clip = data.anim,
+                        flag = (data.flag == 8 and 32 or data.flag) or nil,
+                        scenario = data.task
+                    },
+                    disable = {
+                        combat = data.combat or true,
+                        move = data.disableMovement or false,
+                        car = data.disableMovement or false,
+                        mouse = data.mouse or false
+                    },
+                }
+                if data.prop and data.prop.model then
+                    options.prop = {
+                        model = data.prop.model,
+                        pos = data.prop.pos or vec3(0, 0, 0),
+                        rot = data.prop.rot or vec3(0, 0, 0),
+                        bone = data.prop.bone or 0
+                    }
+                end
+                if data.propTwo and data.propTwo.model then
+                    options.propTwo = {
+                        model = data.propTwo.model,
+                        pos = data.propTwo.pos or vec3(0, 0, 0),
+                        rot = data.propTwo.rot or vec3(0, 0, 0),
+                        bone = data.propTwo.bone or 0
+                    }
+                end
+                if data.progressType == "circle" then
+                    if exports[OXLibExport]:progressCircle(options) then
+                        return true
+                    else
+                        return false
+                    end
+                end
+                if not data.progressType or data.progressType == "bar" then
+                    if exports[OXLibExport]:progressBar(options) then
+                        return true
+                    else
+                        print("^1progressBar was not successful")
+                    end
+                end
+            end,
+        stop =
+            function()
+                exports[OXLibExport]:cancelProgress()
+            end,
+    },
+
+    qb = {
+        start =
+            function(data)
+                local p = promise.new()
+                Core.Functions.Progressbar("progbar",
+                    data.label,
+                    debugMode and 1000 or data.time,
+                    data.dead or false,
+                    data.cancel or true,
+                    {
+                        disableMovement = data.disableMovement or false,
+                        disableCarMovement = data.disableMovement or false,
+                        disableMouse = data.disableMouse or false,
+                        disableCombat = data.disableCombat or true,
+                    },
+                    {
+                        animDict = data.dict,
+                        anim = data.anim,
+                        flags = data.flag or 32,
+                        task = data.task
+                    },
+                    {}, {},
+                    function() p:resolve(true) end,
+                    function() p:resolve(false) end,
+                data.icon)
+                return Citizen.Await(p)
+            end,
+        stop =
+            function()
+                TriggerEvent("progressbar:client:cancel")
+            end,
+    },
+
+    esx = {
+        start =
+            function(data)
+                local p = promise.new()
+                ESX.Progressbar(data.label, debugMode and 1000 or data.time, {
+                    FreezePlayer = true,
+                    animation = {
+                        type = data.anim,
+                        dict = data.dict,
+                        scenario = data.task,
+                    },
+                    onFinish = function()
+                        p:resolve(true)
+                    end,
+                    onCancel = function()
+                        p:resolve(false)
+                        return false
+                    end
+                })
+                return Citizen.Await(p)
+            end,
+        stop =
+            function()
+                ESX.CancelProgressbar()
+            end,
+    },
+
+    lation = {
+        start =
+            function(data)
+                if exports.lation_ui:progressBar({
+                    label = data.label,
+                    description = nil,
+                    duration = debugMode and 1000 or data.time,
+                    icon = data.icon,
+                    useWhileDead = data.dead or false,
+                    disable = {
+                        combat = data.combat or true,
+                        move = data.disableMovement or false,
+                        car = data.disableMovement or false,
+                    },
+                    anim = {
+                        dict = data.dict,
+                        clip = data.anim,
+                        flag = data.flag
+                    },
+                    prop = {
+                        model = data.prop and data.prop.model,
+                        pos = data.prop and (data.prop.pos or vec3(0, 0, 0)),
+                        rot = data.prop and (data.prop.rot or vec3(0, 0, 0)),
+                        bone = data.prop and (data.prop.bone or 0)
+                    }
+                }) then
+                    return true
+                else
+                    return false
+                end
+            end,
+        stop =
+            function()
+                exports.lation_ui:cancelProgress()
+            end,
+    },
+
+    red = {
+        start =
+            function(data)
+                if exports.jim_bridge:redProgressBar({
+                    label = data.label,
+                    time = debugMode and 1000 or data.time,
+                    dict = data.dict,
+                    anim = data.anim,
+                    flag = data.flag or 32,
+                    task = data.task,
+                    disableMovement = data.disableMovement or false,
+                    cancel = data.cancel or true,
+                }) then
+                    return true
+                else
+                    return false
+                end
+            end,
+        stop =
+            function()
+                exports.jim_bridge:stopProgressBar()
+            end,
+    },
+
+    gta = {
+        start =
+            function(data)
+                if exports.jim_bridge:gtaProgressBar({
+                    label = data.label,
+                    time = debugMode and 1000 or data.time,
+                    dict = data.dict,
+                    anim = data.anim,
+                    flag = data.flag or 32,
+                    task = data.task,
+                    disableMovement = data.disableMovement or false,
+                    cancel = data.cancel or true,
+                }) then
+                    return true
+                else
+                    return false
+                end
+            end,
+        stop =
+            function()
+                exports.jim_bridge:stopProgressBar()
+            end,
+    },
+}
 
 --- Displays a progress bar using the configured progress bar system.
 ---
@@ -33,7 +241,11 @@ local inProgress = false
 ---     cancel = true,
 --- })
 --- ```
+
+local progresssBarActive = false
 function progressBar(data)
+    if progresssBarActive then return else progresssBarActive = true end
+
     local ped = PlayerPedId()
     if data.shared then
         debugPrint("^6Bridge^7: ^6Sharing progressBar to player^7: ^6"..data.shared.pid.."^7")
@@ -42,132 +254,52 @@ function progressBar(data)
     end
     local result = nil
     if data.cam then startTempCam(data.cam) end
-    if Config.System.ProgressBar == "ox" then
-        if exports[OXLibExport]:progressBar({
-            duration = debugMode and 1000 or data.time,
-            label = data.label,
-            useWhileDead = data.dead or false,
-			canCancel = data.cancel and data.cancel or true,
-            anim = {
-                dict = data.dict,
-                clip = data.anim,
-                flag = (data.flag == 8 and 32 or data.flag) or nil,
-                scenario = data.task
-            },
-            disable = {
-                combat = true
-            },
-        }) then
-            result = true
-        else
-            result = false
-        end
 
-    elseif Config.System.ProgressBar == "qb" then
+    if progressFunc[Config.System.ProgressBar].start(data) then
-        Core.Functions.Progressbar("progbar",
+        result = true
-            data.label,
+    else
-            debugMode and 1000 or data.time,
+        result = false
-            data.dead or false,
-			data.cancel or true,
-            { disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true },
-            { animDict = data.dict, anim = data.anim, flags = data.flag or 32, task = data.task }, {}, {},
-            function()
-                result = true
-            end, function()
-                result = false
-            end, data.icon)
-
-    elseif Config.System.ProgressBar == "esx" then
-        ESX.Progressbar(data.label, debugMode and 1000 or data.time, {
-            FreezePlayer = true,
-            animation = {
-                type = data.anim,
-                dict = data.dict,
-                scenario = data.task,
-            },
-            onFinish = function()
-                result = true
-            end,
-            onCancel = function()
-                result = false
-            end
-        })
-
-    elseif Config.System.ProgressBar == "gta" then
-        local wait = debugMode and 1000 or data.time
-        inProgress = true
-        if not (data.dead or false) then
-            lockInv(true)
-            displaySpinner(data.label)
-            if data.dict then
-                playAnim(data.dict, data.anim, -1, (data.flag == 8 and 32 or data.flag) or nil)
-            end
-            if data.task then
-                TaskStartScenarioInPlace(ped, data.task, -1, true)
-            end
-            while inProgress and wait > 0 do
-                wait -= 15
-                local waitTimer = 0
-                DisablePlayerFiring(ped, true)
-                DisableControlAction(0, 25, true) -- Disable aim
-                DisableControlAction(0, 21, true) -- Disable sprint
-                DisableControlAction(0, 30, true) -- Disable move left/right
-                DisableControlAction(0, 31, true) -- Disable move forward/back
-                DisableControlAction(0, 36, true) -- Disable stealth
-                if data.cam ~= nil then
-                    DisableControlAction(0, 1, true)   -- Disable look left/right
-                    DisableControlAction(0, 2, true)   -- Disable look up/down
-                    DisableControlAction(0, 106, true) -- Disable vehicle mouse control
-                end
-                if data.cancel then
-                    if IsControlJustReleased(0, 202) or IsControlJustReleased(0, 77) then -- Cancel key (Backspace or Delete)
-                        inProgress = false
-                        waitTimer = 1500
-                        displaySpinner(Loc[Config.Lan].error["cancel"])
-                    end
-                end
-                Wait(waitTimer)
-            end
-            inProgress = false
-            if data.dict then stopAnim(data.dict, data.anim, ped) end
-            ClearPedTasks(ped)
-        end
-        stopSpinner()
-        result = (wait <= 0)
     end
 
-    while result == nil do Wait(10) end
+    while result == nil do
+        Wait(10)
+    end
+    debugPrint("^5Debug^7: ^2ProgressBar result^7: ^3"..tostring(result).."^7")
 
     -- Cleanup
     FreezeEntityPosition(ped, false)
     lockInv(false)
-    if data.cam then stopTempCam(data.cam) end
+    if data.cam then
+        stopTempCam(data.cam)
+    end
     if result == false and data.shared then
         debugPrint("^6Bridge^7: ^2Sending cancel to ^6"..storedPID.."^7")
         TriggerServerEvent(getScript().."server:sharedProg:cancel", storedPID)
     end
     storedPID = nil
+    if result == false then
+        currentToken = nil
+        TriggerServerEvent(getScript()..":clearAuthToken")
+    end
+    if result == true and data.request then
+        TriggerServerEvent(getScript()..":clearAuthToken")
+        currentToken = triggerCallback(AuthEvent)
+    end
+    progresssBarActive = false
     return result
 end
 
 --- Stops the current progress bar.
 ---
 --- This function cancels the progress bar based on the configured progress bar system, handling any necessary cleanup.
-function stopPropgressBar()
+function stopProgressBar()
-    if Config.System.ProgressBar == "ox" then
+    progressFunc[Config.System.ProgressBar].stop()
-        exports[OXLibExport]:cancelProgress()
+    progresssBarActive = false
-    elseif Config.System.ProgressBar == "qb" then
-        TriggerEvent("progressbar:client:cancel")
-    elseif Config.System.ProgressBar == "gta" then
-        inProgress = false
-        BusyspinnerOff()
-    end
 end
 
 -- System to handle sending/sharing progress bars between players --
 -- For example, healing someone --
 
-local storedPID = nil
 
 --- Server event handler for starting a shared progress bar.
 --- This event is triggered when a player wants to start a progress bar on another player.
@@ -201,9 +333,5 @@ end)
 --- This event is triggered when the server wants the client to cancel a shared progress bar.
 RegisterNetEvent(getScript()..":client:sharedProg:Cancel", function()
     debugPrint("^6Bridge^7: ^2Receiving cancel progressBar^7")
-    stopPropgressBar()
+    stopProgressBar()
 end)
-
---- Cleans up when the resource stops.
---- This event handler ensures that any active spinners or progress bars are stopped when the resource is stopped.
-onResourceStop(function() stopSpinner() end, true)

shared/metaHandlers.lua

@@ -0,0 +1,219 @@
+--[[
+    Player Metadata Utilities Module
+    ----------------------------------
+    This module provides functions for retrieving and setting metadata for players
+    across different frameworks (QB, ESX, OXCore). It also registers server callbacks
+    for getting and setting metadata.
+]]
+
+local metaDataFunc = {
+    {   framework = QBXExport,
+        GetPlayer =
+            function(src)
+                if src then
+                    return exports[QBXExport]:GetPlayer(src)
+                end
+                return exports[QBXExport]:GetPlayerData()
+            end,
+        GetPlayerMetadata =
+            function(Player, dataToCheck)
+                return Player.PlayerData.metadata[dataToCheck]
+            end,
+        SetPlayerMetadata =
+            function(Player, key, value)
+                return Player.Functions.SetMetaData(key, value)
+            end,
+    },
+
+    {   framework = QBExport,
+        GetPlayer =
+            function(src)
+                if src then
+                    return exports[QBExport]:GetCoreObject().Functions.GetPlayer(src)
+                end
+                local info = nil
+                Core.Functions.GetPlayerData(function(PlayerData) info = PlayerData end)
+                return info
+            end,
+        GetPlayerMetadata =
+            function(Player, dataToCheck)
+                return Player.PlayerData.metadata[dataToCheck]
+            end,
+        SetPlayerMetadata =
+            function(Player, key, value)
+                return Player.Functions.SetMetaData(key, value)
+            end,
+    },
+
+    {   framework = ESXExport,
+        GetPlayer =
+            function(src)
+                if src then
+                    return ESX.GetPlayerFromId(src)
+                end
+                return ESX.GetPlayerData()
+            end,
+        GetPlayerMetadata =
+            function(Player, dataToCheck)
+                return Player.getMeta(dataToCheck)
+            end,
+        SetPlayerMetadata =
+            function(Player, key, value)
+                return Player.set(key, value)
+            end,
+    },
+
+    {   framework = OXCoreExport,
+        GetPlayer =
+            function(src)
+                if src then
+                    return exports[OXCoreExport]:GetPlayer(src)
+                end
+                return {}
+            end,
+        GetPlayerMetadata =
+            function(Player, dataToCheck)
+                return Player.get(dataToCheck)
+            end,
+        SetPlayerMetadata =
+            function(Player, key, value)
+                return Player.set(key, value)
+            end,
+    },
+
+    {   framework = RSGExport,
+        GetPlayer =
+            function(src)
+                if src then
+                    return exports[RSGExport]:GetCoreObject().Functions.GetPlayer(src)
+                end
+                local info = nil
+                Core.Functions.GetPlayerData(function(PlayerData) info = PlayerData end)
+                return info
+            end,
+        GetPlayerMetadata = function(Player, dataToCheck)
+            return Player.PlayerData.metadata[dataToCheck]
+        end,
+        SetPlayerMetadata = function(Player, key, value)
+            return Player.Functions.SetMetaData(key, value)
+        end,
+    },
+
+}
+
+
+-------------------------------------------------------------
+-- Player Retrieval
+-------------------------------------------------------------
+
+--- Retrieves the player object using the active core export.
+---
+--- @param source number The server ID of the player.
+--- @return table|nil table The player object, or nil if no supported core is detected.
+---
+--- @usage
+--- ```lua
+--- local player = GetPlayer(playerId)
+--- ```
+function GetPlayer(source)
+    for i = 1, #metaDataFunc do
+        local framework = metaDataFunc[i]
+        if isStarted(framework.framework) then
+            return framework.GetPlayer(source)
+        end
+    end
+    return nil
+end
+
+-------------------------------------------------------------
+-- Metadata Retrieval
+-------------------------------------------------------------
+
+--- Retrieves metadata from a player object.
+---
+--- If called client-side (player is nil), it triggers a server callback to retrieve metadata.
+---
+--- @param player table|nil The player object; if nil, metadata is retrieved via a server callback.
+--- @param key string The metadata key to retrieve.
+--- @return any The value of the requested metadata, or nil if not found.
+---
+--- @usage
+--- ```lua
+--- local myMeta = getPlayerMetadata(player, "myKey")
+--- ```
+function getPlayerMetadata(player, key)
+    -- Assume this is client side and callback to server to get the data
+    if not player then
+        debugPrint("^6Bridge^7: ^3GetMetadata^7() calling server: "..key)
+        return triggerCallback(getScript()..":server:GetMetadata", key)
+    else
+        -- else grab server metadata about the player
+        for i = 1, #metaDataFunc do
+            local framework = metaDataFunc[i]
+            if isStarted(framework.framework) then
+
+                debugPrint("^6Bridge^7: ^3GetMetadata^7() ^3"..framework.framework.."^7", key)
+                return framework.GetPlayerMetadata(player, key)
+            end
+        end
+    end
+    return nil
+end
+
+-- Register a server callback for retrieving metadata.
+createCallback(getScript()..":server:GetMetadata", function(source, key)
+    debugPrint("^6Bridge^7: ^3GetMetadata Callback^7 from source: "..tostring(source)..", key: "..tostring(key))
+    local player = GetPlayer(source)
+    if not player then
+        print("Error getting metadata: player not found for source "..tostring(source))
+        return
+    end
+
+    if type(key) == "table" then
+        local Metadata = {}
+        for _, k in ipairs(key) do
+            Metadata[k] = getPlayerMetadata(player, k)
+        end
+        return Metadata
+    elseif type(key) == "string" then
+        return getPlayerMetadata(player, key)
+    end
+end)
+
+-------------------------------------------------------------
+-- Metadata Setting
+-------------------------------------------------------------
+
+--- Sets metadata on a player object.
+---
+--- The function updates the player's metadata using the active core export.
+---
+--- @param player table The player object.
+--- @param key string The metadata key to set.
+--- @param value any The new value for the metadata key.
+---
+--- @usage
+--- ```lua
+--- setPlayerMetadata(player, "myKey", "newValue")
+--- ```
+function setPlayerMetadata(player, key, value)
+    debugPrint("^6Bridge^7: ^3SetMetadata^7() setting metadata^7...")
+    for i = 1, #metaDataFunc do
+        local framework = metaDataFunc[i]
+        if isStarted(framework.framework) then
+            debugPrint("^6Bridge^7: ^3SetMetadata^7() ^3"..framework.framework.."^7", key, value)
+            return framework.GetPlayerMetadata(player, key)
+        end
+    end
+    debugPrint("^6Bridge^7: ^1Error setting metadata^7, ^1framework not supported^7?")
+end
+
+-- Register a server callback for setting metadata.
+createCallback(getScript()..":server:setPlayerMetadata", function(source, key, value)
+    local src = source
+    debugPrint("SetMetadata callback triggered for source:", src, "key:", key, "value:", value)
+    local player = GetPlayer(src)
+    setPlayerMetadata(player, key, value)
+    print("Metadata set successfully.", key)
+    return true
+end)

shared/notify.lua

@@ -1,18 +1,108 @@
--- NOTIFICATIONS --
+--[[
--- This function is widely used to display notifications to the player, can be used server side or client side --
+    Notifications Module
+    ----------------------
+    This module provides a unified interface for displaying notifications using various
+    notification systems. The active system is determined by the Config.System.Notify setting.
 
+    Supported systems include:
+      • okok
+      • qb
+      • ox
+      • red (default)
+      • gta (default)
+      • lation
+      • esx
+]]
+
+local notifyFunc = {
+    okok = {
+        client =
+            function(title, message, type)
+                TriggerEvent('okokNotify:Alert', title, message, 6000, type)
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent('okokNotify:Alert', src, title, message, 6000, type)
+            end,
+    },
+
+    qb = {
+        client =
+            function(title, message, type)
+                TriggerEvent("QBCore:Notify", message, type)
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent("QBCore:Notify", src, message, type)
+            end,
+    },
+
+    ox = {
+        client =
+            function(title, message, type)
+                exports.ox_lib:notify({ title = title, description = message, type = type or "success" })
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent('ox_lib:notify', src, { title = title, description = message, type = type or "success" })
+            end,
+    },
+
+    esx = {
+        client =
+            function(title, message, type)
+                exports["esx_notify"]:Notify(type, 4000, message)
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent(getScript()..":DisplayESXNotify", src, type, message)
+            end,
+    },
+
+    lation = {
+        client =
+            function(title, message, type)
+                exports.lation_ui:notify({ title = title, message = message, type = type or "success", })
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent("lation_ui:notify", src, { title = title, message = message, type = type or "success", })
+            end,
+    },
+
+    gta = {
+        client =
+            function(title, message, type)
+                exports.jim_bridge:Notify(title, message, type)
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent("jim-bridge:Notify", src, title, message, type)
+            end,
+    },
+
+    red = {
+        client =
+            function(title, message, type)
+                TriggerEvent("jim-redui:Notify", title, message, type)
+            end,
+        server =
+            function(title, message, type, src)
+                TriggerClientEvent("jim-redui:Notify", src, title, message, type)
+            end,
+    },
+}
 --- Displays notifications to the player using the configured notification system.
 ---
---- This function supports multiple notification systems based on the `Config.System.Notify` setting.
+--- Supports multiple notification systems based on Config.System.Notify. Can be triggered from both
---- It can be triggered from both client-side and server-side scripts. Depending on the configuration,
+--- client and server contexts.
---- it utilizes different exports or events to display the notification.
 ---
----@param title string|nil The title of the notification. Optional, used by certain notification systems.
+--- @param title string|nil The notification title (optional for some systems).
----@param message string The main message content of the notification.
+--- @param message string The main message content.
----@param type string The type/category of the notification (e.g., "success", "error", "info").
+--- @param type string The notification type ("success", "error", "info").
----@param src number|nil Optional. The server ID of the player to send the notification to. If `nil`, the notification is sent to the caller.
+--- @param src number|nil Optional server ID; if provided, the notification is sent to that player.
 ---
----@usage
+--- @usage
 --- ```lua
 --- -- Client-side usage without specifying a player (shows to the current player)
 --- triggerNotify("Success", "You have completed the task!", "success")
@@ -21,68 +111,68 @@
 --- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId)
 --- ```
 function triggerNotify(title, message, type, src)
-	if Config.System.Notify == "okok" then
+    if not Config.System?.Notify then debugPrint("Notify triggered but not set up") return end
-		if not src then TriggerEvent('okokNotify:Alert', title, message, 6000, type)
+
-		else TriggerClientEvent('okokNotify:Alert', src, title, message, 6000, type) end
+    if src then
-	elseif Config.System.Notify == "qb" then
+        notifyFunc[Config.System.Notify].server(title, message, type, src)
-		if not src then	TriggerEvent("QBCore:Notify", message, type)
+    else
-		else TriggerClientEvent("QBCore:Notify", src, message, type) end
+        notifyFunc[Config.System.Notify].client(title, message, type)
-	elseif Config.System.Notify == "ox" then
+    end
-		if not src then TriggerEvent('ox_lib:notify', {title = title, description = message, type = type or "success"})
-		else TriggerClientEvent('ox_lib:notify', src, { type = type or "success", title = title, description = message }) end
-	elseif Config.System.Notify == "gta" then
-		if not src then TriggerEvent(getScript()..":DisplayGTANotify", title, message)
-		else TriggerClientEvent(getScript()..":DisplayGTANotify", src, title, message) end
-    elseif Config.System.Notify == "esx" then
-		if not src then exports["esx_notify"]:Notify(type, 4000, message)
-		else TriggerClientEvent(getScript()..":DisplayESXNotify", src, type, title, message) end
-	end
 end
 
+-------------------------------------------------------------
+-- ESX Notifications
+-------------------------------------------------------------
+
 --- Registers a server-side event to display ESX notifications to clients.
 ---
---- This event listens for `DisplayESXNotify` and triggers the ESX notification on the client side.
+--- Listens for DisplayESXNotify events and triggers the ESX notification on the client.
 ---
---- @param type string The type/category of the notification (e.g., "success", "error", "info").
+--- @param type string The notification type.
---- @param title string The title of the notification.
+--- @param text string The notification message.
---- @param text string The main message content of the notification.
 ---
 --- @usage
 --- ```lua
---- -- Server-side event trigger
+--- TriggerClientEvent(getScript()..":DisplayESXNotify", playerId, "success", "New achievement unlocked!")
---- TriggerClientEvent(getScript()..":DisplayESXNotify", playerId, "success", "Achievement Unlocked", "You have unlocked a new achievement!")
 --- ```
-RegisterNetEvent(getScript()..":DisplayESXNotify", function(type, title, text)
+RegisterNetEvent(getScript()..":DisplayESXNotify", function(type, text)
     exports["esx_notify"]:Notify(type, 4000, text)
 end)
 
---- Displays default GTA-style text notifications.
+-------------------------------------------------------------
+-- GTA-style Notifications
+-------------------------------------------------------------
+
+--- Displays GTA-style text notifications using native GTA functions.
 ---
---- This event handles displaying text-based notifications using GTA's native functions.
+--- Selects an appropriate icon based on the current script (if applicable) and renders the notification.
---- It supports specific scenarios by assigning different icons based on the script name.
 ---
----@param title string The title or identifier for the notification, used to select the appropriate icon.
+--- @param title string The notification title/identifier (used to select an icon).
----@param text string The main message content of the notification.
+--- @param text string The notification message.
 ---
----@usage
+--- @usage
 --- ```lua
---- -- Client-side event trigger
 --- TriggerEvent(getScript()..":DisplayGTANotify", "taxiname", "Taxi service has arrived.")
 --- ```
-RegisterNetEvent(getScript()..":DisplayGTANotify", function(title, text)
+--RegisterNetEvent(getScript()..":DisplayGTANotify", function(title, text)
-    local iconTable = {}
+--    local iconTable = {}
-    if getScript() == "jim-npcservice" then
+--    if getScript() == "jim-npcservice" then
-        iconTable = {
+--        iconTable = {
-            [Loc[Config.Lan].notify["taxiname"]] = "CHAR_TAXI",
+--            [Loc[Config.Lan].notify["taxiname"]] = "CHAR_TAXI",
-            [Loc[Config.Lan].notify["limoname"]] = "CHAR_CASINO",
+--            [Loc[Config.Lan].notify["limoname"]] = "CHAR_CASINO",
-            [Loc[Config.Lan].notify["ambiname"]] = "CHAR_CALL911",
+--            [Loc[Config.Lan].notify["ambiname"]] = "CHAR_CALL911",
-            [Loc[Config.Lan].notify["pilotname"]] = "CHAR_DEFAULT",
+--            [Loc[Config.Lan].notify["pilotname"]] = "CHAR_DEFAULT",
-            [Loc[Config.Lan].notify["planename"]] = "CHAR_BOATSITE2",
+--            [Loc[Config.Lan].notify["planename"]] = "CHAR_BOATSITE2",
-            [Loc[Config.Lan].notify["heliname"]] = "CHAR_BOATSITE2",
+--            [Loc[Config.Lan].notify["heliname"]] = "CHAR_BOATSITE2",
-        }
+--        }
-    end
+--    end
-    BeginTextCommandThefeedPost("STRING")
+--
-    AddTextComponentSubstringKeyboardDisplay(text)
+--    BeginTextCommandThefeedPost("STRING")
-    EndTextCommandThefeedPostMessagetext(iconTable[title] or "CHAR_DEFAULT", iconTable[title] or "CHAR_DEFAULT", true, 1, title, nil, text)
+--    AddTextComponentSubstringKeyboardDisplay(text)
-    EndTextCommandThefeedPostTicker(true, false)
+--    EndTextCommandThefeedPostMessagetext(
-end)
+--        iconTable[title] or "CHAR_DEFAULT",
+--        iconTable[title] or "CHAR_DEFAULT",
+--        true, 1, title, nil, text
+--    )
+--    EndTextCommandThefeedPostTicker(true, false)
+--end)

shared/phones.lua

@@ -0,0 +1,245 @@
+--[[
+    Phone Mails Module
+    ------------------
+    This module handles sending phone mails using different phone systems.
+    Supported systems include:
+      - gksphone
+      - yflip-phone
+      - roadphone
+      - lb-phone
+      - qb-phone
+      - jpr-phonesystem
+]]
+
+local phoneFunc = {
+    {   phone = "gksphone",
+        sendMail = function(mailData)
+            exports["gksphone"]:SendNewMail(mailData)
+        end,
+        sendInvoice =
+            function(mailData)
+                -- Defensive check for required fields
+                local required = { "billedCitizenid", "amount", "job", "name", "billerCitizenid", "label" }
+                for _, field in ipairs(required) do
+                    if mailData[field] == nil then
+                        print("^1[jim-payments] ERROR:^0 Missing field '" .. field .. "' in mailData")
+                        return
+                    end
+                end
+
+                MySQL.Async.execute(
+                    'INSERT INTO gksphone_invoices (citizenid, amount, society, sender, sendercitizenid, label) VALUES (@citizenid, @amount, @society, @sender, @sendercitizenid, @label)',
+                    {
+                        ['@citizenid'] = mailData.billedCitizenid,
+                        ['@amount'] = mailData.amount,
+                        ['@society'] = mailData.job,
+                        ['@sender'] = mailData.name,
+                        ['@sendercitizenid'] = mailData.billerCitizenid,
+                        ['@label'] = mailData.label
+                    }
+                )
+            end,
+    },
+
+    {   phone = "yflip-phone",
+        sendMail =
+            function(mailData)
+                TriggerServerEvent(getScript()..":yflip:SendMail", mailData)
+            end,
+    },
+
+    {   phone = "roadphone",
+        sendMail =
+            function(mailData)
+                -- Convert HTML line breaks to newlines for roadphone.
+                mailData.message = mailData.message:gsub("%<br>", "\n")
+                exports["roadphone"]:sendMail(mailData)
+            end,
+    },
+
+    {   phone = "lb-phone",
+        sendMail =
+            function(mailData)
+                -- Convert HTML line breaks to newlines for lb-phone.
+                mailData.message = mailData.message:gsub("%<br>", "\n")
+                TriggerServerEvent(getScript()..":lbphone:SendMail", mailData)
+            end,
+    },
+
+    {   phone = "qb-phone",
+        sendMail =
+            function(mailData)
+                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
+            end,
+        sendInvoice =
+            function(mailData)
+                -- Defensive check for required fields
+                local required = { "billedCitizenid", "amount", "job", "name", "billerCitizenid", "src" }
+                for _, field in ipairs(required) do
+                    if mailData[field] == nil then
+                        print("^1[jim-payments] ERROR:^0 Missing field '" .. field .. "' in mailData")
+                        return
+                    end
+                end
+
+                -- Safe insert with all parameters present
+                MySQL.Async.insert(
+                    'INSERT INTO phone_invoices (citizenid, amount, society, sender, sendercitizenid) VALUES (?, ?, ?, ?, ?)',
+                    {
+                        mailData.billedCitizenid,
+                        mailData.amount,
+                        mailData.job,
+                        mailData.name,
+                        mailData.billerCitizenid
+                    },
+                    function(id)
+                        if id then
+                            TriggerClientEvent('qb-phone:client:AcceptorDenyInvoice', mailData.src, id, mailData.name, mailData.job, mailData.billerCitizenid, mailData.amount, GetInvokingResource())
+                        end
+                    end
+                )
+                TriggerClientEvent('qb-phone:RefreshPhone', mailData.src)
+            end,
+    },
+
+    {   phone = "npwd_qbx_mail",
+        sendMail =
+            function(mailData)
+                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
+            end,
+    },
+
+    {   phone = "jpr-phonesystem",
+        sendMail =
+            function(mailData)
+                TriggerServerEvent(getScript()..":jpr:SendMail", mailData)
+            end,
+    },
+
+    {   phone = "ef-phone",
+        sendMail =
+            function(mailData)
+                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
+            end,
+    },
+
+}
+
+
+--- Sends a phone mail using the detected phone system.
+--- The function iterates through a prioritized list of supported phone systems.
+--- Once an active system is found (via `isStarted`), the corresponding mail function is executed.
+---
+--- @param data table A table containing the mail data.
+---   - subject (string): The email subject.
+---   - sender (string): The sender identifier.
+---   - message (string): The email body content.
+---   - actions (table|nil): Optional action buttons for the email.
+--- @usage
+--- sendPhoneMail({
+---     subject = "Welcome!",
+---     sender = "Admin",
+---     message = "Thank you for joining our server.",
+---     actions = {
+---         { label = "Reply", action = replyFunction }
+---     }
+--- })
+function sendPhoneMail(mailData)
+    -- Check each phone system in order and use the first active one.
+    for i = 1, #phoneFunc do
+        local script = phoneFunc[i]
+        if isStarted(script.phone) and script.sendMail then
+            debugPrint("^6Bridge^7[^3"..script.phone.."^7]: ^2Sending mail to player")
+            script.sendMail(mailData)
+            return true
+        end
+    end
+    print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7- ^2No supported phone found")
+    return false
+end
+
+function sendPhoneInvoice(data)
+    if not data.src then return end
+
+    -- Check each phone system in order and use the first active one.
+
+    for i = 1, #phoneFunc do
+        local script = phoneFunc[i]
+        if isStarted(script.phone) and script.sendInvoice then
+            debugPrint("^6Bridge^7[^3"..script.phone.."^7]: ^2Sending mail to player^7", data.src)
+            script.sendInvoice(data)
+            return true
+        end
+    end
+    print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7- ^2No supported phone found")
+    return false
+end
+-------------------------------------------------------------
+-- Phone System Event Handlers
+-------------------------------------------------------------
+
+--- Handles sending mail for lb-phone.
+--- Listens for the `lbphone:SendMail` event and sends an email using lb-phone's API.
+---
+--- @event lbphone:SendMail
+--- @param data table The mail data.
+---   - subject (string): The email subject.
+---   - message (string): The email content.
+---   - buttons (table|nil): Optional action buttons (mapped from data.actions if present).
+RegisterNetEvent(getScript()..":lbphone:SendMail", function(data)
+    local src = source
+    local phoneNumber = exports["lb-phone"]:GetEquippedPhoneNumber(src)
+    local emailAddress = exports["lb-phone"]:GetEmailAddress(phoneNumber)
+    -- Map actions to buttons if provided.
+    data.buttons = data.actions or data.buttons
+
+    exports["lb-phone"]:SendMail({
+        to = emailAddress,
+        subject = data.subject,
+        message = data.message,
+        actions = data.buttons,
+    })
+end)
+
+--- Handles sending mail for yflip-phone.
+--- Listens for the `yflip:SendMail` event and sends an email using yflip-phone's API.
+---
+--- @event yflip:SendMail
+--- @param data table The mail data.
+---   - subject (string): The email subject.
+---   - sender (string): The sender identifier.
+---   - message (string): The email content.
+---   - buttons (table|nil): Optional action buttons.
+RegisterNetEvent(getScript()..":yflip:SendMail", function(data)
+    local src = source
+    exports["yflip-phone"]:SendMail({
+        title = data.subject,
+        sender = data.sender,
+        senderDisplayName = data.sender,
+        content = data.message,
+        actions = data.buttons,
+    }, 'source', src)
+end)
+
+--- Handles sending mail for jpr-phonesystem.
+--- Listens for the `jpr:SendMail` event and sends an email using jpr-phonesystem's API.
+---
+--- @event jpr:SendMail
+--- @param data table The mail data.
+---   - subject (string): The email subject.
+---   - sender (string): The sender identifier.
+---   - message (string): The email content.
+---   - buttons (table|nil): Optional action buttons.
+RegisterNetEvent(getScript()..":jpr:SendMail", function(data)
+    local src = source
+    local Player = Core.Functions.GetPlayer(src)
+    TriggerEvent('jpr-phonesystem:server:sendEmail', {
+        Assunto = data.subject,                     -- Email subject
+        Conteudo = data.message,                    -- Email content
+        Enviado = data.sender,                      -- Sender information
+        Destinatario = Player.PlayerData.citizenid, -- Recipient identifier
+        Event = {},                                 -- Optional event details
+    })
+
+end)
+

shared/polyZone.lua

@@ -1,67 +1,139 @@
--- This automatically detects what polyzone script it should use to create a polyzone --
+--[[
--- if ox_lib is detected, it will automatically use that instead of PolyZone --
+    PolyZone Management Module
--- createPoly({ name = 'name', debug = true, points = { vec2(), vec2() }, onEnter = function() end, onExit = function() end, })
+    ----------------------------
----
+    This module automatically detects the available polyzone library (ox_lib or PolyZone)
+    and creates polygonal and circular zones accordingly. It also provides a function to remove
+    previously created zones.
+
+    Functions:
+      • createPoly(data)       - Creates a polygonal zone.
+      • createCirclePoly(data) - Creates a circular zone.
+      • removePolyZone(Location) - Removes a created zone.
+]]
+
+
+local polyCreation = {
+    {
+        polyZoneScript = OXLibExport,
+        createPoly = function(data)
+            data.minZ = data.minZ or -20.0
+            data.maxZ = data.maxZ or 1000.0
+            data.thickness = ((data.maxZ / 2) - (data.minZ / 2)) * 2
+
+            local mid = data.maxZ - ((data.maxZ / 2) - (data.minZ / 2))
+            for i = 1, #data.points do
+                data.points[i] = vec3(data.points[i].x, data.points[i].y, mid)
+            end
+
+            return lib.zones.poly(data)
+        end,
+        createCircle = function(data)
+            return lib.zones.sphere(data)
+        end,
+        removeZone = function(Location)
+            Location:remove()
+        end,
+    },
+    {
+        polyZoneScript = "PolyZone",
+        createPoly = function(data)
+            local zone = PolyZone:Create(data.points, {
+                name = data.name,
+                minZ = data.minZ or nil,
+                maxZ = data.maxZ or nil,
+                debugPoly = data.debug
+            })
+            zone:onPlayerInOut(function(isPointInside)
+                if isPointInside then
+                    data.onEnter()
+                else
+                    data.onExit()
+                end
+            end)
+            return zone
+        end,
+        createCircle = function(data)
+            local zone = CircleZone:Create(data.coords, data.radius, {
+                name = data.name,
+                debugPoly = data.debug
+            })
+            zone:onPlayerInOut(function(isPointInside)
+                if isPointInside then
+                    data.onEnter()
+                else
+                    data.onExit()
+                end
+            end)
+            return zone
+        end,
+        removeZone = function(Location)
+            Location:destroy()
+        end,
+    }
+
+}
+
+-------------------------------------------------------------
+-- Polygonal Zone Creation
+-------------------------------------------------------------
+
 --- Creates a polygonal zone using the detected polyzone library (ox_lib or PolyZone).
 ---
---- This function automatically detects whether `ox_lib` or `PolyZone` is active and creates a polygonal zone accordingly.
+--- Automatically checks which polyzone script is active. When using ox_lib, it converts the provided
---- It supports setting up entry and exit callbacks for the zone.
+--- 2D points to 3D (setting a constant z value) and sets a thickness value. For PolyZone, it creates the zone
+--- and attaches onEnter and onExit callbacks.
 ---
----@param data table A table containing the zone configuration.
+--- @param data table Zone configuration table with the following keys:
---- - **name** (`string`): The name of the zone.
+---     - name (string): The zone's identifier.
---- - **debug** (`boolean`): Whether to enable debug mode for the zone.
+---     - debug (boolean): Whether debug mode is enabled.
---- - **points** (`table`): A list of `vec2` points defining the polygon.
+---     - points (table): A list of vec2 points defining the polygon.
---- - **onEnter** (`function`): Callback function to execute when a player enters the zone.
+---     - onEnter (function): Callback when a player enters the zone.
---- - **onExit** (`function`): Callback function to execute when a player exits the zone.
+---     - onExit (function): Callback when a player exits the zone.
 ---
----@return table|nil table Returns the created zone object or `nil` if creation failed.
+--- @return table|nil table Returns the created zone object or nil if creation failed.
 ---
 ---@usage
---- ```lua
+---```lua
---- createPoly({
+---createPoly({
----     name = 'testZone',
+---    name = 'testZone',
----     debug = true,
+---    debug = true,
----     points = { vec2(100.0, 100.0), vec2(200.0, 100.0), vec2(200.0, 200.0), vec2(100.0, 200.0) },
+---    points = { vec2(100.0, 100.0), vec2(200.0, 100.0), vec2(200.0, 200.0), vec2(100.0, 200.0) },
----     onEnter = function() print("Entered Test Zone") end,
+---    onEnter = function() print("Entered Test Zone") end,
----     onExit = function() print("Exited Test Zone") end,
+---    onExit = function() print("Exited Test Zone") end,
---- })
+---})
---- ```
+---```
 function createPoly(data)
-    local Location = nil
+    for i = 1, #polyCreation do
-    if isStarted(OXLibExport) then -- if it finds ox_lib, use it instead of PolyZone
+        local script = polyCreation[i]
-        debugPrint("^6Bridge^7: ^2Creating new poly with ^7'^4"..OXLibExport.."^7': "..data.name)
+        if isStarted(script.polyZoneScript) then
-        for i = 1, #data.points do
+            debugPrint("^6Bridge^7: ^2Creating new poly with ^7'^4"..script.polyZoneScript.."^7': "..data.name)
-            data.points[i] = vec3(data.points[i].x, data.points[i].y, 12.0)
+            return script.createPoly(data)
         end
-        data.thickness = 1000
-        Location = lib.zones.poly(data)
-    elseif isStarted("PolyZone") then
-        debugPrint("^6Bridge^7: ^2Creating new poly with ^7'^4PolyZone^7': "..data.name)
-        Location = PolyZone:Create(data.points, { name = data.name, debugPoly = data.debug })
-        Location:onPlayerInOut(function(isPointInside)
-            if isPointInside then data.onEnter() else data.onExit() end
-        end)
-    else
-        print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7")
     end
-    return Location
+
+    print("^4ERROR^7: ^2No PolyZone creation script detected ^7")
+    return nil
 end
 
+-------------------------------------------------------------
+-- Circular Zone Creation
+-------------------------------------------------------------
+
 --- Creates a circular zone using the detected polyzone library (ox_lib or PolyZone).
 ---
---- This function automatically detects whether `ox_lib` or `PolyZone` is active and creates a circular zone accordingly.
+--- When using ox_lib, it creates a sphere zone. For PolyZone, it creates a CircleZone and attaches
---- It supports setting up entry and exit callbacks for the zone.
+--- onEnter and onExit callbacks.
 ---
----@param data table A table containing the circular zone configuration.
+--- @param data table Zone configuration with the following keys:
---- - **name** (`string`): The name of the circular zone.
+---     - name (string): The zone's identifier.
---- - **coords** (`vector3`): The center coordinates of the circle.
+---     - coords (vector3): The center of the circle.
---- - **radius** (`number`): The radius of the circle.
+---     - radius (number): The radius of the circle.
---- - **onEnter** (`function`): Callback function to execute when a player enters the zone.
+---     - onEnter (function): Callback when a player enters the zone.
---- - **onExit** (`function`): Callback function to execute when a player exits the zone.
+---     - onExit (function): Callback when a player exits the zone.
 ---
----@return table|nil table Returns the created circular zone object or `nil` if creation failed.
+--- @return table|nil table Returns the created circular zone object or nil if creation failed.
 ---
----@usage
+--- @usage
 --- ```lua
 --- createCirclePoly({
 ---     name = 'circleZone',
@@ -72,45 +144,42 @@ end
 --- })
 --- ```
 function createCirclePoly(data)
-    local Location = nil
+    for i = 1, #polyCreation do
-    if isStarted(OXLibExport) then -- if it finds ox_lib, use it instead of PolyZone
+        local script = polyCreation[i]
-        debugPrint("^6Bridge^7: ^2Creating new ^3Cricle^2 poly with ^7"..OXLibExport.." "..data.name)
+        if isStarted(script.polyZoneScript) then
-        Location = lib.zones.sphere(data)
+            debugPrint("^6Bridge^7: ^2Creating new ^3Cricle^2 poly with ^7"..script.polyZoneScript.." "..data.name)
-    elseif isStarted("PolyZone") then
+            debugPrint("^6Bridge^7: ^2Zone Stats - Coords: "..formatCoord(data.coords).." Radius: "..data.radius)
-        debugPrint("^6Bridge^7: ^2Creating new ^3Cricle^2 poly with ^7PolyZone ".. data.name)
+            return script.createCircle(data)
-        Location = CircleZone:Create(data.coords, data.radius, { name = data.name, debugPoly = debugMode })
+        end
-        Location:onPlayerInOut(function(isPointInside)
-            if isPointInside then
-                data.onEnter()
-            else
-                data.onExit()
-            end
-        end)
-    else
-        print("^4ERROR^7: ^2No PolyZone creation script detected ^7- ^2Check ^3exports^1.^2lua^7")
     end
-    debugPrint("^6Bridge^7: ^2Zone Stats - Coords: "..formatCoord(data.coords).." Radius: "..data.radius)
+
-    return Location
+    print("^4ERROR^7: ^2No PolyZone creation script detected ^7")
+    return nil
 end
 
+-------------------------------------------------------------
+-- PolyZone Removal Function
+-------------------------------------------------------------
+
 --- Removes a previously created polyzone.
 ---
---- This function detects the active polyzone library (`ox_lib` or `PolyZone`) and removes the specified zone accordingly.
+--- Detects the active polyzone library and calls the appropriate removal method.
 ---
 --- @param Location table The zone object to be removed.
 ---
 --- @usage
 --- ```lua
 --- local zone = createPoly({...})
---- -- Later in the code
+---
 --- removePolyZone(zone)
 --- ```
 function removePolyZone(Location)
-    if isStarted(OXLibExport) then -- if it finds ox_lib, use it instead of PolyZone
+    for i = 1, #polyCreation do
-        debugPrint("^6Bridge^7: ^2Removing ^2poly with ^7"..OXLibExport)
+        local script = polyCreation[i]
-        Location:remove()
+        if isStarted(script.polyZoneScript) then
-    elseif isStarted("PolyZone") then
+            debugPrint("^6Bridge^7: ^2Removing ^3"..script.polyZoneScript.." ^2Zone^7")
-        debugPrint("^6Bridge^7: ^2poly with ^7PolyZone")
+            script.removeZone(Location)
-        Location:destroy()
+            break
+        end
     end
 end

shared/scaleforms.lua

@@ -1,61 +0,0 @@
-function makeInstructionalButtons(info)
-    local build = RequestScaleformMovie("instructional_buttons")
-    while not HasScaleformMovieLoaded(build) do Wait(0) end
-
-    DrawScaleformMovieFullscreen(build, 255, 255, 255, 0, 0)
-    BeginScaleformMovieMethod(build, "CLEAR_ALL")
-    EndScaleformMovieMethod()
-    BeginScaleformMovieMethod(build, "SET_CLEAR_SPACE")
-    ScaleformMovieMethodAddParamInt(200)
-    EndScaleformMovieMethod()
-
-    for i = 1, #info do
-        BeginScaleformMovieMethod(build, "SET_DATA_SLOT")
-        ScaleformMovieMethodAddParamInt(i - 1)
-        for k = 1, #info[i].keys do
-            ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(2, info[i].keys[k], true))
-        end
-        BeginTextCommandScaleformString("STRING")
-        AddTextComponentSubstringKeyboardDisplay(info[i].text)
-        EndTextCommandScaleformString()
-        EndScaleformMovieMethod()
-    end
-
-    BeginScaleformMovieMethod(build, "DRAW_INSTRUCTIONAL_BUTTONS")
-    EndScaleformMovieMethod()
-    BeginScaleformMovieMethod(build, "SET_BACKGROUND_COLOUR")
-    ScaleformMovieMethodAddParamInt(0)
-    ScaleformMovieMethodAddParamInt(0)
-    ScaleformMovieMethodAddParamInt(0)
-    ScaleformMovieMethodAddParamInt(80)
-    EndScaleformMovieMethod()
-
-    DrawScaleformMovieFullscreen(build, 255, 255, 255, 255, 0)
-end
-
--- Testing showing variables on the screen instead of only in f8
-function debugScaleForm(textTable, loc)
-    if debugMode then
-        -- Define the display position (top left corner)
-        local loc = loc or vec2(0.05, 0.65)
-
-        -- Calculate dynamic height based on the number of lines in the textTable
-        local lineHeight = 0.025  -- Height of each line of text
-        local totalHeight = #textTable * lineHeight  -- Dynamic height based on number of lines
-        local boxPadding = 0.01  -- Padding to add around the text inside the box
-        local size = vec2(0.18, totalHeight + boxPadding * 2)  -- Width remains fixed, height is dynamic
-
-        DrawRect(loc.x + size.x / 2, loc.y + size.y / 2, size.x, size.y, 0, 0, 0, 255)
-
-        for i = 1, #textTable do
-            local textLine = textTable[i]
-
-            SetTextScale(0.30, 0.30)
-
-            BeginTextCommandDisplayText("STRING")
-            AddTextComponentSubstringKeyboardDisplay(textLine)
-
-            EndTextCommandDisplayText(loc.x + 0.005, loc.y + (i - 1) * lineHeight + 0.01)
-        end
-    end
-end

shared/scaleforms/bigMessageInstance.lua

@@ -1,6 +1,17 @@
+--[[
+    BigMessage Module
+    -----------------
+    This module provides a flexible way to display large, attention-grabbing messages
+    on screen using a Scaleform movie ("MP_BIG_MESSAGE_FREEMODE"). It supports multiple
+    message types (mission passed, colored shard, old-style, simple shard, rank-up, weapon purchased,
+    and large multiplayer messages), including customizable transitions and durations.
+]]
+
 BigMessage = {}
 BigMessage.__index = BigMessage
 
+--- Creates a new BigMessage instance.
+--- @return table table A new BigMessage object.
 function BigMessage:new()
     local self = setmetatable({}, BigMessage)
     self.scaleform = nil
@@ -15,6 +26,7 @@ function BigMessage:new()
     return self
 end
 
+--- Loads the Scaleform movie if it has not been loaded yet.
 function BigMessage:Load()
     if self.scaleform then return end
     self.scaleform = RequestScaleformMovie("MP_BIG_MESSAGE_FREEMODE")
@@ -23,7 +35,8 @@ function BigMessage:Load()
     end
 end
 
--- Dispose of the scaleform
+--- Disposes of the Scaleform movie.
+--- If manualDispose is true, executes a transition before disposing.
 function BigMessage:Dispose()
     if not self.scaleform then return end
 
@@ -34,8 +47,8 @@ function BigMessage:Dispose()
         ScaleformMovieMethodAddParamBool(self.transitionPreventAutoExpansion)
         EndScaleformMovieMethod()
 
+        -- Wait a fraction of the transition duration (in milliseconds)
         Wait((self.transitionDuration * 0.5) * 1000)
-
         self.manualDispose = false
     end
 
@@ -46,8 +59,10 @@ function BigMessage:Dispose()
     self.isDisplaying = false
 end
 
+--- Updates the display by drawing the Scaleform movie fullscreen.
 function BigMessage:Update()
     if not self.scaleform then return end
+
     DrawScaleformMovieFullscreen(self.scaleform, 255, 255, 255, 255, 0)
 
     if self.manualDispose then return end
@@ -60,6 +75,7 @@ function BigMessage:Update()
             ScaleformMovieMethodAddParamBool(self.transitionPreventAutoExpansion)
             EndScaleformMovieMethod()
             self.transitionExecuted = true
+            -- Extend duration slightly for smooth transition
             self.duration = self.duration + ((self.transitionDuration * 0.5) * 1000)
         else
             self:Dispose()
@@ -67,14 +83,20 @@ function BigMessage:Update()
     end
 end
 
+--- Sets the transition properties for disposing the message.
+--- @param transition string The transition function name (default: "TRANSITION_OUT").
+--- @param duration number The duration for the transition (default: 0.4).
+--- @param preventAutoExpansion boolean Whether to prevent auto-expansion (default: true).
 function BigMessage:SetTransition(transition, duration, preventAutoExpansion)
     self.transition = transition or "TRANSITION_OUT"
     self.transitionDuration = duration or 0.4
     self.transitionPreventAutoExpansion = preventAutoExpansion or true
 end
 
+--- Starts a thread to continuously update the HUD until the message is done.
 function BigMessage:StartUpdate()
     if self.isDisplaying then return end
+
     self.isDisplaying = true
     CreateThread(function()
         while self.isDisplaying do
@@ -85,10 +107,13 @@ function BigMessage:StartUpdate()
 end
 
 --- Displays a mission passed message.
----
+--- @param msg string The message to display.
---- @param msg string The main message to display.
+--- @param duration number|nil The duration (in milliseconds) to display the message (default: 5000).
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param manualDispose boolean|nil Whether to manually dispose the Scaleform after display (default: false).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @usage
+--- ```lua
+--- BigMessage:ShowMissionPassedMessage("MISSION PASSED", 5000)
+--- ```
 function BigMessage:ShowMissionPassedMessage(msg, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -109,13 +134,12 @@ function BigMessage:ShowMissionPassedMessage(msg, duration, manualDispose)
 end
 
 --- Displays a colored shard message.
----
+--- @param msg string The main message.
---- @param msg string The main message to display.
 --- @param desc string The description text.
---- @param textColor number The color index for the text.
+--- @param textColor number The text color index.
---- @param bgColor number The color index for the background.
+--- @param bgColor number The background color index.
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @param manualDispose boolean|nil Whether to manually dispose the Scaleform (default: false).
 function BigMessage:ShowColoredShard(msg, desc, textColor, bgColor, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -125,8 +149,8 @@ function BigMessage:ShowColoredShard(msg, desc, textColor, bgColor, duration, ma
     BeginScaleformMovieMethod(self.scaleform, "SHOW_SHARD_CENTERED_MP_MESSAGE")
     ScaleformMovieMethodAddParamPlayerNameString(msg)
     ScaleformMovieMethodAddParamPlayerNameString(desc)
-    ScaleformMovieMethodAddParamInt(bgColor)
     ScaleformMovieMethodAddParamInt(textColor)
+    ScaleformMovieMethodAddParamInt(bgColor)
     EndScaleformMovieMethod()
 
     self.duration = duration
@@ -134,12 +158,9 @@ function BigMessage:ShowColoredShard(msg, desc, textColor, bgColor, duration, ma
 end
 
 --- Displays an old-style mission passed message.
----
+--- @param msg string The message.
---- @param msg string The main message to display.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
----
---- @return void
 function BigMessage:ShowOldMessage(msg, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -155,13 +176,10 @@ function BigMessage:ShowOldMessage(msg, duration, manualDispose)
 end
 
 --- Displays a simple shard message.
----
+--- @param msg string The main message.
---- @param msg string The main message to display.
 --- @param subtitle string The subtitle text.
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
----
---- @return void
 function BigMessage:ShowSimpleShard(msg, subtitle, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -178,12 +196,11 @@ function BigMessage:ShowSimpleShard(msg, subtitle, duration, manualDispose)
 end
 
 --- Displays a rank-up message.
----
+--- @param msg string The main message.
---- @param msg string The main message to display.
 --- @param subtitle string The subtitle text.
 --- @param rank number The rank level achieved.
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
 function BigMessage:ShowRankupMessage(msg, subtitle, rank, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -203,12 +220,11 @@ function BigMessage:ShowRankupMessage(msg, subtitle, rank, duration, manualDispo
 end
 
 --- Displays a weapon purchased message.
----
+--- @param bigMessage string The main message.
---- @param bigMessage string The main message to display.
 --- @param weaponName string The name of the weapon purchased.
---- @param weaponHash number The hash identifier of the weapon.
+--- @param weaponHash number The weapon hash.
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
 function BigMessage:ShowWeaponPurchasedMessage(bigMessage, weaponName, weaponHash, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -228,10 +244,9 @@ function BigMessage:ShowWeaponPurchasedMessage(bigMessage, weaponName, weaponHas
 end
 
 --- Displays a large multiplayer message.
----
+--- @param msg string The main message.
---- @param msg string The main message to display.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
 function BigMessage:ShowMpMessageLarge(msg, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -254,11 +269,10 @@ function BigMessage:ShowMpMessageLarge(msg, duration, manualDispose)
 end
 
 --- Displays a "Wasted" multiplayer message.
----
+--- @param msg string The main message.
---- @param msg string The main message to display.
 --- @param subtitle string The subtitle text.
---- @param duration number|nil The duration in milliseconds the message should be displayed. Defaults to 5000.
+--- @param duration number|nil Duration in milliseconds (default: 5000).
---- @param manualDispose boolean|nil Whether to manually dispose of the scaleform after the message. Defaults to false.
+--- @param manualDispose boolean|nil Whether to manually dispose (default: false).
 function BigMessage:ShowMpWastedMessage(msg, subtitle, duration, manualDispose)
     duration = duration or 5000
     self:Load()
@@ -274,4 +288,19 @@ function BigMessage:ShowMpWastedMessage(msg, subtitle, duration, manualDispose)
     self:StartUpdate()
 end
 
+--- Starts the update loop for displaying the message.
+function BigMessage:StartUpdate()
+    if self.isDisplaying then return end
+    self.isDisplaying = true
+    CreateThread(function()
+        while self.isDisplaying do
+            Wait(0)
+            self:Update()
+        end
+    end)
+end
+
+-- Create an instance of BigMessage and return it.
+BigMessage = BigMessage:new()
+
 return BigMessage

shared/scaleforms/countDownHandler.lua

@@ -1,6 +1,18 @@
+--[[
+    CountdownHandler Module
+    -------------------------
+    This module provides a countdown HUD using a Scaleform movie ("COUNTDOWN").
+    It handles loading, updating, and disposing of the scaleform, as well as
+    playing sounds and displaying messages for each countdown tick.
+
+    TriggerNetEvent(getScript()..":startCountdown", 5, 25)
+]]
+
 CountdownHandler = {}
 CountdownHandler.__index = CountdownHandler
 
+--- Creates a new CountdownHandler instance.
+--- @return table table A new CountdownHandler object.
 function CountdownHandler:new()
     local self = setmetatable({}, CountdownHandler)
     self.scaleform = nil
@@ -9,14 +21,18 @@ function CountdownHandler:new()
     return self
 end
 
+--- Loads the "COUNTDOWN" scaleform movie.
 function CountdownHandler:Load()
-    if self.scaleform then return end
+    if self.scaleform then
+        return
+    end
     self.scaleform = RequestScaleformMovie("COUNTDOWN")
     while not HasScaleformMovieLoaded(self.scaleform) do
         Wait(0)
     end
 end
 
+--- Disposes of the currently loaded scaleform movie.
 function CountdownHandler:Dispose()
     if self.scaleform then
         SetScaleformMovieAsNoLongerNeeded(self.scaleform)
@@ -24,15 +40,19 @@ function CountdownHandler:Dispose()
     end
 end
 
+--- Updates the HUD by drawing the scaleform movie fullscreen.
 function CountdownHandler:Update()
     if self.scaleform then
         DrawScaleformMovieFullscreen(self.scaleform, 255, 255, 255, 255, 0)
     end
 end
 
+--- Displays a message on the countdown HUD.
+--- @param message string The message to display.
 function CountdownHandler:ShowMessage(message)
     local r, g, b, a = self.colour.r, self.colour.g, self.colour.b, self.colour.a
 
+    -- Set the message in the scaleform.
     BeginScaleformMovieMethod(self.scaleform, "SET_MESSAGE")
     ScaleformMovieMethodAddParamPlayerNameString(message)
     ScaleformMovieMethodAddParamInt(r)
@@ -41,6 +61,7 @@ function CountdownHandler:ShowMessage(message)
     ScaleformMovieMethodAddParamBool(true)
     EndScaleformMovieMethod()
 
+    -- Trigger a fade effect (optional).
     BeginScaleformMovieMethod(self.scaleform, "FADE_MP")
     ScaleformMovieMethodAddParamPlayerNameString(message)
     ScaleformMovieMethodAddParamInt(r)
@@ -49,17 +70,14 @@ function CountdownHandler:ShowMessage(message)
     EndScaleformMovieMethod()
 end
 
---- Starts the countdown with the specified number and HUD color.
+--- Starts the countdown HUD.
----
+--- @param number number|nil The starting number for the countdown (default: 3).
---- @param number number|nil The starting number for the countdown. Defaults to 3.
+--- @param hudColour number|nil The HUD colour index (default: 18).
---- @param hudColour number|nil The HUD color index. Defaults to 18.
+--- @return boolean boolean True when the countdown has finished.
----
---- @return boolean `true` when the countdown has finished.
----
 --- @usage
 --- ```lua
---- -- Start a countdown of 5 seconds with HUD color 25
 --- if CountdownHandler:Start(5, 25) then
+---     -- When run in an if statement, the script will wait until its finished to continue
 ---     print("Countdown Complete")
 --- end
 --- ```
@@ -68,6 +86,7 @@ function CountdownHandler:Start(number, hudColour)
     number = number or 3
     hudColour = hudColour or 18
 
+    -- Get HUD colour using framework function; alternatives could be added here.
     local r, g, b, a = GetHudColour(hudColour)
     self.colour = { r = r, g = g, b = b, a = a }
 
@@ -81,18 +100,17 @@ function CountdownHandler:Start(number, hudColour)
         end
     end)
 
-    -- Begin the countdown
+    -- Countdown logic
     CreateThread(function()
         local currentNumber = number
         while currentNumber > 0 do
-            -- Play countdown sound
             playSound("Count")
             self:ShowMessage(tostring(currentNumber))
             Wait(1000)
             currentNumber = currentNumber - 1
         end
-        playSound("Go")
 
+        playSound("Go")
         self:ShowMessage("GO")
         finished = true
 
@@ -101,14 +119,15 @@ function CountdownHandler:Start(number, hudColour)
         self:Dispose()
         finished = true
     end)
+
     while not finished do Wait(10) end
     return true
 end
 
--- Create an instance of CountdownHandler
+-- Create a singleton instance of CountdownHandler.
 CountdownHandler = CountdownHandler:new()
 
--- Optional: Register an event to start the countdown
+-- Register an event to start the countdown.
 RegisterNetEvent(getScript()..":startCountdown", function(number, hudColour)
     CountdownHandler:Start(number, hudColour)
 end)

shared/scaleforms/debugScaleform.lua

@@ -1,40 +1,43 @@
+-------------------------------------------------------------
+-- Debug Text Display Functionality
+-------------------------------------------------------------
 
---- Displays debug information on the player's screen.
+--- Draws debug text on the screen if debugMode is enabled.
 ---
---- This function renders a semi-transparent box with multiple lines of text for debugging purposes.
+--- Calculates a background rectangle based on the number of text lines and renders each line on-screen.
---- It is controlled by the `debugMode` flag and can be positioned dynamically on the screen.
 ---
---- @param textTable table A table containing strings to display.
+--- @param textTable table An array of strings to display.
---- @param loc vector2|nil Optional. The screen position to display the debug box. Defaults to `vec2(0.05, 0.65)`.
+--- @param loc vector2 (Optional) Top-left coordinate for the text box (default: vec2(0.05, 0.65)).
 ---
 --- @usage
 --- ```lua
---- debugScaleForm({
+---CreateThread(function()
----     "Player Position: X=123.45 Y=678.90 Z=12.34",
+---     while true do
----     "Current Action: Running",
+---         debugScaleForm({
---- })
+---             "Line 1: Debug info",
+---             "Line 2: More info"
+---         })
+---         Wait(0)
+---     end
+---end)
 --- ```
 function debugScaleForm(textTable, loc)
     if debugMode then
-        -- Define the display position (top left corner)
+        loc = loc or vec2(0.05, 0.65)
-        local loc = loc or vec2(0.05, 0.65)
 
-        -- Calculate dynamic height based on the number of lines in the textTable
+        local lineHeight = 0.025        -- Height per line.
-        local lineHeight = 0.025  -- Height of each line of text
+        local totalHeight = #textTable * lineHeight
-        local totalHeight = #textTable * lineHeight  -- Dynamic height based on number of lines
+        local boxPadding = 0.01         -- Padding around the text.
-        local boxPadding = 0.01  -- Padding to add around the text inside the box
+        local size = vec2(0.18, totalHeight + boxPadding * 2)
-        local size = vec2(0.18, totalHeight + boxPadding * 2)  -- Width remains fixed, height is dynamic
 
-        DrawRect(loc.x + size.x / 2, loc.y + size.y / 2, size.x, size.y, 0, 0, 0, 255)
+        -- Draw background rectangle.
+        DrawRect(loc.x + size.x / 2, loc.y + size.y / 2, size.x, size.y, 0, 0, 0, 200)
 
+        -- Render each line of text.
         for i = 1, #textTable do
-            local textLine = textTable[i]
-
             SetTextScale(0.30, 0.30)
-
             BeginTextCommandDisplayText("STRING")
-            AddTextComponentSubstringKeyboardDisplay(textLine)
+            AddTextComponentSubstringKeyboardDisplay(textTable[i])
-
             EndTextCommandDisplayText(loc.x + 0.005, loc.y + (i - 1) * lineHeight + 0.01)
         end
     end

shared/scaleforms/instructionalButtons.lua

@@ -1,30 +1,45 @@
---- Creates instructional buttons using the detected polyzone library (ox_lib or PolyZone).
+-------------------------------------------------------------
+-- Instructional Buttons Functionality
+-------------------------------------------------------------
+
+--- Loads and draws instructional buttons on-screen using a scaleform movie.
 ---
---- This function generates instructional buttons on the player's screen based on the provided information.
+--- Requests the "instructional_buttons" scaleform, clears previous data, sets clear space,
---- It supports different polyzone libraries by automatically detecting which one is active.
+--- creates data slots for each button option provided in `info`, and then draws the scaleform fullscreen.
 ---
----@param info table A table containing the instructional buttons configuration.
+--- @param info table An array of tables, where each table represents a button option:
---- - **keys** (`table`): A list of control keys to display.
+---     - keys (table): An array of key codes (e.g., {38, 29}) to display.
---- - **text** (`string`): The description text for the buttons.
+---     - text (string): The label for the button.
 ---
----@usage
+--- @usage
 --- ```lua
---- makeInstructionalButtons({
+---CreateThread(function()
----     { keys = { 38 }, text = "Interact" },
+---    while true do
----     { keys = { 47 }, text = "Pick Up" },
+---         makeInstructionalButtons({
---- })
+---             { keys = {38, 29}, text = "Open Menu" },
+---             { keys = {45}, text = "Close Menu" }
+---         })
+---         Wait(0)
+---    end
+---end)
 --- ```
 function makeInstructionalButtons(info)
     local build = RequestScaleformMovie("instructional_buttons")
     while not HasScaleformMovieLoaded(build) do Wait(0) end
 
+    -- Draw the scaleform fullscreen (initial draw).
     DrawScaleformMovieFullscreen(build, 255, 255, 255, 0, 0)
+
+    -- Clear previous instructions.
     BeginScaleformMovieMethod(build, "CLEAR_ALL")
     EndScaleformMovieMethod()
+
+    -- Set clear spacing between buttons.
     BeginScaleformMovieMethod(build, "SET_CLEAR_SPACE")
     ScaleformMovieMethodAddParamInt(200)
     EndScaleformMovieMethod()
 
+    -- Add each button option to the scaleform.
     for i = 1, #info do
         BeginScaleformMovieMethod(build, "SET_DATA_SLOT")
         ScaleformMovieMethodAddParamInt(i - 1)
@@ -37,8 +52,11 @@ function makeInstructionalButtons(info)
         EndScaleformMovieMethod()
     end
 
+    -- Draw the instructional buttons.
     BeginScaleformMovieMethod(build, "DRAW_INSTRUCTIONAL_BUTTONS")
     EndScaleformMovieMethod()
+
+    -- Set a translucent black background.
     BeginScaleformMovieMethod(build, "SET_BACKGROUND_COLOUR")
     ScaleformMovieMethodAddParamInt(0)
     ScaleformMovieMethodAddParamInt(0)
@@ -46,5 +64,47 @@ function makeInstructionalButtons(info)
     ScaleformMovieMethodAddParamInt(80)
     EndScaleformMovieMethod()
 
+    -- Final full-screen draw with full opacity.
     DrawScaleformMovieFullscreen(build, 255, 255, 255, 255, 0)
 end
+
+-- EXPERIMENTAL --
+-- RedM Button Prompts --
+-- Creates the promot, then shows it, this needs to be run in a loop
+local promptGroups = {}
+
+function makeRedInstructionalButtons(info, title)
+    if not promptGroups[title] then  -- Create group if not exists
+        promptGroups[title] = {
+            title = CreateVarString(10, 'LITERAL_STRING', title),
+            id = GetRandomIntInRange(0, 0xffffff),
+            prompts = {},
+        }
+        for i = 1, #info do
+            promptGroups[title].prompts[i] = {
+                keys = info[i].keys,
+                text = info[i].text,
+            }
+            local keyTitle = CreateVarString(10, 'LITERAL_STRING', info[i].text)
+            -- Create one prompt per entry
+            local promptSet = UiPromptRegisterBegin()
+            -- Register all keys for this prompt
+            for k = 1, #info[i].keys do
+                PromptSetControlAction(promptSet, info[i].keys[k])
+            end
+            PromptSetText(promptSet, keyTitle)
+            PromptSetEnabled(promptSet, true)
+            PromptSetVisible(promptSet, true)
+            PromptSetGroup(promptSet, promptGroups[title].id)
+            PromptRegisterEnd(promptSet)
+        end
+    end
+    PromptSetActiveGroupThisFrame(promptGroups[title].id, promptGroups[title].title)
+end
+
+onResourceStop(function()
+    for k, v in pairs(promptGroups) do
+        print("^5Bridge^7: ^2Removing Prompt Group^7: ^3" .. k .. "^7")
+        PromptDelete(promptGroups[k].id, 1)
+    end
+end, true)

shared/scaleforms/scaleform_basic.lua

@@ -0,0 +1,115 @@
+-------------------------------------------------------------
+-- 3D Text Rendering
+-------------------------------------------------------------
+
+--- Draws 3D text at specified world coordinates.
+---
+--- Configures text properties, draws the text, and displays a background rectangle behind it.
+---
+--- @param coord table A vector3 with x, y, and z coordinates.
+--- @param text string The text to display.
+--- @param highlight boolean (Optional) If true, highlights parts of the text.
+---
+--- @usage
+--- ```lua
+--- CreateThread(function()
+---     while true do
+---         DrawText3D(vector3(100, 200, 300), "Hello World", true)
+---         Wait(0)
+---     end
+--- end)
+--- ```
+function DrawText3D(coord, text, highlight)
+    SetTextScale(0.30, 0.30)
+    SetTextFont(0)
+    SetTextProportional(1)
+    SetTextColour(255, 255, 255, 215)
+    SetTextEntry("STRING")
+    SetTextCentre(true)
+
+    local totalLength = string.len(text)
+    local textMaxLength = 99 -- max 99
+    local text = totalLength > textMaxLength and text:sub(1, totalLength - (totalLength - textMaxLength)) or text
+    AddTextComponentString(highlight and text:gsub("%~w~", "~y~") or text)
+    SetDrawOrigin(coord.x, coord.y, coord.z, 0)
+    DrawText(0.0, 0.0)
+    local count, length = GetLineCountAndMaxLength(text)
+
+    local padding = 0.005
+    local heightFactor = (count / 43) + padding
+    local weightFactor = (length / 150) + padding
+
+    local height = (heightFactor / 2) - padding / 1
+    local width = (weightFactor / 2) - padding / 1
+
+    DrawRect(0.0, height, width, heightFactor, 0, 0, 0, 150)
+    ClearDrawOrigin()
+end
+
+--- Calculates the number of lines and the maximum line length from the given text.
+---
+--- @param text string The text to analyze.
+--- @return number, number The line count and maximum line length.
+---
+--- @usage
+--- ```lua
+--- local count, maxLen = GetLineCountAndMaxLength("Hello World")
+--- ```
+function GetLineCountAndMaxLength(text)
+    local lineCount, maxLength = 0, 0
+    for line in text:gmatch("[^\n]+") do
+        lineCount += 1
+        local lineLength = string.len(line)
+        if lineLength > maxLength then
+            maxLength = lineLength
+        end
+    end
+    if lineCount == 0 then lineCount = 1 end
+    return lineCount, maxLength
+end
+
+-------------------------------------------------------------
+-- Additional UI Helpers
+-------------------------------------------------------------
+
+--- Displays a help message on the screen.
+---
+--- @param text string The message to display.
+---
+--- @usage
+--- ```lua
+--- DisplayHelpMsg("Press E to interact")
+--- ```
+function DisplayHelpMsg(text)
+    BeginTextCommandDisplayHelp("STRING")
+    AddTextComponentScaleform(text)
+    EndTextCommandDisplayHelp(0, true, false, -1)
+end
+
+--- Displays a "Saving/Loading" spinner with a custom message.
+---
+--- @param text string The message to display alongside the spinner.
+---
+--- @usage
+--- ```lua
+--- displaySpinner("Saving data...")
+--- ```
+function displaySpinner(text)
+    BeginTextCommandBusyspinnerOn('STRING')
+    AddTextComponentSubstringPlayerName(text)
+    EndTextCommandBusyspinnerOn(4)
+end
+
+--- Stops the "Saving/Loading" spinner.
+---
+--- This function should only be called client-side.
+---
+--- @usage
+--- ```lua
+--- stopSpinner()
+--- ```
+function stopSpinner()
+    if not isServer() then
+        BusyspinnerOff()
+    end
+end

shared/scaleforms/timerBars.lua

@@ -1,3 +1,21 @@
+--- Creates and displays a timer HUD on the screen.
+--- Draws a title (if provided) and a series of timer bars from the supplied data.
+---
+--- @param title string|nil Optional title to display at the top of the HUD.
+--- @param data table A table of timer bar entries. Each entry should include:
+---     - stat (string): The statistic name.
+---     - value (string): The value to display.
+---     - multi (number|nil): Optional, indicates multiple checkpoints (e.g., progress levels).
+--- @param alpha number|nil Optional alpha value (transparency) for the HUD; defaults to 255.
+---
+--- @usage
+--- ```lua
+--- createTimerHud("Timer", {
+---     { stat = "Health", value = "85%" },
+---     { stat = "Armor", value = "50%", multi = 2 },
+---     { stat = "Stamina", value = "100%" },
+--- }, 255)
+--- ```
 function createTimerHud(title, data, alpha)
     loadTextureDict("timerbars")
 

shared/skillcheck.lua

@@ -0,0 +1,73 @@
+local skillCheckFunc = {
+    qb = {
+        start = function(data)
+            local Skillbar = exports["qb-minigames"]:Skillbar()
+            if Skillbar then
+                return true
+            else
+                return false
+            end
+        end,
+    },
+    ox = {
+        start = function(data)
+            local Skillbar = exports[OXLibExport]:skillCheck(
+                {
+                    "easy",
+                    "easy",
+                    "easy"
+                },
+                {
+                    "1",
+                    "2",
+                    "3",
+                    "4"
+                }
+            )
+            if Skillbar then
+                return true
+            else
+                return false
+            end
+        end,
+    },
+    gta = {
+        start = function(data)
+            local Skillbar = exports.jim_bridge:skillCheck()
+            if Skillbar then
+                return true
+            else
+                return false
+            end
+        end,
+    },
+    lation = {
+        start = function(data)
+            local Skillbar = exports.lation_ui:skillCheck("",
+                {
+                    "easy",
+                    "easy",
+                    "easy"
+                },
+                {
+                    "1",
+                    "2",
+                    "3",
+                    "4"
+                })
+            if Skillbar then
+                return true
+            else
+                return false
+            end
+        end,
+    },
+
+}
+
+function skillCheck(data)
+    if Config.System.skillCheck then
+        return skillCheckFunc[Config.System.skillCheck].start(data)
+    end
+    return true
+end

shared/societybank.lua

@@ -0,0 +1,213 @@
+--[[
+    Society Banking Module
+    ------------------------
+    This module provides functions to interact with society bank accounts across
+    different banking systems. Supported systems include:
+      • qb-banking
+      • esx_society *testing*
+      • Renewed-Banking
+      • fd_banking
+      • okokBanking
+      • Tgiann-bank
+]]
+
+local societyFunc = {
+    {   bankName = "qb-banking",
+        getAccount =
+            function(society)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0)
+                        Wait(150)
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0)
+                        Wait(150)
+                    end
+                end
+                return exports["qb-banking"]:GetAccountBalance(society)
+            end,
+        chargeSociety =
+            function(society, amount)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0) Wait(150) -- make new account if return "null"
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0) Wait(150) -- make new account if return "null"
+                    end
+                end
+                exports["qb-banking"]:RemoveMoney(society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0)
+                        Wait(150)
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0)
+                        Wait(150)
+                    end
+                end
+                exports["qb-banking"]:AddMoney(society, amount)
+            end,
+    },
+
+    {   bankName = "Renewed-Banking",
+        getAccount =
+            function(society)
+                return exports["Renewed-Banking"]:getAccountMoney(society)
+            end,
+        chargeSociety =
+            function(society, amount)
+                exports['Renewed-Banking']:removeAccountMoney(society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                exports['Renewed-Banking']:addAccountMoney(society, amount)
+            end,
+    },
+
+    {   bankName = "fd_banking",
+        getAccount =
+            function(society)
+                return exports["fd_banking"]:GetAccount(society)
+            end,
+        chargeSociety =
+            function(society, amount)
+                exports["fd_banking"]:RemoveMoney(society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                exports["fd_banking"]:AddMoney(society, amount)
+            end,
+    },
+
+    {   bankName = "okokBanking",
+        getAccount =
+            function(society)
+                return exports['okokBanking']:GetAccount(society)
+            end,
+        chargeSociety =
+            function(society, amount)
+                exports['okokBanking']:RemoveMoney(society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                exports['okokBanking']:AddMoney(society, amount)
+            end,
+    },
+
+    {   bankName = "tgiann-bank",
+        getAccount =
+            function(society)
+                if Jobs[society] then
+                    return exports["tgiann-bank"]:GetJobAccountBalance(society)
+                else
+                    return exports["tgiann-bank"]:GetGangAccountBalance(society)
+                end
+            end,
+        chargeSociety =
+            function(society, amount)
+                if Jobs[society] then
+                    exports["tgiann-bank"]:RemoveJobMoney(society, amount)
+                else
+                    exports["tgiann-bank"]:RemoveGangMoney(society, amount)
+                end
+            end,
+        fundSociety =
+            function(society, amount)
+                if Jobs[society] then
+                    exports["tgiann-bank"]:AddJobMoney(society, amount)
+                else
+                    exports["tgiann-bank"]:AddGangMoney(society, amount)
+                end
+            end,
+    },
+}
+
+
+--- Retrieves the current balance of a society's bank account.
+--- @param society string The identifier of the society.
+--- @return number number The current account balance.
+--- @usage
+--- ```lua
+--- local balance = getSocietyAccount("police")
+--- print("Police account balance: $"..balance)
+--- ```
+function getSocietyAccount(society)
+    local amount = 0
+    if society == nil or society == "none" then return amount end
+
+    for i = 1, #societyFunc do
+        local script = societyFunc[i]
+        if isStarted(script.bankName) then
+            local amount = script.getAccount(society)
+            debugPrint("^6Bridge^7: ^3"..script.bankName.."^7: ^2Retrieved account ^7'^6"..society.."^7' ($"..tostring(amount)..")")
+            return amount
+        end
+    end
+
+    print("^1Error^7: ^3GetSocietyAccount^7: ^2No supported banking script found")
+
+    return amount
+end
+
+--- Deducts funds from a society's bank account.
+--- @param society string The identifier of the society.
+--- @param amount number The amount of money to remove.
+--- @usage
+--- ```lua
+--- chargeSociety("police", 1000)
+--- ```
+function chargeSociety(society, amount)
+
+    for i = 1, #societyFunc do
+        local script = societyFunc[i]
+        if isStarted(script.bankName) then
+            script.chargeSociety(society, amount)
+            local newAmount = getSocietyAccount(society)
+            debugPrint("^6Bridge^7: ^3"..script.bankName.."^7: ^2Removing $"..amount.." from account '^6"..society.."^7' ($"..tostring(newAmount)..")")
+            return
+        end
+    end
+
+    print("^1Error^7: ^3ChargeSociety^7: ^2No supported banking script found")
+end
+
+--- Adds funds to a society's bank account.
+--- @param society string The identifier of the society.
+--- @param amount number The amount of money to add.
+--- @usage
+--- ```lua
+--- fundSociety("police", 500)
+--- ```
+function fundSociety(society, amount)
+
+    for i = 1, #societyFunc do
+        local script = societyFunc[i]
+        if isStarted(script.bankName) then
+            script.fundSociety(society, amount)
+            local newAmount = getSocietyAccount(society)
+            debugPrint("^6Bridge^7: ^3"..script.bankName.."^7: ^2Adding ^7$"..amount.." ^2to account ^7'^6"..society.."^7' ($"..tostring(newAmount)..")")
+            return
+        end
+    end
+
+    print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
+end
+
+
+-- other
+if isStarted("esx_society") then
+    createCallback(getScript()..":getESXSocietyAccount", function(source, society)
+        -- Example query – adjust table/field names to match your esx_society implementation.
+        local result = MySQL.scalar.await('SELECT money FROM society_money WHERE society = ?', { society })
+        return result or 0
+    end)
+end

shared/stashcontrol.lua

@@ -1,271 +0,0 @@
-if isServer() then
-    createCallback(getScript()..':server:GetStashItems', function(source, stashName) local stash = getStash(stashName) return stash end)
-end
-
-local stashCache ={}
-function GetStashTimeout(stashName, stop)
-    if stop then stashCache = {} return end
-    local stash = stashCache[stashName]
-    if not stash then
-        stashCache[stashName] = { items = {}, timeout = 0 }
-        stash = stashCache[stashName]
-    end
-    if #stash.items > 0 then return true end
-    if stash.timeout <= 0 then
-        stash.items = triggerCallback(getScript()..':server:GetStashItems', stashName)
-        stash.timeout = 10000
-        CreateThread(function()
-            while stash.timeout > 0 do stash.timeout -= 1000 Wait(1000) end
-            stashCache[stashName] = nil
-        end)
-    end
-
-    return false
-end
-
-function checkHasItem(stashes, itemTable)
-    if not stashes then return hasItem(itemTable), nil end
-    if type(stashes) == "table" then
-        local succeses = 0
-        local itemCount = 0
-        for _, item in pairs(itemTable) do itemCount += 1 end
-        for _, name in pairs(stashes) do
-            GetStashTimeout(name)
-            for item, amount in pairs(itemTable) do
-                debugPrint("^6Bridge^7: ^2Checking"..(name and " ^7'^6"..name.."^7'" or "").." ^2ingredients^7 - ^6"..item.."^7")
-                if stashhasItem(stashCache[name].items, item, amount) then
-                    succeses += 1
-                    if succeses == itemCount then return true, name end
-                end
-            end
-        end
-    else
-        debugPrint("^6Bridge^7: ^2Checking"..(stashes and " ^7'^6"..stashes.."^7'" or "").." ^2ingredients^7 - ^6"..k.."^7")
-        GetStashTimeout(stashes)
-        return stashhasItem(stashCache[stashes].items, itemTable), stashes
-    end
-
-    return false, nil
-end
-
-
--- Stash Items
-function openStash(data)
-	if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
-    if isStarted(OXInv) then
-        exports[OXInv]:openInventory('stash', data.stash)
-    elseif isStarted(CodeMInv) then
-        exports[CodeMInv]:OpenStash(data.stash, StashWeight, 100)
-    elseif isStarted(QBInv) then
-        if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenStashQB', { stashName = data.stash, label = data.label, maxweight = data.maxWeight or 600000, slots = data.slots or 40 })
-        else
-            TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
-        end
-    else
-        TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
-	end
-    lookEnt(data.coords)
-end
-
-RegisterNetEvent(getScript()..':server:OpenStashQB', function(data)
-    exports[QBInv]:OpenInventory(source, data.stashName, data)
-end)
-
-function getStash(stashName) local stashResource = ""
-    if type(stashName) ~= "string" then return print("Stash name was not a string %s(%s)", stashName, type(stashName)) end
-    local stashItems, items = {}, {}
-    if isStarted(OXInv) then stashResource = OXInv
-        stashItems = exports[OXInv]:Inventory(stashName).items
-
-    elseif isStarted(QSInv) then stashResource = QSInv
-        stashItems = exports[QSInv]:GetStashItems(stashName)
-
-    elseif isStarted(CoreInv) then stashResource = CoreInv
-        stashItems = exports[CoreInv]:getInventory(stashName)
-
-    elseif isStarted(CodeMInv) then stashResource = CodeMInv
-        stashItems = exports[CodeMInv]:GetInventoryItems('Stash', stashName)
-
-    elseif isStarted(OrigenInv) then stashResource = OrigenInv
-        stashItems = exports[OrigenInv]:GetStashItems(stashName)
-
-    elseif isStarted(PSInv) then stashResource = PSInv
-        local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
-		if result then stashItems = json.decode(result) end
-    elseif isStarted(QBInv) then stashResource = QBInv
-        local result = MySQL.scalar.await("SELECT items FROM "..(QBInvNew and "inventories" or "stashitem").." WHERE identifier = ?", { stashName })
-        if result then stashItems = json.decode(result) end
-    end
-
-    debugPrint("^6Bridge^7: ^2Retrieving ^3Stash^2 with ^7"..stashResource)
-    if stashItems then
-        for _, item in pairs(stashItems) do
-            local itemInfo = Items[item.name:lower()]
-            if itemInfo then
-                local indexNum = #items+1 -- Added to help recreate missing slot numbers
-                items[(item.slot and item.slot) or indexNum] = {
-                    name = itemInfo.name or nil,
-                    amount = tonumber(item.amount) or tonumber(item.count),
-                    info = item.info or "",
-                    label = itemInfo.label or nil,
-                    description = itemInfo.description or "",
-                    weight = itemInfo.weight or nil,
-                    type = itemInfo.type or nil,
-                    unique = itemInfo.unique or nil,
-                    useable = itemInfo.useable or nil,
-                    image = itemInfo.image or nil,
-                    slot = (item.slot and item.slot) or indexNum,
-                    metadata = (item.metadata and item.metadata) or nil,
-                }
-            end
-        end
-        debugPrint("^6Bridge^7: ^3GetStashItems^7: ^2Stash information for ^7'^6"..stashName.."^7' ^2retrieved^7")
-    end
-    return items
-end
-
-function stashRemoveItem(stashItems, stashName, items) local amount = amount and amount or 1
-    -- print("stashItems: "..json.encode(stashItems, { indent = true}))
-    -- print("stashName: "..json.encode(stashName, { indent = true}))
-    -- print("items: "..json.encode(items, { indent = true}))
-    if isStarted(OXInv) then
-        for k, v in pairs(items) do
-            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
-            if type(stashName) == "table" then
-                for _, name in pairs(stashName) do
-                    local success = exports[OXInv]:RemoveItem(name, k, v)
-                    if success then
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
-                        break
-                    end
-                end
-            else
-                exports[OXInv]:RemoveItem(stashName, k, v)
-            end
-        end
-
-    elseif isStarted(QSInv) then
-            for k, v in pairs(items) do
-                for l in pairs(stashItems) do
-                    if stashItems[l].name == k then
-                        if (stashItems[l].amount - v) <= 0 then
-                            debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                            stashItems[l] = nil
-                        else
-                            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
-                            exports[QSInv]:RemoveItemIntoStash(stashName, k, v, l)
-                        end
-                    end
-                end
-            end
-
-    elseif isStarted(CoreInv) then
-        for k, v in pairs(items) do
-            exports[CoreInv]:removeItemExact(stashName, k, v)
-            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v)
-        end
-
-    elseif isStarted(CodeMInv) then
-        for k, v in pairs(items) do
-            for l in pairs(stashItems) do
-                if stashItems[l].name == k then
-                    if (stashItems[l].amount - v) <= 0 then
-                        debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                        stashItems[l] = nil
-                    else
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CodeMInv, k, v)
-                        stashItems[l].amount -= v
-                    end
-                end
-            end
-        end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
-
-    elseif isStarted(OrigenInv) then
-        for k, v in pairs(items) do
-            exports[OrigenInv]:RemoveFromStash(stashName, k, v)
-            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v)
-        end
-
-    elseif isStarted(PSInv) then
-        for k, v in pairs(items) do
-            for l in pairs(stashItems) do
-                if stashItems[l].name == k then
-                    if (stashItems[l].amount - v) <= 0 then
-                        debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                        stashItems[l] = nil
-                    else
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
-                        stashItems[l].amount -= v
-                    end
-                end
-            end
-        end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
-        MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { ['stash'] = stashName, ['items'] = json.encode(stashItems) })
-    elseif isStarted(QBInv) then
-        if QBInvNew then
-            for k, v in pairs(items) do
-                exports[QBInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
-                debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
-            end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-            MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { ['stash'] = stashName[1], ['items'] = json.encode(stashItems) })
-        else
-            for k, v in pairs(items) do
-                for l in pairs(stashItems) do
-                    if stashItems[l].name == k then
-                        if (stashItems[l].amount - v) <= 0 then
-                            if Config.System.Debug then
-                                print("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                            end
-                            stashItems[l] = nil
-                        else
-                            if Config.System.Debug then
-                                print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
-                            end
-                            stashItems[l].amount -= v
-                        end
-                    end
-                end
-            end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
-            MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', { ['stash'] = stashName, ['items'] = json.encode(stashItems) })
-        end
-    else
-        print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3exports^1.^2lua^7")
-    end
-end
-RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
-
-function stashhasItem(stashItems, items, amount)
-    local invs = {OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, QBInv, PSInv}
-    local foundInv = ""
-    for _, inv in ipairs(invs) do
-        if isStarted(inv) then
-            foundInv = inv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
-            break
-        end
-    end
-
-    if type(items) ~= "table" then items = { [items] = amount and amount or 1, } end
-    local hasTable = {}
-    for item, amount in pairs(items) do
-        local count = 0
-        for _, itemData in pairs(stashItems) do
-            if itemData and (itemData.name == item) then
-                count += (itemData.amount or 1)
-            end
-        end
-
-        local debugMsg = string.format("^6Bridge^7: ^3stashHasItem^7[^6%s^7]: %s '%s' ^3%d^7/^3%d^7", foundInv, (count >= amount and "^5FOUND^7" or "^1NOT FOUND^7"), item, count, amount)
-        debugPrint(debugMsg)
-
-        hasTable[item] = { hasItem = (count >= amount), count = count }
-    end
-    for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
-    return true, hasTable
-end

shared/targets.lua

@@ -1,231 +1,371 @@
--- This is for experimental targets based on GTA in-world text prompts --
+--[[
-local TextTargets = {}
+    Experimental GTA In-World Text Prompts Targets Module
-local Keys = {
+    -------------------------------------------------------
-    [322] = "ESC", [288] = "F1", [289] = "F2", [170] = "F3", [166] = "F5",
+    This module handles the creation, removal, and management of in-world text targets
-    [167] = "F6", [168] = "F7", [169] = "F8", [56] = "F9", [57] = "F10",
+    for interacting with entities and zones using GTA text prompts. It supports multiple
-    [243] = "~", [157] = "1", [158] = "2", [160] = "3", [164] = "4",  [165] = "5",
+    targeting systems: OX Target, QB Target, or a fallback using DrawText3D.
-    [159] = "6", [161] = "7", [162] = "8", [163] = "9", [84] = "-", [83] = "=",
+
-    [177] = "BACKSPACE", [37] = "TAB",
+    Available functionalities:
-    [44] = "Q", [32] = "W", [38] = "E", [45] = "R", [245] = "T", [246] = "Y",
+      • createEntityTarget   - Creates a target for a specific entity.
-    [303] = "U", [199] = "P",
+      • createBoxTarget      - Creates a box-shaped zone target.
-    [39] = "[",  [40] = "]", [18] = "ENTER", [137] = "CAPS",
+      • createCircleTarget   - Creates a circular zone target.
-    [34] = "A", [8] = "S", [9] = "D", [23] = "F", [47] = "G",
+      • createModelTarget    - Creates a target for specified models.
-    [74] = "H", [311] = "K", [182] = "L", [21] = "LEFTSHIFT",
+      • removeEntityTarget   - Removes a target from an entity.
-    [20] = "Z", [73] = "X", [26] = "C", [0] = "V",  [29] = "B", [249] = "N",
+      • removeZoneTarget     - Removes a zone target.
-    [244] = "M", [82] = ",", [81] = "."
+
+    Fallback: If no targeting system is detected (or if disabled via Config.System.DontUseTarget),
+              the module uses DrawText3D prompts. This is experimental and may not work as expected.
+]]
+
+local targetFunc = {
+    {   targetName = OXTargetExport,
+        entityTarget =
+            function(entity, opts, dist)
+                local options = {}
+                for i = 1, #opts do
+                    options[i] = {
+                        icon = opts[i].icon,
+                        label = opts[i].label,
+                        items = opts[i].item or nil,
+                        groups = opts[i].job or opts[i].gang,
+                        onSelect = opts[i].action,
+                        distance = dist,
+                        canInteract = opts[i].canInteract or nil,
+                    }
+                end
+                exports[OXTargetExport]:addLocalEntity(entity, options)
+            end,
+
+        boxTarget =
+            function(data, opts, dist)
+                local options = {}
+                for i = 1, #opts do
+                    options[i] = {
+                        icon = opts[i].icon,
+                        label = opts[i].label,
+                        items = opts[i].item or nil,
+                        groups = opts[i].groups or opts[i].job or opts[i].gang,
+                        onSelect = opts[i].onSelect or opts[i].action,
+                        distance = dist,
+                        canInteract = opts[i].canInteract or nil,
+                    }
+                end
+
+                data[5].maxZ = data[5].maxZ or (data[2].z + 0.80)
+                data[5].minZ = data[5].minZ or data[2].z - 1.05
+                local thickness = ((data[5].maxZ / 2) - (data[5].minZ / 2)) * 2
+                local mid = data[5].maxZ - ((data[5].maxZ / 2) - (data[5].minZ / 2))
+
+                data[2] = vec3(data[2].x, data[2].y, mid) -- force the coord to middle of the minZ and maxZ
+
+                local target = exports[OXTargetExport]:addBoxZone({
+                    coords = data[2],
+                    size = vec3(data[4], data[3], thickness), -- size uses the math to determine how high it needs to be
+                    rotation = data[5].heading,
+                    debug = data[5].debugPoly,
+                    options = options
+                })
+                return target
+            end,
+
+        circleTarget =
+            function(data, opts, dist)
+                local options = {}
+                for i = 1, #opts do
+                    options[i] = {
+                        icon = opts[i].icon,
+                        label = opts[i].label,
+                        items = opts[i].item or nil,
+                        groups = opts[i].job or opts[i].gang,
+                        onSelect = opts[i].onSelect or opts[i].action,
+                        distance = dist,
+                        canInteract = opts[i].canInteract or nil,
+                    }
+                end
+                local target = exports[OXTargetExport]:addSphereZone({
+                    coords = data[2],
+                    radius = data[3],
+                    debug = data[4].debugPoly,
+                    options = options
+                })
+                return target
+            end,
+
+        modelTarget =
+            function(models, opts, dist)
+                local options = {}
+                for i = 1, #opts do
+                    options[i] = {
+                        icon = opts[i].icon,
+                        label = opts[i].label,
+                        items = opts[i].item or nil,
+                        groups = opts[i].job or opts[i].gang,
+                        onSelect = opts[i].action,
+                        distance = dist,
+                        canInteract = opts[i].canInteract or nil,
+                    }
+                end
+                exports[OXTargetExport]:addModel(models, options)
+            end,
+
+        removeTargetEntity =
+            function(entity)
+                exports[OXTargetExport]:removeLocalEntity(entity, nil)
+            end,
+
+        removeTargetZone =
+            function(target)
+                exports[OXTargetExport]:removeZone(target, true)
+            end,
+
+        removeTargetModel =
+            function(model)
+                exports[OXTargetExport]:removeModel(model, nil)
+            end,
+    },
+
+    {   targetName = QBTargetExport,
+        entityTarget =
+            function(entity, opts, dist)
+                local options = { options = opts, distance = dist }
+                exports[QBTargetExport]:AddTargetEntity(entity, options)
+            end,
+
+        boxTarget =
+            function(data, opts, dist)
+                local options = { options = opts, distance = dist }
+                local target = exports[QBTargetExport]:AddBoxZone(data[1], data[2], data[3], data[4], data[5], options)
+                return data[1]
+            end,
+
+        circleTarget =
+            function(data, opts, dist)
+                local options = { options = opts, distance = dist }
+                local target = exports[QBTargetExport]:AddCircleZone(data[1], data[2], data[3], data[4], options)
+                return data[1]
+            end,
+
+        modelTarget =
+            function(models, opts, dist)
+                local options = { options = opts, distance = dist }
+                exports[QBTargetExport]:AddTargetModel(models, options)
+            end,
+
+        removeTargetEntity =
+            function(entity)
+                exports[QBTargetExport]:RemoveTargetEntity(entity)
+            end,
+
+        removeTargetZone =
+            function(target)
+                exports[QBTargetExport]:RemoveZone(target)
+            end,
+
+        removeTargetModel =
+            function(model)
+                exports[QBTargetExport]:RemoveTargetModel(model, "Test")
+            end,
+    },
+
+    {   targetName = "jim_bridge",
+        entityTarget =
+            function(entity, opts, dist)
+                return exports.jim_bridge:createEntityTarget(entity, opts, dist)
+            end,
+
+        boxTarget =
+            function(data, opts, dist)
+                return exports.jim_bridge:createZoneTarget(data, opts, dist)
+            end,
+
+        circleTarget =
+            function(data, opts, dist)
+                return exports.jim_bridge:createZoneTarget(data, opts, dist)
+            end,
+
+        modelTarget =
+            function(models, opts, dist)
+                return exports.jim_bridge:createModelTarget(models, opts, dist)
+            end,
+
+        removeTargetEntity =
+            function(entity)
+                exports.jim_bridge:removeEntityTarget(entity)
+            end,
+
+        removeTargetZone =
+            function(target)
+                exports.jim_bridge:removeZoneTarget(target)
+            end,
+
+        removeTargetModel =
+            function(model)
+                exports.jim_bridge:removeZoneTarget(model)
+            end,
+    },
 }
 
--- Target Creation --
+
--- Target Entities, this is more based on qb-target's style of target creation, and translates those into ox or qb-target code --
+
-local targetEntities = {}
+-------------------------------------------------------------
+-- Utility Data & Tables
+-------------------------------------------------------------
+
+
+-- Tables for storing created targets for the fallback system and zone management.
+local TextTargets    = {}   -- For fallback DrawText3D targets.
+local targetEntities = {}   -- For entity targets.
+local boxTargets     = {}   -- For box-shaped zone targets.
+local circleTargets  = {}   -- For circular zone targets.
+
+-------------------------------------------------------------
+-- Entity Target Creation
+-------------------------------------------------------------
 
 --- Creates a target for an entity with specified options and interaction distance.
+--- Supports different targeting systems (OX Target, QB Target, or custom DrawText3D)
+--- based on the server configuration.
 ---
---- This function supports different targeting systems (OX Target, QB Target, or custom DrawText3D targets)
+--- @param entity number The entity ID for which the target is created.
---- based on the server configuration. It translates qb-target style options into the appropriate format
+--- @param opts table Array of option tables. Each option should include:
---- for the detected targeting system.
+---        - icon (string): The icon to display.
+---        - label (string): The text label for the option.
+---        - item (string|nil): (Optional) An associated item.
+---        - job (string|nil): (Optional) The job required to interact.
+---        - gang (string|nil): (Optional) The gang required to interact.
+---        - action (function|nil): (Optional) The function executed on selection.
+--- @param dist number The interaction distance for the target.
 ---
----@param entity number The entity ID to create a target for.
+--- @usage
----@param opts table A table of option configurations for the target.
---- - **icon** (`string`): The icon to display for the option.
---- - **label** (`string`): The label text for the option.
---- - **item** (`string|nil`): (Optional) The item associated with the option.
---- - **job** (`string|nil`): (Optional) The job required to interact with the option.
---- - **gang** (`string|nil`): (Optional) The gang required to interact with the option.
---- - **action** (`function|nil`): (Optional) The function to execute when the option is selected.
----@param dist number The interaction distance for the target.
----
----@usage
 --- ```lua
---- createEntityTarget(entityId, {
+---createEntityTarget(entityId, {
----     { icon = "fas fa-car", label = "Open Vehicle", action = openVehicle },
+---   {
----     { icon = "fas fa-lock", label = "Lock Vehicle", action = lockVehicle }
+---       action = function()
---- }, 2.5)
+---           openStorage()
+---       end,
+---       icon = "fas fa-box",
+---       job = "police",
+---       label = "Open Storage",
+---   },
+---}, 2.0)
 --- ```
 function createEntityTarget(entity, opts, dist)
+    -- Store the target entity for later cleanup.
     targetEntities[#targetEntities + 1] = entity
-    local entityCoords = GetEntityCoords(entity)
-    if Config.System.DontUseTarget then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Entity^2 target with ^6DrawText ^7"..entity)
-        local existingTarget = nil
-        for key, target in pairs(TextTargets) do
-            if #(target.coords - entityCoords) < 0.01 then -- Adjust the threshold for coordinate matching
-                existingTarget = target
-                break
-            end
-        end
 
-        if existingTarget then
+    -- if force target off, use jim_bridge buiilt in target functions
-            -- Combine options
+    if Config.System.DontUseTarget then
-            local keyTable = { 38, 29, 303, 45, 46, 47, 48 } -- Extend key table as needed
+        exports.jim_bridge:createEntityTarget(entity, opts, dist)
-            for i = 1, #opts do
+        debugPrint("^6Bridge^7: ^2Creating new ^3Entity ^2target with ^6jim_bridge ^2for entity ^7"..entity)
-                local key = keyTable[#existingTarget.options + i]
+        return
-                opts[i].key = key
-                existingTarget.buttontext[#existingTarget.buttontext + 1] = " ~b~[~w~"..Keys[key].."~b~] ~w~"..opts[i].label
-                existingTarget.options[#existingTarget.options + 1] = opts[i]
-            end
-        else
-            -- Create new target
-            local tempText = {}
-            local keyTable = { 38, 29, 303, 45, 46, 47, 48 }
-            for i = 1, #opts do
-                opts[i].key = keyTable[i]
-                tempText[#tempText + 1] = " ~b~[~w~"..Keys[opts[i].key].."~b~] ~w~"..opts[i].label
-            end
-            TextTargets[entity] = { coords = vec3(entityCoords.x, entityCoords.y, entityCoords.z), buttontext = tempText, options = opts, dist = dist }
-        end
-    elseif isStarted(OXTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Entity^2 target with ^6"..OXTargetExport.." ^7"..entity)
-        local options = {}
-        for i = 1, #opts do
-            options[i] = {
-                icon = opts[i].icon,
-                label = opts[i].label,
-                item = opts[i].item or nil,
-                groups = opts[i].job or opts[i].gang,
-                onSelect = opts[i].action,
-                canInteract = function(_, distance)
-                    return distance < dist and true or false
-                end
-            }
-        end
-        exports[OXTargetExport]:addLocalEntity(entity, options)
-    elseif isStarted(QBTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Entity^2 target with ^6"..QBTargetExport.." ^7"..entity)
-        local options = { options = opts, distance = dist }
-        exports[QBTargetExport]:AddTargetEntity(entity, options)
     end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            debugPrint("^6Bridge^7: ^2Creating new ^3Entity ^2target with ^6"..script.targetName.." ^2for entity ^7"..entity)
+            return script.entityTarget(entity, opts, dist)
+        end
+    end
+
 end
 
-local boxTargets = {}
+-------------------------------------------------------------
+-- Box Zone Target Creation
+-------------------------------------------------------------
 
 --- Creates a box-shaped target zone with specified options and interaction distance.
----
+--- Supports different targeting systems based on the server configuration.
---- This function supports different targeting systems (OX Target, QB Target, or custom DrawText3D targets)
---- based on the server configuration. It translates qb-target style options into the appropriate format
---- for the detected targeting system.
----
 ---@param data table A table containing the box zone configuration.
---- - **name** (`string`): The name identifier for the zone.
+---     - name (`string`): The name identifier for the zone.
---- - **coords** (`vector3`): The center coordinates of the box.
+---     - coords (`vector3`): The center coordinates of the box.
---- - **width** (`number`): The width of the box.
+---     - width (`number`): The width of the box.
---- - **height** (`number`): The height of the box.
+---     - height (`number`): The height of the box.
---- - **options** (`table`): A table with additional options:
+---     - options (`table`): A table with additional options:
----   - **heading** (`number`): The rotation angle of the box.
+---     - heading (`number`): The rotation angle of the box.
----   - **debugPoly** (`boolean`): Whether to enable debug mode for the zone.
+---     - debugPoly (`boolean`): Whether to enable debug mode for the zone.
 ---
 ---@param opts table A table of option configurations for the target.
---- - **icon** (`string`): The icon to display for the option.
+---     - icon (`string`): The icon to display for the option.
---- - **label** (`string`): The label text for the option.
+---     - label (`string`): The label text for the option.
---- - **item** (`string|nil`): (Optional) The item associated with the option.
+---     - item (`string|nil`): (Optional) The item associated with the option.
---- - **job** (`string|nil`): (Optional) The job required to interact with the option.
+---     - job (`string|nil`): (Optional) The job required to interact with the option.
---- - **gang** (`string|nil`): (Optional) The gang required to interact with the option.
+---     - gang (`string|nil`): (Optional) The gang required to interact with the option.
---- - **onSelect** (`function|nil`): (Optional) The function to execute when the option is selected.
+---     - onSelect (`function|nil`): (Optional) The function to execute when the option is selected.
 ---@param dist number The interaction distance for the target.
 ---
 ---@return string|table name identifier or target object of the created zone.
 ---
 ---@usage
---- ```lua
+---```lua
---- createBoxTarget({
+---createBoxTarget(
----     name = 'storageBox',
+---   {
----     coords = vector3(100.0, 200.0, 30.0),
+---       'storageBox',
----     width = 2.0,
+---       vector3(100.0, 200.0, 30.0),
----     height = 2.0,
+---       2.0,
----     options = { heading = 0, debugPoly = false }
+---       2.0,
---- }, {
+---       {
----     { icon = "fas fa-box", label = "Open Storage", action = openStorage }
+---           name = 'storageBox',
---- }, 1.5)
+---           heading = 100.0,
---- ```
+---           debugPoly = true,
+---           minZ = 27.0,
+---           maxZ = 32.0,
+---       },
+---   },
+---{
+---   {
+---       action = function()
+---           openStorage()
+---       end,
+---       icon = "fas fa-box",
+---       job = "police",
+---       label = "Open Storage",
+---   },
+---}, 2.0)
+---```
 function createBoxTarget(data, opts, dist)
-    if Config.System.DontUseTarget then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Box^2 target with ^6DrawText ^7"..data[1])
-        local existingTarget = nil
-        for key, target in pairs(TextTargets) do
-            if #(target.coords - data[2]) < 0.01 then -- Adjust the threshold as needed for coordinate precision
-                existingTarget = target
-                break
-            end
-        end
-        local keyTable = { 38, 29, 303, 45, 46, 47, 48 }
 
-        if existingTarget then
+    -- if force target off, use jim_bridge buiilt in target functions
-            -- Combine options
+    if Config.System.DontUseTarget then
-            for i = 1, #opts do
+        debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6jim_bridge ^7"..data[1])
-                local key = keyTable[#existingTarget.options + i]
+        return exports.jim_bridge:createZoneTarget(data, opts, dist)
-                opts[i].key = key
-                existingTarget.buttontext[#existingTarget.buttontext+1] = " ~b~[~w~"..Keys[key].."~b~] ~w~"..opts[i].label
-                existingTarget.options[#existingTarget.options+1] = opts[i]
-            end
-        else
-            -- Create new target
-            local tempText = {}
-            for i = 1, #opts do
-                opts[i].key = keyTable[i]
-                tempText[#tempText+1] = " ~b~[~w~"..Keys[opts[i].key].."~b~] ~w~"..opts[i].label
-            end
-            TextTargets[data[1]] = { coords = data[2], buttontext = tempText, options = opts, dist = 1.5 }
-        end
-        return data[1]
-    elseif isStarted(OXTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Box^2 target with ^6"..OXTargetExport.." ^7"..data[1])
-        local options = {}
-        for i = 1, #opts do
-            options[i] = {
-                icon = opts[i].icon,
-                label = opts[i].label,
-                item = opts[i].item or nil,
-                groups = opts[i].job or opts[i].gang,
-                onSelect = opts[i].onSelect or opts[i].action,
-                canInteract = function(_, distance)
-                    return distance < dist and true or false
-                end
-            }
-        end
-        if not data[5].useZ then
-            local z = data[2].z + math.abs(data[5].maxZ - data[5].minZ) / 2
-            data[2] = vec3(data[2].x, data[2].y, z)
-        end
-        local target = exports[OXTargetExport]:addBoxZone({
-            coords = data[2],
-            size = vec3(data[4], data[3], (data[5].useZ or not data[5].maxZ) and data[2].z or math.abs(data[5].maxZ - data[5].minZ)),
-            rotation = data[5].heading,
-            debug = data[5].debugPoly,
-            options = options
-        })
-        boxTargets[#boxTargets+1] = target
-        return target
-    elseif isStarted(QBTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Box^2 target with ^6"..QBTargetExport.." ^7"..data[1])
-        local options = { options = opts, distance = dist }
-        local target = exports[QBTargetExport]:AddBoxZone(data[1], data[2], data[3], data[4], data[5], options)
-        boxTargets[#boxTargets+1] = target
-        return data[1]
     end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            debugPrint("^6Bridge^7: ^2Creating new ^3Box ^2target with ^6"..script.targetName.." ^7"..data[1])
+            local target = script.boxTarget(data, opts, dist)
+            boxTargets[#boxTargets + 1] = target
+            return target
+        end
+    end
+    return nil
 end
 
-local circleTargets = {}
+-------------------------------------------------------------
+-- Circle Zone Target Creation
+-------------------------------------------------------------
 
 --- Creates a circular target zone with specified options and interaction distance.
----
+--- Supports different targeting systems based on server configuration.
---- This function supports different targeting systems (OX Target, QB Target, or custom DrawText3D targets)
---- based on the server configuration. It translates qb-target style options into the appropriate format
---- for the detected targeting system.
 ---
 ---@param data table A table containing the circle zone configuration.
---- - **name** (`string`): The name identifier for the zone.
+---     - name (`string`): The name identifier for the zone.
---- - **coords** (`vector3`): The center coordinates of the circle.
+---     - coords (`vector3`): The center coordinates of the circle.
---- - **radius** (`number`): The radius of the circle.
+---     - radius (`number`): The radius of the circle.
---- - **options** (`table`): A table with additional options:
+---     - options (`table`): A table with additional options:
----   - **debugPoly** (`boolean`): Whether to enable debug mode for the zone.
+---     - debugPoly (`boolean`): Whether to enable debug mode for the zone.
 ---
 ---@param opts table A table of option configurations for the target.
---- - **icon** (`string`): The icon to display for the option.
+---     - icon (`string`): The icon to display for the option.
---- - **label** (`string`): The label text for the option.
+---     - label (`string`): The label text for the option.
---- - **item** (`string|nil`): (Optional) The item associated with the option.
+---     - item (`string|nil`): (Optional) The item associated with the option.
---- - **job** (`string|nil`): (Optional) The job required to interact with the option.
+---     - job (`string|nil`): (Optional) The job required to interact with the option.
---- - **gang** (`string|nil`): (Optional) The gang required to interact with the option.
+---     - gang (`string|nil`): (Optional) The gang required to interact with the option.
---- - **onSelect** (`function|nil`): (Optional) The function to execute when the option is selected.
+---     - onSelect (`function|nil`): (Optional) The function to execute when the option is selected.
 ---@param dist number The interaction distance for the target.
 ---
 ---@return string|table name identifier or target object of the created zone.
@@ -242,88 +382,104 @@ local circleTargets = {}
 --- }, 2.0)
 --- ```
 function createCircleTarget(data, opts, dist)
-    if Config.System.DontUseTarget then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Circle^2 target with ^6DrawText ^7"..data[1])
-        local existingTarget = nil
-        for key, target in pairs(TextTargets) do
-            if #(target.coords - data[2]) < 0.01 then -- Adjust the threshold for precision
-                existingTarget = target
-                break
-            end
-        end
 
-        if existingTarget then
+    -- if force target off, use jim_bridge buiilt in target functions
-            -- Combine options
+    if Config.System.DontUseTarget then
-            local keyTable = { 38, 29, 303, 45, 46, 47, 48 } -- Extend key table as needed
+        debugPrint("^6Bridge^7: ^2Creating new ^3Sphere ^2target with ^6jim_bridge ^7"..data[1])
-            for i = 1, #opts do
+        return exports.jim_bridge:createZoneTarget(data, opts, dist)
-                local key = keyTable[#existingTarget.options + i]
-                opts[i].key = key
-                existingTarget.buttontext[#existingTarget.buttontext+1] = " ~b~[~w~"..Keys[key].."~b~] ~w~"..opts[i].label
-                existingTarget.options[#existingTarget.options+1] = opts[i]
-            end
-        else
-            -- Create new target
-            local tempText = ""
-            local keyTable = { 38, 29, 303, 45, 46, 47, 48 }
-            for i = 1, #opts do
-                opts[i].key = keyTable[i]
-                tempText[#tempText+1] = " ~b~[~w~"..Keys[opts[i].key].."~b~] ~w~"..opts[i].label
-            end
-            TextTargets[data[1]] = { coords = data[2], buttontext = tempText, options = opts, dist = dist }
-        end
-        return data[1]
-    elseif isStarted(OXTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Sphere^2 target with ^6"..OXTargetExport.." ^7"..data[1])
-        local options = {}
-        for i = 1, #opts do
-            options[i] = {
-                icon = opts[i].icon,
-                label = opts[i].label,
-                item = opts[i].item or nil,
-                groups = opts[i].job or opts[i].gang,
-                onSelect = opts[i].onSelect or opts[i].action,
-                canInteract = function(_, distance)
-                    return distance < dist and true or false
-                end
-            }
-        end
-        local target = exports[OXTargetExport]:addSphereZone({
-            coords = data[2],
-            radius = data[3],
-            debug = data[4].debugPoly,
-            options = options
-        })
-        circleTargets[#circleTargets+1] = target
-        return target
-    elseif isStarted(QBTargetExport) then
-        debugPrint("^6Bridge^7: ^2Creating new ^3Circle^2 target with ^6"..QBTargetExport.." ^7"..data[1])
-        local options = { options = opts, distance = dist }
-        local target = exports[QBTargetExport]:AddCircleZone(data[1], data[2], data[3], data[4], options)
-        circleTargets[#circleTargets+1] = target
-        return data[1]
     end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            debugPrint("^6Bridge^7: ^2Creating new ^3Sphere ^2target with ^6"..script.targetName.." ^7"..data[1])
+            local target = script.circleTarget(data, opts, dist)
+            circleTargets[#circleTargets + 1] = target
+            return target
+        end
+    end
+
+    return nil
 end
 
--- Simple function to remove an entity target created within the script --
+-------------------------------------------------------------
---- Removes a previously created entity target.
+-- Model Target Creation
+-------------------------------------------------------------
+
+--- Creates a target for models with specified options and interaction distance.
+--- Supports different targeting systems (OX Target, QB Target) based on server configuration.
 ---
---- This function removes the target associated with the specified entity based on the active targeting system.
+--- @param models table Array of model identifiers.
+--- @param opts table Array of option tables (same structure as in createEntityTarget).
+--- @param dist number The interaction distance for the target.
+---
+--- @usage
+--- ```lua
+---createModelTarget({ model1, model2 },
+---{
+---   {
+---       action = function()
+---           openStorage()
+---       end,
+---       icon = "fas fa-box",
+---       job = "police",
+---       label = "Open Storage",
+---   },
+---}, 2.0)
+---```
+function createModelTarget(models, opts, dist)
+
+    -- if force target off, use jim_bridge buiilt in target functions
+    if Config.System.DontUseTarget then
+        debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6jim_bridge^7")
+        return exports.jim_bridge:createModelTarget(models, opts, dist)
+    end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6"..script.targetName.."^7")
+            local target = script.modelTarget(models, opts, dist)
+            circleTargets[#circleTargets + 1] = target
+            return target
+        end
+    end
+
+end
+
+-------------------------------------------------------------
+-- Target Removal Functions
+-------------------------------------------------------------
+
+--- Removes a previously created entity target.
 ---
 --- @param entity number The entity ID whose target should be removed.
 ---
 --- @usage
+--- ```lua
 --- removeEntityTarget(entityId)
+--- ```
 function removeEntityTarget(entity)
-    if isStarted(QBTargetExport) then exports[QBTargetExport]:RemoveTargetEntity(entity) end
+
-    if isStarted(OXTargetExport) then exports[OXTargetExport]:removeLocalEntity(entity, nil) end
+    if Config.System.DontUseTarget then
-    if Config.System.DontUseTarget then TextTargets[entity] = nil end
+        exports.jim_bridge:removeEntityTarget(entity)
+    end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            script.removeTargetEntity(entity)
+            break
+        end
+    end
+
 end
 
--- Simple function to remove circle or box targets in the script --
 --- Removes a previously created zone target.
 ---
---- This function removes the target associated with the specified zone based on the active targeting system.
----
 --- @param target string|table The name identifier or target object of the zone to remove.
 ---
 --- @usage
@@ -332,73 +488,89 @@ end
 --- removeZoneTarget(targetObject)
 --- ```
 function removeZoneTarget(target)
-    if isStarted(QBTargetExport) then exports[QBTargetExport]:RemoveZone(target) end
-    if isStarted(OXTargetExport) then exports[OXTargetExport]:removeZone(target, true) end
-    if Config.System.DontUseTarget then TextTargets[target] = nil end
-end
 
--- If no target script is found, default to DrawText3D targets -- * experimental *
+    if Config.System.DontUseTarget then
-if Config.System.DontUseTarget and not isServer() then
+        exports.jim_bridge:removeZoneTarget(target)
-    CreateThread(function()
+    end
-        while true do
-            local pedCoords = GetEntityCoords(PlayerPedId())
-            local camCoords = GetGameplayCamCoord()
-            local camRotation = GetGameplayCamRot(2) -- Get camera rotation in degrees
-            local camForwardVector = RotationToDirection(camRotation) -- Convert rotation to direction vector
 
-            local closestTarget = nil
+    -- Check for target script and use that
-            local closestDist = math.huge
+    for i = 1, #targetFunc do
-
+        local script = targetFunc[i]
-            for k, v in pairs(TextTargets) do
+        if isStarted(script.targetName) then
-                local targetCoords = v.coords
+            script.removeTargetZone(target)
-                local dist = #(pedCoords - targetCoords)
+            break
-                local vecToTarget = targetCoords - camCoords
-
-                -- Normalize the vector to the target
-                local vecToTargetNormalized = normalizeVector(vecToTarget)
-
-                -- Dot product to check if facing the target
-                local dot = camForwardVector.x * vecToTargetNormalized.x + camForwardVector.y * vecToTargetNormalized.y + camForwardVector.z * vecToTargetNormalized.z
-
-                local isFacingTarget = dot > 0.5 -- Adjust threshold as needed
-
-                if dist <= v.dist and isFacingTarget then
-                    if dist < closestDist then
-                        closestDist = dist
-                        closestTarget = v
-                    end
-                end
-            end
-
-            for k, v in pairs(TextTargets) do
-                local isClosest = (v == closestTarget)
-                if #(pedCoords - v.coords) <= v.dist then
-                    for i = 1, #v.options do
-                        if IsControlJustPressed(0, v.options[i].key) and isClosest then
-                            if v.options[i].onSelect then v.options[i].onSelect() end
-                            if v.options[i].action then v.options[i].action() end
-                        end
-                    end
-                    DrawText3D(vec3(v.coords.x, v.coords.y, v.coords.z + 0.7), concatenateText(v.buttontext), isClosest)
-                end
-            end
-            Wait(0)
         end
-    end)
+    end
 end
 
--- If the current loaded script is stopped, automatically remove targets --
+--- Removes a previously created model target.
-onResourceStop(function()
+---
+--- @param model table The model ID whose target should be removed.
+---
+--- @usage
+--- ```lua
+--- removeModelTarget(model)
+--- ```
+function removeModelTarget(model)
+
+    if Config.System.DontUseTarget then
+        exports.jim_bridge:removeZoneTarget(model)
+    end
+
+    -- Check for target script and use that
+    for i = 1, #targetFunc do
+        local script = targetFunc[i]
+        if isStarted(script.targetName) then
+            script.removeTargetModel(model)
+            break
+        end
+    end
+end
+
+function ShowFloatingHelpNotification(coord, text, highlight)
+    AddTextEntry("FloatingText", text)
+    SetFloatingHelpTextWorldPosition(1, coord.x, coord.y, coord.z)
+    SetFloatingHelpTextStyle(1, 1, 62, -1, 3, 0)
+    BeginTextCommandDisplayHelp("FloatingText")
+    EndTextCommandDisplayHelp(2, false, false, -1)
+end
+
+-------------------------------------------------------------
+-- Cleanup on Resource Stop
+-------------------------------------------------------------
+
+local function CleanupTargets()
+    -- Remove entity targets.
     for i = 1, #targetEntities do
-        if isStarted(OXTargetExport) then exports[OXTargetExport]:removeLocalEntity(targetEntities[i], nil)
+        if isStarted(OXTargetExport) then
-        elseif isStarted(QBTargetExport) then exports[QBTargetExport]:RemoveTargetEntity(targetEntities[i]) end
+            exports[OXTargetExport]:removeLocalEntity(targetEntities[i], nil)
+        elseif isStarted(QBTargetExport) then
+            exports[QBTargetExport]:RemoveTargetEntity(targetEntities[i])
+        end
     end
+    -- Remove box zone targets.
     for i = 1, #boxTargets do
-        if isStarted(OXTargetExport) then exports[OXTargetExport]:removeZone(boxTargets[i], true)
+        if isStarted(OXTargetExport) then
-        elseif isStarted(QBTargetExport) then exports[QBTargetExport]:RemoveZone(boxTargets[i].name) end
+            exports[OXTargetExport]:removeZone(boxTargets[i], true)
+        elseif isStarted(QBTargetExport) then
+            exports[QBTargetExport]:RemoveZone(boxTargets[i].name)
+        end
     end
+    -- Remove circle zone targets.
     for i = 1, #circleTargets do
-        if isStarted(OXTargetExport) then exports[OXTargetExport]:removeZone(circleTargets[i], true)
+        if isStarted(OXTargetExport) then
-        elseif isStarted(QBTargetExport) then exports[QBTargetExport]:RemoveZone(circleTargets[i].name) end
+            exports[OXTargetExport]:removeZone(circleTargets[i], true)
+        elseif isStarted(QBTargetExport) then
+            exports[QBTargetExport]:RemoveZone(circleTargets[i].name)
+        end
     end
+end
+
+onPlayerUnload(function()
+    CleanupTargets()
+end)
+
+-- When the current resource stops, remove all targets.
+onResourceStop(function()
+    CleanupTargets()
 end, true)

shared/vehicles.lua

@@ -1,22 +1,29 @@
--- Get Vehicle Info --
+--[[
-local lastCar = nil
+    Vehicle Info & Properties Module
-local carInfo = {}
+    ----------------------------------
+    This module provides utilities for:
+      - Retrieving vehicle information from a Vehicles table.
+      - Getting and setting vehicle properties using the active framework.
+      - Comparing vehicle property differences.
+      - Synchronizing vehicle properties across clients.
+      - Managing network control of vehicles.
+      - Finding the closest vehicle to a given position.
+]]
 
---- Searches the 'Vehicles' table for a specific vehicle's 'name', 'price', and 'class'.
+-- Cached vehicle info to avoid unnecessary re-searches.
+local lastCar, carInfo = nil, {}
+
+--- Searches the 'Vehicles' table for a specific vehicle's details.
+--- If the vehicle differs from the last searched, it retrieves its model and updates the carInfo table.
+--- The table includes the vehicle's name, price, and class information.
 ---
---- This function checks if the provided vehicle is different from the last searched vehicle.
+--- @param vehicle number The entity ID of the vehicle to search for.
---- If it's a new vehicle, it retrieves its model and searches the 'Vehicles' table for matching entries.
+--- @return table|nil table A table containing the vehicle's details or nil if the vehicle is invalid.
---- It populates the `carInfo` table with the vehicle's name, price, and class.
---- If the vehicle is not found in the table, it defaults to using the vehicle's display name and sets the price to 0.
 ---
----@param vehicle number The entity ID of the vehicle to search for.
+--- @usage
----
----@return table|nil table containing the vehicle's `name`, `price`, and `class`, or `nil` if the vehicle is invalid.
----
----@usage
 --- ```lua
 --- local info = searchCar(vehicleEntity)
---- print(info.name, info.price, info.class)
+--- print(info.name, info.price, info.class.name, info.class.index)
 --- ```
 function searchCar(vehicle)
     if lastCar ~= vehicle then -- If same car, use previous info
@@ -46,10 +53,11 @@ function searchCar(vehicle)
             "Military",          --20
             "Commercial",        --21
             "Trains",            --22
+            "Open Wheel",        --23
         }
         if Vehicles then
             for k, v in pairs(Vehicles) do
-                if tonumber(v.hash) == model or GetHashKey(v.hash) == model or GetHashKey(v.model) == model then
+                if tonumber(v.hash) == model or joaat(v.hash) == model or joaat(v.model) == model then
                     debugPrint("^6Bridge^7: ^2Vehicle info found in^7 ^4Vehicles^7 ^2table^7: ^6"..(v.hash and v.hash or v.model).. " ^7(^6"..Vehicles[k].name.."^7)")
                     carInfo.name = Vehicles[k].name.." "..Vehicles[k].brand
                     carInfo.price = Vehicles[k].price
@@ -78,61 +86,72 @@ function searchCar(vehicle)
     end
 end
 
--- Vehicle Properties --
+-------------------------------------------------------------
+-- Vehicle Properties Functions
+-------------------------------------------------------------
 
---- Retrieves the properties of a given vehicle.
+--- Retrieves the properties of a given vehicle using the active framework.
----
---- This function fetches the vehicle's properties based on the active framework (QBCore or ox).
---- It utilizes the framework's native functions or events to obtain the vehicle's mod list and other details.
 ---
 --- @param vehicle number The entity ID of the vehicle.
----
+--- @return table|nil table A table containing the vehicle's properties or nil if invalid.
---- @return table|nil table containing the vehicle's properties, or `nil` if the vehicle is invalid or the framework is not detected.
 ---
 --- @usage
 --- ```lua
 --- local props = getVehicleProperties(vehicleEntity)
 --- if props then
----     -- Manipulate vehicle properties
+---     -- Use vehicle properties
 --- end
 --- ```
 function getVehicleProperties(vehicle)
-    local properties = {}
+    if not vehicle then return nil end
-    if vehicle == nil then return nil end
+
-    if isStarted(QBExport) and not isStarted(QBXExport) then
+    local propertyFunc = {
-        properties = Core.Functions.GetVehicleProperties(vehicle)
+        { framework = OXLibExport,
-        debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
+            func = function(vehicle)
-    elseif isStarted(OXLibExport) then
+                return lib.getVehicleProperties(vehicle)
-        properties = lib.getVehicleProperties(vehicle)
+            end,
-        debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
+        },
+        { framework = QBExport,
+            func = function(vehicle)
+                return Core.Functions.GetVehicleProperties(vehicle)
+            end,
+        },
+    }
+    for i = 1, #propertyFunc do
+        local prop = propertyFunc[i]
+        if isStarted(prop.framework) then
+            local properties = prop.func(vehicle)
+            debugPrint("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..prop.framework.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]")
+            return properties
+        end
     end
-    return properties
+
+    return nil
 end
 
---- Sets the properties of a given vehicle.
+--- Sets the properties of a given vehicle if changes are detected.
+--- It compares the current properties with the new ones and applies the update using the active framework.
 ---
---- This function applies the provided properties to the vehicle using the active framework's functions or events.
+--- @param vehicle number The entity ID of the vehicle.
---- It first retrieves the current properties and checks for differences before applying the new ones.
+--- @param props table The new properties to apply.
 ---
----@param vehicle number The entity ID of the vehicle.
+--- @usage
----@param props table The properties to set on the vehicle.
----
----@usage
 --- ```lua
 --- setVehicleProperties(vehicleEntity, newProperties)
 --- ```
 function setVehicleProperties(vehicle, props)
-    local oldProps = getVehicleProperties(vehicle)
     if checkDifferences(vehicle, props) then
-        --if debugMode then debugDifferences(vehicle, props) end
         if not DoesEntityExist(vehicle) then
-            print(("Unable to set vehicle properties for '%s' (entity does not exist)"):format(vehicle))
+            print("Unable to set vehicle properties for '"..vehicle.."' (^1entity does not exist^7)")
         end
+
         if isStarted(QBExport) and not isStarted(QBXExport) then
             Core.Functions.SetVehicleProperties(vehicle, props)
             debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
-        else
+
-            TriggerServerEvent(getScript()..":ox:setVehicleProperties", VehToNet(vehicle), props)
+        elseif isStarted(OXLibExport) then
+            lib.setVehicleProperties(vehicle, props, false)
+            debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
         end
     else
         debugPrint("^6Bridge^7: ^2No Changes Found ^7 [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]")
@@ -140,16 +159,13 @@ function setVehicleProperties(vehicle, props)
 end
 
 --- Checks for differences between the current and new vehicle properties.
+--- Compares properties using JSON encoding for deep comparison and logs differences.
 ---
---- This function compares each property of the vehicle to determine if any changes have been made.
+--- @param vehicle number The entity ID of the vehicle.
---- It logs the differences for debugging purposes.
+--- @param newProps table The new properties to compare.
+--- @return boolean `true` if differences are found; `false` otherwise.
 ---
----@param vehicle number The entity ID of the vehicle.
+--- @usage
----@param newProps table The new properties to compare against the current ones.
----
----@return boolean `true` if differences are found, `false` otherwise.
----
----@usage
 --- ```lua
 --- if checkDifferences(vehicleEntity, newProperties) then
 ---     setVehicleProperties(vehicleEntity, newProperties)
@@ -158,58 +174,58 @@ end
 function checkDifferences(vehicle, newProps)
     local oldProps = getVehicleProperties(vehicle)
     debugPrint("^6Bridge^7: ^2Finding differences in ^3Vehicle Properties^7")
-    local allow = false
+    local differencesFound = true
+
     for k in pairs(oldProps) do
         if json.encode(oldProps[k]) ~= json.encode(newProps[k]) then
-            allow = true
+            differencesFound = true
             debugPrint("^6Bridge^7: ^5Old ^7[^3"..k.."^7] - "..json.encode(oldProps[k], { indent = true }))
             debugPrint("^6Bridge^7: ^5New ^7[^3"..k.."^7] - "..json.encode(newProps[k], { indent = true }))
         end
     end
-    return allow
+
+    return differencesFound
 end
 
---- Handles setting vehicle properties received from the server.
+-------------------------------------------------------------
+-- Vehicle Properties Synchronization
+-------------------------------------------------------------
+
+--- Event handler for setting vehicle properties received from the server.
+--- Listens for the `ox:setVehicleProperties` event and applies the properties.
 ---
---- This event listens for the `ox:setVehicleProperties` event and applies the received properties to the vehicle.
+--- @event `getScript()..ox:setVehicleProperties`
----
+--- @param netId number The network ID of the vehicle.
----@event
+--- @param props table The new vehicle properties.
----@param netId number The network ID of the vehicle.
----@param props table The properties to set on the vehicle.
----
----@usage
---- -- Server-side: TriggerClientEvent(getScript()..":ox:setVehicleProperties", netId, properties)
 RegisterNetEvent(getScript()..":ox:setVehicleProperties", function(netId, props)
     local vehicle = NetworkGetEntityFromNetworkId(netId)
     local value = props
     Entity(vehicle).state[getScript()..':setVehicleProperties'] = value
 end)
 
---- Handles state bag changes for setting vehicle properties.
+--- Handles state bag changes for updating vehicle properties.
+--- When the state bag changes, the new properties are applied to the vehicle.
 ---
---- This handler listens for changes to the vehicle's state bag and applies the new properties accordingly.
+--- @param bagName string The state bag's name.
----
+--- @param key string The key that changed.
----@param bagName string The name of the state bag.
+--- @param value table The new state value.
----@param key string The key that changed.
----@param value table The new value of the state.
----
----@usage
---- -- Automatically handled when the state bag changes
 AddStateBagChangeHandler(getScript()..':setVehicleProperties', '', function(bagName, _, value)
     if not value or not GetEntityFromStateBagName then return end
     local entity = GetEntityFromStateBagName(bagName)
     local networked = not bagName:find('localEntity')
     debugPrint("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..entity.."^7] - [^3"..GetEntityModel(entity).."^7] - [^3"..value.plate.."^7]")
 
-    if networked and NetworkGetEntityOwner(entity) ~= cache.playerId then return end
+    if networked then return end
 
     if lib.setVehicleProperties(entity, value) then
         Entity(entity).state:set('setVehicleProperties', nil, true)
     end
 end)
 
---- Pushes a vehicle to other players by syncing it.
+-------------------------------------------------------------
----
+-- Vehicle Control Functions
+-------------------------------------------------------------
+
 --- This function ensures that the vehicle is controlled by the current player and is set as a mission entity.
 --- It requests network control and sets the vehicle accordingly to synchronize changes across clients.
 ---
@@ -222,8 +238,9 @@ end)
 function pushVehicle(entity)
     SetVehicleModKit(entity, 0)
     if entity ~= 0 and DoesEntityExist(entity) then
+        -- Request network control if not already controlled.
         if not NetworkHasControlOfEntity(entity) then
-            debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Requesting network control of vehicle^7.")
+            debugPrint("^6Bridge^7: ^3pushEnt^7: ^2Requesting network control of vehicle^7.")
             NetworkRequestControlOfEntity(entity)
             local timeout = 2000
             while timeout > 0 and not NetworkHasControlOfEntity(entity) do
@@ -231,11 +248,13 @@ function pushVehicle(entity)
                 timeout = timeout - 100
             end
             if NetworkHasControlOfEntity(entity) then
-                debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Network has control of entity^7.")
+                debugPrint("^6Bridge^7: ^3pushEnt^7: ^2Network now has control of the entity^7.")
             end
         end
+
+        -- Set as mission entity if not already set.
         if not IsEntityAMissionEntity(entity) then
-            debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Setting vehicle as a ^7'^2mission^7' &2entity^7.")
+            debugPrint("^6Bridge^7: ^3pushEnt^7: ^2Setting vehicle as a ^7'^2mission^7' ^2entity^7.")
             SetEntityAsMissionEntity(entity, true, true)
             local timeout = 2000
             while timeout > 0 and not IsEntityAMissionEntity(entity) do
@@ -243,8 +262,118 @@ function pushVehicle(entity)
                 timeout = timeout - 100
             end
             if IsEntityAMissionEntity(entity) then
-                debugPrint("^6Bridge^7: ^3pushVehicle^7: ^2Vehicle is a ^7'^2mission^7'^2 entity^7.")
+                debugPrint("^6Bridge^7: ^3pushEnt^7: ^2Vehicle is a ^7'^2mission^7'^2 entity^7.")
             end
         end
     end
 end
+
+-- add entitty named version
+function pushEnt(...) pushVehicle(...) end
+
+
+--- Finds the closest vehicle to the specified coordinates.
+--- The function uses different APIs based on whether a source is provided.
+---
+--- @param coords table|vector3 (Optional) The reference coordinates. If nil, uses the player's position.
+--- @param src boolean (Optional) If true, uses GetPlayerPed(source) and GetAllVehicles.
+--- @return number closestVehicle The closest vehicle entity and its distance.
+--- @return number closestDistance The distance of the closest vehicle.
+---
+--- @usage
+--- ```lua
+--- local closestVeh, distance = getClosestVehicle({ x = 100, y = 200, z = 30 }, src)
+--- ```
+function getClosestVehicle(coords, src)
+    local ped, vehicles, closestDistance, closestVehicle
+
+    if src then
+        -- if checking server side cache src's ped and use server native
+        ped = GetPlayerPed(src)
+        vehicles = GetAllVehicles()
+    else
+        -- if checking client side cache local ped and use client native
+        ped = PlayerPedId()
+        vehicles = GetGamePool('CVehicle')
+    end
+
+    local closestDistance, closestVehicle = -1, -1
+
+    if coords then
+        if type(coords) == 'table' then
+            coords = vec3(coords.x, coords.y, coords.z)
+        end
+    else
+        coords = GetEntityCoords(ped)
+    end
+
+    for i = 1, #vehicles, 1 do
+        local vehicleCoords = GetEntityCoords(vehicles[i])
+        local distance = #(vehicleCoords - coords.xyz)
+
+        if closestDistance == -1 or distance < closestDistance then
+            closestDistance = distance
+            closestVehicle = vehicles[i]
+        end
+    end
+
+    return closestVehicle, closestDistance
+end
+
+--- Checks whether a vehicle is owned or not using the plate as reference
+---
+--- @param plate string The plate of the vehicle to check
+--- @return boolean whether vehicle is owned
+---
+--- @usage
+--- ```lua
+--- local plate = "ABCD1234"
+--- local isVehicleOwned = isVehicleOwned(plate)
+--- ```
+
+local vehiclesOwned = {}
+
+function isVehicleOwned(plate)
+    -- If already checked, cache it to reduce database calls
+    if vehiclesOwned[plate] == true then
+        return true
+    else
+        -- Find frameworks vehicle table and search sql for if vehicle plate is owned
+        local sqlTable = "player_vehicles"
+        local vehDatabase = {
+
+            {   framework = ESXExport,
+                sqlTable = "owned_vehicles"
+            },
+
+            {   framework = QBExport,
+                sqlTable = "player_vehicles"
+            },
+
+            {   framework = QBXExport,
+                sqlTable = "player_vehicles"
+            },
+
+            {   framework = OXCoreExport,
+                sqlTable = "owned_vehicles"
+            },
+
+        }
+
+        for i = 1, #vehDatabase do
+            local framework = vehDatabase[i]
+            if isStarted(framework.framework) then
+                sqlTable = framework.sqlTable
+                break
+            end
+        end
+
+        local result = MySQL.query.await("SELECT 1 from "..sqlTable.." WHERE plate = ?", { plate })
+        if json.encode(result) ~= "[]" then
+            vehiclesOwned[plate] = true     -- Cache ownership for later checks
+            return true
+        else
+            return false
+        end
+    end
+end

shared/versioncheck.lua

@@ -1,47 +0,0 @@
--- Version check for jim_bridge --
-function CheckBridgeVersion()
-	if isServer() then
-        local currentVersion = "^3"..GetResourceMetadata("jim_bridge", 'version'):gsub("%.", "^7.^3").."^7"
-        PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, newestVersion, headers)
-            if not newestVersion then print("^1Currently unable to run a version check for ^7'^3jim_bridge^7' ("..currentVersion.."^7)") return end
-            newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
-            print(newestVersion == currentVersion and "^7'^3jim_bridge^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3jim_bridge^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
-		end)
-	end
-end
---CheckBridgeVersion()
-
--- Print Script names
-function capitalize(str)
-    return (str:gsub("^%l", string.upper):gsub("%-%l", function(letter) return "-" .. string.upper(letter:sub(2)) end))
-end
-
-local scriptName = ("^2"..capitalize(getScript()):gsub("%-", "^7-^2"):gsub("%_", "^7_^2")) or ""
-local scriptVersion = ("^5"..GetResourceMetadata(getScript(), 'version', nil):gsub("%.", "^7.^5")) or ""
-local scriptDescription = ("^2"..GetResourceMetadata(getScript(), 'description', nil)) or ""
-local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil):gsub("%and", "^7and^4")) or ""
-
-print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
-
--- Loaded script Version Check, requires CheckVersion() to be placed in a server file
-function CheckVersion()
-	if isServer() then
-		local currentVersion = "^3"..GetResourceMetadata(getScript(), 'version'):gsub("%.", "^7.^3").."^7"
-		PerformHttpRequest('https://raw.githubusercontent.com/jimathy/UpdateVersions/master/'..getScript()..'.txt', function(err, newestVersion, headers)
-			if not newestVersion then
-				PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..getScript()..'/master/version.txt', function(err, freeVersion, headers)
-					if not freeVersion then print("^1Currently unable to run a version check for ^7'^3"..getScript().."^7' ("..currentVersion.."^7)") return end
-					local currentVersion = "^3"..GetResourceMetadata(getScript(), 'version'):gsub("%.", "^7.^3").."^7"
-					freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
-					print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..freeVersion)
-					print(freeVersion == currentVersion and "^7'^3"..getScript().."^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3"..getScript().."^7' - ^1You are currently running an outdated version^7, ^1please update^7!")
-				end)
-			else
-				newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7"
-				print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..newestVersion)
-				print(newestVersion == currentVersion and '^6You are running the latest version.^7 ('..currentVersion..')' or "^1You are currently running an outdated version^7, ^1please update^7!")
-			end
-		end)
-	end
-end
---CheckVersion()

shared/warmenu.lua

@@ -0,0 +1,694 @@
+WarMenu = { }
+WarMenu.__index = WarMenu
+
+if not isServer() then
+
+-- Deprecated
+WarMenu.debug = false
+function WarMenu.SetDebugEnabled(enabled)
+end
+function WarMenu.IsDebugEnabled()
+	return false
+end
+---
+
+local menus = { }
+local keys = { down = 187, scrollDown = 242, up = 188, scrollUp = 241, left = 189, right = 190, select = 191, accept = 237, back = 194, cancel = 238 }
+
+local skipInputNextFrame = true
+local optionCount = 0
+
+local currentKey = nil
+local currentMenu = nil
+
+local toolTipWidth = 0.153
+
+local spriteWidth = 0.027
+local spriteHeight = spriteWidth * GetAspectRatio()
+
+local titleHeight = 0.101
+local titleYOffset = 0.021
+local titleFont = 1
+local titleScale = 1.0
+
+local buttonHeight = 0.038
+local buttonFont = 0
+local buttonScale = 0.365
+local buttonTextXOffset = 0.005
+local buttonTextYOffset = 0.005
+local buttonSpriteXOffset = 0.002
+local buttonSpriteYOffset = 0.005
+
+local defaultStyle = {
+	x = 0.0175,
+	y = 0.025,
+	width = 0.23,
+	maxOptionCountOnScreen = 10,
+	titleVisible = true,
+	titleColor = { 0, 0, 0, 255 },
+	titleBackgroundColor = { 245, 127, 23, 255 },
+	titleBackgroundSprite = nil,
+	subTitleColor = { 245, 127, 23, 255 },
+	textColor = { 254, 254, 254, 255 },
+	subTextColor = { 189, 189, 189, 255 },
+	focusTextColor = { 0, 0, 0, 255 },
+	focusColor = { 245, 245, 245, 255 },
+	backgroundColor = { 0, 0, 0, 160 },
+	subTitleBackgroundColor = { 0, 0, 0, 255 },
+	buttonPressedSound = { name = 'SELECT', set = 'HUD_FRONTEND_DEFAULT_SOUNDSET' }, --https://pastebin.com/0neZdsZ5
+}
+
+local function IsNavigatedDown()
+	return IsControlJustReleased(2, keys.down) or IsControlJustReleased(2, keys.scrollDown)
+end
+
+local function IsNavigatedUp()
+	return IsControlJustReleased(2, keys.up) or IsControlJustReleased(2, keys.scrollUp)
+end
+
+local function IsSelectedPressed()
+	return IsControlJustReleased(2, keys.select) or IsControlJustReleased(2, keys.accept)
+end
+
+local function IsBackPressed()
+	return IsControlJustReleased(2, keys.back) or IsControlJustReleased(2, keys.cancel)
+end
+
+local function setMenuProperty(id, property, value)
+	if not id then
+		return
+	end
+
+	local menu = menus[id]
+	if menu then
+		menu[property] = value
+	end
+end
+
+local function setStyleProperty(id, property, value)
+	if not id then
+		return
+	end
+
+	local menu = menus[id]
+
+	if menu then
+		if not menu.overrideStyle then
+			menu.overrideStyle = { }
+		end
+
+		menu.overrideStyle[property] = value
+	end
+end
+
+local function getStyleProperty(property, menu)
+	menu = menu or currentMenu
+
+	if menu.overrideStyle then
+		local value = menu.overrideStyle[property]
+		if value ~= nil then
+			return value
+		end
+	end
+
+	return menu.style and menu.style[property] or defaultStyle[property]
+end
+
+local function getTitleHeight()
+	return getStyleProperty('titleVisible') and titleHeight or 0
+end
+
+local function copyTable(t)
+	if type(t) ~= 'table' then
+		return t
+	end
+
+	local result = { }
+	for k, v in pairs(t) do
+		result[k] = copyTable(v)
+	end
+
+	return result
+end
+
+local function setMenuVisible(id, visible, holdCurrentOption)
+	if currentMenu then
+		if visible then
+			if currentMenu.id == id then
+				return
+			end
+		else
+			if currentMenu.id ~= id then
+				return
+			end
+		end
+	end
+
+	if visible then
+		local menu = menus[id]
+
+		if not currentMenu then
+			menu.currentOption = 1
+		else
+			if not holdCurrentOption then
+				menus[currentMenu.id].currentOption = 1
+			end
+		end
+
+		currentMenu = menu
+		skipInputNextFrame = true
+
+		SetUserRadioControlEnabled(false)
+		HudWeaponWheelIgnoreControlInput(true)
+	else
+		HudWeaponWheelIgnoreControlInput(false)
+		SetUserRadioControlEnabled(true)
+
+		currentMenu = nil
+	end
+end
+
+local function setTextParams(font, color, scale, center, shadow, alignRight, wrapFrom, wrapTo)
+	SetTextFont(font)
+	SetTextColour(color[1], color[2], color[3], color[4] or 255)
+	SetTextScale(scale, scale)
+
+	if shadow then
+		SetTextDropShadow()
+	end
+
+	if center then
+		SetTextCentre(true)
+	elseif alignRight then
+		SetTextRightJustify(true)
+	end
+
+	if not wrapFrom or not wrapTo then
+		wrapFrom = wrapFrom or getStyleProperty('x')
+		wrapTo = wrapTo or getStyleProperty('x') + getStyleProperty('width') - buttonTextXOffset
+	end
+
+	SetTextWrap(wrapFrom, wrapTo)
+end
+
+local function getLinesCount(text, x, y)
+	BeginTextCommandLineCount('TWOSTRINGS')
+	AddTextComponentString(tostring(text))
+	return EndTextCommandGetLineCount(x, y)
+end
+
+local function drawText(text, x, y)
+	BeginTextCommandDisplayText('TWOSTRINGS')
+	AddTextComponentString(tostring(text))
+	EndTextCommandDisplayText(x, y)
+end
+
+local function drawRect(x, y, width, height, color)
+	DrawRect(x, y, width, height, color[1], color[2], color[3], color[4] or 255)
+end
+
+local function getCurrentIndex()
+	if currentMenu.currentOption <= getStyleProperty('maxOptionCountOnScreen') and optionCount <= getStyleProperty('maxOptionCountOnScreen') then
+		return optionCount
+	elseif optionCount > currentMenu.currentOption - getStyleProperty('maxOptionCountOnScreen') and optionCount <= currentMenu.currentOption then
+		return optionCount - (currentMenu.currentOption - getStyleProperty('maxOptionCountOnScreen'))
+	end
+
+	return nil
+end
+
+local function drawTitle()
+	if not getStyleProperty('titleVisible') then
+		return
+	end
+
+	local x = getStyleProperty('x') + getStyleProperty('width') / 2
+	local y = getStyleProperty('y') + titleHeight / 2
+
+	if getStyleProperty('titleBackgroundSprite') then
+		DrawSprite(getStyleProperty('titleBackgroundSprite').dict, getStyleProperty('titleBackgroundSprite').name, x, y, getStyleProperty('width'), titleHeight, 0., 255, 255, 255, 255)
+	else
+		drawRect(x, y, getStyleProperty('width'), titleHeight, getStyleProperty('titleBackgroundColor'))
+	end
+
+	if currentMenu.title then
+		setTextParams(titleFont, getStyleProperty('titleColor'), titleScale, true)
+		drawText(currentMenu.title, x, y - titleHeight / 2 + titleYOffset)
+	end
+end
+
+local function drawSubTitle()
+	local x = getStyleProperty('x') + getStyleProperty('width') / 2
+	local y = getStyleProperty('y') + getTitleHeight() + buttonHeight / 2
+
+	drawRect(x, y, getStyleProperty('width'), buttonHeight, getStyleProperty('subTitleBackgroundColor'))
+
+	setTextParams(buttonFont, getStyleProperty('subTitleColor'), buttonScale, false)
+	drawText(currentMenu.subTitle, getStyleProperty('x') + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset)
+
+	if optionCount > getStyleProperty('maxOptionCountOnScreen') then
+		setTextParams(buttonFont, getStyleProperty('subTitleColor'), buttonScale, false, false, true)
+		drawText(tostring(currentMenu.currentOption)..' / '..tostring(optionCount), getStyleProperty('x') + getStyleProperty('width'), y - buttonHeight / 2 + buttonTextYOffset)
+	end
+end
+
+local function drawButton(text, subText)
+	local currentIndex = getCurrentIndex()
+	if not currentIndex then
+		return
+	end
+
+	local backgroundColor = nil
+	local textColor = nil
+	local subTextColor = nil
+	local shadow = false
+
+	if currentMenu.currentOption == optionCount then
+		backgroundColor = getStyleProperty('focusColor')
+		textColor = getStyleProperty('focusTextColor')
+		subTextColor = getStyleProperty('focusTextColor')
+	else
+		backgroundColor = getStyleProperty('backgroundColor')
+		textColor = getStyleProperty('textColor')
+		subTextColor = getStyleProperty('subTextColor')
+		shadow = true
+	end
+
+	local x = getStyleProperty('x') + getStyleProperty('width') / 2
+	local y = getStyleProperty('y') + getTitleHeight() + buttonHeight + (buttonHeight * currentIndex) - buttonHeight / 2
+
+	drawRect(x, y, getStyleProperty('width'), buttonHeight, backgroundColor)
+
+	setTextParams(buttonFont, textColor, buttonScale, false, shadow)
+	drawText(text, getStyleProperty('x') + buttonTextXOffset, y - (buttonHeight / 2) + buttonTextYOffset)
+
+	if subText then
+		setTextParams(buttonFont, subTextColor, buttonScale, false, shadow, true)
+		drawText(subText, getStyleProperty('x') + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset)
+	end
+end
+
+function WarMenu.CreateMenu(id, title, subTitle, style)
+	-- Default settings
+	local menu = { }
+
+	-- Members
+	menu.id = id
+	menu.previousMenu = nil
+	menu.currentOption = 1
+	menu.title = title
+	menu.subTitle = subTitle and string.upper(subTitle) or 'INTERACTION MENU'
+
+	-- Style
+	if style then
+		menu.style = style
+	end
+
+	menus[id] = menu
+end
+
+function WarMenu.CreateSubMenu(id, parent, subTitle, style)
+	local parentMenu = menus[parent]
+	if not parentMenu then
+		return
+	end
+
+	WarMenu.CreateMenu(id, parentMenu.title, subTitle and string.upper(subTitle) or parentMenu.subTitle)
+
+	local menu = menus[id]
+
+	menu.previousMenu = parent
+
+	if parentMenu.overrideStyle then
+		menu.overrideStyle = copyTable(parentMenu.overrideStyle)
+	end
+
+	if style then
+		menu.style = style
+	elseif parentMenu.style then
+		menu.style = copyTable(parentMenu.style)
+	end
+end
+
+function WarMenu.CurrentMenu()
+	return currentMenu and currentMenu.id or nil
+end
+
+function WarMenu.OpenMenu(id)
+	if id and menus[id] then
+		PlaySoundFrontend(-1, 'SELECT', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+		setMenuVisible(id, true, true)
+	end
+end
+
+function WarMenu.IsMenuOpened(id)
+	return currentMenu and currentMenu.id == id
+end
+WarMenu.Begin = WarMenu.IsMenuOpened
+
+function WarMenu.IsAnyMenuOpened()
+	return currentMenu ~= nil
+end
+
+function WarMenu.IsMenuAboutToBeClosed()
+	return false
+end
+
+function WarMenu.CloseMenu()
+	if currentMenu then
+		setMenuVisible(currentMenu.id, false)
+		optionCount = 0
+		currentKey = nil
+		PlaySoundFrontend(-1, 'QUIT', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+	end
+end
+
+function WarMenu.ToolTip(text, width, flipHorizontal)
+	if not currentMenu then
+		return
+	end
+
+	local currentIndex = getCurrentIndex()
+	if not currentIndex then
+		return
+	end
+
+	width = width or toolTipWidth
+
+	local x = nil
+	if not flipHorizontal then
+		x = getStyleProperty('x') + getStyleProperty('width') + width / 2 + buttonTextXOffset
+	else
+		x = getStyleProperty('x') - width / 2 - buttonTextXOffset
+	end
+
+	local textX = x - (width / 2) + buttonTextXOffset
+	setTextParams(buttonFont, getStyleProperty('textColor'), buttonScale, false, true, false, textX, textX + width - (buttonTextYOffset * 2))
+	local linesCount = getLinesCount(text, textX, getStyleProperty('y'))
+
+	local height = GetTextScaleHeight(buttonScale, buttonFont) * (linesCount + 1) + buttonTextYOffset
+	local y = getStyleProperty('y') + getTitleHeight() + (buttonHeight * currentIndex) + height / 2
+
+	drawRect(x, y, width, height, getStyleProperty('backgroundColor'))
+
+	y = y - (height / 2) + buttonTextYOffset
+	drawText(text, textX, y)
+end
+
+function WarMenu.Button(text, subText)
+	if not currentMenu then
+		return
+	end
+
+	optionCount = optionCount + 1
+
+	drawButton(text, subText)
+
+	local pressed = false
+
+	if currentMenu.currentOption == optionCount then
+		if currentKey == keys.select then
+			pressed = true
+			PlaySoundFrontend(-1, getStyleProperty('buttonPressedSound').name, getStyleProperty('buttonPressedSound').set, true)
+		elseif currentKey == keys.left or currentKey == keys.right then
+			PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+		end
+	end
+
+	return pressed
+end
+
+function WarMenu.SpriteButton(text, dict, name, r, g, b, a)
+	if not currentMenu then
+		return
+	end
+
+	local pressed = WarMenu.Button(text)
+
+	local currentIndex = getCurrentIndex()
+	if not currentIndex then
+		return
+	end
+
+	if not HasStreamedTextureDictLoaded(dict) then
+		RequestStreamedTextureDict(dict)
+	end
+	DrawSprite(dict, name, getStyleProperty('x') + getStyleProperty('width') - spriteWidth / 2 - buttonSpriteXOffset, getStyleProperty('y') + getTitleHeight() + buttonHeight + (buttonHeight * currentIndex) - spriteHeight / 2 + buttonSpriteYOffset, spriteWidth, spriteHeight, 0., r or 255, g or 255, b or 255, a or 255)
+
+	return pressed
+end
+
+function WarMenu.InputButton(text, windowTitleEntry, defaultText, maxLength, subText)
+	if not currentMenu then
+		return
+	end
+
+	local pressed = WarMenu.Button(text, subText)
+	local inputText = nil
+
+	if pressed then
+		DisplayOnscreenKeyboard(1, windowTitleEntry or 'FMMC_MPM_NA', '', defaultText or '', '', '', '', maxLength or 255)
+
+		while true do
+			DisableAllControlActions(0)
+
+			local status = UpdateOnscreenKeyboard()
+			if status == 2 then
+				break
+			elseif status == 1 then
+				inputText = GetOnscreenKeyboardResult()
+				break
+			end
+
+			Citizen.Wait(0)
+		end
+	end
+
+	return pressed, inputText
+end
+
+function WarMenu.MenuButton(text, id, subText)
+	if not currentMenu then
+		return
+	end
+
+	local pressed = WarMenu.Button(text, subText)
+
+	if pressed then
+		currentMenu.currentOption = optionCount
+		setMenuVisible(currentMenu.id, false)
+		setMenuVisible(id, true, true)
+	end
+
+	return pressed
+end
+
+function WarMenu.CheckBox(text, checked, callback)
+	if not currentMenu then
+		return
+	end
+
+	local name = nil
+	if currentMenu.currentOption == optionCount + 1 then
+		name = checked and 'shop_box_tickb' or 'shop_box_blankb'
+	else
+		name = checked and 'shop_box_tick' or 'shop_box_blank'
+	end
+
+	local pressed = WarMenu.SpriteButton(text, 'commonmenu', name)
+
+	if pressed then
+		checked = not checked
+		if callback then callback(checked) end
+	end
+
+	return pressed
+end
+
+function WarMenu.ComboBox(text, items, currentIndex, selectedIndex, callback)
+	if not currentMenu then
+		return
+	end
+
+	local itemsCount = #items
+	local selectedItem = items[currentIndex]
+	local isCurrent = currentMenu.currentOption == optionCount + 1
+	selectedIndex = selectedIndex or currentIndex
+
+	if itemsCount > 1 and isCurrent then
+		selectedItem = '← '..tostring(selectedItem)..' →'
+	end
+
+	local pressed = WarMenu.Button(text, selectedItem)
+
+	if pressed then
+		selectedIndex = currentIndex
+	elseif isCurrent then
+		if currentKey == keys.left then
+			if currentIndex > 1 then currentIndex = currentIndex - 1 else currentIndex = itemsCount end
+		elseif currentKey == keys.right then
+			if currentIndex < itemsCount then currentIndex = currentIndex + 1 else currentIndex = 1 end
+		end
+	end
+
+	if callback then callback(currentIndex, selectedIndex) end
+	return pressed, currentIndex
+end
+
+function WarMenu.Display()
+	if currentMenu then
+		if not IsPauseMenuActive() then
+			ClearAllHelpMessages()
+			HudWeaponWheelIgnoreSelection()
+			DisablePlayerFiring(PlayerId(), true)
+			DisableControlAction(0, 25, true)
+
+			drawTitle()
+			drawSubTitle()
+
+			currentKey = nil
+
+			if skipInputNextFrame then
+				skipInputNextFrame = false
+			else
+				if IsNavigatedDown() then
+					PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+
+					if currentMenu.currentOption < optionCount then
+						currentMenu.currentOption = currentMenu.currentOption + 1
+					else
+						currentMenu.currentOption = 1
+					end
+				elseif IsNavigatedUp() then
+					PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+
+					if currentMenu.currentOption > 1 then
+						currentMenu.currentOption = currentMenu.currentOption - 1
+					else
+						currentMenu.currentOption = optionCount
+					end
+				elseif IsControlJustReleased(2, keys.left) then
+					currentKey = keys.left
+				elseif IsControlJustReleased(2, keys.right) then
+					currentKey = keys.right
+				elseif IsSelectedPressed() then
+					currentKey = keys.select
+				elseif IsBackPressed() then
+					if menus[currentMenu.previousMenu] then
+						setMenuVisible(currentMenu.previousMenu, true)
+						PlaySoundFrontend(-1, 'BACK', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true)
+					else
+						WarMenu.CloseMenu()
+					end
+				end
+			end
+		end
+
+		optionCount = 0
+	end
+end
+WarMenu.End = WarMenu.Display
+
+function WarMenu.CurrentOption()
+	if currentMenu and optionCount ~= 0 then
+		return currentMenu.currentOption
+	end
+
+	return nil
+end
+
+function WarMenu.IsItemHovered()
+	if not currentMenu or optionCount == 0 then
+		return false
+	end
+
+	return currentMenu.currentOption == optionCount
+end
+
+function WarMenu.IsItemSelected()
+	return currentKey == keys.select and WarMenu.IsItemHovered()
+end
+
+function WarMenu.SetTitle(id, title)
+	setMenuProperty(id, 'title', title)
+end
+WarMenu.SetMenuTitle = WarMenu.SetTitle
+
+function WarMenu.SetSubTitle(id, text)
+	setMenuProperty(id, 'subTitle', string.upper(text))
+end
+WarMenu.SetMenuSubTitle = WarMenu.SetSubTitle
+
+function WarMenu.SetMenuStyle(id, style)
+	setMenuProperty(id, 'style', style)
+end
+
+function WarMenu.SetMenuTitleVisible(id, visible)
+	setStyleProperty(id, 'titleVisible', visible)
+end
+
+function WarMenu.SetMenuX(id, x)
+	setStyleProperty(id, 'x', x)
+end
+
+function WarMenu.SetMenuY(id, y)
+	setStyleProperty(id, 'y', y)
+end
+
+function WarMenu.SetMenuWidth(id, width)
+	setStyleProperty(id, 'width', width)
+end
+
+function WarMenu.SetMenuMaxOptionCountOnScreen(id, count)
+	setStyleProperty(id, 'maxOptionCountOnScreen', count)
+end
+
+function WarMenu.SetTitleColor(id, r, g, b, a)
+	setStyleProperty(id, 'titleColor', { r, g, b, a })
+end
+WarMenu.SetMenuTitleColor = WarMenu.SetTitleColor
+
+function WarMenu.SetMenuSubTitleColor(id, r, g, b, a)
+	setStyleProperty(id, 'subTitleColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuSubTitleBackgroundColor(id, r, g, b, a)
+	setStyleProperty(id, 'subTitleBackgroundColor', { r, g, b, a })
+end
+
+function WarMenu.SetTitleBackgroundColor(id, r, g, b, a)
+	setStyleProperty(id, 'titleBackgroundColor', { r, g, b, a })
+end
+WarMenu.SetMenuTitleBackgroundColor = WarMenu.SetTitleBackgroundColor
+
+function WarMenu.SetTitleBackgroundSprite(id, dict, name)
+	RequestStreamedTextureDict(dict)
+	setStyleProperty(id, 'titleBackgroundSprite', { dict = dict, name = name })
+end
+WarMenu.SetMenuTitleBackgroundSprite = WarMenu.SetTitleBackgroundSprite
+
+function WarMenu.SetMenuBackgroundColor(id, r, g, b, a)
+	setStyleProperty(id, 'backgroundColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuTextColor(id, r, g, b, a)
+	setStyleProperty(id, 'textColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuSubTextColor(id, r, g, b, a)
+	setStyleProperty(id, 'subTextColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuFocusColor(id, r, g, b, a)
+	setStyleProperty(id, 'focusColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuFocusTextColor(id, r, g, b, a)
+	setStyleProperty(id, 'focusTextColor', { r, g, b, a })
+end
+
+function WarMenu.SetMenuButtonPressedSound(id, name, set)
+	setStyleProperty(id, 'buttonPressedSound', { name = name, set = set })
+end
+
+end

shared/wrapperfunctions.lua

@@ -1,260 +1,81 @@
--- Phone Mails
-
---- Sends a phone mail using the detected phone system.
----
---- This function detects the active phone resource (e.g., gksphone, yflip-phone, qb-phone, etc.)
---- and sends a mail using the appropriate method for that phone system.
----
---- @param data table A table containing the mail data.
---- - **subject** (`string`): The subject of the email.
---- - **sender** (`string`): The sender of the email.
---- - **message** (`string`): The body content of the email.
---- - **actions** (`table|nil`): (Optional) Action buttons associated with the email.
----
---- @usage
---- ```lua
---- sendPhoneMail({
----     subject = "Welcome!",
----     sender = "Admin",
----     message = "Thank you for joining our server.",
----     actions = {
----         { label = "Reply", action = replyFunction }
----     }
---- })
---- ```
-function sendPhoneMail(data) local phoneResource = ""
-    if isStarted("gksphone") then phoneResource = "gksphone"
-        exports["gksphone"]:SendNewMail(data)
-
-    elseif isStarted("yflip-phone") then phoneResource = "yflip-phone"
-        TriggerServerEvent(getScript()..":yflip:SendMail", data)
-
-    elseif isStarted("qs-smartphone") then phoneResource = "qs-smartphone"
-        TriggerServerEvent('qs-smartphone:server:sendNewMail', data)
-
-    elseif isStarted("qs-smartphone-pro") then phoneResource = "qs-smartphone-pro"
-        TriggerServerEvent('phone:sendNewMail', data)
-
-    elseif isStarted("roadphone") then phoneResource = "roadphone"
-        data.message = data.message:gsub("%<br>", "\n")
-        exports['roadphone']:sendMail(data)
-
-    elseif isStarted("lb-phone") then phoneResource = "lb-phone"
-        data.message = data.message:gsub("%<br>", "\n")
-        TriggerServerEvent(getScript()..":lbphone:SendMail", data)
-
-    elseif isStarted("qb-phone") then phoneResource = "qb-phone"
-        TriggerServerEvent('qb-phone:server:sendNewMail', data)
-
-    elseif isStarted("jpr-phonesystem") then phoneResource = "jpr-phonesystem"
-        TriggerServerEvent(getScript()..":jpr:SendMail", data)
-    end
-
-    if phoneResource ~= "" then debugPrint("^6Bridge^7[^3"..phoneResource.."^7]: ^2Sending mail to player")
-    else print("^6Bridge^7: ^1ERROR ^2Sending mail to player ^7 - ^2No supported phone found") end
-end
-
---- Handles sending mail for lb-phone.
----
---- This event listens for the `lbphone:SendMail` event and sends an email using lb-phone's API.
----
---- @event
---- @param data table The mail data.
---- - **subject** (`string`): The subject of the email.
---- - **message** (`string`): The body content of the email.
---- - **buttons** (`table|nil`): (Optional) Action buttons associated with the email.
----
---- @usage
---- ```
---- -- Server-side:
---- TriggerClientEvent(getScript()..":lbphone:SendMail", data)
---- ```
-RegisterNetEvent(getScript()..":lbphone:SendMail", function(data)
-    local src = source
-    local phoneNumber = exports["lb-phone"]:GetEquippedPhoneNumber(src)
-    local emailAddress = exports["lb-phone"]:GetEmailAddress(phoneNumber)
-    if data.actions then data.buttons = data.actions end
-    exports["lb-phone"]:SendMail({
-        to = emailAddress,
-        subject = data.subject,
-        message = data.message,
-        actions = data.buttons,
-    })
-end)
-
---- Handles sending mail for yflip-phone.
----
---- This event listens for the `yflip:SendMail` event and sends an email using yflip-phone's API.
----
---- @event
---- @param data table The mail data.
---- - **subject** (`string`): The subject of the email.
---- - **sender** (`string`): The sender of the email.
---- - **message** (`string`): The body content of the email.
---- - **buttons** (`table|nil`): (Optional) Action buttons associated with the email.
----
---- @usage
---- ```lua
---- -- Server-side:
---- TriggerClientEvent(getScript()..":yflip:SendMail", data)
---- ```
-RegisterNetEvent(getScript()..":yflip:SendMail", function(data)
-    local src = source
-    exports["yflip-phone"]:SendMail({
-        title = data.subject,
-        sender = data.sender,
-        senderDisplayName = data.sender,
-        content = data.message,
-        actions = data.buttons,
-    }, 'source', src)
-end)
-
---- Handles sending mail for jpr-phonesystem.
----
---- This event listens for the `jpr:SendMail` event and sends an email using jpr-phonesystem's API.
----
---- @event
---- @param data table The mail data.
---- - **subject** (`string`): The subject of the email.
---- - **sender** (`string`): The sender of the email.
---- - **message** (`string`): The body content of the email.
---- - **buttons** (`table|nil`): (Optional) Action buttons associated with the email.
----
---- @return void
----
---- @usage
---- ```lua
---- -- Server-side:
---- TriggerClientEvent(getScript()..":jpr:SendMail", data)
---- ```
-RegisterNetEvent(getScript()..":jpr:SendMail", function(data)
-    local src = source
-    local Player = Core.Functions.GetPlayer(src)
-    TriggerEvent('jpr-phonesystem:server:sendEmail', {
-        Assunto = data.subject, -- Subject
-        Conteudo = data.message, -- Content
-        Enviado = data.sender, -- Submitted by
-        Destinatario = Player.PlayerData.citizenid, -- Target
-        Event = {}, -- Optional
-    })
-end)
-
--- Server-Side Functions for Registering Commands, Stashes, and Shops
 
 --- Registers a command with the active command system.
----
+--- This function supports multiple command systems (OXLib, qb-core, ESX Legacy).
---- This function detects whether the server is using OXLib or qb-core for command registration
---- and registers the command accordingly.
 ---
 --- @param command string The name of the command to register.
 --- @param options table A table containing command options.
---- - **help** (`string`): The help description for the command.
+---     - help (`string`): The help description for the command.
---- - **params** (`table`): A table of parameters for the command.
+---     - params (`table`): A table of parameters for the command.
---- - **callback** (`function`): The function to execute when the command is called.
+---     - callback (`function`): The function to execute when the command is called.
---- - **autocomplete** (`function|nil`): (Optional) A function for autocompletion.
+---     - autocomplete (`function|nil`): (Optional) A function for autocompletion.
---- - **restrictedGroup** (`string|nil`): (Optional) The user group required to execute the command.
+---     - restrictedGroup (`string|nil`): (Optional) The user group required to execute the command.
 ---
 --- @usage
---- ````lua
+--- ```lua
---- -- Server Side:
 --- registerCommand("greet", {
 ---     "Greets the player",
 ---     { name = "name", help = "Name of the player to greet" },
----     function(source, args) print("Hello, " .. args[1] .. "!") end,
 ---     nil,
+---     function(source, args) print("Hello, "..args[1].."!") end,
 ---     "admin"
 --- })
 --- ```
 function registerCommand(command, options)
+    -- Name the options
+    local optionTable = {
+        helpInfo = options[1] or nil,           -- help info that pops up in chat box
+        subText = options[2] or nil,            -- sub help info for each arg
+        argsRequired = options[3] or nil,       -- command only works if you enter args
+        funct = options[4] or nil,              -- function that will run when command is triggered
+        restriction = options[5] or nil         -- admin group that can use the group or `nil`
+    }
+
+    local commandResource = ""
     if isStarted(OXLibExport) then
-        debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..OXLibExport, command)
+        commandResource = OXLibExport
-        lib.addCommand(command, { help = options[1], restricted = options[5] and "group."..options[5] or nil }, options[4])
+        lib.addCommand(command,
+            {
+                help = optionTable.helpInfo,
+                params = optionTable.subText,
+                restricted = optionTable.restriction and "group."..optionTable.restriction or nil
+            },
+        optionTable.funct)
+
     elseif isStarted(QBExport) and not isStarted(QBXExport) then
-        debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7 "..QBExport, command)
+        commandResource = QBExport
-        Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] and options[5] or nil)
+        Core.Commands.Add(command,
-    end
+            optionTable.helpInfo,
-end
+            optionTable.subText,
-
+            optionTable.argsRequired,
---- Registers a stash with the active inventory system.
+            optionTable.funt,
----
+            optionTable.restriction or nil
---- This function detects whether the server is using OXInv or QSInv and registers the stash accordingly.
----
---- @param name string The unique identifier for the stash.
---- @param label string The display name for the stash.
---- @param slots number|nil (Optional) The number of slots in the stash. Defaults to 50.
---- @param weight number|nil (Optional) The maximum weight the stash can hold. Defaults to 4,000,000.
---- @param owner string|nil (Optional) The owner identifier for personal stashes.
---- @param coords table|nil (Optional) The coordinates for the stash location.
----
---- @usage
---- ```lua
---- registerStash("playerStash", "Player Stash", 100, 8000000, "player123", { x = 100.0, y = 200.0, z = 30.0 })
---- ```
-function registerStash(name, label, slots, weight, owner, coords)
-    if isStarted(OXInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Stash^7:", name, label, owner or nil)
-        exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
-    elseif isStarted(QSInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3QS ^2Stash^7:", name, label)
-        exports[QSInv]:RegisterStash(name, slots or 50, weight or 4000000)
-    end
-end
-
---- Registers a shop with the active inventory system.
----
---- This function detects whether the server is using OXInv or QBInv and registers the shop accordingly.
----
---- @param name string The unique identifier for the shop.
---- @param label string The display name for the shop.
---- @param items table The list of items available in the shop.
---- @param society string|nil (Optional) The society identifier for shared shops.
----
---- @usage
---- ```lua
---- registerShop("weaponShop", "Weapon Shop", weaponItems, "society_weapons")
---- ```
-function registerShop(name, label, items, society)
-    if isStarted(OXInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3OX ^2Store^7:", name, label)
-        exports[OXInv]:RegisterShop(
-            name, {
-                name = label,
-                inventory = items,
-                society = society,
-            }
         )
-    elseif isStarted(QBInv) and QBInvNew then
+
-        debugPrint("^6Bridge^7: ^2Registering ^3QB ^2Store^7:", name, label)
+    elseif isStarted(RSGExport) then
-        print(json.encode(items, {indent = true}))
+        commandResource = RSGExport
-        exports[QBInv]:CreateShop({
+        Core.Commands.Add(command,
-            name = name,
+            optionTable.helpInfo,
-            label = label,
+            optionTable.subText,
-            slots = #items,
+            optionTable.argsRequired,
-            items = items,
+            optionTable.funt,
-            society = society,
+            optionTable.restriction or nil
-        })
+        )
+
+    elseif isStarted(ESXExport) then
+        commandResource = ESXExport
+        ESX.RegisterCommand(command,
+            optionTable.restriction or 'admin',
+            function(xPlayer, args, showError)
+                optionTable.funct(xPlayer.source, args, showError)
+            end,
+            false,
+            { help = options[1] }
+        )
+
+    end
+    if commandResource ~= "" then
+        debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^4"..commandResource.."^7:", "^7/"..command)
+    else
+        print("^1ERROR^7: ^1Couldn't find supported framework to register command^7:", "/"..command)
     end
 end
-
--- Server-Side Event Registration
-
-if isServer() then
-    --- Registers an event to create an OX stash from the server.
-    ---
-    --- @event
-    --- @param name string The unique identifier for the stash.
-    --- @param label string The display name for the stash.
-    --- @param slots number|nil (Optional) The number of slots in the stash.
-    --- @param weight number|nil (Optional) The maximum weight the stash can hold.
-    --- @param owner string|nil (Optional) The owner identifier for personal stashes.
-    --- @param coords table|nil (Optional) The coordinates for the stash location.
-    ---
-    --- @usage
-    --- ```lua
-    --- -- Server-side:
-    --- TriggerEvent(getScript()..":server:makeOXStash", name, label, slots, weight, owner, coords)
-    --- ```
-    RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords)
-        registerStash(name, label, slots, weight, owner, coords)
-    end)
-end

starter.lua

@@ -1,3 +1,5 @@
+gameName = not IsDuplicityVersion() and GetCurrentGameName()
+
 Exports = {
     QBExport = "qb-core",
     QBXExport = "qbx_core",
@@ -7,17 +9,27 @@ Exports = {
     OXInv = "ox_inventory",
     QBInv = "qb-inventory",
     PSInv = "ps-inventory",
-    QSInv = "qs-inventory",
     CoreInv = "core_inventory",
     CodeMInv = "codem-inventory",
     OrigenInv = "origen_inventory",
+    TgiannInv = "tgiann-inventory",
+    JPRInv = "jpr-inventory",
 
     OXLibExport = "ox_lib",
 
     QBMenuExport = "qb-menu",
 
     QBTargetExport = "qb-target",
-    OXTargetExport = "ox_target"
+    OXTargetExport = "ox_target",
+
+    -- REDM
+    RSGExport = "rsg-core",
+    RSGInv = "rsg-inventory",
+
+    VorpExport = "vorp_core",
+    VorpInv = "vorp_inventory",
+    VorpMenu = "vorp_menu",
+
 }
 
 -- Required variables
@@ -27,18 +39,103 @@ QBInvNew = true
 
 InventoryWeight = 120000
 
+-- [[ Server.Cfg Convar Check ]]--
+-- Check server convars for hard set defaults, otherwise it uses per script configurations
+if Config and Config.System then
+    if Config.System.Debug then
+        if GetConvar("jim_DisableDebug", "false") == "true" then
+            debugMode = false
+        end
+        if GetConvar("jim_DisableEventDebug", "false") == "true" then
+            Config.System.EventDebug = false
+        end
+    end
+
+    Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
+    Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
+    Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")
+    Config.System.drawText = GetConvar("jim_drawTextScript", Config.System.drawText or "gta")
+    Config.System.skillCheck = GetConvar("jim_skillCheckScript", Config.System.skillCheck or "gta")
+
+    if GetConvar("jim_dontUseTarget", "false") == "true" then
+        Config.System.DontUseTarget = true
+    end
+end
+
+-- Load the core files here instead of in fxmanifests
+-- Forcefully loads the files and quietly, compared to fxmanifest complaining if they don't exist when you don't need them all
+local filesToLoad = {
+    Shared = {
+        [Exports.OXLibExport] = { "init.lua" },
+        [Exports.OXCoreExport] = { "lib/init.lua" },
+        [Exports.ESXExport] = { "imports.lua" },
+        [Exports.QBXExport] = { "modules/playerdata.lua" },
+    },
+    Client = {
+        ["PolyZone"] = { "client.lua", "BoxZone.lua", "EntityZone.lua", "CircleZone.lua", "ComboZone.lua" },
+        ["warmenu"] = { "warmenu.lua", },
+    },
+}
+
+-- Shared framework file loader
+for Type, ScriptTable in pairs(filesToLoad) do
+    if Type == "Client" and IsDuplicityVersion() then
+        goto continue
+    else
+        for scriptName, files in pairs(ScriptTable) do
+            local state = GetResourceState(scriptName)
+            -- if the resource is started, load the file
+            if state == "started" then
+                if scriptName == Exports.OXLibExport and GetResourceState(Exports.OXCoreExport):find("start") then
+                    if debugMode then print("OX_Core found, skipping OX_Lib loading") end
+                    goto skip
+                end
+                -- Force items into a table if they are not
+                if type(files) == "string" then
+                    files = { files }
+                end
+                for _, file in pairs(files) do
+                    --print("^5CoreLoader^7: '"..scriptName.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+                    local fileLoader = assert(load(LoadResourceFile(scriptName, (file)), ('@@'..scriptName..'/'..file)))
+                    fileLoader()
+                    if debugMode then
+                        print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    end
+                end
+                ::skip::
+            end
+
+            -- if script is in server, but not started warn the user
+            if state == "uninitialized" or state == "stopped" then
+                print("^5CoreLoader^7: ^3"..scriptName.." ^1 found but it wasn't started^7.")
+                print("^1Check your ^3server^7.^3cfg ^1load order^7")
+            end
+
+            -- debugging only, if the script is missing, warn the user
+            if state == "missing" then
+                if debugMode then
+                    print("^5CoreLoader^7: ^3"..scriptName.." ^2not found^7, ^2skipping")
+                end
+            end
+        end
+    end
+    ::continue::
+end
+
 -- Load files here into the invoking script
 for _, v in pairs({ -- This is a specific load order
+
     'helpers.lua',  -- needs to be first
     '_loaders.lua',
 
     '_eventDebug.lua',
-    'coreloader.lua',   -- needs to be second to load all core related stuff before everything else
     'callback.lua',
+    'coreloader.lua',
 
     'duifunctions.lua',
 
     -- Native Scaleforms
+    'scaleforms/scaleform_basic.lua',
     'scaleforms/bigMessageInstance.lua',
     'scaleforms/countDownHandler.lua',
     'scaleforms/debugScaleform.lua',
@@ -58,7 +155,10 @@ for _, v in pairs({ -- This is a specific load order
     'polyZone.lua',
     'itemcontrol.lua',
     'playerfunctions.lua',
+    'metaHandlers.lua',
     'jobfunctions.lua',
+    'societybank.lua',
+    'phones.lua',
 
     -- Interactions
     'targets.lua',
@@ -66,24 +166,72 @@ for _, v in pairs({ -- This is a specific load order
     'input.lua',
     'notify.lua',
     'drawText.lua',
+    'skillcheck.lua',
 
     -- Crafting / Shops / Stashes
     'crafting.lua',
-    'stashcontrol.lua',
 
     -- Kind of "other"
     'isAnimal.lua',
     'scaleEntity.lua',
     'vehicles.lua',
     'effects.lua',
-    'versioncheck.lua'
+
+    --'warmenu.lua',
+    '_authToken.lua',
+    -- Do version check last
+    '_scriptversioncheck.lua'
 }) do
     if debugMode then
-        print("^5Loading^7: 'jim_bridge/shared/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+        --print("^5Loading^7: 'jim_bridge/shared/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
     end
     local fileLoader = assert(load(LoadResourceFile('jim_bridge', ('shared/'..v)), ('@@jim_bridge/shared/'..v)))
     fileLoader()
     if debugMode then
-        print("^5Success^7: ^2loaded file^7: 'jim_bridge/shared/"..v.."'!")
+        print("^5CoreLoader^7: ^2loaded file^7: ^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
+    end
+end
+
+-- Auto Detection of Old/New QBInv/PSInv versions --
+
+if isStarted(QBInv) then
+    if isServer() then
+        if not checkExportExists(QBInv, "CreateShop") then
+            print("^6Bridge^7: ^2Can^7'^2t ^2find new ^4"..QBInv.."^2 export^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+            QBInvNew = false
+        end
+    else
+        if checkExportExists(QBInv, "GetTrunkSize") then
+            print("^6Bridge^7: ^2Found old ^4"..QBInv.."^3 export^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+            QBInvNew = false
+        end
+    end
+end
+
+if isStarted(PSInv) then
+    if isServer() then
+        if not checkExportExists(PSInv, "CreateShop") then
+            print("^6Bridge^7: ^2Can^7'^2t ^2find new ^4"..PSInv.."^2 export^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+            QBInvNew = false
+        end
+    else
+        local function versionCompare(v1, v2)
+            local split = function(v) local t = {} for s in v:gmatch("[^.]+") do t[#t+1] = tonumber(s) end return t end
+            local a, b = split(v1), split(v2)
+            for i = 1, math.max(#a, #b) do
+                local ai, bi = a[i] or 0, b[i] or 0
+                if ai > bi then return true
+                elseif ai < bi then return false end
+            end
+            return true
+        end
+
+        if versionCompare(GetResourceMetadata(PSInv, "version", 0), "1.0.6") then
+            print("^6Bridge^7: ^4"..PSInv.."^2 Version above ^31.0.6^7, ^2forcing ^1QBInvNew ^2to ^1true^7")
+            QBInvNew = true
+        else
+            print("^6Bridge^7: ^4"..PSInv.."^2 Version ^1below ^31.0.6^7, ^2forcing ^1QBInvNew ^2to ^1false^7")
+            QBInvNew = false
+        end
     end
 end

ui_modules/notifications.lua

@@ -0,0 +1,266 @@
+local notifications = {}
+local spacing = 60  -- vertical spacing between notifications
+local activeDrawing = false -- flag for drawing loop state
+
+local function loadTextureDict(dict)
+	if not HasStreamedTextureDictLoaded(dict) then
+		while not HasStreamedTextureDictLoaded(dict) do RequestStreamedTextureDict(dict) Wait(5) end
+	end
+end
+
+
+--- GTA Section ---
+
+local notifTypes = {
+    success = "✔️",
+    error = "❌",
+    warning = "⚠️",
+    police = "🚓",
+    ambulance = "🚑",
+}
+
+function gtaNotify(title, message, emoji, src)
+    local notif = {
+        title = title,
+        message = message,
+        emoji = notifTypes[emoji] or "❔",
+        state = "enter",
+        startTime = GetGameTimer(),
+        progress = 0,
+        holdTime = 8000,
+        slideDuration = 100,
+        currentOffset = 0,
+    }
+    table.insert(notifications, notif)
+
+    -- Activate drawing loop if not already running
+    -- This allows it to be silent until the first notifcation is called, then the loop starts
+    if not activeDrawing then
+        activeDrawing = true
+        StartGTADrawingLoop()
+    end
+end
+
+-- Drawing loop as a separate controlled thread
+function StartGTADrawingLoop()
+    --loadTextureDict("timerbars")
+    CreateThread(function()
+        while #notifications > 0 do
+            local currentTime = GetGameTimer()
+
+            -- Update notifications vertical offset
+            for i, notif in ipairs(notifications) do
+                local target = (#notifications - i) * spacing
+                notif.currentOffset += (target - notif.currentOffset) * 0.1
+            end
+
+            for i = #notifications, 1, -1 do
+                local notif = notifications[i]
+
+                if notif.state == "enter" then
+                    local elapsed = currentTime - notif.startTime
+                    notif.progress = math.min(elapsed / notif.slideDuration, 1.0)
+                    if notif.progress >= 1.0 then
+                        notif.state = "hold"
+                        notif.holdStart = currentTime
+                    end
+                elseif notif.state == "hold" then
+                    if currentTime - notif.holdStart >= notif.holdTime then
+                        notif.state = "exit"
+                        notif.exitStart = currentTime
+                    end
+                elseif notif.state == "exit" then
+                    local elapsed = currentTime - notif.exitStart
+                    notif.progress = 1.0 - math.min(elapsed / notif.slideDuration, 1.0)
+                    if notif.progress <= 0 then
+                        table.remove(notifications, i)
+                        goto continue
+                    end
+                end
+
+                local startX, targetX = 1.0, 0.8
+                local posX = startX - (startX - targetX) * notif.progress
+                local posY = 0.05 + (notif.currentOffset / 1080)
+
+                -- Background sprite
+                DrawSprite("timerbars", "all_black_bg", posX + 0.11, posY + 0.025, 0.2, 0.053, 0.0, 255, 255, 255, 255)
+
+                -- Title text
+                local moveMessage = false
+                if not notif.title or notif.title == "" then
+                    moveMessage = true
+                else
+                    drawGTANotiText(8, 0.4, vec2(0.75, 0.975), notif.title, vec2(posX, posY))
+                end
+
+                -- Message text
+                drawGTANotiText(4, 0.3, vec2(0.75, 0.975), notif.message, vec2(posX, posY + (moveMessage and 0.015 or 0.03)))
+
+                -- Emoji
+                drawGTANotiText(0, 0.3, vec2(0.75, 0.995), notif.emoji, vec2(posX, posY + 0.015))
+
+                ::continue::
+            end
+            Wait(0)
+        end
+        activeDrawing = false -- No notifications left, pause drawing
+    end)
+end
+
+function drawGTANotiText(font, scale, wrap, string, pos)
+    SetTextFont(font)
+    SetTextScale(scale, scale)
+    SetTextWrap(wrap.x, wrap.y)
+    SetTextJustification(2)
+    SetTextColour(255, 255, 255, 255)
+    SetTextOutline()
+    SetTextEntry("STRING")
+    AddTextComponentString(string)
+    DrawText(pos.x, pos.y)
+end
+
+
+------------------
+-- REDM SECTION --
+------------------
+---
+---
+local REDMnotifTypes = {
+    success = vec3(0, 150, 0),
+    error = vec3(150, 0, 0),
+    warning = vec3(0, 150, 150),
+    police = vec3(0, 0, 150),
+    ambulance = vec3(0, 0, 150),
+}
+
+function redNotify(title, message, style)
+    local notif = {
+        title = title and CreateVarString(10, "LITERAL_STRING", title) or nil,
+        message = message and CreateVarString(10, "LITERAL_STRING", message) or nil,
+        state = "enter",
+        startTime = GetGameTimer(),
+        style = REDMnotifTypes[style] or vec3(0, 0, 0),
+        progress = 0,
+        holdTime = 8000,
+        slideDuration = 100,
+        currentOffset = 0,
+    }
+    table.insert(notifications, notif)
+
+    -- Activate drawing loop if not already running
+    if not activeDrawing then
+        activeDrawing = true
+        StartREDMDrawingLoop()
+    end
+end
+
+-- Drawing loop as a separate controlled thread
+function StartREDMDrawingLoop()
+    CreateThread(function()
+        loadTextureDict("generic_textures")
+        while #notifications > 0 do
+            local currentTime = GetGameTimer()
+
+            -- Update notifications vertical offset
+            for i, notif in ipairs(notifications) do
+                local target = (#notifications - i) * spacing
+                notif.currentOffset += (target - notif.currentOffset) * 0.1
+            end
+
+            for i = #notifications, 1, -1 do
+                local notif = notifications[i]
+
+                if notif.state == "enter" then
+                    local elapsed = currentTime - notif.startTime
+                    notif.progress = math.min(elapsed / notif.slideDuration, 1.0)
+                    if notif.progress >= 1.0 then
+                        notif.state = "hold"
+                        notif.holdStart = currentTime
+                    end
+                elseif notif.state == "hold" then
+                    if currentTime - notif.holdStart >= notif.holdTime then
+                        notif.state = "exit"
+                        notif.exitStart = currentTime
+                    end
+                elseif notif.state == "exit" then
+                    local elapsed = currentTime - notif.exitStart
+                    notif.progress = 1.0 - math.min(elapsed / notif.slideDuration, 1.0)
+                    if notif.progress <= 0 then
+                        table.remove(notifications, i)
+                        goto continue
+                    end
+                end
+
+                local startX, targetX = 1.0, 0.8
+                local posX = startX - (startX - targetX) * notif.progress
+                local posY = 0.05 + (notif.currentOffset / 1080)
+
+                -- Background sprite
+                DrawSprite("generic_textures", "inkroller_1a", posX + 0.09, posY + 0.025, 0.2, 0.053, 180.0, notif.style.x, notif.style.y, notif.style.z, 150)
+
+                -- Title text
+                local moveMessage = false
+                if not notif.title or notif.title == "" then
+                    moveMessage = true
+                else
+                    drawREDMNotiText(1, 0.4, vec2(0.75, 0.975), notif.title, vec2(posX, posY))
+                end
+
+                -- Message text
+                drawREDMNotiText(6, 0.3, vec2(0.75, 0.975), notif.message, vec2(posX, posY + (moveMessage and 0.0145 or 0.025)))
+
+                ::continue::
+            end
+            Wait(0)
+        end
+        activeDrawing = false -- No notifications left, pause drawing
+    end)
+end
+
+function drawREDMNotiText(font, scale, wrap, string, pos)
+    SetTextFontForCurrentCommand(font)
+    SetTextScale(scale, scale)
+	SetTextColor(255, 255, 255, 255)
+    SetTextWrap(wrap.x, wrap.y)
+    SetTextJustification(2)
+	SetTextDropshadow(1, 0, 0, 0, 200)
+	DisplayText(string, pos.x, pos.y)
+end
+
+-- Exports --
+-- Example:
+-- TriggerEvent("jim_bridge:Notify", nil, "Short test message", "success")
+--
+-- exports["jim_bridge"]:Notify(nil, "Short test message", "success")
+--
+
+RegisterNetEvent("jim_bridge:RedNotify", redNotify)
+RegisterNetEvent("jim_bridge:GTANotify", gtaNotify)
+
+RegisterNetEvent("jim_bridge:Notify", function(...)
+    if GetCurrentGameName() == "rdr3" then
+        redNotify(...)
+    else
+        gtaNotify(...)
+    end
+end)
+
+function Notify(...)
+    if GetCurrentGameName() == "rdr3" then
+        redNotify(...)
+    else
+        gtaNotify(...)
+    end
+end
+
+exports("Notify", Notify)
+
+-- Example testing notifications (can remove after testing)
+--CreateThread(function()
+--    TriggerEvent("jim_bridge:Notify", nil, "Short test message", "success")
+--    Wait(3000)
+--    TriggerEvent("jim_bridge:Notify", "Error!", "This is a longer example message to show stacking.", "error")
+--    Wait(3000)
+--    TriggerEvent("jim_bridge:Notify", "Test!", "This notification has to 'type' set.", nil )
+--    Wait(4000)
+--end)

ui_modules/progressbar.lua

@@ -0,0 +1,347 @@
+local inProgress = false
+
+local function loadTextureDict(dict)
+	if not HasStreamedTextureDictLoaded(dict) then
+		while not HasStreamedTextureDictLoaded(dict) do RequestStreamedTextureDict(dict) Wait(5) end
+	end
+end
+
+local function loadAnimDict(animDict)
+	if not DoesAnimDictExist(animDict) then
+		print("^6Bridge^7: ^1ERROR^7: ^2Anim Dictionary^7 - '^6"..animDict.."^7' ^2does not exist in server") return
+	else
+		while not HasAnimDictLoaded(animDict) do RequestAnimDict(animDict) Wait(5) end
+	end
+end
+
+local function playAnim(animDict, animName, duration, flag, ped, speed)
+    loadAnimDict(animDict)
+	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, speed or 8.0, speed or -8.0, duration or 30000, flag or 50, 1, false, false, false)
+end
+
+local function stopAnim(animDict, animName, ped)
+    StopAnimTask(ped or PlayerPedId(), animDict, animName, 0.5)
+    StopAnimTask(ped or PlayerPedId(), animName, animDict, 0.5)
+    RemoveAnimDict(animDict)
+end
+
+function redProgressBar(data)
+    local ped = PlayerPedId()
+
+    local result = nil
+
+    loadTextureDict("generic_textures")
+    if inProgress then return false end
+    inProgress = true
+    local wait = debugMode and 1000 or data.time
+    local endTime = GetGameTimer() + wait
+
+    LocalPlayer.state:set("inv_busy", true, true)
+    TriggerEvent('inventory:client:busy:status', true)
+    TriggerEvent('canUseInventoryAndHotbar:toggle', not true)
+
+    -- Setup Animation/Task if specified
+    if data.dict then
+        playAnim(data.dict, data.anim, -1, data.flag or 32)
+    elseif data.task then
+        TaskStartScenarioInPlace(ped, data.task, -1, true)
+    end
+
+    -- Progress bar rendering loop
+    CreateThread(function()
+        while GetGameTimer() < endTime and inProgress do
+            Wait(0)
+            local elapsed = GetGameTimer()
+            local percentage = ((elapsed - (endTime - wait)) / wait) * 100
+            if percentage < 0 then percentage = 0 end
+            if percentage > 100 then percentage = 100 end
+
+            -- Draw your segmented progress bar
+            ShowRedProgressBar(percentage, data.label, ("%.0f%%"):format(percentage))
+
+            -- Controls to disable during progress
+            if data.disableMouse then
+                DisableControlAction(0, `INPUT_LOOK_LR`, true)
+                DisableControlAction(0, `INPUT_LOOK_UD`, true)
+                DisableControlAction(0, `INPUT_VEH_MOUSE_CONTROL_OVERRIDE`, true)
+            end
+
+            if data.disableMovement then
+                DisableControlAction(0, `INPUT_MOVE_LR`, true)
+                DisableControlAction(0, `INPUT_MOVE_UD`, true)
+                DisableControlAction(0, `INPUT_DUCK`, true)
+                DisableControlAction(0, `INPUT_SPRINT`, true)
+            end
+
+            if data.disableCarMovement then
+                DisableControlAction(0, `INPUT_VEH_MOVE_LEFT_ONLY`, true)
+                DisableControlAction(0, `INPUT_VEH_MOVE_RIGHT_ONLY`, true)
+                DisableControlAction(0, `INPUT_VEH_ACCELERATE`, true)
+                DisableControlAction(0, `INPUT_VEH_BRAKE`, true)
+                DisableControlAction(0, `INPUT_VEH_EXIT`, true)
+            end
+
+            if data.disableCombat then
+                DisablePlayerFiring(PlayerId(), true)
+                DisableControlAction(0, `INPUT_ATTACK`, true)
+                DisableControlAction(0, `INPUT_AIM`, true)
+                DisableControlAction(0, `INPUT_OPEN_WHEEL_MENU`, true)
+                DisableControlAction(0, `INPUT_DETONATE`, true)
+                DisableControlAction(0, `INPUT_THROW_GRENADE`, true)
+                DisableControlAction(0, `INPUT_MELEE_ATTACK`, true)
+                DisableControlAction(0, `INPUT_MELEE_GRAPPLE_ATTACK`, true)
+            end
+
+            if data.cancel and (
+                IsControlJustReleased(0, `INPUT_FRONTEND_RS`) or
+                IsControlJustReleased(0, `INPUT_SWITCH_SHOULDER`) or
+                IsControlJustReleased(0, `INPUT_GAME_MENU_TAB_RIGHT_SECONDARY`) or
+                IsControlJustReleased(0, `INPUT_FRONTEND_CANCEL`) or
+                IsControlJustReleased(0, `INPUT_GAME_MENU_CANCEL`) or
+                IsControlJustReleased(0, `INPUT_FRONTEND_RRIGHT`) or
+                IsControlJustReleased(0, `INPUT_QUIT`) or
+                IsControlJustReleased(0, `INPUT_MINIGAME_QUIT`)
+            ) then
+                inProgress = false
+            end
+        end
+    end)
+
+    -- Wait for completion or cancel
+    while GetGameTimer() < endTime and inProgress do
+        Wait(100)
+    end
+
+    -- Cleanup animations/tasks
+    if data.dict then
+        stopAnim(data.dict, data.anim, ped)
+    end
+    if data.task then
+        ClearPedTasks(ped)
+    end
+
+    result = inProgress
+    inProgress = false
+
+    while result == nil do Wait(10) end
+
+    -- Cleanup
+    FreezeEntityPosition(ped, false)
+
+    LocalPlayer.state:set("inv_busy", false, true)
+    TriggerEvent('inventory:client:busy:status', false)
+    TriggerEvent('canUseInventoryAndHotbar:toggle', not false)
+
+    return result
+end
+
+function ShowRedProgressBar(percentage, title, level)
+    local loc = vec2(0.40, 0.90)
+    local size = vec2(0.3, 0.03)
+    local tickCount = 10        -- visually split into 10 segments (9 inner lines)
+    local barHeight = size.y / 3.4
+    local barWidth  = 0.21      -- tuned to your existing layout
+    local barLeft   = (loc.x - size.x / 4) + 0.075
+    local barCenter = barLeft + barWidth / 2
+    local lineW     = 0.001
+    local lineH     = barHeight + 0.00
+
+    -- Background plate
+    DrawSprite("generic_textures", "inkroller_1a", loc.x + 0.1, loc.y - 0.01, 0.25, 0.07, 180.0, 0, 0, 0, 200)
+
+    -- Title (left)
+    SetTextFontForCurrentCommand(6)
+    SetTextScale(0.35, 0.35)
+    SetTextColor(255, 255, 255, 255)
+    SetTextDropshadow(1, 0, 0, 0, 200)
+    BgDisplayText(title, loc.x - size.x / 4 + 0.074, loc.y - 0.034)
+
+    -- Percentage (right)
+    SetTextFontForCurrentCommand(1)
+    SetTextScale(0.35, 0.35)
+    SetTextColor(255, 255, 255, 255)
+    SetTextDropshadow(1, 0, 0, 0, 200)
+    BgDisplayText(level, loc.x - size.x / 4 + 0.246, loc.y - 0.030)
+
+    -- Track (bg)
+    DrawRect(barCenter, loc.y, barWidth, barHeight, 100, 100, 100, 255)
+
+    -- Fill
+    local fillWidth = barWidth * (percentage / 100.0)
+    if fillWidth > 0.0 then
+        local fillCenter = barLeft + (fillWidth / 2.0)
+        DrawRect(fillCenter, loc.y, fillWidth, barHeight, 255, 0, 0, 200)  -- red fill
+    end
+
+    -- Tick lines (9 inner lines for 10 segments)
+    for i = 1, (tickCount - 1) do
+        local x = barLeft + (barWidth * (i / tickCount))
+        DrawRect(x, loc.y, lineW, lineH, 0, 0, 0, 120)
+    end
+end
+
+function gtaProgressBar(data)
+    local ped = PlayerPedId()
+
+    local result = nil
+
+    loadTextureDict("timerbars")
+    if inProgress then return false end
+    inProgress = true
+    local wait = debugMode and 1000 or data.time
+    local endTime = GetGameTimer() + wait
+
+    -- Setup Animation/Task if specified
+    if data.dict then
+        playAnim(data.dict, data.anim, -1, data.flag or 32)
+    elseif data.task then
+        TaskStartScenarioInPlace(ped, data.task, -1, true)
+    end
+
+    -- Progress bar rendering loop
+    CreateThread(function()
+        while GetGameTimer() < endTime and inProgress do
+            Wait(0)
+            local elapsed = GetGameTimer()
+            local percentage = ((elapsed - (endTime - wait)) / wait) * 100
+
+            if percentage < 0 then percentage = 0 end
+            if percentage > 100 then percentage = 100 end
+
+            -- Draw your segmented progress bar
+            ShowGTAProgressBar(percentage, data.label, ("%.0f%%"):format(percentage))
+
+            -- Controls to disable during progress
+            DisablePlayerFiring(PlayerId(), true)
+            DisableControlAction(0, 25, true) -- Disable aim
+            DisableControlAction(0, 21, true) -- Disable sprint
+            DisableControlAction(0, 30, true) -- Disable move left/right
+            DisableControlAction(0, 31, true) -- Disable move forward/back
+            DisableControlAction(0, 36, true) -- Disable stealth
+
+            if data.cancel and (IsControlJustReleased(0, 202) or IsControlJustReleased(0, 177) or IsControlJustReleased(0, 73)) then
+                inProgress = false
+            end
+        end
+        result = inProgress
+    end)
+
+
+    -- Wait for completion or cancel
+    while result == nil do Wait(10) end
+    inProgress = false
+
+    print(tostring(result))
+    -- Cleanup animations/tasks
+    if data.dict then
+        stopAnim(data.dict, data.anim, ped)
+    end
+    if data.task then
+        ClearPedTasks(ped)
+    end
+
+
+    -- Cleanup
+    FreezeEntityPosition(ped, false)
+
+    LocalPlayer.state:set("inv_busy", false, true)
+    TriggerEvent('inventory:client:busy:status', false)
+    TriggerEvent('canUseInventoryAndHotbar:toggle', not false)
+
+    return result
+end
+
+function ShowGTAProgressBar(percentage, title, level)
+    local loc = vec2(0.37, 0.90)
+    local size = vec2(0.3, 0.03)
+    local tickCount = 10
+    local barHeight = size.y / 3.4
+    local barWidth  = 0.19
+    local barLeft   = (loc.x - size.x / 4) + 0.075
+    local barCenter = barLeft + barWidth / 2
+    local lineW     = 0.001
+    local lineH     = barHeight + 0.00
+
+    -- Background plates
+    DrawSprite("timerbars", "all_black_bg", loc.x + 0.028, loc.y - 0.01, 0.15, 0.07, 0.0,   255, 255, 255, 255)
+    DrawSprite("timerbars", "all_black_bg", loc.x + 0.170, loc.y - 0.01, 0.15, 0.07, 180.0, 255, 255, 255, 255)
+
+    -- Title (left)
+    SetTextFont(0)
+    SetTextProportional(1)
+    SetTextScale(0.35, 0.35)
+    SetTextColour(255, 255, 255, 255)
+    SetTextDropshadow(0, 0, 0, 0, 255)
+    SetTextDropShadow()
+    SetTextOutline()
+    SetTextEntry("STRING")
+    AddTextComponentString(title)
+    DrawText(loc.x - size.x / 4 + 0.074, loc.y - 0.034)
+
+    -- Percentage (right)
+    SetTextFont(0)
+    SetTextProportional(1)
+    SetTextScale(0.35, 0.25)
+    SetTextColour(255, 255, 255, 255)
+    SetTextEntry("STRING")
+    AddTextComponentString(level)
+    DrawText(loc.x - size.x / 4 + 0.246, loc.y - 0.030)
+
+    -- Track (bg)
+    DrawRect(barCenter, loc.y, barWidth, barHeight, 100, 100, 100, 255)
+
+    -- Fill
+    local fillWidth = barWidth * (percentage / 100.0)
+    if fillWidth > 0.0 then
+        local fillCenter = barLeft + (fillWidth / 2.0)
+        DrawRect(fillCenter, loc.y, fillWidth, barHeight, 93, 182, 229, 255) -- GTA blue
+    end
+
+    -- Tick lines
+    for i = 1, (tickCount - 1) do
+        local x = barLeft + (barWidth * (i / tickCount))
+        DrawRect(x, loc.y, lineW, lineH, 0, 0, 0, 120)
+    end
+end
+
+
+function stopProgressBar() inProgress = false end
+function isProgressBar() return inProgress end
+
+function progressBar(...)
+    if GetCurrentGameName() == "rdr3" then
+        return redProgressBar(...)
+    else
+        return gtaProgressBar(...)
+    end
+end
+
+exports("progressBar", function(...)
+    return progressBar(...)
+end)
+exports("gtaProgressBar", function(...)
+    return gtaProgressBar(...)
+end)
+exports("redProgressBar", function(...)
+    return redProgressBar(...)
+end)
+
+exports("stopProgressBar", stopProgressBar)
+exports("isProgressBar", isProgressBar)
+
+--RegisterCommand("testprog", function()
+--    print("test")
+--    if progressBar({
+--        label = "Processing...",
+--        time = 10000,
+--        disableMovement = true,
+--        --dict = "amb@world_human_hang_out_street@female_hold_arm@base",
+--        --anim = "base",
+--        --flag = 49,
+--        cancel = true,
+--    }) then
+--        Notify("Success!", "Short test message", "success")
+--    else
+--        Notify("Error!", "This is a longer example message to show stacking.", "error")
+--    end
+--end)

ui_modules/skillcheck.lua

@@ -0,0 +1,127 @@
+local activeSkillCheck = false
+
+function gtaSkillCheck()
+    if activeSkillCheck then return end
+    local result = false
+    local successes = 0
+    local barsRequired = 3
+
+    for bar = 1, barsRequired do
+        activeSkillCheck = true
+        local width, height = 0.2, 0.01
+        local x, y = 0.5, 0.8
+
+        -- Random highlighted zone
+        local highlightSize = math.random(10, 20) / 100
+        local highlightStart = math.random(10, 50) / 100
+        local highlightEnd = highlightStart + highlightSize
+        local highlightAlpha = 0
+        local cursorPos = 0.0
+        local cursorSpeed = 0.025
+        local movingRight = true
+
+        while activeSkillCheck do
+            Wait(0)
+
+            createScaleBars(x, y, width, height)
+
+            local pulse = (math.sin(GetGameTimer() / 250) + 1) / 2 -- Creates a pulsing effect
+            highlightAlpha = math.floor(150 + (pulse * 105)) -- Pulsing between 150 and 255 alpha
+
+            -- Draw highlighted zone (success area) with pulsing effect
+            DrawRect(x - width / 2 + (highlightStart + highlightSize / 2) * width, y, highlightSize * width, height+0.001, 93, 182, 229, highlightAlpha )
+            -- Draw moving cursor
+            DrawRect(x - width / 2 + cursorPos * width, y, 0.002, height + 0.01, 255, 255, 255, 255)
+
+            -- Move cursor
+            if movingRight then
+                cursorPos += cursorSpeed
+                if cursorPos >= 1.0 then movingRight = false end
+            else
+                cursorPos -= cursorSpeed
+                if cursorPos <= 0.0 then movingRight = true end
+            end
+
+            if IsControlJustPressed(0, 177) then        -- Backspace to cancel
+                local displayTime = GetGameTimer() + 2000
+                PlaySoundFrontend(-1, 'Highlight_Cancel', 'DLC_HEIST_PLANNING_BOARD_SOUNDS', 1)
+                while GetGameTimer() < displayTime do
+                    Wait(0)
+
+                    createScaleBars(x, y, width, height)
+
+                    DrawRect(x - width / 2 + (highlightStart + highlightSize / 2) * width, y, highlightSize * width, height+0.001, 228, 52, 52, 255)
+                    DrawRect(x - width / 2 + cursorPos * width, y, 0.002, height + 0.01, 255, 255, 255, 255)
+
+                    drawGTASuccessText(x, y, "Failed", 228, 52, 52)
+                end
+                return false
+            end
+
+            -- Check for keypress (E)
+            if IsControlJustPressed(0, 38) then
+                activeSkillCheck = false
+                result = cursorPos >= highlightStart and cursorPos <= highlightEnd
+                if result then
+                    PlaySoundFrontend(-1, "YES", "HUD_FRONTEND_DEFAULT_SOUNDSET", true)
+                else
+                    PlaySoundFrontend(-1, 'Highlight_Cancel', 'DLC_HEIST_PLANNING_BOARD_SOUNDS', 1)
+                end
+                local displayTime = GetGameTimer() + 2000
+                while GetGameTimer() < displayTime do
+                    Wait(0)
+
+                    createScaleBars(x, y, width, height)
+
+                    -- Draw highlighted zone
+                    DrawRect(x - width / 2 + (highlightStart + highlightSize / 2) * width, y, highlightSize * width, height+0.001, result and 93 or 228, result and 182 or 52, result and 229 or 52, 180)
+
+                    -- Draw stationary cursor at result position
+                    DrawRect(x - width / 2 + cursorPos * width, y, 0.002, height + 0.01, 255, 255, 255, 255)
+                    -- Display result text
+                    drawGTASuccessText(x, y, result and "Success" or "Failed", result and 114 or 228, result and 204 or 52, result and 144 or 52)
+                end
+                if result then
+                    successes += 1
+                else
+                    return false
+                end
+            end
+        end
+    end
+    activeSkillCheck = false
+    print("^5GTAUI^7: ^2Skill Check Result^7: ^3" .. successes .. "^7/^3" .. barsRequired.."^7")
+    return successes == barsRequired
+end
+
+function drawGTASuccessText(x, y, text, r, g, b)
+    SetTextFont(8)
+    SetTextScale(0.45, 0.45)
+    SetTextColour(r, g, b, 255)
+    SetTextDropshadow(0, 0, 0, 0, 255)
+    SetTextEdge(2, 0, 0, 0, 150)
+    SetTextDropShadow()
+    SetTextOutline()
+    SetTextCentre(true)
+    SetTextEntry("STRING")
+    SetTextCentre(true)
+    SetTextEntry("STRING")
+    AddTextComponentString(text)
+    DrawText(x, y + 0.03)
+end
+
+function createScaleBars(x, y, width, height)
+    -- Draw background box
+    DrawSprite("timerbars", "all_black_bg", x - (width / 4) - 0.006, y, (width / 2) + 0.08, height + 0.04, 0.0, 255, 255, 255, 255)
+    DrawSprite("timerbars", "all_black_bg", x + (width / 4) + 0.006, y, (width / 2) + 0.08, height + 0.04, 180.0, 255, 255, 255, 255)
+    -- Draw full bar (dark background)
+    DrawRect(x, y, width, height, 100, 100, 100, 255)
+end
+
+exports("skillCheck", function(...)
+    if GetCurrentGameName() == "rdr3" then
+        --redSkillCheck(...)
+    else
+        gtaSkillCheck(...)
+    end
+end)

ui_modules/target.lua

@@ -0,0 +1,373 @@
+-- Global Key Table, defined once.
+local KEY_TABLE = { 38, 29, 47, 23, 45, 159, 162, 163 }
+
+-- Mapping of key codes to human-readable key names.
+local Keys = {
+    [322] = "ESC", [288] = "F1", [289] = "F2", [170] = "F3", [166] = "F5",
+    [167] = "F6", [168] = "F7", [169] = "F8", [56] = "F9", [57] = "F10",
+    [243] = "~", [157] = "1", [158] = "2", [160] = "3", [164] = "4", [165] = "5",
+    [159] = "6", [161] = "7", [162] = "8", [163] = "9", [84] = "-", [83] = "=",
+    [177] = "BACKSPACE", [37] = "TAB",
+    [44] = "Q", [32] = "W", [38] = "E", [45] = "R", [245] = "T", [246] = "Y",
+    [303] = "U", [199] = "P",
+    [39] = "[",  [40] = "]", [18] = "ENTER", [137] = "CAPS",
+    [34] = "A", [8] = "S", [9] = "D", [23] = "F", [47] = "G",
+    [74] = "H", [311] = "K", [182] = "L", [21] = "LEFTSHIFT",
+    [20] = "Z", [73] = "X", [26] = "C", [0] = "V",  [29] = "B", [249] = "N",
+    [244] = "M", [82] = ",", [81] = "."
+}
+
+
+-- ===== Ownership + indexes =====
+-- TextTargets: key -> target data (coords/entity/models/options/etc.)
+local TextTargets = {}
+-- targetEntities kept for parity (not strictly required)
+local targetEntities = {}
+
+-- registry: key -> owner, owner -> set(keys)
+local TargetRegistry = { byKey = {}, byResource = {} }
+
+local function getOwnerResource()
+    return GetInvokingResource() or GetCurrentResourceName() or "unknown"
+end
+
+local function registerTarget(owner, key)
+    -- move key across owners if replacing
+    local prev = TargetRegistry.byKey[key]
+    if prev and TargetRegistry.byResource[prev] then
+        TargetRegistry.byResource[prev][key] = nil
+    end
+    TargetRegistry.byKey[key] = owner
+    TargetRegistry.byResource[owner] = TargetRegistry.byResource[owner] or {}
+    TargetRegistry.byResource[owner][key] = true
+end
+
+local function removeTargetKey(key, reason)
+    local owner = TargetRegistry.byKey[key]
+    if TextTargets[key] then
+        TextTargets[key] = nil
+        -- print("^6Bridge^7:^5 Target^7: ^2Removed target '%s'%s", key, reason and (" ("..reason..")") or "")
+    end
+    if owner then
+        if TargetRegistry.byResource[owner] then
+            TargetRegistry.byResource[owner][key] = nil
+        end
+        TargetRegistry.byKey[key] = nil
+    end
+end
+
+AddEventHandler("onResourceStop", function(res)
+    local owned = TargetRegistry.byResource[res]
+    if not owned then return end
+    local cnt = 0
+    for key in pairs(owned) do
+        removeTargetKey(key, "resource stopped: "..res)
+        cnt = cnt + 1
+    end
+    TargetRegistry.byResource[res] = nil
+    -- print("^6Bridge^7:^5 Target^7: ^2Cleared "..cnt.." target(s) from '"..res.."'")
+end)
+
+-- ===== Helpers =====
+local function vecKey(v)
+    -- stable rounded coord string for entity dedupe when name isn't provided
+    return ("%.3f,%.3f,%.3f"):format(v.x, v.y, v.z)
+end
+
+local function bakeButtons(opts)
+    local tempText = {}
+    for i = 1, #opts do
+        opts[i].key = KEY_TABLE[i]
+        tempText[#tempText + 1] =
+            (" ~b~[~w~%s~b~] ~w~%s"):format(Keys[opts[i].key] or ("K"..opts[i].key), opts[i].label or ("Option "..i))
+    end
+    return tempText
+end
+
+-- Update cached text blob
+local function updateCachedText(target)
+    target.text = table.concat(target.buttontext, "\n")
+end
+
+-- ===== Public API: Create targets =====
+-- ENTITY: createEntityTarget(entity, opts, dist, nameOpt?)
+function createEntityTarget(entity, opts, dist, name)
+    startTargetLoop()
+
+    if not entity or entity == 0 then return end
+    targetEntities[#targetEntities + 1] = entity
+
+    local owner = getOwnerResource()
+    local coords = GetEntityCoords(entity)
+    local key    = tostring(name) or ("entity@" .. vecKey(coords))
+
+    -- Always overwrite on same key
+    local buttontext = bakeButtons(opts)
+    TextTargets[key] = {
+        _key   = key,
+        _type  = "entity",
+        _owner = owner,
+        entity = entity,
+        coords = vec3(coords.x, coords.y, coords.z),
+        buttontext = buttontext,
+        options    = opts,
+        dist       = dist,
+    }
+    updateCachedText(TextTargets[key])
+    registerTarget(owner, key)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated ENTITY target '"..key.."' by '"..owner.."' @ "..formatCoord(coords))
+    return key
+end
+
+-- ZONE: createZoneTarget(data, opts, dist)
+-- Expect data[1] = id/name, data[2] = vec3 coords (as in your original)
+function createZoneTarget(data, opts, dist)
+    startTargetLoop()
+
+    local owner = getOwnerResource()
+    local zname = tostring(data[1] or ("zone@"..vecKey(data[2] or vec3(0,0,0))))
+    local coords = data[2]
+
+    local buttontext = bakeButtons(opts)
+    TextTargets[zname] = {
+        _key   = zname,
+        _type  = "zone",
+        _owner = owner,
+        coords = coords,
+        buttontext = buttontext,
+        options    = opts,
+        dist       = dist,
+    }
+    updateCachedText(TextTargets[zname])
+    registerTarget(owner, zname)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated ZONE target '"..zname.."' by '"..owner.."' @ "..formatCoord(coords))
+    return zname
+end
+
+-- MODEL: createModelTarget(models, opts, dist, nameOpt?)
+function createModelTarget(models, opts, dist, name)
+    startTargetLoop()
+
+    local owner = getOwnerResource()
+    if type(models) ~= "table" then models = { models } end
+
+    local key
+    if name then
+        key = tostring(name)
+    else
+        local parts = {}
+        for i, m in ipairs(models) do parts[i] = tostring(m) end
+        key = "model_" .. table.concat(parts, "_")
+    end
+
+    local buttontext = bakeButtons(opts)
+    TextTargets[key] = {
+        _key   = key,
+        _type  = "model",
+        _owner = owner,
+        models = models,
+        buttontext = buttontext,
+        options    = opts,
+        dist       = dist,
+        coords     = vec3(0, 0, 0), -- will be updated by the refresher
+    }
+    updateCachedText(TextTargets[key])
+    registerTarget(owner, key)
+    -- print("^6Bridge^7:^5 Target^7: ^2Added/Updated MODEL target '"..key.."' by '"..owner.."' (models: "..table.concat(models, ",")..")")
+    return key
+end
+
+-- ===== Public API: Remove targets =====
+-- Entity removal accepts entity handle or key string.
+function removeEntityTarget(entityOrKey)
+    local key = nil
+    if type(entityOrKey) == "string" then
+        key = entityOrKey
+    elseif type(entityOrKey) == "number" then
+        for k, t in pairs(TextTargets) do
+            if t._type == "entity" and t.entity == entityOrKey then key = k break end
+        end
+        if not key then
+            -- Fallback: try coord-key match
+            local c = GetEntityCoords(entityOrKey)
+            local guess = "entity@"..vecKey(c)
+            if TextTargets[guess] then key = guess end
+        end
+    end
+    if key then removeTargetKey(key, "removeEntityTarget") end
+end
+
+function removeZoneTarget(key)
+    if not key then return end
+    removeTargetKey(key, "removeZoneTarget")
+end
+
+-- For models, pass the returned key from createModelTarget (recommended).
+function removeModelTarget(key)
+    if not key then return end
+    removeTargetKey(key, "removeModelTarget")
+end
+
+exports("createEntityTarget", createEntityTarget)
+exports("createZoneTarget", createZoneTarget)
+exports("createModelTarget", createModelTarget)
+
+exports("removeEntityTarget", removeEntityTarget)
+exports("removeZoneTarget", removeZoneTarget)
+exports("removeModelTarget", removeModelTarget)
+
+-------------------------------------------------------------
+-- Fallback: DrawText3D Targets (Experimental)
+-------------------------------------------------------------
+local started = false
+function startTargetLoop()
+    if started then return end
+    started = true
+
+    -- lazy include (unchanged from your original)
+    Config = { System = {} }
+    local fileLoader = assert(load(LoadResourceFile("jim_bridge", ('starter.lua')), ('@@jim_bridge/starter.lua')))
+    fileLoader()
+
+    -- Model Entity Refresher (kept)
+    CreateThread(function()
+        while true do
+            local pedCoords = GetEntityCoords(PlayerPedId())
+            for _, target in pairs(TextTargets) do
+                if target.models then
+                    for _, model in ipairs(target.models) do
+                        local entity = GetClosestObjectOfType(pedCoords.x, pedCoords.y, pedCoords.z, target.dist, model, false, false, false)
+                        if entity and entity ~= 0 then
+                            target.entity = entity
+                            target.coords = GetEntityCoords(entity)
+                            break
+                        end
+                    end
+                end
+            end
+            Wait(3000) -- Refresh every 3s
+        end
+    end)
+
+    -- Main Target Loop (unchanged logic, just uses new TextTargets entries)
+    CreateThread(function()
+        while true do
+            local ped = PlayerPedId()
+            local pedCoords = GetEntityCoords(ped)
+            local camCoords = GetGameplayCamCoord()
+            local camRot = GetGameplayCamRot(2)
+            local camForward = RotationToDirection(camRot)
+
+            local closestTarget, closestDist, targetEntity = nil, math.huge, nil
+
+            for _, target in pairs(TextTargets) do
+                local coords = target.coords
+                if coords then
+                    local dist = #(pedCoords - coords)
+                    if dist <= target.dist then
+                        local normVec = normalizeVector(coords - camCoords)
+                        local dot = camForward.x * normVec.x + camForward.y * normVec.y + camForward.z * normVec.z
+
+                        if dot > 0.5 and dist < closestDist then
+                            closestTarget = target
+                            closestDist = dist
+                            targetEntity = target.entity
+                        end
+                    end
+                end
+            end
+
+            for _, target in pairs(TextTargets) do
+                if not target.coords then goto continue end
+                local dist = #(pedCoords - target.coords)
+                if dist > target.dist then goto continue end
+                local isClosest = (target == closestTarget)
+
+                for i, opt in ipairs(target.options) do
+                    if IsControlJustPressed(0, opt.key) and isClosest then
+                        if (not target.canInteract or target.canInteract()) and
+                           (not opt.item or hasItem(opt.item)) and
+                           (not opt.job or hasJob(opt.job, nil)) then
+                            if opt.onSelect then opt.onSelect(targetEntity) end
+                            if opt.action   then opt.action(targetEntity)   end
+                        end
+                    end
+                end
+
+                local baseZ, lineHeight = target.coords.z + 1.0, -0.16
+                local lineOffset = 0
+
+                for i, opt in ipairs(target.options) do
+                    if (not target.canInteract or target.canInteract()) and
+                       (not opt.item or hasItem(opt.item)) and
+                       (not opt.job or hasJob(opt.job, nil)) then
+                        DrawText3D(vec3(target.coords.x, target.coords.y, baseZ + lineHeight * lineOffset), target.buttontext[i], isClosest)
+                        lineOffset = lineOffset + 1
+                    end
+                end
+
+                ::continue::
+            end
+
+            Wait(1)
+        end
+    end)
+end
+
+function DrawText3D(coord, text, highlight)
+    SetTextScale(0.30, 0.30)
+    SetTextFont(0)
+    SetTextProportional(1)
+    SetTextColour(255, 255, 255, 215)
+    SetTextEntry("STRING")
+    SetTextCentre(true)
+
+    local totalLength = string.len(text)
+    local textMaxLength = 99
+    local txt = totalLength > textMaxLength and text:sub(1, textMaxLength) or text
+    AddTextComponentString(highlight and txt:gsub("%~w~", "~y~") or txt)
+    SetDrawOrigin(coord.x, coord.y, coord.z, 0)
+    DrawText(0.0, 0.0)
+    local count, length = GetLineCountAndMaxLength(txt)
+
+    local padding = 0.005
+    local heightFactor = (count / 43) + padding
+    local weightFactor = (length / 150) + padding
+
+    local height = (heightFactor / 2) - padding / 1
+    local width  = (weightFactor / 2) - padding / 1
+
+    DrawRect(0.0, height, width, heightFactor, 0, 0, 0, 150)
+    ClearDrawOrigin()
+end
+
+function GetLineCountAndMaxLength(text)
+    local lineCount, maxLength = 0, 0
+    for line in text:gmatch("[^\n]+") do
+        lineCount = lineCount + 1
+        local lineLength = string.len(line)
+        if lineLength > maxLength then
+            maxLength = lineLength
+        end
+    end
+    if lineCount == 0 then lineCount = 1 end
+    return lineCount, maxLength
+end
+
+function RotationToDirection(rot)
+    local adjust = math.pi / 180
+    return vec3(
+        -math.sin(adjust * rot.z) * math.abs(math.cos(adjust * rot.x)),
+         math.cos(adjust * rot.z) * math.abs(math.cos(adjust * rot.x)),
+         math.sin(adjust * rot.x)
+    )
+end
+
+function normalizeVector(vec)
+    local len = math.sqrt(vec.x^2 + vec.y^2 + vec.z^2)
+    if len ~= 0 then
+        return vec3(vec.x / len, vec.y / len, vec.z / len)
+    else
+        return vec3(0, 0, 0)
+    end
+end

version.txt

@@ -1 +1,16 @@
-1.2
+2.1.0
+
+- Script Overhaul, replace whole script
+- Very alpha support for VorpCore
+- Improve security
+- Removal of Quasar Script Support
+- Support Tgiann-inv's new item system
+- Refactor most multi-functions to be more optimized and smarter
+- Added multifunction bossmenu and clothing functions
+- Added ability to supress update notifcations in fxmanfiest.lua
+- Added coordinate checks to registerStash, registerShop and sellShop
+- Optimize and Enhance built-in progressbar + target functions
+- Improve weird multicharacter issue triggering onPlayerLoaded more than once
+- Scripts that use this will need updating too, as things like stashes won't open
+
+https://github.com/jimathy/jim_bridge/releases/latest