Revert "Revert "Merge pull request #1 from MarcelskyXD/develop-1.8""

This reverts commit c185cffa227af8116fcfc0f0d920e62e2f98d2b8.
This commit is contained in:
rspx
2023-03-25 17:41:52 +01:00
committed by Kan18
parent 43e662e68c
commit 488576e0df
3 changed files with 5 additions and 5 deletions

View File

@@ -58,7 +58,7 @@ function page.tabs.inventory:enable()
local list = { }
for k, item in pairs(inv) do
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(k) end)
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(k) end)
local key = makeKey(item)
if not list[key] then
item.key = key
@@ -129,7 +129,7 @@ Event.onInterval(5, function()
pcall(function() -- prevent errors from some mod items
for slot,v in pairs(ni.getInventory().list()) do
local item = itemDB:get(v, function() ni.getInventory().getItemMeta(slot) end)
local item = itemDB:get(v, function() ni.getInventory().getItemDetail(slot) end)
if item then
if context.state.autostore[makeKey(item)] then
context:sendRequest({

View File

@@ -53,7 +53,7 @@ function page:updateInventoryList()
for slot, item in pairs(inv) do
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(slot) end)
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(slot) end)
local key = makeKey(item)
if not list[key] then
item.displayName = item.displayName:match('(.+) %(damage:.+%)') or item.displayName
@@ -89,7 +89,7 @@ function page:depositAll()
local inv = ni.getInventory().list()
for slot, item in pairs(inv) do
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(slot) end)
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(slot) end)
local key = makeKey(item)
if not context.state.depositAll.retain[key] then
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then

View File

@@ -33,7 +33,7 @@ function page:enable()
local list = { }
for k, item in pairs(inv) do
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(k) end)
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(k) end)
local key = itemDB:makeKey(item)
if not list[key] then
item.key = key