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

Refactored almost every class, somehow didn't break game yet

Browse Source
This commit is contained in:
Anuken
2018-01-27 23:42:42 -05:00
parent 78c8dc4902
commit 35b6b41f24
110 changed files with 1648 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/src/io/anuke/mindustry/client/HtmlLauncher.java
View File

@@ -15,7 +15,7 @@ import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.i18n.shared.DateTimeFormat;
import com.google.gwt.user.client.ui.*;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.io.PlatformFunction;
import io.anuke.mindustry.io.Platform;
import io.anuke.mindustry.net.Net;
import java.util.Date;
@@ -94,7 +94,7 @@ public class HtmlLauncher extends GwtApplication {
Net.setClientProvider(new WebsocketClient());
Mindustry.platforms = new PlatformFunction(){
Platform.instance = new Platform(){
DateTimeFormat format = DateTimeFormat.getFormat("EEE, dd MMM yyyy HH:mm:ss");
@Override

11
html/src/io/anuke/mindustry/client/WebsocketClient.java
View File

@@ -6,8 +6,7 @@ import com.badlogic.gdx.utils.reflect.ClassReflection;
import com.badlogic.gdx.utils.reflect.ReflectionException;
import com.sksamuel.gwt.websockets.Websocket;
import com.sksamuel.gwt.websockets.WebsocketListener;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.Platform;
import io.anuke.mindustry.net.Host;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Net.ClientProvider;
@@ -23,13 +22,15 @@ import io.anuke.ucore.util.Strings;
import java.io.IOException;
import java.nio.ByteBuffer;
import static io.anuke.mindustry.Vars.*;
public class WebsocketClient implements ClientProvider {
Websocket socket;
ByteBuffer buffer = ByteBuffer.allocate(1024);
@Override
public void connect(String ip, int port){
socket = new Websocket("ws://" + ip + ":" + Vars.webPort);
socket = new Websocket("ws://" + ip + ":" + webPort);
socket.addListener(new WebsocketListener() {
public void onMessage(byte[] bytes) {
try {
@@ -103,10 +104,10 @@ public class WebsocketClient implements ClientProvider {
@Override
public void pingHost(String address, int port, Consumer<Host> valid, Consumer<IOException> failed) {
if(!Mindustry.platforms.canJoinGame()) {
if(!Platform.instance.canJoinGame()) {
failed.accept(new IOException());
}else {
Websocket socket = new Websocket("ws://" + address + ":" + Vars.webPort);
Websocket socket = new Websocket("ws://" + address + ":" + webPort);
final boolean[] accepted = {false};
socket.addListener(new WebsocketListener() {
@Override