From 177533b76050d37b3b426ec904a74b86c785e390 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Wed, 27 Feb 2019 17:15:44 -0500 Subject: [PATCH] rename justify property to align --- builder/apis/base64.lua | 79 ++++++++++++++++++++++------------- core/multiMiner.lua | 6 +-- milo/MiloRemote.lua | 2 +- milo/core/listing.lua | 2 +- milo/core/machines.lua | 2 +- milo/plugins/activityView.lua | 20 +++++---- milo/plugins/machineMover.lua | 2 +- miners/scanningMiner.lua | 2 +- neural/Scanner.lua | 8 ++-- neural/Sensor.lua | 6 +-- swshop/shopView.lua | 4 +- 11 files changed, 78 insertions(+), 55 deletions(-) diff --git a/builder/apis/base64.lua b/builder/apis/base64.lua index 767b86d..f35623b 100644 --- a/builder/apis/base64.lua +++ b/builder/apis/base64.lua @@ -2,41 +2,49 @@ -- By KillaVanilla -- see: http://www.computercraft.info/forums2/index.php?/topic/12450-killavanillas-various-apis/ -Base64 = { } +local Base64 = { } + +local bit = _G.bit +local _brshift = bit.brshift +local _bor = bit.bor +local _blshift = bit.blshift +local _band = bit.band +local _sub = string.sub +local os = _G.os local alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" local function sixBitToBase64(input) - return string.sub(alphabet, input+1, input+1) + return _sub(alphabet, input+1, input+1) end local function base64ToSixBit(input) for i=1, 64 do - if input == string.sub(alphabet, i, i) then + if input == _sub(alphabet, i, i) then return i-1 end end end local function octetToBase64(o1, o2, o3) - local i1 = sixBitToBase64(bit.brshift(bit.band(o1, 0xFC), 2)) - local i2 = "A" + local i1 = sixBitToBase64(_brshift(_band(o1, 0xFC), 2)) + local i2 local i3 = "=" local i4 = "=" if o2 then - i2 = sixBitToBase64(bit.bor( bit.blshift(bit.band(o1, 3), 4), bit.brshift(bit.band(o2, 0xF0), 4) )) + i2 = sixBitToBase64(_bor( _blshift(_band(o1, 3), 4), _brshift(_band(o2, 0xF0), 4) )) if not o3 then - i3 = sixBitToBase64(bit.blshift(bit.band(o2, 0x0F), 2)) + i3 = sixBitToBase64(_blshift(_band(o2, 0x0F), 2)) else - i3 = sixBitToBase64(bit.bor( bit.blshift(bit.band(o2, 0x0F), 2), bit.brshift(bit.band(o3, 0xC0), 6) )) + i3 = sixBitToBase64(_bor( _blshift(_band(o2, 0x0F), 2), _brshift(_band(o3, 0xC0), 6) )) end else - i2 = sixBitToBase64(bit.blshift(bit.band(o1, 3), 4)) + i2 = sixBitToBase64(_blshift(_band(o1, 3), 4)) end if o3 then - i4 = sixBitToBase64(bit.band(o3, 0x3F)) + i4 = sixBitToBase64(_band(o3, 0x3F)) end - + return i1..i2..i3..i4 end @@ -45,31 +53,31 @@ end -- octet 3 needs characters 3/4 local function base64ToThreeOctet(s1) - local c1 = base64ToSixBit(string.sub(s1, 1, 1)) - local c2 = base64ToSixBit(string.sub(s1, 2, 2)) - local c3 = 0 - local c4 = 0 - local o1 = 0 - local o2 = 0 - local o3 = 0 - if string.sub(s1, 3, 3) == "=" then + local c1 = base64ToSixBit(_sub(s1, 1, 1)) + local c2 = base64ToSixBit(_sub(s1, 2, 2)) + local c3 + local c4 + local o1 + local o2 + local o3 + if _sub(s1, 3, 3) == "=" then c3 = nil c4 = nil - elseif string.sub(s1, 4, 4) == "=" then - c3 = base64ToSixBit(string.sub(s1, 3, 3)) + elseif _sub(s1, 4, 4) == "=" then + c3 = base64ToSixBit(_sub(s1, 3, 3)) c4 = nil else - c3 = base64ToSixBit(string.sub(s1, 3, 3)) - c4 = base64ToSixBit(string.sub(s1, 4, 4)) + c3 = base64ToSixBit(_sub(s1, 3, 3)) + c4 = base64ToSixBit(_sub(s1, 4, 4)) end - o1 = bit.bor( bit.blshift(c1, 2), bit.brshift(bit.band( c2, 0x30 ), 4) ) + o1 = _bor( _blshift(c1, 2), _brshift(_band( c2, 0x30 ), 4) ) if c3 then - o2 = bit.bor( bit.blshift(bit.band(c2, 0x0F), 4), bit.brshift(bit.band( c3, 0x3C ), 2) ) + o2 = _bor( _blshift(_band(c2, 0x0F), 4), _brshift(_band( c3, 0x3C ), 2) ) else o2 = nil end if c4 then - o3 = bit.bor( bit.blshift(bit.band(c3, 3), 6), c4 ) + o3 = _bor( _blshift(_band(c3, 3), 6), c4 ) else o3 = nil end @@ -102,12 +110,25 @@ function Base64.encode(bytes) return output end +local function Throttle() + local ts = os.clock() + local timeout = .095 + return function() + local nts = os.clock() + if nts > ts + timeout then + os.sleep(0) + ts = os.clock() + end + end +end + function Base64.decode(str) local bytes = {} local blocks = {} local blockNum = 1 + local throttle = Throttle() for i=1, #str, 4 do - blocks[blockNum] = string.sub(str, i, i+3) + blocks[blockNum] = _sub(str, i, i+3) blockNum = blockNum+1 end for i=1, #blocks do @@ -115,9 +136,7 @@ function Base64.decode(str) table.insert(bytes, o1) table.insert(bytes, o2) table.insert(bytes, o3) -if (i % 1000) == 0 then - os.sleep(0) -end + throttle() end -- Remove padding: --[[ diff --git a/core/multiMiner.lua b/core/multiMiner.lua index 6cd2ce7..e8af5ee 100644 --- a/core/multiMiner.lua +++ b/core/multiMiner.lua @@ -221,7 +221,7 @@ local blocksTab = UI.Tab { grid = UI.ScrollingGrid { y = 1, columns = { - { heading = 'Count', key = 'count', width = 6, justify = 'right' }, + { heading = 'Count', key = 'count', width = 6, align = 'right' }, { heading = 'Name', key = 'displayName' }, }, sortColumn = 'displayName', @@ -235,8 +235,8 @@ local turtlesTab = UI.Tab { values = pool, columns = { { heading = 'ID', key = 'id', width = 4, }, - { heading = ' Fuel', key = 'fuel', width = 5, justify = 'right' }, - { heading = ' Dist', key = 'distance', width = 5, justify = 'right' }, + { heading = ' Fuel', key = 'fuel', width = 5, align = 'right' }, + { heading = ' Dist', key = 'distance', width = 5, align = 'right' }, { heading = 'Status', key = 'status' }, }, sortColumn = 'label', diff --git a/milo/MiloRemote.lua b/milo/MiloRemote.lua index dd7aac9..7ac1934 100644 --- a/milo/MiloRemote.lua +++ b/milo/MiloRemote.lua @@ -49,7 +49,7 @@ local page = UI.Page { grid = UI.Grid { y = 2, ey = -2, columns = { - { heading = ' Qty', key = 'count' , width = 4, justify = 'right' }, + { heading = ' Qty', key = 'count' , width = 4, align = 'right' }, { heading = 'Name', key = 'displayName' }, }, values = { }, diff --git a/milo/core/listing.lua b/milo/core/listing.lua index 2c15288..9442459 100644 --- a/milo/core/listing.lua +++ b/milo/core/listing.lua @@ -40,7 +40,7 @@ local page = UI.Page { grid = UI.Grid { y = 2, ey = -2, columns = { - { heading = ' Qty', key = 'count' , width = 4, justify = 'right' }, + { heading = ' Qty', key = 'count' , width = 4, align = 'right' }, { heading = 'Name', key = 'displayName' }, { heading = 'Min', key = 'low' , width = 4 }, { heading = 'Max', key = 'limit' , width = 4 }, diff --git a/milo/core/machines.lua b/milo/core/machines.lua index 17c0fc6..84cab82 100644 --- a/milo/core/machines.lua +++ b/milo/core/machines.lua @@ -29,7 +29,7 @@ local networkPage = UI.Page { y = 2, ey = -3, values = context.storage.nodes, columns = { - { key = 'suffix', width = 4, justify = 'right' }, + { key = 'suffix', width = 4, align = 'right' }, { heading = 'Name', key = 'displayName' }, { heading = 'Type', key = 'mtype', width = 4 }, { heading = 'Pri', key = 'priority', width = 3 }, diff --git a/milo/plugins/activityView.lua b/milo/plugins/activityView.lua index 30e7203..ba0e117 100644 --- a/milo/plugins/activityView.lua +++ b/milo/plugins/activityView.lua @@ -81,13 +81,14 @@ local function createPage(node) local page = UI.Page { parent = monitor, + backgroundColor = colors.black, grid = UI.Grid { - ey = -2, + ey = -3, columns = { - { heading = 'Qty', key = 'count', width = 5 }, - { heading = 'Change', key = 'change', width = 5 }, - { heading = 'Rate', key = 'rate', width = 6 }, - { heading = 'Name', key = 'displayName' }, + { heading = 'Qty', key = 'count', width = 6, align = 'right' }, + { heading = '+/-', key = 'change', width = 6, align = 'right' }, + { heading = 'Name', key = 'displayName' }, + { heading = 'Rate', key = 'rate', width = 6, align = 'right' }, }, sortColumn = 'displayName', headerBackgroundColor = colors.black, @@ -100,19 +101,22 @@ local function createPage(node) prevButton = UI.Button { x = 1, width = 5, event = 'previous', - backgroundColor = colors.lightGray, + textColor = colors.cyan, + backgroundColor = colors.black, text = ' < ' }, resetButton = UI.Button { x = 7, ex = -7, event = 'reset', - backgroundColor = colors.lightGray, + textColor = colors.cyan, + backgroundColor = colors.black, text = 'Reset' }, nextButton = UI.Button { x = -5, width = 5, event = 'next', - backgroundColor = colors.lightGray, + textColor = colors.cyan, + backgroundColor = colors.black, text = ' > ' }, }, diff --git a/milo/plugins/machineMover.lua b/milo/plugins/machineMover.lua index a993e2b..51f477e 100644 --- a/milo/plugins/machineMover.lua +++ b/milo/plugins/machineMover.lua @@ -13,7 +13,7 @@ local page = UI.Page { y = 2, ey = -4, values = context.storage.nodes, columns = { - { key = 'suffix', width = 4, justify = 'right' }, + { key = 'suffix', width = 4, align = 'right' }, { heading = 'Name', key = 'displayName' }, { heading = 'Type', key = 'mtype', width = 4 }, { heading = 'Pri', key = 'priority', width = 3 }, diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua index 702eae5..c0f6abc 100644 --- a/miners/scanningMiner.lua +++ b/miners/scanningMiner.lua @@ -100,7 +100,7 @@ local page = UI.Page { y = 2, ey = -2, sortColumn = 'name', columns = { - { heading = 'Count', key = 'count', width = 5, justify = 'right' }, + { heading = 'Count', key = 'count', width = 5, align = 'right' }, { heading = 'Resource', key = 'displayName' }, }, }, diff --git a/neural/Scanner.lua b/neural/Scanner.lua index 3d6e332..7af1d35 100644 --- a/neural/Scanner.lua +++ b/neural/Scanner.lua @@ -27,7 +27,7 @@ local page = UI.Page { y = 2, columns = { { heading = 'Name', key = 'displayName' }, - { heading = 'Count', key = 'count', width = 5, justify = 'right' }, + { heading = 'Count', key = 'count', width = 5, align = 'right' }, }, sortColumn = 'displayName', }, @@ -46,9 +46,9 @@ local page = UI.Page { columns = { { heading = 'Name', key = 'name' }, { heading = 'Dmg', key = 'metadata', width = 3 }, - { heading = ' X', key = 'x', width = 3, justify = 'right' }, - { heading = ' Y', key = 'y', width = 3, justify = 'right' }, - { heading = ' Z', key = 'z', width = 3, justify = 'right' }, + { heading = ' X', key = 'x', width = 3, align = 'right' }, + { heading = ' Y', key = 'y', width = 3, align = 'right' }, + { heading = ' Z', key = 'z', width = 3, align = 'right' }, }, sortColumn = 'name', }, diff --git a/neural/Sensor.lua b/neural/Sensor.lua index f2db0ac..b200a8b 100644 --- a/neural/Sensor.lua +++ b/neural/Sensor.lua @@ -45,9 +45,9 @@ local page = UI.Page { y = 2, columns = { { heading = 'Name', key = 'displayName' }, - { heading = ' X', key = 'x', width = 3, justify = 'right' }, - { heading = ' Y', key = 'y', width = 3, justify = 'right' }, - { heading = ' Z', key = 'z', width = 3, justify = 'right' }, + { heading = ' X', key = 'x', width = 3, align = 'right' }, + { heading = ' Y', key = 'y', width = 3, align = 'right' }, + { heading = ' Z', key = 'z', width = 3, align = 'right' }, }, values = sensor.sense(), sortColumn = 'displayName', diff --git a/swshop/shopView.lua b/swshop/shopView.lua index c4a1284..76d97f6 100644 --- a/swshop/shopView.lua +++ b/swshop/shopView.lua @@ -59,9 +59,9 @@ local function createPage(node) backgroundSelectedColor = colors.black, unfocusedBackgroundSelectedColor = colors.gray, columns = { - { heading = 'Stock', key = 'count', width = 6, justify = 'right' }, + { heading = 'Stock', key = 'count', width = 6, align = 'right' }, { heading = 'Name', key = 'displayName' }, - { heading = ' Price', key = 'price', width = 9, justify = 'right' }, + { heading = ' Price', key = 'price', width = 9, align = 'right' }, { heading = 'Address', key = 'address', width = 12 }, }, sortColumn = 'displayName',