View difference between Paste ID: FLG2SKe6 and TqV0Mi9L

-local version = "1.13" --(01/09 2020)
+local version = "Dev" --(26/06 2020)
-os.loadAPI("/lib/f") -- a monitor API made by myself, it makes my life easier
+os.loadAPI("/spawner/f") -- a monitor API made by myself, it makes my life easier
-os.loadAPI("/lib/getInput") -- search bar read() function
+os.loadAPI("/spawner/lib/API") -- search_bar
-os.loadAPI("/portal/API") -- custom API to help run the program
+os.loadAPI("/spawner/lib/APIjson")
-local p = peripheral.find("draconic_chest") -- can change for "chest" instead of "draconic_chest"
+local list_items,items = {},{}
-local m = peripheral.find("monitor") -- running on a monitor
+local a,b,c,chestSize = 1,1,1,100
-local q = peripheral.find("peripheral")
+local Pcheck = false
-m.setTextScale(1)
+
-local side,rside = "east","left" -- IMPORTANT
+b = {}
-local list_items,items,stq = {},{},{}
+function addButton(m,x1,y1,x2,y2,name)
-local a,b,c = 1,1,1
+  b[name] = {win = window.create(m,x1,y1,x2,y2)}
-local selected,last_dest = 0,"aucun"
+  b[name]["pos"] = {b[name].win.getPosition()} b[name]["size"] = {b[name].win.getSize()}
-local chestSize = p.getInventorySize()
+  b[name]["isClicked"] =
-local w,h = m.getSize()
+  function(x,y)
     local l = {x1,y1,x2+x1,y2+y1)
-local bg = window.create(m,1,1,w,h)
+    return f.box(x,y,l[1],l[2],l[3],l[4])
-local list = window.create(m,1,2,w*3/5-1,chestSize)
+
-local up_bar = window.create(m,1,1,w,1)
+
-local down_bar = window.create(m,1,h,w,h)
+
-local scroll_bar = window.create(m,w*(3/5),2,1,h-1)
+function getPeriphs()
-local bg2 = window.create(m,w*0.6+1,2,w*0.4+1,h-1)
+  p = peripheral.find("diamond") -- can change for "chest" instead of "draconic_chest"
-local pbg2 = {bg2.getPosition()} sbg2 = {bg2.getSize()}
+  if p == nil then isChest = false else isChest = true end
-local button1 = window.create(bg2,2,3,sbg2[1]-3,3)
+  m = peripheral.find("monitor") -- running on a monitor
-local pb1 = {button1.getPosition()} sb1 = {button1.getSize()}
+  if m == nil then m = term.current() isMonitor = false else m.setTextScale(0.5) isMonitor = true end
   fxd = peripheral.find("thermaldynamics_fluxduct")
   w,h = m.getSize()
   bg = window.create(m,1,1,w,h)
   list = window.create(m,1,2,w*3/5-1,chestSize)
   up_bar = window.create(m,1,1,w,1)
   down_bar = window.create(m,1,h,w,h)
   scroll_bar = window.create(m,w*(3/5),2,1,h-1)
   bg2 = window.create(m,w*0.6+1,2,w*0.4+1,h-1)
   pbg2 = {bg2.getPosition()} sbg2 = {bg2.getSize()}
   addButton(bg2,2,13,sbg2[1]-2,3,"button1")
   addButton(bg2,2,9,5,3,"button2")
   addButton(bg2,2,3,5,3,"spawner1") addButton(bg2,10,3,5,3,"spawner2") addButton(bg2,18,3,5,3,"spawner3")
-  button1.setBackgroundColor(colors.red) button1.clear()
+  for q=1,3 do bq = b["spawner"..q]
-  f.centerText(up_bar,1,"selectionner une destination","black","lightGray")
+  b["spawner"..q].reset = function() b["spawner"..q].win.setBackgroundColor(colors.black) b["spawner"..q].win.clear()
-  f.cprint(down_bar,1,1,"dernier tp : ","black")
+  f.cprint(b["spawner"..q].win,3,2,q,"lightGray","black") end
   b["spawner"..q].selected = function() b["spawner"..q].win.setBackgroundColor(colors.magenta)
-  f.cprint(down_bar,14,1,last_dest,"blue","lightGray")
+  b["spawner"..q].win.clear() f.cprint(b["spawner"..q].win,3,2,q,"black","magenta") end
   b["spawner"..q].reset()
   end
-  f.cprint(bg2,2,1,"Status: ","white","gray")
+
-  f.cprint(bg2,2,7,"Rechercher:","white","gray")
+getPeriphs()
-  f.centerText(button1,2,"fermer","black","red")
+
-  f.drawLine(bg2,2,9,sbg2[1]-2.4,"lightGray")
+local default = {
-  if q ~= nil then
+  spawner1={side="east",curr_item=""},
-    local stq = q.getAllStacks()
+  spawner2={side="north",curr_item=""},
-    if stq[1] ~= nil then f.cprint(bg2,10,1,"ouvert","green","gray")
+  spawner3={side="west",curr_item=""},
-    else f.cprint(bg2,10,1,"en veille","yellow","gray") end
+  rside="right",
   enable = true,
-  if word ~= nil then f.cprint(bg2,2,9,word,"gray","lightGray") end
+  player_name="MarkFergus",
-  f.cprint(bg2,2,11,"Double-cliquer sur","white","gray")
+  server="infinity.mineaurion.com",
-  f.cprint(bg2,2,12," un nom pour se","white","gray")
+  selected = 0, rubrique = 1
-  f.cprint(bg2,2,13," teleporter.","white","gray")
+}
-  f.cprint(bg2,2,14,"Taper dans le","white","gray")
+
-  f.cprint(bg2,2,15," computer une ","white","gray")
+if fs.exists("/spawner/config") == false then f1 = fs.open("/spawner/config","w") f1.write(textutils.serialise(default)) f1.close() end
-  f.cprint(bg2,2,16," recherche.","white","gray")
+f1 = fs.open("/spawner/config","r") index = textutils.unserialize(f1.readAll()) f1.close()
 if fs.exists("/spawner/nbt") == false then error("missing 'nbt file'") end
 f2 = fs.open("/spawner/nbt","r") nbt_index = textutils.unserialize(f2.readAll()) f2.close()
-function pulse()
+rubrique = index.rubrique selected = index.selected
-  rs.setAnalogOutput(rside,15)
+
-  sleep(0.5)
+
-  rs.setAnalogOutput(rside,0)
+
 local GUIDES = {"zorinova","DaikiKaminari","maxou684"}
 
-function getItems()
+
-  b = 1
+
   list.setBackgroundColor(colors.black) list.clear()
   up_bar.setBackgroundColor(colors.lightGray) up_bar.clear()
   down_bar.setBackgroundColor(colors.lightGray) down_bar.clear()
-      list_items[a] = p.getStackInSlot(a)
+
-      if list_items[a] ~= nil and list_items[a].name == "teleporterMKI" then
+
   b["button1"].win.setBackgroundColor(colors.purple) b["button1"].win.clear()
   b["button2"].win.setBackgroundColor(colors.red) b["button2"].win.clear()
-        items[b][2] = API.normalize(list_items[a].display_name)
+
-        if API.check(VIP,items[b][2]) == true then items[b][3] = "VIP" end
+  if fxd~=nil then f.cprint(down_bar,1,1,fxd.getMaxEnergyStored()-fxd.getEnergyStored().." RF","red","lightGray") end
-        if API.check(GUIDES,items[b][2]) == true then items[b][3] = "guide" end
+
   f.cprint(scroll_bar,1,h-2,"v","black","gray")
   f.cprint(bg2,2,1,"Mob: ","white","gray")
   f.cprint(bg2,7,1,index["spawner"..rubrique].curr_item,"purple","gray")
   f.cprint(bg2,8,10,"Status: ","white","gray")
-  table.sort(items, function(a, b) return a[2] < b[2] end)
+  if index.enable == true then f.cprint(bg2,16,10,"actif  ","lime","gray") else f.cprint(bg2,16,10,"inactif","purple","gray") end
-  table.insert(items,1,{1,">>> retour au Spawn <<<","spawn"})
+  f.centerText(b["button1"].win,2,"Rafraichir","black","purple")
   f.centerText(b["button2"].win,2,"i/o","black","red")
   f.cprint(up_bar,1,1,coordinates,"lime","lightGray")
   if rubrique == 1 then b["spawner1"].selected() f.centerText(up_bar,1,"config. spawner 1","black","lightGray")
-function list_display()
+  else b["spawner1"].reset() end
   if rubrique == 2 then b["spawner2"].selected() f.centerText(up_bar,1,"config. spawner 2","black","lightGray")
   else b["spawner2"].reset() end
-      f.drawLine(list,1,c,w,"red")
+  if rubrique == 3 then b["spawner3"].selected() f.centerText(up_bar,1,"config. spawner 3","black","lightGray")
-      f.centerTextRight(list,c,"ouvrir","white")
+  else b["spawner3"].reset() end
 end
 
 function getItems(check1)
   if check1 == true then
-      f.cprint(list,1,c,display[c][2],"gray")
+  local b = 1
-    elseif display[c][3] == "spawn" then
+
-      f.centerText(list,c,display[c][2],"lightBlue")
+
-    elseif display[c][3] == "VIP" then
+
-      f.cprint(list,1,c,display[c][2],"orange")
+      item = p.getStackInSlot(a)
-    elseif display[c][3] == "guide" then
+      if item ~= nil and item.name == "mobSoul" then
-      f.cprint(list,1,c,display[c][2],"lime")
+
         items[b][1] = a
         for ab=1,#nbt_index do
           if item.nbt_hash == nbt_index[ab].nbt_hash then items[b][2] = nbt_index[ab].name end
         end
         items[b]["qty"] = item.qty
         b = b + 1
       end
     end
   end
   if display == nil then display = items end
   end
 end
 
-function search(entry)
+function list_display(check1)
-  bg2.setCursorPos(2,9)
+  if check1 == true then
-  word = getInput.read({bg2},30,"lightGray",entry)
+
-  display = {}
+
-  for i,v in pairs(items) do
+      f.drawLine(list,1,c,w,"lightBlue")
-    if string.find(v[2],word) ~= nil then
+      f.centerTextRight(list,c,tostring(items[c].qty),"black")
-      table.insert(display,v)
+
       list.setBackgroundColor(colors.black)
     end
     if display[c][3] == nil then
       f.centerText(list,c,display[c][2],"purple")
-pulse()
+
   end
   else f.centerText(list,1,"No chest found","red","black") end
 end
-  getItems()
+
-  list_display()
+
   local x,y = list.getPosition()
   if direction == "up" and y <=1 then
-  x,y = list.getPosition()
+
   elseif direction == "down" and y+#items > h-1 then
-  local event = {os.pullEvent()}
+
-  if event[1] == "monitor_touch" then
+
-    if event[4]-y+1 == selected and display[selected] ~= nil and event[3] < j-1 then
+
 
-      f.centerText(up_bar,1,"ouverture...","black")
+function checkPlist()
-      pulse()
+  str = APIjson.decode(http.get("http://api.mineaurion.com/v1/serveurs/"..index.server).readAll())
   local Pcheck = false
-      p.pushItem(side,display[selected][1])
+  for i,v in pairs(str.joueurs) do
-      last_dest = display[selected][2]
+    if v == index.player_name then Pcheck = true end
-      getItems()
+
-    elseif event[4] > 1 and event[3] < j-1 then
+  if (Pcheck==true and index.enable==true) then rs.setAnalogOutput(index.rside,15) else rs.setAnalogOutput(index.rside,0) end
-      selected = event[4]-y+1
+
-    elseif event[4] == 2 and event[3] == j then
+
 function updateIndex()
-    elseif event[4] == h-1 and event[3] == j then
+  shell.run("rm","/spawner/config")
   index.rubrique = rubrique index.selected = selected
-    elseif f.itrv(event[3],pbg2[1],pbg2[1]+sbg2[1]) and f.itrv(event[4],pbg2[2],pbg2[2]+sbg2[2]) then
+  f3 = fs.open("/spawner/config","w") f3.write(textutils.serialise(index)) f3.close()
-      xc = event[3]-pbg2[1]+1 yc = event[4]-pbg2[2]+1
+
-      if f.itrv(xc,pb1[1],pb1[1]+sb1[1]) and f.itrv(yc,pb1[2],pb1[2]+sb1[2]-1) then
+
-        up_bar.clear()
+
-        f.centerText(up_bar,1,"fermeture...","black")
+
-        pulse()
+  getItems(isChest)
   list_display(isChest)
-      elseif f.itrv(xc,2,sbg2[1]) and f.itrv(yc,6,9) then
+
-        search()
+
   checkPlist()
   updateIndex()
   xl,yl = list.getPosition()
-  if event[1] == "char" then search(event[2]) end
+
   refresh = os.startTimer(20)
   event = {os.pullEvent()}
   if event[1] == "peripheral_detach" or event[1] == "peripheral" then getPeriphs() end
   if event[1] == "monitor_touch" or event[1] == "mouse_click" then
     x = event[3] y = event[4]
     coordinates = tostring(x..";"..y..","..selected..","..j)
     if y-yl+1 == selected and display[selected] ~= nil and x < j-1 then
       up_bar.clear()
       f.centerText(up_bar,1,"reconfiguration...","black")
       sleep(0.5)
       p.pushItem(index["spawner"..rubrique].side,display[selected][1],1)
       index["spawner"..rubrique].curr_item = display[selected][2]
       getItems(isChest)
     elseif y > 1 and x < j-1 then
       selected = y-yl+1
     elseif y == 2 and x == j then
       scroll("up")
     elseif yl == h-1 and event[3] == j then
       scroll("down")
     elseif f.itrv(x,pbg2[1],pbg2[1]+sbg2[1]) and f.itrv(y,pbg2[2],pbg2[2]+sbg2[2]) then
       xc = x-pbg2[1]+1 yc = y-pbg2[2]+1
       if b["button1"].isClicked(xc,yc) then
         display = nil
         sleep(0.4)
       end
       if b["spawner1"].isClicked(xc,yc) then rubrique=1 end
       if b["spawner2"].isClicked(xc,yc) then rubrique=2 end
       if b["spawner3"].isClicked(xc,yc) then rubrique=3 end
       if b["button2"].isClicked(xc,yc) then
         if index.enable == true then index.enable = false else index.enable = true end
       end
     end
   end
 end