Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Source reformat

Browse Source
This commit is contained in:
Anuken
2019-04-08 09:03:18 -04:00
parent 4a96b9bb00
commit b40beb0d1d
331 changed files with 2822 additions and 3274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/io/anuke/net/ByteSerializer.java
+5 -5
View File
@@ -15,8 +15,8 @@ public class ByteSerializer implements Serialization{
@Override
public void write(ByteBuffer byteBuffer, Object o){
if(o instanceof FrameworkMessage){
byteBuffer.put((byte) -2); //code for framework message
FrameworkSerializer.write(byteBuffer, (FrameworkMessage) o);
byteBuffer.put((byte)-2); //code for framework message
FrameworkSerializer.write(byteBuffer, (FrameworkMessage)o);
}else{
if(!(o instanceof Packet))
throw new RuntimeException("All sent objects must implement be Packets! Class: " + o.getClass());
@@ -24,7 +24,7 @@ public class ByteSerializer implements Serialization{
if(id == -1)
throw new RuntimeException("Unregistered class: " + o.getClass());
byteBuffer.put(id);
((Packet) o).write(byteBuffer);
((Packet)o).write(byteBuffer);
}
}
@@ -34,7 +34,7 @@ public class ByteSerializer implements Serialization{
if(id == -2){
return FrameworkSerializer.read(byteBuffer);
}else{
Packet packet = Pools.obtain((Class<Packet>) Registrator.getByID(id).type, (Supplier<Packet>) Registrator.getByID(id).constructor);
Packet packet = Pools.obtain((Class<Packet>)Registrator.getByID(id).type, (Supplier<Packet>)Registrator.getByID(id).constructor);
packet.read(byteBuffer);
return packet;
}
@@ -47,7 +47,7 @@ public class ByteSerializer implements Serialization{
@Override
public void writeLength(ByteBuffer byteBuffer, int i){
byteBuffer.putShort((short) i);
byteBuffer.putShort((short)i);
}
@Override
net/src/io/anuke/net/FrameworkSerializer.java
+11 -11
View File
@@ -9,28 +9,28 @@ public class FrameworkSerializer{
public static void write(ByteBuffer buffer, FrameworkMessage message){
if(message instanceof Ping){
Ping p = (Ping) message;
Ping p = (Ping)message;
buffer.put((byte) 0);
buffer.put((byte)0);
buffer.putInt(p.id);
buffer.put(p.isReply ? 1 : (byte) 0);
buffer.put(p.isReply ? 1 : (byte)0);
}else if(message instanceof DiscoverHost){
DiscoverHost p = (DiscoverHost) message;
DiscoverHost p = (DiscoverHost)message;
buffer.put((byte) 1);
buffer.put((byte)1);
}else if(message instanceof KeepAlive){
KeepAlive p = (KeepAlive) message;
KeepAlive p = (KeepAlive)message;
buffer.put((byte) 2);
buffer.put((byte)2);
}else if(message instanceof RegisterUDP){
RegisterUDP p = (RegisterUDP) message;
RegisterUDP p = (RegisterUDP)message;
buffer.put((byte) 3);
buffer.put((byte)3);
buffer.putInt(p.connectionID);
}else if(message instanceof RegisterTCP){
RegisterTCP p = (RegisterTCP) message;
RegisterTCP p = (RegisterTCP)message;
buffer.put((byte) 4);
buffer.put((byte)4);
buffer.putInt(p.connectionID);
}
}
net/src/io/anuke/net/KryoClient.java
+3 -10
View File
@@ -5,24 +5,17 @@ import io.anuke.arc.Core;
import io.anuke.arc.collection.Array;
import io.anuke.arc.function.Consumer;
import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.net.Host;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.*;
import io.anuke.mindustry.net.Net.ClientProvider;
import io.anuke.mindustry.net.Net.SendMode;
import io.anuke.mindustry.net.NetworkIO;
import io.anuke.mindustry.net.Packets.Connect;
import io.anuke.mindustry.net.Packets.Disconnect;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.nio.BufferOverflowException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.net.*;
import java.nio.*;
import java.nio.channels.ClosedSelectorException;
import static io.anuke.mindustry.Vars.netClient;
net/src/io/anuke/net/KryoCore.java
+1 -1
View File
@@ -61,6 +61,6 @@ public class KryoCore{
}
private static int calculateLag(){
return fakeLagMin + (int) (Math.random() * (fakeLagMax - fakeLagMin));
return fakeLagMin + (int)(Math.random() * (fakeLagMax - fakeLagMin));
}
}
net/src/io/anuke/net/KryoServer.java
+2 -8
View File
@@ -1,11 +1,8 @@
package io.anuke.net;
import com.dosse.upnp.UPnP;
import com.esotericsoftware.kryonet.Connection;
import com.esotericsoftware.kryonet.FrameworkMessage;
import com.esotericsoftware.kryonet.Listener;
import com.esotericsoftware.kryonet.*;
import com.esotericsoftware.kryonet.Listener.LagListener;
import com.esotericsoftware.kryonet.Server;
import com.esotericsoftware.kryonet.util.InputStreamSender;
import io.anuke.arc.Core;
import io.anuke.arc.collection.Array;
@@ -15,10 +12,7 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.net.*;
import io.anuke.mindustry.net.Net.SendMode;
import io.anuke.mindustry.net.Net.ServerProvider;
import io.anuke.mindustry.net.Packets.Connect;
import io.anuke.mindustry.net.Packets.Disconnect;
import io.anuke.mindustry.net.Packets.StreamBegin;
import io.anuke.mindustry.net.Packets.StreamChunk;
import io.anuke.mindustry.net.Packets.*;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;