Bugfixes & cleanup

core/src/mindustry/Vars.java

@@ -68,8 +68,6 @@ public class Vars implements Loadable{
     public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?labels=bug&template=bug_report.md";
     /** list of built-in servers.*/
     public static final Seq<String> defaultServers = Seq.with();
-    /** whether multi-tile mining is enabled */
-    public static final boolean multimine = false;
     /** maximum distance between mine and core that supports automatic transferring */
     public static final float mineTransferRange = 220f;
     /** max chat message length */

core/src/mindustry/ai/BlockIndexer.java

@@ -314,25 +314,7 @@ public class BlockIndexer{
 
     /** Find the closest ore block relative to a position. */
     public Tile findClosestOre(Unit unit, Item item){
-        if(multimine) return findClosestOre(unit.x, unit.y, item);
-        if(!(unit instanceof Minerc miner)) return null;
-
-        TileArray arr = getOrePositions(item);
-
-        arr.tiles.sort(t -> t.dst2(unit.x, unit.y));
-
-        for(Tile tile : arr.tiles){
-            for(int x = Math.max(0, tile.x - quadrantSize / 2); x < tile.x + quadrantSize / 2 && x < world.width(); x++){
-                for(int y = Math.max(0, tile.y - quadrantSize / 2); y < tile.y + quadrantSize / 2 && y < world.height(); y++){
-                    Tile res = world.tile(x, y);
-                    if(res.drop() == item && miner.validMine(res, false)){
-                        return res;
-                    }
-                }
-            }
-        }
-
-        return null;
+        return findClosestOre(unit.x, unit.y, item);
     }
 
     /** @return extra unit cap of a team. This is added onto the base value. */

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

@@ -11,8 +11,6 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
-import static mindustry.Vars.*;
-
 public class FormationAI extends AIController implements FormationMember{
     private static Seq<Tile> tiles = new Seq<>();
     public Unit leader;
@@ -67,22 +65,8 @@ public class FormationAI extends AIController implements FormationMember{
         }
 
         if(unit instanceof Minerc mine && leader instanceof Minerc com){
-            if(com.mineTile() != null){
-                if(multimine){
-                    mine.mineTile(mine.validMine(com.mineTile()) ? com.mineTile() : null);
-                }else{
-                    if(mine.mineTile() == null){
-                        tiles.clear();
-                        com.mineTile().circle(6, (cx, cy) -> {
-                            Tile tile = world.tile(cx, cy);
-                            if(mine.validMine(tile) && tile.drop() == com.mineTile().drop() && tile != com.mineTile()){
-                                tiles.add(tile);
-                            }
-                        });
-                        Tile min = tiles.min(t -> t.dst2(com.mineTile()));
-                        mine.mineTile(min);
-                    }
-                }
+            if(com.mineTile() != null && mine.validMine(com.mineTile())){
+                mine.mineTile(com.mineTile());
 
                 CoreBuild core = unit.team.core();
 

core/src/mindustry/content/UnitTypes.java

@@ -1127,17 +1127,17 @@ public class UnitTypes implements ContentList{
             flying = true;
             drag = 0.06f;
             accel = 0.12f;
-            speed = 2f;
+            speed = 1.5f;
             health = 100;
             engineSize = 1.8f;
             engineOffset = 5.7f;
-            range = 56f;
+            range = 50f;
             isCounted = false;
 
             ammoType = AmmoTypes.powerLow;
 
             mineTier = 1;
-            mineSpeed = 3f;
+            mineSpeed = 2.5f;
         }};
 
         poly = new UnitType("poly"){{

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

@@ -37,7 +37,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
 
     public boolean validMine(Tile tile, boolean checkDst){
         return !(tile == null || tile.block() != Blocks.air || (!within(tile.worldx(), tile.worldy(), miningRange) && checkDst)
-        || tile.drop() == null || !canMine(tile.drop())) && state.teams.isValidMine(self(), tile);
+        || tile.drop() == null || !canMine(tile.drop()));
     }
 
     public boolean validMine(Tile tile){
@@ -62,7 +62,6 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
             mineTile = null;
             mineTimer = 0f;
         }else if(mining()){
-            state.teams.registerMined(mineTile, self());
             Item item = mineTile.drop();
             lookAt(angleTo(mineTile.worldx(), mineTile.worldy()));
             mineTimer += Time.delta *type.mineSpeed;
@@ -105,7 +104,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
         float ex = mineTile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag);
         float ey = mineTile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag);
 
-        Draw.z(multimine ? Layer.flyingUnit + 0.1f : Layer.flyingUnitLow - 0.1f);
+        Draw.z(Layer.flyingUnit + 0.1f);
 
         Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl));
 

core/src/mindustry/game/Teams.java

@@ -11,7 +11,6 @@ import mindustry.content.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
@@ -27,8 +26,6 @@ public class Teams{
     public Seq<TeamData> active = new Seq<>();
     /** Teams with block or unit presence. */
     public Seq<TeamData> present = new Seq<>(TeamData.class);
-    /** Ores currently being mined. */
-    private IntMap<Unit> mined = new IntMap<>();
 
     public Teams(){
         active.add(get(Team.crux));
@@ -145,21 +142,7 @@ public class Teams{
         }
     }
 
-    /** @return whether this ore is not taken. */
-    public boolean isValidMine(Unit unit, Tile tile){
-        if(multimine) return true;
-        if(tile == null) return false;
-        Unit u = mined.get(tile.pos());
-        return u == unit || u == null;
-    }
-
-    public void registerMined(Tile tile, Unit unit){
-        if(tile == null || unit == null || multimine) return;
-        mined.put(tile.pos(), unit);
-    }
-
     public void updateTeamStats(){
-        mined.clear();
         present.clear();
 
         for(Team team : Team.all){

core/src/mindustry/world/meta/BuildVisibility.java

@@ -7,10 +7,10 @@ public enum BuildVisibility{
     hidden(() -> false),
     shown(() -> true),
     debugOnly(() -> false),
-    sandboxOnly(() -> Vars.state.rules.infiniteResources),
-    campaignOnly(() -> Vars.state.isCampaign()),
-    lightingOnly(() -> Vars.state.rules.lighting || Vars.state.isCampaign()),
-    ammoOnly(() -> Vars.state.rules.unitAmmo);
+    sandboxOnly(() -> Vars.state == null || Vars.state.rules.infiniteResources),
+    campaignOnly(() -> Vars.state == null || Vars.state.isCampaign()),
+    lightingOnly(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
+    ammoOnly(() -> Vars.state == null || Vars.state.rules.unitAmmo);
 
     private final Boolp visible;