Fix more bugs, add support for tablets

core/src/io/anuke/mindustry/input/AndroidInput.java

@@ -6,20 +6,25 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.input.GestureDetector;
 import com.badlogic.gdx.math.Vector2;
 
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState;
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.resource.ItemStack;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.types.Configurable;
 import io.anuke.ucore.core.Graphics;
 import io.anuke.ucore.core.Inputs;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.scene.utils.Cursors;
 import io.anuke.ucore.util.Mathf;
 
 public class AndroidInput extends InputHandler{
 	public float lmousex, lmousey;
 	public float mousex, mousey;
 	public boolean brokeBlock = false;
+	
+	private boolean enableHold = false;
 	private boolean placing = false;
 	private float warmup;
 	private float warmupDelay = 20;
@@ -115,7 +120,7 @@ public class AndroidInput extends InputHandler{
 	@Override
 	public void update(){
 
-		if(player.recipe != null && Gdx.input.isTouched(0) && Mathf.near2d(lmousex, lmousey, Gdx.input.getX(0), Gdx.input.getY(0), Unit.dp.inPixels(50))
+		if(enableHold && player.recipe != null && Gdx.input.isTouched(0) && Mathf.near2d(lmousex, lmousey, Gdx.input.getX(0), Gdx.input.getY(0), Unit.dp.inPixels(50))
 				&& !ui.hasMouse()){
 			warmup += Timers.delta();
 
@@ -148,13 +153,22 @@ public class AndroidInput extends InputHandler{
 			mousey = Mathf.clamp(mousey, 0, Gdx.graphics.getHeight());
 		}
 	}
-
-	public int touches(){
-		int sum = 0;
-		for(int i = 0; i < 10; i++){
-			if(Gdx.input.isTouched(i))
-				sum++;
+	
+	@Override
+	public void tryPlaceBlock(int x, int y, boolean sound){
+		if(player.recipe != null && 
+				validPlace(x, y, player.recipe.result) && cursorNear() &&
+				Vars.control.hasItems(player.recipe.requirements)){
+			
+			placeBlock(x, y, player.recipe.result, player.rotation, true, sound);
+			
+			for(ItemStack stack : player.recipe.requirements){
+				Vars.control.removeItem(stack);
+			}
+			
+			if(!Vars.control.hasItems(player.recipe.requirements)){
+				Cursors.restoreCursor();
+			}
 		}
-		return sum;
 	}
 }

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -66,10 +66,12 @@ public abstract class InputHandler extends InputAdapter{
 		}
 	}
 	
-	public void tryDeleteBlock(int x, int y, boolean sound){
+	public boolean tryDeleteBlock(int x, int y, boolean sound){
 		if(cursorNear() && validBreak(x, y)){
 			breakBlock(x, y, sound);
+			return true;
 		}
+		return false;
 	}
 	
 	public boolean round2(){
@@ -225,7 +227,7 @@ public abstract class InputHandler extends InputAdapter{
 		}
 		
 		//Effects.shake(3f, 1f, player);
-		if(sound)Sounds.play("break");
+		if(sound) Sounds.play("break");
 		
 		if(!tile.block().isMultiblock() && !tile.isLinked()){
 			tile.setBlock(Blocks.air);

core/src/io/anuke/mindustry/input/PlaceMode.java

@@ -183,8 +183,9 @@ public enum PlaceMode{
 			
 			for(int cx = tilex; cx <= endx; cx ++){
 				for(int cy = tiley; cy <= endy; cy ++){
-					control.getInput().tryDeleteBlock(cx, cy, first);
-					first = false;
+					if(control.getInput().tryDeleteBlock(cx, cy, first)){
+						first = false;
+					}
 				}
 			}
 		}