fix(qb-core): post-update recovery + centralizare notify 17mov_Hud

Restaurat jobs.lua din git (Quasar fork a suprascris joburile 17mov). Adăugat item map în items.lua (lipsea, rupt rv-maphold). Setat licences.driver = false în config.lua. Override QBCore.Functions.Notify + QBCore:Notify event → 17mov_Hud:ShowNotification (toate notificările merg automat prin 17mov_Hud).
2026-04-03 02:47:59 +03:00
parent 06414ed181
commit e756e29294
1539 changed files with 51926 additions and 39806 deletions
@@ -15,25 +15,38 @@ if wasabi_uikit == 'started' or wasabi_uikit == 'starting' then uikitFound = tru
 ---@param data table Same data as used in ox_lib progress bar/circle. Subject to change.
 ---@return boolean
 function WSB.progressUI(data, type)
-    local QBCore = exports['qb-core']:GetCoreObject()
-    local success = false
-    
-    QBCore.Functions.Progressbar(data.name or 'progress', data.label or 'Loading...', data.duration or 5000, data.useWhileDead or false, data.canCancel or false, {
-        disableMovement = data.disable and data.disable.move or false,
-        disableCarMovement = data.disable and data.disable.car or false,
-        disableMouse = data.disable and data.disable.mouse or false,
-        disableCombat = data.disable and data.disable.combat or false,
-    }, data.anim or {}, data.prop or {}, data.propTwo or {}, function()
-        success = true
-    end, function()
-        success = false
-    end)
-    
-    while success == false do
-        Wait(100)
+
+    -- Remove under this line to use your own progress bar/circle system or ox_lib
+    if not data.color then data.color = Config.DefaultColor end
+    if uikitFound then
+        type = type == 'progressCircle' and 'circle' or 'bar'
+        return exports.wasabi_uikit:ProgressBar(data, type) or false
    end
-    
-    return success
+    return ProgressUI(data, type) or false
+    -- Remove above this line if you are using your own progress bar/circle system or ox_lib
+
+    --[[ Remove this line if you are using lation_ui: https://lationscripts.com/product/modern-ui
+    local lation_ui = GetResourceState('lation_ui')
+    if lation_ui ~= 'started' and lation_ui ~= 'starting' then
+        print('^0[^3WARNING^0] ^1lation_ui^0 is not running, please ensure it is started before using ^wsb.progressUI or use default!^0')
+        return false
+    end
+    return exports.lation_ui:progressBar(data)
+    ]] -- Remove this line if you are using lation_ui
+
+--[[    
+    local oxLib = GetResourceState('ox_lib')
+    if oxLib ~= 'started' and oxLib ~= 'starting' then
+        print(
+        '^0[^3WARNING^0] ^1ox_lib^0 is not running, please ensure it is started before using ^wsb.progressUI or use default!^0')
+        return false
+    end
+    if type == 'progressBar' then
+        return exports.ox_lib:progressBar(data)
+    else
+        return exports.ox_lib:progressCircle(data)
+    end
+]]
 end

 -- Compatibility functions for ox_lib