Update v2.1.1

* Added MSK.Numpad
* Added new Design for MSK.Input
* Fixed MSK.Input
* Fixed Config.customNotification

Author: Musiker15

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

client/cl_input.lua

@@ -1,9 +1,12 @@
-local isOpen = false
-local callback = {}
+local isInputOpen = false
+local callback = nil
 
-openInput = function(header, placeholder, field, cb)
-    if isOpen then return print('Input is already open') end
-    if not cb then callback = field else callback = cb end
+MSK.Input = function(header, placeholder, field, cb)
+    if isInputOpen then return end
+    logging('debug', 'MSK.Input')
+    isInputOpen = true
+    callback = cb
+    if not callback then callback = field end
 
     SetNuiFocus(true, true)
     SendNUIMessage({
@@ -12,30 +15,34 @@ openInput = function(header, placeholder, field, cb)
         placeholder = placeholder,
         field = field and type(field) == 'boolean'
     })
-    isOpen = true
 end
-MSK.Input = openInput
-exports('openInput', openInput)
+exports('Input', MSK.Input)
+exports('openInput', MSK.Input)
 
-closeInput = function()
+MSK.CloseInput = function()
+    logging('debug', 'MSK.CloseInput')
+	isInputOpen = false
+    callback = nil
     SetNuiFocus(false, false)
-	isOpen = false
+    SendNUIMessage({
+        action = 'closeInput'
+    })
 end
-MSK.CloseInput = closeInput
-exports('closeInput', closeInput)
-
-RegisterNUICallback('closeInput', function(data)
-    callback()
-    closeInput()
-end)
+exports('CloseInput', MSK.CloseInput)
+exports('closeInput', MSK.CloseInput)
 
 RegisterNUICallback('submitInput', function(data)
+    if data.input == '' then data.input = nil end
+    if tonumber(data.input) then data.input = tonumber(data.input) end
 	callback(data.input)
-    closeInput()
+    MSK.CloseInput()
+end)
+
+RegisterNUICallback('closeInput', function(data)
+    MSK.CloseInput()
 end)
 
-AddEventHandler('onResourceStop', function(resourceName)
-    if resourceName == GetCurrentResourceName() then
-        closeInput()
-    end
+AddEventHandler('onResourceStop', function(resource)
+    if GetCurrentResourceName() ~= resource then return end
+    MSK.CloseInput()
 end)

client/cl_numpad.lua

@@ -0,0 +1,46 @@
+local isNumpadOpen = false
+local callback = nil
+
+MSK.Numpad = function(pin, show, cb)
+    if isNumpadOpen then return end
+    logging('debug', 'MSK.Numpad')
+    isNumpadOpen = true
+    callback = cb
+    
+    SetNuiFocus(true, true)
+    SendNUIMessage({
+        action = 'openNumpad',
+        code = tostring(pin),
+        length = string.len(tostring(pin)),
+        show = show,
+        EnterCode = 'Enter Code',
+        WrongCode = 'Incorrect',
+    })
+end
+exports('Numpad', MSK.Numpad)
+
+MSK.CloseNumpad = function()
+    logging('debug', 'MSK.CloseNumpad')
+    isNumpadOpen = false
+    callback = nil
+    SetNuiFocus(false, false)
+    SendNUIMessage({
+        action = 'closeNumpad'
+    })
+end
+exports('CloseNumpad', MSK.CloseNumpad)
+
+RegisterNUICallback('submitNumpad', function(data)
+    callback(true)
+    MSK.CloseNumpad()
+end)
+
+RegisterNUICallback('closeNumpad', function()
+    MSK.CloseNumpad()
+end)
+
+AddEventHandler('onResourceStop', function(resource)
+    if GetCurrentResourceName() ~= resource then return end
+    MSK.CloseNumpad()
+end)
+  

client/cl_progress.lua

@@ -1,18 +1,18 @@
-ProgressStart = function(time, text, color)
+MSK.Progressbar = function(time, text, color)
     SendNUIMessage({
         action = 'progressBarStart',
         time = time,
         text = text or '',
         color = color or Config.progressColor,
     })
 end
-MSK.ProgressStart = ProgressStart
-exports('ProgressStart', ProgressStart)
+MSK.ProgressStart = MSK.Progressbar
+exports('Progressbar', MSK.Progressbar)
+exports('ProgressStart', MSK.Progressbar)
 
-ProgressStop = function()
+MSK.ProgressStop = function()
     SendNUIMessage({
         action = 'progressBarStop',
     })
 end
-MSK.ProgressStop = ProgressStop
-exports('ProgressStop', ProgressStop)
+exports('ProgressStop', MSK.ProgressStop)

client/main.lua

@@ -41,7 +41,7 @@ MSK.Notification = function(title, message, info, time)
     elseif Config.Notification == 'okok' then
         exports['okokNotify']:Alert(title, message, time or 5000, info or 'info')
     elseif Config.Notification == 'custom' then
-        Config.customNotification()
+        Config.customNotification(title, message, info, time)
     else
         SendNUIMessage({
             action = 'notify',

common/common.lua

@@ -115,6 +115,7 @@ MSK.Logging = function(code, ...)
     local script = "[^2"..GetInvokingResource().."^0]"
 
     if not MSK.TableContains({'error', 'debug', 'info'}, code) then
+        -- Support for old Scripts
         script = code
         local action = ...
         local args = {...}

config.lua

@@ -19,7 +19,7 @@ Config.showCoords = {
 -- Set to 'custom' for Config.customNotification()
 Config.Notification = 'msk'
 
-Config.customNotification = function()
+Config.customNotification = function(title, message, info, time)
     -- Set Config.Notification = 'custom'
     -- Add your own clientside Notification here
 end

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Core functions for MSK Scripts'
-version '2.1.0'
+version '2.1.1'
 
 lua54 'yes'