From 72fb7b9df7527788ac68580df6a51dea068a548c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 10 Jun 2019 18:46:58 -0400
Subject: [PATCH] Net refactor

---
 .../anuke/mindustry/entities/type/Player.java |  2 +-
 .../src/io/anuke/mindustry/io/Changelogs.java |  6 ++---
 core/src/io/anuke/mindustry/net/Net.java      | 27 -------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java
index ad6b53f70c..4fafde48f2 100644
--- a/core/src/io/anuke/mindustry/entities/type/Player.java
+++ b/core/src/io/anuke/mindustry/entities/type/Player.java
@@ -429,7 +429,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
     public void drawBuildRequests(){
         BuildRequest last = null;
         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){
                 Block block = world.ltile(request.x, request.y).block();
diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java
index 33d888be47..10605e7550 100644
--- a/core/src/io/anuke/mindustry/io/Changelogs.java
+++ b/core/src/io/anuke/mindustry/io/Changelogs.java
@@ -1,19 +1,19 @@
 package io.anuke.mindustry.io;
 
+import io.anuke.arc.Core;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.function.Consumer;
 import io.anuke.arc.util.serialization.JsonReader;
 import io.anuke.arc.util.serialization.JsonValue;
-import io.anuke.mindustry.net.Net;
 
 import static io.anuke.mindustry.Vars.releasesURL;
 
 public class Changelogs{
 
     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();
-            JsonValue value = reader.parse(result).child;
+            JsonValue value = reader.parse(result.getResultAsString()).child;
             Array<VersionInfo> out = new Array<>();
 
             while(value != null){
diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java
index 58fa2716aa..eea9a3b82a 100644
--- a/core/src/io/anuke/mindustry/net/Net.java
+++ b/core/src/io/anuke/mindustry/net/Net.java
@@ -1,11 +1,9 @@
 package io.anuke.mindustry.net;
 
 import io.anuke.arc.Core;
-import io.anuke.arc.Net.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.function.BiConsumer;
 import io.anuke.arc.function.Consumer;
-import io.anuke.arc.net.HttpRequestBuilder;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.core.Platform;
@@ -333,31 +331,6 @@ public class Net{
         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{
         tcp, udp
     }