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!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8
z1_lQ95>H=O_D9SD0&>RR!w%eMU|`7bba4!^IQ@2_HQxaR9_QRE)`kBKmm3L(vOYN+
z=P%Is`4Pi@vzd}-*2Lsby!bL^*@`Pco?iED1X(>Z$`u(Vd@<%InAtYt%&JnG@|JtQ
zZ&lWbssHEH<ovYPXL8x*srk=OwZ#Z|erKD<wy4y6h6P($7Xt$WgQu&X%Q~loCIEV3
BL~sBA

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!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8
z1_lQ95>H=O_D9SD0t%A38bT!u3=Eq+T^vI!POl9<$a`3UXG`F{GZ#7kBuqDOJpPj9
zjgZ{D1=%g-s=qi-sFrC>{l$8t+>Wn#YuF4<_Q@aPn<gnwk@-DuX5-AWHVg+AZJZ|a
zaOWNSj=c59%USJ~?3>20bDHTYc4bb%nF*JVsQqWSQr6b7e{T~%X9vf(T-%u)w-in)
z$xqU;@Ql#;z>pK@E|gw+ZP(Y94~HVlw=H_Y@q1fb^@0<5a|4@dJ$|Y5by;7&=o2TJ
czW=lIRX^XRB~cw=3=9kmp00i_>zopr06q9<&Hw-a

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!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8
z1_lQ95>H=O_D9SD0t!lZlz#^>Ffb&0x;TbdoPHY=&2_+lgF88W)A#>9(@)iDmDH~J
zT&|;VE6FK`wT?%DbJ7G8mXizrM{w@6X3$tP@BZ!%9nZJ1RdWO)9^Tpc;&sref4pI3
u)t^EZsLsBryS#4Uq@+6A&L!nfl6Nq?TIzm<amQMabqt=aelF{r5}E)Y`b1j*

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);