Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 2af2ccd
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jan 3 23:35:01 2025 +0000

    chore: bump manifest version to v2.43.5

commit 3dbeb5f
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sat Jan 4 10:33:18 2025 +1100

    fix(server): nil plate in entity mismatch

    See overextended#1856.

commit 20b1e40
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Dec 19 04:36:27 2024 +0000

    chore: bump manifest version to v2.43.4

commit 0b09b6b
Author: Subham PRO <33375250+subhampro@users.noreply.github.com>
Date:   Tue Dec 10 14:03:24 2024 +0530

    fix(server/crafting): weight discrepancy during crafting (overextended#1849)

    Resolves overextended#1848.

commit 44d09a5
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Tue Dec 10 19:29:52 2024 +1100

    refactor(server/esx): check esx version and update config error

commit 9b08f82
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Tue Dec 10 19:19:39 2024 +1100

    fix(server): compare inventory entity plate to requested plate

    Further expand on the last commit, in case the entityid
    tied to an inventory has changed.

commit 9711fde
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sat Dec 7 13:56:02 2024 +1100

    fix(server): check for entity deletion when accessing vehicle inventory

    Resolve overextended#1847.

commit f96ab12
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Nov 24 08:44:28 2024 +0000

    chore: bump manifest version to v2.43.3

commit 24e5c1c
Author: Frowmza <66181451+Frowmza@users.noreply.github.com>
Date:   Thu Nov 21 02:41:11 2024 +0100

    fix(server/mysql): stashes save error when bulk saving is disabled (overextended#1841)

commit 8b502d4
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Mon Nov 18 16:04:16 2024 +1100

    fix(server): check stash distance in getClosestStashCoordss

commit 51099d4
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Mon Nov 18 16:03:37 2024 +1100

    fix(server/inventory): register stash distance on inventories

commit ed50569
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Nov 14 08:21:54 2024 +0000

    chore: bump manifest version to v2.43.2

commit e22a9ee
Author: Kasey Fitton <kaseyfitton@hotmail.co.uk>
Date:   Thu Nov 14 08:20:58 2024 +0000

    refactor(server/esx): error messaging for esx 1.11 (overextended#1833)

commit 425a4bd
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Nov 9 16:01:39 2024 +0000

    chore: bump manifest version to v2.43.1

commit 8a65a5c
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Nov 10 03:00:53 2024 +1100

    fix(client): remove debugging code

commit 7602847
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Nov 9 14:54:52 2024 +0000

    chore: bump manifest version to v2.43.0

commit 2882976
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Nov 10 01:06:46 2024 +1100

    refactor: prevent errors when data files are missing

commit 4c530d0
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Nov 10 00:46:06 2024 +1100

    refactor(client): adjust prints on weapon hash mismatch

commit 39c50fb
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Nov 10 00:37:33 2024 +1100

    refactor(server): tighten security for vehicle inv access

commit f14934c
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Nov 10 00:15:17 2024 +1100

    refactor(client): don't send plate to server when opening vehicle inv

commit 70abcfd
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Oct 4 01:34:16 2024 +1000

    feat(server): add 'usingItem' event hook

commit c0abafb
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sat Sep 28 05:10:59 2024 +1000

    fix(server): prevent cascading errors on resource start

    Prevent some errors caused by other errors (which people
    always ignore).

commit c5027d5
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Sep 15 02:07:19 2024 +0000

    chore: bump manifest version to v2.42.3

commit 8c8d057
Author: retro <128739748+hearondale@users.noreply.github.com>
Date:   Sun Sep 15 03:06:18 2024 +0100

    fix(server/crafting): update weight and sync slot when splitting stack (overextended#1802)

    Co-authored-by: Linden <65407488+thelindat@users.noreply.github.com>

commit 43d735f
Author: Maximus7474 <94017712+Maximus7474@users.noreply.github.com>
Date:   Sun Sep 15 03:59:22 2024 +0200

    fix(client/shops): target icons (overextended#1804)

commit 6ce273c
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sat Sep 14 12:27:31 2024 +1000

    fix(client): replicate invBusy state

    Should resolve overextended#1801.

commit d4445fa
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Sep 13 00:45:35 2024 +0000

    chore: bump manifest version to v2.42.2

commit 65b38e8
Author: EdyzPW <94766321+EdyzPW@users.noreply.github.com>
Date:   Fri Sep 13 03:44:32 2024 +0300

    chore(locales): create ro.json (overextended#1789)

commit 322a5e4
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Sep 13 10:42:52 2024 +1000

    refactor(server/inventory): disable giveItem if target inv is busy

commit e29e0c1
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Sep 13 10:42:10 2024 +1000

    refactor: use callback event for giveItem

commit 8a0b920
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Sep 13 10:41:16 2024 +1000

    refactor(client): replicate invBusy

commit bb654f2
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Sep 13 10:05:57 2024 +1000

    fix(server/crafting): don't start crafting when item is missing

    Generally crafting cannot be triggered by the UI if missing items,
    however this fails when trying to craft multiple times.

    Without this, the item count is only checked after finishing the
    progress bar. Aside from poor UX, it may also fail to remove items
    from the inventory if they are given during the crafting process.

    Fixes overextended#1800.

commit 35fc62b
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Fri Sep 13 09:33:48 2024 +1000

    fix(server/inventory): set metadata.weight of petrolcan

    Fixes overextended#1799

commit 8e96447
Author: 0Programmer <60280452+0Programmer@users.noreply.github.com>
Date:   Fri Sep 13 01:19:18 2024 +0200

    fix(client): use client.dropmodel on invalid point.model (overextended#1798)

commit cf88913
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Sep 1 00:58:55 2024 +0000

    chore: bump manifest version to v2.42.1

commit 50a79b0
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Sep 1 10:39:37 2024 +1000

    refactor(client): print when weapon is disarmed by game

    Since we've have a billion issues posted complaining about
    default game behaviour.

commit 868eeb3
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Sep 1 10:38:49 2024 +1000

    refactor(init): use lib.print.info

commit e63bad5
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Sep 1 10:25:07 2024 +1000

    refactor(client): tweak inventory access distance checking

    Lazy workaround for overextended#1766.

commit d4049b0
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Sep 1 10:02:55 2024 +1000

    fix(client/shops): pass distance to targets

commit 9127e81
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sun Sep 1 09:24:32 2024 +1000

    refactor(server/mysql): silent error on improper configuration

commit 3978cac
Author: Manason <clanerp@gmail.com>
Date:   Thu Aug 29 19:20:26 2024 -0700

    fix(server/qbx): default NPC vehicle database id to nil (overextended#1774)

commit 8278a1d
Author: Solareon <769465+solareon@users.noreply.github.com>
Date:   Fri Aug 30 04:20:10 2024 +0200

    fix(server/qbx): sync inventory items to player object (overextended#1775)

commit 4561261
Author: ARottenberger <69944020+iplayer1337fivem@users.noreply.github.com>
Date:   Fri Aug 30 04:19:19 2024 +0200

    chore(locales): update da.json (overextended#1784)

commit c1a5a7a
Author: Pegos <stelios@pegos.net>
Date:   Fri Aug 30 05:18:47 2024 +0300

    fix(client): infinite textui (overextended#1786)

commit 0317d14
Author: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Aug 17 02:48:31 2024 +0000

    chore: bump manifest version to v2.42.0

commit 696b38d
Author: Linden <65407488+thelindat@users.noreply.github.com>
Date:   Sat Aug 17 12:47:14 2024 +1000

    fix(server/qbx): invalid statebag access

commit 9f816e4
Author: Master Mind <70486873+SOH69@users.noreply.github.com>
Date:   Sat Aug 17 08:15:07 2024 +0530

    fix(server/inventory): ignore owner/group checks when forcing open inventory (overextended#1769)

commit 5618523
Author: toshko <toshko0003@gmail.com>
Date:   Fri Aug 16 06:08:54 2024 +0300

    fix(server/inventory): stash coords (overextended#1768)

commit 9512721
Author: Solareon <769465+solareon@users.noreply.github.com>
Date:   Wed Aug 14 19:13:09 2024 +0200

    feat(bridge/qbx): sync dynamic account types (overextended#1767)

commit 937f775
Author: Solareon <769465+solareon@users.noreply.github.com>
Date:   Wed Aug 14 05:10:58 2024 +0200

    feat: qbx_core support (overextended#1763)
  • Loading branch information
@ulasdemirci0
ulasdemirci0 committed Jan 10, 2025
1 parent 34a3e9b commit 08edfd3
Show file tree
Hide file tree
Showing 21 changed files with 441 additions and 94 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ We do not guarantee compatibility or support for third-party resources.
- [esx](https://github.com/esx-framework/esx_core)
- [qbox](https://github.com/Qbox-project/qbx_core)
- [nd_core](https://github.com/ND-Framework/ND_Core)
- [qb-core](https://github.com/qbcore-framework/qb-core) (LIMITED SUPPORT! Use qbox instead)

## ✨ Features

Expand Down
58 changes: 37 additions & 21 deletions client.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ lib.onCache('ped', function(ped)
Utils.WeaponWheel()
end)

plyState:set('invBusy', true, false)
plyState:set('invBusy', true, true)
plyState:set('invHotkeys', false, false)
plyState:set('canUseWeapons', false, false)

Expand Down Expand Up @@ -530,6 +530,7 @@ local function useSlot(slot, noAnim)
SetCurrentPedWeapon(playerPed, data.hash, false)

if data.hash ~= GetSelectedPedWeapon(playerPed) then
lib.print.info(('failed to equip %s (cause unknown)'):format(item.name))
return lib.notify({ type = 'error', description = locale('cannot_use', data.label) })
end

Expand Down Expand Up @@ -748,7 +749,7 @@ local function registerCommands()
-- No storage or no glovebox
if (checkVehicle == 0 or checkVehicle == 2) or (not Vehicles.glovebox[vehicleClass] and not Vehicles.glovebox.models[vehicleHash]) then return end

local isOpen = client.openInventory('glovebox', { id = 'glove'..GetVehicleNumberPlateText(vehicle), netid = NetworkGetNetworkIdFromEntity(vehicle) })
local isOpen = client.openInventory('glovebox', { netid = NetworkGetNetworkIdFromEntity(vehicle) })

if isOpen then
currentInventory.entity = vehicle
Expand Down Expand Up @@ -1028,6 +1029,10 @@ local function onEnterDrop(point)
if not point.instance or point.instance == currentInstance and not point.entity then
local model = point.model or client.dropmodel

-- Prevent breaking inventory on invalid point.model instead use default client.dropmodel
if not IsModelValid(model) and not IsModelInCdimage(model) then
model = client.dropmodel
end
lib.requestModel(model)

local entity = CreateObject(model, point.coords.x, point.coords.y, point.coords.z, false, true, true)
Expand Down Expand Up @@ -1125,19 +1130,21 @@ local function setStateBagHandler(stateId)
AddStateBagChangeHandler('instance', stateId, function(_, _, value)
currentInstance = value

-- Iterate over known drops and remove any points in a different instance (ignoring no instance)
for dropId, point in pairs(client.drops) do
if point.instance then
if point.instance ~= value then
if point.entity then
Utils.DeleteEntity(point.entity)
point.entity = nil
end
if client.drops then
-- Iterate over known drops and remove any points in a different instance (ignoring no instance)
for dropId, point in pairs(client.drops) do
if point.instance then
if point.instance ~= value then
if point.entity then
Utils.DeleteEntity(point.entity)
point.entity = nil
end

point:remove()
else
-- Recreate the drop using data from the old point
createDrop(dropId, point)
point:remove()
else
-- Recreate the drop using data from the old point
createDrop(dropId, point)
end
end
end
end
Expand Down Expand Up @@ -1179,6 +1186,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
---@class PlayerData
---@field inventory table<number, SlotWithItem?>
---@field weight number
---@field groups table<string, number>
PlayerData = player
PlayerData.id = cache.playerId
PlayerData.source = cache.serverId
Expand Down Expand Up @@ -1272,7 +1280,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven

if point.isClosest and point.currentDistance < 1.2 then
if not hasTextUi then
hasTextUi = nil
hasTextUi = point
lib.showTextUI(point.message, uiOptions)
end

Expand All @@ -1293,7 +1301,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
end
end

for id, data in pairs(lib.load('data.licenses')) do
for id, data in pairs(lib.load('data.licenses') or {}) do
lib.points.new({
coords = data.coords,
distance = 16,
Expand Down Expand Up @@ -1349,19 +1357,21 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
playerCoords = GetEntityCoords(playerPed)

if currentInventory and not currentInventory.ignoreSecurityChecks then
local maxDistance = (currentInventory.distance or currentInventory.type == 'stash' and 4.8 or 1.8) + 0.2

if currentInventory.type == 'otherplayer' then
local id = GetPlayerFromServerId(currentInventory.id)
local ped = GetPlayerPed(id)
local pedCoords = GetEntityCoords(ped)

if not id or #(playerCoords - pedCoords) > 1.8 or not (client.hasGroup(shared.police) or canOpenTarget(ped)) then
if not id or #(playerCoords - pedCoords) > maxDistance or not (client.hasGroup(shared.police) or canOpenTarget(ped)) then
client.closeInventory()
lib.notify({ id = 'inventory_lost_access', type = 'error', description = locale('inventory_lost_access') })
else
TaskTurnPedToFaceCoord(playerPed, pedCoords.x, pedCoords.y, pedCoords.z, 50)
end

elseif currentInventory.coords and (#(playerCoords - currentInventory.coords) > (currentInventory.distance or 2.0) or canOpenTarget(playerPed)) then
elseif currentInventory.coords and (#(playerCoords - currentInventory.coords) > maxDistance or canOpenTarget(playerPed)) then
client.closeInventory()
lib.notify({ id = 'inventory_lost_access', type = 'error', description = locale('inventory_lost_access') })
end
Expand Down Expand Up @@ -1391,6 +1401,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
end

if weaponHash ~= currentWeapon.hash then
lib.print.info(('%s was forcibly unequipped (caused by game behaviour or another resource)'):format(currentWeapon.name))
currentWeapon = Weapon.Disarm(currentWeapon, true)
end
end
Expand Down Expand Up @@ -1522,8 +1533,8 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
while IsPedPlantingBomb(playerPed) do Wait(0) end

TriggerServerEvent('ox_inventory:updateWeapon', 'throw', nil, weapon.slot)
plyState:set('invBusy', false, true)

plyState.invBusy = false
currentWeapon = nil

RemoveWeaponFromPed(playerPed, weapon.hash)
Expand All @@ -1538,7 +1549,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
end
end)

plyState:set('invBusy', false, false)
plyState:set('invBusy', false, true)
plyState:set('invOpen', false, false)
plyState:set('invHotkeys', true, false)
plyState:set('canUseWeapons', true, false)
Expand Down Expand Up @@ -1647,7 +1658,12 @@ local function giveItemToTarget(serverId, slotId, count)
end

Utils.PlayAnim(0, 'mp_common', 'givetake1_a', 1.0, 1.0, 2000, 50, 0.0, 0, 0, 0)
TriggerServerEvent('ox_inventory:giveItem', slotId, serverId, count or 0)

local notification = lib.callback.await('ox_inventory:giveItem', false, slotId, serverId, count or 0)

if notification then
lib.notify({ type = 'error', description = locale(table.unpack(notification)) })
end
end

exports('giveItemToTarget', giveItemToTarget)
Expand Down
2 changes: 1 addition & 1 deletion fxmanifest.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ lua54 'yes'
game 'gta5'
name 'ox_inventory'
author 'Overextended'
version '2.41.0'
version '2.43.5'
repository 'https://github.com/overextended/ox_inventory'
description 'Slot-based inventory with item metadata support'

Expand Down
2 changes: 1 addition & 1 deletion init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ end

function shared.print(...) print(string.strjoin(' ', ...)) end

function shared.info(...) shared.print('^2[info]^7', ...) end
function shared.info(...) lib.print.info(string.strjoin(' ', ...)) end

---Throws a formatted type error.
---```lua
Expand Down
26 changes: 17 additions & 9 deletions locales/da.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ui_close": "Luk",
"ui_drop": "Smid",
"ui_removeattachments": "Fjern tilbehør",
"ui_copy": "Copy serial number",
"ui_copy": "Kopier serie nummer",
"ui_durability": "Holdbarhed",
"ui_ammo": "Ammunition",
"ui_serial": "Serienummer",
Expand All @@ -16,7 +16,9 @@
"ui_shift_drag": "Del tingene op i halvdele",
"ui_ctrl_shift_lmb": "Flyt hurtigt en halv stak ting til et andet inventar",
"ui_alt_lmb": "Brug en ting hurtigt",
"ui_ctrl_c": "When hovering over a weapon, copies it's serial number",
"ui_ctrl_c": "Når du holder musen over våben, kan du se serie nummer",
"ui_remove_ammo": "Fjern ammu",
"ammo_type": "Ammu type",
"$": "DKK",
"male": "Mand",
"female": "Kvinde",
Expand All @@ -30,13 +32,13 @@
"inventory_player_access": "Du kan ikke åbne dit inventar lige nu",
"inventory_right_access": "Du kan ikke åbne dette inventar",
"inventory_lost_access": "Du kan ikke længere tilgå dette inventar",
"wrong_ammo": "Di lam olle æade %s med %s ammunition",
"wrong_ammo": "Du kan ikke lade %s med %s ammunition",
"weapon_license": "Våben Licens",
"already_have": "Du har en våben licens",
"have_purchased": "Du har købt en våben licens",
"can_not_afford": "Du har ikke råd til en våben licens",
"purchase_license": "Køb licens",
"interact_prompt": "Interact with [%s]",
"interact_prompt": "Interagér med [%s]",
"weapon_unregistered": "%s er ikke registreret til nogen",
"weapon_registered": "%s (%s) er registreret til %s",
"weapon_broken": "Dette våben er i stykker",
Expand All @@ -46,11 +48,12 @@
"buy_amount": "Du skal enter et antal du ønsker at købe",
"component_has": "Dette våben har allerede %s",
"component_invalid": "Dette våben kan ikke benytte %s",
"component_slot_occupied": "Dette våben %s slot er optaget",
"cannot_perform": "Du kan ikke udføre denne handling",
"cannot_carry": "Du kan ikke bære så meget",
"cannot_carry_other": "Inventaret du prøver at lægge i kan ikke indeholde så meget",
"cannot_carry_limit": "You cannot carry more than %s %s",
"cannot_carry_limit_other": "Target cannot carry more than %s %s",
"cannot_carry_limit": "Kan ikke bære mere end %s %s",
"cannot_carry_limit_other": "enhed har ikke plads til mere %s %s",
"items_confiscated": "Dine ting er blevet konfiskeret",
"items_returned": "Dine ting er blevet returneret",
"item_unauthorised": "Du har ikke tilladelse til at købe denne ting",
Expand All @@ -66,8 +69,8 @@
"purchased_for": "Købte %s %s for %s%s",
"unable_stack_items": "Du kan ikke lægge disse ting i stakken",
"police_evidence": "Politi bevismateriale",
"open_police_evidence": "Open Police Evidence",
"open_stash": "Open Stash",
"open_police_evidence": "Åben politi beviseopbevaring",
"open_stash": "Åben opbevaring",
"locker_number": "Skabs nummer",
"locker_no_value": "Skal indeholde værdi for at åbne skabet",
"locker_must_number": "Skabet skal benytte et nummer",
Expand All @@ -81,5 +84,10 @@
"no_durability": "Holdbarhed udløbet",
"cannot_give": "Kan ikke give %s %s til person",
"evidence_cannot_take": "Ikke høj nok rangering til at tage bevismateriale",
"dumpster": "Skraldespand"
"dumpster": "Skraldespand",
"crafting_item": "Produktion %s",
"crafting_bench": "Arbejds bænk",
"open_crafting_bench": "Brug arbejdsbænk",
"not_enough_durability": "%s mangler holdbarhed",
"storage": "Opbevaring"
}
94 changes: 94 additions & 0 deletions locales/ro.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"ui_use": "Folosește",
"ui_give": "Oferă",
"ui_close": "Închide",
"ui_drop": "Aruncă",
"ui_removeattachments": "Scoate atașamentele",
"ui_copy": "Copiază numărul de serie",
"ui_durability": "Durabilitate",
"ui_ammo": "Muniție",
"ui_serial": "Numărul de serie",
"ui_components": "Componente",
"ui_tint": "Nuanţă",
"ui_usefulcontrols": "Controale folositoare",
"ui_rmb": "Deschide item context menu",
"ui_ctrl_lmb": "Mutați rapid un teanc de articole într-un alt inventar",
"ui_shift_drag": "Împărțiți cantitatea articolului în jumătate",
"ui_ctrl_shift_lmb": "Mută ​​rapid o jumătate de teanc de articole într-un alt inventar",
"ui_alt_lmb": "Utilizați rapid un articol",
"ui_ctrl_c": "Când treci cu mouse-ul peste o armă, copiază numărul de serie al acesteia",
"ui_remove_ammo": "Scoate muniția",
"ammo_type": "Tip de muniție",
"$": "$",
"male": "Bărbat",
"female": "Femeie",
"used": "Folosit",
"ui_removed": "Scos",
"ui_added": "Adăugat",
"ui_holstered": "Holstered",
"ui_equipped": "Echipat",
"using": "Folosești %s",
"inventory_setup": "Inventarul este gata de utilizare",
"inventory_player_access": "Nu vă puteți deschide inventarul acum",
"inventory_right_access": "Nu puteți deschide acest inventar",
"inventory_lost_access": "Nu se mai poate accesa acest inventar",
"wrong_ammo": "Nu poți încărca %s cu muniție de tip %s",
"license": "Licență de %s",
"already_have": "You already have a %s",
"have_purchased": "Ai achiziționat %s",
"can_not_afford": "Nu îți poți permite %s",
"purchase_license": "Achiziționează o licență de %s",
"interact_prompt": "Interact with [%s]",
"weapon_unregistered": "%s nu este înregistrată nimănui",
"weapon_registered": "%s (%s) este înregistrată lui %s",
"weapon_broken": "Aceasta armă este stricată",
"vehicle_locked": "Vehiculul este încuiat",
"nobody_nearby": "Nu se află nimeni în apropiere",
"give_amount": "Trebuie sa introduci o cantitate pe care să o oferi",
"buy_amount": "Trebuie sa introduci o cantitate pe care să o aciziționezi",
"component_has": "Această arma deja are %s",
"component_invalid": "Această arma este incompatibilă cu %s",
"component_slot_occupied": "This weapon's %s slot is already occupied",
"cannot_perform": "Nu puteți efectua această acțiune",
"cannot_carry": "Nu poți transporta atât de mult",
"cannot_carry_other": "Inventarul țintă nu poate conține atât de mult",
"cannot_carry_limit": "Nu poți transporta mai mult de %s %s",
"cannot_carry_limit_other": "Ținta nu poate transporta mai mult de %s %s",
"items_confiscated": "Articolele tale au fost confiscate",
"items_returned": "Articolele tale au fost returnate",
"item_unauthorised": "Nu sunteți autorizat să cumpărați acest articol",
"item_unlicensed": "Nu aveți licență pentru a cumpăra acest articol",
"item_not_enough": "Nu ai destul %s",
"cannot_afford": "Nu vă puteți permite (missing %s)",
"stash_lowgrade": "Nu sunteți autorizat să luați acest articol",
"cannot_use": "Imposibil de utilizat %s",
"shop_nostock": "Produsul este epuizat",
"identification": "Sex: %s \nData de naștere: %s",
"search_dumpster": "Caută in Tomberon",
"open_label": "Deschide %s",
"purchased_for": "Ai achiziționat %s %s pentru %s%s",
"unable_stack_items": "Nu puteți stivui aceste articole",
"police_evidence": "Dovezile Poliției",
"open_police_evidence": "Deschide Dovezile Poliției",
"open_stash": "Deschide Stash",
"locker_number": "Numărul dulapului",
"locker_no_value": "Trebuie să conțină valoare pentru a deschide dulapul",
"locker_must_number": "Dulapul trebuie să fie un număr",
"weapon_hand_required": "Trebuie să ai o armă în mână",
"weapon_hand_wrong": "Armă greșită în mână",
"open_player_inventory": "Deschide inventarul~",
"open_secondary_inventory": "Deschide inventarul secundar~",
"disable_hotbar": "Afiseaza bara rapida~",
"reload_weapon": "Incarca arma~",
"use_hotbar": "Utilizati elementul %s din bara rapida~",
"no_durability": "%s durabilitatea este epuizată",
"cannot_give": "Incapabil să oferi %s %s către țintă",
"evidence_cannot_take": "Nu sunteți autorizat să retrageți probe",
"dumpster": "Tomberon",
"crafting_item": "Confecționezi %s",
"crafting_bench": "Masă de lucru",
"open_crafting_bench": "Deschide Masa de Lucru",
"not_enough_durability": "%s nu are suficientă durabilitate",
"storage": "Depozit"
}

4 changes: 2 additions & 2 deletions modules/bridge/esx/client.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ local Weapon = require 'modules.weapon.client'

RegisterNetEvent('esx_policejob:handcuff', function()
PlayerData.cuffed = not PlayerData.cuffed
LocalPlayer.state:set('invBusy', PlayerData.cuffed, false)
LocalPlayer.state:set('invBusy', PlayerData.cuffed, true)

if not PlayerData.cuffed then return end

Expand All @@ -47,5 +47,5 @@ end)

RegisterNetEvent('esx_policejob:unrestrain', function()
PlayerData.cuffed = false
LocalPlayer.state:set('invBusy', PlayerData.cuffed, false)
LocalPlayer.state:set('invBusy', PlayerData.cuffed, true)
end)
9 changes: 6 additions & 3 deletions modules/bridge/esx/server.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ end)
local ESX

SetTimeout(500, function()
lib.checkDependency('es_extended', '1.6.0', true)

ESX = exports.es_extended:getSharedObject()
local customInventory = ESX.GetConfig().CustomInventory

if ESX.CreatePickup then
error('ox_inventory requires a ESX Legacy v1.6.0 or above, refer to the documentation.')
end
if customInventory ~= nil and customInventory ~= "ox" then
error('es_extended has not been configured to enable support for ox_inventory!\nEnsure Config.CustomInventory has been set to "ox" in your es_extended resource config.')
end

server.UseItem = ESX.UseItem
server.GetPlayerFromId = ESX.GetPlayerFromId
Expand Down
Loading

0 comments on commit 08edfd3

Please sign in to comment.