Skip to content

Commit

Permalink
chore: QBCore -> QBX (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mekz1222
Mekz1222 authored Sep 26, 2023
1 parent 8718b31 commit 636f3d8
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
46 changes: 23 additions & 23 deletions client/main.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CreateThread(function()
local carIsImmune = false
if entering ~= 0 and not isBlacklistedVehicle(entering) then
sleep = 2000
local plate = GetPlate(entering)
local plate = QBX.Functions.GetPlate(entering)

local driver = GetPedInVehicleSeat(entering, -1)
for _, veh in ipairs(Config.ImmuneVehicles) do
Expand Down Expand Up @@ -81,13 +81,13 @@ CreateThread(function()
-- Hotwiring while in vehicle, also keeps engine off for vehicles you don't own keys to
if cache.vehicle and not isHotwiring then
sleep = 1000
local plate = GetPlate(cache.vehicle)
local plate = QBX.Functions.GetPlate(cache.vehicle)

if GetPedInVehicleSeat(cache.vehicle, -1) == cache.ped and not HasKeys(plate) and not isBlacklistedVehicle(cache.vehicle) and not AreKeysJobShared(cache.vehicle) then
sleep = 0

local vehiclePos = GetOffsetFromEntityInWorldCoords(cache.vehicle, 0.0, 1.0, 0.5)
DrawText3D(Lang:t('info.search_keys'), vehiclePos)
QBX.Functions.DrawText3D(Lang:t('info.search_keys'), vehiclePos)
SetVehicleEngineOn(cache.vehicle, false, false, true)

if IsControlJustPressed(0, 74) then
Expand Down Expand Up @@ -148,7 +148,7 @@ RegisterCommand('engine', function()
end)

AddEventHandler('onResourceStart', function(resourceName)
if resourceName == GetCurrentResourceName() and PlayerData ~= {} then
if resourceName == GetCurrentResourceName() and QBX.PlayerData ~= {} then
GetKeys()
end
end)
Expand All @@ -167,7 +167,7 @@ RegisterNetEvent('qb-vehiclekeys:client:AddKeys', function(plate)
KeysList[plate] = true

if cache.vehicle then
local vehicleplate = GetPlate(cache.vehicle)
local vehicleplate = QBX.Functions.GetPlate(cache.vehicle)

if plate == vehicleplate then
SetVehicleEngineOn(cache.vehicle, false, false, false)
Expand All @@ -182,7 +182,7 @@ end)
RegisterNetEvent('qb-vehiclekeys:client:ToggleEngine', function()
local engineOn = GetIsVehicleEngineRunning(GetVehiclePedIsIn(cache.ped))
local vehicle = GetVehiclePedIsIn(cache.ped, true)
if HasKeys(GetPlate(vehicle)) then
if HasKeys(QBX.Functions.GetPlate(vehicle)) then
if engineOn then
SetVehicleEngineOn(vehicle, false, false, true)
else
Expand All @@ -195,7 +195,7 @@ RegisterNetEvent('qb-vehiclekeys:client:GiveKeys', function(id)
local targetVehicle = GetVehicle()

if targetVehicle then
local targetPlate = GetPlate(targetVehicle)
local targetPlate = QBX.Functions.GetPlate(targetVehicle)
if HasKeys(targetPlate) then
if id and type(id) == "number" then -- Give keys to specific ID
GiveKeys(id, targetPlate)
Expand All @@ -210,7 +210,7 @@ RegisterNetEvent('qb-vehiclekeys:client:GiveKeys', function(id)
end
end
else
QBCore.Functions.Notify(Lang:t("notify.no_keys"), 'error')
QBX.Functions.Notify(Lang:t("notify.no_keys"), 'error')
end
end
end)
Expand All @@ -234,7 +234,7 @@ function GiveKeys(id, plate)
if distance < 1.5 and distance > 0.0 then
TriggerServerEvent('qb-vehiclekeys:server:GiveVehicleKeys', id, plate)
else
QBCore.Functions.Notify(Lang:t("notify.not_near"), 'error')
QBX.Functions.Notify(Lang:t("notify.not_near"), 'error')
end
end

Expand Down Expand Up @@ -282,8 +282,8 @@ function AreKeysJobShared(veh)
local vehName = GetDisplayNameFromVehicleModel(GetEntityModel(veh))
local vehPlate = GetVehicleNumberPlateText(veh)
for job, v in pairs(Config.SharedKeys) do
if job == PlayerData.job.name then
if Config.SharedKeys[job].requireOnduty and not PlayerData.job.onduty then return false end
if job == QBX.PlayerData.job.name then
if Config.SharedKeys[job].requireOnduty and not QBX.PlayerData.job.onduty then return false end
for _, vehicle in pairs(v.vehicles) do
if string.upper(vehicle) == string.upper(vehName) then
if not HasKeys(vehPlate) then
Expand All @@ -300,7 +300,7 @@ end
function ToggleVehicleLocks(veh)
if veh then
if not isBlacklistedVehicle(veh) then
if HasKeys(GetPlate(veh)) or AreKeysJobShared(veh) then
if HasKeys(QBX.Functions.GetPlate(veh)) or AreKeysJobShared(veh) then
local vehLockStatus = GetVehicleDoorLockStatus(veh)

lib.requestAnimDict('anim@mp_player_intmenu@key_fob@')
Expand All @@ -310,10 +310,10 @@ function ToggleVehicleLocks(veh)
NetworkRequestControlOfEntity(veh)
if vehLockStatus == 1 then
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 2)
QBCore.Functions.Notify(Lang:t("notify.vehicle_locked"), 'inform')
QBX.Functions.Notify(Lang:t("notify.vehicle_locked"), 'inform')
else
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 1)
QBCore.Functions.Notify(Lang:t("notify.vehicle_unlocked"), 'inform')
QBX.Functions.Notify(Lang:t("notify.vehicle_unlocked"), 'inform')
end

SetVehicleLights(veh, 2)
Expand All @@ -324,7 +324,7 @@ function ToggleVehicleLocks(veh)
Wait(300)
ClearPedTasks(cache.ped)
else
QBCore.Functions.Notify(Lang:t("notify.no_keys"), 'error')
QBX.Functions.Notify(Lang:t("notify.no_keys"), 'error')
end
else
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 1)
Expand Down Expand Up @@ -368,10 +368,10 @@ end

function LockpickDoor(isAdvanced)
local pos = GetEntityCoords(cache.ped)
local vehicle = QBCore.Functions.GetClosestVehicle()
local vehicle = QBX.Functions.GetClosestVehicle()

if vehicle == nil or vehicle == 0 then return end
if HasKeys(GetPlate(vehicle)) then return end
if HasKeys(QBX.Functions.GetPlate(vehicle)) then return end
if #(pos - GetEntityCoords(vehicle)) > 2.5 then return end
if GetVehicleDoorLockStatus(vehicle) <= 0 then return end

Expand All @@ -389,17 +389,17 @@ function LockpickDoor(isAdvanced)
end

function LockpickFinishCallback(success)
local vehicle = QBCore.Functions.GetClosestVehicle()
local vehicle = QBX.Functions.GetClosestVehicle()

local chance = math.random()
if success then
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
lastPickedVehicle = vehicle

if GetPedInVehicleSeat(vehicle, -1) == cache.ped then
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', GetPlate(vehicle))
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', QBX.Functions.GetPlate(vehicle))
else
QBCore.Functions.Notify(Lang:t("notify.vehicle_lockedpick"), 'success')
QBX.Functions.Notify(Lang:t("notify.vehicle_lockedpick"), 'success')
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(vehicle), 1)
end

Expand Down Expand Up @@ -446,7 +446,7 @@ function Hotwire(vehicle, plate)
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
else
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
QBCore.Functions.Notify(Lang:t("notify.failed_lockedpick"), 'error')
QBX.Functions.Notify(Lang:t("notify.failed_lockedpick"), 'error')
end
Wait(Config.TimeBetweenHotwires)
isHotwiring = false
Expand Down Expand Up @@ -505,7 +505,7 @@ function CarjackVehicle(target)
carjackChance = 0.5
end
if math.random() <= carjackChance then
local plate = GetPlate(vehicle)
local plate = QBX.Functions.GetPlate(vehicle)
for p=1,#occupants do
local ped = occupants[p]
CreateThread(function()
Expand All @@ -520,7 +520,7 @@ function CarjackVehicle(target)
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
else
QBCore.Functions.Notify(Lang:t("notify.carjack_failed"), 'error')
QBX.Functions.Notify(Lang:t("notify.carjack_failed"), 'error')
MakePedFlee(target)
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
end
Expand Down
12 changes: 6 additions & 6 deletions fxmanifest.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ description 'https://github.com/Qbox-project/qbx-vehiclekeys'
version '1.0.0'

shared_scripts {
'@qbx-core/import.lua',
'@qbx-core/shared/locale.lua',
'@ox_lib/init.lua',
'@qbx_core/import.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'

modules {
'qbx-core:core',
'qbx-core:playerdata',
'qbx-core:utils'
'qbx_core:core',
'qbx_core:playerdata',
'qbx_core:utils'
}
12 changes: 6 additions & 6 deletions server/main.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ RegisterNetEvent('qb-vehiclekeys:server:AcquireVehicleKeys', function(plate)
end)

RegisterNetEvent('qb-vehiclekeys:server:breakLockpick', function(itemName)
local player = QBCore.Functions.GetPlayer(source)
local player = QBX.Functions.GetPlayer(source)
if not player then return end
if not (itemName == "lockpick" or itemName == "advancedlockpick") then return end
if player.Functions.RemoveItem(itemName, 1) then
TriggerClientEvent("inventory:client:ItemBox", source, QBCore.Shared.Items[itemName], "remove")
TriggerClientEvent("inventory:client:ItemBox", source, QBX.Shared.Items[itemName], "remove")
end
end)

Expand All @@ -49,7 +49,7 @@ RegisterNetEvent('qb-vehiclekeys:server:setVehLockState', function(vehNetId, sta
end)

lib.callback.register('qbx-vehiclekeys:server:getVehicleKeys', function(source)
local citizenid = QBCore.Functions.GetPlayer(source).PlayerData.citizenid
local citizenid = QBX.Functions.GetPlayer(source).PlayerData.citizenid
local keysList = {}
for plate, citizenids in pairs (vehicleList) do
if citizenids[citizenid] then
Expand All @@ -63,7 +63,7 @@ end)
---- Functions ----
-----------------------
function GiveKeys(id, plate)
local citizenid = QBCore.Functions.GetPlayer(id).PlayerData.citizenid
local citizenid = QBX.Functions.GetPlayer(id).PlayerData.citizenid

if not vehicleList[plate] then vehicleList[plate] = {} end
vehicleList[plate][citizenid] = true
Expand All @@ -73,7 +73,7 @@ function GiveKeys(id, plate)
end

function RemoveKeys(id, plate)
local citizenid = QBCore.Functions.GetPlayer(id).PlayerData.citizenid
local citizenid = QBX.Functions.GetPlayer(id).PlayerData.citizenid

if vehicleList[plate] and vehicleList[plate][citizenid] then
vehicleList[plate][citizenid] = nil
Expand All @@ -83,7 +83,7 @@ function RemoveKeys(id, plate)
end

function HasKeys(id, plate)
local citizenid = QBCore.Functions.GetPlayer(id).PlayerData.citizenid
local citizenid = QBX.Functions.GetPlayer(id).PlayerData.citizenid
if vehicleList[plate] and vehicleList[plate][citizenid] then
return true
end
Expand Down

0 comments on commit 636f3d8

Please sign in to comment.