From 25beb2af32b33f715f946d5a02b837804b76619d Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 17 Jan 2018 17:52:37 -0500 Subject: [PATCH] THEY SAID IT COULDN'T BE DONE --- core/src/Mindustry.gwt.xml | 3 +++ .../io/anuke/mindustry/ui/fragments/MenuFragment.java | 7 +++---- .../src/io/anuke/mindustry/desktop/DesktopLauncher.java | 6 +++--- kryonet/src/io/anuke/kryonet/KryoServer.java | 9 +++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml index b78f7e2301..68c562e7dd 100644 --- a/core/src/Mindustry.gwt.xml +++ b/core/src/Mindustry.gwt.xml @@ -7,4 +7,7 @@ + + + \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index e5fbeeb14a..47b28174aa 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -28,10 +28,9 @@ public class MenuFragment implements Fragment{ add(new MenuButton("$text.play", group, ui.levels::show)); row(); - if(!gwt){ - add(new MenuButton("$text.joingame", group, ui.join::show)); - row(); - } + add(new MenuButton("$text.joingame", group, ui.join::show)); + row(); + add(new MenuButton("$text.tutorial", group, ()-> control.playMap(world.maps().getMap("tutorial")))); row(); diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 524f80ad84..07cd254e57 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -6,7 +6,7 @@ import club.minnced.discord.rpc.DiscordRichPresence; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; import com.badlogic.gdx.utils.Array; -import io.anuke.kryonet.JavaWebsocketClient; +import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoServer; import io.anuke.mindustry.Mindustry; import io.anuke.mindustry.Vars; @@ -120,8 +120,8 @@ public class DesktopLauncher { Mindustry.args = Array.with(arg); - //Net.setClientProvider(new KryoClient()); - Net.setClientProvider(new JavaWebsocketClient()); + //Net.setClientProvider(new JavaWebsocketClient()); + Net.setClientProvider(new KryoClient()); Net.setServerProvider(new KryoServer()); try { diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java index a939422a40..04e2bdeabd 100644 --- a/kryonet/src/io/anuke/kryonet/KryoServer.java +++ b/kryonet/src/io/anuke/kryonet/KryoServer.java @@ -35,6 +35,7 @@ import java.util.Arrays; import java.util.concurrent.CopyOnWriteArrayList; public class KryoServer implements ServerProvider { + final boolean debug = false; final Server server; final SocketServer webServer; final ByteSerializer serializer = new ByteSerializer(); @@ -311,14 +312,14 @@ public class KryoServer implements ServerProvider { try { synchronized (buffer) { buffer.position(0); - UCore.log("Sending object with ID " + Registrator.getID(object.getClass())); + if(debug) UCore.log("Sending object with ID " + Registrator.getID(object.getClass())); serializer.write(buffer, object); int pos = buffer.position(); buffer.position(0); byte[] out = new byte[pos]; buffer.get(out); String string = new String(Base64Coder.encode(out)); - UCore.log("Sending string: " + string); + if(debug) UCore.log("Sending string: " + string); socket.send(string); } }catch (Exception e){ @@ -371,12 +372,12 @@ public class KryoServer implements ServerProvider { @Override public void onMessage(WebSocket conn, String message) { try { - UCore.log("Got message: " + message); + if(debug) UCore.log("Got message: " + message); KryoConnection k = getBySocket(conn); if (k == null) return; byte[] out = Base64Coder.decode(message); - UCore.log("Decoded: " + Arrays.toString(out)); + if(debug) UCore.log("Decoded: " + Arrays.toString(out)); ByteBuffer buffer = ByteBuffer.wrap(out); Object o = serializer.read(buffer); Net.handleServerReceived(o, k.id);