diff --git a/apps/cows.lua b/apps/cows.lua index d3798cf..784e595 100644 --- a/apps/cows.lua +++ b/apps/cows.lua @@ -5,7 +5,6 @@ local Util = require('util') local device = _G.device local os = _G.os -local term = _G.term local turtle = _G.turtle local config = { @@ -31,7 +30,6 @@ local function getCowCount() end end) - term.clearLine() Util.print('%d grown, %d babies', grown, babies) return #blocks diff --git a/apps/farm.lua b/apps/farm.lua index d6131f7..2a1988d 100644 --- a/apps/farm.lua +++ b/apps/farm.lua @@ -16,13 +16,17 @@ local scanner = device['plethora:scanner'] or local crops = Util.readTable(CONFIG_FILE) or { ['minecraft:wheat'] = - { seed = 'minecraft:wheat_seeds', mature = 7 }, + { seed = 'minecraft:wheat_seeds', mature = 7, action = 'plant' }, ['minecraft:carrots'] = - { seed = 'minecraft:carrot', mature = 7 }, + { seed = 'minecraft:carrot', mature = 7, action = 'plant' }, ['minecraft:potatoes'] = - { seed = 'minecraft:potato', mature = 7 }, + { seed = 'minecraft:potato', mature = 7, action = 'plant' }, ['minecraft:beetroots'] = - { seed = 'minecraft:beetroot_seeds', mature = 3 }, + { seed = 'minecraft:beetroot_seeds', mature = 3, 'plant' }, + ['minecraft:reeds'] = { action = 'bash' }, + ['minecraft:melon_block'] = { action = 'smash' }, + ['minecraft:pumpkin'] = { action = 'smash' }, + ['minecraft:chest'] = { action = 'drop' }, } if not fs.exists(CONFIG_FILE) then @@ -31,21 +35,36 @@ end local function scan() local blocks = scanner.scan() + local summed = turtle.getSummedInventory() + local doDropOff + + for _,v in pairs(summed) do + if v.count > 48 then + doDropOff = true + break + end + end Util.filterInplace(blocks, function(v) - if v.name == 'minecraft:reeds' then + v.action = crops[v.name] and crops[v.name].action + + if v.action == 'bash' then return v.y == 0 end - if v.name == 'minecraft:chest' then + if v.action == 'drop' then + return doDropOff and v.y == -1 + end + if v.action == 'smash' then return v.y == -1 end - return crops[v.name] and - scanner.getBlockMeta(v.x, v.y, v.z).metadata == crops[v.name].mature + return v.action == 'plant' and + v.metadata == crops[v.name].mature and + v.y == -1 end) local harvestCount = 0 for _,v in pairs(blocks) do - if v.name ~= 'minecraft:chest' then + if v.action ~= 'drop' then harvestCount = harvestCount + 1 end end @@ -56,29 +75,31 @@ end local function harvest(blocks) turtle.equip('right', 'minecraft:diamond_pickaxe') turtle.setPoint({ x = 0, y = 0, z = 0, heading = turtle.point.heading }) + turtle.select(1) + + local dropped Point.eachClosest(turtle.point, blocks, function(b) - turtle.select(1) - if b.name == 'minecraft:reeds' then - turtle._goto(b) - elseif b.name == 'minecraft:chest' then - local summed = turtle.getSummedInventory() - for _,v in pairs(summed) do - if v.count > 48 then - if turtle._goto(Point.above(b)) then - for k,v2 in pairs(summed) do - if v2.count > 16 then - turtle.dropDown(k, v2.count - 16) - end - end + if b.action == 'bash' then + turtle.digForwardAt(b) + elseif b.action == 'drop' and not dropped then + if turtle._goto(Point.above(b)) then + local summed = turtle.getSummedInventory() + for k,v in pairs(summed) do + if v.count > 16 then + turtle.dropDown(k, v.count - 16) end - break end + dropped = true + turtle.select(1) + end + elseif b.action == 'smash' then + turtle.digDownAt(b) + elseif b.action == 'plant' then + if turtle.digDownAt(b) then + turtle.placeDown(crops[b.name].seed) + turtle.select(1) end - else - turtle._goto(Point.above(b)) - turtle.digDown() - turtle.placeDown(crops[b.name].seed) end end) turtle.equip('right', 'plethora:module:2') @@ -89,6 +110,7 @@ turtle.run(function() turtle.point.heading = Point.facings[facing].heading turtle.setPolicy('digOnly') + turtle.setMovementStrategy('goto') repeat local blocks, harvestCount = scan() if harvestCount > 0 then diff --git a/apps/scanningMiner.lua b/apps/scanningMiner.lua index f24c413..01f894c 100644 --- a/apps/scanningMiner.lua +++ b/apps/scanningMiner.lua @@ -522,15 +522,16 @@ end local success, msg +if not fs.exists(DICTIONARY_FILE) or options.setTrash.value then + print('Place blocks into the turtles inventor to ignore, such as cobble, stone, gravel, etc.') + print('\nPress enter when ready') + read() + addTrash() +end + Event.addRoutine(function() turtle.reset() - if not fs.exists(DICTIONARY_FILE) or options.setTrash.value then - print('Add blocks to ignore, press enter when ready') - read() - addTrash() - end - ejectTrash() turtle.initialize {