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

Removed usage of Core.settings#save

Browse Source
This commit is contained in:
Anuken
2020-05-16 10:23:06 -04:00
parent d390484ea4
commit d110fe5ea3
30 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ public class ItemsDisplay extends Table{
private String format(Item item){
builder.setLength(0);
builder.append(ui.formatAmount(data.items().get(item, 0)));
builder.append(ui.formatAmount(data.getItem(item)));
if(state.isGame() && player.team().data().hasCore() && player.team().core().items().get(item) > 0){
builder.append(" [unlaunched]+ ");
builder.append(ui.formatAmount(state.teams.get(player.team()).core().items().get(item)));

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

@@ -67,7 +67,7 @@ public class AboutDialog extends FloatingDialog{
table.button(Icon.link, () -> {
if(link.name.equals("wiki")) Events.fire(Trigger.openWiki);
if(!Core.net.openURI(link.link)){
if(!Core.app.openURI(link.link)){
ui.showErrorMessage("$linkfail");
Core.app.setClipboardText(link.link);
}

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

@@ -43,7 +43,7 @@ public class DiscordDialog extends Dialog{
Core.app.setClipboardText(discordURL);
});
buttons.button("$openlink", () -> {
if(!Core.net.openURI(discordURL)){
if(!Core.app.openURI(discordURL)){
ui.showErrorMessage("$linkfail");
Core.app.setClipboardText(discordURL);
}

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

@@ -25,7 +25,6 @@ public class HostDialog extends FloatingDialog{
t.field(Core.settings.getString("name"), text -> {
player.name(text);
Core.settings.put("name", text);
Core.settings.save();
ui.listfrag.rebuild();
}).grow().pad(8).get().setMaxLength(40);
@@ -33,7 +32,6 @@ public class HostDialog extends FloatingDialog{
new PaletteDialog().show(color -> {
player.color().set(color);
Core.settings.put("color-0", color.rgba());
Core.settings.save();
});
}).size(54f).get();
button.update(() -> button.getStyle().imageUpColor = player.color());
@@ -71,17 +69,17 @@ public class HostDialog extends FloatingDialog{
if(steam){
Core.app.post(() -> Core.settings.getBoolOnce("steampublic2", () -> {
ui.showCustomConfirm("$setting.publichost.name", "$public.confirm", "$yes", "$no", () -> {
Core.settings.putSave("publichost", true);
Core.settings.put("publichost", true);
platform.updateLobby();
}, () -> {
Core.settings.putSave("publichost", false);
Core.settings.put("publichost", false);
platform.updateLobby();
});
}));
}
if(Version.modifier.contains("beta")){
Core.settings.putSave("publichost", false);
Core.settings.put("publichost", false);
platform.updateLobby();
Core.settings.getBoolOnce("betapublic", () -> ui.showInfo("$public.beta"));
}

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

@@ -49,7 +49,6 @@ public class JoinDialog extends FloatingDialog{
TextField field = add.cont.field(Core.settings.getString("ip"), text -> {
Core.settings.put("ip", text);
Core.settings.save();
}).size(320f, 54f).get();
platform.addDialog(field, 100);
@@ -265,7 +264,6 @@ public class JoinDialog extends FloatingDialog{
t.field(Core.settings.getString("name"), text -> {
player.name(text);
Core.settings.put("name", text);
Core.settings.save();
}).grow().pad(8).get().setMaxLength(maxNameLength);
}else{
t.add(player.name()).update(l -> l.setColor(player.color())).grow().pad(8);
@@ -275,7 +273,6 @@ public class JoinDialog extends FloatingDialog{
new PaletteDialog().show(color -> {
player.color().set(color);
Core.settings.put("color-0", color.rgba8888());
Core.settings.save();
});
}).size(54f).get();
button.update(() -> button.getStyle().imageUpColor = player.color());
@@ -312,7 +309,7 @@ public class JoinDialog extends FloatingDialog{
name.add(label).pad(10).growX().left().color(Pal.accent);
name.button(Icon.downOpen, Styles.emptyi, () -> {
coll.toggle(false);
Core.settings.putSave("collapsed-" + label, coll.isCollapsed());
Core.settings.put("collapsed-" + label, coll.isCollapsed());
}).update(i -> i.getStyle().imageUp = (!coll.isCollapsed() ? Icon.upOpen : Icon.downOpen)).size(40f).right().padRight(10f);
}).growX();
hosts.row();
@@ -442,7 +439,6 @@ public class JoinDialog extends FloatingDialog{
private void saveServers(){
Core.settings.putObject("server-list", servers);
Core.settings.save();
}
@Serialize

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

@@ -39,7 +39,6 @@ public class LanguageDialog extends FloatingDialog{
button.clicked(() -> {
if(getLocale().equals(loc)) return;
Core.settings.put("locale", loc.toString());
Core.settings.save();
Log.info("Setting locale: @", loc.toString());
ui.showInfo("$language.restart");
});

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

@@ -23,7 +23,7 @@ public class ModsDialog extends FloatingDialog{
super("$mods");
addCloseButton();
buttons.button("$mods.guide", Icon.link, () -> Core.net.openURI(modGuideURL)).size(210, 64f);
buttons.button("$mods.guide", Icon.link, () -> Core.app.openURI(modGuideURL)).size(210, 64f);
shown(this::setup);

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

@@ -101,7 +101,6 @@ public class PausedDialog extends FloatingDialog{
ui.showConfirm("$confirm", state.rules.tutorial ? "$quit.confirm.tutorial" : "$quit.confirm", () -> {
if(state.rules.tutorial){
Core.settings.put("playedtutorial", true);
Core.settings.save();
}
wasClient = net.client();
if(net.client()) netClient.disconnectQuietly();

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

@@ -382,7 +382,7 @@ public class PlanetDialog extends FloatingDialog{
stable.row();
stable.button(selected.hasSave() ? "Continue" : "Launch", Styles.transt, () -> {
stable.button("Launch", Styles.transt, () -> {
if(selected != null){
if(selected.is(SectorAttribute.naval)){
ui.showInfo("You need a naval loadout to launch here.");

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

@@ -93,7 +93,6 @@ public class SettingsMenuDialog extends SettingsDialog{
}
Core.settings.clear();
Core.settings.putAll(map);
Core.settings.save();
for(Fi file : dataDirectory.list()){
file.deleteDirectory();

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

@@ -107,7 +107,7 @@ public class MenuFragment extends Fragment{
editor = new MobileButton(Icon.terrain, "$editor", () -> checkPlay(ui.maps::show)),
tools = new MobileButton(Icon.settings, "$settings", ui.settings::show),
mods = new MobileButton(Icon.book, "$mods", ui.mods::show),
donate = new MobileButton(Icon.link, "$website", () -> Core.net.openURI("https://anuke.itch.io/mindustry")),
donate = new MobileButton(Icon.link, "$website", () -> Core.app.openURI("https://anuke.itch.io/mindustry")),
exit = new MobileButton(Icon.exit, "$quit", () -> Core.app.exit());
if(!Core.graphics.isPortrait()){