Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-05-17 08:58:39 -04:00

View File

@@ -9,6 +9,7 @@ import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
@@ -66,6 +67,20 @@ public class Drill extends Block{
idleSoundVolume = 0.003f;
}
@Override
public void drawRequestConfigTop(BuildRequest req, Eachable<BuildRequest> list){
if(!req.worldContext) return;
Tile tile = req.tile();
if(tile == null) return;
countOre(req.tile());
if(returnItem == null) return;
Draw.color(returnItem.color);
Draw.rect("drill-top", req.drawx(), req.drawy());
Draw.color();
}
@Override
public void setBars(){
super.setBars();
@@ -302,7 +317,7 @@ public class Drill extends Block{
if(dominantItem != null && drawMineItem){
Draw.color(dominantItem.color);
Draw.rect("drill-top", x, y, 1f);
Draw.rect("drill-top", x, y);
Draw.color();
}
}