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

Source reformat

Browse Source
This commit is contained in:
Anuken
2019-04-08 09:03:18 -04:00
parent 4a96b9bb00
commit b40beb0d1d
331 changed files with 2822 additions and 3274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ui/Bar.java
View File

@@ -4,10 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.function.FloatProvider;
import io.anuke.arc.function.Supplier;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.BitmapFont;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.GlyphLayout;
import io.anuke.arc.graphics.g2d.ScissorStack;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Rectangle;
import io.anuke.arc.scene.Element;
@@ -79,7 +76,7 @@ public class Bar extends Element{
lay.setText(font, name);
font.setColor(Color.WHITE);
font.draw(name, x + width/2f - lay.width/2f, y + height/2f + lay.height/2f + 1);
font.draw(name, x + width / 2f - lay.width / 2f, y + height / 2f + lay.height / 2f + 1);
Pools.free(lay);
}

6
core/src/io/anuke/mindustry/ui/BorderImage.java
View File

@@ -1,12 +1,10 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.mindustry.graphics.Pal;
public class BorderImage extends Image{
private float thickness = 3f;

26
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -6,17 +6,11 @@ import io.anuke.arc.collection.OrderedMap;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Strings;
import io.anuke.mindustry.type.UnitType;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.mindustry.world.meta.BlockStats;
import io.anuke.mindustry.world.meta.StatCategory;
import io.anuke.mindustry.world.meta.StatValue;
import io.anuke.mindustry.world.meta.*;
public class ContentDisplay{
@@ -93,11 +87,11 @@ public class ContentDisplay{
table.left().defaults().fillX();
table.add(Core.bundle.format("item.explosiveness", (int) (item.explosiveness * 100)));
table.add(Core.bundle.format("item.explosiveness", (int)(item.explosiveness * 100)));
table.row();
table.add(Core.bundle.format("item.flammability", (int) (item.flammability * 100)));
table.add(Core.bundle.format("item.flammability", (int)(item.flammability * 100)));
table.row();
table.add(Core.bundle.format("item.radioactivity", (int) (item.radioactivity * 100)));
table.add(Core.bundle.format("item.radioactivity", (int)(item.radioactivity * 100)));
table.row();
}
@@ -124,15 +118,15 @@ public class ContentDisplay{
table.left().defaults().fillX();
table.add(Core.bundle.format("item.explosiveness", (int) (liquid.explosiveness * 100)));
table.add(Core.bundle.format("item.explosiveness", (int)(liquid.explosiveness * 100)));
table.row();
table.add(Core.bundle.format("item.flammability", (int) (liquid.flammability * 100)));
table.add(Core.bundle.format("item.flammability", (int)(liquid.flammability * 100)));
table.row();
table.add(Core.bundle.format("liquid.heatcapacity", (int) (liquid.heatCapacity * 100)));
table.add(Core.bundle.format("liquid.heatcapacity", (int)(liquid.heatCapacity * 100)));
table.row();
table.add(Core.bundle.format("liquid.temperature", (int) (liquid.temperature * 100)));
table.add(Core.bundle.format("liquid.temperature", (int)(liquid.temperature * 100)));
table.row();
table.add(Core.bundle.format("liquid.viscosity", (int) (liquid.viscosity * 100)));
table.add(Core.bundle.format("liquid.viscosity", (int)(liquid.viscosity * 100)));
table.row();
}

8
core/src/io/anuke/mindustry/ui/GridImage.java
View File

@@ -19,15 +19,15 @@ public class GridImage extends Element{
int minspace = 10;
int jumpx = (int) (Math.max(minspace, xspace) / xspace);
int jumpy = (int) (Math.max(minspace, yspace) / yspace);
int jumpx = (int)(Math.max(minspace, xspace) / xspace);
int jumpy = (int)(Math.max(minspace, yspace) / yspace);
for(int x = 0; x <= imageWidth; x += jumpx){
Fill.crect((int) (getX() + xspace * x - s), getY() - s, 2, getHeight() + (x == imageWidth ? 1 : 0));
Fill.crect((int)(getX() + xspace * x - s), getY() - s, 2, getHeight() + (x == imageWidth ? 1 : 0));
}
for(int y = 0; y <= imageHeight; y += jumpy){
Fill.crect(getX() - s, (int) (getY() + y * yspace - s), getWidth(), 2);
Fill.crect(getX() - s, (int)(getY() + y * yspace - s), getWidth(), 2);
}
}

6
core/src/io/anuke/mindustry/ui/ItemDisplay.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.arc.scene.ui.layout.Table;
/**An item image with text.*/
/** An item image with text. */
public class ItemDisplay extends Table{
public ItemDisplay(Item item){
@@ -12,7 +12,7 @@ public class ItemDisplay extends Table{
}
public ItemDisplay(Item item, int amount){
add(new ItemImage(new ItemStack(item, amount))).size(8*4);
add(new ItemImage(new ItemStack(item, amount))).size(8 * 4);
add(item.localizedName()).padLeft(4);
}
}

6
core/src/io/anuke/mindustry/ui/ItemImage.java
View File

@@ -1,12 +1,12 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.type.Item.Icon;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.arc.function.Supplier;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.layout.Stack;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.type.Item.Icon;
import io.anuke.mindustry.type.ItemStack;
public class ItemImage extends Stack{

2
core/src/io/anuke/mindustry/ui/ItemsDisplay.java
View File

@@ -33,7 +33,7 @@ public class ItemsDisplay extends Table{
for(Item item : content.items()){
if(item.type == ItemType.material && data.isUnlocked(item)){
t.label(() -> format.format(items.get(item, 0))).left();
t.addImage(item.icon(Icon.medium)).size(8*3).padLeft(4).padRight(4);
t.addImage(item.icon(Icon.medium)).size(8 * 3).padLeft(4).padRight(4);
t.add(item.localizedName()).color(Color.LIGHT_GRAY).left();
t.row();
}

14
core/src/io/anuke/mindustry/ui/Links.java
View File

@@ -8,13 +8,13 @@ public class Links{
private static void createLinks(){
links = new LinkEntry[]{
new LinkEntry("discord", "https://discord.gg/mindustry", Color.valueOf("7289da")),
new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Color.valueOf("026aa7")),
new LinkEntry("wiki", "http://mindustry.wikia.com/wiki/Mindustry_Wiki", Color.valueOf("0f142f")),
new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Color.valueOf("fa5c5c")),
new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Color.valueOf("689f38")),
new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Color.valueOf("24292e")),
new LinkEntry("dev-builds", "https://jenkins.hellomouse.net/job/mindustry/", Color.valueOf("fafbfc"))
new LinkEntry("discord", "https://discord.gg/mindustry", Color.valueOf("7289da")),
new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Color.valueOf("026aa7")),
new LinkEntry("wiki", "http://mindustry.wikia.com/wiki/Mindustry_Wiki", Color.valueOf("0f142f")),
new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Color.valueOf("fa5c5c")),
new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Color.valueOf("689f38")),
new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Color.valueOf("24292e")),
new LinkEntry("dev-builds", "https://jenkins.hellomouse.net/job/mindustry/", Color.valueOf("fafbfc"))
};
}

4
core/src/io/anuke/mindustry/ui/LiquidDisplay.java
View File

@@ -8,7 +8,7 @@ import io.anuke.arc.util.Strings;
import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.world.meta.StatUnit;
/**An ItemDisplay, but for liquids.*/
/** An ItemDisplay, but for liquids. */
public class LiquidDisplay extends Table{
public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){
@@ -20,7 +20,7 @@ public class LiquidDisplay extends Table{
t.add(Strings.autoFixed(amount, 1));
add(t);
}
}}).size(8*4).padRight(3);
}}).size(8 * 4).padRight(3);
if(perSecond){
add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.LIGHT_GRAY);

2
core/src/io/anuke/mindustry/ui/MenuButton.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.util.Align;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.util.Align;
public class MenuButton extends TextButton{

7
core/src/io/anuke/mindustry/ui/Minimap.java
View File

@@ -4,10 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.input.KeyCode;
import io.anuke.arc.scene.Element;
import io.anuke.arc.scene.event.ClickListener;
import io.anuke.arc.scene.event.InputEvent;
import io.anuke.arc.scene.event.InputListener;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.event.*;
import io.anuke.arc.scene.ui.layout.Container;
import io.anuke.arc.scene.ui.layout.Unit;
@@ -36,7 +33,7 @@ public class Minimap extends Container<Element>{
public void draw(){
if(renderer.minimap.getRegion() == null) return;
Draw.rect(renderer.minimap.getRegion(), x + width/2f, y + height/2f, width, height);
Draw.rect(renderer.minimap.getRegion(), x + width / 2f, y + height / 2f, width, height);
if(renderer.minimap.getTexture() != null){
renderer.minimap.drawEntities(x, y, width, height);

2
core/src/io/anuke/mindustry/ui/MobileButton.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.util.Align;
import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.util.Align;
public class MobileButton extends ImageButton{

4
core/src/io/anuke/mindustry/ui/ReqImage.java
View File

@@ -1,9 +1,7 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.function.BooleanProvider;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.Element;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.layout.Stack;

8
core/src/io/anuke/mindustry/ui/TreeLayout.java
View File

@@ -1,5 +1,3 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.collection.FloatArray;
@@ -108,7 +106,7 @@ public class TreeLayout{
}
private TreeNode getAncestor(TreeNode node){
return node.ancestor != null ? node.ancestor : node;
return node.ancestor != null ? node.ancestor : node;
}
private float getDistance(TreeNode v, TreeNode w){
@@ -211,7 +209,7 @@ public class TreeLayout{
float shift = 0;
float change = 0;
for(int i = v.children.length - 1; i >= 0; i --){
for(int i = v.children.length - 1; i >= 0; i--){
TreeNode w = v.children[i];
change = change + w.change;
w.prelim += shift;
@@ -236,7 +234,7 @@ public class TreeLayout{
previousChild = w;
}
executeShifts(v);
float midpoint = (v.children[0].prelim + v.children[v.children.length-1].prelim) / 2f;
float midpoint = (v.children[0].prelim + v.children[v.children.length - 1].prelim) / 2f;
if(leftSibling != null){
v.prelim = leftSibling.prelim + getDistance(v, leftSibling);
v.mode = v.prelim - midpoint;

14
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -1,21 +1,19 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.collection.Array;
import io.anuke.arc.collection.ObjectSet;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Cell;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.*;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.io.Contributors;
import io.anuke.mindustry.io.Contributors.Contributor;
import io.anuke.mindustry.ui.Links;
import io.anuke.mindustry.ui.Links.LinkEntry;
import io.anuke.arc.util.Time;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Cell;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.OS;
import io.anuke.arc.util.Strings;
import static io.anuke.mindustry.Vars.ios;
import static io.anuke.mindustry.Vars.ui;

2
core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import static io.anuke.mindustry.Vars.*;

5
core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java
View File

@@ -1,10 +1,11 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.netServer;
import static io.anuke.mindustry.Vars.ui;
public class BansDialog extends FloatingDialog{

2
core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.game.UnlockableContent;
public class ContentInfoDialog extends FloatingDialog{

2
core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
View File

@@ -16,7 +16,7 @@ public class ControlsDialog extends KeybindDialog{
title.setAlignment(Align.center);
titleTable.row();
titleTable.add(new Image("white"))
.growX().height(3f).pad(4f).get().setColor(Pal.accent);
.growX().height(3f).pad(4f).get().setColor(Pal.accent);
}
@Override

11
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -4,10 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.ButtonGroup;
import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.Scaling;
@@ -60,7 +57,8 @@ public class CustomGameDialog extends FloatingDialog{
if(i++ % 2 == 1) modes.row();
}
selmode.add(modes);
selmode.addButton("$mode.custom", "toggle", () -> {})
selmode.addButton("$mode.custom", "toggle", () -> {
})
.update(b -> b.setChecked(lastPreset == null)).size(108f).group(group).get().tapped(() -> {
lastPreset = null;
dialog.show();
@@ -84,7 +82,8 @@ public class CustomGameDialog extends FloatingDialog{
state.wavetime = difficulty.waveTime;
}).width(s);
sdif.addButton("", () -> {})
sdif.addButton("", () -> {
})
.update(t -> {
t.setText(difficulty.toString());
t.touchable(Touchable.disabled);

6
core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -47,9 +47,9 @@ public class CustomRulesDialog extends FloatingDialog{
number("$rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
number("$rules.playerdamagemultiplier", f -> rules.playerDamageMultiplier = f, () -> rules.playerDamageMultiplier);
number("$rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f*tilesize, () -> Math.min(rules.enemyCoreBuildRadius/tilesize, 200));
number("$rules.respawntime", f -> rules.respawnTime = f*60f, () -> rules.respawnTime/60f);
number("$rules.wavespacing", f -> rules.waveSpacing = f*60f, () -> rules.waveSpacing/60f);
number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
number("$rules.respawntime", f -> rules.respawnTime = f * 60f, () -> rules.respawnTime / 60f);
number("$rules.wavespacing", f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f);
}
void number(String text, FloatConsumer cons, FloatProvider prov){

8
core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -2,9 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.collection.Array;
import io.anuke.arc.scene.event.HandCursorListener;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.Tooltip;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.mindustry.Vars;
@@ -34,7 +32,7 @@ public class DatabaseDialog extends FloatingDialog{
Array<Content>[] allContent = Vars.content.getContentMap();
for(int j = 0; j < allContent.length; j ++){
for(int j = 0; j < allContent.length; j++){
ContentType type = ContentType.values()[j];
Array<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden());
@@ -53,7 +51,7 @@ public class DatabaseDialog extends FloatingDialog{
int count = 0;
for(int i = 0; i < array.size; i++){
UnlockableContent unlock = (UnlockableContent) array.get(i);
UnlockableContent unlock = (UnlockableContent)array.get(i);
Image image = unlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-tree-locked");
image.addListener(new HandCursorListener());

4
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -137,7 +137,7 @@ public class DeployDialog extends FloatingDialog{
TextButton button = new TextButton("", "node");
button.setSize(node.width, node.height);
button.update(() -> {
button.setPosition(node.x + panX + width/2f, node.y + panY + height/2f, Align.center);
button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f, Align.center);
});
button.clearChildren();
buildButton(node.zone, button);
@@ -152,7 +152,7 @@ public class DeployDialog extends FloatingDialog{
@Override
public void draw(){
float offsetX = panX + width/2f + x, offsetY = panY + height/2f + y;
float offsetX = panX + width / 2f + x, offsetY = panY + height / 2f + y;
for(ZoneNode node : nodes){
for(ZoneNode child : node.children){

2
core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
View File

@@ -2,8 +2,8 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.arc.scene.ui.Dialog;
import io.anuke.mindustry.graphics.Pal;
import static io.anuke.mindustry.Vars.discordURL;
import static io.anuke.mindustry.Vars.ui;

8
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
View File

@@ -11,9 +11,7 @@ import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.OS;
import io.anuke.arc.util.Time;
import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
@@ -27,7 +25,7 @@ public class FileChooser extends FloatingDialog{
public static Predicate<FileHandle> defaultFilter = file -> true;
private Table files;
private FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" :
Core.files.getExternalStoragePath());
Core.files.getExternalStoragePath());
private FileHandle directory = homeDirectory;
private ScrollPane pane;
private TextField navigation, filefield;
@@ -241,7 +239,7 @@ public class FileChooser extends FloatingDialog{
button.add(image).padRight(4f).size(14 * 2f);
button.getCells().reverse();
files.top().left().add(button).align(Align.topLeft).fillX().expandX()
.height(50).pad(2).padTop(0).padBottom(0).colspan(2);
.height(50).pad(2).padTop(0).padBottom(0).colspan(2);
button.getLabel().setAlignment(Align.left);
files.row();
}

24
core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
View File

@@ -1,15 +1,15 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.Events;
import io.anuke.arc.input.KeyCode;
import io.anuke.arc.scene.ui.Dialog;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.util.Align;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.ResizeEvent;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.net.Net;
import io.anuke.arc.Events;
import io.anuke.arc.scene.ui.Dialog;
import io.anuke.arc.scene.ui.ScrollPane;
import static io.anuke.mindustry.Vars.state;
@@ -23,7 +23,7 @@ public class FloatingDialog extends Dialog{
this.title.setAlignment(Align.center);
titleTable.row();
titleTable.addImage("white", Pal.accent)
.growX().height(3f).pad(4f);
.growX().height(3f).pad(4f);
hidden(() -> {
if(shouldPause && !state.is(State.menu)){
@@ -43,14 +43,14 @@ public class FloatingDialog extends Dialog{
boolean[] done = {false};
shown(() -> Core.app.post(() ->
forEach(child -> {
if(done[0]) return;
forEach(child -> {
if(done[0]) return;
if(child instanceof ScrollPane){
Core.scene.setScrollFocus(child);
done[0] = true;
}
})));
if(child instanceof ScrollPane){
Core.scene.setScrollFocus(child);
done[0] = true;
}
})));
}
protected void onResize(Runnable run){
@@ -66,7 +66,7 @@ public class FloatingDialog extends Dialog{
buttons.addImageTextButton("$back", "icon-arrow-left", 30f, this::hide).size(210f, 64f);
keyDown(key -> {
if(key == KeyCode.ESCAPE || key == KeyCode.BACK) {
if(key == KeyCode.ESCAPE || key == KeyCode.BACK){
Core.app.post(this::hide);
}
});

4
core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
View File

@@ -31,7 +31,7 @@ public class GameOverDialog extends FloatingDialog{
buttons.margin(10);
if(state.rules.pvp){
cont.add(Core.bundle.format("gameover.pvp",winner.localized())).pad(6);
cont.add(Core.bundle.format("gameover.pvp", winner.localized())).pad(6);
buttons.addButton("$menu", () -> {
hide();
state.set(State.menu);
@@ -63,7 +63,7 @@ public class GameOverDialog extends FloatingDialog{
if(state.stats.itemsDelivered.get(item, 0) > 0){
t.table(items -> {
items.add(" [LIGHT_GRAY]" + state.stats.itemsDelivered.get(item, 0));
items.addImage(item.icon(Icon.medium)).size(8 *3).pad(4);
items.addImage(item.icon(Icon.medium)).size(8 * 3).pad(4);
}).left();
t.row();
}

19
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -154,10 +154,10 @@ public class JoinDialog extends FloatingDialog{
versionString = Core.bundle.get("server.outdated");
}else if(host.version < Version.build && Version.build != -1){
versionString = Core.bundle.get("server.outdated") + "\n" +
Core.bundle.format("server.version", host.version, "");
Core.bundle.format("server.version", host.version, "");
}else if(host.version > Version.build && Version.build != -1){
versionString = Core.bundle.get("server.outdated.client") + "\n" +
Core.bundle.format("server.version", host.version, "");
Core.bundle.format("server.version", host.version, "");
}else{
versionString = Core.bundle.format("server.version", host.version, host.versionType);
}
@@ -170,7 +170,7 @@ public class JoinDialog extends FloatingDialog{
t.add("[lightgray]" + Core.bundle.format("server.hostname", host.name)).width(targetWidth() - 10f).left().get().setEllipsis(true);
t.row();
t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("players", host.players) :
Core.bundle.format("players.single", host.players))).left();
Core.bundle.format("players.single", host.players))).left();
t.row();
t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + " / " + Core.bundle.format("save.wave", host.wave)).width(targetWidth() - 10f).left().get().setEllipsis(true);
}).expand().left().bottom().padLeft(12f).padBottom(8);
@@ -229,7 +229,7 @@ public class JoinDialog extends FloatingDialog{
pad = 6;
}
Cell cell = ((Table) pane.getParent()).getCell(button);
Cell cell = ((Table)pane.getParent()).getCell(button);
if(!Mathf.isEqual(cell.getMinWidth(), pw)){
cell.width(pw);
@@ -256,7 +256,7 @@ public class JoinDialog extends FloatingDialog{
local.add().growX();
local.addImageButton("icon-loading", 16 * 2f, this::refreshLocal).pad(-12f).padLeft(0).size(70f);
}else{
local.background((Drawable) null);
local.background((Drawable)null);
}
}
@@ -264,8 +264,8 @@ public class JoinDialog extends FloatingDialog{
if(totalHosts == 0){
local.clear();
}
local.background((Drawable) null);
totalHosts ++;
local.background((Drawable)null);
totalHosts++;
float w = targetWidth();
local.row();
@@ -324,7 +324,7 @@ public class JoinDialog extends FloatingDialog{
void setIP(String ip){
//parse ip:port, if unsuccessful, use default values
if(ip.lastIndexOf(':') != -1 && ip.lastIndexOf(':') != ip.length()-1){
if(ip.lastIndexOf(':') != -1 && ip.lastIndexOf(':') != ip.length() - 1){
try{
int idx = ip.lastIndexOf(':');
this.ip = ip.substring(0, idx);
@@ -343,6 +343,7 @@ public class JoinDialog extends FloatingDialog{
return ip + (port != Vars.port ? ":" + port : "");
}
public Server(){}
public Server(){
}
}
}

4
core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
View File

@@ -1,9 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.scene.ui.ButtonGroup;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Log;

16
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -1,19 +1,17 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.arc.util.Time;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.io.SaveIO.SaveException;
import java.io.IOException;

8
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -3,14 +3,10 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Scaling;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.io.MapIO;

2
core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
View File

@@ -31,7 +31,7 @@ public class MinimapDialog extends FloatingDialog{
t.addRect((x, y, width, height) -> {
if(renderer.minimap.getRegion() == null) return;
Draw.color(Color.WHITE);
Draw.rect(renderer.minimap.getRegion(), x + width/2f, y + height/2f, width, height);
Draw.rect(renderer.minimap.getRegion(), x + width / 2f, y + height / 2f, width, height);
if(renderer.minimap.getTexture() != null){
renderer.minimap.drawEntities(x, y, width, height);

10
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -18,7 +18,7 @@ public class PausedDialog extends FloatingDialog{
shown(this::rebuild);
keyDown(key -> {
if(key == KeyCode.ESCAPE || key == KeyCode.BACK) {
if(key == KeyCode.ESCAPE || key == KeyCode.BACK){
hide();
}
});
@@ -37,7 +37,7 @@ public class PausedDialog extends FloatingDialog{
float dw = 210f;
cont.defaults().width(dw).height(50).pad(5f);
cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f);
cont.addButton("$back", this::hide).colspan(2).width(dw * 2 + 20f);
cont.row();
if(world.isZone()){
@@ -55,7 +55,7 @@ public class PausedDialog extends FloatingDialog{
cont.row();
cont.addButton("$hostserver", ui.host::show).disabled(b -> Net.active()).colspan(2).width(dw*2 + 20f);
cont.addButton("$hostserver", ui.host::show).disabled(b -> Net.active()).colspan(2).width(dw * 2 + 20f);
cont.row();
@@ -97,7 +97,7 @@ public class PausedDialog extends FloatingDialog{
public void runExitSave(){
if(control.saves.getCurrent() == null ||
!control.saves.getCurrent().isAutosave()){
!control.saves.getCurrent().isAutosave()){
state.set(State.menu);
return;
}
@@ -107,7 +107,7 @@ public class PausedDialog extends FloatingDialog{
control.saves.getCurrent().save();
}catch(Throwable e){
e.printStackTrace();
ui.showError("[accent]" + Core.bundle.get("savefail"));
ui.showError("[accent]" + Core.bundle.get("savefail"));
}
state.set(State.menu);
});

14
core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -22,13 +22,13 @@ public class SaveDialog extends LoadDialog{
public void addSetup(){
slots.row();
slots.addImageTextButton("$save.new", "icon-add",14 * 3, () ->
ui.showTextInput("$save", "$save.newslot", "", text -> {
ui.loadAnd("$saving", () -> {
control.saves.addSave(text);
Core.app.post(() -> Core.app.post(this::setup));
});
})
slots.addImageTextButton("$save.new", "icon-add", 14 * 3, () ->
ui.showTextInput("$save", "$save.newslot", "", text -> {
ui.loadAnd("$saving", () -> {
control.saves.addSave(text);
Core.app.post(() -> Core.app.post(this::setup));
});
})
).fillX().margin(10f).minWidth(300f).height(70f).pad(4f).padRight(-4);
}

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -50,7 +50,7 @@ public class SettingsMenuDialog extends SettingsDialog{
title.setAlignment(Align.center);
titleTable.row();
titleTable.add(new Image("white"))
.growX().height(3f).pad(4f).get().setColor(Pal.accent);
.growX().height(3f).pad(4f).get().setColor(Pal.accent);
cont.clearChildren();
cont.remove();

14
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@@ -46,7 +46,7 @@ public class TechTreeDialog extends FloatingDialog{
hidden(ui.deploy::setup);
addCloseButton();
buttons.addImageTextButton("$database", "icon-database", 14*2, () -> {
buttons.addImageTextButton("$database", "icon-database", 14 * 2, () -> {
hide();
ui.database.show();
}).size(210f, 64f);
@@ -94,7 +94,7 @@ public class TechTreeDialog extends FloatingDialog{
table.setName("toast");
table.update(() -> {
table.toFront();
table.setPosition(Core.graphics.getWidth()/2f, Core.graphics.getHeight() - 21, Align.top);
table.setPosition(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() - 21, Align.top);
});
Core.scene.add(table);
}
@@ -172,10 +172,10 @@ public class TechTreeDialog extends FloatingDialog{
button.setSize(nodeSize);
button.update(() -> {
float offset = (Core.graphics.getHeight() % 2) / 2f;
button.setPosition(node.x + panX + width/2f, node.y + panY + height/2f + offset, Align.center);
button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f + offset, Align.center);
button.getStyle().up = Core.scene.skin.getDrawable(!locked(node.node) ? "content-background" : "content-background-locked");
((TextureRegionDrawable)button.getStyle().imageUp)
.setRegion(node.visible ? node.node.block.icon(Icon.medium) : Core.atlas.find("icon-tree-locked"));
.setRegion(node.visible ? node.node.block.icon(Icon.medium) : Core.atlas.find("icon-tree-locked"));
button.getImage().setColor(!locked(node.node) ? Color.WHITE : Color.GRAY);
});
addChild(button);
@@ -222,7 +222,7 @@ public class TechTreeDialog extends FloatingDialog{
infoTable.margin(0).left().defaults().left();
infoTable.addImageButton("icon-info", "node", 14*2, () -> ui.content.show(node.block)).growY().width(50f);
infoTable.addImageButton("icon-info", "node", 14 * 2, () -> ui.content.show(node.block)).growY().width(50f);
infoTable.add().grow();
@@ -251,7 +251,7 @@ public class TechTreeDialog extends FloatingDialog{
if(mobile && locked(node)){
infoTable.row();
infoTable.addImageTextButton("$research", "icon-check", "node", 16*2, () -> unlock(node))
infoTable.addImageTextButton("$research", "icon-check", "node", 16 * 2, () -> unlock(node))
.disabled(b -> !data.hasItems(node.requirements)).growX().height(44f).colspan(3);
}
@@ -261,7 +261,7 @@ public class TechTreeDialog extends FloatingDialog{
@Override
public void draw(){
float offsetX = panX + width/2f + x, offsetY = panY + height/2f + y;
float offsetX = panX + width / 2f + x, offsetY = panY + height / 2f + y;
for(TechTreeNode node : nodes){
if(!node.visible) continue;

9
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@@ -6,10 +6,7 @@ import io.anuke.arc.scene.ui.Button;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.ItemType;
import io.anuke.mindustry.type.Zone;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.type.Zone.ZoneRequirement;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
@@ -52,7 +49,7 @@ public class ZoneInfoDialog extends FloatingDialog{
if(i++ % 2 == 0){
iteminfo.row();
}
iteminfo.addImage(stack.item.icon(Item.Icon.medium)).size(8*3).padRight(1);
iteminfo.addImage(stack.item.icon(Item.Icon.medium)).size(8 * 3).padRight(1);
iteminfo.add(stack.amount + "").color(Color.LIGHT_GRAY).padRight(5);
}
};
@@ -168,7 +165,7 @@ public class ZoneInfoDialog extends FloatingDialog{
}).size(300f, 35f).pad(1).get();
button.clearChildren();
button.left();
button.addImage(item.icon(Item.Icon.medium)).size(8*3).pad(4);
button.addImage(item.icon(Item.Icon.medium)).size(8 * 3).pad(4);
button.add(item.localizedName);
dialog.cont.row();
}

8
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -1,9 +1,7 @@
package io.anuke.mindustry.ui.fragments;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Fill;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.mindustry.core.GameState.State;
@@ -23,13 +21,13 @@ public class BackgroundFragment extends Fragment{
Draw.shader();
boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight();
float logoscl = (int) Unit.dp.scl(1);
float logoscl = (int)Unit.dp.scl(1);
TextureRegion logo = Core.atlas.find("logotext");
float logow = logo.getWidth() * logoscl;
float logoh = logo.getHeight() * logoscl;
Draw.color();
Draw.rect(logo, (int) (w / 2), (int) (h - 10 - logoh - Unit.dp.scl(portrait ? 30f : 0)) + logoh/2, logow, logoh);
Draw.rect(logo, (int)(w / 2), (int)(h - 10 - logoh - Unit.dp.scl(portrait ? 30f : 0)) + logoh / 2, logow, logoh);
}).visible(() -> state.is(State.menu)).grow();
}
}

2
core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
View File

@@ -50,7 +50,7 @@ public class BlockConfigFragment extends Fragment{
table.pack();
table.setTransform(true);
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
table.update(() -> {
if(state.is(State.menu)){

15
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -11,14 +11,9 @@ import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.actions.Actions;
import io.anuke.arc.scene.event.HandCursorListener;
import io.anuke.arc.scene.event.InputEvent;
import io.anuke.arc.scene.event.InputListener;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.event.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.gen.Call;
@@ -180,18 +175,18 @@ public class BlockInventoryFragment extends Fragment{
if(actions){
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
}
}
private String round(float f){
f = (int) f;
f = (int)f;
if(f >= 1000000){
return Strings.fixed(f / 1000000f, 1) + "[gray]mil[]";
}else if(f >= 1000){
return Strings.fixed(f / 1000, 1) + "k";
}else{
return (int) f + "";
return (int)f + "";
}
}

2
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -81,7 +81,7 @@ public class ChatFragment extends Table{
historyPos--;
updateChat();
}
scrollPos = (int) Mathf.clamp(scrollPos + input.axis(Binding.chat_scroll), 0, Math.max(0, messages.size - messagesShown));
scrollPos = (int)Mathf.clamp(scrollPos + input.axis(Binding.chat_scroll), 0, Math.max(0, messages.size - messagesShown));
}
});

43
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -11,17 +11,10 @@ import io.anuke.arc.scene.Element;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.actions.Actions;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Stack;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.scene.utils.Elements;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.Scaling;
import io.anuke.arc.util.Time;
import io.anuke.arc.util.Tmp;
import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.game.UnlockableContent;
@@ -30,13 +23,13 @@ import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.input.Binding;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.AdminAction;
import io.anuke.mindustry.ui.Bar;
import io.anuke.mindustry.ui.IntFormat;
import io.anuke.mindustry.ui.Minimap;
import io.anuke.mindustry.ui.*;
import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import static io.anuke.mindustry.Vars.*;
import java.lang.StringBuilder;
public class HudFragment extends Fragment{
public final PlacementFragment blockfrag = new PlacementFragment();
@@ -124,7 +117,7 @@ public class HudFragment extends Fragment{
});
}
cont.add().size(dsize*4 + 3, dsize).left();
cont.add().size(dsize * 4 + 3, dsize).left();
}
cont.row();
@@ -152,14 +145,14 @@ public class HudFragment extends Fragment{
stuff.add(stack).width(dsize * 4 + 3f);
stuff.row();
stuff.table("button", t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.WHITE))
.grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
.grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
stuff.row();
}).visible(() -> shown);
//fps display
cont.table(info -> {
info.top().left().margin(4).visible(() -> Core.settings.getBool("fps"));
info.update(() -> info.setTranslation(state.rules.waves ? 0f : -Unit.dp.scl(dsize*4 + 3), 0));
info.update(() -> info.setTranslation(state.rules.waves ? 0f : -Unit.dp.scl(dsize * 4 + 3), 0));
IntFormat fps = new IntFormat("fps");
IntFormat ping = new IntFormat("ping");
@@ -187,7 +180,7 @@ public class HudFragment extends Fragment{
t.touchable(Touchable.disabled);
t.visible(() -> !state.is(State.menu));
t.table("flat", c -> c.add("")
.update(l ->{
.update(l -> {
l.setColor(Tmp.c1.set(Color.WHITE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 10f, 1f)));
l.setText(Core.bundle.format("outofbounds", (int)((boundsCountdown - player.destructTime) / 60f)));
}).get().setAlignment(Align.center, Align.center)).margin(6).update(u -> {
@@ -237,7 +230,7 @@ public class HudFragment extends Fragment{
return coreAttackOpacity > 0;
});
t.table("button", top -> top.add("$coreattack").pad(2)
.update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
.update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
});
//launch button
@@ -270,10 +263,10 @@ public class HudFragment extends Fragment{
button.getStyle().disabledFontColor = Color.WHITE;
button.margin(16f);
button.visible(() ->
world.isZone() &&
world.getZone().metCondition() &&
!Net.client() &&
state.wave % world.getZone().launchPeriod == 0 && !world.spawner.isSpawning());
world.isZone() &&
world.getZone().metCondition() &&
!Net.client() &&
state.wave % world.getZone().launchPeriod == 0 && !world.spawner.isSpawning());
button.update(() -> {
if(world.getZone() == null){
@@ -282,10 +275,10 @@ public class HudFragment extends Fragment{
}
button.setText(state.enemies() > 0 ? Core.bundle.format("launch.unable", state.enemies()) : Core.bundle.get("launch") + "\n" +
Core.bundle.format("launch.next", state.wave + world.getZone().launchPeriod));
Core.bundle.format("launch.next", state.wave + world.getZone().launchPeriod));
button.getLabel().setColor(Tmp.c1.set(Color.WHITE).lerp(state.enemies() > 0 ? Color.WHITE : Color.SCARLET,
Mathf.absin(Time.time(), 2f, 1f)));
Mathf.absin(Time.time(), 2f, 1f)));
});
button.setDisabled(() -> state.enemies() > 0);
@@ -466,7 +459,7 @@ public class HudFragment extends Fragment{
}
if(state.rules.waveTimer){
builder.append(waitingf.get((int)(state.wavetime/60)));
builder.append(waitingf.get((int)(state.wavetime / 60)));
}else if(state.enemies() == 0){
builder.append(Core.bundle.get("waiting"));
}

5
core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.ui.fragments;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.Label;
import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.graphics.Pal;
public class LoadingFragment extends Fragment{
private Table table;
@@ -25,7 +25,8 @@ public class LoadingFragment extends Fragment{
t.addImage("white").growX().height(3f).pad(4f).growX().get().setColor(Pal.accent);
t.row();
button = t.addButton("$cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get();
button = t.addButton("$cancel", () -> {
}).pad(20).size(250f, 70f).visible(false).get();
table = t;
});
}

22
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -34,18 +34,18 @@ public class MenuFragment extends Fragment{
//discord icon in top right
parent.fill(c -> c.top().right().addButton("", "discord", ui.discord::show).size(84, 45)
.visible(() -> state.is(State.menu)));
.visible(() -> state.is(State.menu)));
//info icon
if(mobile){
parent.fill(c -> c.top().left().addButton("", "info", ui.about::show).size(84, 45)
.visible(() -> state.is(State.menu)));
.visible(() -> state.is(State.menu)));
}
//version info
parent.fill(c -> c.bottom().left().add(Strings.format("Mindustry v{0} {1}-{2} {3}{4}", Version.number, Version.modifier, Version.type,
(Version.build == -1 ? "custom build" : "build " + Version.build), Version.revision == 0 ? "" : "." + Version.revision))
.visible(() -> state.is(State.menu)));
(Version.build == -1 ? "custom build" : "build " + Version.build), Version.revision == 0 ? "" : "." + Version.revision))
.visible(() -> state.is(State.menu)));
}
private void buildMobile(){
@@ -57,13 +57,13 @@ public class MenuFragment extends Fragment{
container.defaults().size(size).pad(5).padTop(4f);
MobileButton
play = new MobileButton("icon-play-2", isize, "$play", ui.deploy::show),
maps = new MobileButton("icon-map", isize, "$maps", ui.maps::show),
custom = new MobileButton("icon-play-custom", isize, "$customgame", this::showCustomSelect),
join = new MobileButton("icon-add", isize, "$joingame", ui.join::show),
editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)),
tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show),
donate = new MobileButton("icon-donate", isize, "$donate", () -> Core.net.openURI(donationURL));
play = new MobileButton("icon-play-2", isize, "$play", ui.deploy::show),
maps = new MobileButton("icon-map", isize, "$maps", ui.maps::show),
custom = new MobileButton("icon-play-custom", isize, "$customgame", this::showCustomSelect),
join = new MobileButton("icon-add", isize, "$joingame", ui.join::show),
editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)),
tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show),
donate = new MobileButton("icon-donate", isize, "$donate", () -> Core.net.openURI(donationURL));
if(Core.graphics.getWidth() > Core.graphics.getHeight()){
container.add(play);

4
core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.fragments;
import io.anuke.mindustry.input.InputHandler;
import io.anuke.arc.scene.Group;
import io.anuke.mindustry.input.InputHandler;
/**Fragment for displaying overlays such as block inventories. One is created for each input handler.*/
/** Fragment for displaying overlays such as block inventories. One is created for each input handler. */
public class OverlayFragment extends Fragment{
public final BlockInventoryFragment inv;
public final BlockConfigFragment config;

26
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -9,9 +9,7 @@ import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.style.TextureRegionDrawable;
import io.anuke.arc.scene.ui.ButtonGroup;
import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.core.GameState.State;
@@ -21,9 +19,7 @@ import io.anuke.mindustry.game.EventType.WorldLoadEvent;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.input.Binding;
import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.type.Category;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.Tile;
@@ -45,15 +41,15 @@ public class PlacementFragment extends Fragment{
//TODO make this configurable
final KeyCode[] inputGrid = {
KeyCode.NUM_1, KeyCode.NUM_2, KeyCode.NUM_3, KeyCode.NUM_4,
KeyCode.Q, KeyCode.W, KeyCode.E, KeyCode.R,
KeyCode.A, KeyCode.S, KeyCode.D, KeyCode.F,
KeyCode.Z, KeyCode.X, KeyCode.C, KeyCode.V
KeyCode.NUM_1, KeyCode.NUM_2, KeyCode.NUM_3, KeyCode.NUM_4,
KeyCode.Q, KeyCode.W, KeyCode.E, KeyCode.R,
KeyCode.A, KeyCode.S, KeyCode.D, KeyCode.F,
KeyCode.Z, KeyCode.X, KeyCode.C, KeyCode.V
}, inputCatGrid = {
KeyCode.NUM_1, KeyCode.NUM_2,
KeyCode.Q, KeyCode.W,
KeyCode.A, KeyCode.S,
KeyCode.Z, KeyCode.X, KeyCode.C, KeyCode.V
KeyCode.NUM_1, KeyCode.NUM_2,
KeyCode.Q, KeyCode.W,
KeyCode.A, KeyCode.S,
KeyCode.Z, KeyCode.X, KeyCode.C, KeyCode.V
};
public PlacementFragment(){
@@ -292,7 +288,7 @@ public class PlacementFragment extends Fragment{
returnCatArray.sort((c1, c2) -> Boolean.compare(categoryEmpty[c1.ordinal()], categoryEmpty[c2.ordinal()]));
return returnCatArray;
}
Array<Block> getByCategory(Category cat){
returnArray.clear();
for(Block block : content.blocks()){

4
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -107,9 +107,9 @@ public class PlayerListFragment extends Fragment{
t.defaults().size(bs);
t.addImageButton("icon-ban", "clear-partial", 14 * 2,
() -> ui.showConfirm("$confirm", "$confirmban", () -> Call.onAdminRequest(user, AdminAction.ban)));
() -> ui.showConfirm("$confirm", "$confirmban", () -> Call.onAdminRequest(user, AdminAction.ban)));
t.addImageButton("icon-cancel", "clear-partial", 16 * 2,
() -> ui.showConfirm("$confirm", "$confirmkick", () -> Call.onAdminRequest(user, AdminAction.kick)));
() -> ui.showConfirm("$confirm", "$confirmkick", () -> Call.onAdminRequest(user, AdminAction.kick)));
t.row();