From e62f2630b518c1793bfb4667e1fef53805f1a05c Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 28 Feb 2024 09:27:35 +0000 Subject: [PATCH] Removes calls to isWireless Wired modems don't exist on 1.4.7, so there's no method to distinguish between wireless and wired modems. Fixes #1733 --- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/assets/cctweaked/lua/rom/apis/gps.lua | 2 +- src/main/resources/assets/cctweaked/lua/rom/help/modems.txt | 1 - src/main/resources/assets/cctweaked/lua/rom/programs/gps.lua | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c4..3499ded5c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/assets/cctweaked/lua/rom/apis/gps.lua b/src/main/resources/assets/cctweaked/lua/rom/apis/gps.lua index d1eafec2c..dc2e12b8a 100644 --- a/src/main/resources/assets/cctweaked/lua/rom/apis/gps.lua +++ b/src/main/resources/assets/cctweaked/lua/rom/apis/gps.lua @@ -109,7 +109,7 @@ function locate(_nTimeout, _bDebug) -- Find a modem local sModemSide = nil for _, sSide in ipairs(rs.getSides()) do - if peripheral.getType(sSide) == "modem" and peripheral.call(sSide, "isWireless") then + if peripheral.getType(sSide) == "modem" then sModemSide = sSide break end diff --git a/src/main/resources/assets/cctweaked/lua/rom/help/modems.txt b/src/main/resources/assets/cctweaked/lua/rom/help/modems.txt index 281a87582..06fdfd44d 100644 --- a/src/main/resources/assets/cctweaked/lua/rom/help/modems.txt +++ b/src/main/resources/assets/cctweaked/lua/rom/help/modems.txt @@ -6,7 +6,6 @@ isOpen( channel ) close( channel ) closeAll() transmit( channel, replyChannel, message ) -isWireless() Events fired by Modems: "modem_message" when a message is received on an open channel. Arguments are name, channel, replyChannel, message, distance diff --git a/src/main/resources/assets/cctweaked/lua/rom/programs/gps.lua b/src/main/resources/assets/cctweaked/lua/rom/programs/gps.lua index 3a65fd8ae..170c45979 100644 --- a/src/main/resources/assets/cctweaked/lua/rom/programs/gps.lua +++ b/src/main/resources/assets/cctweaked/lua/rom/programs/gps.lua @@ -33,7 +33,7 @@ elseif sCommand == "host" then -- Find a modem local sModemSide = nil for _, sSide in ipairs(rs.getSides()) do - if peripheral.getType(sSide) == "modem" and peripheral.call(sSide, "isWireless") then + if peripheral.getType(sSide) == "modem" then sModemSide = sSide break end