Updated LUA script with new API

src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveEnanReactorCore/startup

@@ -441,7 +441,7 @@ function cloaking_page()
 		SetColorDefault()
 		Write("Cloaking core " .. cloaking_currentKey .. " of " .. #cloakingcores)
 		local isAssemblyValid = cloakingcore.isAssemblyValid()
-		local energy, energyMax = cloakingcore.getEnergyLevel()
+		local energy, energyMax = cloakingcore.energy()
 		local isEnabled = cloakingcore.enable()
 		
 		if not isAssemblyValid then
@@ -919,7 +919,7 @@ end
 function reactor_laser(side)
 	for key,reactorlaser in pairs(reactorlasers) do
 		if (side == nil) or (reactorlaser.side() == side) then
-			reactorlaser.sendLaser(data.reactor_laserAmount)
+			reactorlaser.stabilize(data.reactor_laserAmount)
 		end
 	end
 end

src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveMainframe/startup

@@ -454,7 +454,7 @@ function cloaking_page()
 		SetColorDefault()
 		Write("Cloaking core " .. cloaking_currentKey .. " of " .. #cloakingcores)
 		local isAssemblyValid = cloakingcore.isAssemblyValid()
-		local energy, energyMax = cloakingcore.getEnergyLevel()
+		local energy, energyMax = cloakingcore.energy()
 		local isEnabled = cloakingcore.enable()
 		
 		if not isAssemblyValid then
@@ -716,7 +716,7 @@ function data_explode(separator, data)
 end
 
 function data_setName()
-	if warpcore ~= nil then
+	if ship ~= nil then
 		ShowTitle("<==== Set ship name ====>")
 	else
 		ShowTitle("<==== Set name ====>")
@@ -726,13 +726,13 @@ function data_setName()
 	Write("Enter ship name: ")
 	label = readInputText(label)
 	os.setComputerLabel(label)
-	if warpcore ~= nil then
+	if ship ~= nil then
-		warpcore.coreFrequency(label)
+		ship.coreFrequency(label)
 	end
 	os.reboot()
 end
 
------------ Warpcore support
+----------- Ship support
 
 core_front = 0
 core_right = 0
@@ -747,36 +747,36 @@ core_jumpCost = 0
 core_shipSize = 0
 
 function core_boot()
-	if warpcore == nil then
+	if ship == nil then
 		return
 	end
 
 	Write("Booting Warpdrive Core")
 	
 	if data.core_summon then
-		warpcore.summon_all()
+		ship.summon_all()
 	end
 	
 	Write(".")
-	core_front, core_right, core_up = warpcore.dim_positive()
+	core_front, core_right, core_up = ship.dim_positive()
-	core_back, core_left, core_down = warpcore.dim_negative()
+	core_back, core_left, core_down = ship.dim_negative()
-	core_isInHyper = warpcore.isInHyperspace()
+	core_isInHyper = ship.isInHyperspace()
 	
 	Write(".")
 	repeat
-		pos = warpcore.pos()
+		pos = ship.pos()
 		sleep(0.3)
 	until pos ~= nil
-	X, Y, Z = warpcore.pos()
+	X, Y, Z = ship.pos()
 	Write(".")
 	repeat
-		isAttached = warpcore.isAttached()
+		isAttached = ship.isAttached()
 		sleep(0.3)
 	until isAttached ~= false
 	
 	Write(".")
 	repeat
-		core_shipSize = warpcore.getShipSize()
+		core_shipSize = ship.getShipSize()
 		sleep(0.3)
 	until core_shipSize ~= nil 
 	
@@ -784,7 +784,7 @@ function core_boot()
 	core_computeRealDistance()
 	
 	Write(".")
-	warpcore.mode(1)
+	ship.mode(1)
 	WriteLn("")
 end
 
@@ -829,7 +829,7 @@ function core_computeNewCoordinates(cx, cy, cz)
 	elseif data.core_direction == 2 then
 		res.y = res.y - core_realDistance
 	end
-	local dx, dy, dz = warpcore.getOrientation()
+	local dx, dy, dz = ship.getOrientation()
 	if dx ~= 0 then
 		if data.core_direction == 0 then
 			res.x = res.x + (core_realDistance * dx)
@@ -858,14 +858,14 @@ function core_warp()
 	rs.setOutput(alarm_side, true)
 	if readConfirmation() then
 		rs.setOutput(alarm_side, false)
-		warpcore.direction(data.core_direction)
+		ship.direction(data.core_direction)
-		warpcore.distance(data.core_distance)
+		ship.distance(data.core_distance)
 		if core_isInHyper then
-			warpcore.mode(2)
+			ship.mode(2)
 		else
-			warpcore.mode(1)
+			ship.mode(1)
 		end
-		warpcore.jump()
+		ship.jump()
 	end
 	rs.setOutput(alarm_side, false)
 end
@@ -941,15 +941,15 @@ function core_page_setDimensions()
 	Write(" Down  (".. core_down ..") : ")
 	core_down = readInputNumber(core_down)
 	Write("Setting dimensions...")
-	warpcore.dim_positive(core_front, core_right, core_up)
+	ship.dim_positive(core_front, core_right, core_up)
-	warpcore.dim_negative(core_back, core_left, core_down)
+	ship.dim_negative(core_back, core_left, core_down)
-	core_shipSize = warpcore.getShipSize()
+	core_shipSize = ship.getShipSize()
 	if core_shipSize == nil then core_shipSize = 0 end
 end
 
 function core_page_summon()
 	ShowTitle("<==== Summon players ====>")
-	local playersString, playersArray = warpcore.getAttachedPlayers()
+	local playersString, playersArray = ship.getAttachedPlayers()
 	for i = 1, #playersArray do
 		Show(i..". "..playersArray[i])
 	end
@@ -961,10 +961,10 @@ function core_page_summon()
 	Write(":")
 	local input = readInputNumber("")
 	if input == "" then
-		warpcore.summon_all()
+		ship.summon_all()
 	else
 		input = tonumber(input)
-		warpcore.summon(input - 1)
+		ship.summon(input - 1)
 	end
 end
 
@@ -976,9 +976,9 @@ function core_page_jumpToBeacon()
 	rs.setOutput(alarm_side, true)
 	if readConfirmation() then
 		rs.setOutput(alarm_side, false)
-		warpcore.mode(4)
+		ship.mode(4)
-		warpcore.beaconFrequency(freq)
+		ship.beaconFrequency(freq)
-		warpcore.jump()
+		ship.jump()
 	end
 	rs.setOutput(alarm_side, false)
 end
@@ -991,23 +991,23 @@ function core_page_jumpToGate()
 	rs.setOutput(alarm_side, true)
 	if readConfirmation() then
 		rs.setOutput(alarm_side, false)
-		warpcore.mode(6)
+		ship.mode(6)
-		warpcore.targetJumpgate(name)
+		ship.targetJumpgate(name)
-		warpcore.jump()
+		ship.jump()
 	end
 	rs.setOutput(alarm_side, false)
 end
 
 function core_page()
-	ShowTitle(label .. " - Warpcore status")
+	ShowTitle(label .. " - Ship status")
-	if warpcore ~= nil then
+	if ship ~= nil then
 		WriteLn("Core:")
 		WriteLn(" x, y, z          = " .. X .. ", " .. Y .. ", " .. Z)
-		local energy, energyMax = warpcore.getEnergyLevel()
+		local energy, energyMax = ship.energy()
 		if energy == nil then energy = 0 end
 		if energyMax == nil then energyMax = 1 end
 		WriteLn(" Energy           = " .. math.floor(energy / energyMax * 100) .. " % (" .. energy .. "EU)")
-		local playersString, playersArray = warpcore.getAttachedPlayers()
+		local playersString, playersArray = ship.getAttachedPlayers()
 		if playersString == "" then players = "-" end
 		WriteLn(" Attached players = " .. playersString)
 		WriteLn("Dimensions:")
@@ -1025,7 +1025,7 @@ function core_page()
 			WriteLn(" Summon after     = No")
 		end
 	else
-		ShowWarning("No warpcore controller detected")
+		ShowWarning("No ship controller detected")
 	end
 	
 	SetCursorPos(1, 15)
@@ -1070,8 +1070,8 @@ function core_key(keycode)
 		rs.setOutput(alarm_side, true)
 		if readConfirmation() then
 			rs.setOutput(alarm_side, false)
-			warpcore.mode(5)
+			ship.mode(5)
-			warpcore.jump()
+			ship.jump()
 		end
 		rs.setOutput(alarm_side, false)
 		return true
@@ -1318,7 +1318,7 @@ end
 function reactor_laser(side)
 	for key,reactorlaser in pairs(reactorlasers) do
 		if (side == nil) or (reactorlaser.side() == side) then
-			reactorlaser.sendLaser(data.reactor_laserAmount)
+			reactorlaser.stabilize(data.reactor_laserAmount)
 		end
 	end
 end
@@ -1506,7 +1506,7 @@ function radar_page()
 		end
 
 		SetColorDefault()
-		local energy = { radar.getEnergyLevel() }
+		local energy = { radar.energy() }
 		SetCursorPos(1, 12)
 		Write("Energy: ")
 		if energy ~= nil then
@@ -1613,7 +1613,7 @@ function radar_scan()
 		draw_warning(monitor, "No radar")
 		return false
 	end
-	if radar.getEnergyLevel() < (data.radar_radius * data.radar_radius) then
+	if radar.energy() < (data.radar_radius * data.radar_radius) then
 		draw_warning(monitor, "LOW POWER")
 		return false
 	end
@@ -1623,8 +1623,10 @@ function radar_scan()
 	end
 	radar_timerId = os.startTimer(radar_timerLength)
 	
-	radar.scanRadius(data.radar_radius);
+	radar.radius(data.radar_radius)
+	if radar.start() then
 		draw_warning(monitor, "Scanning...")
+	end
 	return false
 end
 
@@ -1633,11 +1635,13 @@ function radar_scanDone()
 	data.radar_results = {}
 	if (numResults ~= 0) then
 		for i = 0, numResults do
-			local frequency, x, y, z = radar.getResult(i)
+			local success, type, name, x, y, z = radar.getResult(i)
-			if frequency == "default" then
+			if success then
-				frequency = "?"
+				if name == "default" then
+					name = "?"
+				end
+				data.radar_results[i] = { x = x, y = y, z = z, name = name, type = type }
 			end
-			data.radar_results[i] = { x = x, y = y, z = z, frequency = frequency, kind = "core" }
 		end
 		data.radar_scale = data.radar_radius
 	end
@@ -1713,13 +1717,13 @@ function radar_drawContact(monitor, contact)
 	screenX = math.floor(screenX * (screenWidth  - 3) / 2 + ((screenWidth  - 1)  / 2) + 1.5)
 	screenY = math.floor(screenY * (screenHeight - 3) / 2 + ((screenHeight - 1) / 2) + 1.5)
 	
-	if contact.kind == "self" then
+	if contact.type == "self" then
 		draw_text(monitor, screenX, screenY, Style.TextRadarself, Style.CRadarself, Style.BGRadarself)
 	else
 		draw_text(monitor, screenX, screenY, Style.TextRadarother, Style.CRadarother, Style.BGRadarother)
 	end
 	if visible then
-		local text = contact.frequency
+		local text = contact.name
 		screenX = math.min(screenWidth - 1 - string.len(text), math.max(2, math.floor(screenX - string.len(text) / 2 + 0.5)))
 		if screenY == (screenHeight - 1) then
 			screenY = screenY - 1
@@ -1781,13 +1785,13 @@ function radar_drawMap()
 	-- status
 	local text = "Scan radius: " .. data.radar_radius
 	if radar ~= nil then
-		text = text .. " | Energy: " .. radar.getEnergyLevel() .. " EU"
+		text = text .. " | Energy: " .. radar.energy() .. " EU"
 	end
 	text = text .. " | Scale: " .. data.radar_scale
 	draw_centeredText(monitor, screenHeight, text)
 	-- results
 	SetCursorPos(1, 12)
-	radar_drawContact(monitor, {x = radar_x, y = radar_y, z = radar_z, frequency = "", kind = "self"})
+	radar_drawContact(monitor, {x = radar_x, y = radar_y, z = radar_z, name = "", type = "self"})
 	for i = 0, #data.radar_results - 1 do
 		radar_drawContact(monitor, data.radar_results[i])
 	end
@@ -1835,7 +1839,7 @@ reactor = nil
 mininglasers = {}
 reactorlasers = {}
 cloakingcores = {}
-warpcore = nil
+ship = nil
 radar = nil
 for key,side in pairs(sides) do
 	sleep(0)
@@ -1846,7 +1850,7 @@ for key,side in pairs(sides) do
 		lmonitor.setTextScale(monitor_textScale)
 	elseif peripheral.getType(side) == "warpdriveShipController" then
 		WriteLn("Wrapping " .. side)
-		warpcore = peripheral.wrap(side)
+		ship = peripheral.wrap(side)
 	elseif peripheral.getType(side) == "warpdriveEnanReactorCore" then
 		WriteLn("Wrapping " .. side)
 		reactor =  peripheral.wrap(side)
@@ -1866,7 +1870,7 @@ for key,side in pairs(sides) do
 end
 -- sleep(1)
 
-if not os.getComputerLabel() and (warpcore ~= nil or reactor ~= nil) then
+if not os.getComputerLabel() and (ship ~= nil or reactor ~= nil) then
 	data_setName()
 end
 
@@ -1886,12 +1890,12 @@ function connections_page()
 		WriteLn(#monitors .. " Monitors detected")
 	end
 
-	if warpcore == nil then
+	if ship == nil then
 		SetColorDisabled()
-		WriteLn("No warpcore controller detected")
+		WriteLn("No ship controller detected")
 	else
 		SetColorSuccess()
-		WriteLn("Warpcore controller detected")
+		WriteLn("Ship controller detected")
 	end
 
 	if reactor == nil then
@@ -1940,7 +1944,7 @@ function connections_page()
 		WriteLn("No radar detected")
 	else
 		SetColorSuccess()
-		WriteLn("Warpcore radar detected")
+		WriteLn("Radar detected")
 	end
 end
 

src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveRadar/ping

@@ -37,12 +37,13 @@ if radius < 1 or radius > 9999 then
   return
 end
 
-energy, energyMax = radar.getEnergyLevel()
+energy, energyMax = radar.energy()
 if energy < radius * radius then
   error("Low energy level... (" + energy + "/" + radius * radius + ")")
   return
 end
-radar.scanRadius(radius)
+radar.radius(radius)
+radar.start()
 sleep(0.5)
 
 print("Scanning...")
@@ -58,8 +59,12 @@ print("took " .. seconds .. " seconds")
 
 if count ~= nil and count > 0 then
   for i=0, count-1 do
-    freq, x, y, z = radar.getResult(i)
+    success, type, name, x, y, z = radar.getResult(i)
-    print("Ship '" .. freq .. "' @ (" .. x .. " " .. y .. " " .. z .. ")")
+	if success then
+      print(type .. " " .. name .. " @ (" .. x .. " " .. y .. " " .. z .. ")")
+	else
+	  print("Error " .. type)
+	end
   end
 else
   print("Nothing was found =(")

src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveRadar/scan

@@ -65,7 +65,7 @@ function drawContact(x, y, z, name, color)
 end
 
 function scanAndDraw()
-  local energy, energyMax = radar.getEnergyLevel()
+  local energy, energyMax = radar.energy()
   if (energy < radius*radius) then
     hh = math.floor(h / 2)
     hw = math.floor(w / 2)
@@ -78,7 +78,8 @@ function scanAndDraw()
     
     return 0
   end
-  radar.scanRadius(radius)
+  radar.radius(radius)
+  radar.start()
   sleep(2)
   
   redraw()
@@ -87,9 +88,9 @@ function scanAndDraw()
   
   if (numResults ~= 0) then
     for i = 0, numResults-1 do
-      freq, cx, cy, cz = radar.getResult(i)
+      success, type, name, cx, cy, cz = radar.getResult(i)
       
-      drawContact(cx, cy, cz, freq, colors.red)
+      drawContact(cx, cy, cz, name, colors.red)
     end
   end
   
@@ -106,11 +107,11 @@ function redraw()
   textOut(w - 3, 1, "[X]", colors.white, colors.red)
   
   paintutils.drawLine(1, h, w, h, colors.black)
-  local energy, energyMax = radar.getEnergyLevel()
+  local energy, energyMax = radar.energy()
   textOut(4, h, "Energy: " .. energy .. " EU | Scan radius: " .. radius, colors.white, colors.black)
 end
 
-radarX, radarY, radarZ = radar.pos()
+radarX, radarY, radarZ = radar.position()
 mrun = true
 while (mrun) do
   scanAndDraw()

src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveShipController/startup

@@ -139,7 +139,7 @@ function CalcNewCoords(cx, cy, cz)
  elseif SData.Direction == 2 then
   res.y = res.y - RealDistance
  end
- local dx, dy, dz = warp.getOrientation()
+ local dx, dy, dz = ship.getOrientation()
  if dx ~= 0 then
   if SData.Direction == 0 then
    res.x = res.x + (RealDistance * dx)
@@ -168,9 +168,9 @@ function ShowInfo()
  ShowTitle(Title)
  Show("Core:")
  Show(" x, y, z          = "..X..", "..Y..", "..Z)
- local energy, energyMax = warp.getEnergyLevel()
+ local energy, energyMax = ship.energy()
  Show(" Energy           = " .. math.floor(100 * energy / energyMax) .. " % (" .. energy .. "EU)")
- local playersString, playersArray = warp.getAttachedPlayers()
+ local playersString, playersArray = ship.getAttachedPlayers()
  Show(" Attached players = " .. playersString)
  Show("Dimensions:")
  Show(" Front, Right, Up = "..GFront..", "..GRight..", "..GUp)
@@ -201,13 +201,13 @@ end
 function Warp()
  rs.setOutput(Alarm, false)
  sleep(1)
- warp.direction(SData.Direction)
+ ship.direction(SData.Direction)
  if IsInHyper then
-  warp.mode(2)
+  ship.mode(2)
  else
-  warp.mode(1)
+  ship.mode(1)
  end
- warp.jump()
+ ship.jump()
 end
 
 function SetDistance()
@@ -233,7 +233,7 @@ function SetDistance()
   if not IsInHyper then
    SData.Distance = SData.Distance - RealDistance
   end
-  warp.distance(SData.Distance)
+  ship.distance(SData.Distance)
   CalcRealDistance()
  end
 end
@@ -286,15 +286,15 @@ function SetDimensions()
  term.write(" Down  ("..GDown..") : ")
  GDown = tonumber(read())
  term.write("Setting dimensions...")
- warp.dim_positive(GFront, GRight, GUp)
+ ship.dim_positive(GFront, GRight, GUp)
- warp.dim_negative(GBack, GLeft, GDown)
+ ship.dim_negative(GBack, GLeft, GDown)
- weight = warp.getShipSize()
+ weight = ship.getShipSize()
 end
 
 function Summon()
  Clear()
  ShowTitle("<==== Summon players ====>")
- local playersString, playersArray = warp.getAttachedPlayers()
+ local playersString, playersArray = ship.getAttachedPlayers()
  if playersArray == nil then
   Show("- no players attached -")
   sleep(1.0)
@@ -312,10 +312,10 @@ function Summon()
  term.write(":")
  local input = read()
  if input == "" then
-  warp.summonAll()
+  ship.summonAll()
  else
   input = tonumber(input)
-  warp.summon(input - 1)
+  ship.summon(input - 1)
  end
 end
 
@@ -328,9 +328,9 @@ function JumpToBeacon()
  rs.setOutput(Alarm, true)
  if Confirm() then
   rs.setOutput(Alarm, false)
-  warp.mode(4)
+  ship.mode(4)
-  warp.beaconFrequency(freq)
+  ship.beaconFrequency(freq)
-  warp.jump()
+  ship.jump()
  end
  rs.setOutput(Alarm, false)
 end
@@ -344,9 +344,9 @@ function JumpToGate()
  rs.setOutput(Alarm, true)
  if Confirm() then
   rs.setOutput(Alarm, false)
-  warp.mode(6)
+  ship.mode(6)
-  warp.targetJumpgate(name)
+  ship.targetJumpgate(name)
-  warp.jump()
+  ship.jump()
  end
  rs.setOutput(Alarm, false)
 end
@@ -358,7 +358,7 @@ function SetShipName()
  term.write("Enter ship name: ")
  SData.Shipname = tostring(read())
  os.setComputerLabel(SData.Shipname)
- warp.coreFrequency(SData.Shipname)
+ ship.coreFrequency(SData.Shipname)
  SaveData()
  os.reboot()
 end
@@ -377,14 +377,14 @@ end
 Side = { "bottom", "top", "back", "left", "right" }
 for i = 1,5 do
  if peripheral.getType(Side[i]) == "warpdriveShipController" then
-  warp = peripheral.wrap(Side[i])
+  ship = peripheral.wrap(Side[i])
   break
   else
-    warp = nil
+    ship = nil
   end
 end
 
-if warp == nil then
+if ship == nil then
  ShowWarning("No ship controller detected")
  os.pullEvent("key")
  os.reboot()
@@ -400,34 +400,34 @@ end
 Title = "<JumpShip \""..SData.Shipname.."\">"
 
 if SData.Summon then
- warp.summonAll()
+ ship.summonAll()
 end
 
-GFront, GRight, GUp = warp.dim_positive()
+GFront, GRight, GUp = ship.dim_positive()
-GBack, GLeft, GDown = warp.dim_negative()
+GBack, GLeft, GDown = ship.dim_negative()
-IsInHyper = warp.isInHyperspace()
+IsInHyper = ship.isInHyperspace()
 repeat
  sleep(0.3)
- pos = warp.pos()
+ pos = ship.position()
 until pos ~= nil
 print("Ship core detected...")
-X, Y, Z = warp.pos()
+X, Y, Z = ship.position()
 
 repeat
  sleep(0.3)
- isAttached = warp.isAttached()
+ isAttached = ship.isAttached()
 until isAttached
 print("Ship core linked...")
 
 repeat
  sleep(0.3)
- weight = warp.getShipSize()
+ weight = ship.getShipSize()
 until weight ~= nil
 print("Ship weight updated...")
 
 CalcRealDistance()
 
-warp.mode(1)
+ship.mode(1)
 
 mainloop = true
 while(mainloop) do
@@ -471,8 +471,8 @@ while(mainloop) do
   rs.setOutput(Alarm, true)
   if Confirm() then
    rs.setOutput(Alarm, false)
-   warp.mode(5)
+   ship.mode(5)
-   warp.jump()
+   ship.jump()
   end
   rs.setOutput(Alarm, false)
  elseif keycode == 45 then
@@ -488,6 +488,6 @@ if SData.Summon then
 end
 Clear()
 print("wish you good")
-warp.mode(0)
+ship.mode(0)
 sleep(0.5)
 os.shutdown()

src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveRadar/ping.lua

@@ -19,12 +19,13 @@ if radius < 1 or radius > 9999 then
   return
 end
 
-energy, energyMax = radar.getEnergyLevel()
+energy, energyMax = radar.energy()
 if energy < radius * radius then
   print("Low energy level... (" + energy + "/" + radius * radius + ")")
   return
 end
-radar.scanRadius(radius)
+radar.radius(radius)
+radar.start()
 os.sleep(0.5)
 
 print("Scanning...")
@@ -40,8 +41,12 @@ print("took " .. seconds .. " seconds")
 
 if count ~= nil and count > 0 then
   for i=0, count-1 do
-    freq, x, y, z = radar.getResult(i)
+    success, type, name, x, y, z = radar.getResult(i)
-    print("Ship '" .. freq .. "' @ (" .. x .. " " .. y .. " " .. z .. ")")
+	if success then
+      print(type .. " " .. name .. " @ (" .. x .. " " .. y .. " " .. z .. ")")
+	else
+	  print("Error " .. type)
+	end
   end
 else
   print("Nothing was found =(")

src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveRadar/scan.lua

@@ -66,7 +66,7 @@ function drawContact(x, y, z, name, color)
 end
 
 function scanAndDraw()
-  local energy, energyMax = radar.getEnergyLevel()
+  local energy, energyMax = radar.energy()
   if (energy < radius * radius) then
     hh = math.floor(h / 2)
     hw = math.floor(w / 2)
@@ -77,7 +77,8 @@ function scanAndDraw()
     
     return 0
   end
-  radar.scanRadius(radius)
+  radar.radius(radius)
+  radar.start()
   os.sleep(2)
   
   redraw()
@@ -86,9 +87,9 @@ function scanAndDraw()
   
   if (numResults ~= 0) then
     for i = 0, numResults-1 do
-      freq, cx, cy, cz = radar.getResult(i)
+      success, type, name, cx, cy, cz = radar.getResult(i)
       
-      drawContact(cx, cy, cz, freq, 0xFF0000)
+      drawContact(cx, cy, cz, name, 0xFF0000)
     end
   end
   
@@ -107,11 +108,11 @@ function redraw()
   
   textOut(w - 3, 1, "[X]", 0xFFFFFF, 0xFF0000)
   
-  local energy, energyMax = radar.getEnergyLevel()
+  local energy, energyMax = radar.energy()
   textOut(4, h, "Energy: " .. energy .. " EU | Scan radius: " .. radius, 0xFFFFFF, 0x000000)
 end
 
-radarX, radarY, radarZ = radar.pos()
+radarX, radarY, radarZ = radar.position()
 
 while component.isAvailable("warpdriveRadar") do
   scanAndDraw()