Version Bump

- Added ability to choose circle/bar type
- Added ability for props when using progbar

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.16"
+version "2.0.17"
 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/make/progressBars.lua

@@ -43,9 +43,10 @@ function progressBar(data)
     local result = nil
     if data.cam then startTempCam(data.cam) end
     if Config.System.ProgressBar == "ox" then
-        if exports[OXLibExport]:progressBar({
+        local options = {
             duration = debugMode and 1000 or data.time,
             label = data.label,
+            position = data.position or "bottom",
             useWhileDead = data.dead or false,
 			canCancel = data.cancel and data.cancel or true,
             anim = {
@@ -55,12 +56,41 @@ function progressBar(data)
                 scenario = data.task
             },
             disable = {
-                combat = true
+                combat = data.combat or true,
+                move = data.movement or false,
+                car = data.carMovement or false,
+                mouse = data.mouse or false
             },
-        }) then
-            result = true
-        else
-            result = false
+        }
+        if data.prop and data.prop.model then
+            options.prop = {
+                model = data.prop.model,
+                pos = data.prop.pos or vec3(0, 0, 0),
+                rot = data.prop.rot or vec3(0, 0, 0),
+                bone = data.prop.bone or 0
+            }
+        end
+        if data.propTwo and data.propTwo.model then
+            options.propTwo = {
+                model = data.propTwo.model,
+                pos = data.propTwo.pos or vec3(0, 0, 0),
+                rot = data.propTwo.rot or vec3(0, 0, 0),
+                bone = data.propTwo.bone or 0
+            }
+        end
+        if data.progressType == "circle" then
+            if exports[OXLibExport]:progressCircle(options) then
+                result = true
+            else
+                result = false
+            end
+        end
+        if not data.progressType or data.progressType == "bar" then
+            if exports[OXLibExport]:progressBar(options) then
+                result = true
+            else
+                result = false
+            end
         end
 
     elseif Config.System.ProgressBar == "qb" then
@@ -179,7 +209,9 @@ function progressBar(data)
         inProgress = false
     end
 
-    while result == nil do Wait(10) end
+    while result == nil do
+        Wait(10)
+    end
 
     -- Cleanup
     FreezeEntityPosition(ped, false)
@@ -256,7 +288,7 @@ function stopProgressBar()
         exports[OXLibExport]:cancelProgress()
     elseif Config.System.ProgressBar == "qb" then
         TriggerEvent("progressbar:client:cancel")
-    elseif Config.System.ProgressBar == "gta" then
+    elseif Config.System.ProgressBar == "gta" or Config.System.ProgressBar == "red" then
         inProgress = false
     end
 end

version.txt

@@ -1,14 +1,6 @@
-2.0.16
+2.0.17
 
-- Fix weapon item caching for ox_inv
-- add checkExportExist() function
-- Start adding a `billPlayer()` function for multi-billing script support
-- Add support for sending mails to npwd_qbx_mail addon
-- Add "support" for CoreM's shop integration
-- Add Auto check for QBInvNew variable for older inventories
-- Add warnings for if theres an error in your shared vehicles, items or jobs file
-- Add full support for JPR-Inventory
-- Changes to crafting menu ui
-- Fixes to setThirst() and setHunger() functions
+- Fix progressbars getting stuck on ox_lib
+- #BlameMcklean for this one
 
 https://github.com/jimathy/jim_bridge