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

readability and redundant (#2129)

Browse Source
This commit is contained in:
zethnest
2020-06-01 10:56:23 +08:00
committed by GitHub
parent d984862c69
commit b6c0e92c2c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,8 @@ public class MobileInput extends InputHandler implements GestureListener{
Boolp schem = () -> lastSchematic != null && !selectRequests.isEmpty(); Boolp schem = () -> lastSchematic != null && !selectRequests.isEmpty();
group.fill(t -> { group.fill(t -> {
t.bottom().left().visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get()); t.visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
t.bottom().left();
t.button("$cancel", Icon.cancel, () -> { t.button("$cancel", Icon.cancel, () -> {
player.builder().clearBuilding(); player.builder().clearBuilding();
selectRequests.clear(); selectRequests.clear();
@@ -332,13 +333,11 @@ public class MobileInput extends InputHandler implements GestureListener{
if(mode == placing && block != null){ if(mode == placing && block != null){
//draw placing //draw placing
for(int i = 0; i < lineRequests.size; i++){ for(int i = 0; i < lineRequests.size; i++){
BuildRequest req = lineRequests.get(i);
if(i == lineRequests.size - 1 && req.block.rotate){
drawArrow(block, req.x, req.y, req.rotation);
}
BuildRequest request = lineRequests.get(i); BuildRequest request = lineRequests.get(i);
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(req.x, request.y, request.block.size, null) == null); if(i == lineRequests.size - 1 && request.block.rotate){
drawArrow(block, request.x, request.y, request.rotation);
}
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
drawSelected(request.x, request.y, request.block, Pal.accent); drawSelected(request.x, request.y, request.block, Pal.accent);
} }
}else if(mode == breaking){ }else if(mode == breaking){