View difference between Paste ID: JUhsDLDd and fGbMtuXU

---NhUI
+-- future version wish: table implementation?
-nhver = "v0.4u"
+-- cfg: add nhui auto update preferences [versions, hotfixes] (under new menu under options > preferences > updating > versions/hotfixes)
-wip = 0
+-- misc: swap uninstall and about
 -- .nhuicfg: add variable to detect if config is outdated. give warning before install of a new version
---Loading
+-- desk: add hotfix handling structure (versions fed by legacy startup, handled by desktop)
-if deskLoad==nil then
+-- hotfix: detect on startup; have options for more information on the hotfix; option for to never ask again; version list keeps base installs; if multiple hotfixes available, let user select hotfix to view more info/install on startup
 -- if auto update is true display message letting user know it's about to apply a hotfix
-  local cycles = {"   ",".  ",".. ","..."," ..","  .","   "}
+-- hotfix function: checks for internet, runs hotfix link that detects target nhui programs and deletes them, downloads new versions in their place
-  local message = "Loading NhUI "..nhver
+-- updates: add warning if version is not compatible
-  for i=0,7 do
+-- add a spoof disclaimer for comedic effect (not responsible for damage caused for virtual computer etc)
-    term.setCursorPos(1,1)
+
-    print(message..cycles[(i%#cycles)+1])
+-- basic variables and functions
-    sleep(.1)
+nhver,wip="v0.5",true
 local nhuiProgs={["login"]="UwwmSJwL",["updater"]="ag7RuWX4",[".nhuicfg"]="mbD7EU2J"}
-  deskLoad=false
+local nhuiProgList={"startup","desktop","updater","login",".nhuicfg"}
 
 local colorList={["red"]=16384,["yellow"]=16,["white"]=1,["lightGrey"]=256,["grey"]=128}
---Unstable version detected
+local colorListMono={["red"]=1,["yellow"]=1,["white"]=1,["lightGrey"]=256,["grey"]=128}
-local function suggestedUpdate()
+local function setTxtColor(color)
-  if wip==2 and sugUpdate==nil then sugUpdate=false
+  term.setTextColor(term.isColor() and colorList[color] or colorListMono[color])
-    term.clear()
+
-    term.setCursorPos(1,1)
+
-    sleep(.1)
+local function printAt(text,setX,setY)
-    print("You're running an unstable WIP build.\nUpdate to the newest "..nhver.." build now?")
+  term.setCursorPos(setX,setY) print(text)
-    print("\n1|Yes\n2|No")
+end
 
-      local event, b, x, y = os.pullEventRaw()
+
-      if event == "key" then
+  term.clear() term.setCursorPos(1,1)
-        if b==2 then
+
-          term.clear()
+
-          term.setCursorPos(1,1)
+local function pingPastebin()
-          shell.run("delete","installer")
+  http.request("http://pastebin.com")
-          shell.run("pastebin","get","WCdpCaEm","installer")
+  local requesting=true
-          shell.run("installer")
+  while requesting do
-        elseif b==3 then
+
-          break
+    print("Waiting for pastebin.com...")
-        end
+    local event=os.pullEvent()
-      elseif event == "mouse_click" then
+    if event=="http_success" then internet,requesting=true,false
-        if b==1 and x>=1 and x<=5 and y==4 then
+    elseif event=="http_failure" then internet,requesting=false end
-          shell.run("delete","installer")
+
-          shell.run("pastebin","get","WCdpCaEm","installer")
+  if internet==false then print("...could not connect.") sleep(1) resetScreen() end
-          shell.run("installer")
+
-        elseif b==1 and x>=1 and x<=4 and y==5 then
+
-          break
+local function anyKey()
-        end
+  sleep(.2)
-      end
+  local event,b,x,y=os.pullEventRaw()
   if (event=="key" and b~=0) or (event=="mouse_click" and x>0 and y>0) then anyKeyReq=nil end
 end
 
 
---Variables
+local function openConfig()  -- needs to be formatted to fs.open
-if not term.isColor then
+  local file=fs.open(".nhuicfg", "r")
-else
+  sContents=file:read()
-  tBarC = 32768
+  file:close()
-  tBartC = 1
+  tContents=textutils.unserialize(sContents)
-  backColor = 32768
+
 
 local function editConfigLine(line,text)  -- needs to be formatted to fs.open
---Desktop prep
+  table.remove(tContents,line)
   table.insert(tContents,line,text)
 end
-  term.setCursorPos(1,1)
+
 local function saveConfig()  -- needs to be formatted to fs.open
   sContents=textutils.serialize(tContents)
-local function setBackColor()
+  local file=fs.open(".nhuicfg","w")
-  if not term.isColor then
+  file:write(sContents)
-  elseif term.isColor() then
+  file:close()
-    term.setBackgroundColor(backColor)
+
-  else
+
-    term.setBackgroundColor(backColor)
+-- menu-related functions
 openConfig()  -- needs to be formatted to fs.open
 local deskColors={["menuColor"]=tContents[4],["menuTextColor"]=tContents[5],["backgroundColor"]=tContents[6],["textColor"]=tContents[7],["secondaryTextColor"]=tContents[8],["tertiaryTextColor"]=tContents[9]}
 saveConfig()
-local function setTextWhite()
+
-  if not term.isColor then
+local function menuBar()
-  elseif term.isColor() then
+  term.setCursorPos(1,1) term.clearLine()
-    term.setTextColor(1)
+  term.setBackgroundColor(deskColors["menuColor"])
-  else
+  term.setTextColor(deskColors["menuTextColor"])
-    term.setTextColor(1)
+  printAt((s==0 or s==nil) and "1|Start   2|Apps   3|Options   4|NhUI" or "-|Start   -|Apps   -|Options   -|NhUI",2,1)
 end
 
 local function drawMenus()
-local function titleBarColor()
+  term.setTextColor(deskColors["menuTextColor"])
-  if not term.isColor then
+  term.setBackgroundColor(deskColors["menuColor"])
-  elseif term.isColor() then
+  if s==1 then printAt("1|CraftOS\n ---------\n 2|Shutdown\n 3|Restart",2,2)
-    term.setBackgroundColor(tBarC)
+  elseif s==2 then printAt("1|Clock",12,2)
-    term.setTextColor(tBartC)
+  elseif s==3 then printAt("1|Password",21,2)
-  else
+  elseif s==4 then printAt("1|Versions\n                                2|Uninstall\n                                3|About",33,2) end
-    term.setBackgroundColor(tBarC)
+
-    term.setTextColor(tBartC)
+
 local function drawDesktop()
   term.setBackgroundColor(deskColors["backgroundColor"])
   term.clear()
-local function titleBar()
+  if wip==true then setTxtColor("red") printAt("NOTE: WIP BUILD - POSSIBLY UNSTABLE",2,17) end
-  term.setCursorPos(1,1)
+  setTxtColor("lightGrey") printAt("(Use " .. (term.isColor() and "mouse & " or "") .. "keyboard for selecting.)",2,18)
-  titleBarColor()
+  setTxtColor("grey") printAt(nhver,47,18)
-  term.clearLine()
+  menuBar()
-  term.setCursorPos(2, 1)
+
-  term.write("1|Start")
+
-  term.setCursorPos(12, 1)
+
-  term.write("2|Options")
+  dispTime=true
-  term.setCursorPos(24, 1)
+
-  term.write("3|NhUI")
+    local inGameTime=textutils.formatTime(os.time(),false)
     local x=term.getSize()
     printAt(inGameTime,23,1)
-local function titleBarExt()
+    sleep(.01)
-  term.setCursorPos(1,1)
+  until dispTime==false
-  titleBarColor()
+
-  term.clearLine()
+
-  term.setCursorPos(2, 1)
+local function displayTimeMenu()
-  term.write("-|Start")
+  printAt("Current in-game time:\n\n1|(Back)",1,1)
-  term.setCursorPos(12, 1)
+
-  term.write("-|Options")
+    local event,b,x,y=os.pullEventRaw()
-  term.setCursorPos(24, 1)
+    if (event=="key" and b==keys.one) or (event=="mouse_click" and b==1 and x>=1 and x<=8 and y==3) then dispTime=false drawDesktop() return end
-  term.write("-|NhUI")
+
 end
 
-local function deskRun()
+-- executable-related functions
-  if fs.exists("desktop") then
+local function runMenu()
-    shell.run("desktop")
+  local yLine=2
-  else
+
-    shell.run("startup")
+    term.setCursorPos(1,yLine) term.clearLine()
     yLine=yLine+1
   until yLine==6
   menuBar()
   drawMenus()
-  setTextWhite()
+
-  term.setCursorPos(43, 1)
+
-  if os.time()>=10 and os.time()<13 then
+
-    term.write(textutils.formatTime(os.time(), false ))
+  s=0 resetScreen()
-  elseif os.time()>=22 and os.time()>0 then
+  setTxtColor("yellow") print(os.version().." (run 'desktop' to return to desktop)")
-    term.write(textutils.formatTime(os.time(), false ))
+  setTxtColor("white")
-  else
+
-    term.write(" "..textutils.formatTime(os.time(), false ))
+
 
-  sleep(.83)
+local function runClock()
   s=0 resetScreen()
   parallel.waitForAny(displayTime,displayTimeMenu)
-local function displayTimeExt()
+
-  setTextWhite()
+
-  term.setCursorPos(43, 1)
+local function runPasswordSetup()
-  if os.time()>=10 and os.time()<13 then
+  s=0 resetScreen()
-    term.write(textutils.formatTime(os.time(), false ))
+  pingPastebin()
-  elseif os.time()>=22 and os.time()>0 then
+  if internet==true then resetScreen()
-    term.write(textutils.formatTime(os.time(), false ))
+    openConfig()
-  else
+    if tContents[2]==true then print("This terminal is password protected.") else print("This terminal is not password protected.") end
-    term.write(" "..textutils.formatTime(os.time(), false ))
+    print("Would you like to set/change your password?\n\n1|Yes\n2|No\n3|(Back)")
     while true do
       local event,b,x,y=os.pullEventRaw()
       if (event=="key" and b==keys.one) or (event=="mouse_click" and b==1 and x>=1 and x<=5 and y==4) then
         fs.delete("login")
-  setBackColor()
+        shell.run("pastebin get",nhuiProgs["login"],"login")
         resetScreen()
-  term.setCursorPos(2,17)
+        print("Desired password? (Note: will display input.)")
-  if wip==1 then
+        editConfigLine(2,"true")
-    if not term.isColor then
+        local sInput=read()
-      term.write("NOTE: WIP BUILD - CURRENTLY STABLE")
+        if sInput~="" then sPass=sInput end
-    elseif term.isColor() then
+        editConfigLine(3,sPass)
-      term.setTextColor(8192)
+        saveConfig()
-      term.write("NOTE: WIP BUILD - CURRENTLY STABLE")
+        print("\n\n@Preferences saved.\n@Press any key to return to desktop.")
-      term.setTextColor(1)
+        anyKey() drawDesktop() return
-    else
+      elseif (event=="key" and b==keys.two) or (event=="mouse_click" and b==1 and x>=1 and x<=4 and y==5) then
-      term.setTextColor(1)
+        fs.delete("login")
-      term.write("NOTE: WIP BUILD - CURRENTLY STABLE")
+        editConfigLine(2,"")
         editConfigLine(3,"")
-  elseif wip==2 then
+        saveConfig()
-    if not term.isColor then
+        print("\n\n@Preferences saved.\n@Press any key to return to desktop.")
-      term.write("NOTE: WIP BUILD - CURRENTLY UNSTABLE")
+        anyKey() drawDesktop() return
-    elseif term.isColor() then
+      elseif (event=="key" and b==keys.three) or (event=="mouse_click" and b==1 and x>=1 and x<=8 and y==6) then drawDesktop() return end
-      term.setTextColor(16384)
+
-      term.write("NOTE: WIP BUILD - CURRENTLY UNSTABLE")
+  elseif internet==false then drawDesktop() return end
-    else
+
-      term.setTextColor(1)
+
-      term.write("NOTE: WIP BUILD - CURRENTLY UNSTABLE")
+local function runUpdater()
   s=0 resetScreen()
   pingPastebin()
-  if not term.isColor then
+  if internet==true then resetScreen()
-    term.setCursorPos(2,18)
+    shell.run("pastebin run",nhuiProgs["updater"])
-    term.write("(Mouse and keyboard supported.)")
+    drawDesktop()
-    term.setCursorPos(47,17)
+  elseif internet==false then drawDesktop() return end
-    term.write("NhUI")
+
-    term.setCursorPos(46,18)
+
-    term.write(nhver)
+local function runUninstallCheck()
-  else
+  s=0 resetScreen()
-    term.setTextColor(256)
+  print("Would you like to uninstall NhUI "..nhver.."?")
-    term.setCursorPos(2,18)
+  setTxtColor("lightGrey") print("(User-created programs will *not* be deleted.)")
-    term.write("(Mouse and keyboard supported.)")
+  setTxtColor("white") print("\n1|Yes\n2|No (Back)")
-    term.setTextColor(128)
+
-    term.setCursorPos(47,17)
+    local event,b,x,y=os.pullEventRaw()
-    term.write("NhUI")
+    if (event=="key" and b==keys.one) or (event=="mouse_click" and b==1 and x>=1 and x<=5 and y==4) then
-    term.setCursorPos(46,18)
+      for i=1, #nhuiProgList do fs.delete(nhuiProgList[i]) end
-    term.write(nhver)
+      print("\n\n@NhUI "..nhver.." uninstalled successfully.\n@Press any key to reboot your computer.")
       anyKey() os.reboot()
-  titleBar()
+    elseif (event=="key" and b==keys.two) or (event=="mouse_click" and b==1 and x>=1 and x<=11 and y==5) then drawDesktop() return end
-  disptime=1
+
 end
-    displayTime()
+
-  until disptime==0
+local function runAbout()
   s=0 resetScreen()
   print("NhUI Author: Nhorr (Philip)\n(Pastebin Link: pastebin.com/u/Nhorr)\n\n1|(Back)")
-local function menuColor()
+
-  if not term.isColor then
+    local event,b,x,y=os.pullEventRaw()
-  elseif term.isColor() then
+    if (event=="key" and b==keys.one) or (event=="mouse_click" and b==1 and x>=1 and x<=8 and y==4) then drawDesktop() return end
-    term.setTextColor(tBartC)
+
-    term.setBackgroundColor(backColor)
+
-  else
+
-    term.setTextColor(tBartC)
+-- desktop structure
-    term.setBackgroundColor(backColor)
+
   s=0  -- selection rule
   while true do
     local event,b,x,y=os.pullEventRaw()
-local function drawMenu1()
+    -- if selection rule = 0
-  menuColor()
+    if (event=="key" and s==0 and b==keys.one) or (event=="mouse_click" and b==1 and x>=2 and x<=8 and y==1) then s=1 runMenu()
-  term.setCursorPos(2,2)
+    elseif (event=="key" and s==0 and b==keys.two) or (event=="mouse_click" and b==1 and x>=12 and x<=17 and y==1) then s=2 runMenu()
-  print("1|CraftOS")
+    elseif (event=="key" and s==0 and b==keys.three) or (event=="mouse_click" and b==1 and x>=21 and x<=29 and y==1) then s=3 runMenu()
-  term.setCursorPos(2,3)
+    elseif (event=="key" and s==0 and b==keys.four) or (event=="mouse_click" and b==1 and x>=33 and x<=38 and y==1) then s=4 runMenu()
-  print("---------")
+    -- if selection rule = 1
-  term.setCursorPos(2,4)
+    elseif (event=="key" and s==1 and b==keys.one) or (event=="mouse_click" and s==1 and b==1 and x>=2 and x<=10 and y==2) then runShell() break
-  print("2|Shutdown")
+    elseif event=="mouse_click" and s==1 and b==1 and x>=2 and x<=10 and y==3 then s=1 drawMenus()
-  term.setCursorPos(2,5)
+    elseif (event=="key" and s==1 and b==keys.two) or (event=="mouse_click" and s==1 and b==1 and x>=2 and x<=11 and y==4) then os.shutdown()
-  print("3|Restart")
+    elseif (event=="key" and s==1 and b==keys.three) or (event=="mouse_click" and s==1 and b==1 and x>=2 and x<=10 and y==5) then os.reboot()
     -- if selection rule = 2
     elseif (event=="key" and s==2 and b==keys.one) or (event=="mouse_click" and s==2 and b==1 and x>=12 and x<=18 and y==2) then runClock()
-local function clearMenu1()
+    -- if selection rule = 3
-  term.setCursorPos(2,2)
+    elseif (event=="key" and s==3 and b==keys.one) or (event=="mouse_click" and s==3 and b==1 and x>=21 and x<=30 and y==2) then runPasswordSetup()
-  term.clearLine()
+    -- if selection rule = 4
-  term.setCursorPos(2,3)
+    elseif (event=="key" and s==4 and b==keys.one) or (event=="mouse_click" and s==4 and b==1 and x>=33 and x<=42 and y==2) then runUpdater()
-  term.clearLine()
+    elseif (event=="key" and s==4 and b==keys.two) or (event=="mouse_click" and s==4 and b==1 and x>=33 and x<=43 and y==3) then runUninstallCheck()
-  term.setCursorPos(2,4)
+    elseif (event=="key" and s==4 and b==keys.three) or (event=="mouse_click" and s==4 and b==1 and x>=33 and x<=39 and y==4) then runAbout()
-  term.clearLine()
+    elseif event=="key" or event=="mouse_click" then s=0 runMenu() end
-  term.setCursorPos(2,5)
+
-  term.clearLine()
+
 
 -- run desktop
-local function drawMenu2()
+
-  menuColor()
+parallel.waitForAll(drawDesktop,runDesktop)