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

Testing Github/Discord integration

Browse Source
This commit is contained in:
Anuken
2018-01-20 16:24:36 -05:00
parent 7bcea08d83
commit 52f9cd5d22
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.anuke.mindustry" package="io.anuke.mindustry"
android:versionCode="57" android:versionCode="58"
android:versionName="3.3b8" > android:versionName="3.3b9" >
<uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

2
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -87,6 +87,8 @@ public class NetClient extends Module {
Vars.ui.showError("$text.disconnect"); Vars.ui.showError("$text.disconnect");
connecting = false; connecting = false;
Mindustry.platforms.updateRPC();
}); });
Net.handle(WorldData.class, data -> { Net.handle(WorldData.class, data -> {

3
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -68,7 +68,6 @@ public class NetServer extends Module{
Net.sendStream(id, data); Net.sendStream(id, data);
Mindustry.platforms.updateRPC(); Mindustry.platforms.updateRPC();
}); });
Net.handleServer(ConnectConfirmPacket.class, (id, packet) -> { Net.handleServer(ConnectConfirmPacket.class, (id, packet) -> {
@@ -95,6 +94,8 @@ public class NetServer extends Module{
dc.playerid = player.id; dc.playerid = player.id;
Net.send(dc, SendMode.tcp); Net.send(dc, SendMode.tcp);
Mindustry.platforms.updateRPC();
}); });
Net.handleServer(PositionPacket.class, (id, packet) -> { Net.handleServer(PositionPacket.class, (id, packet) -> {

3
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -432,9 +432,6 @@ public class Renderer extends RendererModule{
Draw.thickness(3f); Draw.thickness(3f);
Draw.color(Color.SLATE); Draw.color(Color.SLATE);
Draw.line(x - len + 1, y, x + len + 1.5f, y);
Draw.thickness(1f);
Draw.color(Color.BLACK);
Draw.line(x - len + 1, y, x + len + 0.5f, y); Draw.line(x - len + 1, y, x + len + 0.5f, y);
Draw.color(color); Draw.color(color);
if(w >= 1) if(w >= 1)

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

@@ -28,7 +28,7 @@ public class WebsocketClient implements ClientProvider {
@Override @Override
public void connect(String ip, int port) throws IOException { public void connect(String ip, int port) throws IOException {
socket = new Websocket("wss://" + ip + ":" + Vars.webPort); socket = new Websocket("ws://" + ip + ":" + Vars.webPort);
socket.addListener(new WebsocketListener() { socket.addListener(new WebsocketListener() {
public void onMessage(byte[] bytes) { public void onMessage(byte[] bytes) {
try { try {
@@ -105,7 +105,7 @@ public class WebsocketClient implements ClientProvider {
@Override @Override
public void pingHost(String address, int port, Consumer<Host> valid, Consumer<IOException> failed) { public void pingHost(String address, int port, Consumer<Host> valid, Consumer<IOException> failed) {
failed.accept(new IOException()); failed.accept(new IOException());
Websocket socket = new Websocket("wss://" + address + ":" + Vars.webPort); Websocket socket = new Websocket("ws://" + address + ":" + Vars.webPort);
final boolean[] accepted = {false}; final boolean[] accepted = {false};
socket.addListener(new WebsocketListener() { socket.addListener(new WebsocketListener() {
@Override @Override

2
kryonet/src/io/anuke/kryonet/KryoServer.java
View File

@@ -25,7 +25,6 @@ import io.anuke.mindustry.net.Streamable.StreamChunk;
import io.anuke.ucore.UCore; import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import org.java_websocket.WebSocket; import org.java_websocket.WebSocket;
import org.java_websocket.WebSocketServerFactory;
import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer; import org.java_websocket.server.WebSocketServer;
@@ -43,7 +42,6 @@ public class KryoServer implements ServerProvider {
final ByteBuffer buffer = ByteBuffer.allocate(4096); final ByteBuffer buffer = ByteBuffer.allocate(4096);
final CopyOnWriteArrayList<KryoConnection> connections = new CopyOnWriteArrayList<>(); final CopyOnWriteArrayList<KryoConnection> connections = new CopyOnWriteArrayList<>();
final Array<KryoConnection> array = new Array<>(); final Array<KryoConnection> array = new Array<>();
final WebSocketServerFactory factory = SSLGen.getFactory();
SocketServer webServer; SocketServer webServer;
int lastconnection = 0; int lastconnection = 0;