Merge branch '6.0' into crater

core/assets/bundles/bundle.properties

@@ -643,7 +643,8 @@ setting.buildautopause.name = Auto-Pause Building
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
-setting.indicators.name = Enemy/Ally Indicators
+setting.playerindicators = Player Indicators
+setting.indicators.name = Enemy Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
 setting.touchscreen.name = Touchscreen Controls

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

@@ -990,6 +990,12 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
         return null;
     }
 
+    @Replace
+    @Override
+    public boolean isValid(){
+        return tile.entity == this && !dead();
+    }
+
     @Override
     public void remove(){
         if(sound != null){

core/src/mindustry/graphics/OverlayRenderer.java

@@ -35,7 +35,7 @@ public class OverlayRenderer{
 
     public void drawTop(){
 
-        if(Core.settings.getBool("indicators")){
+        if(Core.settings.getBool("playerindicators")){
             for(Playerc player : Groups.player){
                 if(Vars.player != player && Vars.player.team() == player.team()){
                     if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
@@ -49,7 +49,9 @@ public class OverlayRenderer{
                     }
                 }
             }
+        }
 
+        if(Core.settings.getBool("indicators")){
             Groups.unit.each(unit -> {
                 if(!unit.isLocal() && unit.team() != player.team() && !rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f).setCenter(Core.camera.position.x, Core.camera.position.y).contains(unit.x(), unit.y())){
                     Tmp.v1.set(unit.x(), unit.y()).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength);

core/src/mindustry/ui/dialogs/SchematicsDialog.java

@@ -313,7 +313,11 @@ public class SchematicsDialog extends FloatingDialog{
                 int i = 0;
                 for(ItemStack s : arr){
                     r.addImage(s.item.icon(Cicon.small)).left();
-                    r.add(s.amount + "").padLeft(2).left().color(Color.lightGray).padRight(4);
+                    r.label(() -> {
+                        Tilec core = player.closestCore();
+                        if(core == null || state.rules.infiniteResources || core.items().has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
+                        return (core.items().has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items().get(s.item), s.amount) + "[lightgray]/" + s.amount;
+                    }).padLeft(2).left().padRight(4);
 
                     if(++i % 4 == 0){
                         r.row();

core/src/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -326,6 +326,7 @@ public class SettingsMenuDialog extends SettingsDialog{
         if(!mobile){
             graphics.checkPref("blockselectkeys", true);
         }
+        graphics.checkPref("playerindicators", true);
         graphics.checkPref("indicators", true);
         graphics.checkPref("animatedwater", true);
         if(Shaders.shield != null){