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

🔥🔥🔥🔥🔥🔥maximum breakage

Browse Source
This commit is contained in:
Anuken
2018-12-20 12:38:27 -05:00
parent cabcfc7136
commit 94908bc599
309 changed files with 1883 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kryonet/src/io/anuke/kryonet/ByteSerializer.java
View File

@@ -4,8 +4,8 @@ import com.esotericsoftware.kryonet.FrameworkMessage;
import com.esotericsoftware.kryonet.serialization.Serialization;
import io.anuke.mindustry.net.Packet;
import io.anuke.mindustry.net.Registrator;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.util.Pooling;
import io.anuke.arc.function.Supplier;
import io.anuke.arc.util.Pooling;
import java.nio.ByteBuffer;

10
kryonet/src/io/anuke/kryonet/KryoClient.java
View File

@@ -10,8 +10,8 @@ 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 io.anuke.ucore.function.Consumer;
import io.anuke.ucore.util.Pooling;
import io.anuke.arc.function.Consumer;
import io.anuke.arc.util.Pooling;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
@@ -71,7 +71,7 @@ public class KryoClient implements ClientProvider{
c.id = connection.getID();
if(connection.getRemoteAddressTCP() != null) c.addressTCP = connection.getRemoteAddressTCP().toString();
threads.runDelay(() -> Net.handleClientReceived(c));
Core.app.post(() -> Net.handleClientReceived(c));
}
@Override
@@ -81,14 +81,14 @@ public class KryoClient implements ClientProvider{
}
Disconnect c = new Disconnect();
threads.runDelay(() -> Net.handleClientReceived(c));
Core.app.post(() -> Net.handleClientReceived(c));
}
@Override
public void received(Connection connection, Object object){
if(object instanceof FrameworkMessage) return;
threads.runDelay(() -> {
Core.app.post(() -> {
try{
Net.handleClientReceived(object);
}catch(Exception e){

4
kryonet/src/io/anuke/kryonet/KryoCore.java
View File

@@ -2,7 +2,7 @@ package io.anuke.kryonet;
import com.esotericsoftware.minlog.Log;
import com.esotericsoftware.minlog.Log.Logger;
import io.anuke.ucore.util.ColorCodes;
import io.anuke.arc.util.ColorCodes;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -55,7 +55,7 @@ public class KryoCore{
if(headless)
builder.append(ColorCodes.RESET);
io.anuke.ucore.util.Log.info("&b" + builder.toString());
io.anuke.arc.util.Log.info("&b" + builder.toString());
}
});
}

12
kryonet/src/io/anuke/kryonet/KryoServer.java
View File

@@ -16,8 +16,8 @@ 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.ucore.core.Timers;
import io.anuke.ucore.util.Log;
import io.anuke.arc.core.Timers;
import io.anuke.arc.util.Log;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;
@@ -65,7 +65,7 @@ public class KryoServer implements ServerProvider{
Log.info("&bRecieved connection: {0}", c.addressTCP);
connections.add(kn);
threads.runDelay(() -> Net.handleServerReceived(kn.id, c));
Core.app.post(() -> Net.handleServerReceived(kn.id, c));
}
@Override
@@ -76,7 +76,7 @@ public class KryoServer implements ServerProvider{
Disconnect c = new Disconnect();
c.id = k.id;
threads.runDelay(() -> {
Core.app.post(() -> {
Net.handleServerReceived(k.id, c);
connections.remove(k);
});
@@ -87,7 +87,7 @@ public class KryoServer implements ServerProvider{
KryoConnection k = getByKryoID(connection.getID());
if(object instanceof FrameworkMessage || k == null) return;
threads.runDelay(() -> {
Core.app.post(() -> {
try{
Net.handleServerReceived(k.id, object);
}catch(ValidateException e){
@@ -254,7 +254,7 @@ public class KryoServer implements ServerProvider{
}
private void handleException(Throwable e){
Timers.run(0f, () -> {
Time.run(0f, () -> {
throw new RuntimeException(e);
});
}