Wireless modification for signal caluclation

makuhlmann · makuhlmann · commit 7cf368e54a6e · 2025-03-29T19:26:39.000+01:00
0-1023 -&gt; 1024 blocks by default, cache enabled, same for 65534 to not break vanilla GPS
1024+ -&gt; /4 range, caching disabled
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,8 +39,6 @@ githubRelease {
     prerelease = isUnstable
 }
 
-tasks.publish { dependsOn(tasks.githubRelease) }
-
 idea.project.settings.runConfigurations {
     register<JUnitExt>("Core Tests") {
         vmParameters = "-ea"
diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/network/Packet.java b/projects/common-api/src/main/java/dan200/computercraft/api/network/Packet.java
@@ -18,7 +18,7 @@
  * @see PacketNetwork#transmitSameDimension(Packet, double)
  * @see PacketNetwork#transmitInterdimensional(Packet)
  * @see PacketReceiver#receiveDifferentDimension(Packet)
- * @see PacketReceiver#receiveSameDimension(Packet, double)
+ * @see PacketReceiver#receiveSameDimension(Packet, double, double)
  */
 public record Packet(
     int channel,
diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/network/PacketNetwork.java b/projects/common-api/src/main/java/dan200/computercraft/api/network/PacketNetwork.java
@@ -40,7 +40,7 @@ public interface PacketNetwork {
      * @param packet The packet to send.
      * @param range  The maximum distance this packet will be sent.
      * @see #transmitInterdimensional(Packet)
-     * @see PacketReceiver#receiveSameDimension(Packet, double)
+     * @see PacketReceiver#receiveSameDimension(Packet, double, double)
      */
     void transmitSameDimension(Packet packet, double range);
 
diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/network/PacketReceiver.java b/projects/common-api/src/main/java/dan200/computercraft/api/network/PacketReceiver.java
@@ -35,7 +35,7 @@ public interface PacketReceiver {
      *
      * @return The maximum distance this device can send and receive messages.
      * @see #isInterdimensional()
-     * @see #receiveSameDimension(Packet packet, double)
+     * @see #receiveSameDimension(Packet packet, double, double)
      * @see PacketNetwork#transmitInterdimensional(Packet)
      */
     double getRange();
@@ -58,12 +58,13 @@ public interface PacketReceiver {
      * @param packet   The packet to receive. Generally you should check that you are listening on the given channel and,
      *                 if so, queue the appropriate modem event.
      * @param distance The distance this packet has travelled from the source.
+     * @param signalStrength The signal strength with which the packet has arrived.
      * @see Packet
      * @see #getRange()
      * @see PacketNetwork#transmitSameDimension(Packet, double)
      * @see PacketNetwork#transmitInterdimensional(Packet)
      */
-    void receiveSameDimension(Packet packet, double distance);
+    void receiveSameDimension(Packet packet, double distance, double signalStrength);
 
     /**
      * Receive a network packet from a different dimension.
diff --git a/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java b/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java
@@ -255,9 +255,7 @@ private void addTranslations() {
         addConfigGroup(ConfigSpec.serverSpec, "peripheral", "Peripherals");
         addConfigEntry(ConfigSpec.commandBlockEnabled, "Enable command block peripheral");
         addConfigEntry(ConfigSpec.modemRange, "Modem range (default)");
-        addConfigEntry(ConfigSpec.modemHighAltitudeRange, "Modem range (high-altitude)");
         addConfigEntry(ConfigSpec.modemRangeDuringStorm, "Modem range (bad weather)");
-        addConfigEntry(ConfigSpec.modemHighAltitudeRangeDuringStorm, "Modem range (high-altitude, bad weather)");
         addConfigEntry(ConfigSpec.maxNotesPerTick, "Maximum notes that a computer can play at once");
         addConfigEntry(ConfigSpec.monitorBandwidth, "Monitor bandwidth");
 
diff --git a/projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNodeImpl.java b/projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNodeImpl.java
@@ -78,7 +78,7 @@ synchronized void tryTransmit(Packet packet, double packetDistance, boolean pack
             if (!packetInterdimensional) {
                 var receiveRange = Math.max(range, receiver.getRange()); // Ensure range is symmetrical
                 if (interdimensional || receiver.isInterdimensional() || packetDistance < receiveRange) {
-                    receiver.receiveSameDimension(packet, packetDistance + element.getPosition().distanceTo(receiver.getPosition()));
+                    receiver.receiveSameDimension(packet, packetDistance + element.getPosition().distanceTo(receiver.getPosition()), receiveRange - packetDistance);
                 }
             } else {
                 if (interdimensional || receiver.isInterdimensional()) {
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/config/Config.java b/projects/common/src/main/java/dan200/computercraft/shared/config/Config.java
@@ -16,10 +16,8 @@ public final class Config {
     public static boolean commandRequireCreative = true;
 
     public static boolean enableCommandBlock = false;
-    public static int modemRange = 64;
-    public static int modemHighAltitudeRange = 384;
-    public static int modemRangeDuringStorm = 64;
-    public static int modemHighAltitudeRangeDuringStorm = 384;
+    public static int modemRange = 1024;
+    public static int modemRangeDuringStorm = 896;
     public static int maxNotesPerTick = 8;
     public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
     public static int monitorDistance = 65;
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/config/ConfigSpec.java b/projects/common/src/main/java/dan200/computercraft/shared/config/ConfigSpec.java
@@ -56,9 +56,7 @@ public final class ConfigSpec {
 
     public static final ConfigFile.Value<Boolean> commandBlockEnabled;
     public static final ConfigFile.Value<Integer> modemRange;
-    public static final ConfigFile.Value<Integer> modemHighAltitudeRange;
     public static final ConfigFile.Value<Integer> modemRangeDuringStorm;
-    public static final ConfigFile.Value<Integer> modemHighAltitudeRangeDuringStorm;
     public static final ConfigFile.Value<Integer> maxNotesPerTick;
     public static final ConfigFile.Value<Integer> monitorBandwidth;
 
@@ -277,21 +275,13 @@ or a single method (computercraft:inventory#pushItems).
                 .define("command_block_enabled", Config.enableCommandBlock);
 
             modemRange = builder
-                .comment("The range of Wireless Modems at low altitude in clear weather, in meters.")
+                .comment("The maximum range of Wireless Modems in clear weather, in meters.")
                 .defineInRange("modem_range", Config.modemRange, 0, MODEM_MAX_RANGE);
 
-            modemHighAltitudeRange = builder
-                .comment("The range of Wireless Modems at maximum altitude in clear weather, in meters.")
-                .defineInRange("modem_high_altitude_range", Config.modemHighAltitudeRange, 0, MODEM_MAX_RANGE);
-
             modemRangeDuringStorm = builder
-                .comment("The range of Wireless Modems at low altitude in stormy weather, in meters.")
+                .comment("The maximum range of Wireless Modems in stormy weather, in meters.")
                 .defineInRange("modem_range_during_storm", Config.modemRangeDuringStorm, 0, MODEM_MAX_RANGE);
 
-            modemHighAltitudeRangeDuringStorm = builder
-                .comment("The range of Wireless Modems at maximum altitude in stormy weather, in meters.")
-                .defineInRange("modem_high_altitude_range_during_storm", Config.modemHighAltitudeRangeDuringStorm, 0, MODEM_MAX_RANGE);
-
             maxNotesPerTick = builder
                 .comment("Maximum amount of notes a speaker can play at once.")
                 .defineInRange("max_notes_per_tick", Config.maxNotesPerTick, 1, Integer.MAX_VALUE);
@@ -423,9 +413,7 @@ public static void syncServer(@Nullable Path path) {
         Config.enableCommandBlock = commandBlockEnabled.get();
         Config.maxNotesPerTick = maxNotesPerTick.get();
         Config.modemRange = modemRange.get();
-        Config.modemHighAltitudeRange = modemHighAltitudeRange.get();
         Config.modemRangeDuringStorm = modemRangeDuringStorm.get();
-        Config.modemHighAltitudeRangeDuringStorm = modemHighAltitudeRangeDuringStorm.get();
         Config.monitorBandwidth = monitorBandwidth.get();
 
         // Turtles
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
@@ -114,13 +114,13 @@ public void removed() {
     }
 
     @Override
-    public void receiveSameDimension(Packet packet, double distance) {
+    public void receiveSameDimension(Packet packet, double distance, double signalStrength) {
         if (packet.sender() == this || !state.isOpen(packet.channel())) return;
 
         synchronized (computers) {
             for (var computer : computers) {
                 computer.queueEvent("modem_message",
-                    computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload(), distance);
+                    computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload(), distance, signalStrength);
             }
         }
     }
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java
@@ -10,12 +10,21 @@
 import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.peripheral.modem.ModemPeripheral;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
+import dan200.computercraft.shared.util.WirelessHelpers;
+import net.minecraft.core.Vec3i;
+import net.minecraft.util.Tuple;
+
+import java.util.HashMap;
 
 public abstract class WirelessModemPeripheral extends ModemPeripheral {
     public static final String NORMAL_ADJECTIVE = "upgrade.computercraft.wireless_modem_normal.adjective";
     public static final String ADVANCED_ADJECTIVE = "upgrade.computercraft.wireless_modem_advanced.adjective";
 
     private final boolean advanced;
+    private HashMap<Vec3i, HashMap<Vec3i, Tuple<Double, Long>>> cachedSignalStrengths = new HashMap<>();
+
+    public Long lastLFTransmit = 0L;
+    public Long lastMFTransmit = 0L;
 
     public WirelessModemPeripheral(ModemState state, boolean advanced) {
         super(state);
@@ -34,17 +43,11 @@ public double getRange() {
         } else {
             var world = getLevel();
             if (world != null) {
-                var position = getPosition();
-                double minRange = Config.modemRange;
-                double maxRange = Config.modemHighAltitudeRange;
+                double range = Config.modemRange;
                 if (world.isRaining() && world.isThundering()) {
-                    minRange = Config.modemRangeDuringStorm;
-                    maxRange = Config.modemHighAltitudeRangeDuringStorm;
+                    range = Config.modemRangeDuringStorm;
                 }
-                if (position.y > 96.0 && maxRange > minRange) {
-                    return minRange + (position.y - 96.0) * ((maxRange - minRange) / ((world.getMaxBuildHeight() - 1) - 96.0));
-                }
-                return minRange;
+                return range;
             }
             return 0.0;
         }
@@ -54,4 +57,42 @@ public double getRange() {
     protected PacketNetwork getNetwork() {
         return ComputerCraftAPI.getWirelessNetwork(Nullability.assertNonNull(getLevel().getServer()));
     }
+
+    public double getCachedSignalDegradation(Vec3i receiverPos) {
+        var senderPos = WirelessHelpers.floorToVec3i(getPosition());
+        var senderCachedSignals = cachedSignalStrengths.get(senderPos);
+        if (senderCachedSignals != null) {
+            var receiverCachedSignal = senderCachedSignals.get(receiverPos);
+            if (receiverCachedSignal != null) {
+                double signalDegradation = receiverCachedSignal.getA();
+                Long expiration = receiverCachedSignal.getB();
+                if (getLevel().getDayTime() < expiration) {
+                    return signalDegradation;
+                }
+                // Remove invalidated caches
+                senderCachedSignals.remove(receiverPos);
+                if (senderCachedSignals.isEmpty()) {
+                    cachedSignalStrengths.remove(senderPos);
+                }
+            }
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    public void addCachedSignalDegradation(Vec3i receiverPos, double signalDegradation) {
+        // Prevent overflow the lazy way
+        if (cachedSignalStrengths.size() > 2000) {
+            cachedSignalStrengths = new HashMap<>();
+        }
+
+        var senderPos = WirelessHelpers.floorToVec3i(getPosition());
+        var expiration = getLevel().getDayTime() + 2400;
+        if (cachedSignalStrengths.containsKey(senderPos)) {
+            cachedSignalStrengths.get(senderPos).put(receiverPos, new Tuple<>(signalDegradation, expiration));
+            return;
+        }
+        var senderCachedSignals = new HashMap<Vec3i, Tuple<Double, Long>>();
+        senderCachedSignals.put(receiverPos, new Tuple<>(signalDegradation, expiration));
+        cachedSignalStrengths.put(senderPos, senderCachedSignals);
+    }
 }
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java
@@ -4,13 +4,17 @@
 
 package dan200.computercraft.shared.peripheral.modem.wireless;
 
+import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.network.Packet;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.PacketReceiver;
+import dan200.computercraft.shared.peripheral.modem.ModemPeripheral;
+import dan200.computercraft.shared.util.WirelessHelpers;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.util.Tuple;
 
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class WirelessNetwork implements PacketNetwork {
@@ -43,13 +47,81 @@ public void transmitInterdimensional(Packet packet) {
     private static void tryTransmit(PacketReceiver receiver, Packet packet, double range, boolean interdimensional) {
         var sender = packet.sender();
         if (receiver.getLevel() == sender.getLevel()) {
+            var level = receiver.getLevel();
             var receiveRange = Math.max(range, receiver.getRange()); // Ensure range is symmetrical
             var distanceSq = receiver.getPosition().distanceToSqr(sender.getPosition());
-            if (interdimensional || receiver.isInterdimensional() || distanceSq <= receiveRange * receiveRange) {
-                receiver.receiveSameDimension(packet, Math.sqrt(distanceSq));
+
+            // Interdimensional - just send it
+            if (interdimensional && receiver.isInterdimensional()) {
+                receiver.receiveSameDimension(packet, Math.sqrt(distanceSq), 0.0);
+                return;
+            }
+
+            // Don't do anything if target modem ain't listening
+            try {
+                if(!((ModemPeripheral)receiver).isOpen(packet.channel())) {
+                    return;
+                }
+            } catch (LuaException ignored) {}
+
+            boolean noCache = false;
+
+            // 65534 -> Default GPS, exclude from low range for now
+            if (packet.channel() > 1024 && packet.channel() != 65534) {
+                // High frequency local wireless
+                receiveRange /= 8;
+                noCache = true;
+            }
+
+            if (distanceSq <= receiveRange * receiveRange) {
+                Vec3i senderBlockPosition = WirelessHelpers.floorToVec3i(sender.getPosition());
+                Vec3i receiverBlockPosition = WirelessHelpers.floorToVec3i(receiver.getPosition());
+
+                // No need for distance calc for yourself
+                if (senderBlockPosition.equals(receiverBlockPosition)) {
+                    //System.out.println("Skipped self distance check");
+                    receiver.receiveSameDimension(packet, 0.0, receiveRange);
+                    return;
+                }
+
+                //TODO: Signal range & Different degradation based on channel - 3 groups? (low, mid, high)
+                if (!noCache) {
+                    var cachedSignalDegradation = ((WirelessModemPeripheral)sender).getCachedSignalDegradation(receiverBlockPosition);
+                    if (cachedSignalDegradation != Integer.MAX_VALUE) {
+                        //System.out.println("Cache hit for " + sender.getSenderID() + " -> " + receiverBlockPosition.toString() + "!");
+                        if (cachedSignalDegradation > receiveRange) {
+                            return;
+                        }
+                        receiver.receiveSameDimension(packet, Math.sqrt(distanceSq), receiveRange - cachedSignalDegradation);
+                        return;
+                    }
+                }
+
+
+                List<Vec3i> obstructionBlocks = WirelessHelpers.Bresenham3D(senderBlockPosition, receiverBlockPosition);
+                var signalDegradation = 0.0;
+                var diagonalCompensation = WirelessHelpers.getDiagonalCompensation(senderBlockPosition, receiverBlockPosition);
+
+                for (Vec3i blockVector : obstructionBlocks) {
+                    var explosionResistance = level.getBlockState(new BlockPos(blockVector))
+                        .getBlock()
+                        .getExplosionResistance();
+                    if (explosionResistance >= 100)
+                        explosionResistance /= 4;
+                    signalDegradation += (signalDegradation / 100.0 * explosionResistance + 1.0) * diagonalCompensation;
+
+                    if (signalDegradation > receiveRange) {
+                        break;
+                    }
+                }
+
+                ((WirelessModemPeripheral)sender).addCachedSignalDegradation(receiverBlockPosition, signalDegradation);
+                if (signalDegradation <= receiveRange) {
+                    receiver.receiveSameDimension(packet, Math.sqrt(distanceSq), receiveRange - signalDegradation);
+                }
             }
         } else {
-            if (interdimensional || receiver.isInterdimensional()) {
+            if (interdimensional && receiver.isInterdimensional()) {
                 receiver.receiveDifferentDimension(packet);
             }
         }
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketBrain.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketBrain.java
@@ -12,8 +12,10 @@
 import dan200.computercraft.shared.network.client.PocketComputerDataMessage;
 import dan200.computercraft.shared.network.server.ServerNetworking;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
+import dan200.computercraft.shared.pocket.peripherals.PocketModem;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
@@ -154,6 +156,8 @@ public void setUpgradeData(DataComponentPatch data) {
     public void invalidatePeripheral() {
         var peripheral = upgrade == null ? null : upgrade.upgrade().createPeripheral(this);
         computer.setPeripheral(ComputerSide.BACK, peripheral);
+        // Attach a modem to the top of the pocket. This is a massive hack, but the easiest way to do it without duplicating code.
+        computer.setPeripheral(ComputerSide.TOP, new PocketModem(ItemStack.EMPTY, false).createPeripheral(this));
     }
 
     @Override
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/util/WirelessHelpers.java b/projects/common/src/main/java/dan200/computercraft/shared/util/WirelessHelpers.java
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ githubRelease {`
`39`	`39`	`prerelease = isUnstable`
`40`	`40`	`}`
`41`	`41`
`42`		`-tasks.publish { dependsOn(tasks.githubRelease) }`
`43`		`-`
`44`	`42`	`idea.project.settings.runConfigurations {`
`45`	`43`	`register<JUnitExt>("Core Tests") {`
`46`	`44`	`vmParameters = "-ea"`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ synchronized void tryTransmit(Packet packet, double packetDistance, boolean pack`
`78`	`78`	`if (!packetInterdimensional) {`
`79`	`79`	`var receiveRange = Math.max(range, receiver.getRange()); // Ensure range is symmetrical`
`80`	`80`	`if (interdimensional \|\| receiver.isInterdimensional() \|\| packetDistance < receiveRange) {`
`81`		`- receiver.receiveSameDimension(packet, packetDistance + element.getPosition().distanceTo(receiver.getPosition()));`
	`81`	`+ receiver.receiveSameDimension(packet, packetDistance + element.getPosition().distanceTo(receiver.getPosition()), receiveRange - packetDistance);`
`82`	`82`	`}`
`83`	`83`	`} else {`
`84`	`84`	`if (interdimensional \|\| receiver.isInterdimensional()) {`
Original file line number	Diff line number	Diff line change
`@@ -114,13 +114,13 @@ public void removed() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
`117`		`- public void receiveSameDimension(Packet packet, double distance) {`
	`117`	`+ public void receiveSameDimension(Packet packet, double distance, double signalStrength) {`
`118`	`118`	`if (packet.sender() == this \|\| !state.isOpen(packet.channel())) return;`
`119`	`119`
`120`	`120`	`synchronized (computers) {`
`121`	`121`	`for (var computer : computers) {`
`122`	`122`	`computer.queueEvent("modem_message",`
`123`		`- computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload(), distance);`
	`123`	`+ computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload(), distance, signalStrength);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`