Merge branch 'master' of github.com:MightyPirates/OpenComputers

src/main/resources/assets/opencomputers/loot/OpenLoader/OpenLoader.man

@@ -0,0 +1,16 @@
+NAME
+	OpenLoader - A simple bootloader
+
+DESCRIPTION
+	A simple bootloader that gives power to chose wich system to boot.
+	The bootloader searches for init.lua on filesystems.
+	One drive can contain more than one system/init. Another inits
+	may be placed into /boot/kernel directory. Entries are labeled
+	following these rules:
+	for /boot/kernel, the label is file name
+	for /init.lua label is contained in /.osprop file, which is
+	simple lua script returning table with properties.
+
+EXAMPLE .osprop file:
+	return {name = "OpenOS"}
+

src/main/resources/assets/opencomputers/loot/OpenLoader/init.lua

@@ -0,0 +1,125 @@
+_G._OSVERSION = "OpenLoader 0.1"
+local component = component or require('component')
+local computer = computer or require('computer')
+local unicode = unicode or require('unicode')
+
+
+local gpu = component.list("gpu")()
+local w, h
+
+local screen = component.list('screen')()
+for address in component.list('screen') do
+    if #component.invoke(address, 'getKeyboards') > 0 then
+        screen = address
+    end
+end
+
+local cls = function()end
+if gpu and screen then
+    component.invoke(gpu, "bind", screen)
+    w, h = component.invoke(gpu, "getResolution")
+    component.invoke(gpu, "setResolution", w, h)
+    component.invoke(gpu, "setBackground", 0x000000)
+    component.invoke(gpu, "setForeground", 0xFFFFFF)
+    component.invoke(gpu, "fill", 1, 1, w, h, " ")
+    cls = function()component.invoke(gpu,"fill", 1, 1, w, h, " ")end
+end
+local y = 1
+local function status(msg)
+    if gpu and screen then
+        component.invoke(gpu, "set", 1, y, msg)
+        if y == h then
+            component.invoke(gpu, "copy", 1, 2, w, h - 1, 0, -1)
+            component.invoke(gpu, "fill", 1, h, w, 1, " ")
+        else
+            y = y + 1
+        end
+    end
+end
+
+local function loadfile(fs, file)
+    --status("> " .. file)
+    local handle, reason = component.invoke(fs,"open",file)
+    if not handle then
+        error(reason)
+    end
+    local buffer = ""
+    repeat
+        local data, reason = component.invoke(fs,"read",handle,math.huge)
+        if not data and reason then
+            error(reason)
+        end
+        buffer = buffer .. (data or "")
+    until not data
+    component.invoke(fs,"close",handle)
+    return load(buffer, "=" .. file)
+end
+
+local function dofile(fs, file)
+    local program, reason = loadfile(fs, file)
+    if program then
+        local result = table.pack(pcall(program))
+        if result[1] then
+            return table.unpack(result, 2, result.n)
+        else
+            error(result[2])
+        end
+    else
+        error(reason)
+    end
+end
+
+local function boot(kernel)
+    status("BOOTING")
+    _G.computer.getBootAddress = function()return kernel.address end
+    cls()
+    dofile(kernel.address, kernel.fpx .. kernel.file)
+end
+
+status("OpenLoader")
+status("Select what to boot:")
+
+local osList = {}
+
+for fs in component.list("filesystem") do
+    if component.invoke(fs, "isDirectory", "boot/kernel/")then
+        for _,file in ipairs(component.invoke(fs, "list", "boot/kernel/")) do
+            osList[#osList+1] = {fpx = "boot/kernel/", file = file, address = fs}
+            status(tostring(#osList).."."..file.." from "..(fs:sub(1,3)))
+        end
+    end
+    if fs ~= computer.getBootAddress() and component.invoke(fs, "exists", "init.lua") then
+        local osName = "init.lua"
+        if component.invoke(fs, "exists", ".osprop") then
+            pcall(function()
+                local prop = dofile(fs, ".osprop") 
+                osName = (prop and prop.name) or "init.lua" 
+            end)
+        end
+        osList[#osList+1] = {fpx = "", file = "init.lua", address = fs}
+        status(tostring(#osList).."."..osName.." from "..(fs:sub(1,3)))
+    end
+end
+status("Select os: ")
+if #osList == 1 then
+    boot(osList[1])
+end
+if #osList == 0 then
+    error("No OS found")
+    while true do computer.pullSignal() end
+end
+while true do
+    local sig = {computer.pullSignal()}
+    if sig[1] == "key_down" then
+        if sig[4] >= 2 and sig[4] <= 11 then
+            if osList[sig[4]-1] then
+                boot(osList[sig[4]-1])
+            else
+                status("Not found!")
+            end
+        end
+    end
+end
+error("System crashed")
+while true do computer.pullSignal() end
+

src/main/resources/assets/opencomputers/loot/OpenOS/.osprop

@@ -0,0 +1 @@
+return {name = "OpenOS"}

src/main/resources/assets/opencomputers/loot/loot.properties

@@ -7,6 +7,7 @@
 BetterShell=besh
 Builder=build:1:dyeCyan
 OpenIRC=irc:1:dyeRed
+OpenLoader=openloader:1:dyeOrange
 OpenOS=openos:1:dyeGreen
 MazeGen=maze:1:dyeBrown
 OPPM=oppm:1:dyeLime

src/main/resources/assets/opencomputers/robot.names

@@ -17,12 +17,14 @@ Kilobyte
 
 # Names of more or less famous robots, as a bit of filler material. Feel free
 # to add more via pull requests. Let's hope this won't get us sued...
+Adventure Core
 Atlas
 Bender
 C-3PO
 Clank
 Claptrap
 Dog
+Fact Core
 GLaDOS
 HAL 9000
 Heron
@@ -33,6 +35,7 @@ Marvin
 P-Body
 R2-D2
 Skynet
+Space Core
 Terminator T-1000
 Terminator T-800
 Wheatley