mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 00:49:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Eyecandyfi

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier 2020-03-06 10:14:52 +01:00
parent f50ee2ecf2
commit c5de6706e0
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,8 @@ package mindustry.world.blocks.distribution;
import arc.*;
import arc.func.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
@ -157,20 +155,27 @@ public class CraterConveyor extends Block implements Autotiler{
return;
}
// crater needs to be centered
if(entity.reload > 0f) return;
if(entity.blendbit2 == 6){ // unload
while(true){
if(!tryDump(tile)) break;
// unload
if(entity.blendbit2 == 6){
while(tryDump(tile)){
if(entity.items.total() == 0) poofOut(tile);
}
if(entity.items.total() == 0) poofOut(tile);
}else if(shouldLaunch(tile)){ // transfer
Tile destination = tile.front();
if(destination != null && destination.getTeam() == tile.getTeam() && destination.block() instanceof CraterConveyor){
}
else
// transfer
if(entity.blendbit2 != 5 || (entity.items.total() >= getMaximumAccepted(tile, entity.items.first()))){
if(tile.front() != null
&& tile.front().getTeam() == tile.getTeam()
&& tile.front().block() instanceof CraterConveyor){
// always let destination update first
destination.block().update(destination);
CraterConveyorEntity e = destination.ent();
tile.front().block().update(tile.front());
CraterConveyorEntity e = tile.front().ent();
// sleep if its occupied
if(e.from != Pos.invalid){
@ -216,8 +221,7 @@ public class CraterConveyor extends Block implements Autotiler{
@Override
public int removeStack(Tile tile, Item item, int amount){
try{
return super.removeStack(tile, item, amount);
try{return super.removeStack(tile, item, amount);
}finally{
if(tile.entity.items.total() == 0) poofOut(tile);
}
@ -285,8 +289,6 @@ public class CraterConveyor extends Block implements Autotiler{
) cons.get(tile.left());
}
// ▲ | ▼ fixme: refactor
// awaken inputting conveyors
private void bump(Tile tile){
upstream(tile, t -> {
@ -297,13 +299,6 @@ public class CraterConveyor extends Block implements Autotiler{
});
}
private boolean shouldLaunch(Tile tile){
CraterConveyorEntity entity = tile.ent();
// prevent(s) launch only when the crater is on a loading dock that still has room for items
return entity.blendbit2 != 5 || (entity.items.total() >= getMaximumAccepted(tile, entity.items.first()));
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
CraterConveyorEntity entity = tile.ent();