diff --git a/client/dev.lua b/client/dev.lua index 03b7f8d..32571b9 100644 --- a/client/dev.lua +++ b/client/dev.lua @@ -50,8 +50,7 @@ lib.registerMenu({ {label = Lang:t('dev_options.label3'), description = Lang:t('dev_options.desc3'), icon = 'fas fa-compass'}, {label = Lang:t('dev_options.label4'), description = Lang:t('dev_options.desc4'), icon = 'fas fa-compass'}, {label = Lang:t('dev_options.label5'), description = Lang:t('dev_options.desc5'), icon = 'fas fa-compass-drafting', close = false}, - {label = Lang:t('dev_options.label6'), description = Lang:t('dev_options.desc6'), icon = 'fas fa-car-side', close = false}, - {label = Lang:t('admin_options.label1'), description = Lang:t('admin_options.desc1'), icon = 'fab fa-fly', close = false}, + {label = Lang:t('dev_options.label6'), description = Lang:t('dev_options.desc6'), icon = 'fas fa-car-side', close = false} } }, function(selected) Options[selected]() diff --git a/client/player.lua b/client/player.lua index a440754..7ab8615 100644 --- a/client/player.lua +++ b/client/player.lua @@ -177,12 +177,12 @@ function GeneratePlayersMenu() {label = string.format('Phone: %s', player.phone)}, {label = string.format('Crafting Rep: %s', player.craftingrep)}, {label = string.format('Dealer Rep: %s', player.dealerrep)}, - {label = string.format('Cash: %s', player.cash)}, - {label = string.format('Bank: %s', player.bank)}, + {label = string.format('Cash: %s', CommaValue(player.cash))}, + {label = string.format('Bank: %s', CommaValue(player.bank))}, {label = string.format('Job: %s', player.job)}, {label = string.format('Gang: %s', player.gang)}, {label = string.format('Radio: %s', Player(args[1].id).state.radioChannel)}, - {label = string.format('%s', player.license)}, + {label = string.format('%s', player.license), description = 'License'}, {label = string.format('%s', player.discord), description = 'Discord'}, {label = string.format('%s', player.steam), description = 'Steam'} } diff --git a/client/vehicle.lua b/client/vehicle.lua index fb45457..b2acfe6 100644 --- a/client/vehicle.lua +++ b/client/vehicle.lua @@ -27,7 +27,7 @@ function GenerateVehiclesSpawnMenu() end) for i = 1, #categories do - lib.setMenuOptions('qb_adminmenu_spawn_vehicles_menu', {label = categories[i], args = {('qb_adminmenu_spawn_vehicles_menu_%s'):format(categories[i])}}, i) + lib.setMenuOptions('qb_adminmenu_spawn_vehicles_menu', {label = string.firstToUpper(categories[i]), args = {('qb_adminmenu_spawn_vehicles_menu_%s'):format(categories[i])}}, i) lib.registerMenu({ id = ('qb_adminmenu_spawn_vehicles_menu_%s'):format(categories[i]), diff --git a/fxmanifest.lua b/fxmanifest.lua index 20277c4..a73d616 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -23,4 +23,4 @@ client_scripts { } lua54 'yes' -use_experimental_fxv2_oal 'yes' +use_experimental_fxv2_oal 'yes' \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 0314e2b..18d0c44 100644 --- a/server/main.lua +++ b/server/main.lua @@ -66,8 +66,8 @@ local AdministrationOptions = { local BanDuration = (Input[2] or 0) * 3600 + (Input[3] or 0) * 86400 + (Input[4] or 0) * 2629743 DropPlayer(SelectedPlayer.id, Lang:t('player_options.administration.banreason', { reason = Input[1], lenght = os.date('%c', os.time() + BanDuration) })) MySQL.Async.insert('INSERT INTO bans (name, license, discord, ip, reason, expire, bannedby) VALUES (?, ?, ?, ?, ?, ?, ?)', { - GetPlayerName(SelectedPlayer.id), exports.qbx_core:GetIdentifier(SelectedPlayer.id, 'license'), exports.qbx_core:GetIdentifier(SelectedPlayer.id, 'discord'), - exports.qbx_core:GetIdentifier(SelectedPlayer.id, 'ip'), Input[1], os.time() + BanDuration, GetPlayerName(Source) + GetPlayerName(SelectedPlayer.id), GetPlayerIdentifierByType(SelectedPlayer.id, 'license'), GetPlayerIdentifierByType(SelectedPlayer.id, 'discord'), + GetPlayerIdentifierByType(SelectedPlayer.id, 'ip'), Input[1], os.time() + BanDuration, GetPlayerName(Source) }) end, function(Source, SelectedPlayer, Input) @@ -170,9 +170,9 @@ lib.callback.register('qb-admin:server:getplayers', function(source) bank = v.PlayerData.money.bank, job = v.PlayerData.job.label .. ' | ' .. v.PlayerData.job.grade.level, gang = v.PlayerData.gang.label, - license = exports.qbx_core:GetIdentifier(k, 'license') or 'Unknown', - discord = exports.qbx_core:GetIdentifier(k, 'discord') or 'Not Linked', - steam = exports.qbx_core:GetIdentifier(k, 'steam') or 'Not Linked', + license = GetPlayerIdentifierByType(k, 'license') or 'Unknown', + discord = GetPlayerIdentifierByType(k, 'discord') or 'Not Linked', + steam = GetPlayerIdentifierByType(k, 'steam') or 'Not Linked', } end table.sort(Players, function(a, b) return a.id < b.id end) @@ -198,9 +198,9 @@ lib.callback.register('qb-admin:server:getplayer', function(source, playerToGet) bank = playerData.money.bank, job = playerData.job.label .. ' | ' .. playerData.job.grade.level, gang = playerData.gang.label, - license = exports.qbx_core:GetIdentifier(playerToGet, 'license') or 'Unknown', - discord = exports.qbx_core:GetIdentifier(playerToGet, 'discord') or 'Not Linked', - steam = exports.qbx_core:GetIdentifier(playerToGet, 'steam') or 'Not Linked', + license = GetPlayerIdentifierByType(playerToGet, 'license') or 'Unknown', + discord = GetPlayerIdentifierByType(playerToGet, 'discord') or 'Not Linked', + steam = GetPlayerIdentifierByType(playerToGet, 'steam') or 'Not Linked', } return player end)