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

Disabled multiplayer for HTML5, net bugfixes

Browse Source
This commit is contained in:
Anuken
2018-01-19 18:27:41 -05:00
parent 1dad6b27c7
commit b1a38c3e61
11 changed files with 209 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/AndroidManifest.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.anuke.mindustry"
android:versionCode="56"
android:versionName="3.3b7.1" >
android:versionCode="57"
android:versionName="3.3b8" >
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
core/src/io/anuke/mindustry/core/NetClient.java
+9 -32
View File
@@ -49,7 +49,7 @@ public class NetClient extends Module {
IntSet requests = new IntSet();
IntSet recieved = new IntSet();
float playerSyncTime = 2;
float dataTimeout = 60*15; //13 seconds timeout
float dataTimeout = 60*18; //18 seconds timeout
public NetClient(){
@@ -61,7 +61,6 @@ public class NetClient extends Module {
gotData = false;
kicked = false;
Gdx.app.postRunnable(() -> {
Vars.ui.loadfrag.hide();
Vars.ui.loadfrag.show("$text.connecting.data");
@@ -71,7 +70,6 @@ public class NetClient extends Module {
c.name = Vars.player.name;
c.android = Vars.android;
Net.send(c, SendMode.tcp);
});
Timers.runTask(dataTimeout, () -> {
if (!gotData) {
@@ -85,7 +83,6 @@ public class NetClient extends Module {
Net.handle(Disconnect.class, packet -> {
if (kicked) return;
Gdx.app.postRunnable(() -> {
Timers.runFor(3f, Vars.ui.loadfrag::hide);
GameState.set(State.menu);
@@ -93,10 +90,8 @@ public class NetClient extends Module {
Vars.ui.showError("$text.disconnect");
connecting = false;
});
});
Net.handle(WorldData.class, data -> {
Gdx.app.postRunnable(() -> {
UCore.log("Recieved world data: " + data.stream.available() + " bytes.");
NetworkIO.load(data.stream);
Vars.player.set(Vars.control.core.worldx(), Vars.control.core.worldy() - Vars.tilesize * 2);
@@ -110,7 +105,6 @@ public class NetClient extends Module {
GameState.set(State.playing);
Net.setClientLoaded(true);
});
});
Net.handle(SyncPacket.class, packet -> {
if (!gotData) return;
@@ -146,23 +140,20 @@ public class NetClient extends Module {
Player player = Vars.control.playerGroup.getByID(packet.playerid);
Weapon weapon = (Weapon) Upgrade.getByID(packet.weaponid);
Gdx.app.postRunnable(() -> weapon.shoot(player, packet.x, packet.y, packet.rotation));
weapon.shoot(player, packet.x, packet.y, packet.rotation);
});
Net.handle(PlacePacket.class, packet -> {
Gdx.app.postRunnable(() ->{
Recipe recipe = Recipes.getByResult(Block.getByID(packet.block));
if (recipe != null) Vars.control.removeItems(recipe.requirements);
Vars.control.input.placeBlockInternal(packet.x, packet.y, Block.getByID(packet.block), packet.rotation, true, false);
});
});
Net.handle(BreakPacket.class, packet -> {
Gdx.app.postRunnable(() -> Vars.control.input.breakBlockInternal(packet.x, packet.y, false));
Vars.control.input.breakBlockInternal(packet.x, packet.y, false);
});
Net.handle(StateSyncPacket.class, packet -> {
Gdx.app.postRunnable(() -> {
System.arraycopy(packet.items, 0, Vars.control.items, 0, packet.items.length);
@@ -170,12 +161,10 @@ public class NetClient extends Module {
Timers.resetTime(packet.time + (float) (TimeUtils.timeSinceMillis(packet.timestamp) / 1000.0 * 60.0));
Gdx.app.postRunnable(Vars.ui.hudfrag::updateItems);
});
Vars.ui.hudfrag.updateItems();
});
Net.handle(EnemySpawnPacket.class, spawn -> {
Gdx.app.postRunnable(() -> {
//duplicates.
if (Vars.control.enemyGroup.getByID(spawn.id) != null ||
recieved.contains(spawn.id)) return;
@@ -192,30 +181,23 @@ public class NetClient extends Module {
Effects.effect(Fx.spawn, enemy);
});
});
Net.handle(EnemyDeathPacket.class, spawn -> {
Gdx.app.postRunnable(() -> {
Enemy enemy = Vars.control.enemyGroup.getByID(spawn.id);
if (enemy != null) enemy.onDeath();
});
});
Net.handle(BulletPacket.class, packet -> {
//TODO shoot effects for enemies, clientside as well as serverside
BulletType type = (BulletType) BaseBulletType.getByID(packet.type);
Gdx.app.postRunnable(() -> {
Entity owner = Vars.control.enemyGroup.getByID(packet.owner);
new Bullet(type, owner, packet.x, packet.y, packet.angle).add();
});
});
Net.handle(BlockDestroyPacket.class, packet -> {
Tile tile = Vars.world.tile(packet.position % Vars.world.width(), packet.position / Vars.world.width());
if (tile != null && tile.entity != null) {
Gdx.app.postRunnable(() ->{
if (tile.entity != null) tile.entity.onDeath(true);
});
}
});
@@ -231,7 +213,6 @@ public class NetClient extends Module {
DataInputStream stream = new DataInputStream(packet.stream);
Gdx.app.postRunnable(() -> {
try {
float time = stream.readFloat();
@@ -261,7 +242,6 @@ public class NetClient extends Module {
//do nothing else...
//TODO fix
}
});
});
@@ -269,14 +249,13 @@ public class NetClient extends Module {
Player player = Vars.control.playerGroup.getByID(packet.playerid);
if (player != null) {
Gdx.app.postRunnable(player::remove);
player.remove();
}
Mindustry.platforms.updateRPC();
});
Net.handle(PlayerSpawnPacket.class, packet -> {
Gdx.app.postRunnable(() -> {
//duplicates.
if (Vars.control.enemyGroup.getByID(packet.id) != null ||
recieved.contains(packet.id)) return;
@@ -297,19 +276,17 @@ public class NetClient extends Module {
Mindustry.platforms.updateRPC();
});
});
Net.handle(ChatPacket.class, packet -> Gdx.app.postRunnable(() -> Vars.ui.chatfrag.addMessage(packet.text, Vars.netClient.colorizeName(packet.id, packet.name))));
Net.handle(ChatPacket.class, packet -> Vars.ui.chatfrag.addMessage(packet.text, Vars.netClient.colorizeName(packet.id, packet.name)));
Net.handle(KickPacket.class, packet -> {
kicked = true;
Net.disconnect();
GameState.set(State.menu);
Gdx.app.postRunnable(() -> Vars.ui.showError("$text.server.kicked." + packet.reason.name()));
Vars.ui.showError("$text.server.kicked." + packet.reason.name());
});
Net.handle(WeaponSwitchPacket.class, packet -> {
Gdx.app.postRunnable(() -> {
Player player = Vars.control.playerGroup.getByID(packet.playerid);
if (player == null) return;
@@ -317,7 +294,6 @@ public class NetClient extends Module {
player.weaponLeft = (Weapon) Upgrade.getByID(packet.left);
player.weaponRight = (Weapon) Upgrade.getByID(packet.right);
});
});
Net.handle(BlockTapPacket.class, packet -> {
Tile tile = Vars.world.tile(packet.position);
@@ -331,7 +307,7 @@ public class NetClient extends Module {
Net.handle(GameOverPacket.class, packet -> {
kicked = true;
Gdx.app.postRunnable(ui.restart::show);
ui.restart.show();
});
Net.handle(FriendlyFireChangePacket.class, packet -> Vars.control.setFriendlyFire(packet.enabled));
@@ -404,6 +380,7 @@ public class NetClient extends Module {
packet.x = x;
packet.y = y;
packet.rotation = angle;
packet.playerid = Vars.player.id;
Net.send(packet, SendMode.udp);
}
core/src/io/anuke/mindustry/core/NetServer.java
+5 -12
View File
@@ -48,7 +48,6 @@ public class NetServer extends Module{
UCore.log("Sending world data to client (ID=" + id + ")");
Gdx.app.postRunnable(() -> {
Player player = new Player();
player.clientid = id;
player.name = packet.name;
@@ -67,7 +66,7 @@ public class NetServer extends Module{
data.stream = new ByteArrayInputStream(stream.toByteArray());
Net.sendStream(id, data);
});
});
Net.handleServer(ConnectConfirmPacket.class, packet -> {
@@ -75,7 +74,7 @@ public class NetServer extends Module{
if (player == null) return;
Gdx.app.postRunnable(player::add);
player.add();
sendMessage("[accent]" + Bundles.format("text.server.connected", player.name));
});
@@ -88,7 +87,6 @@ public class NetServer extends Module{
}
sendMessage("[accent]" + Bundles.format("text.server.disconnected", player.name));
Gdx.app.postRunnable(() -> {
player.remove();
DisconnectPacket dc = new DisconnectPacket();
@@ -96,7 +94,6 @@ public class NetServer extends Module{
Net.send(dc, SendMode.tcp);
});
});
Net.handleServer(PositionPacket.class, pos -> {
Player player = connections.get(Net.getLastConnection());
@@ -114,7 +111,7 @@ public class NetServer extends Module{
});
Net.handleServer(PlacePacket.class, packet -> {
Gdx.app.postRunnable(() -> Vars.control.input.placeBlockInternal(packet.x, packet.y, Block.getByID(packet.block), packet.rotation, true, false));
Vars.control.input.placeBlockInternal(packet.x, packet.y, Block.getByID(packet.block), packet.rotation, true, false);
packet.playerid = connections.get(Net.getLastConnection()).id;
Recipe recipe = Recipes.getByResult(Block.getByID(packet.block));
@@ -128,7 +125,7 @@ public class NetServer extends Module{
});
Net.handleServer(BreakPacket.class, packet -> {
Gdx.app.postRunnable(() -> Vars.control.input.breakBlockInternal(packet.x, packet.y, false));
Vars.control.input.breakBlockInternal(packet.x, packet.y, false);
packet.playerid = connections.get(Net.getLastConnection()).id;
Net.sendExcept(Net.getLastConnection(), packet, SendMode.tcp);
@@ -145,7 +142,7 @@ public class NetServer extends Module{
packet.name = player.name;
packet.id = player.id;
Net.sendExcept(player.clientid, packet, SendMode.tcp);
Gdx.app.postRunnable(() -> Vars.ui.chatfrag.addMessage(packet.text, Vars.netClient.colorizeName(packet.id, packet.name)));
Vars.ui.chatfrag.addMessage(packet.text, Vars.netClient.colorizeName(packet.id, packet.name));
});
Net.handleServer(UpgradePacket.class, packet -> {
@@ -189,7 +186,6 @@ public class NetServer extends Module{
Net.handleServer(EntityRequestPacket.class, packet -> {
int id = packet.id;
int dest = Net.getLastConnection();
Gdx.app.postRunnable(() -> {
if (Vars.control.playerGroup.getByID(id) != null) {
Player player = Vars.control.playerGroup.getByID(id);
PlayerSpawnPacket p = new PlayerSpawnPacket();
@@ -218,7 +214,6 @@ public class NetServer extends Module{
Gdx.app.error("Mindustry", "Entity request target not found!");
}
});
});
}
public void sendMessage(String message){
@@ -226,8 +221,6 @@ public class NetServer extends Module{
packet.name = null;
packet.text = message;
Net.send(packet, SendMode.tcp);
Gdx.app.postRunnable(() -> Vars.ui.chatfrag.addMessage(message, null));
}
public void handleFriendlyFireChange(boolean enabled){
core/src/io/anuke/mindustry/core/Renderer.java
+1
View File
@@ -422,6 +422,7 @@ public class Renderer extends RendererModule{
//TODO optimize!
public void drawBar(Color color, float x, float y, float fraction){
fraction = Mathf.clamp(fraction);
float len = 3;
float w = (int) (len * 2 * fraction) + 0.5f;
core/src/io/anuke/mindustry/core/UI.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class UI extends SceneModule{
font.getData().setScale(Vars.fontscale);
font.getData().down += Unit.dp.scl(4f);
font.getData().lineHeight -= Unit.dp.scl(2f);
}, skin.font(), skin.getFont("default-font-chat"));
}, skin.font(), skin.getFont("default-font-chat"), skin.getFont("korean"));
}
@Override
core/src/io/anuke/mindustry/entities/effect/DamageArea.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class DamageArea{
};
Entities.getNearby(Vars.control.enemyGroup, rect, cons);
if(!Vars.control.isFriendlyFire()) Entities.getNearby(Vars.control.playerGroup, rect, cons);
if(Vars.control.isFriendlyFire()) Entities.getNearby(Vars.control.playerGroup, rect, cons);
}
public static void damageEntities(float x, float y, float radius, int damage){
core/src/io/anuke/mindustry/net/Net.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class Net{
/**Get the client ping. Only valid after updatePing().*/
public static int getPing(){
return clientProvider.getPing();
return server() ? 0 : clientProvider.getPing();
}
/**Returns the last connection that sent a packet to this server.*/
core/src/io/anuke/mindustry/net/Packets.java
+4 -4
View File
@@ -49,7 +49,7 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
buffer.put((byte)name.length());
buffer.put((byte)name.getBytes().length);
buffer.put(name.getBytes());
buffer.put(android ? (byte)1 : 0);
}
@@ -275,7 +275,7 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
buffer.put((byte)name.length());
buffer.put((byte)name.getBytes().length);
buffer.put(name.getBytes());
buffer.put(weaponleft);
buffer.put(weaponright);
@@ -352,12 +352,12 @@ public class Packets {
@Override
public void write(ByteBuffer buffer) {
if(name != null) {
buffer.putShort((short) name.length());
buffer.putShort((short) name.getBytes().length);
buffer.put(name.getBytes());
}else{
buffer.putShort((short)-1);
}
buffer.putShort((short)text.length());
buffer.putShort((short)text.getBytes().length);
buffer.put(text.getBytes());
buffer.putInt(id);
}
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+2 -1
View File
@@ -28,9 +28,10 @@ public class MenuFragment implements Fragment{
add(new MenuButton("$text.play", group, ui.levels::show));
row();
if(!Vars.gwt) {
add(new MenuButton("$text.joingame", group, ui.join::show));
row();
}
add(new MenuButton("$text.tutorial", group, ()-> control.playMap(world.maps().getMap("tutorial"))));
row();
kryonet/src/io/anuke/kryonet/KryoClient.java
+7 -14
View File
@@ -62,40 +62,33 @@ public class KryoClient implements ClientProvider{
c.id = connection.getID();
if(connection.getRemoteAddressTCP() != null) c.addressTCP = connection.getRemoteAddressTCP().toString();
try{
Net.handleClientReceived(c);
}catch (Exception e){
Gdx.app.postRunnable(() -> {throw new RuntimeException(e);});
}
Gdx.app.postRunnable(() -> Net.handleClientReceived(c));
}
@Override
public void disconnected (Connection connection) {
Disconnect c = new Disconnect();
try{
Net.handleClientReceived(c);
}catch (Exception e){
Gdx.app.postRunnable(() -> {throw new RuntimeException(e);});
}
Gdx.app.postRunnable(() -> Net.handleClientReceived(c));
}
@Override
public void received (Connection connection, Object object) {
if(object instanceof FrameworkMessage) return;
Gdx.app.postRunnable(() -> {
try{
Net.handleClientReceived(object);
}catch (Exception e){
if(e instanceof KryoNetException && e.getMessage() != null && e.getMessage().toLowerCase().contains("incorrect")) {
Gdx.app.postRunnable(() -> Vars.ui.showError("$text.server.mismatch"));
Vars.ui.showError("$text.server.mismatch");
Vars.netClient.disconnectQuietly();
}else{
Gdx.app.postRunnable(() -> {
throw new RuntimeException(e);
}
}
});
}
}
}
};
kryonet/src/io/anuke/kryonet/KryoServer.java
+4 -10
View File
@@ -66,12 +66,8 @@ public class KryoServer implements ServerProvider {
c.id = kn.id;
c.addressTCP = connection.getRemoteAddressTCP().toString();
try {
Net.handleServerReceived(c, kn.id);
connections.add(kn);
}catch (Exception e){
Gdx.app.postRunnable(() -> {throw new RuntimeException(e);});
}
Gdx.app.postRunnable(() -> Net.handleServerReceived(c, kn.id));
}
@Override
@@ -83,11 +79,7 @@ public class KryoServer implements ServerProvider {
Disconnect c = new Disconnect();
c.id = k.id;
try{
Net.handleServerReceived(c, c.id);
}catch (Exception e){
Gdx.app.postRunnable(() -> {throw new RuntimeException(e);});
}
Gdx.app.postRunnable(() -> Net.handleServerReceived(c, c.id));
}
@Override
@@ -95,11 +87,13 @@ public class KryoServer implements ServerProvider {
KryoConnection k = getByKryoID(connection.getID());
if(object instanceof FrameworkMessage || k == null) return;
Gdx.app.postRunnable(() -> {
try{
Net.handleServerReceived(object, k.id);
}catch (Exception e){
e.printStackTrace();
}
});
}
};