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

Pools replace with Pooling / Removed all core reflection

Browse Source
This commit is contained in:
Anuken
2018-09-09 17:44:10 -04:00
parent 2cb6e454c8
commit 65f911909b
20 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/net/Net.java
+4 -5
View File
@@ -8,7 +8,6 @@ import com.badlogic.gdx.net.HttpRequestBuilder;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.net.Packets.KickReason;
@@ -68,7 +67,7 @@ public class Net{
if(loaded){
//handle all packets that were skipped while loading
for(int i = 0; i < packetQueue.size; i++){
Log.info("Processing {0} packet post-load.", ClassReflection.getSimpleName(packetQueue.get(i).getClass()));
Log.info("Processing {0} packet post-load.", packetQueue.get(i).getClass());
handleClientReceived(packetQueue.get(i));
}
}
@@ -238,14 +237,14 @@ public class Net{
}
}else if(!((object instanceof Packet) && ((Packet) object).isUnimportant())){
packetQueue.add(object);
Log.info("Queuing packet {0}.", ClassReflection.getSimpleName(object.getClass()));
Log.info("Queuing packet {0}.", object);
}else{
synchronized(packetPoolLock){
Pooling.free(object);
}
}
}else{
Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass()));
Log.err("Unhandled packet type: '{0}'!", object);
}
}
@@ -261,7 +260,7 @@ public class Net{
Pooling.free(object);
}
}else{
Log.err("Unhandled packet type: '{0}'!", ClassReflection.getSimpleName(object.getClass()));
Log.err("Unhandled packet type: '{0}'!", object.getClass());
}
}
core/src/io/anuke/mindustry/net/Registrator.java
-2
View File
@@ -3,7 +3,6 @@ package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.ObjectIntMap;
import io.anuke.mindustry.net.Packets.*;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.util.Pooling;
public class Registrator{
private static ClassEntry[] classes = {
@@ -18,7 +17,6 @@ public class Registrator{
static{
if(classes.length > 127) throw new RuntimeException("Can't have more than 127 registered classes!");
for(int i = 0; i < classes.length; i++){
Pooling.registerType((Class<Packet>) classes[i].type, (Supplier<Packet>) classes[i].constructor);
ids.put(classes[i].type, i);
}
}