From 2d504521b1da27707c2cd158915e56f513bbe31c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 7 Aug 2019 08:39:59 -0400 Subject: [PATCH] Bugfixes --- .../java/io/anuke/annotations/AssetsAnnotationProcessor.java | 2 +- core/src/io/anuke/mindustry/core/UI.java | 2 +- core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java index afc58ccedf..6c6b485dd8 100644 --- a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java +++ b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java @@ -40,7 +40,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{ try{ String path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no") - .toUri().toURL().toString().substring("file:".length())) + .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length())) .getParent().getParent().getParent().getParent().getParent().getParent().toString(); process("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound", "newSound"); diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 014ef53679..eb45f38fc1 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -131,7 +131,7 @@ public class UI implements ApplicationListener{ generator = new FreeTypeFontGenerator(Core.files.internal("fonts/font.ttf")); FreeTypeFontParameter param = new FreeTypeFontParameter(){{ - size = (int)(9 * 2 * Math.max(UnitScl.dp.scl(1f), 0.5f)); + size = (int)(UnitScl.dp.scl(18f)); shadowColor = Color.DARK_GRAY; shadowOffsetY = 2; incremental = true; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 0886920247..0ccd1c4811 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -73,7 +73,7 @@ public class MenuFragment extends Fragment{ String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : Version.modifier + " build " + Version.build); parent.fill((x, y, w, h) -> { - float logoscl = (int)UnitScl.dp.scl(1); + float logoscl = UnitScl.dp.scl(1); float logow = Math.min(logo.getWidth() * logoscl, Core.graphics.getWidth() - UnitScl.dp.scl(20)); float logoh = logow * (float)logo.getHeight() / logo.getWidth();