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

Move update function up

Browse Source 
It felt wrong to put it down below.
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-16 18:17:00 +02:00
parent 7df44ec060
commit b9b8a4a2f7
1 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,51 @@ public class CraterConveyor extends Block implements Autotiler{
blendscly = bits[2];
}
@Override
public void updateTile(){
// reel in crater
if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed, 0f, 1f);
// sleep when idle
if(link == -1){
if(cooldown == 0f) sleep();
return;
}
// crater needs to be centered
if(cooldown > 0f) return;
if(blendbit2 == 6){
while(dump()) if(items.total() == 0) poofOut();
}
/* unload */ else /* transfer */
if(blendbit2 != 5 || (items.total() >= getMaximumAccepted(items.first()))){
if(front() != null
&& front().team() == team()
&& front().block() instanceof CraterConveyor){
CraterConveyorEntity e = (CraterConveyorEntity)tile.front();
// sleep if its occupied
if(e.link != -1){
sleep();
}else{
e.items.addAll(items);
e.link = tile.pos();
// ▲ new | old ▼
link = -1;
items.clear();
e.cooldown = cooldown = 1;
e.noSleep();
bump(this);
}
}
}
}
@Override
public void drawLayer(){
if(link == -1) return;
@ -234,49 +279,5 @@ public class CraterConveyor extends Block implements Autotiler{
link = read.i();
cooldown = read.f();
}
@Override
public void updateTile(){
// reel in crater
if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed, 0f, 1f);
// sleep when idle
if(link == -1){
if(cooldown == 0f) sleep();
return;
}
// crater needs to be centered
if(cooldown > 0f) return;
if(blendbit2 == 6){
while(dump()) if(items.total() == 0) poofOut();
}
/* unload */ else /* transfer */
if(blendbit2 != 5 || (items.total() >= getMaximumAccepted(items.first()))){
if(front() != null
&& front().team() == team()
&& front().block() instanceof CraterConveyor){
CraterConveyorEntity e = (CraterConveyorEntity)tile.front();
// sleep if its occupied
if(e.link != -1){
sleep();
}else{
e.items.addAll(items);
e.link = tile.pos();
// ▲ new | old ▼
link = -1;
items.clear();
e.cooldown = cooldown = 1;
e.noSleep();
bump(this);
}
}
}
}
}
}