Merge remote-tracking branch 'origin/master'

core/src/mindustry/ai/types/MinerAI.java

@@ -25,7 +25,7 @@ public class MinerAI extends AIController{
 
         if(mining){
             if(timer.get(timerTarget2, 60 * 4) || targetItem == null){
-                targetItem = unit.team.data().mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i));
+                targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i));
             }
 
             //core full of the target item, do nothing
@@ -75,4 +75,4 @@ public class MinerAI extends AIController{
             circle(core, unit.type.range / 1.8f);
         }
     }
-}
+}

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

@@ -61,6 +61,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     transient boolean updateFlow;
     transient byte cdump;
     transient int rotation;
+    transient float payloadRotation;
     transient boolean enabled = true;
     transient float enabledControlTime;
     transient String lastAccessed;

core/src/mindustry/game/Teams.java

@@ -234,8 +234,6 @@ public class Teams{
         public Queue<BlockPlan> blocks = new Queue<>();
         /** The current command for units to follow. */
         public UnitCommand command = UnitCommand.attack;
-        /** Target items to mine. */
-        public Seq<Item> mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium);
 
         /** Quadtree for all buildings of this team. Null if not active. */
         @Nullable
@@ -370,4 +368,4 @@ public class Teams{
             '}';
         }
     }
-}
+}

core/src/mindustry/type/UnitType.java

@@ -88,6 +88,8 @@ public class UnitType extends UnlockableContent{
     public BlockFlag[] targetFlags = {null};
     /** targetFlags, as an override for "non-AI" teams. By default, units of this type will rush the core. */
     public BlockFlag[] playerTargetFlags = {BlockFlag.core, null};
+    /** Target items to mine. Used in MinerAI */
+    public Seq<Item> mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium);
 
     public Color outlineColor = Pal.darkerMetal;
     public int outlineRadius = 3;
@@ -965,4 +967,4 @@ public class UnitType extends UnlockableContent{
 
     //endregion
 
-}
+}

core/src/mindustry/world/Block.java

@@ -86,7 +86,7 @@ public class Block extends UnlockableContent{
     public boolean solid;
     /** whether this block CAN be solid. */
     public boolean solidifes;
-    /** whether this is rotateable */
+    /** whether this is rotatable */
     public boolean rotate;
     /** number of different variant regions to use */
     public int variants = 0;

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -153,6 +153,11 @@ public class StackConveyor extends Block implements Autotiler{
             Draw.z(Layer.block - 0.15f);
             super.drawCracks();
         }
+        
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon, x, y);
+        }
 
         @Override
         public void onProximityUpdate(){

core/src/mindustry/world/blocks/payloads/BuildPayload.java

@@ -80,6 +80,7 @@ public class BuildPayload implements Payload{
     @Override
     public void set(float x, float y, float rotation){
         build.set(x, y);
+        build.payloadRotation = rotation;
     }
 
     @Override

servers_v6.json

@@ -7,10 +7,6 @@
     "name": "RCM",
     "address": ["185.104.248.61", "easyplay.su"]
   },
-  {
-    "name": "SkaarjDustry",
-    "address": ["skaarjproject.duckdns.org"]
-  },
   {
     "name": "{AA}",
     "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"]

servers_v7.json

@@ -1,8 +1,4 @@
 [
-  {
-    "name": "Mindustry Central",
-    "address": ["n2.mindustry.me:4019", "mindustry.me:2034", "mindustry.me:2035"]
-  },
   {
     "name": "mindustry.pl",
     "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"]
@@ -27,6 +23,10 @@
     "name": "DarkDustry",
     "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] 
   },
+  {
+    "name": "SkaarjDustry",
+    "address": ["skaarjproject.duckdns.org"]
+  },
   {
     "name": "Chaotic Neutral",
     "address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"]
@@ -55,10 +55,6 @@
     "name": "Shiza Minigames",
     "address": ["shizashizashiza.ml"]
   },
-  { 
-    "name": "devass.su",
-    "address": ["185.22.152.66"]
-  },
   {
     "name": "Phoenix Network",
     "address": ["172.104.253.198"]