Version Bump

This should fix the `jim_bridge` side of the reports of stores erroring when scripts starts

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.23"
+version "2.1.02"
 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.'

shared/_authToken.lua

@@ -124,7 +124,6 @@ end
 
 function distExploitCheck(table, src)
     if forceDisableExplotProtection == true then return true end
-
     if not table then
         print("^1Error^7: ^1This wasn^7'^1t reigstered correctly or this is an exploit attempt^1")
         return false
@@ -135,7 +134,7 @@ function distExploitCheck(table, src)
     local allow = false
 
     for i = 1, #table do
-        if #(table[i].xyz  - srcCoords) <= 10 then
+        if #(table[i].xy  - srcCoords.xy) <= 10 then
             return true
         else
             allow = false
@@ -143,7 +142,7 @@ function distExploitCheck(table, src)
     end
 
     if not allow then
-        print(src and ("^1Src ^3"..src.." ").."^1Tried to open a registered shop/stash from over the distance limit^7")
+        print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
         return false
     end
 

shared/callback.lua

@@ -25,7 +25,6 @@ local function awaitWithTimeout(registerFn, timeoutMs)
     return nil, res
 end
 
-
 --- Registers a callback function with the appropriate framework.
 ---
 --- This function checks which framework is started (e.g., OX, QB, ESX) and registers the callback accordingly.

shared/itemcontrol.lua

@@ -88,7 +88,6 @@ local InvFunc = {
                     inventory = items,
                     society = society,
                 })
-                debugPrint("^6Bridge^7: ^2Registering ^5"..OXInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -123,7 +122,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..OXInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -322,7 +320,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[OrigenInv]:registerStash(name, label, slots or 50, weight or 4000000)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..OrigenInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -514,7 +511,6 @@ local InvFunc = {
         registerShop =
             function(name, label, items, society)
                 exports[TgiannInv]:RegisterShop(name, items)
-                debugPrint("^6Bridge^7: ^2Registering ^5"..TgiannInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -548,7 +544,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..TgiannInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -841,7 +836,6 @@ local InvFunc = {
                         items = items,
                         society = society,
                     })
-                    debugPrint("^6Bridge^7: ^2Registering ^5"..QBInv.." ^3Store^7:", name, "^4Label^7: "..label)
                 end
             end,
         openStash =
@@ -1040,7 +1034,6 @@ local InvFunc = {
                         items = items,
                         society = society,
                     })
-                    debugPrint("^6Bridge^7: ^2Registering ^5"..PSInv.." ^3Store^7:", name, "^4Label^7: "..label)
                 end
             end,
         openStash =
@@ -1206,7 +1199,6 @@ local InvFunc = {
                     items = items,
                     society = society,
                 })
-                debugPrint("^6Bridge^7: ^2Registering ^5"..RSGInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -2104,9 +2096,7 @@ end
 function openStash(data)
     if (data.job or data.gang) and not jobCheck(data.job or data.gang) then return end
 
-    local p = promise.new()
-    p:resolve(triggerCallback(getScript()..":getRegisteredStashLocations", data.stash))
-    local exploitCheck = Citizen.Await(p)
+    local exploitCheck = triggerCallback(getScript()..":getRegisteredStashLocations", data.stash)
 
     if not exploitCheck then
         print("^3Warning^7: ^2This isn't a registered stash^1, refusing call^7")
@@ -2351,19 +2341,24 @@ end
 --- )
 --- ```
 function registerStash(name, label, slots, weight, owner, coords)
-    if coords then
-        stashExploitCheck[name] = stashExploitCheck[name] or {}
-        stashExploitCheck[name][#stashExploitCheck[name]+1] = coords
-    else
-        print("^3Warning^7: ^1Stash ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterStash^7()")
-    end
+
+    -- ensure tables exist
+    stashExploitCheck = stashExploitCheck or {}
+    stashExploitCheck[name] = stashExploitCheck[name] or {}
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
             inv.registerStash(name, label, slots, weight, owner, coords)
-            return
+            debugPrint("^6Bridge^7: ^2Registering ^4"..inv.invName.." ^3Stash^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
+            break
         end
     end
+
+    if coords then
+        stashExploitCheck[name][#stashExploitCheck[name]+1] = coords.xyz
+    else
+        print("^3Warning^7: ^1Stash ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterStash^7()")
+    end
 end
 
 if isServer() then
@@ -2485,6 +2480,7 @@ function sellMenu(data)
                             sellMenu(origData)
                         end
                         v.sellTable = data.sellTable[k]
+                        v.name = data.name
                         sellMenu(v)
                     end,
                 }
@@ -2587,8 +2583,8 @@ RegisterNetEvent(getScript()..":Sellitems", function(data, token)
 end)
 
 function registerSellShop(name, coords)
-    if coords and type(coords) == "vector3" then
-        print("Registered Sell Shop "..name.." Correctly")
+    if coords then
+        debugPrint("^6Bridge^7: ^2Registering ^3Sell Store^7: "..name, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
         sellShopExploitCheck[name] = sellShopExploitCheck[name] or {}
         sellShopExploitCheck[name][#sellShopExploitCheck[name]+1] = coords
     end
@@ -2688,29 +2684,23 @@ end)
 --- registerShop("weaponShop", "Weapon Shop", weaponItems, "society_weapons")
 --- ```
 function registerShop(name, label, items, society, coords)
-    local shopResource = ""
+    -- ensure tables exist
+    shopExploitCheck = shopExploitCheck or {}
+    shopExploitCheck[name] = shopExploitCheck[name] or {}
 
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
-            shopResource = inv.invName
             inv.registerShop(name, label, items, society)
+            debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
             break
         end
     end
 
     -- If received coords, pass them to distance check cache
-    if coords and type(coords) == "vector3" then
-        --print("Registered Shop Correctly")
-        shopExploitCheck[name] = shopExploitCheck[name] or {}
+    if coords then
         shopExploitCheck[name][#shopExploitCheck[name]+1] = coords
     else
         print("^3Warning^7: ^1Store ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterShop^7()")
     end
-
-    if shopResource ~= "" then
-        debugPrint("^6Bridge^7: ^2Registering ^5"..shopResource.." ^3Store^7:", name, "^4Label^7: "..label)
-    else
-    --    debugPrint("^1ERROR^7: ^1Couldn't find supported inventory to register shop^7:", name)
-    end
 end

shared/playerfunctions.lua

@@ -130,12 +130,13 @@ end)
 --- @param type string "thirst" or "hunger".
 --- @param amount number New value to set.
 RegisterNetEvent(getScript()..":server:setNeed", function(needType, amount)
-    local src = source
-    if needType == "thirst" then
-        setThirst(src, amount)
-    elseif needType == "hunger" then
-        setHunger(src, amount)
-    end
+    print("^1Deprecated function ':server:setNeed' called, please update your scripts^7")
+--    local src = source
+--    if needType == "thirst" then
+--        setThirst(src, amount)
+--    elseif needType == "hunger" then
+--        setHunger(src, amount)
+--    end
 end)
 
 -------------------------------------------------------------
@@ -322,41 +323,42 @@ end
 --- ConsumeSuccess("beer", "alcohol")
 --- ```
 function ConsumeSuccess(itemName, type, data)
-    local hunger = data and data.hunger or Items[itemName].hunger
-    local thirst = data and data.thirst or Items[itemName].thirst
-
-    ExecuteCommand("e c")
-    removeItem(itemName, 1)
-
-    if isStarted(ESXExport) then
-        if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
-        end
-        if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
-        end
-    else
-        if hunger then
-            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"] + tonumber(thirst))
-        end
-    end
-
-    if type == "alcohol" then
-        alcoholCount = (alcoholCount or 0) + 1
-        if alcoholCount > 1 and alcoholCount < 4 then
-            TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
-        elseif alcoholCount >= 4 then
-            TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
-            AlienEffect()
-        end
-    end
-
-    if Config.Reward then
-        getRandomReward(itemName)
-    end
+    print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
+    --local hunger = data and data.hunger or Items[itemName].hunger
+    --local thirst = data and data.thirst or Items[itemName].thirst
+    --
+    --ExecuteCommand("e c")
+    --removeItem(itemName, 1)
+    --
+    --if isStarted(ESXExport) then
+    --    if hunger then
+    --        TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
+    --    end
+    --    if thirst then
+    --        TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
+    --    end
+    --else
+    --    if hunger then
+    --        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"] + tonumber(thirst))
+    --    end
+    --end
+    --
+    --if type == "alcohol" then
+    --    alcoholCount = (alcoholCount or 0) + 1
+    --    if alcoholCount > 1 and alcoholCount < 4 then
+    --        TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
+    --    elseif alcoholCount >= 4 then
+    --        TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
+    --        AlienEffect()
+    --    end
+    --end
+    --
+    --if Config.Reward then
+    --    getRandomReward(itemName)
+    --end
 end
 
 -------------------------------------------------------------
@@ -918,17 +920,10 @@ local wardrobeFunc = {
             end)
         end,
     },
-    {   name = "illenium-appearance",
+    {
+        name = "illenium-appearance",
         openWardrobe = function()
-            exports['illenium-appearance']:startPlayerCustomization(function(appearance)
-                if appearance then
-                    TriggerServerEvent("illenium-appearance:server:saveAppearance", appearance)
-                end
-            end, {
-                components = true, componentConfig = { masks = true, upperBody = true, lowerBody = true, bags = true, shoes = true, scarfAndChains = true, bodyArmor = true, shirts = true, decals = true, jackets = true },
-                props = true, propConfig = { hats = true, glasses = true, ear = true, watches = true, bracelets = true },
-                enableExit = true,
-            })
+            TriggerEvent("illenium-appearance:client:openOutfitMenu")
         end,
     },
 }

version.txt

@@ -1,15 +1,9 @@
-2.0.22
+2.1.02
 
-- Support for qs-interface
-- Fix polyzone minZ + maxZ handling
-- Fix ox_target zone location to match qb-target
-- Fix "Waiting for script start" loop bug
-- Add condition for fading in entities
-- Fix typo breaking scripts on gta skillbar fail
-- Fix typo for gksphone invoice event
-- Fix latio_ui TextUI placement
-- Remove registerShop debug message
-- Fix typo in print when removing codem stash item
-- Fix function typo from origen inv documenation
+- Script Overhaul, replace whole script
+- Removal of Quasar Script Support
+- Support Tgiann-inv's new item system
+- **Hotfix for stores and stashes not registering properly**
+- **Hotfix "nil" print and use .xy for distance check**
 
-https://github.com/jimathy/jim_bridge
+https://github.com/jimathy/jim_bridge/releases/latest