From 1da12b834201299355edfe98a39a961ea7e39640 Mon Sep 17 00:00:00 2001
From: kepler155c <kepler155c@gmail.com>
Date: Tue, 16 Oct 2018 19:10:11 -0400
Subject: [PATCH] plethora app fixes

---
 apps/farm.lua          | 20 +++++++++++++++-----
 apps/scanningMiner.lua |  7 ++++---
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/farm.lua b/apps/farm.lua
index cd656ba..89dc227 100644
--- a/apps/farm.lua
+++ b/apps/farm.lua
@@ -3,7 +3,13 @@ _G.requireInjector(_ENV)
 local Point = require('point')
 local Util  = require('util')
 
-local scanner = device['plethora:scanner'] or error('Plethora scanner required')
+local device = _G.device
+local os     = _G.os
+local turtle = _G.turtle
+
+local scanner = device['plethora:scanner'] or
+  turtle.equip('right', 'plethora:module:2') or
+  error('Plethora scanner required')
 
 local crops = {
   ['minecraft:wheat'] =
@@ -25,27 +31,31 @@ local function scan()
     return crops[v.name] and
       scanner.getBlockMeta(v.x, v.y, v.z).metadata == crops[v.name].mature
     end)
-  
+
   return blocks
 end
 
 local function harvest(blocks)
+  turtle.equip('right', 'minecraft:diamond_pickaxe')
+
   Point.eachClosest(turtle.point, blocks, function(b)
     Util.print(b)
     if b.name == 'minecraft:reeds' then
-      turtle.goto(b)
+      turtle._goto(b)
     else
-      turtle.goto(Point.above(b))
+      turtle._goto(Point.above(b))
       turtle.digDown()
       turtle.placeDown(crops[b.name].seed)
       turtle.select(1)
     end
   end)
+
+  turtle.equip('right', 'plethora:module:2')
 end
 
 turtle.reset()
 local facing = scanner.getBlockMeta(0, 0, 0).state.facing
-pt.heading = Point.facings[facing].heading
+turtle.point.heading = Point.facings[facing].heading
 
 turtle.setPolicy('digOnly')
 
diff --git a/apps/scanningMiner.lua b/apps/scanningMiner.lua
index fdbd670..67f0886 100644
--- a/apps/scanningMiner.lua
+++ b/apps/scanningMiner.lua
@@ -414,7 +414,9 @@ local function scan()
         page.statusBar:setValue('status', m)
         page.statusBar:draw()
         page:sync()
-        os.sleep(5)
+        os.sleep(3)
+      else
+        page.statusBar:setValue('mining', m)
       end
       dirty = true
     elseif b.action == 'liquid_fuel' then
@@ -442,14 +444,13 @@ local function mineChunk()
       pts[i].y = mining.home.y - 8
     end
     pts[i].y = pts[i].y - mining.home.y -- abs to rel
-    debug(pts[i])
   end
 
   Point.eachClosest(turtle.point, pts, function(pt)
     if turtle.isAborted() then
       error('aborted')
     end
-    status('scanning ' .. pt.y + mining.home.y - 8 .. ' - ' .. pt.y + mining.home.y + 8)
+    status('scanning ' .. pt.y + mining.home.y - 8 .. '-' .. pt.y + mining.home.y + 8)
 
     turtle.select(1)
     safeGoto(pt.x, pt.z, pt.y)