Sensor types

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

@@ -18,11 +18,13 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.audio.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
@@ -37,7 +39,7 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Buildingc.class}, isFinal = false, genio = false, serialize = false)
 @Component(base = true)
-abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable{
+abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable, Senseable{
     //region vars and initialization
     static final float timeToSleep = 60f * 1;
     static final ObjectSet<Building> tmpTiles = new ObjectSet<>();
@@ -1165,6 +1167,26 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    @Override
+    public double sense(LSensor sensor){
+        if(sensor == LSensor.health) return health;
+        if(sensor == LSensor.efficiency) return efficiency();
+        if(sensor == LSensor.totalItems && items != null) return items.total();
+        if(sensor == LSensor.totalLiquids && liquids != null) return liquids.total();
+        if(sensor == LSensor.totalPower && power != null) return power.status * (block.consumes.getPower().buffered ? block.consumes.getPower().capacity : 1f);
+        if(sensor == LSensor.powerNetIn && power != null) return power.graph.getPowerProduced();
+        if(sensor == LSensor.powerNetOut && power != null) return power.graph.getPowerNeeded();
+        if(sensor == LSensor.powerNetStored && power != null) return power.graph.getLastPowerStored();
+        return 0;
+    }
+
+    @Override
+    public double sense(Content content){
+        if(content instanceof Item && items != null) return items.get((Item)content);
+        if(content instanceof Liquid && liquids != null) return liquids.get((Liquid)content);
+        return 0;
+    }
+
     @Override
     public void remove(){
         if(sound != null){

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

@@ -9,12 +9,14 @@ import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
@@ -23,7 +25,7 @@ import mindustry.world.blocks.environment.*;
 import static mindustry.Vars.*;
 
 @Component(base = true)
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable, Senseable{
 
     @Import boolean hovering;
     @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health;
@@ -67,6 +69,19 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return type.region.getWidth() * 2f;
     }
 
+    @Override
+    public double sense(LSensor sensor){
+        if(sensor == LSensor.totalItems) return stack().amount;
+        if(sensor == LSensor.health) return health;
+        return 0;
+    }
+
+    @Override
+    public double sense(Content content){
+        if(content == stack().item) return stack().amount;
+        return 0;
+    }
+
     @Override
     public int itemCapacity(){
         return type.itemCapacity;