Update v1.7.5

* New Notification UI

Author: Musiker15

VERSION

@@ -1 +1 @@
-1.7.4
+1.7.5

client.lua

@@ -41,21 +41,20 @@ MSK.Split = function(str, delimiter)
     return result 
 end
 
-MSK.Notification = function(message, info, duration, playSound)
+MSK.Notification = function(title, message, info, time)
     if Config.Notification == 'native' then
         SetNotificationTextEntry('STRING')
         AddTextComponentString(message)
         DrawNotification(false, true)
     else
         SendNUIMessage({
+            action = 'notify',
+            title = title,
             message = message,
-            duration = duration or 5000,
-            type = info or 'default',
-            map = IsRadarEnabled()
+            info = info or 'general',
+            time = time or 5000
         })
     end
-
-    if playSound then PlaySoundFrontend(-1, "ATM_WINDOW", "HUD_FRONTEND_DEFAULT_SOUNDSET", 1) end
 end
 
 MSK.HelpNotification = function(text)
@@ -225,8 +224,8 @@ AddEventHandler("msk_core:responseCallback", function(requestId, ...)
 end)
 
 RegisterNetEvent("msk_core:notification")
-AddEventHandler("msk_core:notification", function(message, info, duration, playSound)
-    MSK.Notification(message, info, duration, playSound)
+AddEventHandler("msk_core:notification", function(title, message, info, time)
+    MSK.Notification(title, message, info, time)
 end)
 
 RegisterNetEvent('msk_core:advancedNotification')

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Core functions for MSK Scripts'
-version '1.7.4'
+version '1.7.5'
 
 lua54 'yes'
 
@@ -24,16 +24,11 @@ server_scripts {
     'server_*.lua'
 }
 
-files {
-	'import.lua'
-}
-
 ui_page 'html/index.html'
 
 files {
-	'html/index.html',
-	'html/style.css',
-	'html/script.js'
+	"html/**/*.*",
+    'import.lua'
 }
 
 dependencies {

server.lua

@@ -135,11 +135,13 @@ MSK.RegisterCommand = function(name, group, cb, console, framework, suggestion)
     end
 end
 
-MSK.Notification = function(src, message, info, duration, playSound)
-    TriggerClientEvent('msk_core:notification', src, message, info, duration, playSound)
+MSK.Notification = function(src, title, message, info, time)
+    if not src or src == 0 then return end
+    TriggerClientEvent('msk_core:notification', src, title, message, info, time)
 end
 
 MSK.AdvancedNotification = function(src, text, title, subtitle, icon, flash, icontype)
+    if not src or src == 0 then return end
     TriggerClientEvent('msk_core:advancedNotification', src, text, title, subtitle, icon, flash, icontype)
 end