1.7 fixes

apis/meAdapter.lua

@@ -1,41 +1,36 @@
 local class      = require('class')
-local Util       = require('util')
+local itemDB     = require('itemDB')
 local Peripheral = require('peripheral')
+local Util       = require('util')
 
-local MEProvider = class()
+local MEAdapter = class()
 
-function MEProvider:init(args)
+function MEAdapter:init(args)
   local defaults = {
     items = { },
     name = 'ME',
+    jobList = { },
+    direction = 'up',
+    wrapSide = 'bottom',
+    auto = false,
   }
   Util.merge(self, defaults)
   Util.merge(self, args)
 
-  if self.side then
-    local mep = peripheral.wrap('bottom')
-    if mep then
-      Util.merge(self, mep)
-    end
-  else
+  if self.auto then
     local mep = Peripheral.getByMethod('getAvailableItems')
     if mep then
       Util.merge(self, mep)
     end
+  else
+    local mep = peripheral.wrap(self.wrapSide)
+    if mep then
+      Util.merge(self, mep)
+    end
   end
-
-  local sides = {
-    top = 'down',
-    bottom = 'up',
-    east = 'west',
-    west = 'east',
-    north = 'south',
-    south = 'north',
-  }
-  self.oside = sides[self.direction or self.side]
 end
  
-function MEProvider:isValid()
+function MEAdapter:isValid()
   return self.getAvailableItems and self.getAvailableItems()
 end
 
@@ -74,7 +69,7 @@ local function convertItem(item)
   item.displayName = safeString(item.displayName)
 end
 
-function MEProvider:refresh()
+function MEAdapter:refresh()
   self.items = self.getAvailableItems('all')
   for _,v in pairs(self.items) do
     Util.merge(v, v.item)
@@ -83,34 +78,103 @@ function MEProvider:refresh()
   return self.items
 end
 
-function MEProvider:listItems()
+function MEAdapter:listItems()
   self:refresh()
   return self.items
 end
  
-function MEProvider:getItemInfo(name, damage)
- 
-  for key,item in pairs(self.items) do
-    if item.name == name and item.damage == damage then
+function MEAdapter:getItemInfo(item)
+   for key,i in pairs(self.items) do
+    if item.name == i.name and item.damage == i.damage and item.nbtHash == i.nbtHash then
       return item
     end
   end
 end
- 
-function MEProvider:craft(name, damage, count)
+
+function MEAdapter:isCPUAvailable()
+  local cpus = self.getCraftingCPUs() or { }
+  local available = false
+
+  for cpu,v in pairs(cpus) do
+    if not v.busy then
+      available = true
+    elseif not self.jobList[cpu] then -- something else is crafting something (don't know what)
+      return false                  -- return false since we are in an unknown state
+    end
+  end
+  return available
+end 
+
+function MEAdapter:craft(item, count)
+
+  if not self:isCPUAvailable() then
+    return false
+  end
 
   self:refresh()
 
-  local item = self:getItemInfo(name, damage)
-
+  local item = self:getItemInfo(item)
   if item and item.is_craftable then
 
-    self.requestCrafting({ id = name, dmg = damage }, count)
-    return true
+    local cpus = self.getCraftingCPUs() or { }
+    for cpu,v in pairs(cpus) do
+      if not v.busy then
+        self.requestCrafting({
+            id = item.name,
+            dmg = item.damage,
+            nbt_hash = item.nbtHash,
+          },
+          qty or 1,
+          cpu
+        )
+
+        os.sleep(0) -- tell it to craft, yet it doesn't show busy - try waiting a cycle...
+        cpus = self.getCraftingCPUs() or { }
+        if not cpus[cpu].busy then
+          -- print('sleeping again')
+          os.sleep(.1) -- sigh
+          cpus = self.getCraftingCPUs() or { }
+        end
+
+        -- not working :(
+        if cpus[cpu].busy then
+          self.jobList[cpu] = {
+            name = item.name,
+            damage = item.damage,
+            nbtHash = item.nbtHash,
+            count = count,
+          }
+          return true
+        end
+        break -- only need to try the first available cpu
+      end
+    end
+    return false
   end
 end
 
-function MEProvider:craftItems(items)
+function MEAdapter:getJobList()
+  local cpus = self.getCraftingCPUs() or { }
+  for cpu,v in pairs(cpus) do
+    if not v.busy then
+      self.jobList[cpu] = nil
+    end
+  end
+
+  return self.jobList
+end
+
+function MEAdapter:isCrafting(item)
+  for _,v in pairs(self:getJobList()) do
+    if v.name == item.name and 
+       v.damage == item.damage and 
+       v.nbtHash == item.nbtHash then
+      return true
+    end
+  end
+end
+
+function MEAdapter:craftItems(items)
   local cpus = self.getCraftingCPUs() or { }
   local count = 0
 
@@ -130,28 +194,36 @@ function MEProvider:craftItems(items)
   end
 end
 
-function MEProvider:provide(item, count, slot)
+function MEAdapter:provide(item, count, slot, direction)
   return pcall(function()
-    self.exportItem({
-      id = item.name,
-      dmg = item.damage
-    }, self.oside, count, slot)
+    while count > 0 do
+      local qty = math.min(count, 64)
+      local s, m = self.exportItem({
+        id = item.name,
+        dmg = item.damage
+      }, direction or self.direction, qty, slot)
+
+      if not s or s.size ~= qty then
+        break
+      end
+      count = count - 64
+    end
   end)
 end
  
-function MEProvider:insert(slot, count)
-  local s, m = pcall(function() self.pullItem(self.oside, slot, count) end)
+function MEAdapter:insert(slot, count)
+  local s, m = pcall(function() self.pullItem(self.direction, slot, count) end)
   if not s and m then
-    print('MEProvider:pullItem')
+    print('MEAdapter:pullItem')
     print(m)
     sleep(1)
-    s, m = pcall(function() self.pullItem(self.oside, slot, count) end)
+    s, m = pcall(function() self.pullItem(self.direction, slot, count) end)
     if not s and m then
-      print('MEProvider:pullItem')
+      print('MEAdapter:pullItem')
       print(m)
       read()
     end
   end
 end
 
-return MEProvider
+return MEAdapter