1.7.10 compatibility

This commit is contained in:
kepler155c
2018-03-20 05:00:52 -04:00
parent a9c7672fbf
commit b1afacfbb1

View File

@@ -1086,39 +1086,35 @@ function listingPage:applyFilter()
end end
local function getTurtleInventory() local function getTurtleInventory()
local list = { }
if duckAntenna then if duckAntenna then
for _,v in pairs(duckAntenna.getAllStacks(false)) do local list = duckAntenna.getAllStacks(false)
if v.qty > 0 then for _,v in pairs(list) do
v.name = v.id v.name = v.id
v.damage = v.dmg v.damage = v.dmg
v.displayName = v.display_name v.displayName = v.display_name
v.count = v.qty v.count = v.qty
v.maxDamage = v.max_dmg v.maxDamage = v.max_dmg
v.maxCount = v.max_size v.maxCount = v.max_size
v.nbtHash = v.nbt_hash v.nbtHash = v.nbt_hash
if not itemDB:get(v) then if not itemDB:get(v) then
itemDB:add(v) itemDB:add(v)
end
table.insert(list, v)
end end
end end
itemDB:flush() itemDB:flush()
else return list
for i = 1,16 do
local qty = turtle.getItemCount(i)
if qty > 0 then
turtleChestAdapter:insert(i, qty)
local items = turtleChestAdapter:listItems()
local _, item = next(items)
turtleChestAdapter:extract(1, qty, i)
table.insert(list, item)
end
end
end end
return list local inventory = { }
for i = 1,16 do
local qty = turtle.getItemCount(i)
if qty > 0 then
turtleChestAdapter:insert(i, qty)
local items = turtleChestAdapter:listItems()
_, inventory[i] = next(items)
turtleChestAdapter:extract(1, qty, i)
end
end
return inventory
end end
local function learnRecipe(page) local function learnRecipe(page)
@@ -1135,7 +1131,13 @@ local function learnRecipe(page)
ingredients = ingredients, ingredients = ingredients,
} }
if #results > 1 then local numResults = 0
for _,v in pairs(results) do
if v.count > 0 then
numResults = numResults + 1
end
end
if numResults > 1 then
for _,v1 in pairs(results) do for _,v1 in pairs(results) do
for _,v2 in pairs(ingredients) do for _,v2 in pairs(ingredients) do
if v1.name == v2.name and if v1.name == v2.name and