Port to v2 utility

[/] Some fixes
zRxnx · Apr 21, 2024 · 3296b2a · 3296b2a
1 parent ee1962b
commit 3296b2a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 35 deletions.
diff --git a/client/functions.lua b/client/functions.lua
@@ -484,7 +484,7 @@ OpenInfoMenu = function()
 
     MENU[#MENU + 1] = {
         title = Strings.gender_title,
-        description = (Strings.gender_desc):format(CORE.Bridge.getVariables().sex == 'm' and Strings.male or Strings.female),
+        description = (Strings.gender_desc):format(CORE.Bridge.getPlayerObject().sex == 'm' and Strings.male or Strings.female),
         arrow = false,
         icon = 'fa-solid fa-genderless',
         iconColor = Config.IconColor,
@@ -1596,7 +1596,7 @@ OpenBillMenu = function()
                 },
                 onSelect = function()
                     COOLDOWN = false
-                    Config.PayBill(data.id)
+                    CORE.Bridge.getPlayerObject().payBill(data.id)
                     Wait(100)
                     OpenBillMenu()
                 end,
@@ -1632,7 +1632,7 @@ end
 
 OpenCompanyMenu = function()
     local MENU = {}
-    local DATA_SOCIETY = lib.callback.await('zrx_personalmenu:server:getSocietyData', 500, CORE.Bridge.getVariables().job.name)
+    local DATA_SOCIETY = lib.callback.await('zrx_personalmenu:server:getSocietyData', 500, CORE.Bridge.getPlayerObject().job.name)
     local nearPlayer = lib.getClosestPlayer(GetEntityCoords(cache.ped), 3.0, false)
     local nearPlayerId = GetPlayerServerId(nearPlayer)
     local nearPlayerPed = GetPlayerPed(nearPlayer)

diff --git a/configuration/config.lua b/configuration/config.lua
@@ -65,12 +65,6 @@ Config.Navigation = {
     end
 }
 
---| Place here your pay bill actions
-Config.PayBill = function(bill)
-    CORE.Framework.TriggerServerCallback('esx_billing:payBill', function()
-    end, bill)
-end
-
 --| Place here your links/informations
 Config.Information = {
     { label = 'Discord', value = 'discord.gg/example' },

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -5,7 +5,7 @@ use_experimental_fxv2_oal 'yes'
 
 author 'zRxnx'
 description 'Advanced personal menu system'
-version '2.5.1'
+version '2.6.0'
 
 dependencies {
     'zrx_utility',

diff --git a/server/functions.lua b/server/functions.lua
@@ -5,12 +5,12 @@ Player = {
         if not IsGradeAllowed(xJob) then
             CORE.Bridge.notification(xPlayer.source, Strings.company_not_permitted)
         elseif xJob.name == yJob.name then
-            CORE.Bridge.notification(xPlayer.source, (Strings.company_hire_already):format(xTarget.getName()))
+            CORE.Bridge.notification(xPlayer.source, (Strings.company_hire_already):format(xTarget.name))
         else
-            CORE.Bridge.setJob(xTarget.player, xJob.name, 0)
+            xTarget.setJob(xJob.name, 0)
 
-            CORE.Bridge.notification(xPlayer.source, (Strings.company_you_hired):format(xTarget.getName()))
-            CORE.Bridge.notification(xTarget.source, (Strings.company_by_hired):format(xPlayer.getName()))
+            CORE.Bridge.notification(xPlayer.source, (Strings.company_you_hired):format(xTarget.name))
+            CORE.Bridge.notification(xTarget.source, (Strings.company_by_hired):format(xPlayer.name))
 
             if Webhook.Links.company:len() > 0 then
                 local message = ([[
@@ -35,14 +35,14 @@ Player = {
         elseif xJob.name ~= yJob.name then
             CORE.Bridge.notification(xPlayer.source, Strings.company_not_same)
         elseif xJob.name == yJob.name then
-            if CORE.Bridge.doesJobExist(Config.Company.default.job, Config.Company.default.grade) then
-                CORE.Bridge.setJob(xTarget.player, Config.Company.default.job, Config.Company.default.grade)
+            if CORE.Bridge.getJobObject(Config.Company.default.job, Config.Company.default.grade).doesJobExist() then
+                xTarget.setJob(Config.Company.default.job, Config.Company.default.grade)
             else
-                CORE.Bridge.setJob(xTarget.player, 'unemployed', 0)
+                xTarget.setJob('unemployed', 0)
             end
 
-            CORE.Bridge.notification(xPlayer.source, (Strings.company_you_fired):format(xTarget.getName()))
-            CORE.Bridge.notification(xTarget.source, (Strings.company_by_fired):format(xPlayer.getName()))
+            CORE.Bridge.notification(xPlayer.source, (Strings.company_you_fired):format(xTarget.name))
+            CORE.Bridge.notification(xTarget.source, (Strings.company_by_fired):format(xPlayer.name))
 
             if Webhook.Links.company:len() > 0 then
                 local message = ([[
@@ -70,10 +70,10 @@ Player = {
             local grade = xJob.grade + 1
 
             if CORE.Bridge.doesJobExist(xJob.name, grade) then
-                CORE.Bridge.setJob(xTarget.player, xJob.name, grade)
+                xTarget.setJob(xJob.name, grade)
 
-                CORE.Bridge.notification(xPlayer.source, (Strings.company_you_promote):format(xTarget.getName(), xJob.grade_label, grade))
-                CORE.Bridge.notification(xTarget.source, (Strings.company_by_promote):format(xPlayer.getName(), xJob.grade_label, grade))
+                CORE.Bridge.notification(xPlayer.source, (Strings.company_you_promote):format(xTarget.name, xJob.grade_label, grade))
+                CORE.Bridge.notification(xTarget.source, (Strings.company_by_promote):format(xPlayer.name, xJob.grade_label, grade))
 
                 if Webhook.Links.company:len() > 0 then
                     local message = ([[
@@ -104,10 +104,10 @@ Player = {
             local grade = xJob.grade - 1
 
             if CORE.Bridge.doesJobExist(xJob.name, grade) then
-                CORE.Bridge.setJob(xTarget.player, xJob.name, grade)
+                xTarget.setJob(xJob.name, grade)
 
-                CORE.Bridge.notification(xPlayer.source, (Strings.company_you_derank):format(xTarget.getName(), xJob.grade_label, grade))
-                CORE.Bridge.notification(xTarget.source, (Strings.company_by_derank):format(xPlayer.getName(), xJob.grade_label, grade))
+                CORE.Bridge.notification(xPlayer.source, (Strings.company_you_derank):format(xTarget.name, xJob.grade_label, grade))
+                CORE.Bridge.notification(xTarget.source, (Strings.company_by_derank):format(xPlayer.name, xJob.grade_label, grade))
 
                 if Webhook.Links.company:len() > 0 then
                     local message = ([[

diff --git a/server/server.lua b/server/server.lua
@@ -35,7 +35,7 @@ end)
 
 lib.callback.register('zrx_personalmenu:server:getPlayerData', function(player)
     if Player.HasCooldown(player) then return {} end
-    local xPlayer = CORE.Bridge.getVariables(player)
+    local xPlayer = CORE.Bridge.getPlayerObject(player)
 
     if Webhook.Links.callback:len() > 0 then
         local message = [[
@@ -50,9 +50,9 @@ lib.callback.register('zrx_personalmenu:server:getPlayerData', function(player)
         name = xPlayer.name,
         dob = xPlayer.dob,
         height = xPlayer.height,
-        bank = CORE.Bridge.getAccount(xPlayer.player, Config.Accounts.bank).money,
-        money = CORE.Bridge.getAccount(xPlayer.player, Config.Accounts.money).money,
-        black_money = CORE.Bridge.getAccount(xPlayer.player, Config.Accounts.black_money).money,
+        bank = xPlayer.getAccount(Config.Accounts.bank).money,
+        money = xPlayer.getAccount(Config.Accounts.money).money,
+        black_money = xPlayer.getAccount(Config.Accounts.black_money).money,
         ping = GetPlayerPing(xPlayer.player)
     }
 end)
@@ -67,7 +67,7 @@ lib.callback.register('zrx_personalmenu:server:getPlayerBills', function(player)
         CORE.Server.DiscordLog(player, 'BILLS', message, Webhook.Links.callback)
     end
 
-    return CORE.Bridge.getBills(player)
+    return CORE.Bridge.getPlayerObject(player).getBills()
 end)
 
 lib.callback.register('zrx_personalmenu:server:getPlayerLicenses', function(player)
@@ -80,7 +80,7 @@ lib.callback.register('zrx_personalmenu:server:getPlayerLicenses', function(play
         CORE.Server.DiscordLog(player, 'LICENSES', message, Webhook.Links.callback)
     end
 
-    return CORE.Bridge.getLicenses(player)
+    return CORE.Bridge.getPlayerObject(player).getLicenses()
 end)
 
 lib.callback.register('zrx_personalmenu:server:getSocietyData', function(player, job)
@@ -96,7 +96,7 @@ lib.callback.register('zrx_personalmenu:server:getSocietyData', function(player,
     end
 
     return {
-        money = CORE.Bridge.getSocietyMoney(job)
+        money = CORE.Bridge.getSocietyObject(job).getSocietyMoney()
     }
 end)
 
@@ -134,7 +134,7 @@ RegisterNetEvent('zrx_personalmenu:server:managePlayer', function(target, action
         return Config.PunishPlayer(source, 'Tried to trigger "zrx_personalmenu:server:managePlayer"')
     end
 
-    local xPlayer, xTarget = CORE.Bridge.getVariable(source), CORE.Bridge.getVariable(target)
+    local xPlayer, xTarget = CORE.Bridge.getPlayerObject(source), CORE.Bridge.getPlayerObject(target)
 
     if action == 'hire' then
         Player.Hire(xPlayer, xTarget)
@@ -219,11 +219,11 @@ end)
 
 RegisterNetEvent('zrx_personalmenu:server:giveCar', function(target, plate)
     if not target or not plate then return end
-	local xPlayer = CORE.Bridge.getVariable(source)
+	local xPlayer = CORE.Bridge.getPlayerObject(source)
     local row = MySQL.single.await('SELECT `plate`, `owner` FROM `owned_vehicles` WHERE `plate` = ? LIMIT 1', { plate })
 
     if row?.plate == plate and row?.owner == xPlayer.identifier then
-        local xTarget = CORE.Bridge.getVariable(target)
+        local xTarget = CORE.Bridge.getPlayerObject(target)
 
         MySQL.update.await('UPDATE `owned_vehicles` SET `owner` = ? WHERE `plate` = ?', { xTarget.identifier, plate })