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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-05-26 19:39:50 -04:00
parent ddb3afc255
commit a375dd3fc2
53 changed files with 146 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -14,7 +14,7 @@ import mindustry.ui.Links.*;
import static mindustry.Vars.*;
public class AboutDialog extends FloatingDialog{
public class AboutDialog extends BaseDialog{
private Array<String> contributors = new Array<>();
private static ObjectSet<String> bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "f-droid");
@@ -93,7 +93,7 @@ public class AboutDialog extends FloatingDialog{
}
public void showCredits(){
FloatingDialog dialog = new FloatingDialog("$credits");
BaseDialog dialog = new BaseDialog("$credits");
dialog.addCloseButton();
dialog.cont.add("$credits.text").fillX().wrap().get().setAlignment(Align.center);
dialog.cont.row();

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

@@ -7,7 +7,7 @@ import mindustry.net.Administration.*;
import static mindustry.Vars.*;
public class AdminsDialog extends FloatingDialog{
public class AdminsDialog extends BaseDialog{
public AdminsDialog(){
super("$server.admins");

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

@@ -7,7 +7,7 @@ import mindustry.net.Administration.*;
import static mindustry.Vars.*;
public class BansDialog extends FloatingDialog{
public class BansDialog extends BaseDialog{
public BansDialog(){
super("$server.bans");

6
core/src/mindustry/ui/dialogs/FloatingDialog.java → core/src/mindustry/ui/dialogs/BaseDialog.java
View File

@@ -11,11 +11,11 @@ import mindustry.graphics.*;
import static mindustry.Vars.*;
public class FloatingDialog extends Dialog{
public class BaseDialog extends Dialog{
private boolean wasPaused;
protected boolean shouldPause;
public FloatingDialog(String title, DialogStyle style){
public BaseDialog(String title, DialogStyle style){
super(title, style);
setFillParent(true);
this.title.setAlignment(Align.center);
@@ -40,7 +40,7 @@ public class FloatingDialog extends Dialog{
});
}
public FloatingDialog(String title){
public BaseDialog(String title){
this(title, Core.scene.getStyle(DialogStyle.class));
}

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

@@ -6,7 +6,7 @@ import arc.scene.ui.*;
import mindustry.gen.*;
import mindustry.graphics.*;
public class ColorPicker extends FloatingDialog{
public class ColorPicker extends BaseDialog{
private Cons<Color> cons = c -> {};
private Color current = new Color();

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

@@ -4,7 +4,7 @@ import arc.scene.ui.ScrollPane;
import arc.scene.ui.layout.Table;
import mindustry.ctype.UnlockableContent;
public class ContentInfoDialog extends FloatingDialog{
public class ContentInfoDialog extends BaseDialog{
public ContentInfoDialog(){
super("$info.title");

3
core/src/mindustry/ui/dialogs/ControlsDialog.java
View File

@@ -20,8 +20,7 @@ public class ControlsDialog extends KeybindDialog{
buttons.button("$back", Icon.left, this::hide).size(230f, 64f);
keyDown(key -> {
if(key == KeyCode.escape || key == KeyCode.back)
hide();
if(key == KeyCode.escape || key == KeyCode.back) hide();
});
}
}

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

@@ -14,7 +14,7 @@ import mindustry.graphics.*;
import mindustry.maps.*;
import mindustry.ui.*;
public class CustomGameDialog extends FloatingDialog{
public class CustomGameDialog extends BaseDialog{
private MapPlayDialog dialog = new MapPlayDialog();
public CustomGameDialog(){

8
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -19,18 +19,18 @@ import mindustry.world.*;
import static mindustry.Vars.*;
public class CustomRulesDialog extends FloatingDialog{
public class CustomRulesDialog extends BaseDialog{
private Table main;
private Rules rules;
private Prov<Rules> resetter;
private LoadoutDialog loadoutDialog;
private FloatingDialog banDialog;
private BaseDialog banDialog;
public CustomRulesDialog(){
super("$mode.custom");
loadoutDialog = new LoadoutDialog();
banDialog = new FloatingDialog("$bannedblocks");
banDialog = new BaseDialog("$bannedblocks");
banDialog.addCloseButton();
banDialog.shown(this::rebuildBanned);
@@ -84,7 +84,7 @@ public class CustomRulesDialog extends FloatingDialog{
}).get().setScrollYForce(previousScroll);
banDialog.cont.row();
banDialog.cont.button("$add", Icon.add, () -> {
FloatingDialog dialog = new FloatingDialog("$add");
BaseDialog dialog = new BaseDialog("$add");
dialog.cont.pane(t -> {
t.left().margin(14f);
int[] i = {0};

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

@@ -16,7 +16,7 @@ import mindustry.ui.*;
import static mindustry.Vars.ui;
public class DatabaseDialog extends FloatingDialog{
public class DatabaseDialog extends BaseDialog{
public DatabaseDialog(){
super("$database");

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

@@ -17,7 +17,7 @@ import java.util.*;
import static mindustry.Vars.platform;
public class FileChooser extends FloatingDialog{
public class FileChooser extends BaseDialog{
private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath());
private static Fi lastDirectory = homeDirectory;

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

@@ -9,7 +9,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class GameOverDialog extends FloatingDialog{
public class GameOverDialog extends BaseDialog{
private Team winner;
public GameOverDialog(){

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

@@ -12,7 +12,7 @@ import java.io.*;
import static mindustry.Vars.*;
public class HostDialog extends FloatingDialog{
public class HostDialog extends BaseDialog{
float w = 300;
public HostDialog(){

4
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -19,7 +19,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class JoinDialog extends FloatingDialog{
public class JoinDialog extends BaseDialog{
Array<Server> servers = new Array<>();
Dialog add;
Server renaming;
@@ -44,7 +44,7 @@ public class JoinDialog extends FloatingDialog{
buttons.button("?", () -> ui.showInfo("$join.info")).size(60f, 64f).width(-1);
}
add = new FloatingDialog("$joingame.title");
add = new BaseDialog("$joingame.title");
add.cont.add("$joingame.ip").padRight(5f).left();
TextField field = add.cont.field(Core.settings.getString("ip"), text -> {

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

@@ -13,7 +13,7 @@ import java.util.Locale;
import static mindustry.Vars.locales;
import static mindustry.Vars.ui;
public class LanguageDialog extends FloatingDialog{
public class LanguageDialog extends BaseDialog{
private Locale lastLocale;
private ObjectMap<Locale, String> displayNames = ObjectMap.of(
Locale.TRADITIONAL_CHINESE, "正體中文",

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

@@ -19,7 +19,7 @@ import java.io.*;
import static mindustry.Vars.*;
public class LoadDialog extends FloatingDialog{
public class LoadDialog extends BaseDialog{
ScrollPane pane;
Table slots;

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

@@ -11,7 +11,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class LoadoutDialog extends FloatingDialog{
public class LoadoutDialog extends BaseDialog{
private Runnable hider;
private Runnable resetter;
private Runnable updater;

4
core/src/mindustry/ui/dialogs/MapPlayDialog.java
View File

@@ -12,7 +12,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class MapPlayDialog extends FloatingDialog{
public class MapPlayDialog extends BaseDialog{
CustomRulesDialog dialog = new CustomRulesDialog();
Rules rules;
@NonNull Gamemode selectedGamemode = Gamemode.survival;
@@ -89,7 +89,7 @@ public class MapPlayDialog extends FloatingDialog{
}
private void displayGameModeHelp(){
FloatingDialog d = new FloatingDialog(Core.bundle.get("mode.help.title"));
BaseDialog d = new BaseDialog(Core.bundle.get("mode.help.title"));
d.setFillParent(false);
Table table = new Table();
table.defaults().pad(1f);

6
core/src/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -17,8 +17,8 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class MapsDialog extends FloatingDialog{
private FloatingDialog dialog;
public class MapsDialog extends BaseDialog{
private BaseDialog dialog;
public MapsDialog(){
super("$maps");
@@ -158,7 +158,7 @@ public class MapsDialog extends FloatingDialog{
}
void showMapInfo(Map map){
dialog = new FloatingDialog("$editor.mapinfo");
dialog = new BaseDialog("$editor.mapinfo");
dialog.addCloseButton();
float mapsize = Core.graphics.isPortrait() ? 160f : 300f;

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

@@ -10,7 +10,7 @@ import mindustry.gen.*;
import static mindustry.Vars.renderer;
public class MinimapDialog extends FloatingDialog{
public class MinimapDialog extends BaseDialog{
public MinimapDialog(){
super("$minimap");

7
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -17,7 +17,7 @@ import java.io.*;
import static mindustry.Vars.*;
public class ModsDialog extends FloatingDialog{
public class ModsDialog extends BaseDialog{
public ModsDialog(){
super("$mods");
@@ -25,7 +25,6 @@ public class ModsDialog extends FloatingDialog{
buttons.button("$mods.guide", Icon.link, () -> Core.app.openURI(modGuideURL)).size(210, 64f);
shown(this::setup);
hidden(() -> {
@@ -67,7 +66,7 @@ public class ModsDialog extends FloatingDialog{
float margin = 12f;
buttons.button("$mod.import", Icon.add, style, () -> {
FloatingDialog dialog = new FloatingDialog("$mod.import");
BaseDialog dialog = new BaseDialog("$mod.import");
TextButtonStyle bstyle = Styles.cleart;
@@ -245,7 +244,7 @@ public class ModsDialog extends FloatingDialog{
}
private void showMod(LoadedMod mod){
FloatingDialog dialog = new FloatingDialog(mod.meta.displayName());
BaseDialog dialog = new BaseDialog(mod.meta.displayName());
dialog.addCloseButton();

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

@@ -6,7 +6,7 @@ import mindustry.gen.*;
import static mindustry.Vars.*;
public class PausedDialog extends FloatingDialog{
public class PausedDialog extends BaseDialog{
private SaveDialog save = new SaveDialog();
private LoadDialog load = new LoadDialog();
private boolean wasClient = false;

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

@@ -29,7 +29,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class PlanetDialog extends FloatingDialog{
public class PlanetDialog extends BaseDialog{
private static final Color
outlineColor = Pal.accent.cpy().a(1f),
hoverColor = Pal.accent.cpy().a(0.5f),

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

@@ -7,7 +7,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class ResourcesDialog extends FloatingDialog{
public class ResourcesDialog extends BaseDialog{
public ResourcesDialog(){
super("//TODO resources");

8
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -20,7 +20,7 @@ import mindustry.ui.*;
import static mindustry.Vars.*;
public class SchematicsDialog extends FloatingDialog{
public class SchematicsDialog extends BaseDialog{
private SchematicInfoDialog info = new SchematicInfoDialog();
private Schematic firstSchematic;
private String search = "";
@@ -168,7 +168,7 @@ public class SchematicsDialog extends FloatingDialog{
}
public void showImport(){
FloatingDialog dialog = new FloatingDialog("$editor.export");
BaseDialog dialog = new BaseDialog("$editor.export");
dialog.cont.pane(p -> {
p.margin(10f);
p.table(Tex.button, t -> {
@@ -217,7 +217,7 @@ public class SchematicsDialog extends FloatingDialog{
}
public void showExport(Schematic s){
FloatingDialog dialog = new FloatingDialog("$editor.export");
BaseDialog dialog = new BaseDialog("$editor.export");
dialog.cont.pane(p -> {
p.margin(10f);
p.table(Tex.button, t -> {
@@ -312,7 +312,7 @@ public class SchematicsDialog extends FloatingDialog{
}
}
public static class SchematicInfoDialog extends FloatingDialog{
public static class SchematicInfoDialog extends BaseDialog{
SchematicInfoDialog(){
super("");

4
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -31,7 +31,7 @@ public class SettingsMenuDialog extends SettingsDialog{
private Table prefs;
private Table menu;
private FloatingDialog dataDialog;
private BaseDialog dataDialog;
private boolean wasPaused;
public SettingsMenuDialog(){
@@ -77,7 +77,7 @@ public class SettingsMenuDialog extends SettingsDialog{
prefs.clearChildren();
prefs.add(menu);
dataDialog = new FloatingDialog("$settings.data");
dataDialog = new BaseDialog("$settings.data");
dataDialog.addCloseButton();
dataDialog.cont.table(Tex.button, t -> {

22
core/src/mindustry/ui/dialogs/TechTreeDialog.java
View File

@@ -1,8 +1,6 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.scene.ui.layout.Stack;
import arc.struct.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.input.*;
@@ -13,11 +11,14 @@ import arc.scene.actions.*;
import arc.scene.event.*;
import arc.scene.style.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.Stack;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.content.TechTree.*;
import mindustry.game.EventType.*;
import mindustry.game.Objectives.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
@@ -29,7 +30,7 @@ import java.util.*;
import static mindustry.Vars.*;
public class TechTreeDialog extends FloatingDialog{
public class TechTreeDialog extends BaseDialog{
private final float nodeSize = Scl.scl(60f);
private ObjectSet<TechTreeNode> nodes = new ObjectSet<>();
private TechTreeNode root = new TechTreeNode(TechTree.root, null);
@@ -361,6 +362,21 @@ public class TechTreeDialog extends FloatingDialog{
}).fillX().left();
t.row();
}
//TODO test if this works
if(node.objectives.length > 0){
t.table(r -> {
r.add("$complete").colspan(2).left();
r.row();
for(Objective o : node.objectives){
r.image(Icon.right).padRight(4);
r.add(o.display()).color(Color.lightGray);
r.image(o.complete() ? Icon.ok : Icon.cancel, o.complete() ? Color.lightGray : Color.scarlet).padLeft(3);
r.row();
}
});
t.row();
}
});
}else{
desc.add("$completed");

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

@@ -5,7 +5,7 @@ import arc.scene.ui.layout.Table;
import mindustry.gen.*;
import mindustry.net.Administration.TraceInfo;
public class TraceDialog extends FloatingDialog{
public class TraceDialog extends BaseDialog{
public TraceDialog(){
super("$trace");

171
core/src/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@@ -1,171 +0,0 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.graphics.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import mindustry.game.*;
import mindustry.game.Objectives.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.ui.Cicon;
import static mindustry.Vars.*;
//TODO remove
public class ZoneInfoDialog extends FloatingDialog{
private LoadoutDialog loadout = new LoadoutDialog();
public ZoneInfoDialog(){
super("");
titleTable.remove();
addCloseButton();
}
public void show(SectorPreset zone){
setup(zone);
show();
}
private void setup(SectorPreset zone){
cont.clear();
Table iteminfo = new Table();
Runnable rebuildItems = () -> {
int i = 0;
iteminfo.clear();
if(!zone.unlocked()) return;
for(ItemStack stack : zone.getLaunchCost()){
if(stack.amount == 0) continue;
if(i++ % 2 == 0){
iteminfo.row();
}
iteminfo.image(stack.item.icon(Cicon.small)).size(8 * 3).padRight(1);
iteminfo.add(stack.amount + "").color(Color.lightGray).padRight(5);
}
};
rebuildItems.run();
cont.pane(cont -> {
if(zone.locked()){
cont.image(Icon.lock);
cont.row();
cont.add("$locked").padBottom(6);
cont.row();
cont.table(req -> {
req.defaults().left();
Array<Objectives.Objective> zones = zone.requirements.select(o -> !(o instanceof Unlock));
if(!zones.isEmpty()){
req.table(r -> {
r.add("$complete").colspan(2).left();
r.row();
for(Objectives.Objective o : zones){
r.image(Icon.terrain).padRight(4);
r.add(o.display()).color(Color.lightGray);
r.image(o.complete() ? Icon.ok : Icon.cancel, o.complete() ? Color.lightGray : Color.scarlet).padLeft(3);
r.row();
}
});
}
req.row();
Array<Unlock> blocks = zone.requirements.select(o -> o instanceof Unlock).as();
if(!blocks.isEmpty()){
req.table(r -> {
r.add("$research.list").colspan(2).left();
r.row();
for(Unlock blocko : blocks){
r.image(blocko.block.icon(Cicon.small)).size(8 * 3).padRight(5);
r.add(blocko.block.localizedName).color(Color.lightGray).left();
r.image(blocko.block.unlocked() ? Icon.ok : Icon.cancel, blocko.block.unlocked() ? Color.lightGray : Color.scarlet).padLeft(3);
r.row();
}
}).padTop(10);
}
}).growX();
}else{
cont.add(zone.localizedName).color(Pal.accent).growX().center();
cont.row();
cont.image().color(Pal.accent).height(3).pad(6).growX();
cont.row();
cont.table(desc -> {
desc.left().defaults().left().width(Core.graphics.isPortrait() ? 350f : 500f);
desc.pane(t -> t.marginRight(12f).add(zone.description).wrap().growX()).fillX().maxHeight(mobile ? 300f : 450f).pad(2).padBottom(8f).get().setScrollingDisabled(true, false);
desc.row();
desc.table(t -> {
t.left();
t.add("$zone.resources").padRight(6);
/*
if(zone.resources.size > 0){
t.table(r -> {
t.left();
int i = 0;
for(Item item : zone.resources){
r.image(item.icon(Cicon.small)).size(8 * 3);
if(++i % 4 == 0){
r.row();
}
}
});
}else{
t.add("$none");
}*/
});
Rules rules = zone.getRules();
desc.row();
desc.add(Core.bundle.format("zone.objective", Core.bundle.get(!rules.attackMode ? "zone.objective.survival" : "zone.objective.attack")));
if(zone.bestWave() > 0){
desc.row();
desc.add(Core.bundle.format("bestwave", zone.bestWave()));
}
});
cont.row();
}
cont.marginRight(12f);
});
cont.row();
/*
cont.button(zone.canConfigure() ? "$configure" : Core.bundle.format("configure.locked", zone.configureObjective.display()),
() -> loadout.show(zone.loadout.findCore().itemCapacity, zone.getStartingItems(), zone::resetStartingItems, zone::updateLaunchCost, rebuildItems)
).fillX().pad(3).disabled(b -> !zone.canConfigure());*/
cont.row();
Button button = cont.button(zone.locked() ? "$uncover" : "$launch", () -> {
if(!data.isUnlocked(zone)){
Sounds.unlock.play();
data.unlockContent(zone);
ui.planet.setup();
setup(zone);
}else{
ui.planet.hide();
data.removeItems(zone.getLaunchCost());
hide();
//control.playZone(zone);
}
}).minWidth(200f).margin(13f).padTop(5).disabled(b -> zone.locked() ? !zone.canUnlock() : !data.hasItems(zone.getLaunchCost())).uniformY().get();
button.row();
button.add(iteminfo);
}
}

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -532,7 +532,7 @@ public class HudFragment extends Fragment{
}
private void showLaunchConfirm(){
FloatingDialog dialog = new FloatingDialog("$launch");
BaseDialog dialog = new BaseDialog("$launch");
dialog.update(() -> {
if(!inLaunchWave()){
dialog.hide();