From 25488d00e603282fb8214b4e9adcd4e9e29a7c18 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 30 Dec 2017 19:36:23 -0500 Subject: [PATCH] Slowly descending into a branchy mess --- core/assets/bundles/bundle.properties | 10 ++++++ .../io/anuke/mindustry/core/NetClient.java | 31 +++++++++++++++++++ core/src/io/anuke/mindustry/net/Packets.java | 20 ++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 core/src/io/anuke/mindustry/core/NetClient.java create mode 100644 core/src/io/anuke/mindustry/net/Packets.java diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7a49495043..612a93322b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -10,7 +10,17 @@ text.level.select=Level Select text.level.mode=Gamemode: text.savegame=Save Game text.loadgame=Load Game +text.joingame=Join Game text.quit=Quit +text.hostserver=Host Server +text.joingame.title=Join Game +text.joingame.ip=IP: +text.connecting=[accent]Connecting... +text.connecting.data=[accent]Loading world data... +text.connectfail=[crimson]Failed to connect to server: [orange]{0} +text.server.port=Port: +text.server.invalidport=Invalid port number! +text.server.error=[crimson]Error hosting server: [orange]{0} text.tutorial.back=< Prev text.tutorial.next=Next > text.save.new=New Save diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java new file mode 100644 index 0000000000..7e2c4c4141 --- /dev/null +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -0,0 +1,31 @@ +package io.anuke.mindustry.core; + +import com.badlogic.gdx.Gdx; +import io.anuke.mindustry.Vars; +import io.anuke.mindustry.core.GameState.State; +import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.net.Packets.Connect; +import io.anuke.ucore.modules.Module; + +public class NetClient extends Module { + + public NetClient(){ + + Net.handle(Connect.class, packet -> { + Gdx.app.postRunnable(() -> { + Vars.ui.hideLoading(); + Vars.ui.showLoading("$text.connecting.data"); + }); + }); + } + + public void update(){ + if(!Net.client()) return; + + if(!GameState.is(State.menu) && Net.active()){ + + }else{ + Net.disconnect(); + } + } +} diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java new file mode 100644 index 0000000000..5b5638caf8 --- /dev/null +++ b/core/src/io/anuke/mindustry/net/Packets.java @@ -0,0 +1,20 @@ +package io.anuke.mindustry.net; + +/**Class for storing all packets.*/ +public class Packets { + + public static class Connect { + public int id; + public String addressTCP; + } + + public static class Disconnect { + public int id; + public String addressTCP; + } + + public static class WorldData { + + } + +}