mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 19:09:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Call bumps & upstreams from the objects themselves

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier 2020-04-16 19:01:27 +02:00
parent e66a1a92c3
commit a83546bc9d
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,7 @@ public class CraterConveyor extends Block implements Autotiler{
e.cooldown = cooldown = 1; e.cooldown = cooldown = 1;
e.noSleep(); e.noSleep();
bump(this); bump();
} }
} }
} }
@ -199,7 +199,7 @@ public class CraterConveyor extends Block implements Autotiler{
private void poofOut(){ private void poofOut(){
Fx.plasticburn.at(this); Fx.plasticburn.at(this);
link = -1; link = -1;
bump(this); bump();
} }
@Override @Override
@ -224,34 +224,34 @@ public class CraterConveyor extends Block implements Autotiler{
} }
// crater conveyor tiles that input into this one // crater conveyor tiles that input into this one
private void upstream(CraterConveyorEntity tile, Cons<CraterConveyorEntity> cons){ private void upstream(Cons<CraterConveyorEntity> cons){
if(tile.blendbit1 == 0 && !(back() instanceof CraterConveyorEntity)) return; if(blendbit1 == 0 && !(back() instanceof CraterConveyorEntity)) return;
if( tile.blendbit1 == 0 // 1 input from the back, 0 from the sides if( blendbit1 == 0 // 1 input from the back, 0 from the sides
|| tile.blendbit1 == 2 // 1 input from the back, 1 from the sides || blendbit1 == 2 // 1 input from the back, 1 from the sides
|| tile.blendbit1 == 3 // 1 input from the back, 2 from the sides || blendbit1 == 3 // 1 input from the back, 2 from the sides
) cons.get((CraterConveyorEntity)back()); ) cons.get((CraterConveyorEntity)back());
if( tile.blendbit1 == 3 // 1 input from the back, 2 from the sides if( blendbit1 == 3 // 1 input from the back, 2 from the sides
|| tile.blendbit1 == 4 // 0 input from the back, 2 from the sides || blendbit1 == 4 // 0 input from the back, 2 from the sides
||(tile.blendbit1 == 1 && tile.blendscly == -1) // side is open ||(blendbit1 == 1 && blendscly == -1) // side is open
||(tile.blendbit1 == 2 && tile.blendscly == +1) // side is open ||(blendbit1 == 2 && blendscly == +1) // side is open
) cons.get((CraterConveyorEntity)right()); ) cons.get((CraterConveyorEntity)right());
if( tile.blendbit1 == 3 // 1 input from the back, 2 from the sides if( blendbit1 == 3 // 1 input from the back, 2 from the sides
|| tile.blendbit1 == 4 // 0 input from the back, 2 from the sides || blendbit1 == 4 // 0 input from the back, 2 from the sides
||(tile.blendbit1 == 1 && tile.blendscly == +1) // side is open ||(blendbit1 == 1 && blendscly == +1) // side is open
||(tile.blendbit1 == 2 && tile.blendscly == -1) // side is open ||(blendbit1 == 2 && blendscly == -1) // side is open
) cons.get((CraterConveyorEntity)left()); ) cons.get((CraterConveyorEntity)left());
} }
// awaken inputting conveyors // awaken inputting conveyors
private void bump(CraterConveyorEntity tile){ private void bump(){
upstream(tile, t -> { upstream(t -> {
if(t == null || !t.sleeping || t.items().total() <= 0) return; if(t == null || !t.sleeping || t.items().total() <= 0) return;
t.noSleep(); t.noSleep();
bump(t); t.bump();
}); });
} }