From ecb357285879a7d19b61256639549e07e7e8fd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 11:56:36 +0200 Subject: [PATCH 01/24] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..6ff79975 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_addoninventory +ESX AddonInventory From 0e988247fa9fa15ebb729f075b3f73e87f32600b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 11:59:31 +0200 Subject: [PATCH 02/24] Update README.md --- README.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/README.md b/README.md index 6ff79975..8324bdbc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,36 @@ # fxserver-esx_addoninventory ESX AddonInventory + +[INSTALLATION] + +1) CD in your resources folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_addoninventory esx_addoninventory +``` +3) Add this in your server.cfg : + +``` +start esx_addoninventory +``` + +[USAGE] + +There is two types of inventories : shared and not shared. + +- Shared inventories dont belong to a specific user. Example : foodstore items. +- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example : property items money + +You must create the inventory in the database (addon_inventory) before using it : + +name = name of the inventory, label = label of the inventory, shared (0 or 1) = Is inventory shared + +``` +TriggerEvent('esx_addoninventory:getSharedInventory', 'main_grocery', function(inventory) + inventory.addItem('bread', 1) +end) + +TriggerEvent('esx_addoninventory:getInventory', 'property', 'steam:0123456789', function(inventory) + inventory.removeItem('water', 1) +end) +``` From 1a7f048e7ea420b06a456828f3babbfcb694584e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 12:01:13 +0200 Subject: [PATCH 03/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8324bdbc..692405a5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ start esx_addoninventory There is two types of inventories : shared and not shared. - Shared inventories dont belong to a specific user. Example : foodstore items. -- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example : property items money +- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example : property items You must create the inventory in the database (addon_inventory) before using it : From 65f67f4e0f0c512bf40bba5cd121d7d33f68a1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 12:02:21 +0200 Subject: [PATCH 04/24] Add files --- __resource.lua | 9 +++ server/classes/addoninventory.lua | 102 ++++++++++++++++++++++++ server/main.lua | 125 ++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+) create mode 100644 __resource.lua create mode 100644 server/classes/addoninventory.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..44dce451 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,9 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX AddonInventory' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'server/classes/addoninventory.lua', + 'server/main.lua' +} \ No newline at end of file diff --git a/server/classes/addoninventory.lua b/server/classes/addoninventory.lua new file mode 100644 index 00000000..fca3dbe9 --- /dev/null +++ b/server/classes/addoninventory.lua @@ -0,0 +1,102 @@ +function CreateAddonInventory(name, owner, items) + + local self = {} + + self.name = name + self.owner = owner + self.items = items + + self.addItem = function(name, count) + + local item = self.getItem(name) + item.count = item.count + count + + self.saveItem(name, item.count) + end + + self.removeItem = function(name, count) + + local item = self.getItem(name) + item.count = item.count - count + + self.saveItem(name, item.count) + end + + self.setItem = function(name, count) + + local item = self.getItem(name) + item.count = count + + self.saveItem(name, item.count) + end + + self.getItem = function(name) + + for i=1, #self.items, 1 do + if self.items[i].name == name then + return self.items[i] + end + end + + item = { + name = name, + count = 0, + label = Items[name] + } + + table.insert(self.items, item) + + if self.owner == nil then + MySQL.Async.execute( + 'INSERT INTO addon_inventory_items (inventory_name, name, count) VALUES (@inventory_name, @item_name, @count)', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = 0 + } + ) + else + MySQL.Async.execute( + 'INSERT INTO addon_inventory_items (inventory_name, name, count, owner) VALUES (@inventory_name, @item_name, @count, @owner)', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = 0, + ['@owner'] = self.owner + } + ) + end + + return item + + end + + self.saveItem = function(name, count) + + if self.owner == nil then + MySQL.Async.execute( + 'UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = count + } + ) + else + MySQL.Async.execute( + 'UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name AND owner = @owner', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = count, + ['@owner'] = self.owner + } + ) + end + + end + + return self + +end + diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..a821db2d --- /dev/null +++ b/server/main.lua @@ -0,0 +1,125 @@ +ESX = nil +Items = {} +local InventoriesIndex = {} +local Inventories = {} +local SharedInventories = {} + + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +AddEventHandler('onMySQLReady', function() + + local items = MySQL.Sync.fetchAll('SELECT * FROM items') + + for i=1, #items, 1 do + Items[items[i].name] = items[i].label + end + + local result = MySQL.Sync.fetchAll('SELECT * FROM addon_inventory') + + for i=1, #result, 1 do + + local name = result[i].name + local label = result[i].label + local shared = result[i].shared + + local result2 = MySQL.Sync.fetchAll( + 'SELECT * FROM addon_inventory_items WHERE inventory_name = @inventory_name', + { + ['@inventory_name'] = name + } + ) + + if shared == 0 then + + table.insert(InventoriesIndex, name) + + Inventories[name] = {} + local items = {} + + for j=1, #result2, 1 do + + local itemName = result2[j].name + local itemCount = result2[j].count + local itemOwner = result2[j].owner + + if items[itemOwner] == nil then + items[itemOwner] = {} + end + + table.insert(items[itemOwner], { + name = itemName, + count = itemCount, + label = Items[itemName] + }) + + end + + for k,v in pairs(items) do + local addonInventory = CreateAddonInventory(name, k, v) + table.insert(Inventories[name], addonInventory) + end + + else + + local items = {} + + for j=1, #result2, 1 do + table.insert(items, { + name = result2[j].name, + count = result2[j].count, + label = Items[result2[j].name] + }) + end + + local addonInventory = CreateAddonInventory(name, nil, items) + SharedInventories[name] = addonInventory + + end + + end + +end) + +function GetInventory(name, owner) + for i=1, #Inventories[name], 1 do + if Inventories[name][i].owner == owner then + return Inventories[name][i] + end + end +end + +function GetSharedInventory(name) + return SharedInventories[name] +end + +AddEventHandler('esx_addoninventory:getInventory', function(name, owner, cb) + cb(GetInventory(name, owner)) +end) + +AddEventHandler('esx_addoninventory:getSharedInventory', function(name, cb) + cb(GetSharedInventory(name)) +end) + +AddEventHandler('esx:playerLoaded', function(source) + + local xPlayer = ESX.GetPlayerFromId(source) + local addonInventories = {} + + for i=1, #InventoriesIndex, 1 do + + local name = InventoriesIndex[i] + local inventory = GetInventory(name, xPlayer.identifier) + + if inventory == nil then + inventory = CreateAddonInventory(name, xPlayer.identifier, {}) + table.insert(Inventories[name], inventory) + end + + table.insert(addonInventories, inventory) + + end + + xPlayer.set('addonInventories', addonInventories) + +end) From e93392f283f0c9d5cf81c1fa5854462e9d191020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 12:08:42 +0200 Subject: [PATCH 05/24] Add SQL file --- README.md | 3 ++- esx_addoninventory.sql | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 esx_addoninventory.sql diff --git a/README.md b/README.md index 692405a5..66b8939d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ ESX AddonInventory ``` git clone https://github.com/FXServer-ESX/fxserver-esx_addoninventory esx_addoninventory ``` -3) Add this in your server.cfg : +3) Import esx_addoninventory.sql in your database +1) Add this in your server.cfg : ``` start esx_addoninventory diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql new file mode 100644 index 00000000..a02c5700 --- /dev/null +++ b/esx_addoninventory.sql @@ -0,0 +1,16 @@ +CREATE TABLE `addon_inventory` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `shared` int(11) NOT NULL, + PRIMARY KEY (`id`) +); + +CREATE TABLE `addon_inventory_items` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_name` varchar(255) NOT NULL, + `name` varchar(255) NOT NULL, + `count` int(11) NOT NULL, + `owner` varchar(60) DEFAULT NULL, + PRIMARY KEY (`id`) +); From ffc6054d3368a55f94b33b9991ac55a6cb0dc32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:06:56 +0200 Subject: [PATCH 06/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66b8939d..141fe098 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ESX AddonInventory [INSTALLATION] -1) CD in your resources folder +1) CD in your resources/[ESX] folder 2) Clone the repository ``` git clone https://github.com/FXServer-ESX/fxserver-esx_addoninventory esx_addoninventory From 9df7e8e72f228ba9fd6c51bce990b5be97dab141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:09:18 +0200 Subject: [PATCH 07/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 141fe098..c47d91a8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ESX AddonInventory [INSTALLATION] -1) CD in your resources/[ESX] folder +1) CD in your resources/[esx] folder 2) Clone the repository ``` git clone https://github.com/FXServer-ESX/fxserver-esx_addoninventory esx_addoninventory From afc58f5e75bca2d41dca4fb9e76076cc85fa8007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 7 Aug 2017 12:21:24 +0200 Subject: [PATCH 08/24] Update esx_addoninventory.sql --- esx_addoninventory.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index a02c5700..5ae70805 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -1,3 +1,5 @@ +USE `essentialmode`; + CREATE TABLE `addon_inventory` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, From 3ad30b0ef3da11922f40f485e1a60f1084bd2776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:09:46 +0200 Subject: [PATCH 09/24] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 6651444c09ec0d1f760aa1c1af600bc0c1f358ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:16:26 +0200 Subject: [PATCH 10/24] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..22b7b313 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_addoninventory + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-esx_addoninventory Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 062912ed16507153b8690ce835e386585689c504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:18:16 +0200 Subject: [PATCH 11/24] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 44dce451..2ea3473a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX AddonInventory' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', 'server/classes/addoninventory.lua', From b39f5563c82bc4e81de8f9f8f2ef5ff5a035bb37 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:47:07 +0100 Subject: [PATCH 12/24] Fix message pack Error --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index a821db2d..f64180c1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -102,8 +102,8 @@ AddEventHandler('esx_addoninventory:getSharedInventory', function(name, cb) end) AddEventHandler('esx:playerLoaded', function(source) - - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) local addonInventories = {} for i=1, #InventoriesIndex, 1 do From bc648c672724f189336af3a77b8981b1d3887b45 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 3 Jul 2018 11:44:20 +0200 Subject: [PATCH 13/24] Minor changes --- README.md | 51 +++++++++++++++++++++++++++++------------- __resource.lua | 4 +++- esx_addoninventory.sql | 26 +++++++++++---------- 3 files changed, 53 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index c47d91a8..e604e62f 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,58 @@ -# fxserver-esx_addoninventory -ESX AddonInventory +# esx_addoninventory -[INSTALLATION] +## Download & Installation -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_addoninventory esx_addoninventory +fvm install --save --folder=esx esx-org/esx_addoninventory ``` -3) Import esx_addoninventory.sql in your database -1) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_addoninventory [esx]/esx_addoninventory +``` + +### Manually +- Download https://github.com/ESX-Org/esx_addoninventory/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Import `esx_addoninventory.sql` in your database +- Add this in your `server.cfg`: ``` start esx_addoninventory ``` -[USAGE] - +## Usage There is two types of inventories : shared and not shared. -- Shared inventories dont belong to a specific user. Example : foodstore items. -- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example : property items +- Shared inventories dont belong to a specific user. Example: foodstore items. +- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example: property items You must create the inventory in the database (addon_inventory) before using it : name = name of the inventory, label = label of the inventory, shared (0 or 1) = Is inventory shared -``` +```lua TriggerEvent('esx_addoninventory:getSharedInventory', 'main_grocery', function(inventory) - inventory.addItem('bread', 1) + inventory.addItem('bread', 1) end) TriggerEvent('esx_addoninventory:getInventory', 'property', 'steam:0123456789', function(inventory) - inventory.removeItem('water', 1) + inventory.removeItem('water', 1) end) + ``` +# Legal +### License +esx_addoninventory - inventories! + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 2ea3473a..f6416a25 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,4 +8,6 @@ server_scripts { '@mysql-async/lib/MySQL.lua', 'server/classes/addoninventory.lua', 'server/main.lua' -} \ No newline at end of file +} + +dependency 'es_extended' \ No newline at end of file diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index 5ae70805..424ba207 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -1,18 +1,20 @@ USE `essentialmode`; CREATE TABLE `addon_inventory` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `label` varchar(255) NOT NULL, - `shared` int(11) NOT NULL, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `shared` int(11) NOT NULL, + + PRIMARY KEY (`id`) ); CREATE TABLE `addon_inventory_items` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `inventory_name` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `count` int(11) NOT NULL, - `owner` varchar(60) DEFAULT NULL, - PRIMARY KEY (`id`) -); + `id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_name` varchar(255) NOT NULL, + `name` varchar(255) NOT NULL, + `count` int(11) NOT NULL, + `owner` varchar(60) DEFAULT NULL, + + PRIMARY KEY (`id`) +); \ No newline at end of file From a7106978574b7a57519d9521598e81d4496092fa Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:49:48 -0400 Subject: [PATCH 14/24] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 7f729de3fe192328cf81bfdd88097e3a2e7ec7f0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Sep 2018 16:55:37 +0200 Subject: [PATCH 15/24] mysql-async v3.0.1 support --- README.md | 2 +- __resource.lua | 4 +- server/classes/addoninventory.lua | 69 ++++++++++++------------------- server/main.lua | 22 +++------- 4 files changed, 34 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index e604e62f..113f008d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ You must create the inventory in the database (addon_inventory) before using it name = name of the inventory, label = label of the inventory, shared (0 or 1) = Is inventory shared ```lua -TriggerEvent('esx_addoninventory:getSharedInventory', 'main_grocery', function(inventory) +TriggerEvent('esx_addoninventory:getSharedInventory', 'society_police', function(inventory) inventory.addItem('bread', 1) end) diff --git a/__resource.lua b/__resource.lua index f6416a25..8362acc0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,8 +1,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' -description 'ESX AddonInventory' +description 'ESX Addon Inventory' -version '1.0.0' +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/server/classes/addoninventory.lua b/server/classes/addoninventory.lua index fca3dbe9..4fd7e9bf 100644 --- a/server/classes/addoninventory.lua +++ b/server/classes/addoninventory.lua @@ -1,5 +1,4 @@ function CreateAddonInventory(name, owner, items) - local self = {} self.name = name @@ -7,7 +6,6 @@ function CreateAddonInventory(name, owner, items) self.items = items self.addItem = function(name, count) - local item = self.getItem(name) item.count = item.count + count @@ -15,7 +13,6 @@ function CreateAddonInventory(name, owner, items) end self.removeItem = function(name, count) - local item = self.getItem(name) item.count = item.count - count @@ -23,7 +20,6 @@ function CreateAddonInventory(name, owner, items) end self.setItem = function(name, count) - local item = self.getItem(name) item.count = count @@ -31,7 +27,6 @@ function CreateAddonInventory(name, owner, items) end self.getItem = function(name) - for i=1, #self.items, 1 do if self.items[i].name == name then return self.items[i] @@ -47,56 +42,44 @@ function CreateAddonInventory(name, owner, items) table.insert(self.items, item) if self.owner == nil then - MySQL.Async.execute( - 'INSERT INTO addon_inventory_items (inventory_name, name, count) VALUES (@inventory_name, @item_name, @count)', - { - ['@inventory_name'] = self.name, - ['@item_name'] = name, - ['@count'] = 0 - } - ) + MySQL.Async.execute('INSERT INTO addon_inventory_items (inventory_name, name, count) VALUES (@inventory_name, @item_name, @count)', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = 0 + }) else - MySQL.Async.execute( - 'INSERT INTO addon_inventory_items (inventory_name, name, count, owner) VALUES (@inventory_name, @item_name, @count, @owner)', - { - ['@inventory_name'] = self.name, - ['@item_name'] = name, - ['@count'] = 0, - ['@owner'] = self.owner - } - ) + MySQL.Async.execute('INSERT INTO addon_inventory_items (inventory_name, name, count, owner) VALUES (@inventory_name, @item_name, @count, @owner)', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = 0, + ['@owner'] = self.owner + }) end return item - end self.saveItem = function(name, count) - if self.owner == nil then - MySQL.Async.execute( - 'UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name', - { - ['@inventory_name'] = self.name, - ['@item_name'] = name, - ['@count'] = count - } - ) + MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = count + }) else - MySQL.Async.execute( - 'UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name AND owner = @owner', - { - ['@inventory_name'] = self.name, - ['@item_name'] = name, - ['@count'] = count, - ['@owner'] = self.owner - } - ) + MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name AND owner = @owner', + { + ['@inventory_name'] = self.name, + ['@item_name'] = name, + ['@count'] = count, + ['@owner'] = self.owner + }) end - end return self - end diff --git a/server/main.lua b/server/main.lua index f64180c1..3fe3bb57 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,8 +7,7 @@ local SharedInventories = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('onMySQLReady', function() - +MySQL.ready(function() local items = MySQL.Sync.fetchAll('SELECT * FROM items') for i=1, #items, 1 do @@ -18,17 +17,13 @@ AddEventHandler('onMySQLReady', function() local result = MySQL.Sync.fetchAll('SELECT * FROM addon_inventory') for i=1, #result, 1 do - local name = result[i].name local label = result[i].label local shared = result[i].shared - local result2 = MySQL.Sync.fetchAll( - 'SELECT * FROM addon_inventory_items WHERE inventory_name = @inventory_name', - { - ['@inventory_name'] = name - } - ) + local result2 = MySQL.Sync.fetchAll('SELECT * FROM addon_inventory_items WHERE inventory_name = @inventory_name', { + ['@inventory_name'] = name + }) if shared == 0 then @@ -38,7 +33,6 @@ AddEventHandler('onMySQLReady', function() local items = {} for j=1, #result2, 1 do - local itemName = result2[j].name local itemCount = result2[j].count local itemOwner = result2[j].owner @@ -52,7 +46,6 @@ AddEventHandler('onMySQLReady', function() count = itemCount, label = Items[itemName] }) - end for k,v in pairs(items) do @@ -76,9 +69,7 @@ AddEventHandler('onMySQLReady', function() SharedInventories[name] = addonInventory end - end - end) function GetInventory(name, owner) @@ -103,11 +94,10 @@ end) AddEventHandler('esx:playerLoaded', function(source) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) local addonInventories = {} for i=1, #InventoriesIndex, 1 do - local name = InventoriesIndex[i] local inventory = GetInventory(name, xPlayer.identifier) @@ -117,9 +107,7 @@ AddEventHandler('esx:playerLoaded', function(source) end table.insert(addonInventories, inventory) - end xPlayer.set('addonInventories', addonInventories) - end) From c5aa786087e2d4ac53a36df966cf4343df5e81a9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:32:37 +0100 Subject: [PATCH 16/24] name as primary key --- README.md | 11 +++++++---- esx_addoninventory.sql | 5 ++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 113f008d..a3863058 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,17 @@ start esx_addoninventory ``` ## Usage -There is two types of inventories : shared and not shared. +There are two types of inventories: shared and not shared. - Shared inventories dont belong to a specific user. Example: foodstore items. -- Not shared inventories are created for every user in the server. They are created in db when player is loaded, Example: property items +- None-shared inventories are created for every user in the server. They are created in db when player is loaded, Example: property items -You must create the inventory in the database (addon_inventory) before using it : +### `addon_inventory` database information +An addon inventory must be configured in the database before using it. Don't forget to run a server restart afterwards (you can alternative restart the script and relog all clients) -name = name of the inventory, label = label of the inventory, shared (0 or 1) = Is inventory shared +| `name` | `label` | `shared` | +| -------- | ------- | -------- | +| name of the inventory | label of the inventory (not used) | is the inventory shared with others? (boolean either `0` or `1`) | ```lua TriggerEvent('esx_addoninventory:getSharedInventory', 'society_police', function(inventory) diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index 424ba207..7a664629 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -1,12 +1,11 @@ USE `essentialmode`; CREATE TABLE `addon_inventory` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, + `name` varchar(60) NOT NULL, `label` varchar(255) NOT NULL, `shared` int(11) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`name`) ); CREATE TABLE `addon_inventory_items` ( From 129223976aa16b01f9309c396681ed0670ec2e4a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 31 May 2019 23:18:39 +0200 Subject: [PATCH 17/24] Added missing mysql indexes --- README.md | 2 +- esx_addoninventory.sql | 20 +++++++++++--------- server/classes/addoninventory.lua | 6 ++---- server/main.lua | 16 ++++------------ 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index a3863058..ffbf5477 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ end) ### License esx_addoninventory - inventories! -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2019 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index 7a664629..d0601743 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -1,19 +1,21 @@ USE `essentialmode`; CREATE TABLE `addon_inventory` ( - `name` varchar(60) NOT NULL, - `label` varchar(255) NOT NULL, - `shared` int(11) NOT NULL, + `name` VARCHAR(60) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `shared` INT(11) NOT NULL, PRIMARY KEY (`name`) ); CREATE TABLE `addon_inventory_items` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `inventory_name` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `count` int(11) NOT NULL, - `owner` varchar(60) DEFAULT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `inventory_name` VARCHAR(255) NOT NULL, + `name` VARCHAR(255) NOT NULL, + `count` INT(11) NOT NULL, + `owner` VARCHAR(60) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `index_addon_inventory_items_inventory_name_name` (`inventory_name`, `name`), + INDEX `index_addon_inventory_items_inventory_name_name_owner` (`inventory_name`, `name`, `owner`) ); \ No newline at end of file diff --git a/server/classes/addoninventory.lua b/server/classes/addoninventory.lua index 4fd7e9bf..75614d1e 100644 --- a/server/classes/addoninventory.lua +++ b/server/classes/addoninventory.lua @@ -63,15 +63,13 @@ function CreateAddonInventory(name, owner, items) self.saveItem = function(name, count) if self.owner == nil then - MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name', - { + MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name', { ['@inventory_name'] = self.name, ['@item_name'] = name, ['@count'] = count }) else - MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name AND owner = @owner', - { + MySQL.Async.execute('UPDATE addon_inventory_items SET count = @count WHERE inventory_name = @inventory_name AND name = @item_name AND owner = @owner', { ['@inventory_name'] = self.name, ['@item_name'] = name, ['@count'] = count, diff --git a/server/main.lua b/server/main.lua index 3fe3bb57..a1c59453 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,9 +1,5 @@ -ESX = nil -Items = {} -local InventoriesIndex = {} -local Inventories = {} -local SharedInventories = {} - +local InventoriesIndex, Inventories, SharedInventories, Items = {}, {}, {}, {} +ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -54,7 +50,6 @@ MySQL.ready(function() end else - local items = {} for j=1, #result2, 1 do @@ -67,7 +62,6 @@ MySQL.ready(function() local addonInventory = CreateAddonInventory(name, nil, items) SharedInventories[name] = addonInventory - end end end) @@ -92,15 +86,13 @@ AddEventHandler('esx_addoninventory:getSharedInventory', function(name, cb) cb(GetSharedInventory(name)) end) -AddEventHandler('esx:playerLoaded', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) local addonInventories = {} for i=1, #InventoriesIndex, 1 do local name = InventoriesIndex[i] local inventory = GetInventory(name, xPlayer.identifier) - + if inventory == nil then inventory = CreateAddonInventory(name, xPlayer.identifier, {}) table.insert(Inventories[name], inventory) From 8d47719dbfc4a7b2911e90f661550f81069bb4d9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 31 May 2019 23:22:14 +0200 Subject: [PATCH 18/24] One more index --- esx_addoninventory.sql | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index d0601743..770cda76 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -10,12 +10,13 @@ CREATE TABLE `addon_inventory` ( CREATE TABLE `addon_inventory_items` ( `id` INT(11) NOT NULL AUTO_INCREMENT, - `inventory_name` VARCHAR(255) NOT NULL, - `name` VARCHAR(255) NOT NULL, + `inventory_name` VARCHAR(100) NOT NULL, + `name` VARCHAR(100) NOT NULL, `count` INT(11) NOT NULL, `owner` VARCHAR(60) DEFAULT NULL, PRIMARY KEY (`id`), INDEX `index_addon_inventory_items_inventory_name_name` (`inventory_name`, `name`), - INDEX `index_addon_inventory_items_inventory_name_name_owner` (`inventory_name`, `name`, `owner`) + INDEX `index_addon_inventory_items_inventory_name_name_owner` (`inventory_name`, `name`, `owner`), + INDEX `index_addon_inventory_inventory_name` (`inventory_name`) ); \ No newline at end of file From a4f28663c4e5bef42961396c51dcc3954b9b2175 Mon Sep 17 00:00:00 2001 From: JaroSound Date: Tue, 4 Jun 2019 18:22:24 +0200 Subject: [PATCH 19/24] Items cannot be local? https://github.com/ESX-Org/esx_addoninventory/issues/15 --- server/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index a1c59453..6a2eb0b0 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,4 +1,5 @@ -local InventoriesIndex, Inventories, SharedInventories, Items = {}, {}, {}, {} +Items = {} +local InventoriesIndex, Inventories, SharedInventories = {}, {}, {} ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) From 996a0f9e3b8d9664a11c4069c88cf36104389cd6 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:25:02 +0100 Subject: [PATCH 20/24] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (64%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 64% rename from __resource.lua rename to fxmanifest.lua index 8362acc0..6680ece9 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Addon Inventory' @@ -10,4 +12,4 @@ server_scripts { 'server/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependency 'es_extended' From 113ebe790c7990f89d0bfb4de9f7c58c7a9935e8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 23:26:14 +0100 Subject: [PATCH 21/24] Update esx_addoninventory.sql --- esx_addoninventory.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index 770cda76..eacaaff8 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -13,7 +13,7 @@ CREATE TABLE `addon_inventory_items` ( `inventory_name` VARCHAR(100) NOT NULL, `name` VARCHAR(100) NOT NULL, `count` INT(11) NOT NULL, - `owner` VARCHAR(60) DEFAULT NULL, + `owner` VARCHAR(40) DEFAULT NULL, PRIMARY KEY (`id`), INDEX `index_addon_inventory_items_inventory_name_name` (`inventory_name`, `name`), From c339d44214aaf4ec1e436df42fe85884df458cd1 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:47:14 +0200 Subject: [PATCH 22/24] 2020 update --- README.md | 2 +- esx_addoninventory.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ffbf5477..015bf74b 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ end) ### License esx_addoninventory - inventories! -Copyright (C) 2015-2019 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index eacaaff8..cb167e76 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `addon_inventory` ( `name` VARCHAR(60) NOT NULL, From 861d03555dff6e1c54bbcb089303c831d180d934 Mon Sep 17 00:00:00 2001 From: shortybsd Date: Sat, 16 May 2020 22:24:36 -0500 Subject: [PATCH 23/24] Update esx_addoninventory.sql INT - Integer display width is deprecated and will be removed in a future release. --- esx_addoninventory.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esx_addoninventory.sql b/esx_addoninventory.sql index cb167e76..b1946b78 100644 --- a/esx_addoninventory.sql +++ b/esx_addoninventory.sql @@ -3,20 +3,20 @@ USE `es_extended`; CREATE TABLE `addon_inventory` ( `name` VARCHAR(60) NOT NULL, `label` VARCHAR(100) NOT NULL, - `shared` INT(11) NOT NULL, + `shared` INT NOT NULL, PRIMARY KEY (`name`) ); CREATE TABLE `addon_inventory_items` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, + `id` INT NOT NULL AUTO_INCREMENT, `inventory_name` VARCHAR(100) NOT NULL, `name` VARCHAR(100) NOT NULL, - `count` INT(11) NOT NULL, + `count` INT NOT NULL, `owner` VARCHAR(40) DEFAULT NULL, PRIMARY KEY (`id`), INDEX `index_addon_inventory_items_inventory_name_name` (`inventory_name`, `name`), INDEX `index_addon_inventory_items_inventory_name_name_owner` (`inventory_name`, `name`, `owner`), INDEX `index_addon_inventory_inventory_name` (`inventory_name`) -); \ No newline at end of file +); From 5709570bc2cda27e08159536e3a6c9d1a3734915 Mon Sep 17 00:00:00 2001 From: giorgos94 <67142894+giorgos94@users.noreply.github.com> Date: Mon, 20 Jul 2020 17:14:51 +0300 Subject: [PATCH 24/24] Update addoninventory.lua (#34) * Update addoninventory.lua Fix issue where deposited item registers as 0 quantity/count in database * Update addoninventory.lua Co-authored-by: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> --- server/classes/addoninventory.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/classes/addoninventory.lua b/server/classes/addoninventory.lua index 75614d1e..e4f02a2c 100644 --- a/server/classes/addoninventory.lua +++ b/server/classes/addoninventory.lua @@ -8,7 +8,7 @@ function CreateAddonInventory(name, owner, items) self.addItem = function(name, count) local item = self.getItem(name) item.count = item.count + count - + Wait(100) self.saveItem(name, item.count) end