Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversion to new QBX core #17

Closed
wants to merge 7 commits into from
Closed

Conversion to new QBX core #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7736660
Update fxmanifest.lua
CarlBishop Sep 30, 2023
d5d836e
Update main.lua
CarlBishop Sep 30, 2023
dcfae8f
Update main.lua
CarlBishop Sep 30, 2023
7058536
Update main.lua
CarlBishop Sep 30, 2023
7b4ba06
Update main.lua
CarlBishop Sep 30, 2023
ff0d316
Update main.lua
CarlBishop Sep 30, 2023
f77e778
Update main.lua
CarlBishop Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions client/main.lua
View file
Open in desktop
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 = QBX.Functions.GetPlate(entering)
local plate = GetPlate(entering)

local driver = GetPedInVehicleSeat(entering, -1)
for _, veh in ipairs(Config.ImmuneVehicles) do
Expand All @@ -37,7 +37,7 @@ CreateThread(function()
if not isTakingKeys then
isTakingKeys = true

TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
if lib.progressCircle({
duration = 2500,
label = Lang:t("progress.takekeys"),
Expand All @@ -48,17 +48,17 @@ CreateThread(function()
car = true,
},
}) then
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', plate)
isTakingKeys = false
else
isTakingKeys = false
end
end
elseif Config.LockNPCDrivingCars then
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 2)
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 2)
else
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', plate)

--Make passengers flee
local pedsInVehicle = GetPedsInVehicle(entering)
Expand All @@ -71,23 +71,23 @@ CreateThread(function()
-- Parked car logic
elseif driver == 0 and entering ~= lastPickedVehicle and not HasKeys(plate) and not isTakingKeys then
if Config.LockNPCParkedCars then
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 2)
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 2)
else
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(entering), 1)
end
end
end

-- 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 = QBX.Functions.GetPlate(cache.vehicle)
local plate = 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)
QBX.Functions.DrawText3D(Lang:t('info.search_keys'), vehiclePos)
DrawText3D(Lang:t('info.search_keys'), vehiclePos)
SetVehicleEngineOn(cache.vehicle, false, false, true)

if IsControlJustPressed(0, 74) then
Expand Down Expand Up @@ -144,7 +144,7 @@ end)

RegisterKeyMapping('engine', Lang:t("info.engine"), 'keyboard', 'G')
RegisterCommand('engine', function()
TriggerEvent("qb-vehiclekeys:client:ToggleEngine")
TriggerEvent("qbx_vehiclekeys:client:ToggleEngine")
end)

AddEventHandler('onResourceStart', function(resourceName)
Expand All @@ -163,26 +163,26 @@ RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()
KeysList = {}
end)

RegisterNetEvent('qb-vehiclekeys:client:AddKeys', function(plate)
RegisterNetEvent('qbx_vehiclekeys:client:AddKeys', function(plate)
KeysList[plate] = true

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

if plate == vehicleplate then
SetVehicleEngineOn(cache.vehicle, false, false, false)
end
end
end)

RegisterNetEvent('qb-vehiclekeys:client:RemoveKeys', function(plate)
RegisterNetEvent('qbx_vehiclekeys:client:RemoveKeys', function(plate)
KeysList[plate] = nil
end)

RegisterNetEvent('qb-vehiclekeys:client:ToggleEngine', function()
RegisterNetEvent('qbx_vehiclekeys:client:ToggleEngine', function()
local engineOn = GetIsVehicleEngineRunning(GetVehiclePedIsIn(cache.ped))
local vehicle = GetVehiclePedIsIn(cache.ped, true)
if HasKeys(QBX.Functions.GetPlate(vehicle)) then
if HasKeys(GetPlate(vehicle)) then
if engineOn then
SetVehicleEngineOn(vehicle, false, false, true)
else
Expand All @@ -191,26 +191,26 @@ RegisterNetEvent('qb-vehiclekeys:client:ToggleEngine', function()
end
end)

RegisterNetEvent('qb-vehiclekeys:client:GiveKeys', function(id)
RegisterNetEvent('qbx_vehiclekeys:client:GiveKeys', function(id)
local targetVehicle = GetVehicle()

if targetVehicle then
local targetPlate = QBX.Functions.GetPlate(targetVehicle)
local targetPlate = GetPlate(targetVehicle)
if HasKeys(targetPlate) then
if id and type(id) == "number" then -- Give keys to specific ID
GiveKeys(id, targetPlate)
else
if IsPedSittingInVehicle(cache.ped, targetVehicle) then -- Give keys to everyone in vehicle
local otherOccupants = GetOtherPlayersInVehicle(targetVehicle)
for p = 1, #otherOccupants do
TriggerServerEvent('qb-vehiclekeys:server:GiveVehicleKeys', GetPlayerServerId(NetworkGetPlayerIndexFromPed(otherOccupants[p])), targetPlate)
TriggerServerEvent('qbx_vehiclekeys:server:GiveVehicleKeys', GetPlayerServerId(NetworkGetPlayerIndexFromPed(otherOccupants[p])), targetPlate)
end
else -- Give keys to closest player
GiveKeys(GetPlayerServerId(GetClosestPlayer()), targetPlate)
end
end
else
QBX.Functions.Notify(Lang:t("notify.no_keys"), 'error')
exports.qbx_core:Notify(Lang:t("notify.no_keys"), 'error')
end
end
end)
Expand All @@ -221,7 +221,7 @@ end)

-- Backwards Compatibility ONLY -- Remove at some point --
RegisterNetEvent('vehiclekeys:client:SetOwner', function(plate)
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', plate)
end)
-- Backwards Compatibility ONLY -- Remove at some point --

Expand All @@ -232,14 +232,14 @@ end)
function GiveKeys(id, plate)
local distance = #(GetEntityCoords(cache.ped) - GetEntityCoords(GetPlayerPed(GetPlayerFromServerId(id))))
if distance < 1.5 and distance > 0.0 then
TriggerServerEvent('qb-vehiclekeys:server:GiveVehicleKeys', id, plate)
TriggerServerEvent('qbx_vehiclekeys:server:GiveVehicleKeys', id, plate)
else
QBX.Functions.Notify(Lang:t("notify.not_near"), 'error')
exports.qbx_core:Notify(Lang:t("notify.not_near"), 'error')
end
end

function GetKeys()
lib.callback('qbx-vehiclekeys:server:getVehicleKeys', function(keysList)
lib.callback('qbx_vehiclekeys:server:getVehicleKeys', function(keysList)
KeysList = keysList
end)
end
Expand Down Expand Up @@ -287,7 +287,7 @@ function AreKeysJobShared(veh)
for _, vehicle in pairs(v.vehicles) do
if string.upper(vehicle) == string.upper(vehName) then
if not HasKeys(vehPlate) then
TriggerServerEvent("qb-vehiclekeys:server:AcquireVehicleKeys", vehPlate)
TriggerServerEvent("qbx_vehiclekeys:server:AcquireVehicleKeys", vehPlate)
end
return true
end
Expand All @@ -300,7 +300,7 @@ end
function ToggleVehicleLocks(veh)
if veh then
if not isBlacklistedVehicle(veh) then
if HasKeys(QBX.Functions.GetPlate(veh)) or AreKeysJobShared(veh) then
if HasKeys(GetPlate(veh)) or AreKeysJobShared(veh) then
local vehLockStatus = GetVehicleDoorLockStatus(veh)

lib.requestAnimDict('anim@mp_player_intmenu@key_fob@')
Expand All @@ -309,11 +309,11 @@ function ToggleVehicleLocks(veh)
TriggerServerEvent("InteractSound_SV:PlayWithinDistance", 5, "lock", 0.3)
NetworkRequestControlOfEntity(veh)
if vehLockStatus == 1 then
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 2)
QBX.Functions.Notify(Lang:t("notify.vehicle_locked"), 'inform')
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 2)
exports.qbx_core:Notify(Lang:t("notify.vehicle_locked"), 'inform')
else
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 1)
QBX.Functions.Notify(Lang:t("notify.vehicle_unlocked"), 'inform')
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(veh), 1)
exports.qbx_core:Notify(Lang:t("notify.vehicle_unlocked"), 'inform')
end

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

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

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

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

function LockpickFinishCallback(success)
local vehicle = QBX.Functions.GetClosestVehicle()
local vehicle = exports.qbx_core: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', QBX.Functions.GetPlate(vehicle))
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', GetPlate(vehicle))
else
QBX.Functions.Notify(Lang:t("notify.vehicle_lockedpick"), 'success')
TriggerServerEvent('qb-vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(vehicle), 1)
exports.qbx_core:Notify(Lang:t("notify.vehicle_lockedpick"), 'success')
TriggerServerEvent('qbx_vehiclekeys:server:setVehLockState', NetworkGetNetworkIdFromEntity(vehicle), 1)
end

else
Expand All @@ -410,11 +410,11 @@ function LockpickFinishCallback(success)

if usingAdvanced then
if chance <= Config.RemoveLockpickAdvanced then
TriggerServerEvent("qb-vehiclekeys:server:breakLockpick", "advancedlockpick")
TriggerServerEvent("qbx_vehiclekeys:server:breakLockpick", "advancedlockpick")
end
else
if chance <= Config.RemoveLockpickNormal then
TriggerServerEvent("qb-vehiclekeys:server:breakLockpick", "lockpick")
TriggerServerEvent("qbx_vehiclekeys:server:breakLockpick", "lockpick")
end
end
end
Expand Down Expand Up @@ -443,10 +443,10 @@ function Hotwire(vehicle, plate)
}) then
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)
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', plate)
else
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
QBX.Functions.Notify(Lang:t("notify.failed_lockedpick"), 'error')
exports.qbx_core: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 = QBX.Functions.GetPlate(vehicle)
local plate = GetPlate(vehicle)
for p=1,#occupants do
local ped = occupants[p]
CreateThread(function()
Expand All @@ -518,9 +518,9 @@ function CarjackVehicle(target)
end)
end
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
TriggerServerEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', plate)
else
QBX.Functions.Notify(Lang:t("notify.carjack_failed"), 'error')
exports.qbx_core:Notify(Lang:t("notify.carjack_failed"), 'error')
MakePedFlee(target)
TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
end
Expand Down Expand Up @@ -557,4 +557,4 @@ end
function MakePedFlee(ped)
SetPedFleeAttributes(ped, 0, 0)
TaskReactAndFleePed(ped, cache.ped)
end
end
3 changes: 1 addition & 2 deletions fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ client_script 'client/main.lua'
server_script 'server/main.lua'

modules {
'qbx_core:core',
'qbx_core:playerdata',
'qbx_core:utils'
}
}
26 changes: 13 additions & 13 deletions server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local vehicleList = {}

-- Event to give keys. receiver can either be a single id, or a table of ids.
-- Must already have keys to the vehicle, trigger the event from the server, or pass forcegive paramter as true.
RegisterNetEvent('qb-vehiclekeys:server:GiveVehicleKeys', function(receiver, plate)
RegisterNetEvent('qbx_vehiclekeys:server:GiveVehicleKeys', function(receiver, plate)
local giver = source

if HasKeys(giver, plate) then
Expand All @@ -30,26 +30,26 @@ RegisterNetEvent('qb-vehiclekeys:server:GiveVehicleKeys', function(receiver, pla
end
end)

RegisterNetEvent('qb-vehiclekeys:server:AcquireVehicleKeys', function(plate)
RegisterNetEvent('qbx_vehiclekeys:server:AcquireVehicleKeys', function(plate)
local src = source
GiveKeys(src, plate)
end)

RegisterNetEvent('qb-vehiclekeys:server:breakLockpick', function(itemName)
local player = QBX.Functions.GetPlayer(source)
RegisterNetEvent('qbx_vehiclekeys:server:breakLockpick', function(itemName)
local player = exports.qbx_core: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, QBX.Shared.Items[itemName], "remove")
end
end)

RegisterNetEvent('qb-vehiclekeys:server:setVehLockState', function(vehNetId, state)
RegisterNetEvent('qbx_vehiclekeys:server:setVehLockState', function(vehNetId, state)
SetVehicleDoorsLocked(NetworkGetEntityFromNetworkId(vehNetId), state)
end)

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

if not vehicleList[plate] then vehicleList[plate] = {} end
vehicleList[plate][citizenid] = true

TriggerClientEvent('QBCore:Notify', id, Lang:t('notify.keys_taken'))
TriggerClientEvent('qb-vehiclekeys:client:AddKeys', id, plate)
TriggerClientEvent('qbx_vehiclekeys:client:AddKeys', id, plate)
end

function RemoveKeys(id, plate)
local citizenid = QBX.Functions.GetPlayer(id).PlayerData.citizenid
local citizenid = exports.qbx_core:GetPlayer(id).PlayerData.citizenid

if vehicleList[plate] and vehicleList[plate][citizenid] then
vehicleList[plate][citizenid] = nil
end

TriggerClientEvent('qb-vehiclekeys:client:RemoveKeys', id, plate)
TriggerClientEvent('qbx_vehiclekeys:client:RemoveKeys', id, plate)
end

function HasKeys(id, plate)
local citizenid = QBX.Functions.GetPlayer(id).PlayerData.citizenid
local citizenid = exports.qbx_core:GetPlayer(id).PlayerData.citizenid
if vehicleList[plate] and vehicleList[plate][citizenid] then
return true
end
Expand All @@ -103,7 +103,7 @@ lib.addCommand('givekeys', {
restricted = false,
}, function (source, args)
local src = source
TriggerClientEvent('qb-vehiclekeys:client:GiveKeys', src, args.id)
TriggerClientEvent('qbx_vehiclekeys:client:GiveKeys', src, args.id)
end)

lib.addCommand('addkeys', {
Expand Down