From 7f729de3fe192328cf81bfdd88097e3a2e7ec7f0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Sep 2018 16:55:37 +0200 Subject: [PATCH] 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)