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

builder/apis/builder.lua

@@ -9,10 +9,10 @@ local turtle     = _G.turtle
 
 local Builder = class()
 Util.merge(Builder, {
-  isCommandComputer = not turtle,
-  loc = { },
-  index = 1,
-  mode = 'build',
+	isCommandComputer = not turtle,
+	loc = { },
+	index = 1,
+	mode = 'build',
 })
 
 local BUILDER_DIR = 'usr/builder'
@@ -20,82 +20,82 @@ local BUILDER_DIR = 'usr/builder'
 local blockInfo = Blocks()
 
 function Builder:getBlockCounts()
-  local blocks = { }
+	local blocks = { }
 
-  for k = self.index, #self.schematic.blocks do
-    local b = self.schematic.blocks[k]
-    local key = tostring(b.id) .. ':' .. b.dmg
-    local block = blocks[key]
-    if not block then
-      block = Util.shallowCopy(b)
-      block.qty = 0
-      block.need = 0
-      blocks[key] = block
-    end
-    block.need = block.need + 1
-  end
+	for k = self.index, #self.schematic.blocks do
+		local b = self.schematic.blocks[k]
+		local key = tostring(b.id) .. ':' .. b.dmg
+		local block = blocks[key]
+		if not block then
+			block = Util.shallowCopy(b)
+			block.qty = 0
+			block.need = 0
+			blocks[key] = block
+		end
+		block.need = block.need + 1
+	end
 
-  return blocks
+	return blocks
 end
 
 function Builder:substituteBlocks(throttle)
-  for _,b in pairs(self.schematic.blocks) do
+	for _,b in pairs(self.schematic.blocks) do
 
-    -- replace schematic block type with substitution
-    local pb = blockInfo:getPlaceableBlock(b.id, b.dmg)
+		-- replace schematic block type with substitution
+		local pb = blockInfo:getPlaceableBlock(b.id, b.dmg)
 
-    Util.merge(b, pb)
+		Util.merge(b, pb)
 
-    b.odmg = pb.odmg or pb.dmg
+		b.odmg = pb.odmg or pb.dmg
 
-    local sub = self.subDB:get({ b.id, b.dmg })
-    if sub then
-      b.id, b.dmg = self.subDB:extract(sub)
-    end
-    throttle()
-  end
+		local sub = self.subDB:get({ b.id, b.dmg })
+		if sub then
+			b.id, b.dmg = self.subDB:extract(sub)
+		end
+		throttle()
+	end
 end
 
 function Builder:reloadSchematic(throttle)
-  self.schematic:reload(throttle)
-  self:substituteBlocks(throttle)
+	self.schematic:reload(throttle)
+	self:substituteBlocks(throttle)
 end
 
 function Builder:log(...)
-  Util.print(...)
+	Util.print(...)
 end
 
 function Builder:dumpInventory()
 end
 
 function Builder:logBlock(index, b)
-  local bdir = b.direction or ''
-  local logText = string.format('%d %s:%d (x:%d,z:%d:y:%d) %s',
-    index, b.id, b.dmg, b.x, b.z, b.y, bdir)
-  self:log(logText)
-  -- self:log(b.index) -- unique identifier of block
+	local bdir = b.direction or ''
+	local logText = string.format('%d %s:%d (x:%d,z:%d:y:%d) %s',
+		index, b.id, b.dmg, b.x, b.z, b.y, bdir)
+	self:log(logText)
+	-- self:log(b.index) -- unique identifier of block
 
-  if device.wireless_modem then
-    Message.broadcast('builder', { x = b.x, y = b.y, z = b.z, heading = b.heading })
-  end
+	if device.wireless_modem then
+		Message.broadcast('builder', { x = b.x, y = b.y, z = b.z, heading = b.heading })
+	end
 end
 
 function Builder:saveProgress(index)
-  Util.writeTable(
-    fs.combine(BUILDER_DIR, self.schematic.filename .. '.progress'),
-    { index = index, loc = self.loc }
-  )
+	Util.writeTable(
+		fs.combine(BUILDER_DIR, self.schematic.filename .. '.progress'),
+		{ index = index, loc = self.loc }
+	)
 end
 
 function Builder:loadProgress(filename)
-  local progress = Util.readTable(fs.combine(BUILDER_DIR, filename))
-  if progress then
-    self.index = progress.index
-    if self.index > #self.schematic.blocks then
-      self.index = 1
-    end
-    self.loc = progress.loc or { }
-  end
+	local progress = Util.readTable(fs.combine(BUILDER_DIR, filename))
+	if progress then
+		self.index = progress.index
+		if self.index > #self.schematic.blocks then
+			self.index = 1
+		end
+		self.loc = progress.loc or { }
+	end
 end
 
 return Builder