milo: simplify learn types + monitor resize

milo/core/learnWizard.lua

@@ -0,0 +1,90 @@
+local Milo   = require('milo')
+local UI     = require('ui')
+
+local turtle = _G.turtle
+
+local learnPage = UI.Page {
+  titleBar = UI.TitleBar { title = 'Learn Recipe' },
+  wizard = UI.Wizard {
+    y = 2, ey = -2,
+    pages = {
+      general = UI.Window {
+        index = 1,
+        grid = UI.ScrollingGrid {
+          x = 2, ex = -2, y = 2, ey = -2,
+          disableHeader = true,
+          columns = {
+            { heading = 'Name', key = 'name'},
+          },
+          sortColumn = 'name',
+        },
+      },
+    },
+  },
+  notification = UI.Notification { },
+}
+
+local general = learnPage.wizard.pages.general
+
+function general:validate()
+  Milo:setState('learnType', self.grid:getSelected().value)
+  return true
+end
+
+function learnPage:enable()
+  local t = { }
+
+  for _, page in pairs(self.wizard.pages) do
+    if page.validFor then
+      t[page.validFor] = {
+        name = page.validFor,
+        value = page.validFor,
+      }
+    end
+  end
+  general.grid:setValues(t)
+  general.grid:setSelected('name', Milo:getState('learnType') or '')
+
+  Milo:pauseCrafting({ key = 'gridInUse', msg = 'Crafting paused' })
+
+  self:focusFirst()
+  UI.Page.enable(self)
+end
+
+function learnPage:disable()
+  Milo:resumeCrafting({ key = 'gridInUse' })
+  return UI.Page.disable(self)
+end
+
+function learnPage.wizard:getPage(index)
+  local pages = { }
+  table.insert(pages, general)
+  local selected = general.grid:getSelected()
+  for _, page in pairs(self.pages) do
+    if page.validFor and (not selected or selected.value == page.validFor) then
+      table.insert(pages, page)
+    end
+  end
+  table.sort(pages, function(a, b)
+    return a.index < b.index
+  end)
+
+  return pages[index]
+end
+
+function learnPage:eventHandler(event)
+  if event.type == 'cancel' then
+    turtle.emptyInventory()
+    UI:setPreviousPage()
+
+  elseif event.type  == 'form_invalid' or event.type == 'general_error' then
+    self.notification:error(event.message)
+    self:setFocus(event.field)
+
+  else
+    return UI.Page.eventHandler(self, event)
+  end
+  return true
+end
+
+UI:addPage('learnWizard', learnPage)

milo/core/listing.lua

@@ -234,7 +234,7 @@ function page:eventHandler(event)
     Milo:setState('displayMode', displayMode)
 
   elseif event.type == 'learn' then
-    UI:setPage('learn')
+    UI:setPage('learnWizard')
 
   elseif event.type == 'craft' then
     local item = self.grid:getSelected()
@@ -242,7 +242,6 @@ function page:eventHandler(event)
       if Craft.findRecipe(item) then -- or item.is_craftable then
         UI:setPage('craft', self.grid:getSelected())
       else
-        Sound.play('entity.villager.no')
         self.notification:error('No recipe defined')
       end
     end

milo/core/machines.lua

@@ -395,6 +395,10 @@ function nodeWizard.wizard.pages.general:enable()
 	self:focusFirst()
 end
 
+function nodeWizard.wizard.pages.general:isValidFor()
+	return false
+end
+
 function nodeWizard.wizard.pages.general:showInventory(node)
 	local inventory
 
@@ -418,31 +422,28 @@ end
 
 function nodeWizard.wizard.pages.general:validate()
 	if self.form:save() then
-		_G._p3 = nodeWizard.choices
-		_G._p4 = nodeWizard.node
 		nodeWizard.node.category = Util.find(nodeWizard.choices, 'value', nodeWizard.node.mtype).category
+
+		nodeWizard.nodePages = { }
+		table.insert(nodeWizard.nodePages, nodeWizard.wizard.pages.general)
 		for _, page in pairs(nodeWizard.wizard.pages) do
-			page.index = nil
-		end
-		local index = 2
-		nodeWizard.wizard.pages.general.index = 1
-		nodeWizard.wizard.pages.confirmation.index = 2
-		for _, page in pairs(nodeWizard.wizard.pages) do
-			if not page.index then
-				if not page.isValidFor or page:isValidFor(nodeWizard.node) then
-					page.index = index
-					index = index + 1
-					if page.setNode then
-						page:setNode(nodeWizard.node)
-					end
+			if not page.isValidFor or page:isValidFor(nodeWizard.node) then
+				table.insert(nodeWizard.nodePages, page)
+				if page.setNode then
+					page:setNode(nodeWizard.node)
 				end
 			end
 		end
-		nodeWizard.wizard.pages.confirmation.index = index
+		table.insert(nodeWizard.nodePages, nodeWizard.wizard.pages.confirmation)
 		return true
 	end
 end
 
+--[[ Confirmation ]]--
+function nodeWizard.wizard.pages.confirmation:isValidFor()
+	return false
+end
+
 --[[ Wizard ]] --
 function nodeWizard:enable(node)
 	local adapter = node.adapter
@@ -469,17 +470,17 @@ function nodeWizard:enable(node)
 
 	self.wizard.pages.general:showInventory(self.node)
 
-	-- restore indices
-	for _, page in pairs(self.wizard.pages) do
-		if not page.oindex then
-			page.oindex = page.index
-		end
-		page.index = page.oindex
-	end
+	self.nodePages = { }
+	table.insert(self.nodePages, self.wizard.pages.general)
+	table.insert(self.nodePages, self.wizard.pages.confirmation)
 
 	UI.Page.enable(self)
 end
 
+function nodeWizard.wizard:getPage(index)
+	return nodeWizard.nodePages[index]
+end
+
 function nodeWizard:eventHandler(event)
 	if event.type == 'cancel' then
 		UI:setPreviousPage()
@@ -500,6 +501,12 @@ function nodeWizard:eventHandler(event)
 			return true
 		end)
 
+		for _, page in pairs(self.nodePages) do
+			if page.saveNode then
+				page:saveNode(self.node)
+			end
+		end
+
 		Util.clear(context.storage.nodes[self.node.name])
 		Util.merge(context.storage.nodes[self.node.name], self.node)
 		context.storage.nodes[self.node.name].adapter = adapter