Bugfixes

core/src/io/anuke/mindustry/core/Control.java

@@ -46,7 +46,7 @@ public class Control implements ApplicationListener{
         music = new MusicControl();
         data = new GlobalData();
 
-        Unit.dp.product = settings.getInt("uiscale", 100) / 100f;
+        Unit.dp.setProduct(settings.getInt("uiscale", 100) / 100f);
 
         Core.input.setCatch(KeyCode.BACK, true);
 

core/src/io/anuke/mindustry/editor/MapEditorDialog.java

@@ -1,40 +1,34 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.StringMap;
-import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.Pixmap;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.input.KeyCode;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.scene.actions.Actions;
-import io.anuke.arc.scene.event.Touchable;
-import io.anuke.arc.scene.style.TextureRegionDrawable;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.files.*;
+import io.anuke.arc.function.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.input.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.arc.scene.actions.*;
+import io.anuke.arc.scene.event.*;
+import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextButton.TextButtonStyle;
-import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.scene.ui.TextButton.*;
+import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.core.Platform;
+import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.io.JsonIO;
-import io.anuke.mindustry.io.MapIO;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.ui.dialogs.FileChooser;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Block.Icon;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.io.*;
+import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.ui.dialogs.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.Block.*;
 import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.storage.CoreBlock;
+import io.anuke.mindustry.world.blocks.storage.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -378,10 +372,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
     }
 
     public void build(){
-        float amount = 10f, baseSize = 60f;
-
-        float size = mobile ? (int)(Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
-        Math.min(Core.graphics.getHeight() / amount, baseSize);
+        float size = 60f;
 
         clearChildren();
         table(cont -> {

core/src/io/anuke/mindustry/world/Block.java

@@ -230,8 +230,8 @@ public class Block extends BlockStorage{
     public void drawPlace(int x, int y, int rotation, boolean valid){
     }
 
-    protected void drawPlaceText(String text, int x, int y, boolean valid){
-        if(renderer.pixelator.enabled()) return;
+    protected float drawPlaceText(String text, int x, int y, boolean valid){
+        if(renderer.pixelator.enabled()) return 0;
 
         Color color = valid ? Pal.accent : Pal.remove;
         BitmapFont font = Core.scene.skin.getFont("outline");
@@ -241,6 +241,8 @@ public class Block extends BlockStorage{
         font.getData().setScale(1f / 4f);
         layout.setText(font, text);
 
+        float width = layout.width;
+
         font.setColor(color);
         float dx = x * tilesize + offset(), dy = y * tilesize + offset() + size * tilesize / 2f + 3;
         font.draw(text, dx, dy + layout.height + 1, Align.center);
@@ -255,6 +257,7 @@ public class Block extends BlockStorage{
         font.getData().setScale(1f);
         Draw.reset();
         Pools.free(layout);
+        return width;
     }
 
     public void draw(Tile tile){

core/src/io/anuke/mindustry/world/blocks/production/Drill.java

@@ -136,9 +136,8 @@ public class Drill extends Block{
         countOre(tile);
 
         if(returnItem != null){
-            drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / (drillTime + hardnessDrillMultiplier * returnItem.hardness) * returnCount, 2), x, y, valid);
-
-            float dx = x * tilesize + offset() - 31f, dy = y * tilesize + offset() + size * tilesize / 2f + 5;
+            float width = drawPlaceText(Core.bundle.formatFloat("bar.drillspeed", 60f / (drillTime + hardnessDrillMultiplier * returnItem.hardness) * returnCount, 2), x, y, valid);
+            float dx = x * tilesize + offset() - width/2f - 4f, dy = y * tilesize + offset() + size * tilesize / 2f + 5;
             Draw.mixcol(Color.DARK_GRAY, 1f);
             Draw.rect(returnItem.icon(Item.Icon.large), dx, dy - 1);
             Draw.reset();

desktop-sdl/build.gradle

@@ -51,10 +51,10 @@ task dist(type: Jar, dependsOn: classes){
 }
 
 task ikZip(type: Zip){
-    def filename = "$appName-windows-${version}"
+    def filename = "$appName-${getTarget()}-${version}"
 
     from "build/libs/$filename"
-    archiveBaseName = "$appName-${getTarget()}"
+    archiveName = "$appName-${getTarget()}-${getVersionString()}.zip"
 }
 
 task ikdist{
@@ -62,7 +62,7 @@ task ikdist{
     finalizedBy ikZip
 
     doLast{
-        def filename = "$appName-windows-${version}"
+        def filename = "$appName-${getTarget()}-${version}"
         def folder = "build/libs/$filename"
         def baseArgs = System.properties['os.name'].toLowerCase().contains('windows') ? [] : ["mono"]
         def args = baseArgs + ["$IKVM_DIR/ikvmc.exe", "-target:winexe", "-static", "-out:build/libs/${filename}.exe", "build/libs/${filename}.jar"]

server/build.gradle

@@ -36,6 +36,8 @@ task dist(type: Jar){
     from{ configurations.compile.collect{ zipTree(it) } }
     from files(project.assetsDir)
     exclude("sprites/**")
+    exclude("music/**")
+    exclude("sounds/**")
     exclude("fonts/**")
     exclude("com/badlogic/gdx/**")
     exclude("bundles/**")