Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Anuken
2020-02-03 20:24:49 -05:00
parent 88d2ec5be8
commit a942ed2cad
141 changed files with 2213 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/input/InputHandler.java
View File

@@ -132,7 +132,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemTransfer.create(item,
player.x + Angles.trnsx(player.rotation + 180f, backTrns), player.y + Angles.trnsy(player.rotation + 180f, backTrns),
new Vec2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
if(tile.block() != block || tile.entity == null || tile.entity.items == null) return;
if(tile.block() != block || tile.entity == null || tile.entity.getItems() == null) return;
tile.block().handleStack(item, removed, tile, player);
remaining[1] -= removed;
@@ -595,7 +595,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(tile.interactable(player.getTeam()) && tile.block().consumesTap){
consumed = true;
}else if(tile.interactable(player.getTeam()) && tile.block().synthetic() && !consumed){
if(tile.block().hasItems && tile.entity.items.total() > 0){
if(tile.block().hasItems && tile.entity.getItems().total() > 0){
frag.inv.showFor(tile);
consumed = true;
showedInventory = true;

11
core/src/mindustry/input/MobileInput.java
View File

@@ -16,11 +16,10 @@ import mindustry.*;
import mindustry.content.*;
import mindustry.core.GameState.*;
import mindustry.entities.*;
import mindustry.entities.type.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
import mindustry.world.*;
@@ -45,7 +44,7 @@ public class MobileInput extends InputHandler implements GestureListener{
private float lineScale;
/** Animation data for crosshair. */
private float crosshairScale;
private TargetTrait lastTarget;
private Teamc lastTarget;
/** Used for shifting build requests. */
private float shiftDeltaX, shiftDeltaY;
@@ -77,7 +76,7 @@ public class MobileInput extends InputHandler implements GestureListener{
Tile tile = world.ltileWorld(x, y);
if(tile != null && tile.synthetic() && player.getTeam().isEnemy(tile.getTeam())){
TileEntity entity = tile.entity;
Tilec entity = tile.entity;
player.setMineTile(null);
player.target = entity;
}else if(tile != null && player.mech.canHeal && tile.entity != null && tile.getTeam() == player.getTeam() && tile.entity.damaged()){
@@ -155,7 +154,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}
void removeRequest(BuildRequest request){
selectRequests.removeValue(request, true);
selectRequests.remove(request, true);
if(!request.breaking){
removals.add(request);
}
@@ -376,7 +375,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}
}
TargetTrait target = player.target;
Teamc target = player.target;
//draw targeting crosshair
if(target != null && !state.isEditor()){