Update v4.1.5

* Added Support for okokGarage's VehicleKeys

Author: Musiker15

VERSION

@@ -1 +1 @@
-4.1.4
+4.1.5

client/client.lua

@@ -41,7 +41,7 @@ toggleEngine = function(bypass)
 	end
 
 	if not bypass then
-		canToggleEngine = getIsVehicleOrKeyOwner(vehicle)
+		canToggleEngine = getIsKeyOwner(vehicle)
 	end
 
 	if not canToggleEngine then 
@@ -178,7 +178,7 @@ CreateThread(function()
 end)
 
 SetEngineState = function(vehicle, state, engine)
-	if not DoesEntityExist(vehicle) then return end
+	assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function SetEngineState')
 	logging('SetEngineState', vehicle, state)
 
 	currentVehicle.isEngineOn = state
@@ -195,7 +195,7 @@ RegisterNetEvent('msk_enginetoggle:setEngineState', SetEngineState) -- Do not us
 
 GetEngineState = function(vehicle)
 	if not vehicle then vehicle = GetVehiclePedIsIn(PlayerPedId()) end
-	if not DoesEntityExist(vehicle) then return end
+	assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function GetEngineState')
 
 	if Entity(vehicle).state.isEngineOn == nil then
 		SetEngineState(vehicle, GetIsVehicleEngineRunning(vehicle), false)
@@ -206,7 +206,7 @@ exports('GetEngineState', GetEngineState)
 exports('getEngineState', GetEngineState) -- Support for old versions
 
 SetVehicleDamaged = function(vehicle, state)
-	if not DoesEntityExist(vehicle) then return end
+	assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function SetVehicleDamaged')
 	logging('SetVehicleDamaged', vehicle, state)
 
 	currentVehicle.isDamaged = state
@@ -229,7 +229,7 @@ RegisterNetEvent('msk_enginetoggle:setVehicleDamaged', SetVehicleDamaged)
 
 GetVehicleDamaged = function(vehicle)
 	if not vehicle then vehicle = GetVehiclePedIsIn(PlayerPedId()) end
-	if not DoesEntityExist(vehicle) then return end
+	assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function GetVehicleDamaged')
 
 	if Entity(vehicle).state.isDamaged == nil then
 		SetVehicleDamaged(vehicle, false)
@@ -242,7 +242,7 @@ exports('getVehicleDamaged', GetVehicleDamaged) -- Support for old versions
 GetPedVehicleSeat = function(playerPed, vehicle)
 	if not playerPed then playerPed = PlayerPedId() end
 	if not vehicle then vehicle = GetVehiclePedIsIn(playerPed) end
-	if not DoesEntityExist(vehicle) then return end
+	assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function GetPedVehicleSeat')
 
     for i = -1, 16 do
         if (GetPedInVehicleSeat(vehicle, i) == playerPed) then 

client/client_hotwire.lua

@@ -1,7 +1,5 @@
 if Config.EnableLockpick and Config.LockpickHotkey.enable then
 	RegisterCommand(Config.LockpickHotkey.command, function(source, args, rawCommand)
-		TriggerServerEvent('msk_enginetoggle:hasItem')
-
         if Config.Framework == 'ESX' then
             ESX = exports["es_extended"]:getSharedObject()
 

client/client_vehiclekeys.lua

@@ -1,40 +1,88 @@
-getIsVehicleOrKeyOwner = function(vehicle)
+trim = function(str)
+    return tostring(str):gsub("%s+", "")
+end
+
+getKeyFromInventory = function(plate)
+    if Config.VehicleKeys.inventory == 'ox_inventory' then
+        local inventory = exports.ox_inventory:GetPlayerItems()
+
+        for k, v in pairs(inventory) do
+            if v.name == Config.VehicleKeys.item and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
+                return true
+            end
+        end
+    elseif Config.VehicleKeys.inventory == 'qs-inventory' then
+        local inventory = exports['qs-inventory']:getUserInventory()
+
+        for k, v in pairs(inventory) do
+            if v.name == Config.VehicleKeys.item and trim(v.info[Config.VehicleKeys.plate]) == trim(plate) then
+                return true
+            end
+        end
+    elseif Config.VehicleKeys.inventory == 'core_inventory' then
+        local p = promise.new()
+
+        if Config.Framework == 'ESX' then
+            ESX.TriggerServerCallback('core_inventory:server:getInventory', function(inventory)
+                p:resolve(inventory)
+            end)
+        elseif Config.Framework == 'QBCore' then
+            QBCore.Functions.TriggerCallback('core_inventory:server:getInventory', function(inventory)
+                p:resolve(inventory)
+            end)
+        elseif Config.Framework == 'Standalone' then
+            -- Add your own code here
+        end
+
+        local inventory = Citizen.Await(p)
+
+        for k, v in pairs(inventory) do
+            if v.name == Config.VehicleKeys.item and trim(v.metadata[Config.VehicleKeys.plate]) == trim(plate) then
+                return true
+            end
+        end
+    else
+        -- Add your own code here
+    end
+
+    return false
+end
+exports('getKeyFromInventory', getKeyFromInventory)
+
+getIsKeyOwner = function(vehicle)
     if not Config.VehicleKeys.enable then return true end
-    local isVehicleOrKeyOwner, isVehicle, isPlate = false, false, false
+    local isKeyOwner, ignoreVehicle, ignorePlate = false, false, false
+    local plate = GetVehicleNumberPlateText(vehicle)
     local canToggleEngine = true
 
     if Config.VehicleKeys.script == 'VehicleKeyChain' and (GetResourceState("VehicleKeyChain") == "started") then
-        isVehicleOrKeyOwner = exports["VehicleKeyChain"]:IsVehicleOrKeyOwner(vehicle)
+        isKeyOwner = exports["VehicleKeyChain"]:IsVehicleOrKeyOwner(vehicle)
     elseif Config.VehicleKeys.script == 'vehicle_keys' and (GetResourceState("vehicle_keys") == "started") then
-        isVehicleOrKeyOwner = exports["vehicle_keys"]:doesPlayerOwnPlate(GetVehicleNumberPlateText(vehicle))
+        isKeyOwner = exports["vehicle_keys"]:doesPlayerOwnPlate(plate)
+    elseif Config.VehicleKeys.script == 'okokGarage' and (GetResourceState("okokGarage") == "started") then
+        isKeyOwner = getKeyFromInventory(plate)
     else
-        if (GetResourceState(Config.VehicleKeys.script) == "started") then
-            -- Add your own code here
-            isVehicleOrKeyOwner = true
-        end
+        -- Add your own code here
     end
 
     for k, v in pairs(Config.Whitelist.vehicles) do 
         if GetHashKey(v) == GetEntityModel(vehicle) then
-            isVehicle = true
+            ignoreVehicle = true
             break
         end
     end
 
     for k, v in pairs(Config.Whitelist.plates) do 
-        if string.find(trim(tostring(GetVehicleNumberPlateText(vehicle))), v) then 
-            isPlate = true
+        if string.find(trim(plate), trim(v)) then 
+            ignorePlate = true
             break
         end
     end
 
-    if not isVehicleOrKeyOwner and not isVehicle and not isPlate then
+    if not isKeyOwner and not ignoreVehicle and not ignorePlate then
         canToggleEngine = false
     end
 
     return canToggleEngine
 end
-
-trim = function(str)
-	return string.gsub(str, "%s+", "")
-end
+exports('getIsKeyOwner', getIsKeyOwner)

config.lua

@@ -46,7 +46,15 @@ Config.EngineFromSecondSeat = false
 
 Config.VehicleKeys = {
     enable = false, -- Set true to enable this feature
-    script = 'VehicleKeyChain' -- Set to 'VehicleKeyChain' or 'vehicle_keys'
+
+    -- Supported Scripts: 'VehicleKeyChain', 'vehicle_keys', 'okokGarage'
+    script = 'VehicleKeyChain',
+
+    -- This is for inventories with metadata like ox_inventory
+    -- Supported Inventories: ox_inventory, qs-inventory, core_inventory
+    inventory = 'ox_inventory',
+    item = 'keys',
+    plate = 'plate' -- Key Name for plate in your inventory for your vehicle keys script
 }
 ----------------------------------------------------------------
 Config.SaveSteeringAngle = true

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_enginetoggle'
 description 'EngineToggle for Vehicles'
-version '4.1.4'
+version '4.1.5'
 
 lua54 'yes'
 

server/server.lua

@@ -39,6 +39,10 @@ RegisterNetEvent('msk_enginetoggle:addTempKey', function(plate)
 		exports["VehicleKeyChain"]:AddTempKey(playerId, plate)
 	elseif Config.VehicleKeys.script == 'vehicle_keys' then
 		exports["vehicle_keys"]:giveVehicleKeysToPlayerId(playerId, plate, 'temporary')
+	elseif Config.VehicleKeys.script == 'okokGarage' then
+		TriggerEvent("okokGarage:GiveKeys", plate, playerId)
+	else
+		-- Add your own code here
 	end
 
 	Config.Notification(source, Translation[Config.Locale]['hotwiring_foundkey'], 'info')