Merge pull request #58 from SOH69/dev

New Updates v2.0.7

Author: SOH69

.gitignore

@@ -0,0 +1,2 @@
+
+/build

client/event.lua

@@ -18,19 +18,21 @@ AddEventHandler('onResourceStop', function(resource)
     end
 end)
 
-RegisterNetEvent('mm_radio:client:use', function()
+RegisterNetEvent('mm_radio:client:use', function(slot)
     if Radio.PlayerDead or IsPedFatallyInjured(cache.ped) then return end
     Radio.usingRadio = true
     SetNuiFocus(true, true)
     Radio:toggleRadioAnimation(true)
-    local battery = lib.callback.await('mm_radio:server:getbatterydata', false)
+    local battery, radioId = lib.callback.await('mm_radio:server:getradiodata', false, slot)
+    local userdata = Radio.userData[Radio.identifier]
     Radio:SendSvelteMessage("setRadioVisible", {
+        radioId = radioId,
         onRadio = Radio.onRadio,
         channel = Radio.RadioChannel,
         volume = Radio.Volume,
         favourite = Radio.favourite,
         recomended = Radio.recomended,
-        userData = Radio.userData[Radio.identifier],
+        userData = userdata,
         time = Radio:CalculateTimeToDisplay(),
         street = Radio:getCrossroads(),
         maxChannel = Shared.MaxFrequency,
@@ -41,7 +43,7 @@ RegisterNetEvent('mm_radio:client:use', function()
         overlay = Shared.Overlay
     })
     UpdateTime()
-    if Radio.userData[Radio.identifier].allowMovement then
+    if userdata.allowMovement then
         SetNuiFocusKeepInput(true)
         DisableControls()
     end

client/function.lua

@@ -91,6 +91,11 @@ function Radio:Init(data)
             self.favourite[#self.favourite+1] = val
         end
     end
+
+    if not self.userData[self.identifier].enableClicks then
+        exports['pma-voice']:setVoiceProperty('micClicks', false)
+    end
+
     self:doRadioCheck()
 end
 
@@ -145,8 +150,9 @@ function Radio:leaveradio()
 end
 
 function Radio:update()
-    local battery = lib.callback.await('mm_radio:server:getbatterydata', false)
+    local battery, radioId = lib.callback.await('mm_radio:server:getradiodata', false)
     self:SendSvelteMessage("updateRadio", {
+        radioId = radioId,
         onRadio = Radio.onRadio,
         channel = Radio.RadioChannel,
         volume = Radio.Volume,

client/nui.lua

@@ -101,6 +101,13 @@ RegisterNUICallback('allowMovement', function(data, cb)
     cb("ok")
 end)
 
+RegisterNUICallback('enableClicks', function(data, cb)
+    Radio.userData[Radio.identifier].enableClicks = data
+    SetResourceKvp('radioSettings2', json.encode(Radio.userData))
+    exports['pma-voice']:setVoiceProperty('micClicks', data)
+    cb("ok")
+end)
+
 RegisterNUICallback('updateRadioSize', function(data, cb)
     Radio.userData[Radio.identifier].radioSizeMultiplier = data.radio
     Radio.userData[Radio.identifier].overlaySizeMultiplier = data.overlay
@@ -112,9 +119,24 @@ RegisterNUICallback('saveData', function(data, cb)
     local player = Framework.core.getPlayerData()
     local identifier = player.cid
     if not identifier then return Radio:Notify(locale('unsuccess_name', channel)) end
-    Radio.userData[Radio.identifier].name = data
+    Radio.userData[Radio.identifier].name = data.name
     Radio:update()
-    TriggerServerEvent('mm_radio:server:addToRadioChannel', Radio.RadioChannel, data)
+    TriggerServerEvent('mm_radio:server:addToRadioChannel', Radio.RadioChannel, data.name)
     SetResourceKvp('radioSettings2', json.encode(Radio.userData))
-    cb("ok")
+    cb(retreval)
+end)
+
+RegisterNUICallback('getMutedList', function(_, cb)
+    cb(exports['pma-voice']:getMutedPlayers())
+end)
+
+RegisterNUICallback('togglemutePlayer', function(data, cb)
+    if data == cache.serverId then
+        Radio:Notify(locale('failed_mute'))
+        return cb(nil)
+    end
+    exports['pma-voice']:toggleMutePlayer(data)
+    Wait(100)
+    print(json.encode(exports['pma-voice']:getMutedPlayers()))
+    cb(exports['pma-voice']:getMutedPlayers())
 end)

fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version 'cerulean'
 game "gta5"
 
 author "Master Mind"
-version '2.0.6'
+version '2.0.7'
 description 'A beautiful Radio Resource for FiveM'
 repository 'https://github.com/SOH69/mm_radio'
 

locales/cs.json

@@ -14,6 +14,7 @@
         "frequency": "Frekvence",
         "disconnect": "ODPOJIT",
         "notconnected": "NEPŘIPOJENO",
+        "settings": "Nastavení",
         "channels": "Kanály",
         "radio": "Rádio",
         "members": "Členové",

locales/de.json

@@ -14,6 +14,7 @@
         "frequency": "Frequenz",
         "disconnect": "TRENNEN",
         "notconnected": "NICHT VERBUNDEN",
+        "settings": "Einstellungen",
         "channels": "Kanäle",
         "radio": "Radio",
         "members": "Mitglieder",
@@ -26,6 +27,7 @@
         "radio_settings": "RADIOEINSTELLUNGEN",
         "move_radio": "RADIO BEWEGEN",
         "allow_move": "BEWEGEN ERLAUBEN",
-        "overlay_settings": "OVERLAYEINSTELLUNGEN"
+        "overlay_settings": "OVERLAYEINSTELLUNGEN",
+		"enableClicks": "Funkgeräusch"
     }
 }

locales/en.json

@@ -8,12 +8,14 @@
     "jammer_notify_description": "Failed to Connect to Station %.2f MHz",
     "toggle_defean": "Radio Deafened",
     "toggle_undeafen": "Radio Undeafened",
+    "failed_mute": "Failed to Mute Player",
 
     "ui": {
         "header": "IN RADIO",
         "frequency": "Frequency",
         "disconnect": "DISCONNECT",
         "notconnected": "NOT CONNECTED",
+        "settings": "Settings",
         "channels": "Channels",
         "radio": "Radio",
         "members": "Members",
@@ -26,6 +28,7 @@
         "radio_settings": "Radio Settings",
         "move_radio": "Move Radio",
         "allow_move": "Allow Move",
-        "overlay_settings": "Overlay Settings"
+        "overlay_settings": "Overlay Settings",
+		"enableClicks": "Radio Sound"
     }
 }

locales/es.json

@@ -14,6 +14,7 @@
         "frequency": "Frecuencia",
         "disconnect": "DESCONECTAR",
         "notconnected": "NO CONECTADA",
+        "settings": "Ajustes",
         "channels": "Canales",
         "radio": "Radio",
         "members": "Miembros",

locales/fr.json

@@ -14,6 +14,7 @@
         "frequency": "Fréquence",
         "disconnect": "DÉCONNECTER",
         "notconnected": "PAS CONNECTÉ",
+        "settings": "Paramètres",
         "channels": "Canaux",
         "radio": "Radio",
         "members": "Membres",

server/main.lua

@@ -188,46 +188,60 @@ end)
 local function SetRadioData(src, slot)
     local player = Framework.core.GetPlayer(src)
     local radioId = player.id .. math.random(1000, 9999)
+    local name = player.charinfo.firstname .. " " .. player.charinfo.lastname
     if Shared.Inventory == 'ox' then
-        exports.ox_inventory:SetMetadata(src, slot, { radioId = radioId })
+        exports.ox_inventory:SetMetadata(src, slot, { radioId = radioId, name = name })
         return radioId
     elseif Shared.Inventory == 'qb' or Shared.Inventory == 'ps' then
         local items = player.items
         local item = items[slot]
         if item  then
             item.info = item.info or {}
-            item.info.radioId = radioId
+            item.info ={
+                radioId = radioId,
+                name = name
+            }
             local invResourceName = exports.bl_bridge:getFramework('inventory')
             exports[invResourceName]:SetInventory(src, items)
             return radioId
         end
         return false
     elseif Shared.Inventory == 'qs' then
-        exports['qs-inventory']:SetItemMetadata(src, slot, { radioId = radioId })
+        exports['qs-inventory']:SetItemMetadata(src, slot, { radioId = radioId, name = name })
         return radioId
     else
         return false
     end
 end
 
-lib.callback.register('mm_radio:server:getbatterydata', function(source)
-    if not Shared.Inventory or not Shared.Battery.state then return 100 end
+local function GetSlotWithRadio(source)
+    local player = Framework.core.GetPlayer(source)
+    for i=1, #Shared.RadioItem do
+        local item = player.getItem(Shared.RadioItem[i])
+        if item then
+            return item.slot
+        end
+    end
+end
+
+lib.callback.register('mm_radio:server:getradiodata', function(source, slot)
+    if not Shared.Inventory or not Shared.Battery.state then return 100, 'PERSONAL' end
     local battery = 100
     local player = Framework.core.GetPlayer(source)
-    for _, slotData in pairs(player.items) do
-        if slotData and lib.table.contains(Shared.RadioItem, slotData.name) then
-            local item = slotData
-            local id = false
-            if not item.metadata?.radioId then
-                id = SetRadioData(source, item.slot)
-            else
-                id = item.metadata?.radioId
-            end
-            battery = id and batteryData[id] or 100
-            break
+    if not slot then
+        slot = GetSlotWithRadio(source)
+    end
+    local slotData = player.items[slot]
+    if slotData and lib.table.contains(Shared.RadioItem, slotData.name) then
+        local id = false
+        if not slotData.metadata?.radioId then
+            id = SetRadioData(source, slot)
+        else
+            id = slotData.metadata?.radioId
         end
+        battery = id and batteryData[id] or 100
     end
-    return battery
+    return battery, id
 end)
 
 lib.callback.register('mm_radio:server:getjammer', function()
@@ -267,8 +281,8 @@ lib.versionCheck('SOH69/mm_radio')
 
 if Shared.Ready then
     for i=1, #Shared.RadioItem do
-        Framework.core.RegisterUsableItem(Shared.RadioItem[i], function(source)
-            TriggerClientEvent('mm_radio:client:use', source)
+        Framework.core.RegisterUsableItem(Shared.RadioItem[i], function(source, slot, metadata)
+            TriggerClientEvent('mm_radio:client:use', source, slot, metadata)
         end)
     end