Update v2.6.7

Author: Musiker15

client/functions/disconnectlogger.lua

@@ -35,11 +35,8 @@ local display = function(data)
     CreateThread(function()
         while showDisplay do
             local sleep = 500
-
-            local playerPed = PlayerPedId()
-            local playerCoords = GetEntityCoords(playerPed)
-            local dist = #(data.coords - playerCoords)
-
+            
+            local dist = #(data.coords - MSK.Player.coords)
             local coordsUsed = vec3(data.coords.x, data.coords.y, data.coords.z + 0.2)
 
             if dist <= 20.0 then

client/functions/entities.lua

@@ -5,7 +5,7 @@ GetEntities = function(isPlayerEntity)
         for _, player in ipairs(GetActivePlayers()) do
             local ped = GetPlayerPed(player)
 
-            if DoesEntityExist(ped) and ped ~= PlayerPedId() then
+            if DoesEntityExist(ped) and ped ~= MSK.Player.ped then
                 entities[player] = ped
             end
         end
@@ -23,7 +23,7 @@ GetClosestEntity = function(isPlayerEntity, coords)
     if coords then
         coords = vector3(coords.x, coords.y, coords.z)
     else
-        coords = GetEntityCoords(PlayerPedId())
+        coords = MSK.Player.coords
     end
 
     for k, entity in pairs(entites) do
@@ -44,7 +44,7 @@ GetClosestEntities = function(isPlayerEntity, coords, distance)
     if coords then
         coords = vector3(coords.x, coords.y, coords.z)
     else
-        coords = GetEntityCoords(PlayerPedId())
+        coords = MSK.Player.coords
     end
 
     for k, entity in pairs(entites) do
@@ -59,14 +59,14 @@ GetClosestEntities = function(isPlayerEntity, coords, distance)
 end
 
 PlayerDied = function(deathCause, killer, killerServerId)
-    local playerPed = PlayerPedId()
-	local playerCoords = GetEntityCoords(playerPed)
+    local playerPed = MSK.Player.ped
+	local playerCoords = MSK.Player.coords
 
     local data = {
         killedByPlayer = false,
         victim = playerPed,
         victimCoords = playerCoords,
-        victimServerId = GetPlayerServerId(PlayerId())
+        victimServerId = MSK.Player.serverId
     }
 
     if killer and killerServerId then
@@ -93,7 +93,7 @@ AddEventHandler('gameEventTriggered', function(event, data)
             local playerPed = entity
             local playerDied = data[4]
 
-            if playerDied and NetworkGetPlayerIndexFromPed(playerPed) == PlayerId() and (IsPedDeadOrDying(playerPed, true) or IsPedFatallyInjured(playerPed)) then
+            if playerDied and NetworkGetPlayerIndexFromPed(playerPed) == MSK.Player.clientId and (IsPedDeadOrDying(playerPed, true) or IsPedFatallyInjured(playerPed)) then
                 local deathCause, killerEntity = GetPedCauseOfDeath(playerPed), GetPedSourceOfDeath(playerPed)
                 local killer = NetworkGetPlayerIndexFromPed(killerEntity)
 

client/functions/main.lua

@@ -166,7 +166,7 @@ MSK.IsSpawnPointClear = function(coords, maxDistance)
     if coords then
         coords = vector3(coords.x, coords.y, coords.z)
     else
-        coords = GetEntityCoords(PlayerPedId())
+        coords = MSK.Player.coords
     end
 
     for k, vehicle in pairs(GetGamePool('CVehicle')) do

client/functions/player.lua

@@ -11,16 +11,6 @@ function Player:set(key, value)
     end
 end
 
-function Player:remove(key)
-    if self[key] then
-        TriggerEvent('msk_core:onPlayerRemove', key, self[key])
-        TriggerServerEvent('msk_core:onPlayerRemove', key, self[key])
-        self[key] = nil
-
-        return true
-    end
-end
-
 Player:set('clientId', PlayerId())
 Player:set('serverId', GetPlayerServerId(Player.clientId))
 Player:set('playerId', Player.serverId)
@@ -47,7 +37,7 @@ local GetPlayerDeath = function()
 end
 
 setmetatable(Player, {
-    __index = function(self, key)
+    __index = function(self, key, ...)
         if key == 'coords' then
             return GetEntityCoords(self.ped)
         elseif key == 'heading' then

client/functions/points.lua

@@ -3,10 +3,14 @@ local RegisteredPoints = {}
 local closestPoint
 
 local RemovePoint = function(self)
-    if closestPoint.id and closestPoint.id == self.id then
+    if closestPoint and closestPoint.id and closestPoint.id == self.id then
         closestPoint = nil
     end
 
+    if self.onRemove then
+        self.onRemove(self)
+    end
+
     RegisteredPoints[self.id] = nil
 end
 
@@ -93,13 +97,32 @@ Points.Add = function(properties)
 
     return self
 end
+exports('AddPoint', Points.Add)
+
+Points.Remove = function(pointId)
+    if not RegisteredPoints[pointId] then return false end
+    RegisteredPoints[pointId].Remove()
+    return true
+end
+exports('RemovePoint', Points.Remove)
+
+Points.RemoveAllPoints = function()
+    for k, point in pairs(RegisteredPoints) do
+        point.Remove()
+    end
+
+    RegisteredPoints = {}
+end
+exports('RemoveAllPoints', Points.RemoveAllPoints)
 
 Points.GetAllPoints = function()
     return RegisteredPoints
 end
+exports('GetAllPoints', Points.GetAllPoints)
 
 Points.GetClosestPoint = function()
     return closestPoint
 end
+exports('GetClosestPoint', Points.GetClosestPoint)
 
 MSK.Points = Points

client/functions/progressbar.lua

@@ -19,11 +19,11 @@ local Controls = {
 }
 
 local interrupted = function(data)
-    if not data.useWhileDead and IsEntityDead(MSK.Player.playerPed) then return true end
-    if not data.useWhileRagdoll and IsPedRagdoll(MSK.Player.playerPed) then return true end
-    if not data.useWhileCuffed and IsPedCuffed(MSK.Player.playerPed) then return true end
-    if not data.useWhileFalling and IsPedFalling(MSK.Player.playerPed) then return true end
-    if not data.useWhileSwimming and IsPedSwimming(MSK.Player.playerPed) then return true end
+    if not data.useWhileDead and IsEntityDead(MSK.Player.ped) then return true end
+    if not data.useWhileRagdoll and IsPedRagdoll(MSK.Player.ped) then return true end
+    if not data.useWhileCuffed and IsPedCuffed(MSK.Player.ped) then return true end
+    if not data.useWhileFalling and IsPedFalling(MSK.Player.ped) then return true end
+    if not data.useWhileSwimming and IsPedSwimming(MSK.Player.ped) then return true end
 end
 
 local setProgressData = function(data)
@@ -33,10 +33,10 @@ local setProgressData = function(data)
     if anim then
         if anim.dict then
             MSK.Request.AnimDict(anim.dict)
-            TaskPlayAnim(MSK.Player.playerPed, anim.dict, anim.anim, anim.blendIn or 3.0, anim.blendOut or 1.0, anim.duration or -1, anim.flag or 49, anim.playbackRate or 0, anim.lockX, anim.lockY, anim.lockZ)
+            TaskPlayAnim(MSK.Player.ped, anim.dict, anim.anim, anim.blendIn or 3.0, anim.blendOut or 1.0, anim.duration or -1, anim.flag or 49, anim.playbackRate or 0, anim.lockX, anim.lockY, anim.lockZ)
             RemoveAnimDict(anim.dict)
         elseif anim.scenario then
-            TaskStartScenarioInPlace(MSK.Player.playerPed, anim.scenario, 0, anim.playEnter ~= nil and anim.playEnter or true)
+            TaskStartScenarioInPlace(MSK.Player.ped, anim.scenario, 0, anim.playEnter ~= nil and anim.playEnter or true)
         end
     end
 
@@ -84,10 +84,10 @@ local setProgressData = function(data)
 
     if anim then
         if anim.dict then
-            StopAnimTask(MSK.Player.playerPed, anim.dict, anim.clip, 1.0)
-            ClearPedTasks(MSK.Player.playerPed)
+            StopAnimTask(MSK.Player.ped, anim.dict, anim.clip, 1.0)
+            ClearPedTasks(MSK.Player.ped)
         else
-            ClearPedTasks(MSK.Player.playerPed)
+            ClearPedTasks(MSK.Player.ped)
         end
     end
 end

client/functions/request.lua

@@ -23,12 +23,6 @@ MSK.Request.ScaleformMovie = function(scaleformName, timeout)
 end
 exports('RequestScaleformMovie', MSK.Request.ScaleformMovie)
 
-setmetatable(MSK.Request, {
-    __call = function(_, request, hasLoaded, assetType, asset, timeout, ...)
-        return MSK.Request.Streaming(request, hasLoaded, assetType, asset, timeout, ...)
-    end
-})
-
 MSK.Request.AnimDict = function(animDict)
     assert(animDict and type(animDict) == 'string', ("Parameter 'animDict' has to be a 'string' (reveived %s)"):format(type(animDict)))
     assert(DoesAnimDictExist(animDict), ("attempted to load invalid animDict '%s'"):format(animDict))
@@ -78,4 +72,37 @@ MSK.Request.TextureDict = function(textureDict)
 
     return MSK.Request(RequestStreamedTextureDict, HasStreamedTextureDictLoaded, 'textureDict', textureDict)
 end
-exports('RequestTextureDict', MSK.Request.TextureDict)
+exports('RequestTextureDict', MSK.Request.TextureDict)
+
+MSK.Request.Raycast = function(distance, flag)
+    local flags = {
+        none = 0,
+        all = -1,
+        world = 1,
+        vehicle = 2,
+        ped = 4,
+        object = 16,
+        water = 32,
+        glass = 64,
+        river = 128,
+        foliage = 256,
+    }
+
+    if type(flag) ~= 'number' then
+        flag = flags[flag] or -1
+    end
+
+    local destination = GetOffsetFromEntityInWorldCoords(MSK.Player.ped, 0.0, distance or 5.0, 0.0)
+    local handle = StartShapeTestCapsule(MSK.Player.coords, destination, distance or 5.0, flag or -1, MSK.Player.ped, 4)
+
+    local entity = MSK.Timeout.Await(1000, function()
+        local retval, hit, endCoords, surfaceNormal, entityHit = GetShapeTestResult(handle)
+
+        if retval ~= 1 and hit then
+            return entityHit ~= 0 and entityHit
+        end
+    end, ("Function 'MSK.Request.Raycast' timed out after 1s - no result received from GetShapeTestResult (%s) on function MSK.Request.Raycast"):format(handle))
+
+    return entity
+end
+exports('RequestRaycast', MSK.Request.Raycast)

client/functions/showCoords.lua

@@ -48,9 +48,9 @@ end
 startShowCoordsThread = function()
 	while showCoords do
 		local sleep = 1
-		local playerPed = PlayerPedId()
-		local playerX, playerY, playerZ = table.unpack(GetEntityCoords(playerPed))
-		local playerH = GetEntityHeading(playerPed)
+		
+		local playerX, playerY, playerZ = table.unpack(MSK.Player.coords)
+		local playerH = MSK.Player.heading
 
 		DrawGenericText(("~g~X~w~ = ~r~%s ~g~Y~w~ = ~r~%s ~g~Z~w~ = ~r~%s ~g~H~w~ = ~r~%s~s~"):format(MSK.Math.Round(playerX, 2), MSK.Math.Round(playerY, 2), MSK.Math.Round(playerZ, 2), MSK.Math.Round(playerH, 2)))
 

client/functions/vehicle.lua

@@ -24,22 +24,11 @@ end
 exports('GetVehicleWithPlate', MSK.GetVehicleWithPlate)
 
 MSK.GetVehicleInDirection = function(distance)
-    local playerPed = PlayerPedId()
-    local playerCoords = GetEntityCoords(playerPed)
-    local destination = GetOffsetFromEntityInWorldCoords(playerPed, 0.0, distance or 5.0, 0.0)
-    local handle = StartShapeTestCapsule(playerCoords, destination, distance or 5.0, 2, playerPed, 4)
-
-    local entity = MSK.Timeout.Await(1000, function()
-        local retval, hit, endCoords, surfaceNormal, entityHit = GetShapeTestResult(handle)
-
-        if retval ~= 1 and hit then
-            return entityHit ~= 0 and entityHit
-        end
-    end, "No result received from GetShapeTestResult on function GetVehicleInFront")
+    local entity = MSK.Request.Raycast(distance, 2)
 
     if DoesEntityExist(entity) then
         local entityCoords = GetEntityCoords(entity)
-        return entity, entityCoords, ('%.2f'):format(#(playerCoords - entityCoords))
+        return entity, entityCoords, ('%.2f'):format(#(MSK.Player.coords - entityCoords))
     end
 
     return entity
@@ -48,8 +37,10 @@ MSK.GetVehicleInFront = MSK.GetVehicleInDirection
 exports('GetVehicleInDirection', MSK.GetVehicleInDirection)
 
 MSK.GetPedVehicleSeat = function(playerPed, vehicle)
-    if not playerPed then playerPed = PlayerPedId() end
-    if not vehicle then GetVehiclePedIsIn(playerPed, false) end
+    if not playerPed then playerPed = MSK.Player.ped end
+    if not vehicle then vehicle = MSK.Player.vehicle end
+
+    if not DoesEntityExist(vehicle) then return false end
 
     for i = -1, 16 do
         if GetPedInVehicleSeat(vehicle, i) == playerPed then 
@@ -85,7 +76,7 @@ MSK.GetVehicleLabel = function(vehicle, model)
         vehicleModel = GetEntityModel(vehicle)
     end
 
-    if model then
+    if model and not vehicleModel then
         if not IsModelValid(model) then
             return 'Unknown', error(('The Model does not exist on function MSK.GetVehicleLabel (reveived %s)'):format(model))
         end
@@ -132,9 +123,9 @@ local isInVehicle, isEnteringVehicle = false, false
 CreateThread(function()
 	while true do
 		local sleep = 200
-		local playerPed = PlayerPedId()
+		local playerPed = MSK.Player.ped
 
-		if not isInVehicle and not IsPlayerDead(PlayerId()) then
+		if not isInVehicle and not IsPlayerDead(MSK.Player.clientId) then
 			if DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not isEnteringVehicle then
 				local vehicle = GetVehiclePedIsTryingToEnter(playerPed)
                 local plate = GetVehicleNumberPlateText(vehicle)
@@ -162,7 +153,7 @@ CreateThread(function()
                 TriggerServerEvent('msk_core:enteredVehicle', currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)
 			end
 		elseif isInVehicle then
-			if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then
+			if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(MSK.Player.clientId) then
 				isInVehicle = false
 				TriggerEvent('msk_core:exitedVehicle', currentVehicle.vehicle, currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)
                 TriggerServerEvent('msk_core:exitedVehicle', currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Functions for MSK Scripts'
-version '2.6.6'
+version '2.6.7'
 
 lua54 'yes'
 

import.lua

@@ -26,7 +26,7 @@ local context = IsDuplicityVersion() and 'server' or 'client'
 MSK = exports.msk_core:GetLib()
 
 ----------------------------------------------------------------
--- Support for old Scripts
+-- Quick function access
 ----------------------------------------------------------------
 -- MSK.Input(header, placeholder, field, cb)
 setmetatable(MSK.Input, {
@@ -49,6 +49,15 @@ setmetatable(MSK.Progress, {
     end
 })
 
+if context == 'server' then
+    -- MSK.Check(repo)
+    setmetatable(MSK.Check, {
+        __call = function(self, ...)
+            self.Version(...)
+        end
+    })
+end
+
 ----------------------------------------------------------------
 -- MSK.Player
 ----------------------------------------------------------------
@@ -68,10 +77,6 @@ if context == 'client' then
     AddEventHandler('msk_core:onPlayer', function(key, value, oldValue)
         MSK.Player[key] = value
     end)
-
-    AddEventHandler('msk_core:onPlayerRemove', function(key, value)
-        MSK.Player[key] = nil
-    end)
 end
 
 if context == 'server' then
@@ -105,11 +110,6 @@ if context == 'server' then
         MSK.Player[playerId][key] = value
     end)
 
-    AddEventHandler('msk_core:OnPlayerRemove', function(playerId, key, value)
-        if not MSK.Player[playerId] then return end
-        MSK.Player[playerId][key] = nil
-    end)
-
     for playerId, data in pairs(MSK.Player) do
         if not getmetatable(MSK.Player[playerId]) then
             setmetatable(MSK.Player[playerId], playerMeta)