From 5dc87ef8d12bc306555b1a9ed4543bf8a5c5775e Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sat, 23 Feb 2019 18:36:42 -0500 Subject: [PATCH] network sniffer --- core/Follow.lua | 2 +- core/apis/swarm.lua | 2 +- core/multiMiner.lua | 2 +- turtle/lavaRefuel.lua | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/Follow.lua b/core/Follow.lua index abe885d..d3f6d71 100644 --- a/core/Follow.lua +++ b/core/Follow.lua @@ -31,7 +31,7 @@ local page = UI.Page { { heading = 'Status', key = 'status' }, { heading = 'Fuel', key = 'fuel' }, }, - sortColumn = 'label', + sortColumn = 'distance', autospace = true, }, } diff --git a/core/apis/swarm.lua b/core/apis/swarm.lua index 94e5de5..45ad47b 100644 --- a/core/apis/swarm.lua +++ b/core/apis/swarm.lua @@ -16,7 +16,7 @@ local function hijackTurtle(remoteId) local hijack = { } for _,method in pairs(methods) do hijack[method] = function(...) - socket:write({ fn = method, args = { ... } }) + socket:write({ method, ... }) local resp = socket:read() if not resp then error('timed out: ' .. method) diff --git a/core/multiMiner.lua b/core/multiMiner.lua index 8ed9534..7dfc2e9 100644 --- a/core/multiMiner.lua +++ b/core/multiMiner.lua @@ -57,7 +57,7 @@ local function hijackTurtle(remoteId) local hijack = { } for _,method in pairs(methods) do hijack[method] = function(...) - socket:write({ fn = method, args = { ... } }) + socket:write({ method, ... }) local resp = socket:read() if not resp then error('timed out: ' .. method) diff --git a/turtle/lavaRefuel.lua b/turtle/lavaRefuel.lua index 7c6401d..e3b19c3 100644 --- a/turtle/lavaRefuel.lua +++ b/turtle/lavaRefuel.lua @@ -22,6 +22,7 @@ if not turtle.select('minecraft:bucket') then end local s, m = turtle.run(function() + turtle.set({ 'status', 'refueling' }) turtle.setMovementStrategy('goto') local facing = scanner.getBlockMeta(0, 0, 0).state.facing @@ -58,6 +59,7 @@ end) turtle.gotoY(0) turtle.go({ x = 0, y = 0, z = 0 }) +turtle.set({ 'status', 'idle' }) turtle.unequip('left') print('Fuel: ' .. turtle.getFuelLevel())