From b86f32b83adba4135941670795b223b63f2b3e89 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sat, 6 Jul 2019 23:53:47 -0400 Subject: [PATCH] package manager list in repo + cleanup --- common/DiskCopy.lua | 15 ++++++++++++--- gps/.package | 6 +++++- milo/autorun/milo.lua | 1 + packages.list | 22 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 packages.list diff --git a/common/DiskCopy.lua b/common/DiskCopy.lua index 7e0afa5..849dbe3 100644 --- a/common/DiskCopy.lua +++ b/common/DiskCopy.lua @@ -9,11 +9,20 @@ local fs = _G.fs local peripheral = _G.peripheral local drives = { } +if peripheral.getType('left') == 'drive' then + drives.left = Util.shallowCopy(peripheral.wrap('left')) + drives.left.name = 'left' +end +if peripheral.getType('right') == 'drive' then + drives.right = Util.shallowCopy(peripheral.wrap('right')) + drives.right.name = 'right' +end + peripheral.find('drive', function(n, v) if not drives.left then drives.left = Util.shallowCopy(v) drives.left.name = n - else + elseif not drives.right then drives.right = Util.shallowCopy(v) drives.right.name = n end @@ -44,7 +53,7 @@ local page = UI.Page { x = -19, y = 2, ey = 5, width = 18, }, dir = UI.Button { - x = 17, y = 7, width = 6, + x = 17, y = 6, width = 6, event = 'change_dir', }, progress = UI.ProgressBar { @@ -72,7 +81,7 @@ local page = UI.Page { inactive = true, }, warning = UI.Text { - x = 2, ex = -2, y = -5, + x = 2, ex = -2, y = -1, align = 'center', textColor = colors.orange, }, diff --git a/gps/.package b/gps/.package index 72bba13..8e1ee40 100644 --- a/gps/.package +++ b/gps/.package @@ -1,6 +1,10 @@ { title = 'GPS', repository = 'kepler155c/opus-apps/{{OPUS_BRANCH}}/gps', - description = [[A single turtle GPS]], + description = [[A single turtle GPS server + +Uses 4 wireless modems connected to a single turtle or computer connected with network cables. +The turtle will also initially place all the modems in the correct locations. +]], licence = 'MIT', } diff --git a/milo/autorun/milo.lua b/milo/autorun/milo.lua index 33b2acf..2e7966f 100644 --- a/milo/autorun/milo.lua +++ b/milo/autorun/milo.lua @@ -8,6 +8,7 @@ if fs.exists('packages/milo/Milo.lua') then end fs.delete('packages/milo/apis/milo.lua') +fs.delete('packages/milo/plugins/manipulator.lua') if peripheral.find('workbench') and shell.openForegroundTab then shell.openForegroundTab('MiloLocal') diff --git a/packages.list b/packages.list new file mode 100644 index 0000000..5f00076 --- /dev/null +++ b/packages.list @@ -0,0 +1,22 @@ +{ + [ 'common' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/common/.package', + [ 'core' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/core/.package', + [ 'builder' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/builder/.package', + [ 'ccemux' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/ccemux/.package', + [ 'farms' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/farms/.package', +-- [ 'forestry' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/forestry/.package', + [ 'games' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/games/.package', +-- [ 'glasses' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/glasses/.package', + [ 'gps' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/gps/.package', + [ 'mbs' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/mbs/.package', + [ 'milo' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/milo/.package', + [ 'miners' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/miners/.package', + [ 'monitor' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/monitor/.package', + [ 'neural' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/neural/.package', +-- [ 'pickup' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/pickup/.package', + [ 'recipeBook' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/recipeBook/.package', + [ 'shellex' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/shellex/.package', +-- [ 'storage' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/storage/.package', + [ 'swshop' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/swshop/.package', + [ 'turtle' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/turtle/.package', +} \ No newline at end of file