Hover unit display

core/src/mindustry/entities/Units.java

@@ -180,6 +180,25 @@ public class Units{
         return result;
     }
 
+    /** Returns the closest ally of this team. Filter by predicate.
+     * Unlike the closest() function, this only guarantees that unit hitboxes overlap the range. */
+    public static Unitc closestOverlap(Team team, float x, float y, float range, Boolf<Unitc> predicate){
+        result = null;
+        cdist = 0f;
+
+        nearby(team, x - range, y - range, range*2f, range*2f, e -> {
+            if(!predicate.get(e)) return;
+
+            float dist = e.dst2(x, y);
+            if(result == null || dist < cdist){
+                result = e;
+                cdist = dist;
+            }
+        });
+
+        return result;
+    }
+
     /** Iterates over all units in a rectangle. */
     public static void nearby(Team team, float x, float y, float width, float height, Cons<Unitc> cons){
         teamIndex.tree(team).intersect(height, x, y, width, cons);

core/src/mindustry/entities/comp/TileComp.java

@@ -9,6 +9,7 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.math.geom.QuadTree.*;
+import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
@@ -37,7 +38,7 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Tilec.class}, isFinal = false, genio = false, serialize = false)
 @Component
-abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTreeObject{
+abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTreeObject, Displayable{
     //region vars and initialization
     static final float timeToSleep = 60f * 1;
     static final ObjectSet<Tilec> tmpTiles = new ObjectSet<>();
@@ -910,7 +911,18 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
         return block.icon(Cicon.medium);
     }
 
+    @Override
     public void display(Table table){
+        //display the block stuff
+        //TODO duplicated code?
+        table.table(t -> {
+            t.left();
+            t.add(new Image(block.getDisplayIcon(tile))).size(8 * 4);
+            t.labelWrap(block.getDisplayName(tile)).left().width(190f).padLeft(5);
+        }).growX().left();
+
+        table.row();
+
         table.table(bars -> {
             bars.defaults().growX().height(18f).pad(4);
 
@@ -926,12 +938,13 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
 
             if(items != null){
                 table.row();
+                table.left();
                 table.table(l -> {
                     Bits current = new Bits();
-                    l.left();
 
                     Runnable rebuild = () -> {
                         l.clearChildren();
+                        l.left();
                         for(Item item : content.items()){
                             if(items.hasFlowItem(item)){
                                 l.image(item.icon(Cicon.small)).padRight(3f);
@@ -950,7 +963,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
                             }
                         }
                     });
-                });
+                }).left();
             }
 
             if(liquids != null){

core/src/mindustry/entities/comp/UnitComp.java

@@ -3,8 +3,9 @@ package mindustry.entities.comp;
 import arc.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.*;
+import arc.scene.ui.layout.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -13,13 +14,14 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
 @Component
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable{
 
     @Import float x, y, rotation, elevation, maxHealth, drag, armor;
 
@@ -187,6 +189,11 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         }
     }
 
+    @Override
+    public void display(Table table){
+        type.display(this, table);
+    }
+
     @Override
     public boolean isImmune(StatusEffect effect){
         return type.immunities.contains(effect);