Skip to content

Compression On Inventory Sync #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TovarischPootis merged 3 commits into from
Apr 6, 2022
Merged

Compression On Inventory Sync #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1198b80
Update sv_base_inventory.lua
EvieMae Apr 6, 2022
12817f4
Update cl_base_inventory.lua
EvieMae Apr 6, 2022
0c726c6
Update cl_base_inventory.lua
EvieMae Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 37 additions & 29 deletions gamemode/core/meta/inventory/cl_base_inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,47 @@ net.Receive("nutInventoryData", function()
end)

net.Receive("nutInventoryInit", function()
local id = net.ReadType()
local typeID = net.ReadString()
local data = net.ReadTable()
local instance = nut.inventory.new(typeID)
instance.id = id
instance.data = data
instance.items = {}
local id = net.ReadType()
local typeID = net.ReadString()
local data = net.ReadTable()
local instance = nut.inventory.new(typeID)
instance.id = id
instance.data = data
instance.items = {}
local length = net.ReadUInt(32)
local data2 = net.ReadData(length)
local uncompressed_data = util.Decompress(data2)

local items = util.JSONToTable(uncompressed_data)

local expectedItems = net.ReadUInt(32)
local function readItem()
return net.ReadUInt(32), net.ReadString(), net.ReadTable(), net.ReadUInt(32)
end
local function readItem(I)
local c = items[I] -- i
return c.i, c.u, c.d, c.q
end

for i = 1, expectedItems do
local itemID, itemType, data, quantity = readItem()
local item = nut.item.new(itemType, itemID)
item.data = table.Merge(item.data, data)
item.invID = instance.id
item.quantity = quantity
instance.items[itemID] = item
hook.Run("ItemInitialized", item)
end
local datatable = items
local expectedItems = #datatable

nut.inventory.instances[instance.id] = instance
hook.Run("InventoryInitialized", instance)
for i = 1, expectedItems do
local itemID, itemType, data, quantity = readItem(i)
local item = nut.item.new(itemType, itemID)
item.data = table.Merge(item.data, data)
item.invID = instance.id
item.quantity = quantity
instance.items[itemID] = item
hook.Run("ItemInitialized", item)
end

for _, character in pairs(nut.char.loaded) do
for index, inventory in pairs(character.vars.inv) do
if (inventory:getID() == id) then
character.vars.inv[index] = instance
end
end
end
nut.inventory.instances[instance.id] = instance
hook.Run("InventoryInitialized", instance)

for _, character in pairs(nut.char.loaded) do
for index, inventory in pairs(character.vars.inv) do
if inventory:getID() == id then
character.vars.inv[index] = instance
end
end
end
end)

net.Receive("nutInventoryAdd", function()
Expand Down
57 changes: 32 additions & 25 deletions gamemode/core/meta/inventory/sv_base_inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,31 +280,38 @@ function Inventory:syncData(key, recipients)
end

function Inventory:sync(recipients)
net.Start("nutInventoryInit")
-- ID is not always a number.
net.WriteType(self.id)
net.WriteString(self.typeID)
net.WriteTable(self.data)
net.WriteUInt(table.Count(self.items), 32)
local function writeItem(item)
net.WriteUInt(item:getID(), 32)
net.WriteString(item.uniqueID)
net.WriteTable(item.data)
net.WriteUInt(item:getQuantity(), 32)
end

-- TODO:
-- Roughly 150 bytes per item * n items - 325 bytes < 64000 bytes
-- => n is roughly less than 428 items before net message limit reached.
-- Is this safe to assume inventories have at most 400 items?
for _, item in pairs(self.items) do
writeItem(item)
end
local res = net.Send(recipients or self:getRecipients())

for _, item in pairs(self.items) do
item:onSync(recipients)
end
net.Start("nutInventoryInit")
-- ID is not always a number.
net.WriteType(self.id)
net.WriteString(self.typeID)
net.WriteTable(self.data)
local items = {}

local function writeItem(item)
items[#items + 1] = {
i = item:getID(),
u = item.uniqueID,
d = item.data,
q = item:getQuantity()
}
end

for _, item in pairs(self.items) do
writeItem(item)
end

local compressedTable = util.Compress(util.TableToJSON(items))
net.WriteUInt(#compressedTable, 32)
net.WriteData(compressedTable, #compressedTable)
--local currentBytes, currentBits = net.BytesWritten()
--print("Current net message size: " .. currentBytes .. " bytes (" .. currentBits .. " bits)")


local res = net.Send(recipients or self:getRecipients())

for _, item in pairs(self.items) do
item:onSync(recipients)
end
end

function Inventory:delete()
Expand Down