View difference between Paste ID: DPPUiBUk and CGybLH7b

-local function fileGen()
+os.loadAPI('mcPaintFolder/screenAPI.lua')
-    if not fs.exists('mcPaintFolder/info.txt') then
+local mon = ''
-        term.clear()
+local event = ''
-        term.write('Enter monitor side: ')
+mon, isMonitor = screenAPI.wrapMon()
-        side = io.read()
+
-        if peripheral.getType(side) ~= 'monitor' then
+if not isMonitor then
-            term.write('No monitor on this side!')
+    mon = term
-            fileGen()
+    eventClick = 'mouse_click'
-        else
+    eventDrag = 'mouse_drag'
-        term.write('Data saved!')
+else
-        info = fs.open('mcPaintFolder/info.txt', 'w')
+    mon = screenAPI.wrapMon()
-        info.write(side)
+    mon.setTextScale(0.5)
-        info.close()
+    eventClick = 'monitor_touch'
-        os.sleep(2)
+
 
-    end
+
 mon.clear()
 local x, y = 1, 1
-fileGen()
+local length, height = mon.getSize()
-info = fs.open('mcPaintFolder/info.txt', 'r')
+
-side = info.readAll()
+
 local imageTable = {}
-local mon = peripheral.wrap(side)
+
-mon.setTextScale(0.5)
+
 local lineMode = false
 
 local function createImageFile(color) -- creates a table of the form imageTable[x][y] = black as default
-local length, width = mon.getSize()
+
         imageTable[x] = {}
         for y = 1, height do
             imageTable[x][y] = color
         end
     end
 end
 
 local function drawPalette() -- Draws up the GUI
     local color = 0
-        for y = 1, width do
+
         color = 2^(i-1)
         colorTable[i] = color
         mon.setBackgroundColor(color)
         mon.setCursorPos(length, i)
         mon.write(' ')
     end
     mon.setCursorPos(length, 17)
     mon.write('E')
     mon.setCursorPos(length, 18)
     mon.write('B')
     mon.setCursorPos(length, 19)
     mon.write('L')
     mon.setCursorPos(length, 20)
     mon.write('S')
     mon.setCursorPos(length, 21)
     mon.write('X')
 end
 
 function infoTrans(table1, table2) --Transfers the information from the various screenAPI functions to the table we want, in this case imageTable
     for i, v in pairs(table1) do
         for k, u in pairs(table1[i]) do
             table2[i][k] = table1[i][k]
         end
     end
 end
-    if not boxModeToggled then
+
-        if not eraseMode then
+
-            imageTable[x][y] = currentColor
+    if boxModeToggled then
-            mon.setCursorPos(x,y)
+        local _, _, x2, y2 = os.pullEvent(eventClick)
-            mon.write(' ')
+        if x2 ~= length then
-        else
+            boxTable = screenAPI.drawBox(x, y, x2, y2, currentColor)
-            imageTable[x][y] = currentColor
+            infoTrans(boxTable, imageTable)
-            mon.setCursorPos(x,y)
+
-            mon.write(' ')
+    elseif lineModeToggled then
         local _, _, x2, y2 = os.pullEvent(eventClick)
         if x2 ~= length then
-        local _, _, x2, y2 = os.pullEvent('monitor_touch')
+            lineTable = screenAPI.drawLine(x, y, x2, y2, currentColor)
-        local xinc, yinc = 1, 1
+            infoTrans(lineTable, imageTable)
-        if x < x2 then
+
-            xinc = 1
+
-        else
+        imageTable[x][y] = currentColor
-            xinc = -1
+        mon.setCursorPos(x,y)
         mon.write(' ')
-        if y < y2 then
+
-            yinc = 1
+
-        else
+
-            yinc = -1
+
     mon.setBackgroundColor(2^15)
-        for i = x, x2, xinc do
+    mon.clear()
-            for k = y, y2, yinc do
+    mon.setCursorPos(1,1)
-                imageTable[i][k] = currentColor
+    write('Enter your file\'s name: \n\n')
-                mon.setCursorPos(i,k)
+    for i= 1, #fs.list('mcPaintFolder/images/') do
-                mon.write(' ')
+        write(fs.list('mcPaintFolder/images')[i]..'\n')
     end
     mon.setCursorPos(1,2)
-    end
+
     if not fs.exists('mcPaintFolder/images/'..fileName) then
     image = fs.open('mcPaintFolder/images/'..fileName, 'w')
     imageString = textutils.serialise(imageTable)
-    if not fs.exists('/images/') then
+
-        fs.makeDir('/images')
+
     mon.clear()
-    term.clear()
+    shell.run('mcImage.lua', fileName)
-    term.setCursorPos(1,1)
+    drawPalette()
-    term.write('Enter your file\'s name: \n')
+    else term.write('file already exists!')
     saveImage()
     end
 end
 
 local function boxMode() -- toggles box creation
     if boxModeToggled == true then
-    else term.write('file already exists! Change file name: \n')
+
         mon.setBackgroundColor(2^15)
         mon.setCursorPos(length,18)
         mon.write('B')
     else
         boxModeToggled = true
         mon.setBackgroundColor(2^14)
         mon.setCursorPos(length,18)
         mon.write('B')
     end
     mon.setBackgroundColor(currentColor)
 end
 
 local function lineMode() -- toggles line creation
     if lineModeToggled == true then
         lineModeToggled = false
         mon.setBackgroundColor(2^15)
         mon.setCursorPos(length,19)
         mon.write('L')
     else
         lineModeToggled = true
         mon.setBackgroundColor(2^14)
         mon.setCursorPos(length,19)
         mon.write('L')
     end
     mon.setBackgroundColor(currentColor)
 end
 
 
-    _, _, x, y = os.pullEvent('monitor_touch')
+
-    if x == length then
+
-        eraseMode = false
+
-        if y <= 16 then
+
-            selectColor()
+
-        elseif y == 17 then
+-- This is the MAIN part of code.
-            eraseMode = true
+
-            mon.setBackgroundColor(2^15)
+
-            currentColor = 2^15
+
-        elseif y == 18 then
+
-            boxMode()
+    eventType, _, x, y = os.pullEvent()
-        elseif y == 19 then
+    if (eventType == eventClick) or (eventType == eventDrag) then
-            saveImage()
+        if eventType == eventClick and x == length then
-        elseif y == 20 then
+            eraseMode = false
-            mon.setBackgroundColor(2^15)
+            if y <= 16 then
-            mon.clear()
+                selectColor()
-            return
+            elseif y == 17 then
 
-    elseif x < length then
+                eraseMode = true
-        draw()
+                mon.setBackgroundColor(2^15)
                 currentColor = 2^15
 
             elseif y == 18 then
 
                 boxMode()
 
             elseif y == 19 then
 
                 lineMode()
 
             elseif y == 20 then
 
                 saveImage()
 
             elseif y == 21 then
 
                 mon.setBackgroundColor(2^15)
                 mon.clear()
                 mon.setCursorPos(1,1)
                 return
             end
         elseif x < length and (eventType == eventClick or eventType == eventDrag) then
             draw()
         end
     end
 end