View difference between Paste ID: pqt4PEHz and xUmtXVET

 --[[
 
     Minecraft Intranet
     Repeater program
 
 --]]
 
 print("Minecraft Intranet :: Repeater")
 print()
 
--- Program directory
+-- Load dependencies
-local progDir = shell.resolve("/"..shell.getRunningProgram().."/..")
+dofile("/common/all")
 program.load("message", "names", "device")
--- Load APIs
+program.load("devices/repeater")
-dofile(progDir.."/config")
+
 -- Create repeater
--- Load repeater config
+
 local defaultConfig = {
     device = "repeater",
-    modemSide = "back",
+    detectTimeout = 1
-    detectTimeout = 5
+
 local config = common.loadStore(configPath, defaultConfig)
-local config = mcnet.config.load(configPath, defaultConfig)
+local repeater = mcnet.device.Repeater:new()
 print("  Computer ID: "..tostring(os.computerID()))
 print()
-print("  Modem side: "..config.modemSide)
+
 -- Register handlers
-rednet.open(config.modemSide)
+repeater:on("forwardMessage", function(success, senderId, msg)
     if success then
--- Detect surrounding devices
+        print("Forwarded from "..senderId)
-print("Detecting surrounding devices...")
+    else
-rednet.broadcast("deviceOn")
+        print("Failed to forwarded from "..senderId)
     end
-local surroundings = {}
+end)
 
-local detectTimer = os.startTimer(config.detectTimeout)
+repeater:on("char", function(char)
-while true do
+    if char == "q" then
-    local event, p1, p2 = os.pullEvent()
+
-    local refresh = false
+
         local event, char = os.pullEvent("char")
-    if (event == "rednet_message") then
+        -- Check response
-        -- Add and notify if device started
+        local response = (string.lower(char) == "y" and "y") or "n"
-        if (p1 == "deviceOn") then
+
-            surroundings[p1] = true
+
-            rednet.send(p1, "deviceDetect")
+            repeater:stop()
-            refresh = true
+
-        -- Add if device detected
+
-        elseif (p1 == "deviceDetect") then
+end)
-            surroundings[p1] = true
+
-            refresh = true
+repeater:on("error", function(errorType, errorMessage)
-        -- Remove if device stopped
+    print("[ERROR] "..errorMessage)
-        elseif (p1 == "deviceOff") then
+end)
-            surroundings[p1] = nil
+
-            refresh = true
+-- Start
 print("Starting...")
-    elseif (event == "timer" and p1 == detectTimer) then
+repeater:start(config.detectTimeout)
-        -- Detection timed out
+write("  Detected:")
-        break
+for i,deviceId in pairs(repeater:neighbours()) do
     write(" "..deviceId)
 end
-    if refresh then
+
-        -- Refresh timer
+
-        detectTimer = os.startTimer(config.detectTimeout)
+
 -- Main loop
 print("Listening...")
 print("  Press Q to quit")
-write("Detected:")
+
-for deviceId,v in pairs(surroundings) do
+
-    write(" "..deviceId")
+while repeater.isRunning do
     repeater:trigger(os.pullEvent())
 end
 
--- Start listening
+-- Stop
-print("Repeating...")
+
-print("Press Q to quit")
+
 print()