Merge remote-tracking branch 'origin/master'

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

@@ -133,6 +133,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             case mineY -> mining() ? mineTile.y : -1;
             case flag -> flag;
             case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
+            case commanded -> controller instanceof FormationAI ? 1 : 0;
             case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;
             default -> 0;
         };

core/src/mindustry/graphics/Shaders.java

@@ -1,6 +1,7 @@
 package mindustry.graphics;
 
 import arc.*;
+import arc.files.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
@@ -225,11 +226,18 @@ public class Shaders{
         }
     }
 
-    public static class SurfaceShader extends LoadShader{
-
+    public static class SurfaceShader extends Shader{
         public SurfaceShader(String frag){
-            super(frag, "screenspace");
+            super(getShaderFi("screenspace.vert"), getShaderFi(frag + ".frag"));
+            loadNoise();
+        }
 
+        public SurfaceShader(String vertRaw, String fragRaw){
+            super(vertRaw, fragRaw);
+            loadNoise();
+        }
+
+        public void loadNoise(){
             Core.assets.load("sprites/noise.png", Texture.class).loaded = t -> {
                 ((Texture)t).setFilter(TextureFilter.linear);
                 ((Texture)t).setWrap(TextureWrap.repeat);
@@ -252,9 +260,12 @@ public class Shaders{
     }
 
     public static class LoadShader extends Shader{
-
         public LoadShader(String frag, String vert){
-            super(Core.files.internal("shaders/" + vert + ".vert"), Core.files.internal("shaders/" + frag + ".frag"));
+            super(getShaderFi(vert + ".vert"), getShaderFi(frag + ".frag"));
         }
     }
+
+    public static Fi getShaderFi(String file){
+        return Core.files.internal("shaders/" + file);
+    }
 }

core/src/mindustry/logic/LAccess.java

@@ -34,6 +34,7 @@ public enum LAccess{
     type,
     flag,
     controlled,
+    commanded,
     name,
     config,
     payloadCount,