From 4b6b1b43cdc8638e6c260533336f8efb17982e62 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 14 Apr 2018 13:49:42 -0400
Subject: [PATCH] Updated uCore

---
 build.gradle                                         |  2 +-
 core/assets/version.properties                       |  4 ++--
 .../anuke/mindustry/mapeditor/MapEditorDialog.java   | 12 ++++++------
 core/src/io/anuke/mindustry/mapeditor/MapView.java   |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index c3125d07ff..7e925de460 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = '5e20b05'
+        uCoreVersion = 'a6f9111'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets/version.properties b/core/assets/version.properties
index 51e65610fb..cedc38472a 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Thu Apr 12 17:32:28 EDT 2018
+#Sat Apr 14 13:49:06 EDT 2018
 version=release
-androidBuildCode=511
+androidBuildCode=512
 name=Mindustry
 code=3.5
 build=custom build
diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
index 79ce0e18f8..b4c5a2c58c 100644
--- a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
@@ -1,6 +1,5 @@
 package io.anuke.mindustry.mapeditor;
 
-import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -27,6 +26,7 @@ import io.anuke.ucore.scene.builders.table;
 import io.anuke.ucore.scene.ui.*;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.util.Bundles;
+import io.anuke.ucore.util.Input;
 import io.anuke.ucore.util.Log;
 import io.anuke.ucore.util.Strings;
 
@@ -340,20 +340,20 @@ public class MapEditorDialog extends Dialog{
 		}
 
 		//ctrl keys (undo, redo, save)
-		if(Inputs.keyDown(Keys.CONTROL_LEFT)){
-			if(Inputs.keyTap(Keys.Z)){
+		if(Inputs.keyDown(Input.CONTROL_LEFT)){
+			if(Inputs.keyTap(Input.Z)){
 				view.undo();
 			}
 
-			if(Inputs.keyTap(Keys.Y)){
+			if(Inputs.keyTap(Input.Y)){
 				view.redo();
 			}
 
-			if(Inputs.keyTap(Keys.S)){
+			if(Inputs.keyTap(Input.S)){
 				saveDialog.save();
 			}
 
-			if(Inputs.keyTap(Keys.G)){
+			if(Inputs.keyTap(Input.G)){
 				view.setGrid(!view.isGrid());
 			}
 		}
diff --git a/core/src/io/anuke/mindustry/mapeditor/MapView.java b/core/src/io/anuke/mindustry/mapeditor/MapView.java
index 60a13f2815..d60f2b14a4 100644
--- a/core/src/io/anuke/mindustry/mapeditor/MapView.java
+++ b/core/src/io/anuke/mindustry/mapeditor/MapView.java
@@ -1,6 +1,5 @@
 package io.anuke.mindustry.mapeditor;
 
-import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Colors;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -27,6 +26,7 @@ import io.anuke.ucore.scene.event.InputListener;
 import io.anuke.ucore.scene.event.Touchable;
 import io.anuke.ucore.scene.ui.TextField;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.util.Input;
 import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Tmp;
 
@@ -182,7 +182,7 @@ public class MapView extends Element implements GestureListener{
 		super.act(delta);
 
 		if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) &&
-				!Inputs.keyDown(Keys.CONTROL_LEFT)) {
+				!Inputs.keyDown(Input.CONTROL_LEFT)) {
 			float ax = Inputs.getAxis("move_x");
 			float ay = Inputs.getAxis("move_y");
 			offsetx -= ax * 15f / zoom;