mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-17 21:55:12 +00:00
Code Issues Releases Wiki Activity

Change network packet to a record

Browse Source 
Look at all that code we can delete!
This commit is contained in:
Jonathan Coates
2021-10-06 18:38:51 +01:00
parent 0b5fe990e5
commit 36e0dcbad0
5 changed files with 21 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
View File

@@ -63,14 +63,14 @@ public abstract class ModemPeripheral implements IPeripheral, IPacketSender, IPa
@Override
public void receiveSameDimension( @Nonnull Packet packet, double distance )
{
if( packet.getSender() == this || !state.isOpen( packet.getChannel() ) ) return;
if( packet.sender() == this || !state.isOpen( packet.channel() ) ) return;
synchronized( computers )
{
for( IComputerAccess computer : computers )
{
computer.queueEvent( "modem_message",
computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload(), distance );
computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload(), distance );
}
}
}
@@ -78,14 +78,14 @@ public abstract class ModemPeripheral implements IPeripheral, IPacketSender, IPa
@Override
public void receiveDifferentDimension( @Nonnull Packet packet )
{
if( packet.getSender() == this || !state.isOpen( packet.getChannel() ) ) return;
if( packet.sender() == this || !state.isOpen( packet.channel() ) ) return;
synchronized( computers )
{
for( IComputerAccess computer : computers )
{
computer.queueEvent( "modem_message",
computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload() );
computer.getAttachmentName(), packet.channel(), packet.replyChannel(), packet.payload() );
}
}
}

2
src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java
View File

@@ -63,7 +63,7 @@ public class WirelessNetwork implements IPacketNetwork
private static void tryTransmit( IPacketReceiver receiver, Packet packet, double range, boolean interdimensional )
{
IPacketSender sender = packet.getSender();
IPacketSender sender = packet.sender();
if( receiver.getLevel() == sender.getLevel() )
{
double receiveRange = Math.max( range, receiver.getRange() ); // Ensure range is symmetrical

4
src/main/java/dan200/computercraft/shared/wired/WiredNetwork.java
View File

@@ -325,9 +325,9 @@ public final class WiredNetwork implements IWiredNetwork
TreeSet<TransmitPoint> transmitTo = new TreeSet<>();
{
TransmitPoint startEntry = start.element.getLevel() != packet.getSender().getLevel()
TransmitPoint startEntry = start.element.getLevel() != packet.sender().getLevel()
? new TransmitPoint( start, Double.POSITIVE_INFINITY, true )
: new TransmitPoint( start, start.element.getPosition().distanceTo( packet.getSender().getPosition() ), false );
: new TransmitPoint( start, start.element.getPosition().distanceTo( packet.sender().getPosition() ), false );
points.put( start, startEntry );
transmitTo.add( startEntry );
}

4
src/main/java/dan200/computercraft/shared/wired/WiredNode.java
View File

@@ -80,7 +80,7 @@ public final class WiredNode implements IWiredNode
public void transmitSameDimension( @Nonnull Packet packet, double range )
{
Objects.requireNonNull( packet, "packet cannot be null" );
if( !(packet.getSender() instanceof IWiredSender) || ((IWiredSender) packet.getSender()).getNode() != this )
if( !(packet.sender() instanceof IWiredSender) || ((IWiredSender) packet.sender()).getNode() != this )
{
throw new IllegalArgumentException( "Sender is not in the network" );
}
@@ -100,7 +100,7 @@ public final class WiredNode implements IWiredNode
public void transmitInterdimensional( @Nonnull Packet packet )
{
Objects.requireNonNull( packet, "packet cannot be null" );
if( !(packet.getSender() instanceof IWiredSender) || ((IWiredSender) packet.getSender()).getNode() != this )
if( !(packet.sender() instanceof IWiredSender) || ((IWiredSender) packet.sender()).getNode() != this )
{
throw new IllegalArgumentException( "Sender is not in the network" );
}