From b1e8001ae8055553f7aa7f3f71c683625293af94 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 9 Mar 2021 19:04:29 -0500 Subject: [PATCH] Minor cleanup --- core/src/mindustry/ClientLauncher.java | 2 +- core/src/mindustry/core/Renderer.java | 2 +- core/src/mindustry/graphics/MenuRenderer.java | 2 +- core/src/mindustry/ui/fragments/PlacementFragment.java | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index ef9352db76..f2ec9a1291 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -143,7 +143,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform if(assets.update(1000 / loadingFPS)){ loader.dispose(); loader = null; - Log.info("Total time to load: @", Time.timeSinceMillis(beginTime)); + Log.info("Total time to load: @ms", Time.timeSinceMillis(beginTime)); for(ApplicationListener listener : modules){ listener.init(); } diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 52f99b72d5..cdf6bfb7ed 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -325,7 +325,7 @@ public class Renderer implements ApplicationListener{ int w = world.width() * tilesize, h = world.height() * tilesize; int memory = w * h * 4 / 1024 / 1024; - if(memory >= 65){ + if(memory >= (mobile ? 65 : 120)){ ui.showInfo("@screenshot.invalid"); return; } diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index efa42cfc89..b44b6cc5e7 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -36,7 +36,7 @@ public class MenuRenderer implements Disposable{ Time.mark(); generate(); cache(); - Log.info("Time to generate menu: @", Time.elapsed()); + Log.debug("Time to generate menu: @", Time.elapsed()); } private void generate(){ diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 018b577954..9d6faa293e 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -21,7 +21,6 @@ import mindustry.input.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; -import mindustry.world.blocks.*; import mindustry.world.blocks.ConstructBlock.*; import static mindustry.Vars.*; @@ -329,7 +328,7 @@ public class PlacementFragment extends Fragment{ int amount = core.items.get(stack.item); int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier); - String color = (amount < stackamount / 2f ? "[red]" : amount < stackamount ? "[accent]" : "[white]"); + String color = (amount < stackamount / 2f ? "[scarlet]" : amount < stackamount ? "[accent]" : "[white]"); return color + UI.formatAmount(amount) + "[white]/" + stackamount; }).padLeft(5);