TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-11 05:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Улучшена система поиска сетевого окружения

Browse Source
This commit is contained in:
Igor Timofeev 2016-06-07 10:07:53 +03:00
parent c26a608659
commit 8775b00e2f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Applications.txt
View File

@ -743,7 +743,7 @@
["icon"]="IgorTimofeev/OpenComputers/master/Applications/Finder/Icon.pic",
["createShortcut"]="dock",
["forceDownload"]=true,
["version"]=1.0,
["version"]=1.1,
},
{
["name"]="MineOS/Applications/Control",

11
Applications/Finder/Finder.lua
View File

@ -307,8 +307,8 @@ local function openModem()
if component.isAvailable("modem") then component.modem.open(port) end
end
local function sendPersonalInfo()
if component.isAvailable("modem") then component.modem.broadcast(port, "addMeToList") end
local function sendPersonalInfo(sendAgain)
if component.isAvailable("modem") then component.modem.broadcast(port, sendAgain and "addMeToListToo" or "addMeToList") end
end
local function sendMessageOrFileWindow(text1, text2)
@ -504,9 +504,12 @@ while true do
local localAddress, remoteAddress, remotePort, distance, message1, message2 = eventData[2], eventData[3], eventData[4], eventData[5], eventData[6], eventData[7]
local truncatedRemoteAddress = unicode.sub(remoteAddress, 1, 5)
if remotePort == port then
if message1 == "addMeToList" and not network[remoteAddress] then
if message1 == "addMeToList" then
sendPersonalInfo(true)
network[remoteAddress] = true
drawAll()
elseif message1 == "addMeToListToo" then
network[remoteAddress] = true
sendPersonalInfo()
drawAll()
elseif message1 == "hereIsMessage" then
GUI.error(message2, {title = {color = 0xFFDB40, text = MineOSCore.localization.gotMessageFrom .. truncatedRemoteAddress}})