From 81a7894037b187219f0009f0c5b4823ea00a6cd3 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Tue, 12 Mar 2019 20:05:04 -0400 Subject: [PATCH] refactor common apps into its own package --- common/.package | 16 ++++++++++++++++ {core => common}/Appstore.lua | 0 {core => common}/Devices.lua | 0 {core => common}/DiskCopy.lua | 0 {core => common}/Events.lua | 0 {core => common}/Follow.lua | 0 {core => common}/Turtles.lua | 0 common/autorun/common.lua | 6 ++++++ {core => common}/debugMonitor.lua | 0 {core => common}/edit.lua | 0 {core => common}/etc/scripts/abort | 0 {core => common}/etc/scripts/goHome | 0 {core => common}/etc/scripts/moveTo | 0 {core => common}/etc/scripts/reboot | 0 {core => common}/etc/scripts/setHome | 0 {core => common}/etc/scripts/shutdown | 0 {core => common}/etc/scripts/summon | 0 {core => common}/multiMiner.lua | 0 {core => common}/recorder.lua | 0 core/.package | 4 ++-- core/autorun/core.lua | 9 --------- miners/scanningMiner.lua | 4 ++-- 22 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 common/.package rename {core => common}/Appstore.lua (100%) rename {core => common}/Devices.lua (100%) rename {core => common}/DiskCopy.lua (100%) rename {core => common}/Events.lua (100%) rename {core => common}/Follow.lua (100%) rename {core => common}/Turtles.lua (100%) create mode 100644 common/autorun/common.lua rename {core => common}/debugMonitor.lua (100%) rename {core => common}/edit.lua (100%) rename {core => common}/etc/scripts/abort (100%) rename {core => common}/etc/scripts/goHome (100%) rename {core => common}/etc/scripts/moveTo (100%) rename {core => common}/etc/scripts/reboot (100%) rename {core => common}/etc/scripts/setHome (100%) rename {core => common}/etc/scripts/shutdown (100%) rename {core => common}/etc/scripts/summon (100%) rename {core => common}/multiMiner.lua (100%) rename {core => common}/recorder.lua (100%) delete mode 100644 core/autorun/core.lua diff --git a/common/.package b/common/.package new file mode 100644 index 0000000..38a1d4c --- /dev/null +++ b/common/.package @@ -0,0 +1,16 @@ +{ + title = 'Useful applications', + repository = 'kepler155c/opus-apps/{{OPUS_BRANCH}}/common', + description = [[Various applications for Opus. + +* App Store +* Peripheral API viewer +* Disk / Computer copier +* A better editor (copy/paste/undo) +* Turtle swarm miner +* Turtle follow +* Screen recorder +* and more... + ]], + licence = 'MIT', +} diff --git a/core/Appstore.lua b/common/Appstore.lua similarity index 100% rename from core/Appstore.lua rename to common/Appstore.lua diff --git a/core/Devices.lua b/common/Devices.lua similarity index 100% rename from core/Devices.lua rename to common/Devices.lua diff --git a/core/DiskCopy.lua b/common/DiskCopy.lua similarity index 100% rename from core/DiskCopy.lua rename to common/DiskCopy.lua diff --git a/core/Events.lua b/common/Events.lua similarity index 100% rename from core/Events.lua rename to common/Events.lua diff --git a/core/Follow.lua b/common/Follow.lua similarity index 100% rename from core/Follow.lua rename to common/Follow.lua diff --git a/core/Turtles.lua b/common/Turtles.lua similarity index 100% rename from core/Turtles.lua rename to common/Turtles.lua diff --git a/common/autorun/common.lua b/common/autorun/common.lua new file mode 100644 index 0000000..834a23e --- /dev/null +++ b/common/autorun/common.lua @@ -0,0 +1,6 @@ +_ENV.shell.setCompletionFunction("packages/common/edit.lua", + function(shell, nIndex, sText) + if nIndex == 1 then + return _G.fs.complete(sText, shell.dir(), true, false) + end + end) diff --git a/core/debugMonitor.lua b/common/debugMonitor.lua similarity index 100% rename from core/debugMonitor.lua rename to common/debugMonitor.lua diff --git a/core/edit.lua b/common/edit.lua similarity index 100% rename from core/edit.lua rename to common/edit.lua diff --git a/core/etc/scripts/abort b/common/etc/scripts/abort similarity index 100% rename from core/etc/scripts/abort rename to common/etc/scripts/abort diff --git a/core/etc/scripts/goHome b/common/etc/scripts/goHome similarity index 100% rename from core/etc/scripts/goHome rename to common/etc/scripts/goHome diff --git a/core/etc/scripts/moveTo b/common/etc/scripts/moveTo similarity index 100% rename from core/etc/scripts/moveTo rename to common/etc/scripts/moveTo diff --git a/core/etc/scripts/reboot b/common/etc/scripts/reboot similarity index 100% rename from core/etc/scripts/reboot rename to common/etc/scripts/reboot diff --git a/core/etc/scripts/setHome b/common/etc/scripts/setHome similarity index 100% rename from core/etc/scripts/setHome rename to common/etc/scripts/setHome diff --git a/core/etc/scripts/shutdown b/common/etc/scripts/shutdown similarity index 100% rename from core/etc/scripts/shutdown rename to common/etc/scripts/shutdown diff --git a/core/etc/scripts/summon b/common/etc/scripts/summon similarity index 100% rename from core/etc/scripts/summon rename to common/etc/scripts/summon diff --git a/core/multiMiner.lua b/common/multiMiner.lua similarity index 100% rename from core/multiMiner.lua rename to common/multiMiner.lua diff --git a/core/recorder.lua b/common/recorder.lua similarity index 100% rename from core/recorder.lua rename to common/recorder.lua diff --git a/core/.package b/core/.package index 7079717..9c3b3d8 100644 --- a/core/.package +++ b/core/.package @@ -1,6 +1,6 @@ { - title = 'Core apps and apis', + title = 'APIs used by various programs', repository = 'kepler155c/opus-apps/{{OPUS_BRANCH}}/core', - description = [[Provides common files used by Opus applications. Also includes various useful applications.]], + description = [[Provides APIs used by Opus applications.]], licence = 'MIT', } diff --git a/core/autorun/core.lua b/core/autorun/core.lua deleted file mode 100644 index fd4002a..0000000 --- a/core/autorun/core.lua +++ /dev/null @@ -1,9 +0,0 @@ -if fs.exists('packages/core/lavaRefuel.lua') then fs.delete('packages/core/lavaRefuel.lua') end -if fs.exists('packages/core/t.lua') then fs.delete('packages/core/t.lua') end - -_ENV.shell.setCompletionFunction("packages/core/edit.lua", - function(shell, nIndex, sText) - if nIndex == 1 then - return _G.fs.complete(sText, shell.dir(), true, false) - end - end) diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua index 963c2b9..965cd2b 100644 --- a/miners/scanningMiner.lua +++ b/miners/scanningMiner.lua @@ -587,12 +587,12 @@ Event.addRoutine(function() ) local maxDistance = Point.distance( HOME_PT, - { x = mining.x + 16, y = 0, z = mining.z + 16 } + { x = mining.x, y = 0, z = mining.z } ) _G._debug({ distance = distance, maxDistance = maxDistance }) - if distance > maxDistance then + if distance > maxDistance + 16 then term.clear() term.setCursorPos(1, 1) _G.printError('WARNING\n\nTurtle is outside the mining area\n')