changes for deprecated ui methods - recolor milo - make turtle scripts run again - mob rancher improvements

common/Appstore.lua

@@ -354,7 +354,7 @@ function categoryPage:eventHandler(event)
 		self:draw()
 
 	elseif event.type == 'quit' then
-		UI:exitPullEvents()
+		UI:quit()
 
 	else
 		return UI.Page.eventHandler(self, event)
@@ -366,4 +366,4 @@ print("Retrieving catalog list")
 categoryPage:setCategory(source.name, source.index)
 
 UI:setPage(categoryPage)
-UI:pullEvents()
+UI:start()

common/Devices.lua

@@ -49,7 +49,7 @@ end
 
 function peripheralsPage:eventHandler(event)
 	if event.type == 'quit' then
-		Event.exitPullEvents()
+		UI:quit()
 
 	elseif event.type == 'grid_select' then
 		UI:setPage('methods', event.selected)
@@ -198,4 +198,4 @@ UI:setPages({
 	methods = methodsPage,
 })
 
-UI:pullEvents()
+UI:start()

common/DiskCopy.lua

@@ -269,4 +269,4 @@ Event.onTimeout(.2, function()
 end)
 
 UI:setPage(page)
-UI:pullEvents()
+UI:start()

common/Events.lua

@@ -90,7 +90,7 @@ local page = UI.Page {
 			self.grid:draw()
 
 		elseif event.type == 'quit' then
-			UI:exitPullEvents()
+			UI:quit()
 
 		else
 			return UI.Page.eventHandler(self, event)

common/Follow.lua

@@ -238,6 +238,6 @@ Event.addRoutine(function()
 end)
 
 UI:setPage(page)
-UI:pullEvents()
+UI:start()
 
 swarm:stop()

common/SoundPlayer.lua

@@ -60,4 +60,4 @@ function page:eventHandler(event)
 end
 
 UI:setPage(page)
-UI:pullEvents()
+UI:start()

common/Turtles.lua

@@ -292,30 +292,42 @@ function page:runScript(scriptName)
 			print('Unable to read script file')
 		end
 
-		local socket = Socket.connect(turtle.id, 161)
-		if not socket then
-			print('Unable to connect to ' .. turtle.id)
-			return
-		end
-
-		local function processVariables(script)
+		local function processVariables()
 			local variables = {
-				COMPUTER_ID = os.getComputerID(),
+				COMPUTER_ID = os.getComputerID,
+				GPS = function()
+					local pt = require('opus.gps').getPoint()
+					if not pt then
+						error('Unable to determine location')
+					end
+					return _G.textutils.serialize(pt)
+				end,
 			}
 			for k,v in pairs(variables) do
 				local token = string.format('{%s}', k)
-				script = script:gsub(token, v)
+				if script:find(token, 1, true) then
+					local s, m = pcall(v)
+					if not s then
+						self.notification:error(m)
+						return
+					end
+					script = script:gsub(token, m)
+				end
 			end
-
-			return script
+			return true
 		end
 
-		script = processVariables(script)
+		if processVariables(script) then
+			local socket = Socket.connect(turtle.id, 161)
+			if not socket then
+				self.notification:error('Unable to connect')
+				return
+			end
+			socket:write({ type = 'script', args = script })
+			socket:close()
 
-		socket:write({ type = 'script', args = script })
-		socket:close()
-
-		self.notification:success('Sent')
+			self.notification:success('Sent')
+		end
 	end
 end
 
@@ -339,7 +351,7 @@ end
 
 function page:eventHandler(event)
 	if event.type == 'quit' then
-		UI:exitPullEvents()
+		UI:quit()
 
 	elseif event.type == 'tab_select' then
 		config.tab = event.button.text

common/etc/scripts/moveTo

@@ -1,29 +0,0 @@
-turtle.run(function()
-
-  _G.requireInjector(_ENV)
-
-  local GPS    = require('opus.gps')
-  local Socket = require('opus.socket')
-
-  local id = {COMPUTER_ID}
-
-  if not turtle.enableGPS() then
-    error('turtle: No GPS found')
-  end
-
-  local socket = Socket.connect(id, 161)
-  if not socket then
-    error('turtle: Unable to connect to ' .. id)
-  end
-
-  socket:write({ type = 'gps' })
-
-  local pt = socket:read(3)
-  if not pt then
-    error('turtle: No GPS response')
-  end
-
-  if not turtle.pathfind(pt) then
-    error('Unable to go to location')
-  end
-end)

common/etc/scripts/moveTo.lua

@@ -0,0 +1,17 @@
+local turtle = _G.turtle
+
+turtle.run(function()
+    _G.requireInjector(_ENV)
+
+    local GPS = require('opus.gps')
+
+    if not turtle.enableGPS() then
+        error('turtle: No GPS found')
+    end
+
+    local pt = {GPS}
+
+    if not turtle.pathfind(pt) then
+        error('Unable to go to location')
+    end
+end)