Version Bump

`2.0.12` - `2.0.13`

.github/workflows/notify-discord.yml

@@ -0,0 +1,17 @@
+name: Discord Commit Notifier
+
+on:
+  push:
+    branches:
+      - '*'  # triggers on all branches
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Discord Commits
+        uses: Sniddl/discord-commits@v1.6
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          template: "avatar-with-link"
+          include-extras: true

_versioncheck.lua

@@ -1,4 +1,4 @@
-function parseVersion(version)
+local function parseVersion(version)
     local parts = {}
     for num in version:gmatch("%d+") do
         table.insert(parts, tonumber(num))
@@ -6,7 +6,7 @@ function parseVersion(version)
     return parts
 end
 
-function compareVersions(current, newest)
+local function compareVersions(current, newest)
     local currentParts = parseVersion(current)
     local newestParts = parseVersion(newest)
     for i = 1, math.max(#currentParts, #newestParts) do
@@ -20,28 +20,48 @@ end
 
 function CheckBridgeVersion()
     if IsDuplicityVersion() then
-		CreateThread(function()
-			Wait(4000)
-			local currentVersionRaw = GetResourceMetadata("jim_bridge", 'version')
-			PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, newestVersionRaw, headers)
-				if not newestVersionRaw then
-					print("^1Unable to run version check for ^7'^3jim_bridge^7' (^3"..currentVersionRaw.."^7)")
-					return
-				end
+        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
 
-				newestVersionRaw = newestVersionRaw:match("[^\r\n]+")
-				local compareResult = compareVersions(currentVersionRaw, newestVersionRaw)
+                local lines = {}
+                for line in body:gmatch("[^\r\n]+") do
+                    table.insert(lines, line)
+                end
 
-				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("^7'^3jim_bridge^7' - ^1You are running an outdated version^7! ^7(^3"..currentVersionRaw.."^7 → ^3"..newestVersionRaw.."^7)")
-				else
-					print("^7'^3jim_bridge^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersionRaw.."^7)")
-				end
-			end)
-		end)
-	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(1200000, function()
+                        CheckBridgeVersion()
+                    end)
+                else
+                    print("^7'^3jim_bridge^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersionRaw.."^7)")
+                end
+            end)
+        end)
+    end
 end
 
+
 CheckBridgeVersion()

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.01"
+version "2.0.13"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
@@ -16,9 +16,4 @@ files {
 }
 
 -- Version checker
-server_scripts { '_versioncheck.lua' }
-
--- NUI Menu Loading
-client_scripts { 'nui/*.lua' }
-ui_page 'nui/index.html'
-files { 'nui/index.html', 'nui/script.js', 'nui/style.css' }
+server_scripts { '_versioncheck.lua' }

nui/index.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>QB Menu</title>
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-
-        <!-- Font Awesome Icons Import -->
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
-
-        <link rel="stylesheet" href="./style.css" />
-        <script src="./script.js" defer></script>
-    </head>
-    <body>
-        <div id="container">
-            <div id="buttons"></div>
-        </div>
-        <!--
-        <div id="input-popup" class="hidden">
-            <div class="input-box">
-                <div class="input-header">Enter Info</div>
-                <form id="input-form">
-                </form>
-                <div class="input-actions">
-                    <button type="submit" form="input-form" class="input-submit">Submit</button>
-                    <button type="button" class="input-cancel">Cancel</button>
-                </div>
-            </div>
-        </div>
-        -->
-    </body>
-</html>

nui/main.lua

@@ -1,138 +0,0 @@
-Config = Config or { System = {} }
-
-CreateThread(function()
-    local fileLoader = assert(load(LoadResourceFile('jim_bridge', ('starter.lua')), ('@@jim_bridge/starter.lua')))
-    fileLoader()
-end)
-
-local headerShown = false
-local sendData = nil
-local sendModifiers = nil
-
-
---Colours for progressbar
-local colours = {
-    ["dark.0"] = "#C1C2C5", ["dark.1"] = "#A6A7AB", ["dark.2"] = "#909296", ["dark.3"] = "#5C5F66", ["dark.4"] = "#373A40", ["dark.5"] = "#2C2E33", ["dark.6"] = "#25262B", ["dark.7"] = "#1A1B1E", ["dark.8"] = "#141517", ["dark.9"] = "#101113",
-    ["gray.0"] = "#F8F9FA", ["gray.1"] = "#F1F3F5", ["gray.2"] = "#E9ECEF", ["gray.3"] = "#DEE2E6", ["gray.4"] = "#CED4DA", ["gray.5"] = "#ADB5BD", ["gray.6"] = "#868E96", ["gray.7"] = "#495057", ["gray.8"] = "#343A40", ["gray.9"] = "#212529",
-    ["red.0"] = "#FFF5F5", ["red.1"] = "#FFE3E3", ["red.2"] = "#FFC9C9", ["red.3"] = "#FFA8A8", ["red.4"] = "#FF8787", ["red.5"] = "#FF6B6B", ["red.6"] = "#FA5252", ["red.7"] = "#F03E3E", ["red.8"] = "#E03131", ["red.9"] = "#C92A2A",
-    ["pink.0"] = "#FFF0F6", ["pink.1"] = "#FFDEEB", ["pink.2"] = "#FCC2D7", ["pink.3"] = "#FAA2C1", ["pink.4"] = "#F783AC", ["pink.5"] = "#F06595", ["pink.6"] = "#E64980", ["pink.7"] = "#D6336C", ["pink.8"] = "#C2255C", ["pink.9"] = "#A61E4D",
-    ["grape.0"] = "#F8F0FC", ["grape.1"] = "#F3D9FA", ["grape.2"] = "#EEBEFA", ["grape.3"] = "#E599F7", ["grape.4"] = "#DA77F2", ["grape.5"] = "#CC5DE8", ["grape.6"] = "#BE4BDB", ["grape.7"] = "#AE3EC9", ["grape.8"] = "#9C36B5", ["grape.9"] = "#862E9C",
-    ["violet.0"] = "#F3F0FF", ["violet.1"] = "#E5DBFF", ["violet.2"] = "#D0BFFF", ["violet.3"] = "#B197FC", ["violet.4"] = "#9775FA", ["violet.5"] = "#845EF7", ["violet.6"] = "#7950F2", ["violet.7"] = "#7048E8", ["violet.8"] = "#6741D9", ["violet.9"] = "#5F3DC4",
-    ["indigo.0"] = "#EDF2FF", ["indigo.1"] = "#DBE4FF", ["indigo.2"] = "#BAC8FF", ["indigo.3"] = "#91A7FF", ["indigo.4"] = "#748FFC", ["indigo.5"] = "#5C7CFA", ["indigo.6"] = "#4C6EF5", ["indigo.7"] = "#4263EB", ["indigo.8"] = "#3B5BDB", ["indigo.9"] = "#364FC7",
-    ["blue.0"] = "#E7F5FF", ["blue.1"] = "#D0EBFF", ["blue.2"] = "#A5D8FF", ["blue.3"] = "#74C0FC", ["blue.4"] = "#4DABF7", ["blue.5"] = "#339AF0", ["blue.6"] = "#228BE6", ["blue.7"] = "#1C7ED6", ["blue.8"] = "#1971C2", ["blue.9"] = "#1864AB",
-    ["cyan.0"] = "#E3FAFC", ["cyan.1"] = "#C5F6FA", ["cyan.2"] = "#99E9F2", ["cyan.3"] = "#66D9E8", ["cyan.4"] = "#3BC9DB", ["cyan.5"] = "#22B8CF", ["cyan.6"] = "#15AABF", ["cyan.7"] = "#1098AD", ["cyan.8"] = "#0C8599", ["cyan.9"] = "#0B7285",
-    ["teal.0"] = "#E6FCF5", ["teal.1"] = "#C3FAE8", ["teal.2"] = "#96F2D7", ["teal.3"] = "#63E6BE", ["teal.4"] = "#38D9A9", ["teal.5"] = "#20C997", ["teal.6"] = "#12B886", ["teal.7"] = "#0CA678", ["teal.8"] = "#099268", ["teal.9"] = "#087F5B",
-    ["green.0"] = "#EBFBEE", ["green.1"] = "#D3F9D8", ["green.2"] = "#B2F2BB", ["green.3"] = "#8CE99A", ["green.4"] = "#69DB7C", ["green.5"] = "#51CF66", ["green.6"] = "#40C057", ["green.7"] = "#37B24D", ["green.8"] = "#2F9E44", ["green.9"] = "#2B8A3E",
-    ["lime.0"] = "#F4FCE3", ["lime.1"] = "#E9FAC8", ["lime.2"] = "#D8F5A2", ["lime.3"] = "#C0EB75", ["lime.4"] = "#A9E34B", ["lime.5"] = "#94D82D", ["lime.6"] = "#82C91E", ["lime.7"] = "#74B816", ["lime.8"] = "#66A80F", ["lime.9"] = "#5C940D",
-    ["yellow.0"] = "#FFF9DB", ["yellow.1"] = "#FFF3BF", ["yellow.2"] = "#FFEC99", ["yellow.3"] = "#FFE066", ["yellow.4"] = "#FFD43B", ["yellow.5"] = "#FCC419", ["yellow.6"] = "#FAB005", ["yellow.7"] = "#F59F00", ["yellow.8"] = "#F08C00", ["yellow.9"] = "#E67700",
-    ["orange.0"] = "#FFF4E6", ["orange.1"] = "#FFE8CC", ["orange.2"] = "#FFD8A8", ["orange.3"] = "#FFC078", ["orange.4"] = "#FFA94D", ["orange.5"] = "#FF922B", ["orange.6"] = "#FD7E14", ["orange.7"] = "#F76707",["orange.8"] = "#E8590C",["orange.9"] = "#D9480F"
-}
-
--- Functions
-function openNuiMenu(data, modifiers)
-    if not data or not next(data) then return end
-	for _, v in pairs(data) do
-        v["icon"] = v["arrow"] and "fas fa-angle-right" or v["icon"] or nil
-        v["colorScheme"] = v["colourScheme"] and colours[v["colourScheme"]] or (v["colorScheme"] and colours[v["colorScheme"]] or colours["green.7"])
-        if v["onSelect"] then
-            v.params = { isAction = true, event = v["onSelect"] }
-        end
-    end
-    SetNuiFocus(true, true)
-    headerShown = false
-    sendData = data
-    sendModifiers = modifiers or {}
-    SendNUIMessage({ action = 'OPEN_MENU', data = table.clone(data) })
-end
-
-local function closeMenu()
-    sendData = nil
-    sendModifiers = nil
-    headerShown = false
-    SetNuiFocus(false, false)
-    SendNUIMessage({ action = 'CLOSE_MENU' })
-end
-
-local function showHeader(data)
-    if not data or not next(data) then return end
-    headerShown = true
-    sendData = data
-    SendNUIMessage({ action = 'SHOW_HEADER', data = table.clone(data) })
-end
-
--- Events
-
-RegisterNetEvent("jim_bridge:client:openMenu", function(data) openNuiMenu(data) end)
-
-RegisterNetEvent("jim_bridge:client:closeMenu", function() closeMenu() end)
-
--- NUI Callbacks
-
-RegisterNUICallback('clickedButton', function(option)
-    if headerShown then headerShown = false end
-    PlaySound(-1, "CLICK_BACK", "WEB_NAVIGATION_SOUNDS_PHONE", 0, 0, 1)
-    SetNuiFocus(false, false)
-    if sendData then
-        local data = sendData[tonumber(option)]
-        sendData = nil
-        if data then
-            if data.params and data.params.event then
-                if data.params.isServer then
-                    TriggerServerEvent(data.params.event, data.params.args)
-                elseif data.params.isCommand then
-                    ExecuteCommand(data.params.event)
-                elseif data.params.isQBCommand then
-                    TriggerServerEvent('QBCore:CallCommand', data.params.event, data.params.args)
-                elseif data.params.isAction then
-                    data.params.event(data.params.args)
-                else
-                    TriggerEvent(data.params.event, data.params.args)
-                end
-            end
-        end
-    end
-end)
-
-RegisterNUICallback('closeMenu', function()
-    if sendModifiers and sendModifiers.onExit then sendModifiers.onExit() end -- when close menu is triggered (with esc or using a button to close it) trigger onExit function
-    headerShown = false
-    sendModifiers = nil
-    sendData = nil
-    SetNuiFocus(false, false)
-end)
-
--- Command and Keymapping
-RegisterCommand('playerfocus', function() if headerShown then SetNuiFocus(true, true) end end)
-RegisterKeyMapping('playerFocus', 'Give Menu Focus', 'keyboard', 'LMENU')
-
--- Exports
-exports('openMenu', function(data) openNuiMenu(data) end)
-exports('closeMenu', function() closeMenu() end)
-exports('showHeader', function(data) showHeader(data) end)
-
-
--- Input Dialog
--- function inputDialog(title, config)
---     local p = promise.new()
---     local cbId = math.random(111111, 999999)
---
---     RegisterNUICallback("inputResult", function(data, cb)
---         if data.cbId == cbId then
---             cb({})
---             SetNuiFocus(false, false)
---             p:resolve(data.result)
---         end
---     end)
---
---     SendNUIMessage({
---         action = "SHOW_INPUT",
---         title = title,
---         data = config,
---         cbId = cbId
---     })
---
---     SetNuiFocus(true, true)
---     return Citizen.Await(p)
--- end
---
--- exports('inputDialog', inputDialog)

nui/script.js

@@ -1,342 +0,0 @@
-let buttonParams = [];
-let menuItems = [];
-
-const openMenu = (data = null) => {
-    let html = "<div id='buttons'>";
-
-    // Add search as a title-like fixed header
-    html += `
-        <div class="title search-container">
-            <input type="text" id="search-input" placeholder="Search..." autocomplete="off">
-        </div>
-    `;
-
-    data.forEach((item, index) => {
-        if (!item.hidden) {
-            let header = item.header || item.title;
-            let message = item.txt || item.text || item.description;
-            let isMenuHeader = item.isMenuHeader;
-            let isDisabled = item.disabled;
-            let icon = item.icon;
-            let progress = item.progress || item.progressbar;
-            let colour = item.colorScheme;
-            html += getButtonRender(header, message, index, isMenuHeader, isDisabled, icon, progress, colour);
-            if (item.params) buttonParams[index] = item.params;
-        }
-    });
-
-    html += "</div>";
-
-    $("#container").html(html);
-
-    $('.button').click(function() {
-        const target = $(this)
-        if (!target.hasClass('title') && !target.hasClass('disabled')) {
-            postData(target.attr('id'));
-        }
-    });
-
-    $("#search-input").on("input", function() {
-        const value = $(this).val().toLowerCase();
-        $("#buttons .button, #buttons .title").filter(function(index) {
-            if (index === 0) return; // Skip the search bar itself (first title)
-            $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
-        });
-    });
-};
-
-const getButtonRender = (header, message = null, id, isMenuHeader, isDisabled, icon, progress, colour) => {
-    return `
-        <div class="${isMenuHeader ? "title" : "button"} ${isDisabled ? "disabled" : ""} " id="${id}">
-            ${icon ? `
-                <div class="icon">
-                    <img src=${icon} onerror="this.onerror=null; this.remove();">
-                    <i class="${icon}" onerror="this.onerror=null; this.remove();"></i>
-                </div>
-            ` : " " }
-            <div class="column">
-                <div class="header">${header ? `${header}` : " "}</div>
-                ${message ? `<div class="text"> ${message}</div>` : ""}
-            </div>
-        </div>
-
-        ${progress ? `
-            <div class="progress-container">
-                <div class="progress-bar" style="width: ${progress}%; background-color: ${colour};"></div>
-            </div>`
-        : ""}
-    `;
-};
-
-const closeMenu = () => {
-    $("#buttons").html(" ");
-    buttonParams = [];
-    $("#search-input").hide(); // hide search bar
-};
-
-const postData = (id) => {
-    $.post(`https://${GetParentResourceName()}/clickedButton`, JSON.stringify(parseInt(id) + 1));
-    return closeMenu();
-};
-
-const cancelMenu = () => {
-    $.post(`https://${GetParentResourceName()}/closeMenu`);
-    return closeMenu();
-};
-
-const filterButtons = (query) => {
-    const filteredItems = menuItems.filter(item => item.header.toLowerCase().includes(query.toLowerCase()));
-    openMenu(filteredItems);
-};
-
-$("#search-input").on('input', function() {
-    filterButtons($(this).val());
-});
-
-document.onkeyup = function (event) {
-    const charCode = event.key;
-    if (charCode == "Escape") {
-        cancelMenu();
-    }
-};
-
-let inputCallbackId = null;
-
-window.addEventListener("message", (event) => {
-    const data = event.data;
-    const buttons = data.data;
-    const action = data.action;
-    debugLog("Opening Input Popup", data.data); // Log the input config specifically
-
-    switch (action) {
-        case "OPEN_MENU":
-        case "SHOW_HEADER":
-            return openMenu(buttons);
-        case "CLOSE_MENU":
-            return closeMenu();
-        case "SHOW_INPUT":
-            inputCallbackId = data.cbId;
-            debugLog("Opening Input Popup", data.data); // Log the input config specifically
-            return openInputPopup(data.data);
-        default:
-            return;
-    }
-});
-
-document.onkeyup = function (event) {
-    const charCode = event.key;
-    if (charCode == "Escape") {
-        cancelMenu();
-    }
-};
-
-const openInputPopup = (config) => {
-    if (!config || !Array.isArray(config)) {
-        console.error("Invalid input config: missing or malformed 'fields'", config);
-        return;
-    }
-    const container = document.getElementById("input-popup");
-    const form = document.getElementById("input-form");
-    form.innerHTML = ""; // clear form
-
-    config.forEach(field => {
-        let input;
-
-        switch (field.type) {
-            case "text":
-            case "number":
-                input = document.createElement("input");
-                input.type = field.type;
-                break;
-            case "radio":
-                input = document.createElement("input");
-                input.type = "radio";
-                break;
-            case "select":
-                input = document.createElement("select");
-                field.options.forEach(opt => {
-                    const option = document.createElement("option");
-                    option.value = opt;
-                    option.textContent = opt;
-                    input.appendChild(option);
-                });
-                break;
-            case "slider":
-                input = document.createElement("input");
-                input.type = "range";
-                input.min = field.min;
-                input.max = field.max;
-                input.step = field.step || 1;
-                break;
-            case "color":
-                input = document.createElement("input");
-                input.type = "color";
-                break;
-        }
-
-        if (!input) return;
-
-        input.name = field.name;
-        input.className = "input-field";
-        input.placeholder = field.label || field.placeholder || "";
-        if (field.required) input.required = true;
-
-        const wrapper = document.createElement("div");
-        wrapper.className = "input-wrapper";
-        if (field.type === "radio") {
-            if (field.label) {
-                const titleLabel = document.createElement("label");
-                titleLabel.className = "input-label";
-                titleLabel.textContent = field.label;
-                wrapper.appendChild(titleLabel);
-            }
-
-            if (Array.isArray(field.options)) {
-                field.options.forEach(opt => {
-                    const radioWrapper = document.createElement("label");
-                    radioWrapper.className = "radio-wrapper";
-
-                    const radio = document.createElement("input");
-                    radio.type = "radio";
-                    radio.name = field.name;
-                    radio.value = opt.value;
-                    radio.className = "radio-input";
-
-                    // Set default checked radio
-                    if (field.default === opt.value) {
-                        radio.checked = true;
-                    }
-
-                    const label = document.createElement("span");
-                    label.className = "radio-label";
-                    label.textContent = opt.label || opt.value;
-
-                    radioWrapper.appendChild(radio);
-                    radioWrapper.appendChild(label);
-                    wrapper.appendChild(radioWrapper);
-                });
-            }
-
-            form.appendChild(wrapper);
-            return;
-        }
-
-        if (field.type === "color") {
-            if (field.label) {
-                const titleLabel = document.createElement("label");
-                titleLabel.className = "input-label";
-                titleLabel.textContent = field.label;
-                wrapper.appendChild(titleLabel);
-            }
-            const colorPreview = document.createElement("span");
-            colorPreview.className = "color-preview";
-            colorPreview.textContent = input.value;
-
-            input.addEventListener("input", () => {
-                const hex = input.value;
-                const rgb = hexToRgb(hex);
-                colorPreview.textContent = `${hex.toUpperCase()} (${rgb})`;
-            });
-            wrapper.classList.add("color-picker");
-
-            wrapper.appendChild(input);
-            wrapper.appendChild(colorPreview);
-            form.appendChild(wrapper);
-            return;
-        }
-
-        if (field.type === "slider") {
-            if (field.label) {
-                const titleLabel = document.createElement("label");
-                titleLabel.className = "input-label";
-                titleLabel.textContent = field.label;
-                wrapper.appendChild(titleLabel);
-            }
-            input.value = field.default || field.min;
-            const sliderValue = document.createElement("div");
-            sliderValue.className = "slider-values";
-            sliderValue.innerHTML = `
-                <span class="slider-min">${field.min}</span>
-                <span class="slider-current">${input.value}</span>
-                <span class="slider-max">${field.max}</span>
-            `;
-
-            input.addEventListener("input", () => {
-                sliderValue.querySelector(".slider-current").textContent = input.value;
-            });
-
-            wrapper.appendChild(sliderValue);
-            wrapper.appendChild(input);
-            form.appendChild(wrapper);
-            return;
-        }
-
-        // Common label
-        const label = document.createElement("label");
-        label.className = "input-label";
-        label.textContent = field.label || field.name || "Input";
-        wrapper.appendChild(label);
-
-        // Input
-        input.name = field.name;
-        input.className = "input-field";
-        if (field.required) input.required = true;
-        wrapper.appendChild(input);
-
-        form.appendChild(wrapper);
-
-        form.appendChild(wrapper);
-    });
-
-    form.onsubmit = function (e) {
-        e.preventDefault();
-        const data = {};
-        new FormData(form).forEach((val, key) => {
-            // checkboxes return "on" when checked
-            if (form[key].type === "checkbox") {
-                data[key] = form[key].checked;
-            } else if (form[key].type === "color") {
-                const hex = val;
-                const rgb = hexToRgb(hex);
-                data[key] = {
-                    hex: hex.toUpperCase(),
-                    rgb: rgb
-                };
-            } else {
-                data[key] = val;
-            }
-        });
-        returnInputData(data);
-    };
-
-    document.querySelector(".input-cancel").onclick = () => {
-        returnInputData(null);
-    };
-
-    container.classList.remove("hidden");
-};
-
-const closeInputPopup = () => {
-    document.getElementById("input-popup").classList.add("hidden");
-};
-
-const returnInputData = (result) => {
-    $.post(`https://${GetParentResourceName()}/inputResult`, JSON.stringify({
-        cbId: inputCallbackId,
-        result
-    }));
-    closeInputPopup();
-};
-
-const debugLog = (label, data) => {
-    //console.log(`^4[DEBUG] ${label}`);
-    //console.log(JSON.stringify(data, null, 2));
-};
-
-function hexToRgb(hex) {
-    const bigint = parseInt(hex.slice(1), 16);
-    const r = (bigint >> 16) & 255;
-    const g = (bigint >> 8) & 255;
-    const b = bigint & 255;
-    return `RGB(${r}, ${g}, ${b})`;
-}

nui/style.css

@@ -1,450 +0,0 @@
-@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@300;500&display=swap");
-
-:root {
-	--font-family: "Poppins", sans-serif !important;
-	--width: 65%;
-
-
-	--text-colour: white;
-	--text-colour-hover: black;
-	--background-button: rgba(23, 23, 23, 85%);
-	--background-button-hover: rgba(200, 200, 200, 85%);
-	--background-title: rgba(23, 23, 23, 100%);
-
-    /*
-	--text-colour: black;
-	--text-colour-hover: white;
-	--background-button: rgba(200, 200, 200, 85%);
-	--background-button-hover: rgba(0, 0, 0, 85%);
-	--background-title: rgba(200, 200, 200);
-    */
-}
-
-* {
-    padding: 0;
-    margin: 0;
-    font-family: var(--font-family);
-	font-weight: 300;
-}
-
-#container {
-	position: absolute;
-	height: auto;
-	top: 15%;
-	right: 20%;
-	z-index: 2;
-}
-.button {
-    cursor: pointer;
-    display: flex;
-    flex-direction: row !important;
-    gap: 10px;
-}
-.title {
-    cursor: default;
-    gap: 10px;
-    display: flex;
-    flex-direction: row !important;
-}
-
-#buttons {
-	max-height: 80vh;
-	width: 250%;
-	overflow-x: none;
-	overflow-y: auto;
-	padding: 10px;
-}
-
-html, body { background: transparent !important; }
-
-#buttons::-webkit-scrollbar { display: none; }
-
-body::-webkit-scrollbar { display: none; }
-
-.button {
-	max-width: 56%;
-	height: 60%;
-	background-color: var(--background-button);
-	color: var(--text-colour);
-	margin: auto;
-	position: relative;
-	top: 10%;
-	overflow: hidden;
-	padding: 0.45rem;
-	display: flex;
-	flex-direction: column;
-	cursor: pointer;
-	z-index: 1;
-	transition-property: color;
-	transition-duration: 0.1s, 0.2s;
-	transition-timing-function: linear, ease-in;
-}
-
-.button::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 0%;
-    height: 100%;
-    background-color: var(--background-button-hover);
-    z-index: 0;
-    transition: width 0.2s ease;
-}
-
-.button:hover::before {
-    width: 100%;
-}
-
-.button > * {
-    position: relative;
-    z-index: 1;
-}
-
-.button:hover {
-    color: var(--text-colour-hover);
-}
-
-.icon > img {
-	width: 2.2vh !important;
-}
-
-.icon {
-	font-size: 1.2vh;
-	transition-property: all, filter;
-	transition-duration: 0.1s, 0.3s;
-	transition-timing-function: linear, ease-in;
-    display: inline-flex;
-    align-items: center;
-    position: static;
-    justify-content: left;
-	opacity: 0.5;
-}
-
-.button:hover > .icon {
-	opacity: 1.0;
-	animation: bounce 2s linear;
-	filter: drop-shadow(-1px -1px 15px white);
-}
-
-.bounce {
-	animation-name: bounce-4;
-	animation-timing-function: ease;
-}
-
-@keyframes bounce {
-	0%   { transform: scale(1,1); }
-	10%  { transform: scale(1.1); }
-	30%  { transform: scale(1.5); }
-	50%  { transform: scale(1.5); }
-	100% { transform: scale(1.5); }
-}
-
-.title {
-	font-family: var(--font-family);
-	width: auto;
-	max-width: 56%;
-	height: 60%;
-	background: var(--background-title);
-	color: var(--text-colour);
-	margin: auto;
-	margin-left: -0.5;
-	position: relative;
-	top: 10%;
-	overflow: hidden;
-	padding: 0.45rem;
-	flex-direction: column;
-	border-left: 0px;
-}
-
-.title > div.header {
-	font-family: var(--font-family);
-    text-decoration: underline !important;
-}
-
-.disabled {
-    cursor: default;
-}
-
-div > .text {
-	font-family: var(--font-family);
-	flex-direction: column;
-	font-size: 1.0vh;
-	overflow: hidden;
-}
-div > .header {
-	font-family: var(--font-family);
-	width: 100%;
-	max-width: 100%;
-	display: flex;
-	align-items: center;
-	position: relative;
-	justify-content: left;
-	overflow: wrap;
-	font-size: 1.3vh;
-	font-weight: 400;
-	overflow: hidden;
-}
-
-/* Search input */
-
-.title.search-container {
-    background: var(--background-button);
-    color: var(--text-colour);
-    border-top-left-radius: 8px;
-    border-top-right-radius: 8px;
-    z-index: 3;
-}
-
-.title.search-container input[type="text"] {
-    color: var(--text-colour);
-    font-family: var(--font-family);
-    font-size: 1rem;
-	width: auto;
-	max-width: 56%;
-    border: none;
-    background-color: transparent;
-	transition: background-color 0.2s ease, color 0.2s ease;
-	outline: none;
-}
-
-
-.title.search-container input[type="text"]::placeholder {
-    color: var(--text-colour);
-    opacity: 0.5;
-}
-
-.progress-container {
-	z-index: 99999;
-    width: auto;
-	max-width: 56%;
-    background-color: var(--background-title);
-    height: 0.4vh;
-	padding-left: 0.45rem;
-	padding-right: 0.45rem;
-    margin: auto;
-}
-
-.progress-bar {
-    height: 90%;
-	max-width: auto;
-    transition: width 0.3s ease-in-out;
-}
-
-
-
-.hidden {
-    display: none !important;
-}
-
-#input-popup {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    width: 100vw;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-}
-
-.input-box {
-	font-weight: 300;
-    background: var(--background-button);
-    color: var(--text-colour);
-    width: 25vw;
-	box-shadow: 0 0 15px var(--background-button-hover);
-}
-
-.input-header {
-    font-size: 1.4rem;
-    margin-bottom: 1rem;
-    margin-top: 0.5rem;
-    font-weight: 500;
-    text-align: center;
-}
-
-.input-actions {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 1rem;
-}
-
-.input-actions button {
-    padding: 0.5rem 1rem;
-    border: none;
-    border-radius: 6px;
-    margin-bottom: 0.8rem;
-    margin-left: 0.6rem;
-    margin-right: 0.6rem;
-    cursor: pointer;
-    background: var(--background-button);
-    color: var(--text-colour);
-    transition: background 0.2s ease;
-}
-
-.input-actions button:hover {
-	color: var(--text-colour-hover);
-	background: var(--background-button-hover);
-}
-
-.input-wrapper {
-    position: relative;
-    width: 95%;
-    padding: 0.1rem;
-    margin-left: 0.6rem;
-    margin-bottom: 0.8rem;
-	background-color: var(--background-title);
-    overflow: hidden;
-}
-
-.input-wrapper::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 0%;
-    height: 100%;
-    background-color: var(--background-button-hover);
-    z-index: 0;
-    transition: width 0.2s ease;
-}
-
-.input-wrapper:focus-within::before {
-    width: 100%;
-}
-
-.input-wrapper:focus-within .input-field {
-    color: var(--text-colour-hover) !important;
-}
-
-.input-wrapper:focus-within .input-label {
-    color: var(--text-colour-hover) !important;
-}
-
-.checkbox-wrapper:has(.checkbox-input:focus) .checkbox-label {
-    color: var(--text-colour-hover) !important;
-}
-
-.input-wrapper:focus-within .color-preview {
-    color: var(--text-colour-hover) !important;
-}
-
-.input-wrapper:has(input[type="range"]:focus) .slider-values {
-    color: var(--text-colour-hover) !important;
-}
-
-.input-wrapper:focus-within .slider-current {
-    color: var(--text-colour-hover) !important;
-}
-
-
-.input-field {
-	width: 100%;
-    position: relative;
-    z-index: 1;
-    border: transparent;
-    background: transparent;
-    color: var(--text-colour);
-    font-size: 1rem;
-    transition: color 0.2s ease;
-}
-
-.input-wrapper:hover .input-field {
-    color: var(--text-colour-hover);
-}
-
-.input-label {
-    display: block;
-    font-size: 0.9rem;
-    font-weight: 500;
-    color: var(--text-colour);
-    margin-bottom: 0.25rem;
-    z-index: 1;
-    position: relative;
-}
-
-.radio-wrapper {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    padding: 0.5rem;
-    background: var(--background-title);
-    border-radius: 4px;
-    z-index: 1;
-}
-
-.radio-input {
-    transform: scale(1.2);
-    accent-color: var(--background-button-hover);
-    z-index: 1;
-}
-
-.radio-label {
-    color: var(--text-colour);
-    font-size: 0.95rem;
-    z-index: 1;
-}
-
-/* Focus styling */
-.radio-wrapper:has(.radio-input:focus) .radio-label {
-    color: var(--text-colour-hover) !important;
-}
-.input-wrapper:focus-within .radio-label {
-	color: var(--text-colour-hover) !important;
-  }
-.input-wrapper.color-picker {
-    display: flex;
-    flex-direction: column; /* this is key */
-    align-items: flex-start;
-    justify-content: flex-start;
-    z-index: 1;
-}
-
-.input-field[type="color"] {
-    width: 100%; /* half width */
-    padding: 0.2rem;
-    cursor: pointer;
-    z-index: 1;
-}
-
-.color-preview {
-    display: inline-block;
-    margin-left: 0.5rem;
-    font-size: 0.9rem;
-    color: var(--text-colour);
-    z-index: 1;
-    position: relative;
-}
-
-.slider-values {
-    z-index: 2;
-	position: relative; /* <-- this is the key */
-	margin-left: 0.6rem;
-    margin-right: 0.6rem;
-    display: flex;
-    justify-content: space-between;
-    font-size: 0.85rem;
-    color: var(--text-colour);
-    margin-bottom: 0.3rem;
-}
-
-.slider-current {
-    font-weight: bold;
-    color: var(--text-colour);
-    z-index: 1;
-}
-
-.input-field select,
-.input-field option {
-    background-color: var(--background-button);
-    color: var(--text-colour);
-}
-
-.input-field option:hover,
-.input-field option:focus {
-    background-color: var(--background-button-hover);
-    color: var(--text-colour-hover);
-}

shared/_loaders.lua

@@ -40,6 +40,7 @@ function onPlayerLoaded(func, onStart)
 
     if not loaded then
         local tempFunc = function()
+            Wait(2000)
             debugPrint("^6Bridge^7: ^2Executing onPlayerLoaded")
             func()
         end
@@ -49,7 +50,13 @@ function onPlayerLoaded(func, onStart)
             AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
         elseif isStarted(ESXExport) then
             onPlayerFramework = ESXExport
-            AddEventHandler('esx:playerLoaded', tempFunc)
+            AddEventHandler('esx:playerLoaded', function()
+                if waitForSharedLoad() then
+                    if isStarted(ESXExport) then Wait(11000) end
+                    tempFunc()
+                end
+            end
+        )
         elseif isStarted(OXCoreExport) then
             onPlayerFramework = OXCoreExport
             AddEventHandler('ox:playerLoaded', tempFunc)
@@ -99,10 +106,14 @@ end
 --- end, true)
 --- ```
 function onResourceStart(func, thisScript)
-    debugPrint("^6Bridge^7: Registering ^3onResourceStart^7()")
+    debugPrint("^6Bridge^7: ^2Registering ^3onResourceStart^7()")
     AddEventHandler('onResourceStart', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
-            func()
+            if waitForSharedLoad() then
+                debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
+                if isStarted(ESXExport) then Wait(10000) end
+                func()
+            end
         end
     end)
 end
@@ -138,9 +149,7 @@ function waitForLogin()
     local loggedIn = false
 
     if isStarted(ESXExport) then
-        debugPrint("^6Bridge^7: ^3ESX waitForLogin^7() ^2running^7")
         while (GetGameTimer() - startTime) < timeout do
-            while not ESX do Wait(100) end
             local playerData = ESX.GetPlayerData()
             if playerData and playerData.job then
                 loggedIn = true
@@ -175,4 +184,26 @@ function waitForLogin()
         debugPrint("^6Bridge^7: ^2Player Login Detected^7.")
         return true
     end
+end
+
+function waitForSharedLoad()
+    local timeout = 100000  -- 10 seconds in milliseconds
+    local startTime = GetGameTimer()
+    local loaded = true
+    while ((not Jobs or not next(Jobs)) and (not Items or not next(Items)) and (not Vehicles or not next(Vehicles))) and (GetGameTimer() - startTime) < timeout do
+        print((GetGameTimer() - startTime) < timeout)
+        Wait(1000)
+        debugPrint("Waiting for Jobs, Items, and Vehicles to be loaded")
+        if Jobs and Items and Vehicles then
+            print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
+            loaded = true
+            break
+        end
+    end
+    if not loaded then
+        print("^4Error^7: ^2Timeout reached while waiting for shared load^7.")
+        return false
+    else
+        return true
+    end
 end

shared/_scriptversioncheck.lua

@@ -15,7 +15,7 @@ function compareVersions(current, newest)
         if c < n then return -1
         elseif c > n then return 1 end
     end
-    return 0 -- equal
+    return 0
 end
 
 function capitalize(str)
@@ -30,42 +30,66 @@ local scriptAuthor = ("^2by ^4"..GetResourceMetadata(getScript(), 'author', nil)
 print(scriptName.." ^7v"..scriptVersion.."^7 - "..scriptDescription.." "..scriptAuthor.."^7")
 
 function CheckVersion()
-    if isServer() then
+    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
 
-                        fallbackVersionRaw = fallbackVersionRaw:match("[^\r\n]+"):gsub("v", "")
+                        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, fallbackVersionRaw)
+                        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("^7'^3"..script.."^7' - ^1You are currently running an outdated version^7! (^3"..currentVersionRaw.."^7 → ^3"..fallbackVersionRaw.."^7)")
+                            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"..fallbackVersionRaw.."^7)")
+                            print("^7'^3"..script.."^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..fallbackVersion.."^7)")
                         end
                     end)
                 else
-                    newestVersionRaw = newestVersionRaw:match("[^\r\n]+"):gsub("v", "")
+                    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, newestVersionRaw)
-					if compareResult == 0 then
+                    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("^7'^3"..script.."^7' - ^1You are currently running an outdated version^7! (^3"..currentVersionRaw.."^7 → ^3"..newestVersionRaw.."^7)")
+                        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(1200000, function() CheckVersion() end)
                     else
-                        print("^7'^3"..script.."^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersionRaw.."^7)")
+                        print("^7'^3"..script.."^7' - ^5You are running a newer version ^7(^3"..currentVersionRaw.."^7 ← ^3"..newestVersion.."^7)")
                     end
                 end
             end)
@@ -73,4 +97,4 @@ function CheckVersion()
     end
 end
 
-CheckVersion()
+CheckVersion()

shared/coreloader.lua

@@ -9,13 +9,13 @@
 -------------------------------------------------------------
 -- Global Variable Initialization
 -------------------------------------------------------------
-Items, Vehicles, Jobs, Gangs, Core, ESX = {}, nil, nil, nil, nil, nil
+Items, Vehicles, Jobs, Gangs, Core = {}, nil, nil, nil, nil
 
 -------------------------------------------------------------
 -- Correct QB Inventory Export
 -------------------------------------------------------------
--- Ensure that the QB inventory export is corrected from 'qb-inventory' to 'ps-inventory' or 'lj-inventory' if needed.
-Exports.QBInv = (isStarted("ps-inventory") and "ps-inventory") or (isStarted("lj-inventory") and "lj-inventory") or Exports.QBInv
+-- Correct ps-invetory to ls-inventory if somehow you still have that
+Exports.PSInv = isStarted("lj-inventory") and "lj-inventory" or Exports.PSInv
 
 -------------------------------------------------------------
 -- Framework Exports and Inventory Identifiers
@@ -27,14 +27,15 @@ OXLibExport, QBXExport, QBExport, ESXExport, OXCoreExport =
     Exports.ESXExport or "",
     Exports.OXCoreExport or ""
 
-OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv =
+OXInv, QBInv, PSInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv =
     Exports.OXInv or "",
     Exports.QBInv or "",
     Exports.PSInv or "",
     Exports.QSInv or "",
     Exports.CoreInv or "",
     Exports.CodeMInv or "",
-    Exports.OrigenInv or ""
+    Exports.OrigenInv or "",
+    Exports.TgiannInv or ""
 
 RSGExport, RSGInv =
     Exports.RSGExport or "",
@@ -86,6 +87,12 @@ elseif isStarted(QBExport) then
     itemResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
     Items = Core and Core.Shared.Items or nil
+    CreateThread(function()
+        while not Items or not next(Items) do
+            Items = exports[QBExport]:GetCoreObject().Shared.Items
+            Wait(1000)
+        end
+    end)
     if isStarted(QBExport) and not isStarted(QBXExport) then
         RegisterNetEvent('QBCore:Client:UpdateObject', function()
             Core = Core or exports[QBExport]:GetCoreObject()
@@ -95,13 +102,7 @@ elseif isStarted(QBExport) then
 
 elseif isStarted(ESXExport) then
     itemResource = ESXExport
-    ESX = exports[ESXExport]:getSharedObject()
-    while ESX == nil do
-        print("Waiting for ESX")
-        Wait(0)
-    end
     CreateThread(function()
-        while not ESX do Wait(0) end
         if isServer() then
             Items = ESX.GetItems()
             while not createCallback do Wait(100) end
@@ -119,12 +120,10 @@ elseif isStarted(RSGExport) then
     itemResource = RSGExport
     Core = Core or exports[RSGExport]:GetCoreObject()
     Items = Core and Core.Shared.Items or nil
-    if isStarted(RSGExport) and not isStarted(QBXExport) then
-        RegisterNetEvent('QBCore:Client:UpdateObject', function()
-            Core = Core or exports[RSGExport]:GetCoreObject()
-            Items = Core and Core.Shared.Items or nil
-        end)
-    end
+    RegisterNetEvent('RSGCore:Client:UpdateObject', function()
+        Core = Core or exports[RSGExport]:GetCoreObject()
+        Items = Core and Core.Shared.Items or nil
+    end)
 
 end
 
@@ -141,6 +140,7 @@ end
 -------------------------------------------------------------
 -- Compile vehicles from the detected frameworks into a unified table.
 if isStarted(QBXExport) or isStarted(QBExport) then
+    vehResource = QBExport
     Core = Core or exports[QBExport]:GetCoreObject()
     Vehicles = Core and Core.Shared.Vehicles
     if isStarted(QBExport) and not isStarted(QBXExport) then
@@ -149,26 +149,23 @@ if isStarted(QBXExport) or isStarted(QBExport) then
             Vehicles = Core and Core.Shared.Vehicles
         end)
     end
-    vehResource = QBExport
 
 elseif isStarted(OXCoreExport) then
+    vehResource = OXCoreExport
     Vehicles = {}
     for k, v in pairs(Ox.GetVehicleData()) do
         Vehicles[k] = { model = k, hash = GetHashKey(k), price = v.price, name = v.name, brand = v.make }
     end
-    vehResource = OXCoreExport
 
 elseif isStarted(ESXExport) then
+    vehResource = ESXExport
     CreateThread(function()
         if isServer() then
-            vehResource = ESXExport
             createCallback(getScript()..":getVehiclesPrices", function(source)
                 return Vehicles
             end)
             while not MySQL do Wait(2000) print("^1Waiting for MySQL to exist") end
             Vehicles = MySQL.query.await('SELECT model, price, name FROM vehicles')
-            --jsonPrint(Vehicles)
-            --while not createCallback do print("waiting") Wait(100) end
         end
         if not isServer() then
             --while not triggerCallback do print("waiting") Wait(100) end
@@ -187,23 +184,19 @@ elseif isStarted(ESXExport) then
     end)
 
 elseif isStarted(RSGExport) then
+    vehResource = RSGExport
     Core = Core or exports[RSGExport]:GetCoreObject()
     Vehicles = Core and Core.Shared.Vehicles
-    if isStarted(RSGExport) then
-        RegisterNetEvent('RSGExport:Client:UpdateObject', function()
-            Core = Core or exports[RSGExport]:GetCoreObject()
-            Vehicles = Core and Core.Shared.Vehicles
-        end)
-    end
-    vehResource = RSGExport
+    RegisterNetEvent('RSGCore:Client:UpdateObject', function()
+        Core = Core or exports[RSGExport]:GetCoreObject()
+        Vehicles = Core and Core.Shared.Vehicles
+    end)
 end
 if vehResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    CreateThread(function()
-        while not Vehicles do Wait(1000) print("Waiting") end
-        debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-    end)
+    while not Vehicles do Wait(1000) end
+    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
 end
 
 -------------------------------------------------------------
@@ -249,44 +242,69 @@ elseif isStarted(QBExport) then
     end
 
 elseif isStarted(ESXExport) then
-    ESX = exports[ESXExport]:getSharedObject()
+    jobResource = ESXExport
     if isServer() then
+        -- If server, create callback to get jobs
+        createCallback(getScript()..":getESXJobs", function(source)
+            return Jobs
+        end)
+        -- Populate jobs table with ESX.GetJobs()
         Jobs = ESX.GetJobs()
-        for k, v in pairs(Jobs) do
-            local count = countTable(Jobs[k].grades) - 1
-            Jobs[k].grades[tostring(count)].isBoss = true
+        --jsonPrint(Jobs)
+        --If retreived jobs is empty, wait for ESX to load
+        while countTable(Jobs) == 0 do
+            Jobs = ESX.GetJobs()
+            Wait(100)
         end
+        -- Organise into a table the script can use
+        for Role, Grades in pairs(Jobs) do
+
+            -- Check for "Boss" in name of grades
+            for grade, info in pairs(Grades.grades) do
+                --print(grade)
+                --jsonPrint(info)
+
+                if info.label then
+                    --print(info)
+                    if info.label:find("boss") or info.label:find("Boss") then
+                        --print("Found Boss label for:", Grades.label)
+                        Jobs[Role].grades[grade].isBoss = true
+                        goto continue
+                    end
+                end
+            end
+
+            -- If no roles with "boss" in the name, revert to max grade
+
+            -- Count grades
+            local count = countTable(Grades.grades)
+            Jobs[Role].grades[tostring(count-1)].isBoss = true
+            --print(Grades.label.." Grade: "..count.." is Boss")
+            ::continue::
+        end
+        -- ESX Default doesn't have gangs, so copy jobs to gangs
+        Gangs = Jobs
+    end
+    -- If client side, trigger callback to get jobs
+    if not isServer() then
+        Jobs = triggerCallback(getScript()..":getESXJobs")
         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)
 
 elseif isStarted(RSGExport) then
     jobResource = RSGExport
     Core = Core or exports[RSGExport]:GetCoreObject()
     Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
-    if isStarted(RSGExport) and not isStarted(QBXExport) then
-        RegisterNetEvent('QBCore:Client:UpdateObject', function()
-            Core = exports[RSGExport]:GetCoreObject()
-            Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
-        end)
-    end
+    RegisterNetEvent('RSGCore:Client:UpdateObject', function()
+        Core = exports[RSGExport]:GetCoreObject()
+        Jobs, Gangs = Core.Shared.Jobs, Core.Shared.Gangs
+    end)
 end
 
 if jobResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    while not Jobs do Wait(100) end
+    while not Jobs do Wait(1000) end
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource)
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
 end

shared/crafting.lua

@@ -80,11 +80,6 @@ function craftingMenu(data)
     -- 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 == "hasCrafted" and not data.craftable.craftedItems then
-                -- Retreive list of already crafted items from playermetadata to see if we should class this recipe as "new"
-                craftedItems = GetMetadata(nil, "craftedItems") or {}
-                data.craftable.craftedItems = craftedItems
-            end
             if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
                 tempCarryTable[k] = Recipes[i].amount or 1
             end
@@ -114,7 +109,7 @@ function craftingMenu(data)
                         settext = settext..(settext ~= "" and br or "")..(Items[l] and Items[l].label or "error - "..l)..(b > 1 and " x"..b or "")
                         metaTable[Items[l] and Items[l].label or "error - "..l] = b
                         itemTable[l] = b
-                        Wait(0)
+                        --Wait(0)
                     end
 
                     while not canCarryTable do Wait(0) end
@@ -122,25 +117,16 @@ function craftingMenu(data)
                     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 "")
 
-                    if not disable then
-                        if not canCarryTable[k] then
-                            setheader = setheader.." 📦"
-                        else
-                            setheader = setheader.." ✔️"
-                        end
-                    elseif not canCarryTable[k] then
-                        setheader = setheader.." 📦"
-                    end
-                    if Recipes[i]["hasCrafted"] ~= nil and craftedItems[k] == nil then
-                        setheader = "✨ "..setheader
-                    end
+                    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],
                         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) or disable) and settext or nil,
                         metadata = metaTable,
                         onSelect = (not disable and canCarryTable[k]) and function()
@@ -162,7 +148,7 @@ function craftingMenu(data)
                     }
                 end
             end
-            Wait(0)
+            --Wait(0)
         end
     end
 
@@ -208,16 +194,23 @@ end
 function multiCraft(data)
     local max = 0
     local stashName = nil
-    for i = 1, 100 do
-        local itemTable = {}
-        for l, b in pairs(data.craft[data.item]) do
-            debugPrint("")
-            itemTable[l] = (b * i)
-        end
+    local maxCreation = 100
 
+    -- Generate item table to check against stash or inventory
+    -- takes into account the ingredients needed for multiple items
+    local multiItemTable = {}
+
+    for i = 1, maxCreation do
+        multiItemTable[i] = {}
+        for l, b in pairs(data.craft[data.item]) do
+            multiItemTable[i][l] = (b * i)
+        end
+    end
+
+    for i = 1, maxCreation do
+        -- if its received a stash name, check if the items are in the stash
         if data.stashName then
-            debugPrint("")
-            local hasItems, stashname = checkStashItem(data.stashName, itemTable)
+            local hasItems, stashname = checkStashItem(data.stashName, multiItemTable[i])
             if hasItems == true then
                 max += 1
                 stashName = stashname
@@ -225,31 +218,34 @@ function multiCraft(data)
                 break
             end
         else
-            debugPrint("")
-            local has, _ = hasItem(itemTable, nil, nil)
+            -- 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
-        Wait(10)
     end
 
-    local dialog = createInput(data.craftable.Header, {
+    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") and {
             type = "slider",
-            label = "How many to craft?",
+            label = "How many to craft? "..br.."Max: "..carryMax,
             required = true,
             default = 1,
             min = 1,
-            max = max
+            max = carryMax
         }) or nil,
         ((Config.System.Menu == "qb") and {
             type = "number",
-            label = "How many to craft?"..br.."Max: "..max,
             name = "amount",
-            isRecuired = true,
+            isRequired = true,
             default = 1,
         }) or nil,
     })
@@ -259,14 +255,14 @@ function multiCraft(data)
 
         end
         if Config.System.Menu == "qb" then
-            if dialog["amount"] > max or dialog["amount"] < 1 or dialog["amount"] == nil or dialog["amount"] == "" 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,
@@ -274,7 +270,6 @@ function multiCraft(data)
             amount = dialog["amount"] or dialog[1],
             coords = data.coords,
             stashName = stashName or nil,
-            --stashTable = data.stashName,
             onBack = data.onBack,
             metadata = data.metadata,
         })
@@ -331,19 +326,23 @@ function makeItem(data)
     local crafted, crafting = true, true
     local cam = createTempCam(PlayerPedId(), data.coords)
     startTempCam(cam)
-
     for i = 1, craftAmount do
         for k, v in pairs(data.craft) do
             if not excludeKeys[k] then
                 if type(v) == "table" then
                     for l, b in pairs(v) do
+                        if isInventoryOpen() then
+                            print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            crafted, crafting = false, false
+                            return
+                        end
                         if crafting and progressBar({
                             label = "Using "..b.." "..Items[l].label,
                             time = 1000,
                             cancel = true,
                             dict = 'pickup_object',
                             anim = "putdown_low",
-                            flag = 48,
+                            flag = 49,
                             icon = l,
                         }) then
                             TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[l], "use", b)
@@ -353,6 +352,11 @@ function makeItem(data)
                         end
                         Wait(200)
                     end
+                    if isInventoryOpen() then
+                        --print("^1Error^7: ^2Inventory is open, you tried to break things")
+                        crafted, crafting, CraftLock = false, false, false
+                        return
+                    end
                     if crafted then
                         local craftProp = nil
                         if prop then
@@ -363,6 +367,12 @@ function makeItem(data)
                             local s = data.sound
                             PlaySoundFromEntity(s.soundId, s.audioName, PlayerPedId(), s.audioRef, true, 0)
                         end
+                        if isInventoryOpen() then
+                            --print("^1Error^7: ^2Inventory is open, you tried to break things")
+                            crafted, crafting = false, false
+                            crafted, crafting, CraftLock = false, false, false
+                            return
+                        end
                         if crafting and progressBar({
                             label = bartext..((metadata and metadata.label) or Items[data.item].label),
                             time = bartime,
@@ -371,8 +381,10 @@ function makeItem(data)
                             anim = anim,
                             flag = 49,
                             icon = data.item,
+                            request = true,
                         }) then
-                            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata)
+                            TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
+                            currentToken = nil -- clear client cached token
                             CreateThread(function()
                                 if data.craft["hasCrafted"] ~= nil then
                                     debugPrint("hasCrafted Found, marking '"..data.item.."' as crafted for player")
@@ -412,7 +424,6 @@ function makeItem(data)
     end
     stopTempCam()
     CraftLock = false
-    lockInv(false)
     if canReturn then craftingMenu(data) end
     ClearPedTasks(PlayerPedId())
 end
@@ -431,8 +442,19 @@ end
 --- @param stashName string|table The stash name(s) to remove ingredients from.
 --- @param metadata table (optional) Metadata for the crafted item.
 --- @usage
-RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata)
+RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable, stashName, metadata, token)
     local src = source
+    debugPrint(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 = {}
@@ -441,7 +463,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
@@ -449,7 +473,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

shared/helpers.lua

@@ -21,6 +21,10 @@
 --- end
 --- ```
 function isStarted(script)
+    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
 
@@ -258,7 +262,7 @@ end
 --- ```
 function countTable(tbl)
     local i = 0
-    for _ in pairs(tbl) do i = i + 1 end
+    for _ in pairs(tbl) do i += 1 end
     return i
 end
 
@@ -546,6 +550,24 @@ 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)
+	if type(tbl) == "table" then
+		return math.random(tbl[1], tbl[2])
+	else
+		return tbl
+	end
+end
+
 -------------------------------------------------------------
 -- Material and Prop Functions
 -------------------------------------------------------------

shared/inventories.lua

@@ -15,6 +15,7 @@
 function lockInv(toggle)
     FreezeEntityPosition(PlayerPedId(), toggle)
     LocalPlayer.state:set("inv_busy", toggle, true)
+    LocalPlayer.state:set("invBusy", toggle, true)
     TriggerEvent('inventory:client:busy:status', toggle)
     TriggerEvent('canUseInventoryAndHotbar:toggle', not toggle)
 end
@@ -49,8 +50,9 @@ function hasItem(items, amount, src)
 
             local count = 0
             for _, itemData in pairs(grabInv) do
+                jsonPrint(itemData)
                 if itemData and itemData.name == item then
-                    count += (itemData.count or itemData.amount or 1)
+                    count += (itemData.amount or itemData.count or 1)
                 end
             end
             foundInv = foundInv:gsub("%-", "^7-^6"):gsub("%_", "^7_^6")
@@ -66,6 +68,9 @@ function hasItem(items, amount, src)
         end
         return true, hasTable
     end
+    -- if can't find inventory, return false
+    print("^1Error^7: ^1Can't find players inventory for some reason")
+    return false, {}
 end
 
 --- Retrieves a player's inventory based on the active inventory system.
@@ -120,9 +125,17 @@ function getPlayerInv(src)
     elseif isStarted(CodeMInv) then
         foundInv = CodeMInv
         if src then
-            grabInv = exports[CodeMInv]:GetInventory(src)
+            grabInv = exports[CodeMInv]:GetInventory(getPlayer(src).citizenId, src)
         else
-            grabInv = exports[CodeMInv]:GetClientPlayerInventory()
+            grabInv = exports[CodeMInv]:getUserInventory()
+        end
+
+    elseif isStarted(TgiannInv) then
+        foundInv = TgiannInv
+        if src then
+            grabInv = exports[TgiannInv]:GetPlayerItems(src)
+        else
+            grabInv = exports[TgiannInv]:GetPlayerItems()
         end
 
     elseif isStarted(QBInv) then
@@ -160,4 +173,91 @@ function getPlayerInv(src)
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end
     return grabInv, foundInv
+end
+
+function isInventoryOpen()
+    if isStarted(OXInv) then
+        return LocalPlayer.state.invBusy
+
+    elseif isStarted(QSInv) then
+        return exports[QSInv]:inInventory()
+
+    elseif isStarted(OrigenInv) then
+        return exports[OrigenInv]:IsInventoryOpen()
+
+    elseif isStarted(CoreInv) then
+        return exports[CoreInv]:isInventoryOpen()
+
+    elseif isStarted(CodeMInv) then
+        return false
+        -- CodeM doesn't have a function to check if the inventory is open
+        -- No idea what it uses, so it just skips the check
+
+    elseif isStarted(TgiannInv) then
+        return exports[TgiannInv]:IsInventoryActive()
+
+    elseif isStarted(QBInv) then
+        return LocalPlayer.state.inv_busy
+
+    elseif isStarted(PSInv) then
+        return LocalPlayer.state.inv_busy
+
+    elseif ESX and isStarted(ESXExport) then
+        return false
+
+    elseif isStarted(RSGInv) then
+        return LocalPlayer.state.inv_busy
+
+    end
+end
+
+-------------------------------------------------------------
+-- Item Image Retrieval
+-------------------------------------------------------------
+
+--- Retrieves the NUI link for an item's image from the active inventory system.
+---
+--- @param item string The item name.
+--- @return string string A `nui://` link to the item's image, or an empty string if not found.
+---
+--- @usage
+--- ```lua
+--- local imageLink = invImg("health_potion")
+--- if imageLink ~= "" then print(imageLink) end
+--- ```
+function invImg(item)
+    local imgLink = ""
+    if item ~= "" and Items[item] then
+        if isStarted(OXInv) then
+            imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
+
+        elseif isStarted(QSInv) then
+            imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
+
+        elseif isStarted(CoreInv) then
+            imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
+
+        elseif isStarted(CodeMInv) then
+            imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
+
+        elseif isStarted(OrigenInv) then
+            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
+
+        elseif isStarted(QBInv) then
+            imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
+
+        elseif isStarted(PSInv) then
+            imgLink = "nui://"..PSInv.."/html/images/"..(Items[item].image or "")
+
+        elseif isStarted(TgiannInv) then
+            imgLink = "nui://inventory_images/images/"..(Items[item].image or "")
+
+        elseif isStarted(RSGInv) then
+            imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
+
+        else
+            print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
+        end
+    end
+    return imgLink
 end

shared/itemcontrol.lua

@@ -31,57 +31,27 @@ validTokens = {}
 --- ```
 function createUseableItem(item, funct)
     if isStarted(ESXExport) then
-        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7es_extended", item)
+        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7es_extended^7", item)
         while not ESX do Wait(0) end
         ESX.RegisterUsableItem(item, funct)
+
     elseif isStarted(QBExport) and not isStarted(QBXExport) then
-        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qb-core", item)
+        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qb-core^7", item)
         Core.Functions.CreateUseableItem(item, funct)
+
     elseif isStarted(QBXExport) then
-        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qbx_core", item)
+        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^7qbx_core^7", item)
         exports[QBXExport]:CreateUseableItem(item, funct)
+
+    elseif isStarted(RSGExport) then
+        debugPrint("^6Bridge^7: ^2Registering item as ^3Usable^2 with ^1rsg-core^7", item)
+        Core.Functions.CreateUseableItem(item, funct)
+
     else
         print("^4ERROR^7: No supported framework detected for registering usable item: ^3"..item.."^7")
     end
 end
 
--------------------------------------------------------------
--- Item Image Retrieval
--------------------------------------------------------------
-
---- Retrieves the NUI link for an item's image from the active inventory system.
----
---- @param item string The item name.
---- @return string string A `nui://` link to the item's image, or an empty string if not found.
----
---- @usage
---- ```lua
---- local imageLink = invImg("health_potion")
---- if imageLink ~= "" then print(imageLink) end
---- ```
-function invImg(item)
-    local imgLink = ""
-    if item ~= "" and Items[item] then
-        if isStarted(OXInv) then
-            imgLink = "nui://"..OXInv.."/web/images/"..(Items[item].image or "")
-        elseif isStarted(QSInv) then
-            imgLink = "nui://"..QSInv.."/html/images/"..(Items[item].image or "")
-        elseif isStarted(CoreInv) then
-            imgLink = "nui://"..CoreInv.."/html/img/"..(Items[item].image or "")
-        elseif isStarted(CodeMInv) then
-            imgLink = "nui://"..CodeMInv.."/html/itemimages/"..(Items[item].image or "")
-        elseif isStarted(OrigenInv) then
-            imgLink = "nui://"..OrigenInv.."/html/img/"..(Items[item].image or "")
-        elseif isStarted(QBInv) then
-            imgLink = "nui://"..QBInv.."/html/images/"..(Items[item].image or "")
-        elseif isStarted(RSGInv) then
-            imgLink = "nui://"..RSGInv.."/html/images/"..(Items[item].image or "")
-        else
-            print("^4ERROR^7: ^2No Inventory detected for invImg - Check starter.lua")
-        end
-    end
-    return imgLink
-end
 
 -------------------------------------------------------------
 -- Adding and Removing Items
@@ -162,7 +132,7 @@ end
 --- TriggerServerEvent(getScript()..":server:toggleItem", true, "health_potion", 1)
 --- ```
 RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount, newsrc, info, slot, token)
-    debugPrint(GetInvokingResource())
+    --debugPrint(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
@@ -174,21 +144,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
 
     local src = newsrc or source
     if (give == true or give == 1) then
-        if newsrc == nil then -- must be coming from client this would be blank
-            if token == nil then
-                debugPrint("^1Auth^7: ^1No token recieved^7")
-                dupeWarn(src, item, "Auth: Player "..src.." attempted to spawn "..item.." without an auth token")
-            else
-                if type(token) ~= "number" then -- checks if the newsrc is a source or token, if number its coming form the server itself
-                    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])
-                        dupeWarn(src, item, "Auth: "..src.." attempted to spawn "..item.." with an incorrect auth token")
-                    else
-                        debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
-                        validTokens[src] = nil
-                    end
-                end
+        if newsrc == nil then -- this must be coming from client this would be blank
+            if not checkToken(src, token, "item", item) then
+                return
             end
         end
     end
@@ -204,22 +162,32 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
             dupeWarn(src, item, amount)
 
         else
-            if isStarted(OXInv) then invName = OXInv
+            if isStarted(OXInv) then
+                invName = OXInv
                 exports[OXInv]:RemoveItem(src, item, remamount, nil)
 
-            elseif isStarted(QSInv) then invName = QSInv
+            elseif isStarted(QSInv) then
+                invName = QSInv
                 exports[QSInv]:RemoveItem(src, item, remamount)
 
-            elseif isStarted(CoreInv) then invName = CoreInv
+            elseif isStarted(CoreInv) then
+                invName = CoreInv
                 exports[CoreInv]:removeItem(src, item, remamount)
 
-            elseif isStarted(OrigenInv) then invName = OrigenInv
+            elseif isStarted(OrigenInv) then
+                invName = OrigenInv
                 exports[OrigenInv]:removeItem(src, item, remamount)
 
-            elseif isStarted(CodeMInv) then invName = CodeMInv
+            elseif isStarted(CodeMInv) then
+                invName = CodeMInv
                 exports[CodeMInv]:RemoveItem(src, item, remamount)
 
-            elseif isStarted(QBInv) then invName = QBInv
+            elseif isStarted(TgiannInv) then
+                invName = TgiannInv
+                exports[TgiannInv]:RemoveItem(src, item, remamount)
+
+            elseif isStarted(QBInv) then
+                invName = QBInv
                 while remamount > 0 do
                     if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
                         remamount -= 1
@@ -231,7 +199,9 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
                 if Config.Crafting.showItemBox then
                     TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "remove", amount or 1)
                 end
-            elseif isStarted(PSInv) then invName = PSInv
+
+            elseif isStarted(PSInv) then
+                invName = PSInv
                 while remamount > 0 do
                     if Core.Functions.GetPlayer(src).Functions.RemoveItem(item, 1, slot) then
                         remamount -= 1
@@ -282,6 +252,7 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
     else
         local amountToAdd = amount or 1
         if isStarted(OXInv) then invName = OXInv
+            jsonPrint(info)
             exports[OXInv]:AddItem(src, item, amountToAdd, info, slot)
 
         elseif isStarted(QSInv) then invName = QSInv
@@ -296,22 +267,26 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
         elseif isStarted(OrigenInv) then invName = OrigenInv
             exports[OrigenInv]:addItem(src, item, amountToAdd, info, slot)
 
+        elseif isStarted(TgiannInv) then invName = TgiannInv
+            exports[TgiannInv]:AddItem(src, item, amountToAdd, slot, info)
+
         elseif isStarted(QBInv) then invName = QBInv
             if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
                 TriggerClientEvent((isStarted(QBInv) and QBInvNew and "qb-" or "").."inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
             end
 
+        elseif isStarted(PSInv) then invName = PSInv
+            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
+                if Config.Crafting.showItemBox then
+                    TriggerClientEvent("ps-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
+                end
+            end
+
         elseif isStarted(RSGInv) then invName = RSGInv
             if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
                 TriggerClientEvent("rsg-inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
             end
 
-        elseif isStarted(PSInv) then invName = PSInv
-            if Core.Functions.GetPlayer(src).Functions.AddItem(item, amountToAdd, nil, info) then
-                if Config.Crafting.showItemBox then
-                    TriggerClientEvent("inventory:client:ItemBox", src, Items[item], "add", amountToAdd)
-                end
-            end
         end
 
         if invName == "" then
@@ -347,13 +322,13 @@ end)
 --- ```lua
 --- dupeWarn(playerId, "health_potion")
 --- ```
-function dupeWarn(src, item, amount)
+function dupeWarn(src, item, message)
     local name = getPlayer(src).name
-    print("^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7' but it wasn't there")
+    print(message or "^5DupeWarn^7: "..name.." (^1"..tostring(src).."^7) ^2Tried to remove item '^3"..item.."^7'^2 but it wasn't there^7")
     if not debugMode then
-        DropPlayer(src, name.."("..tostring(src)..") Kicked for suspected duplicating items: "..item)
+        DropPlayer(src, name.."("..tostring(src)..") kicked by exploit protection")
     end
-    print("^5DupeWarn^7: "..name.."(^1"..tostring(src).."^7) ^2Dropped from server - exploit protection detected an item not being found in players inventory^7")
+    print("^5DupeWarn^7: "..name.."(^1"..tostring(src).."^7) ^2Dropped from server - exploit protection^7")
 end
 
 -------------------------------------------------------------
@@ -410,7 +385,7 @@ function getDurability(item)
             if v.name == item then
                 if v.slot <= lowestSlot then
                     lowestSlot = v.slot
-                    durability = itemcheck[k].info.durability
+                    durability = itemcheck[k].info and itemcheck[k].info.durability or nil
                 end
             end
         end
@@ -422,7 +397,7 @@ function getDurability(item)
             if v.slot <= lowestSlot then
                 debugPrint(v.slot, itemcheck[k].metadata.durability)
                 lowestSlot = v.slot
-                durability = v.metadata.durability
+                durability = v.metadata and v.metadata.durability or nil
             end
         end
     end
@@ -432,7 +407,7 @@ function getDurability(item)
         for _, v in pairs(itemcheck) do
             if v.name == item and v.slot <= lowestSlot then
                 lowestSlot = v.slot
-                durability = v.metadata.durability
+                durability = v.info and v.info.durability or nil
             end
         end
     end
@@ -442,7 +417,7 @@ function getDurability(item)
         for _, v in pairs(itemcheck) do
             if v.name == item and v.slot <= lowestSlot then
                 lowestSlot = v.slot
-                durability = v.metadata.durability
+                durability = v.metadata and v.metadata.durability or nil
             end
         end
     end
@@ -450,9 +425,9 @@ function getDurability(item)
     if isStarted(CodeMInv) then
         local itemcheck = exports[CodeMInv]:GetClientPlayerInventory()
         for _, v in pairs(itemcheck) do
-            if v.name == item and v.slot <= lowestSlot then
-                lowestSlot = v.slot
-                durability = v.metadata.durability
+            if v.name == item and tonumber(v.slot) <= lowestSlot then
+                lowestSlot = tonumber(v.slot)
+                durability = v.info and v.info.durability or nil
             end
         end
     end
@@ -462,7 +437,17 @@ function getDurability(item)
         for _, v in pairs(itemcheck) do
             if v.name == item and v.slot <= lowestSlot then
                 lowestSlot = v.slot
-                durability = v.metadata.durability
+                durability = v.metadata and v.metadata.durability or nil
+            end
+        end
+    end
+
+    if isStarted(TgiannInv) then
+        local itemcheck = exports[TgiannInv]:GetPlayerItems()
+        for _, v in pairs(itemcheck) do
+            if v.name == item and v.slot <= lowestSlot then
+                lowestSlot = v.slot
+                durability = v.metadata and v.metadata.durability or nil
             end
         end
     end
@@ -524,6 +509,9 @@ RegisterNetEvent(getScript()..":server:setMetaData", function(data)
 
     elseif isStarted(OrigenInv) then
         exports[OrigenInv]:setMetadata(src, data.slot, data.metadata)
+
+    elseif isStarted(TgiannInv) then
+        exports[TgiannInv]:UpdateItemMetadata(src, data.item, data.slot, data.metadata)
     end
 end)
 
@@ -633,9 +621,31 @@ function canCarry(itemTable, src)
                 resultTable[k] = exports[OrigenInv]:canCarryItem(src, k, v)
             end
 
-        elseif isStarted(QBInv) then
+        elseif isStarted(TgiannInv) then
             for k, v in pairs(itemTable) do
-                resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
+                resultTable[k] = exports[TgiannInv]:CanCarryItem(source, k, v)
+            end
+
+        elseif isStarted(QBInv) then
+            if QBInvNew then
+                for k, v in pairs(itemTable) do
+                    resultTable[k] = exports[QBInv]:CanAddItem(src, k, v)
+                end
+            else
+                local items = getPlayerInv(src)
+                local totalWeight = 0
+                if not items then return false end
+                for _, item in pairs(items) do
+                    totalWeight += (item.weight * item.amount)
+                end
+                for k, v in pairs(itemTable) do
+                    local itemInfo = Items[k]
+                    if not itemInfo and not Player.Offline then
+                        resultTable[k] = true
+                    else
+                        resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight
+                    end
+                end
             end
 
         elseif isStarted(PSInv) then
@@ -669,13 +679,33 @@ if isServer() then
         return result
     end)
 
+    createCallback(getScript()..":server:getMaxCarryCraft", function(source, data)
+        local src = source
+        local item = data.item
+        local max = data.max or 100
+
+        local maxCanCarry = 0
+        for i = 1, max do
+            local checkTable = {
+                [item] = i
+            }
+            local result = canCarry(checkTable, src)
+            if result[item] == true then
+                maxCanCarry = i
+            else
+                break
+            end
+        end
+        return maxCanCarry
+    end)
+
     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())
+        --debugPrint(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  ""
@@ -707,22 +737,63 @@ if isServer() then
     receivedEvent = {}
     createCallback(getScript()..":callback:GetAuthEvent", function(source)
         local src = source
-        debugPrint(GetInvokingResource())
+        --debugPrint(GetInvokingResource())
         if GetInvokingResource() and GetInvokingResource() ~= getScript() and GetInvokingResource() ~= "qb-core" then
             debugPrint("^1Error^7: ^1Possible exploit^7, ^1vital callback was called from an external resource^7")
             return ""
         end
         debugPrint("^1Auth^7: ^2Player Source^7: "..src.." ^2requested ^3AuthEvent^7", AuthEvent)
-        if not receivedEvent[src] then receivedEvent[src] = true
+        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 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
+

shared/jobfunctions.lua

@@ -12,8 +12,16 @@
 -------------------------------------------------------------
 -- 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
 
+if not isServer() then
+    onPlayerLoaded(function()
+        onDuty = getPlayer().onDuty
+    end, true)
+end
+
 -------------------------------------------------------------
 -- Boss Role Detection
 -------------------------------------------------------------
@@ -38,7 +46,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
@@ -92,9 +100,14 @@ end
 --- toggleDuty()  -- Player receives a notification of their new duty status.
 --- ```
 function toggleDuty()
-    onDuty = not onDuty
     if isStarted(QBExport) or isStarted(QBXExport) then
         TriggerServerEvent("QBCore:ToggleDuty")
+        Wait(100)
+        onDuty = getPlayer().onDuty
+    elseif isStarted(RSGExport) then
+        TriggerServerEvent("RSGCore:ToggleDuty")
+        Wait(100)
+        onDuty = getPlayer().onDuty
     else
         if onDuty then
             triggerNotify(nil, "Now on duty", "success")
@@ -104,6 +117,15 @@ function toggleDuty()
     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
 -------------------------------------------------------------

shared/make/makeProp.lua

@@ -23,7 +23,7 @@ local Props = {}
 function makeProp(data, freeze, synced)
     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))

shared/metaHandlers.lua

@@ -23,15 +23,23 @@ function GetPlayer(source)
     if isStarted(QBExport) then
         debugPrint("^6Bridge^7: ^3GetPlayer^7() QBExport")
         return exports[QBExport]:GetCoreObject().Functions.GetPlayer(source)
+
     elseif isStarted(QBXExport) then
         debugPrint("^6Bridge^7: ^3GetPlayer^7() QBOXExport")
         return exports[QBXExport]:GetCoreObject().Functions.GetPlayer(source)
+
     elseif isStarted(ESXExport) then
         debugPrint("^6Bridge^7: ^3GetPlayer^7() ESXExport")
         return ESX.GetPlayerFromId(source)
+
     elseif isStarted(OXCoreExport) then
         debugPrint("^6Bridge^7: ^3GetPlayer^7() OXCoreExport")
         return exports[OXCoreExport]:GetPlayer(source)
+
+    elseif isStarted(RSGExport) then
+        debugPrint("^6Bridge^7: ^3GetPlayer^7() RSGExport")
+        return exports[RSGExport]:GetCoreObject().Functions.GetPlayer(source)
+
     end
     return nil
 end
@@ -58,14 +66,21 @@ function GetMetadata(player, key)
         return triggerCallback(getScript()..":server:GetMetadata", key)
     else
         if isStarted(QBExport) or isStarted(QBXExport) then
-            debugPrint("^6Bridge^7: ^3GetMetadata^7() QBExport or QBXExport", key)
+            debugPrint("^6Bridge^7: ^3GetMetadata^7() QBExport/QBXExport", key)
             return player.PlayerData.metadata[key]
+
         elseif isStarted(ESXExport) then
             debugPrint("^6Bridge^7: ^3GetMetadata^7() ESXExport", key)
             return player.getMeta(key)
+
         elseif isStarted(OXCoreExport) then
             debugPrint("^6Bridge^7: ^3GetMetadata^7() OXCoreExport", key)
             return player.get(key)
+
+        elseif isStarted(RSGExport) then
+            debugPrint("^6Bridge^7: ^3GetMetadata^7() RSGExport", key)
+            return player.PlayerData.metadata[key]
+
         end
     end
     return nil
@@ -112,12 +127,19 @@ function SetMetadata(player, key, value)
     if isStarted(QBExport) or isStarted(QBXExport) then
         debugPrint("^6Bridge^7: ^3SetMetadata^7() using QBExport/QBXExport")
         player.Functions.SetMetaData(key, value)
+
     elseif isStarted(ESXExport) then
         debugPrint("^6Bridge^7: ^3SetMetadata^7() using ESXExport")
         player.setMeta(key, value)
+
     elseif isStarted(OXCoreExport) then
         debugPrint("^6Bridge^7: ^3SetMetadata^7() using OXCoreExport")
         player.set(key, value)
+
+    elseif isStarted(RSGExport) then
+        debugPrint("^6Bridge^7: ^3SetMetadata^7() using RSGExport")
+        player.Functions.SetMetaData(key, value)
+
     end
 end
 

shared/phones.lua

@@ -78,6 +78,11 @@ function sendPhoneMail(data)
                 TriggerServerEvent(getScript()..":jpr:SendMail", mailData)
             end,
         },
+        {   name = "ef-phone",
+            send = function(mailData)
+                TriggerServerEvent('qb-phone:server:sendNewMail', mailData)
+            end,
+        },
     }
 
     local activePhone = nil

shared/playerfunctions.lua

@@ -111,10 +111,16 @@ end)
 function setThirst(src, thirst)
     if isStarted(ESXExport) then
         TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
+
     elseif isStarted(QBExport) or isStarted(QBXExport) then
         local Player = Core.Functions.GetPlayer(src)
         Player.Functions.SetMetaData('thirst', thirst)
         TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
+
+    elseif isStarted(RSGExport) then
+        local Player = Core.Functions.GetPlayer(src)
+        Player.Functions.SetMetaData('thirst', thirst)
+        TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
     end
 end
 
@@ -130,10 +136,16 @@ end
 function setHunger(src, hunger)
     if isStarted(ESXExport) then
         TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
+
     elseif isStarted(QBExport) or isStarted(QBXExport) then
         local Player = Core.Functions.GetPlayer(src)
         Player.Functions.SetMetaData('hunger', hunger)
         TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
+
+    elseif isStarted(RSGExport) then
+        local Player = Core.Functions.GetPlayer(src)
+        Player.Functions.SetMetaData('hunger', hunger)
+        TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
     end
 end
 
@@ -161,20 +173,31 @@ function chargePlayer(cost, moneyType, newsrc)
     if moneyType == "cash" then
         if isStarted(OXInv) then fundResource = OXInv
             exports[OXInv]:RemoveItem(src, "money", cost)
+
         elseif isStarted(QBExport) or isStarted(QBXExport) then
             fundResource = QBExport
             Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
+
         elseif isStarted(RSGExport) then
-            fundResource = QBExport
+            fundResource = RSGExport
             Core.Functions.GetPlayer(src).Functions.RemoveMoney("cash", cost)
+
         elseif isStarted(ESXExport) then
             fundResource = ESXExport
             ESX.GetPlayerFromId(src).removeMoney(cost, "")
+
         end
     elseif moneyType == "bank" then
-        if isStarted(QBExport) or isStarted(QBXExport) then fundResource = QBExport
+        if isStarted(QBExport) or isStarted(QBXExport) then
+            fundResource = QBExport
             Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost)
-        elseif isStarted(ESXExport) then fundResource = ESXExport
+
+        elseif isStarted(RSGExport) then
+            fundResource = RSGExport
+            Core.Functions.GetPlayer(src).Functions.RemoveMoney("bank", cost)
+
+        elseif isStarted(ESXExport) then
+            fundResource = ESXExport
             ESX.GetPlayerFromId(src).removeMoney(cost, "")
         end
     end
@@ -212,17 +235,29 @@ function fundPlayer(fund, moneyType, newsrc)
         if isStarted(OXInv) then
             fundResource = OXInv
             exports[OXInv]:AddItem(src, "money", fund)
+
         elseif isStarted(QBExport) or isStarted(QBXExport) then
             fundResource = QBExport
             Core.Functions.GetPlayer(src).Functions.AddMoney("cash", fund)
+
+        elseif isStarted(RSGExport) then
+            fundResource = RSGExport
+            Core.Functions.GetPlayer(src).Functions.AddMoney("cash", fund)
+
         elseif isStarted(ESXExport) then
             fundResource = ESXExport
-            PlayESX.GetPlayerFromId(src).addMoney(fund, "")
+            ESX.GetPlayerFromId(src).addMoney(fund, "")
+
         end
     elseif moneyType == "bank" then
         if isStarted(QBExport) or isStarted(QBXExport) then
             fundResource = QBExport
             Core.Functions.GetPlayer(src).Functions.AddMoney("bank", fund)
+
+        elseif isStarted(RSGExport) then
+            fundResource = RSGExport
+            Core.Functions.GetPlayer(src).Functions.AddMoney("bank", fund)
+
         elseif isStarted(ESXExport) then
             fundResource = ESXExport
             ESX.GetPlayerFromId(src).addMoney(fund, "")
@@ -266,17 +301,17 @@ function ConsumeSuccess(itemName, type, data)
 
     if isStarted(ESXExport) then
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", hunger * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", thirst * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
         end
     else
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + hunger)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + thirst)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
         end
     end
 
@@ -290,7 +325,9 @@ function ConsumeSuccess(itemName, type, data)
         end
     end
 
-    getRandomReward(itemName)
+    if Config.Reward then
+        getRandomReward(itemName)
+    end
 end
 
 -------------------------------------------------------------
@@ -380,6 +417,35 @@ function hasJob(job, source, grade)
                     if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
                 end
             end
+
+        elseif isStarted(RSGExport) then
+            if Core.Functions.GetPlayer then
+                local player = Core.Functions.GetPlayer(src)
+                if not player then print("Player not found for src: "..src) end
+                local jobinfo = player.PlayerData.job
+                if jobinfo.name == job then
+                    hasJobFlag = true
+                    duty = player.PlayerData.job.onduty
+                    if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
+                end
+                local ganginfo = player.PlayerData.gang
+                if ganginfo.name == job then
+                    hasJobFlag = true
+                    if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
+                end
+            else
+                local jobinfo = exports[RSGExport]:GetPlayer(src).PlayerData.job
+                if jobinfo.name == job then
+                    hasJobFlag = true
+                    duty = exports[RSGExport]:GetPlayer(src).PlayerData.job.onduty
+                    if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
+                end
+                local ganginfo = exports[RSGExport]:GetPlayer(src).PlayerData.gang
+                if ganginfo.name == job then
+                    hasJobFlag = true
+                    if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
+                end
+            end
         else
             print("^4ERROR^7: ^2No Core detected for hasJob ^7- ^2Check ^3starter^1.^2lua^7")
         end
@@ -425,6 +491,22 @@ function hasJob(job, source, grade)
                 hasJobFlag = true
                 if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
             end
+
+        elseif isStarted(RSGExport) then
+            local info = nil
+            Core.Functions.GetPlayerData(function(PlayerData) info = PlayerData end)
+            local jobinfo = info.job
+            if jobinfo.name == job then
+                hasJobFlag = true
+                duty = jobinfo.onduty
+                if grade and not (grade <= jobinfo.grade.level) then hasJobFlag = false end
+            end
+            local ganginfo = info.gang
+            if ganginfo.name == job then
+                hasJobFlag = true
+                if grade and not (grade <= ganginfo.grade.level) then hasJobFlag = false end
+            end
+
         else
             print("^4ERROR^7: ^2No Core detected for hasJob() ^7- ^2Check ^3starter^1.^2lua^7")
         end

shared/scaleforms/bigMessageInstance.lua

@@ -149,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

shared/shops.lua

@@ -30,15 +30,17 @@ function sellMenu(data)
         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,
-            }
+            if Items[k] then
+                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
         end
     else
         for k, v in pairsByKeys(data.sellTable) do
@@ -48,7 +50,9 @@ function sellMenu(data)
                     header = k,
                     txt = "Amount of items: "..countTable(v.Items),
                     onSelect = function()
-                        v.onBack = function() sellMenu(origData) end
+                        v.onBack = function()
+                            sellMenu(origData)
+                        end
                         v.sellTable = data.sellTable[k]
                         sellMenu(v)
                     end,
@@ -57,8 +61,8 @@ function sellMenu(data)
         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 "",
+        header = data.sellTable.Header or "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
+        headertxt = data.sellTable.Header and "Amount of items: "..countTable(data.sellTable.Items or data.sellTable),
         canClose = true,
         onBack = data.onBack,
     })
@@ -105,12 +109,14 @@ function sellAnim(data)
     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)
+    playAnim(dict, "givetake2_a", 0.3, 48)
+    playAnim(dict, "givetake2_b", 0.3, 48, 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
+    if data.onBack then
+        data.onBack()
+    end
 end
 
 --- Server event handler for processing item sales.
@@ -148,6 +154,7 @@ end)
 --- })
 --- ```
 function openShop(data)
+    jsonPrint(data)
     if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
 
     if Config.General.JimShops then
@@ -156,25 +163,45 @@ function openShop(data)
     elseif isStarted(OXInv) then
         exports[OXInv]:openInventory('shop', { type = data.shop })
 
+    elseif isStarted(QSInv) or isStarted(CodeMInv) then
+        TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
+
+    elseif isStarted(TgiannInv) then
+        TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
+
     elseif isStarted(QBInv) then
         if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenShopNewQB', data.shop)
+            TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
         else
             TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
         end
+
+    elseif isStarted(PSInv) then
+        if QBInvNew then
+            TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
+        else
+            TriggerServerEvent("inventory:server:OpenInventory", "shop", data.items.label, data.items)
+        end
+
     elseif isStarted(RSGInv) then
-        TriggerServerEvent(getScript()..':server:OpenShopNewRSG', data.shop)
+        TriggerServerEvent(getScript()..':server:openServerShop', data.shop)
     end
     lookEnt(data.coords)
 end
 
---- Server event handler for opening a shop using the new QB inventory system.
-RegisterNetEvent(getScript()..':server:OpenShopNewQB', function(data)
-    exports[QBInv]:OpenShop(source, data)
-end)
-
-RegisterNetEvent(getScript()..':server:OpenShopNewRSG', function(data)
-    exports[RSGInv]:OpenShop(source, data)
+RegisterNetEvent(getScript()..':server:openServerShop', function(data)
+    if isStarted(QBInv) then
+        exports[QBInv]:OpenShop(source, data)
+    end
+    if isStarted(PSInv) then
+        exports[PSInv]:OpenShop(source, data)
+    end
+    if isStarted(TgiannInv) then
+        exports[TgiannInv]:OpenShop(source, data)
+    end
+    if isStarted(RSGInv) then
+        exports[RSGInv]:OpenShop(source, data)
+    end
 end)
 
 --- Registers a shop with the active inventory system.
@@ -196,6 +223,11 @@ function registerShop(name, label, items, society)
             inventory = items,
             society = society,
         })
+
+    elseif isStarted(TgiannInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3Tgiann ^2Store^7:", name, label)
+        exports[TgiannInv]:RegisterShop(name, items)
+
     elseif isStarted(QBInv) and QBInvNew then
         debugPrint("^6Bridge^7: ^2Registering ^3QB ^2Store^7:", name, label)
         exports[QBInv]:CreateShop({
@@ -206,6 +238,16 @@ function registerShop(name, label, items, society)
             society = society,
         })
 
+    elseif isStarted(PSInv) and QBInvNew then
+        debugPrint("^6Bridge^7: ^2Registering ^3PS ^2Store^7:", name, label)
+        exports[PSInv]:CreateShop({
+            name = name,
+            label = label,
+            slots = #items,
+            items = items,
+            society = society,
+        })
+
     elseif isStarted(RSGInv) then
         debugPrint("^6Bridge^7: ^2Registering ^3RSG ^2Store^7:", name, label)
         exports[RSGInv]:CreateShop({

shared/stashcontrol.lua

@@ -47,19 +47,19 @@ function GetStashTimeout(stashName, stop)
         stashCache[stashName] = { items = {}, timeout = 0 }
         stash = stashCache[stashName]
     else
-        debugPrint("^6Bridge^7: ^2Local Stash ^7'^3"..stashName.."^7'^2 cache found^7")
+        debugPrint("^6Bridge^7: ^2Local Stash for ^7'^3"..stashName.."^7'^2 cache found^7")
     end
 
     -- If there are already items in cache, skip recheck.
     if countTable(stashCache[stashName].items) > 0 then
-        debugPrint("^6Bridge^7: '^3"..stashName.." ^2Items found in cache, skipping recheck")
+        debugPrint("^6Bridge^7: '^3"..stashName.."^7' ^2Items found in local cache, skipping server recheck")
         return true
     end
 
     -- If timeout has expired, update the stash items from the server.
     if stashCache[stashName].timeout <= 0 then
         stashCache[stashName].items = triggerCallback(getScript()..':server:GetStashItems', stashName)
-        stashCache[stashName].timeout = 15000  -- Timeout in milliseconds.
+        stashCache[stashName].timeout = 10000  -- Timeout in milliseconds.
         CreateThread(function()
             while stashCache[stashName] and stashCache[stashName].timeout > 0 do
                 stashCache[stashName].timeout -= 1000
@@ -90,20 +90,12 @@ function checkStashItem(stashes, itemTable)
     end
 
     if type(stashes) == "table" then
-        local successes = 0
-        local itemCount = countTable(itemTable)
+        debugPrint("^6Bridge^7: ^2Checking multiple stashes for ingredients^7")
         -- Iterate over each provided stash name.
         for _, name in pairs(stashes) do
-            Wait(10)  -- Delay to avoid multiple callbacks issues.
             GetStashTimeout(name)
-            for item, amount in pairs(itemTable) do
-                debugPrint("^6Bridge^7: ^2Checking "..(name and " '^3"..name.."^7'" or "").." ingredients - ^6"..item.."^7")
-                if stashhasItem(stashCache[name].items, item, amount) then
-                    successes += 1
-                    if successes == itemCount then
-                        return true, name
-                    end
-                end
+            if stashhasItem(stashCache[name].items, itemTable, nil) then
+                return true, name
             end
         end
     else
@@ -151,9 +143,17 @@ function openStash(data)
     elseif isStarted(OrigenInv) then
         exports[OrigenInv]:openInventory('stash', data.stash, { label = data.label })
 
+    elseif isStarted(TgiannInv) then
+        TriggerServerEvent(getScript()..':server:openServerStash', {
+            stashName = data.stash,
+            label = data.label,
+            maxweight = data.maxWeight or 600000,
+            slots = data.slots or 40
+        })
+
     elseif isStarted(QBInv) then
         if QBInvNew then
-            TriggerServerEvent(getScript()..':server:OpenStashQB', {
+            TriggerServerEvent(getScript()..':server:openServerStash', {
                 stashName = data.stash,
                 label = data.label,
                 maxweight = data.maxWeight or 600000,
@@ -161,11 +161,30 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
+        end
+
+    elseif isStarted(PSInv) then
+        if QBInvNew then
+            TriggerServerEvent(getScript()..':server:openServerStash', {
+                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, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
         end
 
     elseif isStarted(RSGInv) then
-        TriggerServerEvent(getScript()..':server:OpenStashRSG', {
+        TriggerServerEvent(getScript()..':server:openServerStash', {
             stashName = data.stash,
             label = data.label,
             maxweight = data.maxWeight or 600000,
@@ -175,19 +194,32 @@ function openStash(data)
     else
         --Fallback to these commands
         TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
     end
 
     lookEnt(data.coords)
 end
 
--- Register an event for opening QB stashes.
-RegisterNetEvent(getScript()..':server:OpenStashQB', function(data)
-    exports[QBInv]:OpenInventory(source, data.stashName, data)
-end)
 
-RegisterNetEvent(getScript()..':server:OpenStashRSG', function(data)
-    exports[RSGInv]:OpenInventory(source, data.stashName, data)
+-- Wrapper function for opening stash from the server.
+-- Messy but not much else I can do about it.
+RegisterNetEvent(getScript()..":server:openServerStash", function(data)
+    local src = source
+    if isStarted(TgiannInv) then
+        exports[TgiannInv]:OpenInventory(source, 'stash', data.stashName, data)
+    end
+    if isStarted(QBInv) then
+        exports[QBInv]:OpenInventory(source, data.stashName, data)
+    end
+    if isStarted(PSInv) then
+        exports[PSInv]:OpenInventory(source, data.stashName, data)
+    end
+    if isStarted(RSGInv) then
+        exports[RSGInv]:OpenInventory(source, data.stashName, data)
+    end
 end)
 
 
@@ -216,7 +248,9 @@ function getStash(stashName)
     local stashItems, items = {}, {}
     if isStarted(OXInv) then
         stashResource = OXInv
-        stashItems = exports[OXInv]:Inventory(stashName).items
+        local stash = exports[OXInv]:Inventory(stashName)
+        -- Add fallback if ox can't find the stash and returns a boolean
+        stashItems = type(stash) == "table" and stash.items or {}
 
     elseif isStarted(QSInv) then
         stashResource = QSInv
@@ -234,6 +268,10 @@ function getStash(stashName)
         stashResource = OrigenInv
         stashItems = exports[OrigenInv]:getInventory(stashName)
 
+    elseif isStarted(TgiannInv) then
+        stashResource = TgiannInv
+        stashItems = exports[TgiannInv]:GetSecondaryInventoryItems("stash", stashName)
+
     elseif isStarted(PSInv) then
         stashResource = PSInv
         local result = MySQL.scalar.await('SELECT items FROM stashitems WHERE stash = ?', { stashName })
@@ -241,8 +279,13 @@ function getStash(stashName)
 
     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
+        if QBInvNew then
+            local result = exports[QBInv]:GetInventory(stashName) or {}
+            stashItems = result.items or {}
+        else
+            local result = MySQL.scalar.await("SELECT items FROM stashitems WHERE stash = ?", { stashName })
+            if result then stashItems = json.decode(result) end
+        end
 
     elseif isStarted(RSGInv) then
         stashResource = RSGInv
@@ -298,39 +341,27 @@ function stashRemoveItem(stashItems, stashName, items)
     if type(stashName) ~= "table" then
         stashName = { stashName }
     end
+
     if isStarted(OXInv) then
         for k, v in pairs(items) do
-            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
+            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
-            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
+            exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v)
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
         end
 
     elseif isStarted(CoreInv) then
         for k, v in pairs(items) do
-            exports[CoreInv]:removeItemExact(stashName, k, v)
+            exports[CoreInv]:removeItemExact(stashName[1], k, v)
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..CoreInv, k, v)
         end
 
@@ -348,33 +379,21 @@ function stashRemoveItem(stashItems, stashName, items)
                 end
             end
         end
-        exports[CodeMInv]:UpdateStash(stashName, stashItems)
+        exports[CodeMInv]:UpdateStash(stashName[1], stashItems)
         debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3CodeM^2 stash ^7'^6"..stashName.."^7'")
+
     elseif isStarted(OrigenInv) then
         for k, v in pairs(items) do
-            exports[OrigenInv]:RemoveFromStash(stashName, k, v)
+            exports[OrigenInv]:RemoveFromStash(stashName[1], k, v)
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OrigenInv, k, v)
         end
 
-    elseif isStarted(PSInv) then
+    elseif isStarted(TgiannInv) 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
+            local itemData = exports[TgiannInv]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
+            exports[TgiannInv]:RemoveItemFromSecondaryInventory("stash", stashName[1], k, v, itemData.slot, nil)
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
         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
@@ -382,11 +401,6 @@ function stashRemoveItem(stashItems, stashName, items)
                 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
@@ -401,13 +415,38 @@ function stashRemoveItem(stashItems, stashName, items)
                     end
                 end
             end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName.."^7'")
+            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName[1].."^7'")
             MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName,
+                ['stash'] = stashName[1],
                 ['items'] = json.encode(stashItems)
             })
         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"..PSInv, k, v)
+                        stashItems[l].amount -= v
+                    end
+                end
+            end
+        end
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3PS^2 stash ^7'^6"..stashName[1].."^7'")
+        MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
+            ['stash'] = stashName[1],
+            ['items'] = json.encode(stashItems)
+        })
+
+    elseif isStarted(RSGInv) then
+        for k, v in pairs(items) do
+            exports[RSGInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..RSGInv, k, v)
+        end
     else
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end
@@ -432,7 +471,7 @@ RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
 --- local hasAll, details = stashhasItem(currentStashItems, { iron = 2, wood = 5 })
 --- ```
 function stashhasItem(stashItems, items, amount)
-    local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, QBInv, PSInv }
+    local invs = { OXInv, QSInv, CoreInv, CodeMInv, OrigenInv, TgiannInv, QBInv, PSInv, RSGInv }
     local foundInv = ""
     for _, inv in ipairs(invs) do
         if isStarted(inv) then
@@ -463,3 +502,90 @@ function stashhasItem(stashItems, items, amount)
 
     return true, hasTable
 end
+
+
+--- Registers a stash with the active inventory system.
+--- Supports either OXInv or QSInv.
+---
+--- @param name string Unique stash identifier.
+--- @param label string Display name for the stash.
+--- @param slots number|nil (Optional) Number of slots (default 50).
+--- @param weight number|nil (Optional) Maximum weight (default 4000000).
+--- @param owner string|nil (Optional) Owner identifier for personal stashes.
+--- @param coords table|nil (Optional) 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, label, slots or 50, weight or 4000000)
+
+    --elseif isStarted(CoreInv) then
+    --    debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
+    --    exports[CoreInv]:openHolder(nil, name, 'stash', nil, nil, false, nil)
+
+    elseif isStarted(OrigenInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
+        exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
+
+    elseif isStarted(TgiannInv) then
+        debugPrint("^6Bridge^7: ^2Registering ^3TgiannInv ^2Stash^7:", name, label)
+        exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
+
+    end
+end
+
+if isServer() then
+    --- Registers an event to create an OX stash from the server.
+    --- When triggered, it calls registerStash with the provided parameters.
+    ---
+    --- @event server:makeOXStash
+    --- @param name string Unique stash identifier.
+    --- @param label string Display name for the stash.
+    --- @param slots number|nil (Optional) Number of slots.
+    --- @param weight number|nil (Optional) Maximum weight.
+    --- @param owner string|nil (Optional) Owner identifier.
+    --- @param coords table|nil (Optional) Stash coordinates.
+    --- @usage
+    --- ```lua
+    --- TriggerEvent(getScript()..":server:makeOXStash", name, label, slots, weight, owner, coords, token)
+    --- ```
+    RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords, token)
+        local src = source or nil
+        if src then
+            if not checkToken(src, token, "stash", name) then
+                return
+            end
+        end
+
+        registerStash(name, label, slots, weight, owner, coords)
+    end)
+end
+
+RegisterNetEvent(getScript()..":openGrabBox", function(data)
+	if isStarted(OXInv) then
+		return
+	end
+	local id = ""
+	if data.metadata then
+		id = data.metadata.id
+	elseif data.info then
+		id = data.info.id
+	end
+	openStash({
+		stash = id,
+	})
+end)

shared/targets.lua

@@ -121,7 +121,7 @@ function createEntityTarget(entity, opts, dist)
             options[i] = {
                 icon = opts[i].icon,
                 label = opts[i].label,
-                item = opts[i].item or nil,
+                items = opts[i].item or nil,
                 groups = opts[i].job or opts[i].gang,
                 onSelect = opts[i].action,
                 distance = dist,
@@ -230,7 +230,7 @@ function createBoxTarget(data, opts, dist)
             options[i] = {
                 icon = opts[i].icon,
                 label = opts[i].label,
-                item = opts[i].item or nil,
+                items = opts[i].item or nil,
                 groups = opts[i].job or opts[i].gang,
                 onSelect = opts[i].onSelect or opts[i].action,
                 distance = dist,
@@ -336,7 +336,7 @@ function createCircleTarget(data, opts, dist)
             options[i] = {
                 icon = opts[i].icon,
                 label = opts[i].label,
-                item = opts[i].item or nil,
+                items = opts[i].item or nil,
                 groups = opts[i].job or opts[i].gang,
                 onSelect = opts[i].onSelect or opts[i].action,
                 distance = dist,
@@ -418,7 +418,7 @@ function createModelTarget(models, opts, dist)
             options[i] = {
                 icon = opts[i].icon,
                 label = opts[i].label,
-                item = opts[i].item or nil,
+                items = opts[i].item or nil,
                 groups = opts[i].job or opts[i].gang,
                 onSelect = opts[i].action,
                 distance = dist,

shared/vehicles.lua

@@ -108,6 +108,7 @@ function getVehicleProperties(vehicle)
     if isStarted(QBExport) and not isStarted(QBXExport) then
         properties = Core.Functions.GetVehicleProperties(vehicle)
         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]")
+
     elseif isStarted(OXLibExport) then
         properties = lib.getVehicleProperties(vehicle)
         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]")
@@ -134,6 +135,7 @@ function setVehicleProperties(vehicle, props)
         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]")
+
         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]")

shared/wrapperfunctions.lua

@@ -21,85 +21,24 @@
 --- })
 --- ```
 function registerCommand(command, options)
+
     if isStarted(OXLibExport) then
         debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..OXLibExport, command)
         lib.addCommand(command, { help = options[1], restricted = options[5] and "group."..options[5] or nil }, options[4])
+
     elseif isStarted(QBExport) and not isStarted(QBXExport) then
         debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..QBExport, command)
         Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] or nil)
+
+    elseif isStarted(RSGExport) then
+        debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7"..RSGExport, command)
+        Core.Commands.Add(command, options[1], options[2], options[3], options[4], options[5] or nil)
+
     elseif isStarted(ESXExport) then
         debugPrint("^6Bridge^7: ^2Registering ^3Command^2 with ^7ESX Legacy", command)
         ESX.RegisterCommand(command, options[5] or 'admin', function(xPlayer, args, showError)
             options[4](xPlayer.source, args, showError)
         end, false, { help = options[1] })
+
     end
-end
-
---- Registers a stash with the active inventory system.
---- Supports either OXInv or QSInv.
----
---- @param name string Unique stash identifier.
---- @param label string Display name for the stash.
---- @param slots number|nil (Optional) Number of slots (default 50).
---- @param weight number|nil (Optional) Maximum weight (default 4000000).
---- @param owner string|nil (Optional) Owner identifier for personal stashes.
---- @param coords table|nil (Optional) 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(nil, name, slots or 50, weight or 4000000)
-
-    --elseif isStarted(CoreInv) then
-    --    debugPrint("^6Bridge^7: ^2Registering ^3CoreInv ^2Stash^7:", name, label)
-    --    exports[CoreInv]:openHolder(nil, name, 'stash', nil, nil, false, nil)
-
-    elseif isStarted(OrigenInv) then
-        debugPrint("^6Bridge^7: ^2Registering ^3OrigenInv ^2Stash^7:", name, label)
-        exports["origen_inventory"]:registerStash(name, label, slots or 50, weight or 4000000)
-    end
-end
-
-if isServer() then
-    --- Registers an event to create an OX stash from the server.
-    --- When triggered, it calls registerStash with the provided parameters.
-    ---
-    --- @event server:makeOXStash
-    --- @param name string Unique stash identifier.
-    --- @param label string Display name for the stash.
-    --- @param slots number|nil (Optional) Number of slots.
-    --- @param weight number|nil (Optional) Maximum weight.
-    --- @param owner string|nil (Optional) Owner identifier.
-    --- @param coords table|nil (Optional) Stash coordinates.
-    --- @usage
-    --- ```lua
-    --- TriggerEvent(getScript()..":server:makeOXStash", name, label, slots, weight, owner, coords)
-    --- ```
-    RegisterNetEvent(getScript()..":server:makeOXStash", function(name, label, slots, weight, owner, coords, token)
-        local src = source or nil
-        if src then
-            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])
-            else
-                debugPrint("^1Auth^7: ^2Client and Server Auth tokens match^7!", token, validTokens[src])
-                validTokens[src] = nil
-            end
-        end
-
-        registerStash(name, label, slots, weight, owner, coords)
-    end)
-end
+end

starter.lua

@@ -13,6 +13,7 @@ Exports = {
     CoreInv = "core_inventory",
     CodeMInv = "codem-inventory",
     OrigenInv = "origen_inventory",
+    TgiannInv = "tgiann-inventory",
 
     OXLibExport = "ox_lib",
 
@@ -29,7 +30,12 @@ Exports = {
 -- Required variables
 debugMode = Config.System.Debug
 
--- Check server convars for hard set defaults
+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
@@ -41,38 +47,70 @@ if Config and Config.System then
     end
 
     Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
-    Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify)
-    Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar)
-    Config.System.drawText = GetConvar("jim_drawTextScript", Config.System.drawText)
-    Config.System.skillCheck = GetConvar("jim_skillCheckScript", Config.System.skillCheck)
+    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
 
-QBInvNew = true
+-- 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", },
+    },
+}
 
-InventoryWeight = 120000
+-- 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
+                -- 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
+            end
 
--- Testing loading the core files here instead of in fxmanifests
---for k, v in pairs({ -- This is a specific load order
---    [Exports.OXLibExport] = "init.lua",
---    [Exports.OXCoreExport] = "lib/init.lua",
---    [Exports.ESXExport] = "imports.lua",
---    [Exports.QBXExport] = "modules/playerdata.lua",
---}) do
---    if GetResourceState(k) == "started" then
---        print("^5Loading^7: '"..k.."/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
---        local fileLoader = assert(load(LoadResourceFile(k, (v)), ('@@'..k..'/'..v)))
---        fileLoader()
---        print("^2Success^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
---    else
---        if debugMode then
---            print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
---        end
---    end
---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
@@ -82,7 +120,7 @@ for _, v in pairs({ -- This is a specific load order
 
     '_eventDebug.lua',
     'callback.lua',
-    'coreloader.lua',   -- needs to be second to load all core related stuff before everything else
+    'coreloader.lua',
 
     'duifunctions.lua',
 
@@ -143,4 +181,4 @@ for _, v in pairs({ -- This is a specific load order
     if debugMode then
         print("^5Success^7: ^2loaded file^7: ^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
     end
-end
+end

version.txt

@@ -1 +1,5 @@
-2.0.01
+2.0.13
+
+- Add `GetRandomTiming()` function needed for restaurant scripts without jim-consuambles
+
+https://github.com/jimathy/jim_bridge