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

Undo the last 5

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-02-10 13:11:49 +01:00
parent 66c81246b6
commit ac3ab6971d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,6 @@ import static mindustry.Vars.*;
public class CraterConveyor extends Block implements Autotiler{ public class CraterConveyor extends Block implements Autotiler{
private TextureRegion[] regions = new TextureRegion[8]; private TextureRegion[] regions = new TextureRegion[8];
protected final Array<Tile> upstreamTiles = new Array<>();
public float speed = 0f; public float speed = 0f;
public CraterConveyor(String name){ public CraterConveyor(String name){
@@ -142,7 +140,7 @@ public class CraterConveyor extends Block implements Autotiler{
entity.blendbit2 = 0; entity.blendbit2 = 0;
if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) entity.blendbit2 = 5; // a 0 that faces into a crater conveyor with none behind it if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) entity.blendbit2 = 5; // a 0 that faces into a crater conveyor with none behind it
if(!upstream(tile, upstreamTiles).isEmpty() && !blends(tile, tile.rotation(), 0)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it if(bits[0] == 0 && !blends(tile, tile.rotation(), 0)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it
entity.blendbit1 = bits[0]; entity.blendbit1 = bits[0];
entity.blendsclx = bits[1]; entity.blendsclx = bits[1];
@@ -285,7 +283,7 @@ public class CraterConveyor extends Block implements Autotiler{
if( entity.blendbit1 == 0 // 1 input from the back, 0 from the sides 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 == 2 // 1 input from the back, 1 from the sides
|| entity.blendbit1 == 3 // 1 input from the back, 2 from the sides || entity.blendbit1 == 3 // 1 input from the back, 2 from the sides
) if(blends(tile, tile.rotation(), 2)) cons.get(tile.back()); ) cons.get(tile.back());
if( entity.blendbit1 == 3 // 1 input from the back, 2 from the sides 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 == 4 // 0 input from the back, 2 from the sides
@@ -300,12 +298,6 @@ public class CraterConveyor extends Block implements Autotiler{
) cons.get(tile.left()); ) cons.get(tile.left());
} }
private Array<Tile> upstream(Tile tile, Array<Tile> upstreamTiles){
upstreamTiles.clear();
upstream(tile, upstreamTiles::add);
return upstreamTiles;
}
// ▲ | ▼ fixme: refactor // ▲ | ▼ fixme: refactor
// awaken inputting conveyors // awaken inputting conveyors