From 2bd4abc9a1fd7a994b2013c426445e33abc1fa04 Mon Sep 17 00:00:00 2001 From: Smok1e <33802666+Smok1e@users.noreply.github.com> Date: Fri, 16 Sep 2022 02:09:53 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D1=81=D0=B5=D1=80=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Как завещал нам дедушка Декарт, «Я мыслю, следовательно, я есмь». Бля, файл короче чекается на наличие в парсере. component.get ("computer").beep заменил на computer.beep, ибо хуле-вообще. Ну и под шумок себя в контрибуторов вписал, ой, то есть ПОФИКСИЛ НЕСООТВЕТСТВИЕ ВИКИ КОДУ. --- Libraries/System.lua | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Libraries/System.lua b/Libraries/System.lua index 254fc4f7..6514e334 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -2171,19 +2171,21 @@ function system.error(path, line, traceback) -- Read part of file to display error line -- GUI.alert("SYS", path) - for line in filesystem.lines(path) do - if lineCounter >= codeView.fromLine and lineCounter <= toLine then - codeView.lines[lineCounter] = line:gsub("\t", " ") - elseif lineCounter < codeView.fromLine then - codeView.lines[lineCounter] = " " - elseif lineCounter > toLine then - break - end - - lineCounter = lineCounter + 1 - - if lineCounter % 200 == 0 then - computer.pullSignal(0) + if filesystem.exists(path) then + for line in filesystem.lines(path) do + if lineCounter >= codeView.fromLine and lineCounter <= toLine then + codeView.lines[lineCounter] = line:gsub("\t", " ") + elseif lineCounter < codeView.fromLine then + codeView.lines[lineCounter] = " " + elseif lineCounter > toLine then + break + end + + lineCounter = lineCounter + 1 + + if lineCounter % 200 == 0 then + computer.pullSignal(0) + end end end @@ -2218,7 +2220,7 @@ function system.error(path, line, traceback) workspace:draw() for i = 1, 3 do - component.get("computer").beep(1500, 0.08) + computer.beep(1500, 0.08) end end @@ -2646,6 +2648,7 @@ function system.updateDesktop() "Yakov Verevkin, vk.com/id60991376", "Alexey Smirnov, vk.com/id23897419", "Timofey Shestakov, vk.com/id113499693", + "Fedor Cheremisenov, vk.com/id402150900", " ", "UX-advisers:", " ", From 83e5516e97ba18c0c98f31c7613699427fbdb4ae Mon Sep 17 00:00:00 2001 From: Smok1e <33802666+Smok1e@users.noreply.github.com> Date: Fri, 16 Sep 2022 02:10:46 +0300 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D1=81=D0=B5=D1=80=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BE=D0=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2bd4abc9a1fd7a994b2013c426445e33abc1fa04. --- Libraries/System.lua | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Libraries/System.lua b/Libraries/System.lua index 6514e334..254fc4f7 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -2171,21 +2171,19 @@ function system.error(path, line, traceback) -- Read part of file to display error line -- GUI.alert("SYS", path) - if filesystem.exists(path) then - for line in filesystem.lines(path) do - if lineCounter >= codeView.fromLine and lineCounter <= toLine then - codeView.lines[lineCounter] = line:gsub("\t", " ") - elseif lineCounter < codeView.fromLine then - codeView.lines[lineCounter] = " " - elseif lineCounter > toLine then - break - end - - lineCounter = lineCounter + 1 - - if lineCounter % 200 == 0 then - computer.pullSignal(0) - end + for line in filesystem.lines(path) do + if lineCounter >= codeView.fromLine and lineCounter <= toLine then + codeView.lines[lineCounter] = line:gsub("\t", " ") + elseif lineCounter < codeView.fromLine then + codeView.lines[lineCounter] = " " + elseif lineCounter > toLine then + break + end + + lineCounter = lineCounter + 1 + + if lineCounter % 200 == 0 then + computer.pullSignal(0) end end @@ -2220,7 +2218,7 @@ function system.error(path, line, traceback) workspace:draw() for i = 1, 3 do - computer.beep(1500, 0.08) + component.get("computer").beep(1500, 0.08) end end @@ -2648,7 +2646,6 @@ function system.updateDesktop() "Yakov Verevkin, vk.com/id60991376", "Alexey Smirnov, vk.com/id23897419", "Timofey Shestakov, vk.com/id113499693", - "Fedor Cheremisenov, vk.com/id402150900", " ", "UX-advisers:", " ", From fd46419ea2032056b0d2353cda42eb16eca82ecc Mon Sep 17 00:00:00 2001 From: Smok1e <33802666+Smok1e@users.noreply.github.com> Date: Fri, 16 Sep 2022 02:13:09 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D1=81=D0=B5=D1=80=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Как завещал нам дедушка Декарт, «Я мыслю, следовательно, я есмь». Бля, файл короче чекается на наличие в парсере. component.get ("computer").beep заменил на computer.beep, ибо хуле-вообще. Ну и под шумок себя в контрибуторов вписал, ой, то есть ПОФИКСИЛ НЕСООТВЕТСТВИЕ ВИКИ И КОДА. --- Libraries/System.lua | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Libraries/System.lua b/Libraries/System.lua index 254fc4f7..6514e334 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -2171,19 +2171,21 @@ function system.error(path, line, traceback) -- Read part of file to display error line -- GUI.alert("SYS", path) - for line in filesystem.lines(path) do - if lineCounter >= codeView.fromLine and lineCounter <= toLine then - codeView.lines[lineCounter] = line:gsub("\t", " ") - elseif lineCounter < codeView.fromLine then - codeView.lines[lineCounter] = " " - elseif lineCounter > toLine then - break - end - - lineCounter = lineCounter + 1 - - if lineCounter % 200 == 0 then - computer.pullSignal(0) + if filesystem.exists(path) then + for line in filesystem.lines(path) do + if lineCounter >= codeView.fromLine and lineCounter <= toLine then + codeView.lines[lineCounter] = line:gsub("\t", " ") + elseif lineCounter < codeView.fromLine then + codeView.lines[lineCounter] = " " + elseif lineCounter > toLine then + break + end + + lineCounter = lineCounter + 1 + + if lineCounter % 200 == 0 then + computer.pullSignal(0) + end end end @@ -2218,7 +2220,7 @@ function system.error(path, line, traceback) workspace:draw() for i = 1, 3 do - component.get("computer").beep(1500, 0.08) + computer.beep(1500, 0.08) end end @@ -2646,6 +2648,7 @@ function system.updateDesktop() "Yakov Verevkin, vk.com/id60991376", "Alexey Smirnov, vk.com/id23897419", "Timofey Shestakov, vk.com/id113499693", + "Fedor Cheremisenov, vk.com/id402150900", " ", "UX-advisers:", " ",