peripheral overhaul + 1.7 fixes

2018-01-06 22:26:21 -05:00
parent f2b9efc80f
commit 44932ac515
12 changed files with 536 additions and 113 deletions
--- a/apis/chestAdapter18.lua
+++ b/apis/chestAdapter18.lua
@@ -32,7 +32,7 @@ function ChestAdapter:isValid()
 end

 function ChestAdapter:getCachedItemDetails(item, k)
-  local cached = itemDB:get(item, true)
+  local cached = itemDB:get(item)
  if cached then
    return cached
  end
@@ -44,7 +44,7 @@ function ChestAdapter:getCachedItemDetails(item, k)
    return
  end

-  return itemDB:add(item, detail)
+  return itemDB:add(detail)
 end

 function ChestAdapter:refresh(throttle)
@@ -163,8 +163,8 @@ function ChestAdapter:extract(slot, qty, toSlot)
  self.pushItems(self.direction, slot, qty, toSlot)
 end

-function ChestAdapter:insert(slot, qty)
-  self.pullItems(self.direction, slot, qty)
+function ChestAdapter:insert(slot, qty, toSlot)
+  self.pullItems(self.direction, slot, qty, toSlot)
 end

 return ChestAdapter
--- a/apis/inventoryAdapter.lua
+++ b/apis/inventoryAdapter.lua
@@ -5,8 +5,9 @@ local Adapter = { }
 function Adapter.wrap(args)
 	local adapters = {
 		--'refinedAdapter',
-    --'meAdapter',
    'chestAdapter18',
+
+    'meAdapter',
    'chestAdapter',
  }

--- a/apis/itemDB.lua
+++ b/apis/itemDB.lua
@@ -50,7 +50,7 @@ function itemDB:splitKey(key, item)
  return item
 end

-function itemDB:get(key, enforceNBT)
+function itemDB:get(key)
  if type(key) == 'string' then
    key = self:splitKey(key)
  end
@@ -89,7 +89,7 @@ end
  If the base item contains an NBT hash, then the NBT hash uniquely
  identifies this item.
 ]]--
-function itemDB:add(baseItem, detail)
+function itemDB:add(baseItem)
  local nItem = {
    name    = baseItem.name,
    damage  = baseItem.damage,
@@ -101,9 +101,9 @@ function itemDB:add(baseItem, detail)
 debug('--')
 debug('adding ' .. makeKey(nItem))

-  nItem.displayName = safeString(detail.displayName)
-  nItem.maxCount = detail.maxCount
-  nItem.maxDamage = detail.maxDamage
+  nItem.displayName = safeString(baseItem.displayName)
+  nItem.maxCount = baseItem.maxCount
+  nItem.maxDamage = baseItem.maxDamage

  for k,item in pairs(self.data) do
    if nItem.name == item.name and
--- a/apis/meAdapter.lua
+++ b/apis/meAdapter.lua
@@ -56,23 +56,24 @@ function MEAdapter:init(args)
    items = { },
    name = 'ME',
    jobList = { },
-    direction = 'up',
-    wrapSide = 'bottom',
  }
  Util.merge(self, defaults)
  Util.merge(self, args)

-  if self.autoDetect then
-    local mep = Peripheral.getByMethod('getAvailableItems')
-    if mep then
-      Util.merge(self, mep)
-    end
+  local chest
+
+  if not self.side then
+    chest = Peripheral.getByMethod('getAvailableItems')
  else
-    local mep = peripheral.wrap(self.wrapSide)
-    if mep then
-      Util.merge(self, mep)
+    chest = Peripheral.getBySide(self.side)
+    if chest and not chest.getAvailableItems then
+      chest = nil
    end
  end
+
+  if chest then
+    Util.merge(self, chest)
+  end
 end

 function MEAdapter:isValid()
@@ -87,11 +88,7 @@ function MEAdapter:refresh()
    convertItem(v)

    if not itemDB:get(v) then
-      local t = { }
-      for _,k in pairs(keys) do
-        t[k] = v[k]
-      end
-      itemDB:add(t)
+      itemDB:add(v, v)
    end
  end
  itemDB:flush()
--- a/apis/turtle/craft.lua
+++ b/apis/turtle/craft.lua
@@ -70,7 +70,7 @@ local function turtleCraft(recipe, qty, inventoryAdapter)
    inventoryAdapter:provide(item, provideQty, k)
    if turtle.getItemCount(k) == 0 then -- ~= qty then
                                        -- FIX: ingredients cannot be stacked
-debug('failed ' .. v .. ' - ' .. provideQty)
+--debug('failed ' .. v .. ' - ' .. provideQty)
      return false
    end
  end
--- a/apps/chestManager.lua
+++ b/apps/chestManager.lua
@@ -650,7 +650,6 @@ local itemPage = UI.Page {

 function itemPage:enable(item)
  self.item = item
-debug(self.item)

  self.form:setValues(item)
  self.titleBar.title = item.displayName or item.name
@@ -778,7 +777,7 @@ local listingPage = UI.Page {
    },
  },
  grid = UI.Grid {
-    y = 2, height = UI.term.height - 2,
+    y = 2, ey = -2,
    columns = {
      { heading = 'Name', key = 'displayName' , width = 22 },
      { heading = 'Qty',  key = 'count'       , width = 5  },
@@ -806,6 +805,7 @@ local listingPage = UI.Page {
  accelerators = {
    r = 'refresh',
    q = 'quit',
+    grid_select_right = 'craft',
  },
  displayMode = 0,
 }
@@ -866,7 +866,7 @@ function listingPage:eventHandler(event)
  elseif event.type == 'learn' then
    UI:setPage('learn')

-  elseif event.type == 'craft' then
+  elseif event.type == 'craft' or event.type == 'grid_select_right' then
    UI:setPage('craft', self.grid:getSelected())

  elseif event.type == 'forget' then
@@ -923,7 +923,6 @@ function listingPage:applyFilter()
 end

 local function getTurtleInventory()
-
  if duckAntenna then
    local list = duckAntenna.getAllStacks(false)
    for _,v in pairs(list) do
@@ -933,7 +932,11 @@ local function getTurtleInventory()
      v.count = v.qty
      v.maxDamage = v.max_dmg
      v.maxCount = v.max_size
+      if not itemDB:get(v) then
+        itemDB:add(v)
+      end
    end
+    itemDB:flush()
    return list
  end

@@ -1011,8 +1014,7 @@ local function learnRecipe(page)
        if recipe.maxCount ~= 64 then
          newRecipe.maxCount = recipe.maxCount
        end
-
-        for k,ingredient in pairs(ingredients) do
+        for k,ingredient in pairs(Util.shallowCopy(ingredients)) do
          if ingredient.maxDamage > 0 then
            ingredient.damage = '*'               -- I don't think this is right
          end
@@ -1256,7 +1258,7 @@ Event.onInterval(5, function()
          if item.count <= 0 then
            demandCrafting[key] = nil
            item.statusCode = 'success'
-            if item.eject then
+            if inventoryAdapter.eject and item.eject then
              inventoryAdapter:eject(item, item.ocount, inventoryAdapter.getMetadata().state.facing)
            end
          end
--- a/apps/crafter.lua
+++ b/apps/crafter.lua
@@ -241,7 +241,6 @@ local function craftItem(ikey, item, items, machineStatus)
    if turtle.getItemCount(slot) ~= maxCount * qty then -- ~= maxCount then FIXXX !!!
      item.status = 'Extract failed: ' .. (ingredient.displayName or itemDB:getName(ingredient))
      item.statusCode = STATUS_ERROR
-debug({ key, maxCount })
      return
    end
 --      c = c - maxCount
@@ -268,7 +267,6 @@ debug({ key, maxCount })
          l = { true }
        end
      end
-debug { s, l }
      if not s then
        item.statusCode = STATUS_ERROR
        item.status = l
@@ -376,7 +374,7 @@ local function craftItems()
      clearGrid()
    elseif item.need > 0 then
      item.status = 'no recipe'
-      item.statusCode = STATUS_WARNING
+      item.statusCode = STATUS_ERROR
    end
    jobListGrid:update()
    jobListGrid:draw()
--- a/apps/mirrorHost.lua
+++ b/apps/mirrorHost.lua
@@ -39,13 +39,6 @@ while true do
    end
  end)

-  -- ensure socket is connected
-  Event.onInterval(3, function(h)
-    if not socket:ping() then
-      Event.off(h)
-    end
-  end)
-
  while true do
    Event.pullEvent()
    if not socket.connected then
--- a/apps/storageActivity.lua
+++ b/apps/storageActivity.lua
@@ -150,7 +150,6 @@ function changedPage:refresh()
    end

    self.grid:setValues(changedItems)
-    debug(storage:getPercentUsed())
  end
  self.grid:draw()
 end
--- a/apps/termShare.lua
+++ b/apps/termShare.lua
@@ -11,9 +11,12 @@ local name = args[1] or error('Syntax: termShare [device name] <title>')
 local title = args[2]

 device[name] = term.current()
+device[name].name = name
+device[name].side = name
+device[name].type = 'terminal'

 if title then
 	multishell.setTitle(multishell.getCurrent(), title)
 end
-os.pullEvent('char')
-device[name] = nil
+os.pullEvent('terminate')
+os.queueEvent('peripheral_detach', name)
--- a/etc/recipes/computercraft.db
+++ b/etc/recipes/computercraft.db
@@ -13,6 +13,35 @@
    },
    count = 1,
  },
+  [ "computercraft:pocket_computer:1" ] = {
+    count = 1,
+    ingredients = {
+      "minecraft:gold_ingot:0",
+      "minecraft:gold_ingot:0",
+      "minecraft:gold_ingot:0",
+      [ 9 ] = "minecraft:gold_ingot:0",
+      [ 10 ] = "minecraft:glass_pane:0",
+      [ 11 ] = "minecraft:gold_ingot:0",
+      [ 5 ] = "minecraft:gold_ingot:0",
+      [ 6 ] = "minecraft:golden_apple:0",
+      [ 7 ] = "minecraft:gold_ingot:0",
+    },
+    maxCount = 1,
+  },
+  [ "computercraft:peripheral:0" ] = {
+    ingredients = {
+      "minecraft:stone:0",
+      "minecraft:stone:0",
+      "minecraft:stone:0",
+      [ 9 ] = "minecraft:stone:0",
+      [ 10 ] = "minecraft:redstone:0",
+      [ 11 ] = "minecraft:stone:0",
+      [ 5 ] = "minecraft:stone:0",
+      [ 6 ] = "minecraft:redstone:0",
+      [ 7 ] = "minecraft:stone:0",
+    },
+    count = 1,
+  },
  [ "computercraft:peripheral:4" ] = {
    ingredients = {
      "minecraft:gold_ingot:0",
@@ -27,6 +56,20 @@
    },
    count = 4,
  },
+  [ "computercraft:advanced_modem:0" ] = {
+    ingredients = {
+      "minecraft:gold_ingot:0",
+      "minecraft:gold_ingot:0",
+      "minecraft:gold_ingot:0",
+      [ 9 ] = "minecraft:gold_ingot:0",
+      [ 10 ] = "minecraft:gold_ingot:0",
+      [ 11 ] = "minecraft:gold_ingot:0",
+      [ 5 ] = "minecraft:gold_ingot:0",
+      [ 6 ] = "minecraft:ender_eye:0",
+      [ 7 ] = "minecraft:gold_ingot:0",
+    },
+    count = 1,
+  },
  [ "computercraft:computer:16384" ] = {
    ingredients = {
      "minecraft:gold_ingot:0",
--- a/etc/recipes/enderio.db
+++ b/etc/recipes/enderio.db
@@ -1,4 +1,335 @@
 {
+  [ "enderio:blockAlloySmelter:0" ] = {
+    ingredients = {
+      "minecraft:iron_ingot:0",
+      "minecraft:furnace:0",
+      "minecraft:iron_ingot:0",
+      [ 9 ] = "minecraft:iron_ingot:0",
+      [ 10 ] = "minecraft:cauldron:0",
+      [ 11 ] = "minecraft:iron_ingot:0",
+      [ 5 ] = "minecraft:furnace:0",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "minecraft:furnace:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockBuffer:0" ] = {
+    ingredients = {
+      "minecraft:iron_ingot:0",
+      "enderio:itemAlloy:0",
+      "minecraft:iron_ingot:0",
+      [ 9 ] = "minecraft:iron_ingot:0",
+      [ 10 ] = "enderio:itemAlloy:0",
+      [ 11 ] = "minecraft:iron_ingot:0",
+      [ 5 ] = "enderio:itemAlloy:0",
+      [ 6 ] = "minecraft:chest:0",
+      [ 7 ] = "enderio:itemAlloy:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockCapBank:3" ] = {
+    ingredients = {
+      "enderio:itemAlloy:0",
+      "enderio:itemBasicCapacitor:2",
+      "enderio:itemAlloy:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "enderio:itemBasicCapacitor:2",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:itemBasicCapacitor:2",
+      [ 6 ] = "enderio:itemMaterial:6",
+      [ 7 ] = "enderio:itemBasicCapacitor:2",
+    },
+    count = 1,
+  },
+  [ "enderio:blockExperienceObelisk:0" ] = {
+    ingredients = {
+      [ 9 ] = "enderio:itemAlloy:7",
+      [ 10 ] = "enderio:itemMachinePart:0",
+      [ 11 ] = "enderio:itemAlloy:7",
+      [ 2 ] = "enderio:itemXpTransfer:0",
+      [ 6 ] = "enderio:itemAlloy:7",
+    },
+    count = 1,
+  },
+  [ "enderio:blockFarmStation:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:0",
+      "minecraft:diamond_hoe:*",
+      "enderio:itemAlloy:0",
+      [ 9 ] = "enderio:itemMaterial:5",
+      [ 10 ] = "enderio:itemFrankenSkull:1",
+      [ 11 ] = "enderio:itemMaterial:5",
+      [ 5 ] = "enderio:itemAlloy:0",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "enderio:itemAlloy:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockKillerJoe:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:6",
+      "enderio:itemAlloy:6",
+      "enderio:itemAlloy:6",
+      [ 9 ] = "enderio:blockFusedQuartz:0",
+      [ 10 ] = "enderio:blockFusedQuartz:0",
+      [ 11 ] = "enderio:blockFusedQuartz:0",
+      [ 5 ] = "enderio:blockFusedQuartz:0",
+      [ 6 ] = "enderio:itemFrankenSkull:2",
+      [ 7 ] = "enderio:blockFusedQuartz:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockPainter:0" ] = {
+    ingredients = {
+      "minecraft:quartz:0",
+      "minecraft:diamond:0",
+      "minecraft:quartz:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "enderio:itemAlloy:0",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:itemAlloy:0",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "enderio:itemAlloy:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockReservoir:0" ] = {
+    ingredients = {
+      "enderio:blockFusedQuartz:0",
+      "enderio:blockFusedQuartz:0",
+      "enderio:blockFusedQuartz:0",
+      [ 9 ] = "enderio:blockFusedQuartz:0",
+      [ 10 ] = "enderio:blockFusedQuartz:0",
+      [ 11 ] = "enderio:blockFusedQuartz:0",
+      [ 5 ] = "enderio:blockFusedQuartz:0",
+      [ 6 ] = "minecraft:cauldron:0",
+      [ 7 ] = "enderio:blockFusedQuartz:0",
+    },
+    count = 4,
+  },
+  [ "enderio:blockSagMill:0" ] = {
+    ingredients = {
+      "minecraft:flint:0",
+      "minecraft:flint:0",
+      "minecraft:flint:0",
+      [ 9 ] = "minecraft:iron_ingot:0",
+      [ 10 ] = "minecraft:piston:0",
+      [ 11 ] = "minecraft:iron_ingot:0",
+      [ 5 ] = "minecraft:iron_ingot:0",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "minecraft:iron_ingot:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockSliceAndSplice:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:7",
+      "minecraft:skull:0",
+      "enderio:itemAlloy:7",
+      [ 9 ] = "enderio:itemAlloy:7",
+      [ 10 ] = "enderio:itemAlloy:7",
+      [ 11 ] = "enderio:itemAlloy:7",
+      [ 5 ] = "minecraft:iron_axe:*",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "minecraft:shears:*",
+    },
+    count = 1,
+  },
+  [ "enderio:blockSolarPanel:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:1",
+      "enderio:blockFusedQuartz:0",
+      "enderio:itemAlloy:1",
+      [ 9 ] = "enderio:itemBasicCapacitor:0",
+      [ 10 ] = "minecraft:daylight_detector:0",
+      [ 11 ] = "enderio:itemBasicCapacitor:0",
+      [ 5 ] = "enderio:itemAlloy:2",
+      [ 6 ] = "enderio:blockFusedQuartz:0",
+      [ 7 ] = "enderio:itemAlloy:2",
+    },
+    count = 1,
+  },
+  [ "enderio:blockSolarPanel:1" ] = {
+    ingredients = {
+      "enderio:itemAlloy:5",
+      "enderio:blockFusedQuartz:2",
+      "enderio:itemAlloy:5",
+      [ 9 ] = "enderio:itemBasicCapacitor:1",
+      [ 10 ] = "minecraft:daylight_detector:0",
+      [ 11 ] = "enderio:itemBasicCapacitor:1",
+      [ 5 ] = "enderio:itemAlloy:2",
+      [ 6 ] = "enderio:blockFusedQuartz:2",
+      [ 7 ] = "enderio:itemAlloy:2",
+    },
+    count = 1,
+  },
+  [ "enderio:blockSolarPanel:2" ] = {
+    ingredients = {
+      "enderio:itemAlloy:7",
+      "enderio:blockFusedQuartz:4",
+      "enderio:itemAlloy:7",
+      [ 9 ] = "enderio:blockSolarPanel:1",
+      [ 10 ] = "enderio:blockSolarPanel:1",
+      [ 11 ] = "enderio:blockSolarPanel:1",
+      [ 5 ] = "enderio:itemBasicCapacitor:2",
+      [ 6 ] = "enderio:itemMaterial:8",
+      [ 7 ] = "enderio:itemBasicCapacitor:2",
+    },
+    count = 1,
+  },
+  [ "enderio:blockSoulBinder:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:7",
+      "enderio:blockEndermanSkull:0",
+      "enderio:itemAlloy:7",
+      [ 9 ] = "enderio:itemAlloy:7",
+      [ 10 ] = "minecraft:skull:0",
+      [ 11 ] = "enderio:itemAlloy:7",
+      [ 5 ] = "minecraft:skull:4",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "minecraft:skull:2",
+    },
+    count = 1,
+  },
+  [ "enderio:blockTank:0" ] = {
+    ingredients = {
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_bars:0",
+      "minecraft:iron_ingot:0",
+      [ 9 ] = "minecraft:iron_ingot:0",
+      [ 10 ] = "minecraft:iron_bars:0",
+      [ 11 ] = "minecraft:iron_ingot:0",
+      [ 5 ] = "minecraft:iron_bars:0",
+      [ 6 ] = "minecraft:glass:0",
+      [ 7 ] = "minecraft:iron_bars:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockTransceiver:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:0",
+      "enderio:itemFrankenSkull:3",
+      "enderio:itemAlloy:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "enderio:itemBasicCapacitor:2",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:blockFusedQuartz:0",
+      [ 6 ] = "enderio:itemMaterial:8",
+      [ 7 ] = "enderio:blockFusedQuartz:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockVacuumChest:0" ] = {
+    ingredients = {
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_ingot:0",
+      [ 9 ] = "minecraft:iron_ingot:0",
+      [ 10 ] = "enderio:itemMaterial:5",
+      [ 11 ] = "minecraft:iron_ingot:0",
+      [ 5 ] = "minecraft:iron_ingot:0",
+      [ 6 ] = "minecraft:chest:0",
+      [ 7 ] = "minecraft:iron_ingot:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockVat:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:0",
+      "minecraft:cauldron:0",
+      "enderio:itemAlloy:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "minecraft:furnace:0",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:blockTank:0",
+      [ 6 ] = "enderio:itemMachinePart:0",
+      [ 7 ] = "enderio:blockTank:0",
+    },
+    count = 1,
+  },
+  [ "enderio:blockWirelessCharger:0" ] = {
+    ingredients = {
+      "enderio:itemAlloy:0",
+      "enderio:itemAlloy:0",
+      "enderio:itemAlloy:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "enderio:itemBasicCapacitor:2",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:itemAlloy:0",
+      [ 6 ] = "enderio:itemFrankenSkull:3",
+      [ 7 ] = "enderio:itemAlloy:0",
+    },
+    count = 1,
+  },
+  [ "enderio:itemBasicCapacitor:2" ] = {
+    ingredients = {
+      [ 10 ] = "enderio:itemAlloy:2",
+      [ 2 ] = "enderio:itemAlloy:2",
+      [ 5 ] = "enderio:itemBasicCapacitor:1",
+      [ 6 ] = "minecraft:glowstone:0",
+      [ 7 ] = "enderio:itemBasicCapacitor:1",
+    },
+    count = 1,
+  },
+  [ "enderio:itemBasicFilterUpgrade:0" ] = {
+    ingredients = {
+      [ 10 ] = "minecraft:paper:0",
+      [ 2 ] = "minecraft:paper:0",
+      [ 5 ] = "minecraft:paper:0",
+      [ 6 ] = "minecraft:hopper:0",
+      [ 7 ] = "minecraft:paper:0",
+    },
+    count = 1,
+  },
+  [ "enderio:itemBasicFilterUpgrade:1" ] = {
+    ingredients = {
+      "minecraft:redstone:0",
+      "minecraft:paper:0",
+      "minecraft:redstone:0",
+      [ 9 ] = "minecraft:redstone:0",
+      [ 10 ] = "minecraft:paper:0",
+      [ 11 ] = "minecraft:redstone:0",
+      [ 5 ] = "minecraft:paper:0",
+      [ 6 ] = "enderio:itemFrankenSkull:1",
+      [ 7 ] = "minecraft:paper:0",
+    },
+    count = 1,
+  },
+  [ "enderio:itemBasicFilterUpgrade:2" ] = {
+    ingredients = {
+      "minecraft:comparator:0",
+      "enderio:itemBasicFilterUpgrade:1",
+      "minecraft:comparator:0",
+    },
+    count = 1,
+  },
+  [ "enderio:itemConduitFacade:0" ] = {
+    ingredients = {
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:itemMaterial:1",
+      [ 7 ] = "enderio:itemMaterial:1",
+    },
+    count = 1,
+  },
+  [ "enderio:itemExtractSpeedUpgrade:0" ] = {
+    ingredients = {
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_ingot:0",
+      [ 9 ] = "enderio:itemAlloy:0",
+      [ 10 ] = "minecraft:redstone_torch:0",
+      [ 11 ] = "enderio:itemAlloy:0",
+      [ 5 ] = "enderio:itemAlloy:0",
+      [ 6 ] = "minecraft:piston:0",
+      [ 7 ] = "enderio:itemAlloy:0",
+    },
+    count = 1,
+  },
  [ "enderio:itemItemConduit:0" ] = {
    ingredients = {
      "enderio:itemMaterial:1",
@@ -13,18 +344,6 @@
    },
    count = 8,
  },
-  [ "enderio:itemMaterial:4" ] = {
-    ingredients = {
-      "enderio:itemAlloy:2",
-    },
-    count = 9,
-  },
-  [ "enderio:itemMaterial:3" ] = {
-    ingredients = {
-      "enderio:itemAlloy:5",
-    },
-    count = 9,
-  },
  [ "enderio:itemLiquidConduit:0" ] = {
    ingredients = {
      "enderio:itemMaterial:1",
@@ -39,29 +358,45 @@
    },
    count = 8,
  },
-  [ "enderio:itemBasicCapacitor:0" ] = {
+  [ "enderio:itemLiquidConduit:1" ] = {
    ingredients = {
-      [ 10 ] = "minecraft:gold_nugget:0",
-      [ 2 ] = "minecraft:gold_nugget:0",
-      [ 3 ] = "minecraft:redstone:0",
-      [ 5 ] = "minecraft:gold_nugget:0",
-      [ 6 ] = "thermalfoundation:material:128",
-      [ 7 ] = "minecraft:gold_nugget:0",
-      [ 9 ] = "minecraft:redstone:0",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:blockFusedQuartz:0",
+      [ 6 ] = "enderio:blockFusedQuartz:0",
+      [ 7 ] = "enderio:blockFusedQuartz:0",
    },
-    count = 1,
+    count = 8,
  },
-  [ "enderio:itemMaterial:5" ] = {
+  [ "enderio:itemLiquidConduit:2" ] = {
    ingredients = {
-      "enderio:itemMaterial:3",
-      "enderio:itemMaterial:3",
-      "enderio:itemMaterial:3",
-      [ 9 ] = "enderio:itemMaterial:3",
-      [ 10 ] = "enderio:itemMaterial:3",
-      [ 11 ] = "enderio:itemMaterial:3",
-      [ 5 ] = "enderio:itemMaterial:3",
-      [ 6 ] = "minecraft:diamond:0",
-      [ 7 ] = "enderio:itemMaterial:3",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:itemAlloy:2",
+      [ 6 ] = "enderio:blockFusedQuartz:0",
+      [ 7 ] = "enderio:itemAlloy:2",
+    },
+    count = 8,
+  },
+  [ "enderio:itemMachinePart:0" ] = {
+    ingredients = {
+      "minecraft:iron_bars:0",
+      "minecraft:iron_ingot:0",
+      "minecraft:iron_bars:0",
+      [ 9 ] = "minecraft:iron_bars:0",
+      [ 10 ] = "minecraft:iron_ingot:0",
+      [ 11 ] = "minecraft:iron_bars:0",
+      [ 5 ] = "minecraft:iron_ingot:0",
+      [ 6 ] = "enderio:itemBasicCapacitor:0",
+      [ 7 ] = "minecraft:iron_ingot:0",
    },
    count = 1,
  },
@@ -78,6 +413,46 @@
    },
    count = 1,
  },
+  [ "enderio:itemMaterial:2" ] = {
+    ingredients = {
+      "minecraft:gravel:0",
+      "minecraft:clay_ball:0",
+      "minecraft:gravel:0",
+      [ 9 ] = "minecraft:gravel:0",
+      [ 10 ] = "minecraft:clay_ball:0",
+      [ 11 ] = "minecraft:gravel:0",
+      [ 5 ] = "minecraft:sand:0",
+      [ 6 ] = "minecraft:gravel:0",
+      [ 7 ] = "minecraft:sand:0",
+    },
+    count = 8,
+  },
+  [ "enderio:itemMaterial:3" ] = {
+    ingredients = {
+      "enderio:itemAlloy:5",
+    },
+    count = 9,
+  },
+  [ "enderio:itemMaterial:4" ] = {
+    ingredients = {
+      "enderio:itemAlloy:2",
+    },
+    count = 9,
+  },
+  [ "enderio:itemMaterial:5" ] = {
+    ingredients = {
+      "enderio:itemMaterial:3",
+      "enderio:itemMaterial:3",
+      "enderio:itemMaterial:3",
+      [ 9 ] = "enderio:itemMaterial:3",
+      [ 10 ] = "enderio:itemMaterial:3",
+      [ 11 ] = "enderio:itemMaterial:3",
+      [ 5 ] = "enderio:itemMaterial:3",
+      [ 6 ] = "minecraft:diamond:0",
+      [ 7 ] = "enderio:itemMaterial:3",
+    },
+    count = 1,
+  },
  [ "enderio:itemMaterial:6" ] = {
    ingredients = {
      "enderio:itemMaterial:4",
@@ -92,6 +467,20 @@
    },
    count = 1,
  },
+  [ "enderio:itemPowerConduit:0" ] = {
+    ingredients = {
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:itemAlloy:4",
+      [ 6 ] = "enderio:itemAlloy:4",
+      [ 7 ] = "enderio:itemAlloy:4",
+    },
+    count = 8,
+  },
  [ "enderio:itemPowerConduit:1" ] = {
    ingredients = {
      "enderio:itemMaterial:1",
@@ -106,52 +495,50 @@
    },
    count = 8,
  },
-  [ "enderio:itemMaterial:2" ] = {
+  [ "enderio:itemPowerConduit:2" ] = {
    ingredients = {
-      "minecraft:gravel:0",
-      "minecraft:clay_ball:0",
-      "minecraft:gravel:0",
-      [ 9 ] = "minecraft:gravel:0",
-      [ 10 ] = "minecraft:clay_ball:0",
-      [ 11 ] = "minecraft:gravel:0",
-      [ 5 ] = "minecraft:sand:0",
-      [ 6 ] = "minecraft:gravel:0",
-      [ 7 ] = "minecraft:sand:0",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:itemAlloy:2",
+      [ 6 ] = "enderio:itemAlloy:2",
+      [ 7 ] = "enderio:itemAlloy:2",
    },
    count = 8,
  },
-  [ "enderio:itemBasicCapacitor:2" ] = {
+  [ "enderio:itemRedstoneConduit:0" ] = {
    ingredients = {
-      [ 10 ] = "enderio:itemAlloy:2",
-      [ 2 ] = "enderio:itemAlloy:2",
-      [ 5 ] = "enderio:itemBasicCapacitor:1",
-      [ 6 ] = "minecraft:glowstone:0",
-      [ 7 ] = "enderio:itemBasicCapacitor:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      "enderio:itemMaterial:1",
+      [ 9 ] = "enderio:itemMaterial:1",
+      [ 10 ] = "enderio:itemMaterial:1",
+      [ 11 ] = "enderio:itemMaterial:1",
+      [ 5 ] = "enderio:itemAlloy:3",
+      [ 6 ] = "enderio:itemAlloy:3",
+      [ 7 ] = "enderio:itemAlloy:3",
+    },
+    count = 8,
+  },
+  [ "enderio:itemSoulVessel:0" ] = {
+    ingredients = {
+      [ 7 ] = "enderio:blockFusedQuartz:0",
+      [ 2 ] = "enderio:itemAlloy:7",
+      [ 10 ] = "enderio:blockFusedQuartz:0",
+      [ 5 ] = "enderio:blockFusedQuartz:0",
    },
    count = 1,
  },
-  [ "enderio:itemBasicCapacitor:1" ] = {
-    ingredients = {
-      [ 10 ] = "enderio:itemAlloy:1",
-      [ 2 ] = "enderio:itemAlloy:1",
-      [ 5 ] = "enderio:itemBasicCapacitor:0",
-      [ 6 ] = "thermalfoundation:material:768",
-      [ 7 ] = "enderio:itemBasicCapacitor:0",
-    },
+  [ "enderio:itemXpTransfer:0" ] = {
    count = 1,
-  },
-  [ "enderio:itemMachinePart:0" ] = {
    ingredients = {
-      "minecraft:iron_bars:0",
-      "minecraft:iron_ingot:0",
-      "minecraft:iron_bars:0",
-      [ 9 ] = "minecraft:iron_bars:0",
-      [ 10 ] = "minecraft:iron_ingot:0",
-      [ 11 ] = "minecraft:iron_bars:0",
-      [ 5 ] = "minecraft:iron_ingot:0",
-      [ 6 ] = "enderio:itemBasicCapacitor:0",
-      [ 7 ] = "minecraft:iron_ingot:0",
+      [ 6 ] = "enderio:itemAlloy:1",
+      [ 3 ] = "enderio:itemAlloy:7",
+      [ 9 ] = "enderio:itemAlloy:7",
    },
-    count = 1,
+    maxCount = 1,
  },
 }