From 866283162b3d8171e6e4801bcc15f96bcaf0743c Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sat, 7 Jun 2025 21:59:03 -0400 Subject: [PATCH] touchup --- modules/inventory/_default/server.lua | 8 ++++---- modules/inventory/codem-inventory/server.lua | 4 ++-- modules/inventory/core_inventory/server.lua | 4 ++-- modules/inventory/jpr-inventory/server.lua | 4 ++-- modules/inventory/origen_inventory/server.lua | 3 ++- modules/inventory/ox_inventory/server.lua | 2 +- modules/inventory/ps-inventory/server.lua | 4 ++-- modules/inventory/qb-inventory/server.lua | 4 ++-- modules/inventory/qs-inventory/server.lua | 7 +++---- modules/inventory/tgiann-inventory/server.lua | 5 +++-- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 282bfd9..7394471 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -87,7 +87,7 @@ end ---This will open the specified stash for the src passed. ---@param src number ---@param _type string ----@param id number||string +---@param id number|string ---@return nil Inventory.OpenStash = function(src, _type, id) _type = _type or "stash" @@ -95,8 +95,8 @@ Inventory.OpenStash = function(src, _type, id) return false, Prints.Error("This Inventory Has Not Been Bridged For A Stash Feature.") end ---This will register a stash ----@param id number||string +---This will register a stash +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -104,7 +104,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/codem-inventory/server.lua b/modules/inventory/codem-inventory/server.lua index c1d713f..a41417e 100644 --- a/modules/inventory/codem-inventory/server.lua +++ b/modules/inventory/codem-inventory/server.lua @@ -108,7 +108,7 @@ end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -116,7 +116,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/core_inventory/server.lua b/modules/inventory/core_inventory/server.lua index cdfdd3d..25d7201 100644 --- a/modules/inventory/core_inventory/server.lua +++ b/modules/inventory/core_inventory/server.lua @@ -153,7 +153,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -161,7 +161,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end if not slots then slots = 30 end diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua index 8362184..3aad1d1 100644 --- a/modules/inventory/jpr-inventory/server.lua +++ b/modules/inventory/jpr-inventory/server.lua @@ -73,7 +73,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -81,7 +81,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 594e9cf..b4bf7a6 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -153,7 +153,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -161,6 +161,7 @@ end ---@param groups table ---@param coords table ---@return boolean +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 2b077c1..ac0c964 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -129,7 +129,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index 7bb44c2..09ff6f2 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -112,7 +112,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -120,7 +120,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index 5807125..52a5924 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -135,7 +135,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -143,7 +143,7 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 3d68dc3..3b40ab6 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -148,7 +148,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -156,9 +156,9 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) - if Inventory.Stashes[id] then return true end + if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { id = id, label = label, @@ -168,7 +168,6 @@ Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coor groups = groups, coords = coords } - --exports['qs-inventory']:RegisterStash(src, id, stashSlots, stashWeight) -- this needs to pass source to register, need to plan around this. return true, id end diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index f0c05fb..77773d5 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -115,7 +115,7 @@ Inventory.OpenStash = function(src, _type, id) end ---This will register a stash ----@param id number||string +---@param id number|string ---@param label string ---@param slots number ---@param weight number @@ -123,8 +123,9 @@ end ---@param groups table ---@param coords table ---@return boolean ----@return string +---@return string|number Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) + if Inventory.Stashes[id] then return true, id end Inventory.Stashes[id] = { id = id, label = label,