Merge pull request #9 from Xogy/master

qbcore, esx, newest esx exports supports, optimalization.

Author: Isigar

README.md

@@ -7,17 +7,14 @@ Eazy tag system with configuration
 
 **Installation**
 1) Put into relisoft_tag folder into your resource folder
-2) Start after es_extended in your server.cfg
+2) Start after es_extended/qbcore in your server.cfg
 3) Edit config.lua file to fit your needs
 
 **Configurations**
 
 `Config.SeeOwnLabel = true/false`
 - if true you will be see your own tag above yourself
 
-`Config.SeeDistance = 100`
-- distance on which will other player will see your tag
-
 `Config.TextSize = 1.5`
 - font size for tags more is bigger
 
@@ -27,28 +24,37 @@ Eazy tag system with configuration
 `Config.NearCheckWait = 500`
 - miliseconds to check if player is near any admin
 
-`Config.TagByPermission = true`
-- with this option tag system will use xPlayer.getPermission() function
-and labels for tags will be get by permission level not group, you have to have
-older ESX to have this function, its deprecated in newer versions.
+
+- You can change your labels for admin groups in here
 ```
 Config.GroupLabels = {
-    helper = "HELPER",
-    mod = "~g~MODERATOR",
-    admin = "~b~ADMINISTRATOR",
-    superadmin = "~r~GOD",
-}
-
-Config.PermissionLabels = {
-    [1] = "HELPER",
-    [2] = "~g~MODERATOR",
-    [3] = "~b~ADMINISTRATOR",
-    [4] = "~r~GOD",
-    [5] = "~r~GOD",
+    ESX = {
+        -- group system that used to work on numbers only
+        [1] = {
+            [1] = "HELPER",
+            [2] = "~g~MODERATOR",
+            [3] = "~b~ADMINISTRATOR",
+            [4] = "~r~GOD",
+            [5] = "~r~GOD",
+        },
+        -- group system that works on name
+        [1] = {
+            helper = "HELPER",
+            mod = "~g~MODERATOR",
+            admin = "~b~ADMINISTRATOR",
+            superadmin = "~r~GOD",
+        },
+    },
+
+    QBCore = {
+        -- group system that works on ACE
+        [1] = {
+            god = "~r~GOD",
+            admin = "~b~ADMINISTRATOR",
+            mod = "~g~MODERATOR",
+        },
+    }
 }
 ```
 - Settings for tag labels, key in table is for group or permission level, you can change it 
-to fit your needs.
-
-**Dependency**
-- es_extended
+to fit your needs.

client/main.lua

@@ -1,17 +1,8 @@
--- relisoft.cz
--- Some-RP.cz
--- forum.some-rp.cz
+-- store.rcore.cz
 
-ESX = nil
 local currentAdminPlayers = {}
 local visibleAdmins = {}
-
-Citizen.CreateThread(function()
-    while ESX == nil do
-        TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
-        Citizen.Wait(0)
-    end
-end)
+local closeAdmins = {}
 
 RegisterNetEvent('relisoft_tag:set_admins')
 AddEventHandler('relisoft_tag:set_admins', function(admins)
@@ -23,9 +14,8 @@ AddEventHandler('relisoft_tag:set_admins', function(admins)
     end
 end)
 
-RegisterNetEvent('esx:playerLoaded')
-AddEventHandler('esx:playerLoaded', function()
-    ESX.TriggerServerCallback('relisoft_tag:getAdminsPlayers', function(admins)
+CreateThread(function()
+    callCallback('getAdminsPlayers', function(admins)
         currentAdminPlayers = admins
     end)
 end)
@@ -36,7 +26,7 @@ function draw3DText(pos, text, options)
     local scaleOption = options.size or 0.8
 
     local camCoords = GetGameplayCamCoords()
-    local dist = #(vector3(camCoords.x, camCoords.y, camCoords.z) - vector3(pos.x, pos.y, pos.z))
+    local dist = #(camCoords - pos)
     local scale = (scaleOption / dist) * 2
     local fov = (1 / GetGameplayCamFov()) * 100
     local scaleMultiplier = scale * fov
@@ -57,7 +47,7 @@ end
 
 Citizen.CreateThread(function()
     while true do
-        Citizen.Wait(Config.NearCheckWait)
+        Wait(Config.NearCheckWait)
         local ped = PlayerPedId()
         local pedCoords = GetEntityCoords(ped)
         for k, v in pairs(currentAdminPlayers) do
@@ -67,7 +57,7 @@ Citizen.CreateThread(function()
                 local adminCoords = GetEntityCoords(adminPed)
 
                 local distance = #(adminCoords - pedCoords)
-                if distance < (Config.SeeDistance) then
+                if distance < 40 then
                     visibleAdmins[v.source] = v
                 else
                     visibleAdmins[v.source] = nil
@@ -78,47 +68,62 @@ Citizen.CreateThread(function()
 end)
 
 CreateThread(function()
-    local wtt = 500
     while true do
-        Wait(wtt)
-        if next(visibleAdmins) ~= nil then
-            for k, v in pairs(visibleAdmins) do
-                local playerServerID = GetPlayerFromServerId(v.source)
-                if playerServerID ~= -1 then
-                    local adminPed = GetPlayerPed(playerServerID)
-                    local adminCoords = GetEntityCoords(adminPed)
-                    local x, y, z = table.unpack(adminCoords)
-                    z = z + Config.ZOffset
+        Wait(500)
+        closeAdmins = {}
+        for k, v in pairs(visibleAdmins) do
+            local playerServerID = GetPlayerFromServerId(v.source)
+            if playerServerID ~= -1 then
+                local adminPed = GetPlayerPed(playerServerID)
+                local label
+
+                if v.permission then
+                    label = Config.GroupLabels.ESX[1][v.permission]
+                end
+
+                if v.group then
+                    label = Config.GroupLabels.ESX[2][v.group]
+                end
+
+                if v.qbcore then
+                    label = Config.GroupLabels.QBCore[1][v.qbcore]
+                end
 
-                    local label
-                    if GetPlayerName(PlayerPedId()) == 'Kouba' then
-                        label = "CoOnwer"
-                    end
-                    if Config.TagByPermission then
-                        label = Config.PermissionLabels[v.permission]
-                    else
-                        label = Config.GroupLabels[v.group]
-                    end
 
-                    if label then
-                        if v.source == GetPlayerServerId(PlayerId()) then
-                            if Config.SeeOwnLabel == true then
-                                draw3DText(vector3(x, y, z), label, {
-                                    size = Config.TextSize
-                                })
-                                wtt = 0
-                            end
-                        else
-                            draw3DText(vector3(x, y, z), label, {
+                if label then
+                    closeAdmins[playerServerID] = {
+                        ped = adminPed,
+                        label = label,
+                        source = v.source,
+                        self = v.source == GetPlayerServerId(PlayerId()),
+                    }
+                end
+            end
+        end
+    end
+end)
+
+CreateThread(function()
+    while true do
+        Wait(0)
+        if next(closeAdmins) ~= nil then
+            for k, v in pairs(closeAdmins) do
+                if v.label then
+                    if v.self then
+                        if Config.SeeOwnLabel == true then
+                            draw3DText(GetEntityCoords(v.ped) + Config.Offset, v.label, {
                                 size = Config.TextSize
                             })
-                            wtt = 0
                         end
+                    else
+                        draw3DText(GetEntityCoords(v.ped) + Config.Offset, v.label, {
+                            size = Config.TextSize
+                        })
                     end
                 end
             end
         else
-            wtt = 1000
+            Wait(1000)
         end
     end
 end)

config.lua

@@ -0,0 +1,42 @@
+Config = {}
+
+-- Framework.ESX
+-- Framework.QBCORE
+Config.Framework = Framework.ESX
+
+Config.Locale = "en"
+
+Config.SeeOwnLabel = true
+
+Config.TextSize = 0.8
+Config.Offset = vector3(0, 0, 1.2)
+Config.NearCheckWait = 500
+
+Config.GroupLabels = {
+    ESX = {
+        -- group system that used to work on numbers only
+        [1] = {
+            [1] = "HELPER",
+            [2] = "~g~MODERATOR",
+            [3] = "~b~ADMINISTRATOR",
+            [4] = "~r~GOD",
+            [5] = "~r~GOD",
+        },
+        -- group system that works on name
+        [2] = {
+            helper = "HELPER",
+            mod = "~g~MODERATOR",
+            admin = "~b~ADMINISTRATOR",
+            superadmin = "~r~GOD",
+        },
+    },
+
+    QBCore = {
+        -- group system that works on ACE
+        [1] = {
+            god = "~r~GOD",
+            admin = "~b~ADMINISTRATOR",
+            mod = "~g~MODERATOR",
+        },
+    }
+}

config/config.lua

@@ -2,11 +2,18 @@ fx_version 'adamant'
 games {'common'}
 
 client_scripts {
-    'config/config.lua',
-    'client/main.lua'
+    'utils/client/callback.lua',
+    'client/main.lua',
 }
 
 server_scripts {
-    'config/config.lua',
-    'server/main.lua'
+    'utils/server/callback.lua',
+    'server/main.lua',
+}
+
+shared_scripts {
+    'utils/const.lua',
+    'config.lua',
+    'utils/shared.lua',
+    'locales/*.lua',
 }

fxmanifest.lua

@@ -0,0 +1,4 @@
+Locales["cs"] = {
+    ["tag_on"] = "Právě jste si zapl tag",
+    ["tag_off"] = "Právě jste si vypnul tag",
+}

locales/cs.lua

@@ -0,0 +1,4 @@
+Locales["en"] = {
+    ["tag_on"] = "You just turned on your tag",
+    ["tag_off"] = "You just turned off your tag",
+}