Merge pull request #70 from ChrisNewmanDev/main

Added Wasabi Banking

.gitattributes

@@ -1,12 +1,16 @@
 # VCS / CI noise
-.gitattributes     export-ignore
-.gitignore         export-ignore
-.github/**         export-ignore
-.gitmodules        export-ignore
+/.gitattributes          export-ignore
+/.gitignore              export-ignore
+/.gitmodules             export-ignore
+/.github                 export-ignore
 
 # Dev tooling/config
-.vscode/**         export-ignore
-*.code-workspace   export-ignore
-.editorconfig      export-ignore
-.eslintrc*         export-ignore
-.prettier*         export-ignore
+/.vscode                 export-ignore
+*.code-workspace         export-ignore
+/.editorconfig           export-ignore
+/.eslintrc*              export-ignore
+/.prettier*              export-ignore
+
+# Omit release-only helpers
+/server/restaurantchecker.lua  export-ignore
+/server/installitems.lua       export-ignore

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.1.07"
+version "2.1.09"
 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.'
@@ -11,7 +11,11 @@ files {
     'starter.lua',
     'shared/*.lua',
     'shared/make/*.lua',
+    'shared/auth/*.lua',
+    'shared/make/*.lua',
+    'shared/modules/*.lua',
     'shared/scaleforms/*.lua',
+    'shared/wrappers/*.lua',
 }
 
 -- Version checker

shared/_authToken.lua

@@ -137,21 +137,31 @@ function distExploitCheck(table, src)
         return false
     end
 
+    local maxDist = 10.0
+    local nearestDist = 999999.0
+    local nearestCoords = nil
+
     local ped = src and GetPlayerPed(src) or PlayerPedId()
     local srcCoords = GetEntityCoords(ped)
-    local allow = false
 
     for i = 1, #table do
-        if #(table[i].xy  - srcCoords.xy) <= 10 then
+
+        local dist2d = #(table[i].xy - srcCoords.xy)
+
+        -- Track the nearestDist
+        if dist2d < nearestDist then
+            nearestDist = dist2d
+            nearestCoords = table[i]
+        end
+
+        if dist2d <= maxDist then
+            debugPrint("^1Found location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
             return true
-        else
-            allow = false
         end
     end
 
-    if not allow then
-        print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
-        return false
-    end
+    print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
+    print("^1Nearest Possible Location^7: ^3"..nearestDist.." ^7away from player - "..formatCoord(nearestCoords))
+    return false
 
 end

shared/crafting.lua

@@ -121,7 +121,7 @@ function craftingMenu(data)
         for k, v in pairs(Recipes[i]) do
             if not excludeKeys[k] then
                 if not Recipes[i].amount then Recipes[i].amount = 1 end
-                tempCarryTable[k] = tempCarryTable[k] and (tempCarryTable[k] < Recipes[i].amount) or Recipes[i].amount
+                tempCarryTable[k] = math.max(tempCarryTable[k] or 0, Recipes[i].amount)
             end
         end
     end
@@ -420,7 +420,7 @@ function makeItem(origData)
             for k, v in pairs(data.craft[data.item]) do
                 if isInventoryOpen() then
                     print("^1Error^7: ^2Inventory is open, you tried to break things")
-                    stopCam(0)
+                    stopCam(100)
                     ClearPedTasks(Ped)
                     if canReturn then craftingMenu(origData) end
                     CraftLock = false
@@ -434,6 +434,7 @@ function makeItem(origData)
                     anim = "putdown_low",
                     flag = 49,
                     icon = k,
+                    disableMovement = true,
                 }) then
                     TriggerEvent((isStarted(QBInv) and QBInvNew and "qb-" or "")..'inventory:client:ItemBox', Items[k], "use", v)
                 else
@@ -455,6 +456,7 @@ function makeItem(origData)
                 anim = anim,
                 flag = 49,
                 icon = data.item,
+                disableMovement = true,
                 request = true,
             }) then
                 TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata, currentToken)
@@ -487,6 +489,7 @@ function makeItem(origData)
             anim = anim,
             flag = 49,
             icon = data.item,
+            disableMovement = true,
             request = true,
         }) then
             data.craft.amount *= craftAmount
@@ -524,7 +527,7 @@ function makeItem(origData)
     end
 
     --Wait(500)
-    stopCam(0)
+    stopCam(100)
     CraftLock = false
     if canReturn then craftingMenu(origData) end
     ClearPedTasks(Ped)
@@ -593,4 +596,5 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
     -- Optionally, add experience here:
     -- for example:
     -- if isStarted("core_skills") then exports["core_skills"]:AddExperience(src, 2) end
-end)
+
+end)

shared/helpers.lua

@@ -638,6 +638,8 @@ function lookEnt(entity)
                 debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
                 Wait(1500)
             end
+            -- Make players head face the coord for 5 seconds
+            TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
         else
             if DoesEntityExist(entity) then
                 local entCoords = GetEntityCoords(entity)
@@ -646,6 +648,9 @@ function lookEnt(entity)
                     debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
                     Wait(1500)
                 end
+
+                -- Make players head face the coord for 5 seconds
+                TaskLookAtEntity(ped, entity, 5000, 1, 1)
             end
         end
     end

shared/input.lua

@@ -64,6 +64,7 @@ function createInput(title, opts)
                     label = (opts[i].label or opts[i].text)..(opts[i].txt and " - "..opts[i].txt or ""),
                     isRequired = opts[i].isRequired,
                     name = opts[i].name,
+                    default = opts[i].default,
                     options = opts[i].options,
                 }
             end

shared/itemcontrol.lua

@@ -1656,6 +1656,10 @@ RegisterNetEvent(getScript()..":server:toggleItem", function(give, item, amount,
 
     local invName = ""
     if give == 0 or give == false then
+        if remamount < 0 then
+            print("^1Error^7: ^7src - ^1Client tried to remove a minus number of item ^7- "..item)
+            return
+        end
         if not hasItem(item, amount or 1, src) then
             dupeWarn(src, item, amount)
 
@@ -1803,6 +1807,7 @@ function getItemMetadata(item, slot, src)
 
     if chosenSlot then
         for k, v in pairs(itemcheck) do
+            v.slot = tonumber(v.slot)
             if v.name == item and v.slot == chosenSlot then
                 lowestSlot = v.slot
                 metadata = itemcheck[k].info or itemcheck[k].metadata or {}
@@ -1811,6 +1816,7 @@ function getItemMetadata(item, slot, src)
         end
     else
         for k, v in pairs(itemcheck) do
+            v.slot = tonumber(v.slot)
             if v.name == item then
                 if v.slot <= lowestSlot then
                     lowestSlot = v.slot

shared/make/cameras.lua

@@ -19,7 +19,7 @@ local camCache = {}
 -- ```
 function createTempCam(ent, coords)
 	local camID = nil
-	if Config.Crafting?.craftCam or Config.System.enableCam then
+	if (Config.Crafting and Config.Crafting.craftCam) or Config.System.enableCam then
 
 		-- if not ent or coords are provided, make a basic camera to control later
 		if not ent and not coords then
@@ -171,7 +171,7 @@ function stopTempCam(renderTime)
 
 		clearLoadLocation()
 
-		Wait(renderTime or 0)
+		Wait(renderTime or 500)
 		for i = 1, #camCache do
 			DestroyCam(camCache[i], true)
 		end

shared/metaHandlers.lua

@@ -122,7 +122,7 @@ function GetPlayer(source)
             return framework.GetPlayer(source)
         end
     end
-    return nil
+    return {}
 end
 
 -------------------------------------------------------------

shared/notify.lua

@@ -111,7 +111,10 @@ local notifyFunc = {
 --- triggerNotify("Alert", "You have been warned for misconduct.", "error", playerId)
 --- ```
 function triggerNotify(title, message, type, src)
-    if not Config.System?.Notify then debugPrint("Notify triggered but not set up") return end
+    if not Config or not Config.System or not Config.System.Notify then
+        print("Notify triggered but not set up")
+        return
+    end
 
     if src then
         notifyFunc[Config.System.Notify].server(title, message, type, src)

shared/playerfunctions.lua

@@ -221,6 +221,10 @@ local billPlayerFunc = {
         function(data)
             TriggerEvent("codem-billing:client:OpenMenu")
         end,
+    tgg =
+        function(data)
+            exports["tgg-billing"]:OpenBillingMenu()
+        end,
 }
 
 --- BillPlayer
@@ -388,41 +392,6 @@ end
 --- ```
 function ConsumeSuccess(itemName, type, data)
     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
 
 -------------------------------------------------------------
@@ -435,19 +404,26 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                     return hasJobFlag, duty
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                     return hasJobFlag, duty
@@ -461,21 +437,29 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
+                ::skip::
                 return hasJobFlag, duty
             end,
     },
@@ -504,9 +488,8 @@ local hasGroupFunc = {
         hasGroup =
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
-
                 local playerInfo = GetPlayer(src)
-                local info = playerInfo.job
+                local info = playerInfo and playerInfo.job
                 while not info do
                     info = GetPlayer(src).job
                     Wait(100)
@@ -514,7 +497,6 @@ local hasGroupFunc = {
                 if info.name == group then
                     hasJobFlag = true
                 end
-
                 return hasJobFlag, duty
             end,
     },
@@ -524,18 +506,25 @@ local hasGroupFunc = {
             function(group, grade, src)
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
-                local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo and jobinfo.name == group then
+                local jobInfo, gangInfo = nil, nil
+                if next(playerInfo) then
+                    jobInfo = playerInfo.job
+                    gangInfo = playerInfo.gang
+                    if playerInfo.PlayerData then
+                        jobInfo = playerInfo.PlayerData.job
+                        gangInfo = playerInfo.PlayerData.gang
+                    end
+                end
+                if jobInfo and jobInfo.name == group then
                     hasJobFlag = true
-                    duty = jobinfo.onduty
-                    if grade and not (grade <= jobinfo.grade.level) then
+                    duty = jobInfo.onduty
+                    if grade and not (grade <= jobInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
-                local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo and ganginfo.name == group then
+                if gangInfo and gangInfo.name == group then
                     hasJobFlag = true
-                    if grade and not (grade <= ganginfo.grade.level) then
+                    if grade and not (grade <= gangInfo.grade.level) then
                         hasJobFlag = false
                     end
                 end
@@ -589,6 +578,7 @@ local getPlayerFunc = {
                 local Player = {}
                 local info = ESX.GetPlayerFromId(src)
                 if not info then return {} end
+
                 Player = {
                     name = info.getName(),
                     cash = info.getMoney(),
@@ -605,6 +595,8 @@ local getPlayerFunc = {
                     onDuty = info.job.onDuty,
                     --account = info.charinfo.account,
                     citizenId = info.identifier,
+                    hunger = Player(src).state.hunger or 0,
+                    thirst = Player(src).state.thirst or 0,
                 }
                 return Player
             end,
@@ -620,6 +612,7 @@ local getPlayerFunc = {
                     if v.name == "money" then cash = v.money end
                     if v.name == "bank" then bank = v.money end
                 end
+
                 Player = {
                     firstname = info.firstName,
                     lastname = info.lastName,
@@ -635,7 +628,9 @@ local getPlayerFunc = {
                     --account = info.charinfo.account,
                     citizenId = info.identifier,
                     isDead = IsEntityDead(PlayerPedId()),
-                    isDown = IsPedDeadOrDying(PlayerPedId(), true)
+                    isDown = IsPedDeadOrDying(PlayerPedId(), true),
+                    hunger = LocalPlayer.state.hunger or 0,
+                    thirst = LocalPlayer.state.thirst or 0,
                 }
                 return Player
             end,
@@ -719,6 +714,8 @@ local getPlayerFunc = {
                     isDead = info.PlayerData.metadata["isdead"],
                     isDown = info.PlayerData.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.PlayerData.metadata["hunger"],
+                    thirst = info.PlayerData.metadata["thirst"],
                 }
                 return Player
             end,
@@ -747,6 +744,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -778,6 +777,8 @@ local getPlayerFunc = {
                         isDead = info.metadata["isdead"],
                         isDown = info.metadata["inlaststand"],
                         charInfo = info.charinfo,
+                        hunger = info.metadata["hunger"],
+                        thirst = info.metadata["thirst"],
                     }
                 end
                 return Player
@@ -809,6 +810,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -840,6 +843,8 @@ local getPlayerFunc = {
                         isDead = info.metadata["isdead"],
                         isDown = info.metadata["inlaststand"],
                         charInfo = info.charinfo,
+                        hunger = info.metadata["hunger"],
+                        thirst = info.metadata["thirst"],
                     }
                 end
                 return Player
@@ -871,6 +876,8 @@ local getPlayerFunc = {
                     isDead = info.metadata["isdead"],
                     isDown = info.metadata["inlaststand"],
                     charInfo = info.charinfo,
+                    hunger = info.metadata["hunger"],
+                    thirst = info.metadata["thirst"],
                 }
                 return Player
             end,
@@ -972,6 +979,12 @@ local wardrobeFunc = {
             TriggerEvent("illenium-appearance:client:openOutfitMenu")
         end,
     },
+    {
+        name = "rcore_clothing",
+        openWardrobe = function()
+            TriggerEvent('rcore_clothing:openChangingRoom')
+        end,
+    }
 }
 
 --- Opens the clothing customization menu
@@ -984,4 +997,5 @@ function openClothing()
             break
         end
     end
-end
+
+end

shared/societybank.lua

@@ -192,6 +192,21 @@ local societyFunc = {
             end,
     },
 
+    {   bankName = "wasabi_banking",
+        getAccount =
+            function(society)
+                return exports['wasabi_banking']:GetAccountBalance(society, 'society')
+            end,
+        chargeSociety =
+            function(society, amount)
+                exports['wasabi_banking']:RemoveMoney('society', society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                exports['wasabi_banking']:AddMoney('society', society, amount)
+            end,
+    },
+
 }
 
 
@@ -263,4 +278,14 @@ function fundSociety(society, amount)
     end
 
     print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
+end
+
+if isServer() then
+    createCallback(getScript()..":server:getAccount", function(source, society)
+        if society then
+            local getMoney = getSocietyAccount(society)
+            return getMoney
+        end
+        return 0
+    end)
 end

starter.lua

@@ -77,6 +77,7 @@ end
 -- [[ Server.Cfg Convar Check ]]--
 -- Check server convars for hard set defaults, otherwise it uses per script configurations
 if Config and Config.System then
+    debugMode = Config.System.Debug
     if Config.System.Debug then
         if GetConvar("jim_DisableDebug", "false") == "true" then
             debugMode = false
@@ -84,10 +85,7 @@ if Config and Config.System then
         if GetConvar("jim_DisableEventDebug", "false") == "true" then
             Config.System.EventDebug = false
         end
-    else
-        debugMode = Config.System.Debug
     end
-
     Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
     Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
     Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")

version.txt

@@ -1,11 +1,14 @@
-2.1.07
+2.1.09
 
-- Support for new embeded shop recipes
-- Add checks for targets set with minZ and maxZ set too high or low
-- New target function `createPropTarget()` which creates a box target based on a prop model
-- Add CodeM as option for billing
-- Add 17Mov progressbar support
-- Fix OrigenInv calling OX_Inv to get player inventory
-- Allow "Grab Boxes" to have custom slots and weight
+- Add 100 wait for stopCam to reduce slow movement
+- Add support for rcore_clothing in openClothing() - Thanks desypher
+- Add hunger and thirst calls to getPlayer() - Thanks oosayeroo
+- Add support for tgg-billing - Thanks GhostInLowGear
+- Fix hasJob() checking players who haven't logged in yet
+- Add exploit possibility for removeItem with minus numbers
+- Fix movement being allowed when crafting
+- Make distExploitCheck() more verbose
+- CodeM slot fix, force to number (because numbers are apparently strings)
+- ESX change to check statebag for hunger and thirst info
 
 https://github.com/jimathy/jim_bridge/releases/latest