Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Anuken
2021-03-09 19:04:29 -05:00
parent 8aba480148
commit b1e8001ae8
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ClientLauncher.java
+1 -1
View File
@@ -143,7 +143,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
if(assets.update(1000 / loadingFPS)){ if(assets.update(1000 / loadingFPS)){
loader.dispose(); loader.dispose();
loader = null; 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){ for(ApplicationListener listener : modules){
listener.init(); listener.init();
} }
core/src/mindustry/core/Renderer.java
+1 -1
View File
@@ -325,7 +325,7 @@ public class Renderer implements ApplicationListener{
int w = world.width() * tilesize, h = world.height() * tilesize; int w = world.width() * tilesize, h = world.height() * tilesize;
int memory = w * h * 4 / 1024 / 1024; int memory = w * h * 4 / 1024 / 1024;
if(memory >= 65){ if(memory >= (mobile ? 65 : 120)){
ui.showInfo("@screenshot.invalid"); ui.showInfo("@screenshot.invalid");
return; return;
} }
core/src/mindustry/graphics/MenuRenderer.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class MenuRenderer implements Disposable{
Time.mark(); Time.mark();
generate(); generate();
cache(); cache();
Log.info("Time to generate menu: @", Time.elapsed()); Log.debug("Time to generate menu: @", Time.elapsed());
} }
private void generate(){ private void generate(){
core/src/mindustry/ui/fragments/PlacementFragment.java
+1 -2
View File
@@ -21,7 +21,6 @@ import mindustry.input.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.ConstructBlock.*; import mindustry.world.blocks.ConstructBlock.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -329,7 +328,7 @@ public class PlacementFragment extends Fragment{
int amount = core.items.get(stack.item); int amount = core.items.get(stack.item);
int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier); 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; return color + UI.formatAmount(amount) + "[white]/" + stackamount;
}).padLeft(5); }).padLeft(5);