Updates

client/main.lua

@@ -20,9 +20,7 @@ CreateThread(function()
         local sleep = 1000
         if LocalPlayer.state.isLoggedIn then
             sleep = 100
-
-            local ped = cache.ped
-            local entering = GetVehiclePedIsTryingToEnter(ped)
+            local entering = GetVehiclePedIsTryingToEnter(cache.ped)
             local carIsImmune = false
             if entering ~= 0 and not isBlacklistedVehicle(entering) then
                 sleep = 2000
@@ -82,9 +80,9 @@ CreateThread(function()
             end
 
             -- Hotwiring while in vehicle, also keeps engine off for vehicles you don't own keys to
-            if IsPedInAnyVehicle(ped, false) and not IsHotwiring then
+            if cache.vehicle and not IsHotwiring then
                 sleep = 1000
-                local vehicle = GetVehiclePedIsIn(ped)
+                local vehicle = cache.vehicle
                 local plate = QBCore.Functions.GetPlate(vehicle)
 
                 if GetPedInVehicleSeat(vehicle, -1) == cache.ped and not HasKeys(plate) and not isBlacklistedVehicle(vehicle) and not AreKeysJobShared(vehicle) then
@@ -112,7 +110,7 @@ CreateThread(function()
                             end
                         end
                         if GetPedInVehicleSeat(targetveh, -1) == target and not IsBlacklistedWeapon() then
-                            local pos = GetEntityCoords(ped, true)
+                            local pos = GetEntityCoords(cache.ped, true)
                             local targetpos = GetEntityCoords(target, true)
                             if #(pos - targetpos) < 5.0 and not carIsImmune then
                                 CarjackVehicle(target)
@@ -129,7 +127,7 @@ end)
 function isBlacklistedVehicle(vehicle)
     local isBlacklisted = false
     for _,v in ipairs(Config.NoLockVehicles) do
-        if GetHashKey(v) == GetEntityModel(vehicle) then
+        if joaat(v) == GetEntityModel(vehicle) then
             isBlacklisted = true
             break;
         end
@@ -171,9 +169,8 @@ end)
 RegisterNetEvent('qb-vehiclekeys:client:AddKeys', function(plate)
     KeysList[plate] = true
 
-    local ped = cache.ped
-    if IsPedInAnyVehicle(ped, false) then
-        local vehicle = GetVehiclePedIsIn(ped)
+    if cache.vehicle then
+        local vehicle = cache.vehicle
         local vehicleplate = QBCore.Functions.GetPlate(vehicle)
 
         if plate == vehicleplate then
@@ -246,8 +243,8 @@ function GiveKeys(id, plate)
 end
 
 function GetKeys()
-    QBCore.Functions.TriggerCallback('qb-vehiclekeys:server:GetVehicleKeys', function(keysList)
-        KeysList = keysList
+    lib.callback('qbx-vehiclekeys:server:getVehicleKeys', function(keysList)
+      KeysList = keysList
     end)
 end
 
@@ -256,17 +253,9 @@ function HasKeys(plate)
 end
 exports('HasKeys', HasKeys)
 
-function loadAnimDict(dict)
-    while (not HasAnimDictLoaded(dict)) do
-        RequestAnimDict(dict)
-        Wait(0)
-    end
-end
-
 function GetVehicleInDirection(coordFromOffset, coordToOffset)
-    local ped = cache.ped
-    local coordFrom = GetOffsetFromEntityInWorldCoords(ped, coordFromOffset.x, coordFromOffset.y, coordFromOffset.z)
-    local coordTo = GetOffsetFromEntityInWorldCoords(ped, coordToOffset.x, coordToOffset.y, coordToOffset.z)
+    local coordFrom = GetOffsetFromEntityInWorldCoords(cache.ped, coordFromOffset.x, coordFromOffset.y, coordFromOffset.z)
+    local coordTo = GetOffsetFromEntityInWorldCoords(cache.ped, coordToOffset.x, coordToOffset.y, coordToOffset.z)
 
     local rayHandle = CastRayPointToPoint(coordFrom.x, coordFrom.y, coordFrom.z, coordTo.x, coordTo.y, coordTo.z, 10, cache.ped, 0)
     local _, _, _, _, vehicle = GetShapeTestResult(rayHandle)
@@ -319,14 +308,10 @@ function ToggleVehicleLocks(veh)
     if veh then
         if not isBlacklistedVehicle(veh) then
             if HasKeys(QBCore.Functions.GetPlate(veh)) or AreKeysJobShared(veh) then
-                local ped = cache.ped
                 local vehLockStatus = GetVehicleDoorLockStatus(veh)
-
-                loadAnimDict("anim@mp_player_intmenu@key_fob@")
-                TaskPlayAnim(ped, 'anim@mp_player_intmenu@key_fob@', 'fob_click', 3.0, 3.0, -1, 49, 0, false, false, false)
-
+                lib.requestAnimDict("anim@mp_player_intmenu@key_fob@")
+                TaskPlayAnim(cache.ped, 'anim@mp_player_intmenu@key_fob@', 'fob_click', 3.0, 3.0, -1, 49, 0, false, false, false)
                 TriggerServerEvent("InteractSound_SV:PlayWithinDistance", 5, "lock", 0.3)
-
                 NetworkRequestControlOfEntity(veh)
                 if vehLockStatus == 1 then
                     TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 2)
@@ -342,7 +327,7 @@ function ToggleVehicleLocks(veh)
                 Wait(200)
                 SetVehicleLights(veh, 0)
                 Wait(300)
-                ClearPedTasks(ped)
+                ClearPedTasks(cache.ped)
             else
                 QBCore.Functions.Notify(Lang:t("notify.no_keys"), 'error')
             end
@@ -387,8 +372,7 @@ function IsBlacklistedWeapon()
 end
 
 function LockpickDoor(isAdvanced)
-    local ped = cache.ped
-    local pos = GetEntityCoords(ped)
+    local pos = GetEntityCoords(cache.ped)
     local vehicle = QBCore.Functions.GetClosestVehicle()
 
     if vehicle == nil or vehicle == 0 then return end
@@ -397,8 +381,17 @@ function LockpickDoor(isAdvanced)
     if GetVehicleDoorLockStatus(vehicle) <= 0 then return end
 
     usingAdvanced = isAdvanced
-    Config.LockPickDoorEvent()
-end
+    lib.requestAnimDict('veh@break_in@0h@p_m_one@')
+    TaskPlayAnim(cache.ped, 'veh@break_in@0h@p_m_one@', "low_force_entry_ds", 3.0, 3.0, -1, 16, 0, 0, 0, 0)
+    local success = lib.skillCheck({'easy', 'easy', {areaSize = 60, speedMultiplier = 1}, 'medium'}, {'1', '2', '3', '4'})
+    if success then
+        LockpickFinishCallback(success)
+    else
+        AttemptPoliceAlert('carjack')
+        TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
+        TriggerEvent('QBCore:Notify', 'You failed to lockpick.', 'error')
+     end
+  end
 
 function LockpickFinishCallback(success)
     local vehicle = QBCore.Functions.GetClosestVehicle()
@@ -433,7 +426,6 @@ end
 
 function Hotwire(vehicle, plate)
     local hotwireTime = math.random(Config.minHotwireTime, Config.maxHotwireTime)
-    local ped = cache.ped
     IsHotwiring = true
 
     SetVehicleAlarm(vehicle, true)
@@ -454,7 +446,7 @@ function Hotwire(vehicle, plate)
             combat = true,
         }
     }) then
-        StopAnimTask(ped, "anim@amb@clubhouse@tutorial@bkr_tut_ig3@", "machinic_loop_mechandplayer", 1.0)
+        StopAnimTask(cache.ped, "anim@amb@clubhouse@tutorial@bkr_tut_ig3@", "machinic_loop_mechandplayer", 1.0)
         if (math.random() <= Config.HotwireChance) then
             TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
         else
@@ -464,7 +456,7 @@ function Hotwire(vehicle, plate)
         Wait(Config.TimeBetweenHotwires)
         IsHotwiring = false
     else
-        StopAnimTask(ped, "anim@amb@clubhouse@tutorial@bkr_tut_ig3@", "machinic_loop_mechandplayer", 1.0)
+        StopAnimTask(cache.ped, "anim@amb@clubhouse@tutorial@bkr_tut_ig3@", "machinic_loop_mechandplayer", 1.0)
         IsHotwiring = false
     end
     SetTimeout(10000, function()
@@ -477,7 +469,7 @@ function CarjackVehicle(target)
     if not Config.CarJackEnable then return end
     isCarjacking = true
     canCarjack = false
-    loadAnimDict('mp_am_hold_up')
+    lib.requestAnimDict('mp_am_hold_up')
     local vehicle = GetVehiclePedIsUsing(target)
     local occupants = GetPedsInVehicle(vehicle)
     for p=1,#occupants do

config.lua

@@ -7,9 +7,6 @@ Config.LockNPCParkedCars = true -- Lock state for NPC parked cars [true = locked
 -- Lockpick Settings
 Config.RemoveLockpickNormal = 0.5 -- Chance to remove lockpick on fail
 Config.RemoveLockpickAdvanced = 0.2 -- Chance to remove advanced lockpick on fail
-Config.LockPickDoorEvent = function() -- This function is called when a player attempts to lock pick a vehicle
-    TriggerEvent('qb-lockpick:client:openLockpick', LockpickFinishCallback)
-end
 
 -- Carjack Settings
 Config.CarJackEnable = true -- True allows for the ability to car jack peds.

fxmanifest.lua

@@ -1,17 +1,15 @@
 fx_version 'cerulean'
 game 'gta5'
-
-description 'https://github.com/QBCore-Remastered'
-version '1.0.1'
+lua54 'yes'
+description 'https://github.com/Qbox-project'
+version '1.0.0'
 
 shared_scripts {
-	'@qb-core/shared/locale.lua',
+	'@qbx-core/shared/locale.lua',
 	'locales/en.lua',
 	'locales/*.lua',
 	'@ox_lib/init.lua',
 	'config.lua',
 }
 client_script 'client/main.lua'
 server_script 'server/main.lua'
-
-lua54 'yes'

server/main.lua

@@ -49,15 +49,15 @@ RegisterNetEvent('qb-vehiclekeys:server:setVehLockState', function(vehNetId, sta
     SetVehicleDoorsLocked(NetworkGetEntityFromNetworkId(vehNetId), state)
 end)
 
-QBCore.Functions.CreateCallback('qb-vehiclekeys:server:GetVehicleKeys', function(source, cb)
+lib.callback.register('qb-vehiclekeys:server:GetVehicleKeys', function(source)
     local citizenid = QBCore.Functions.GetPlayer(source).PlayerData.citizenid
     local keysList = {}
     for plate, citizenids in pairs (VehicleList) do
         if citizenids[citizenid] then
             keysList[plate] = true
         end
     end
-    cb(keysList)
+    return keysList
 end)
 
 -----------------------