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

Prettify upsteam calculator

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-02-07 10:51:36 +01:00
parent 94dc220924
commit 9abb08152b
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -276,26 +276,29 @@ public class CraterConveyor extends Block implements Autotiler{
}
}
// ▲ | ▼ fixme: refactor
private void upstream(Tile tile, Cons<Tile> cons){
CraterConveyorEntity entity = tile.ent();
if(entity.blendbit1 == 0 || entity.blendbit1 == 2 || entity.blendbit1 == 3) cons.get(tile.back());
if( entity.blendbit1 == 0 // 1 input from the back, 0 from the sides
|| entity.blendbit1 == 2 // 1 input from the back, 1 from the sides
|| entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
) cons.get(tile.back());
// fixme: add x/y checks for bits 1 & 2
if(entity.blendbit1 == 2 && entity.blendscly == +1) cons.get(tile.right());
if(entity.blendbit1 == 2 && entity.blendscly == -1) cons.get(tile.left());
if( entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
|| entity.blendbit1 == 4 // 0 input from the back, 2 from the sides
||(entity.blendbit1 == 1 && entity.blendscly == -1) // side is open
||(entity.blendbit1 == 2 && entity.blendscly == +1) // side is open
) cons.get(tile.right());
if(entity.blendbit1 == 1 && entity.blendscly == -1) cons.get(tile.right());
if(entity.blendbit1 == 1 && entity.blendscly == +1) cons.get(tile.left());
if(entity.blendbit1 == 4 || entity.blendbit1 == 3){
cons.get(tile.right());
cons.get(tile.left());
}
if( entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
|| entity.blendbit1 == 4 // 0 input from the back, 2 from the sides
||(entity.blendbit1 == 1 && entity.blendscly == +1) // side is open
||(entity.blendbit1 == 2 && entity.blendscly == -1) // side is open
) cons.get(tile.left());
}
// ▲ | ▼ fixme: refactor
// awaken inputting conveyors
private void bump(Tile tile){
upstream(tile, t -> {