Skip to content

Commit 86df48f

Browse files
Musiker15Musiker15
committed
Update v2.5.0
1 parent afb7c5e commit 86df48f

File tree

11 files changed

+229
-84
lines changed

11 files changed

+229
-84
lines changed

‎client/functions/input.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ MSK.OpenInput = MSK.Input.Open
3232
exports('Input', MSK.Input.Open)
3333
exports('openInput', MSK.Input.Open) -- Support for old Scripts
3434

35+
setmetatable(MSK.Input, {
36+
__call = function(self, header, placeholder, field, cb)
37+
self.Open(header, placeholder, field, cb)
38+
end
39+
})
40+
3541
MSK.Input.Close = function()
3642
isInputOpen = false
3743
callback = nil

‎client/functions/numpad.lua

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MSK.Numpad = {}
33
local isNumpadOpen = false
44
local callback = nil
55

6-
MSK.Numpad.Open = function(pin, show, cb)
6+
MSK.Numpad.Open = function(pin, showPin, cb)
77
if isNumpadOpen then return end
88
isNumpadOpen = true
99
callback = cb
@@ -13,7 +13,7 @@ MSK.Numpad.Open = function(pin, show, cb)
1313
action = 'openNumpad',
1414
code = tostring(pin),
1515
length = string.len(tostring(pin)),
16-
show = show,
16+
show = showPin,
1717
EnterCode = 'Enter Code',
1818
WrongCode = 'Incorrect',
1919
})
@@ -32,6 +32,12 @@ end
3232
MSK.OpenNumpad = MSK.Numpad.Open
3333
exports('Numpad', MSK.Numpad.Open)
3434

35+
setmetatable(MSK.Numpad, {
36+
__call = function(self, pin, showPin, cb)
37+
self.Open(pin, showPin, cb)
38+
end
39+
})
40+
3541
MSK.Numpad.Close = function()
3642
isNumpadOpen = false
3743
callback = nil
@@ -44,8 +50,8 @@ MSK.CloseNumpad = MSK.Numpad.Close
4450
exports('CloseNumpad', MSK.Numpad.Close)
4551
RegisterNetEvent('msk_core:closeNumpad', MSK.Numpad.Close)
4652

47-
MSK.Register('msk_core:numpad', function(source, pin, show)
48-
return MSK.Numpad.Open(pin, show)
53+
MSK.Register('msk_core:numpad', function(source, pin, showPin)
54+
return MSK.Numpad.Open(pin, showPin)
4955
end)
5056

5157
MSK.Numpad.Active = function()

‎client/functions/player.lua

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
local Player = {}
2+
3+
Player.clientId = PlayerId()
4+
Player.serverId = GetPlayerServerId(Player.clientId)
5+
Player.playerId = Player.serverId
6+
7+
MSK.Player = Player
8+
9+
function Player:set(key, value)
10+
if self[key] ~= value then
11+
TriggerEvent('msk_core:onPlayer', key, value, self[key])
12+
self[key] = value
13+
14+
return true
15+
end
16+
end
17+
18+
CreateThread(function()
19+
while true do
20+
Player:set('clientId', PlayerId())
21+
Player:set('serverId', GetPlayerServerId(Player.clientId))
22+
Player:set('playerId', Player.serverId)
23+
24+
local playerPed = PlayerPedId()
25+
Player:set('playerPed', playerPed)
26+
27+
local vehicle = GetVehiclePedIsIn(playerPed, false)
28+
29+
if vehicle > 0 and DoesEntityExist(vehicle) then
30+
Player:set('vehicle', vehicle)
31+
32+
if not Player.seat or GetPedInVehicleSeat(vehicle, Player.seat) ~= playerPed then
33+
Player:set('seat', MSK.GetPedVehicleSeat(playerPed, vehicle))
34+
TriggerEvent('msk_core:onSeatChange', Player.vehicle, Player.seat)
35+
end
36+
else
37+
Player:set('vehicle', false)
38+
Player:set('seat', false)
39+
end
40+
41+
local hasWeapon, currentWeapon = GetCurrentPedWeapon(playerPed, true)
42+
Player:set('weapon', hasWeapon and currentWeapon or false)
43+
44+
Wait(100)
45+
end
46+
end)

‎client/functions/progressbar.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,14 @@ MSK.Progress.Start = function(data, text, color)
120120
end
121121
MSK.Progressbar = MSK.Progress.Start -- Support for old Scripts
122122
exports('Progressbar', MSK.Progress.Start)
123-
exports('ProgressbarStart', MSK.Progress.Start) -- Support for old Scripts
124123
RegisterNetEvent("msk_core:progressbar", MSK.Progress.Start)
125124

125+
setmetatable(MSK.Progress, {
126+
__call = function(self, data, text, color)
127+
self.Start(data, text, color)
128+
end
129+
})
130+
126131
MSK.Progress.Stop = function()
127132
if not isProgressActive then return end
128133

‎client/main.lua

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ elseif MSK.Bridge.Framework.Type == 'QBCore' then
8181
end)
8282
end
8383

84-
GetLib = function()
85-
return MSK
86-
end
87-
exports('GetLib', GetLib)
88-
exports('getCoreObject', GetLib) -- Support for old Versions
89-
9084
if Config.BanSystem.enable and Config.BanSystem.commands.enable then
9185
CreateThread(function()
9286
TriggerEvent('chat:addSuggestion', '/' .. Config.BanSystem.commands.ban, 'Ban a Player', {
@@ -101,39 +95,8 @@ if Config.BanSystem.enable and Config.BanSystem.commands.enable then
10195
end)
10296
end
10397

104-
MSK.Player = {}
105-
MSK.Player.clientId = PlayerId()
106-
MSK.Player.playerId = GetPlayerServerId(MSK.Player.clientId)
107-
MSK.Player.serverId = MSK.Player.playerId
108-
109-
CreateThread(function()
110-
while true do
111-
local sleep = 100
112-
113-
MSK.Player.clientId = PlayerId()
114-
MSK.Player.playerId = GetPlayerServerId(MSK.Player.clientId)
115-
MSK.Player.serverId = MSK.Player.playerId
116-
117-
local playerPed = PlayerPedId()
118-
MSK.Player.playerPed = playerPed
119-
120-
local vehicle = GetVehiclePedIsIn(playerPed, false)
121-
122-
if vehicle > 0 and DoesEntityExist(vehicle) then
123-
MSK.Player.vehicle = vehicle
124-
125-
if not MSK.Player.seat or GetPedInVehicleSeat(vehicle, MSK.Player.seat) ~= playerPed then
126-
MSK.Player.seat = MSK.GetPedVehicleSeat(playerPed, vehicle)
127-
TriggerEvent('msk_core:onSeatChange', MSK.Player.vehicle, MSK.Player.seat)
128-
end
129-
else
130-
MSK.Player.vehicle = false
131-
MSK.Player.seat = false
132-
end
133-
134-
local hasWeapon, currentWeapon = GetCurrentPedWeapon(playerPed, true)
135-
MSK.Player.weapon = hasWeapon and currentWeapon or false
136-
137-
Wait(sleep)
138-
end
139-
end)
98+
local GetLib = function()
99+
return MSK
100+
end
101+
exports('GetLib', GetLib)
102+
exports('getCoreObject', GetLib) -- Support for old Versions

‎fxmanifest.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ games { 'gta5' }
44
author 'Musiker15 - MSK Scripts'
55
name 'msk_core'
66
description 'Functions for MSK Scripts'
7-
version '2.4.11'
7+
version '2.5.0'
88

99
lua54 'yes'
1010

‎import.lua

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,84 @@
1-
MSK = exports.msk_core:GetLib()
1+
----------------------------------------------------------------
2+
-- General Stuff
3+
----------------------------------------------------------------
4+
if not _VERSION:find('5.4') then
5+
error("Enable Lua 5.4 in the fxmanifest.lua! (shared_script '@msk_core/import.lua')", 2)
6+
end
7+
8+
local resourceName = GetCurrentResourceName()
9+
local msk_core = 'msk_core'
10+
11+
if resourceName == msk_core then return end
12+
13+
if MSK and MSK.name == msk_core then
14+
error(("Duplicate entires for '@%s/fxmanifest.lua' detected! Please remove all duplicate entires in '%s/fxmanifest.lua'"):format(msk_core, resourceName))
15+
end
16+
17+
if GetResourceState(msk_core) ~= 'started' then
18+
error('^1msk_core must be started before this resource.^0', 0)
19+
end
20+
21+
----------------------------------------------------------------
22+
-- Export for MSK Library
23+
----------------------------------------------------------------
24+
MSK = exports.msk_core:GetLib()
25+
26+
----------------------------------------------------------------
27+
-- Support for old Scripts
28+
----------------------------------------------------------------
29+
-- MSK.Input(header, placeholder, field, cb)
30+
setmetatable(MSK.Input, {
31+
__call = function(self, header, placeholder, field, cb)
32+
self.Open(header, placeholder, field, cb)
33+
end
34+
})
35+
36+
-- MSK.Numpad(pin, showPin, cb)
37+
setmetatable(MSK.Numpad, {
38+
__call = function(self, pin, showPin, cb)
39+
self.Open(pin, showPin, cb)
40+
end
41+
})
42+
43+
-- MSK.Progress(data)
44+
setmetatable(MSK.Progress, {
45+
__call = function(self, data, text, color)
46+
self.Start(data, text, color)
47+
end
48+
})
49+
50+
----------------------------------------------------------------
51+
-- MSK.Player
52+
----------------------------------------------------------------
53+
if not IsDuplicityVersion() then
54+
MSK.Player = {}
55+
56+
MSK.Player.clientId = PlayerId()
57+
MSK.Player.serverId = GetPlayerServerId(MSK.Player.clientId)
58+
MSK.Player.playerId = MSK.Player.serverId
59+
60+
CreateThread(function()
61+
local playerPed = PlayerPedId()
62+
MSK.Player.playerPed = playerPed
63+
64+
local vehicle = GetVehiclePedIsIn(playerPed, false)
65+
66+
if vehicle > 0 and DoesEntityExist(vehicle) then
67+
MSK.Player.vehicle = vehicle
68+
69+
if not MSK.Player.seat or GetPedInVehicleSeat(vehicle, MSK.Player.seat) ~= playerPed then
70+
MSK.Player.seat = MSK.GetPedVehicleSeat(playerPed, vehicle)
71+
end
72+
else
73+
MSK.Player.vehicle = false
74+
MSK.Player.seat = false
75+
end
76+
77+
local hasWeapon, currentWeapon = GetCurrentPedWeapon(playerPed, true)
78+
MSK.Player.weapon = hasWeapon and currentWeapon or false
79+
end)
80+
81+
AddEventHandler('msk_core:onPlayer', function(key, value, oldValue)
82+
MSK.Player[key] = value
83+
end)
84+
end

‎server/functions/main.lua

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,40 +52,6 @@ MSK.DrawGenericText = function(src, text, outline, font, size, color, position)
5252
end
5353
exports('DrawGenericText', MSK.DrawGenericText)
5454

55-
MSK.Progressbar = function(src, time, text, color)
56-
if not src or src == 0 then return end
57-
TriggerClientEvent('msk_core:progressbar', src, time, text, color)
58-
end
59-
exports('Progressbar', MSK.Progressbar)
60-
61-
MSK.ProgressStop = function(src)
62-
if not src or src == 0 then return end
63-
TriggerClientEvent('msk_core:progressbarStop', src)
64-
end
65-
exports('ProgressStop', MSK.ProgressStop)
66-
67-
MSK.Input = function(src, header, placeholder, field)
68-
return MSK.Trigger('msk_core:input', src, header, placeholder, field)
69-
end
70-
exports('Input', MSK.Input)
71-
72-
MSK.CloseInput = function(src)
73-
if not src or src == 0 then return end
74-
TriggerClientEvent('msk_core:closeInput', src)
75-
end
76-
exports('CloseInput', MSK.CloseInput)
77-
78-
MSK.Numpad = function(src, pin, show)
79-
return MSK.Trigger('msk_core:numpad', src, pin, show)
80-
end
81-
exports('Numpad', MSK.Numpad)
82-
83-
MSK.CloseNumpad = function(src)
84-
if not src or src == 0 then return end
85-
TriggerClientEvent('msk_core:closeNumpad', src)
86-
end
87-
exports('CloseNumpad', MSK.CloseNumpad)
88-
8955
MSK.IsSpawnPointClear = function(coords, maxDistance)
9056
if not coords then return end
9157
if not maxDistance then maxDistance = 5.0 end

‎server/functions/ui.lua

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
MSK.Input = {}
2+
MSK.Numpad = {}
3+
MSK.Progress = {}
4+
5+
----------------------------------------------------------------
6+
-- MSK.Input
7+
----------------------------------------------------------------
8+
MSK.Input.Open = function(playerId, header, placeholder, field)
9+
if not playerId or playerId <= 0 then return end
10+
return MSK.Trigger('msk_core:input', playerId, header, placeholder, field)
11+
end
12+
exports('Input', MSK.Input.Open)
13+
exports('OpenInput', MSK.Input.Open)
14+
15+
setmetatable(MSK.Input, {
16+
__call = function(self, header, placeholder, field, cb)
17+
self.Open(header, placeholder, field, cb)
18+
end
19+
})
20+
21+
MSK.Input.Close = function(playerId)
22+
if not playerId or playerId <= 0 then return end
23+
TriggerClientEvent('msk_core:closeInput', playerId)
24+
end
25+
MSK.CloseInput = MSK.Input.Close
26+
exports('CloseInput', MSK.Input.Close)
27+
28+
----------------------------------------------------------------
29+
-- MSK.Numpad
30+
----------------------------------------------------------------
31+
MSK.Numpad.Open = function(playerId, pin, showPin)
32+
if not playerId or playerId <= 0 then return end
33+
return MSK.Trigger('msk_core:numpad', playerId, pin, showPin)
34+
end
35+
exports('Numpad', MSK.Numpad.Open)
36+
37+
setmetatable(MSK.Numpad, {
38+
__call = function(self, pin, showPin, cb)
39+
self.Open(pin, showPin, cb)
40+
end
41+
})
42+
43+
MSK.Numpad.Close = function(playerId)
44+
if not playerId or playerId <= 0 then return end
45+
TriggerClientEvent('msk_core:closeNumpad', playerId)
46+
end
47+
exports('CloseNumpad', MSK.Numpad.Close)
48+
49+
----------------------------------------------------------------
50+
-- MSK.Progress
51+
----------------------------------------------------------------
52+
MSK.Progress.Start = function(playerId, data, text, color)
53+
if not playerId or playerId <= 0 then return end
54+
TriggerClientEvent('msk_core:progressbar', playerId, data, text, color)
55+
end
56+
MSK.Progressbar = MSK.Progress.Start
57+
exports('Progressbar', MSK.Progress.Start)
58+
59+
setmetatable(MSK.Progress, {
60+
__call = function(self, data, text, color)
61+
self.Start(data, text, color)
62+
end
63+
})
64+
65+
MSK.Progress.Stop = function(playerId)
66+
if not playerId or playerId <= 0 then return end
67+
TriggerClientEvent('msk_core:progressbarStop', playerId)
68+
end
69+
exports('ProgressStop', MSK.Progress.Stop)

‎server/main.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ MSK.GetPlayers = function(key, val)
119119
end
120120
exports('GetPlayers', MSK.GetPlayers)
121121

122-
GetLib = function()
122+
local GetLib = function()
123123
return MSK
124124
end
125125
exports('GetLib', GetLib)

0 commit comments

Comments
 (0)