diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java index b533f26c56..f9a83c80fd 100644 --- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java @@ -34,5 +34,10 @@ public abstract class BaseProcessor extends AbstractProcessor{ return true; } + @Override + public SourceVersion getSupportedSourceVersion(){ + return SourceVersion.RELEASE_8; + } + public abstract void process(RoundEnvironment env) throws Exception; } diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java index 72f5c45727..62fcd9fbc2 100644 --- a/core/src/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -54,8 +54,9 @@ public class Fonts{ Core.assets.load("default", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> Fonts.def = (BitmapFont)f; Core.assets.load("chat", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> Fonts.chat = (BitmapFont)f; Core.assets.load("icon", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{ - size = (int)(Scl.scl(30f)); + size = 30; incremental = true; + characters = "\0"; }})).loaded = f -> Fonts.icon = (BitmapFont)f; } @@ -104,12 +105,19 @@ public class Fonts{ FileHandleResolver resolver = new InternalFileHandleResolver(); Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver)); Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){ + ObjectSet scaled = new ObjectSet<>(); + @Override public BitmapFont loadSync(AssetManager manager, String fileName, Fi file, FreeTypeFontLoaderParameter parameter){ if(fileName.equals("outline")){ parameter.fontParameters.borderWidth = Scl.scl(2f); parameter.fontParameters.spaceX -= parameter.fontParameters.borderWidth; } + if(!scaled.contains(parameter.fontParameters)){ + parameter.fontParameters.size = (int)(Scl.scl(parameter.fontParameters.size)); + scaled.add(parameter.fontParameters); + } + parameter.fontParameters.magFilter = TextureFilter.Linear; parameter.fontParameters.minFilter = TextureFilter.Linear; parameter.fontParameters.packer = UI.packer; @@ -119,8 +127,8 @@ public class Fonts{ FreeTypeFontParameter param = new FreeTypeFontParameter(){{ borderColor = Color.darkGray; - size = (int)(Scl.scl(18f)); incremental = true; + size = 18; }}; Core.assets.load("outline", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/font.ttf", param)).loaded = t -> Fonts.outline = (BitmapFont)t; @@ -198,7 +206,7 @@ public class Fonts{ static FreeTypeFontParameter fontParameter(){ return new FreeTypeFontParameter(){{ - size = (int)(Scl.scl(18f)); + size = 18; shadowColor = Color.darkGray; shadowOffsetY = 2; incremental = true; diff --git a/gradle.properties b/gradle.properties index b74ceb8844..c3930b0bc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=e287fdce0449a87fb15599c67b5167ac0273bcb6 +archash=460d616ccc09942f462108337d0e6bf2bed8ded8