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

Add spaces to operations

Browse Source
This commit is contained in:
summetdev
2020-10-27 21:13:36 +03:00
parent 41f79b995d
commit a4f54a890a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/graphics/LoadRenderer.java
View File

@@ -48,7 +48,7 @@ public class LoadRenderer implements Disposable{
new Bar("s_proc#", OS.cores / 16f, OS.cores < 4), new Bar("s_proc#", OS.cores / 16f, OS.cores < 4),
new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false), new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false),
new Bar("g_vtype", graphics.getGLVersion().type == Type.GLES ? 0.5f : 1f, graphics.getGLVersion().type == Type.GLES), new Bar("g_vtype", graphics.getGLVersion().type == Type.GLES ? 0.5f : 1f, graphics.getGLVersion().type == Type.GLES),
new Bar("s_mem#", () -> true, () -> Core.app.getJavaHeap() / 1024f / 1024f / 200f, () -> Core.app.getJavaHeap() > 1024*1024*110), new Bar("s_mem#", () -> true, () -> Core.app.getJavaHeap() / 1024f / 1024f / 200f, () -> Core.app.getJavaHeap() > 1024 * 1024 * 110),
new Bar("v_ver#", () -> Version.build != 0, () -> Version.build == -1 ? 0.3f : (Version.build - 103f) / 10f, () -> !Version.modifier.equals("release")), new Bar("v_ver#", () -> Version.build != 0, () -> Version.build == -1 ? 0.3f : (Version.build - 103f) / 10f, () -> !Version.modifier.equals("release")),
new Bar("s_osv", OS.isWindows ? 0.35f : OS.isLinux ? 0.9f : OS.isMac ? 0.5f : 0.2f, OS.isMac), new Bar("s_osv", OS.isWindows ? 0.35f : OS.isLinux ? 0.9f : OS.isMac ? 0.5f : 0.2f, OS.isMac),
new Bar("v_worlds#", () -> Vars.control != null && Vars.control.saves != null, () -> Vars.control.saves.getSaveSlots().size / 30f, () -> Vars.control.saves.getSaveSlots().size > 30), new Bar("v_worlds#", () -> Vars.control != null && Vars.control.saves != null, () -> Vars.control.saves.getSaveSlots().size / 30f, () -> Vars.control.saves.getSaveSlots().size > 30),

2
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -57,7 +57,7 @@ public class DatabaseDialog extends BaseDialog{
UnlockableContent unlock = (UnlockableContent)array.get(i); UnlockableContent unlock = (UnlockableContent)array.get(i);
Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray); Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray);
list.add(image).size(8*4).pad(3); list.add(image).size(8 * 4).pad(3);
ClickListener listener = new ClickListener(); ClickListener listener = new ClickListener();
image.addListener(listener); image.addListener(listener);
if(!Vars.mobile && unlocked(unlock)){ if(!Vars.mobile && unlocked(unlock)){

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -67,7 +67,7 @@ public class Reconstructor extends UnitBlock{
stats.add(Stat.output, table -> { stats.add(Stat.output, table -> {
table.row(); table.row();
for(var upgrade : upgrades){ for(var upgrade : upgrades){
float size = 8*3; float size = 8 * 3;
if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){ if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){
table.image(upgrade[0].icon(Cicon.small)).size(size).padRight(4).padLeft(10).scaling(Scaling.fit).right(); table.image(upgrade[0].icon(Cicon.small)).size(size).padRight(4).padLeft(10).scaling(Scaling.fit).right();
table.add(upgrade[0].localizedName).left(); table.add(upgrade[0].localizedName).left();

2
tests/src/test/java/ApplicationTests.java
View File

@@ -554,7 +554,7 @@ public class ApplicationTests{
@Test @Test
void allBlockTest(){ void allBlockTest(){
Tiles tiles = world.resize(256*3 + 20, 10); Tiles tiles = world.resize(256 * 3 + 20, 10);
world.beginMapLoad(); world.beginMapLoad();
for(int x = 0; x < tiles.width; x++){ for(int x = 0; x < tiles.width; x++){