Cleanup

core/src/mindustry/core/NetClient.java

@@ -607,7 +607,7 @@ public class NetClient implements ApplicationListener{
             unit.rotation,
             unit instanceof Mechc m ? m.baseRotation() : 0,
             unit.vel.x, unit.vel.y,
-            player.miner().mineTile(),
+            player.unit().mineTile(),
             player.boosting, player.shooting, ui.chatfrag.shown(), control.input.isBuilding,
             requests,
             Core.camera.position.x, Core.camera.position.y,

core/src/mindustry/core/NetServer.java

@@ -630,9 +630,7 @@ public class NetServer implements ApplicationListener{
             }
         }
 
-        if(player.isMiner()){
+        player.unit().mineTile = mining;
-            player.miner().mineTile(mining);
-        }
 
         con.rejectedRequests.clear();
 

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

@@ -51,10 +51,6 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit instanceof Builderc;
     }
 
-    public boolean isMiner(){
-        return unit instanceof Minerc;
-    }
-
     public @Nullable CoreBuild closestCore(){
         return state.teams.closestCore(x, y, team);
     }
@@ -164,10 +160,6 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit;
     }
 
-    public Minerc miner(){
-        return !(unit instanceof Minerc) ? Nulls.miner : (Minerc)unit;
-    }
-
     public Builderc builder(){
         return !(unit instanceof Builderc) ? Nulls.builder : (Builderc)unit;
     }

core/src/mindustry/input/DesktopInput.java

@@ -383,8 +383,8 @@ public class DesktopInput extends InputHandler{
             schematicY += shiftY;
         }
 
-        if(Core.input.keyTap(Binding.deselect)){
+        if(Core.input.keyTap(Binding.deselect) && !isPlacing()){
-            player.miner().mineTile(null);
+            player.unit().mineTile = null;
         }
 
         if(Core.input.keyTap(Binding.clear_building)){
@@ -481,7 +481,7 @@ public class DesktopInput extends InputHandler{
             }else if(selected != null){
                 //only begin shooting if there's no cursor event
                 if(!tileTapped(selected.build) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && !player.builder().activelyBuilding() && !droppingItem &&
-                    !tryBeginMine(selected) && player.miner().mineTile() == null && !Core.scene.hasKeyboard()){
+                    !tryBeginMine(selected) && player.unit().mineTile() == null && !Core.scene.hasKeyboard()){
                     player.shooting = shouldShoot;
                 }
             }else if(!Core.scene.hasKeyboard()){ //if it's out of bounds, shooting is just fine

core/src/mindustry/input/InputHandler.java

@@ -925,7 +925,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     boolean tryBeginMine(Tile tile){
         if(canMine(tile)){
             //if a block is clicked twice, reset it
-            player.miner().mineTile(player.miner().mineTile() == tile ? null : tile);
+            player.unit().mineTile = player.unit().mineTile == tile ? null : tile;
             return true;
         }
         return false;
@@ -934,7 +934,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     boolean canMine(Tile tile){
         return !Core.scene.hasMouse()
             && tile.drop() != null
-            && player.miner().validMine(tile)
+            && player.unit().validMine(tile)
             && !(tile.floor().playerUnmineable && tile.overlay().itemDrop == null)
             && player.unit().acceptsItem(tile.drop())
             && tile.block() == Blocks.air;

core/src/mindustry/input/MobileInput.java

@@ -914,7 +914,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         }
 
         //update shooting if not building + not mining
-        if(!player.builder().isBuilding() && player.miner().mineTile() == null){
+        if(!player.builder().isBuilding() && player.unit().mineTile() == null){
 
             //autofire targeting
             if(manualShooting){

core/src/mindustry/type/UnitType.java

@@ -374,7 +374,7 @@ public class UnitType extends UnlockableContent{
         if(stacks != null){
             ItemStack[] out = new ItemStack[stacks.length];
             for(int i = 0; i < out.length; i++){
-                out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.1) * 50)));
+                out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.11) * 50)));
             }
 
             return out;

server/src/mindustry/server/ServerControl.java

@@ -58,6 +58,10 @@ public class ServerControl implements ApplicationListener{
     private String suggested;
 
     public ServerControl(String[] args){
+        setup(args);
+    }
+
+    protected void setup(String[] args){
         Core.settings.defaults(
             "bans", "",
             "admins", "",
@@ -254,7 +258,7 @@ public class ServerControl implements ApplicationListener{
         info("Server loaded. Type @ for help.", "'help'");
     }
 
-    private void registerCommands(){
+    protected void registerCommands(){
         handler.register("help", "Displays this command list.", arg -> {
             info("Commands:");
             for(Command command : handler.getCommandList()){
@@ -273,6 +277,7 @@ public class ServerControl implements ApplicationListener{
             Core.app.exit();
         });
 
+
         handler.register("stop", "Stop hosting the server.", arg -> {
             net.closeServer();
             if(lastTask != null) lastTask.cancel();