From 13619a14dca56376b2b3a3306a7eae3842f2380e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 16 Mar 2018 12:34:35 -0400
Subject: [PATCH] Added custom cursors

---
 build.gradle                                   |   2 +-
 core/assets/cursors/cursor.png                 | Bin 0 -> 201 bytes
 core/assets/cursors/hand.png                   | Bin 0 -> 276 bytes
 core/assets/cursors/ibar.png                   | Bin 0 -> 196 bytes
 core/assets/version.properties                 |   4 ++--
 core/src/io/anuke/mindustry/core/Renderer.java |   9 ++++++++-
 6 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 core/assets/cursors/cursor.png
 create mode 100644 core/assets/cursors/hand.png
 create mode 100644 core/assets/cursors/ibar.png

diff --git a/build.gradle b/build.gradle
index da94f43d1a..84899de744 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = '36de2b4'
+        uCoreVersion = '872bce6'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets/cursors/cursor.png b/core/assets/cursors/cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece5696be0d1e218aa873b9beae4a246992a06ae
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#5wn1RobmUt1NVVK8J;eVAr`0KPPFDbpupptd&Ro&zu|Ht;ZW8mhvWPO8b3c`
z*l#vd^30l;{D~J|#w=TLCCJn3zKtNOXGXaq!-Ox!90fDmW}I17YE#~F@As|BIx+SC
uoSK}U_WDdN+dMV@`Kh)TA<yq@^Vk-Zn$NIcE9(N<$>8bg=d#Wzp$PzbVnlEN

literal 0
HcmV?d00001

diff --git a/core/assets/cursors/hand.png b/core/assets/cursors/hand.png
new file mode 100644
index 0000000000000000000000000000000000000000..1613b1eac36d70e96811090ab8c89d42eb132b3a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#5wn1Rf@H3SPzg|Iv!{z=h{fr(!3TK{EAVUyym#gz=bwb>29C#Hvb+(Jo3|jl
zrCjwF=Lyv^t*O6QZ<O2dHE#`@!O1@PV|>#j<tZ}1=gn-KdDe#Ez@m-QWFGFkW8aat
z{&+d7-I9IN7<NuGUB#}<DL6CX@)5QF3|Gq9I`;2v;^*w(_?Bxsv*VV+NhSG7Iu@Q0
zIv*Hv0^NnuORw$v+VbI0Wcjv5PdI*Wi>qF6B5!VBQ?17@mA)?P%NKp(MAP?wmcHue
V+q5LABMj(#22WQ%mvv4FO#nUkXwCot

literal 0
HcmV?d00001

diff --git a/core/assets/cursors/ibar.png b/core/assets/cursors/ibar.png
new file mode 100644
index 0000000000000000000000000000000000000000..61ddc4b423ba2880c350fc5a0ce0d340a9c5d1d5
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#5wn1Rg3=x3-vL0OWKS2z5R21qgQB?(7;tbWr*HcHzi0ZXI<1o0HJ{6M6mBIs
z<*?TAC~!`iV8U{8;r|HEoz@H*i{{<m-J#?8HnwVxK*Ym4J72sGI`xk?tgQM|$O6^b
oH+7fSEu558XWO}?{7Lc-hF447uQ2Xd3$l*E)78&qol`;+03iBATL1t6

literal 0
HcmV?d00001

diff --git a/core/assets/version.properties b/core/assets/version.properties
index 2126758c6b..59622ba94d 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Fri Mar 16 00:38:49 EDT 2018
+#Fri Mar 16 12:34:23 EDT 2018
 version=release
-androidBuildCode=414
+androidBuildCode=421
 name=Mindustry
 code=3.4
 build=custom build
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 51c95ffcda..1faf54be0a 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -33,6 +33,7 @@ import io.anuke.ucore.function.Callable;
 import io.anuke.ucore.graphics.*;
 import io.anuke.ucore.modules.RendererModule;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.scene.utils.Cursors;
 import io.anuke.ucore.util.Angles;
 import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Tmp;
@@ -68,6 +69,12 @@ public class Renderer extends RendererModule{
 			}
 		});
 
+		Cursors.cursorScaling = 3;
+		Cursors.outlineColor = Color.valueOf("444444");
+		Cursors.arrow = Cursors.loadCursor("cursor");
+		Cursors.hand = Cursors.loadCursor("hand");
+		Cursors.ibeam = Cursors.loadCursor("ibar");
+
 		clearColor = Hue.lightness(0.4f);
 		clearColor.a = 1f;
 
@@ -427,7 +434,7 @@ public class Renderer extends RendererModule{
 			
 		}else if(input.breakMode.delete && control.input().drawPlace()
 				&& (input.recipe == null || !state.inventory.hasItems(input.recipe.requirements))
-				&& (input.placeMode.delete || input.breakMode.both)){
+				&& (input.placeMode.delete || input.breakMode.both || !android)){
 
             if(input.breakMode == PlaceMode.holdDelete)
                 input.breakMode.draw(tilex, tiley, 0, 0);