Revert "Merge pull request #1 from MarcelskyXD/develop-1.8"
This reverts commit f7ac0b1674ee7558578a3c127a4f252dc159eeac, reversing changes made to a76c59fb361732b111ee3d7965d61372c1c33da8.
This commit is contained in:
@@ -58,7 +58,7 @@ function page.tabs.inventory:enable()
|
|||||||
local list = { }
|
local list = { }
|
||||||
|
|
||||||
for k, item in pairs(inv) do
|
for k, item in pairs(inv) do
|
||||||
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(k) end)
|
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(k) end)
|
||||||
local key = makeKey(item)
|
local key = makeKey(item)
|
||||||
if not list[key] then
|
if not list[key] then
|
||||||
item.key = key
|
item.key = key
|
||||||
@@ -129,7 +129,7 @@ Event.onInterval(5, function()
|
|||||||
|
|
||||||
pcall(function() -- prevent errors from some mod items
|
pcall(function() -- prevent errors from some mod items
|
||||||
for slot,v in pairs(ni.getInventory().list()) do
|
for slot,v in pairs(ni.getInventory().list()) do
|
||||||
local item = itemDB:get(v, function() ni.getInventory().getItemDetail(slot) end)
|
local item = itemDB:get(v, function() ni.getInventory().getItemMeta(slot) end)
|
||||||
if item then
|
if item then
|
||||||
if context.state.autostore[makeKey(item)] then
|
if context.state.autostore[makeKey(item)] then
|
||||||
context:sendRequest({
|
context:sendRequest({
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ function page:updateInventoryList()
|
|||||||
|
|
||||||
for slot, item in pairs(inv) do
|
for slot, item in pairs(inv) do
|
||||||
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then
|
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then
|
||||||
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(slot) end)
|
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(slot) end)
|
||||||
local key = makeKey(item)
|
local key = makeKey(item)
|
||||||
if not list[key] then
|
if not list[key] then
|
||||||
item.displayName = item.displayName:match('(.+) %(damage:.+%)') or item.displayName
|
item.displayName = item.displayName:match('(.+) %(damage:.+%)') or item.displayName
|
||||||
@@ -89,7 +89,7 @@ function page:depositAll()
|
|||||||
local inv = ni.getInventory().list()
|
local inv = ni.getInventory().list()
|
||||||
|
|
||||||
for slot, item in pairs(inv) do
|
for slot, item in pairs(inv) do
|
||||||
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(slot) end)
|
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(slot) end)
|
||||||
local key = makeKey(item)
|
local key = makeKey(item)
|
||||||
if not context.state.depositAll.retain[key] then
|
if not context.state.depositAll.retain[key] then
|
||||||
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then
|
if (context.state.depositAll.includeHotbar or slot > 9) and item.name ~= 'plethora:neuralconnector' then
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ function page:enable()
|
|||||||
local list = { }
|
local list = { }
|
||||||
|
|
||||||
for k, item in pairs(inv) do
|
for k, item in pairs(inv) do
|
||||||
item = itemDB:get(item, function() return ni.getInventory().getItemDetail(k) end)
|
item = itemDB:get(item, function() return ni.getInventory().getItemMeta(k) end)
|
||||||
local key = itemDB:makeKey(item)
|
local key = itemDB:makeKey(item)
|
||||||
if not list[key] then
|
if not list[key] then
|
||||||
item.key = key
|
item.key = key
|
||||||
|
|||||||
Reference in New Issue
Block a user