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

Net refactor

Browse Source
This commit is contained in:
Anuken
2019-06-10 18:46:58 -04:00
parent d7e1297cce
commit 72fb7b9df7
3 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -429,7 +429,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
public void drawBuildRequests(){ public void drawBuildRequests(){
BuildRequest last = null; BuildRequest last = null;
for(BuildRequest request : getPlaceQueue()){ for(BuildRequest request : getPlaceQueue()){
if(getCurrentRequest() == request && request.progress > 0.001f && (dst(request.x * tilesize, request.y * tilesize) <= placeDistance || state.isEditor())) continue; if(request.progress > 0.01f || (getCurrentRequest() == request && (dst(request.x * tilesize, request.y * tilesize) <= placeDistance || state.isEditor()))) continue;
if(request.breaking){ if(request.breaking){
Block block = world.ltile(request.x, request.y).block(); Block block = world.ltile(request.x, request.y).block();

6
core/src/io/anuke/mindustry/io/Changelogs.java
View File

@@ -1,19 +1,19 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import io.anuke.arc.Core;
import io.anuke.arc.collection.Array; import io.anuke.arc.collection.Array;
import io.anuke.arc.function.Consumer; import io.anuke.arc.function.Consumer;
import io.anuke.arc.util.serialization.JsonReader; import io.anuke.arc.util.serialization.JsonReader;
import io.anuke.arc.util.serialization.JsonValue; import io.anuke.arc.util.serialization.JsonValue;
import io.anuke.mindustry.net.Net;
import static io.anuke.mindustry.Vars.releasesURL; import static io.anuke.mindustry.Vars.releasesURL;
public class Changelogs{ public class Changelogs{
public static void getChangelog(Consumer<Array<VersionInfo>> success, Consumer<Throwable> fail){ public static void getChangelog(Consumer<Array<VersionInfo>> success, Consumer<Throwable> fail){
Net.http(releasesURL, "GET", result -> { Core.net.httpGet(releasesURL, result -> {
JsonReader reader = new JsonReader(); JsonReader reader = new JsonReader();
JsonValue value = reader.parse(result).child; JsonValue value = reader.parse(result.getResultAsString()).child;
Array<VersionInfo> out = new Array<>(); Array<VersionInfo> out = new Array<>();
while(value != null){ while(value != null){

27
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -1,11 +1,9 @@
package io.anuke.mindustry.net; package io.anuke.mindustry.net;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.Net.*;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.arc.function.BiConsumer; import io.anuke.arc.function.BiConsumer;
import io.anuke.arc.function.Consumer; import io.anuke.arc.function.Consumer;
import io.anuke.arc.net.HttpRequestBuilder;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools; import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
@@ -333,31 +331,6 @@ public class Net{
active = false; active = false;
} }
public static void http(String url, String method, Consumer<String> listener, Consumer<Throwable> failure){
http(url, method, null, listener, failure);
}
public static void http(String url, String method, String body, Consumer<String> listener, Consumer<Throwable> failure){
HttpRequest req = new HttpRequestBuilder().newRequest()
.method(method).url(url).content(body).build();
Core.net.sendHttpRequest(req, new HttpResponseListener(){
@Override
public void handleHttpResponse(HttpResponse httpResponse){
listener.accept(httpResponse.getResultAsString());
}
@Override
public void failed(Throwable t){
failure.accept(t);
}
@Override
public void cancelled(){
}
});
}
public enum SendMode{ public enum SendMode{
tcp, udp tcp, udp
} }