spaces->tab, equipper improvements, supertreefarm rewrite, follow improvements, sensor cleanup, milo multiple items allowed in recipes, remote canvas access

milo/plugins/item/recipeTab.lua

@@ -6,85 +6,89 @@ local UI     = require('ui')
 local colors = _G.colors
 
 local recipeTab = UI.Tab {
-  tabTitle = 'Recipe',
-  index = 2,
-  backgroundColor = colors.cyan,
-  grid = UI.ScrollingGrid {
-    x = 2, ex = -2, y = 2, ey = -4,
-    disableHeader = true,
-    columns = {
-      { heading = 'Slot', key = 'slot', width = 2 },
-      { heading = 'Key', key = 'key' },
-    },
-    sortColumn = 'slot',
-  },
-  ignoreResultNBT = UI.Button {
-    x = 2, y = -2,
-    text = 'Ignore Result NBT', event = 'ignore_result_nbt',
-  },
-  ignoreNBT = UI.Button {
-    x = -13, y = -2,
-    text = 'Ignore NBT', event = 'ignore_nbt',
-  },
+	tabTitle = 'Recipe',
+	index = 2,
+	backgroundColor = colors.cyan,
+	grid = UI.ScrollingGrid {
+		x = 2, ex = -2, y = 2, ey = -4,
+		disableHeader = true,
+		columns = {
+			{ heading = 'Slot', key = 'slot', width = 2 },
+			{ heading = 'Count', key = 'count', width = 2 },
+			{ heading = 'Key', key = 'key' },
+		},
+		sortColumn = 'slot',
+	},
+	ignoreResultNBT = UI.Button {
+		x = 2, y = -2,
+		text = 'Ignore Result NBT', event = 'ignore_result_nbt',
+	},
+	ignoreNBT = UI.Button {
+		x = -13, y = -2,
+		text = 'Ignore NBT', event = 'ignore_nbt',
+	},
 }
 
 function recipeTab:setItem(item)
-  self.item = item
-  self.recipe = Craft.findRecipe(self.item)
+	self.item = item
+	self.recipe = Craft.findRecipe(self.item)
 
-  self.parent:setActive(self, self.recipe)
+	self.parent:setActive(self, self.recipe)
 
-  local t = { }
-  if self.recipe then
-    for k, v in pairs(self.recipe.ingredients) do
-      table.insert(t, {
-        slot = k,
-        key = v,
-      })
-    end
-    local key = itemDB:splitKey(self.recipe.result)
-    self.ignoreResultNBT.inactive = not key.nbtHash
-  end
-  self.grid:setValues(t)
+	local t = { }
+	if self.recipe then
+		for k, v in Craft.ingedients(self.recipe) do
+_syslog(k)
+_syslog(v)
+			table.insert(t, {
+				slot = k,
+				key = v.key,
+				count = v.count,
+			})
+		end
+		local key = itemDB:splitKey(self.recipe.result)
+		self.ignoreResultNBT.inactive = not key.nbtHash
+	end
+	self.grid:setValues(t)
 end
 
 function recipeTab:eventHandler(event)
-  if event.type == 'ignore_result_nbt' then
-    -- remove old entry
-    Milo:updateRecipe(self.recipe.result)
+	if event.type == 'ignore_result_nbt' then
+		-- remove old entry
+		Milo:updateRecipe(self.recipe.result)
 
-    local item = itemDB:splitKey(self.recipe.result)
-    item.nbtHash = nil
-    self.recipe.result = itemDB:makeKey(item)
+		local item = itemDB:splitKey(self.recipe.result)
+		item.nbtHash = nil
+		self.recipe.result = itemDB:makeKey(item)
 
-    -- add updated entry
-    Milo:updateRecipe(self.recipe.result, self.recipe)
+		-- add updated entry
+		Milo:updateRecipe(self.recipe.result, self.recipe)
 
-    self.ignoreResultNBT.inactive = true
-    self:emit({ type = 'info_message', message = 'Recipe updated' })
+		self.ignoreResultNBT.inactive = true
+		self:emit({ type = 'info_message', message = 'Recipe updated' })
 
-  elseif event.type == 'grid_focus_row' then
-    local key = itemDB:splitKey(event.selected.key)
-    self.ignoreNBT.inactive = not key.nbtHash
-    self.ignoreNBT:draw()
+	elseif event.type == 'grid_focus_row' then
+		local key = itemDB:splitKey(event.selected.key)
+		self.ignoreNBT.inactive = not key.nbtHash
+		self.ignoreNBT:draw()
 
-  elseif event.type == 'ignore_nbt' then
-    local selected = self.grid:getSelected()
-    local item = itemDB:splitKey(selected.key)
-    item.nbtHash = nil
-    selected.key = itemDB:makeKey(item)
-    self.grid:draw()
+	elseif event.type == 'ignore_nbt' then
+		local selected = self.grid:getSelected()
+		local item = itemDB:splitKey(selected.key)
+		item.nbtHash = nil
+		selected.key = itemDB:makeKey(item)
+		self.grid:draw()
 
-    self.recipe.ingredients = { }
-    for _, v in pairs(self.grid.values) do
-      self.recipe.ingredients[v.slot] = v.key
-    end
+		self.recipe.ingredients = { }
+		for _, v in pairs(self.grid.values) do
+			self.recipe.ingredients[v.slot] = v.key
+		end
 
-    Milo:updateRecipe(self.recipe.result, self.recipe)
-    self:emit({ type = 'info_message', message = 'Recipe updated' })
+		Milo:updateRecipe(self.recipe.result, self.recipe)
+		self:emit({ type = 'info_message', message = 'Recipe updated' })
 
-    return true
-  end
+		return true
+	end
 end
 
 return { itemTab = recipeTab }