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

Fixed build errors

Browse Source
This commit is contained in:
Anuken
2019-07-22 00:56:00 -04:00
parent 54180c4768
commit 8d2a637bd8
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -290,6 +290,7 @@ public class Control implements ApplicationListener{
dialog.buttons.addButton("$ok", () -> { dialog.buttons.addButton("$ok", () -> {
Core.settings.put("uiscalechanged", false); Core.settings.put("uiscalechanged", false);
settings.save();
dialog.hide(); dialog.hide();
}); });

6
core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
View File

@@ -52,19 +52,19 @@ public class WaveInfoDialog extends FloatingDialog{
dialog.cont.defaults().size(210f, 64f); dialog.cont.defaults().size(210f, 64f);
dialog.cont.addButton("$waves.copy", () -> { dialog.cont.addButton("$waves.copy", () -> {
ui.showInfoFade("$waves.copied"); ui.showInfoFade("$waves.copied");
Core.app.getClipboard().setContents(world.maps.writeWaves(groups)); Core.app.setClipboardText(world.maps.writeWaves(groups));
dialog.hide(); dialog.hide();
}).disabled(b -> groups == null); }).disabled(b -> groups == null);
dialog.cont.row(); dialog.cont.row();
dialog.cont.addButton("$waves.load", () -> { dialog.cont.addButton("$waves.load", () -> {
try{ try{
groups = world.maps.readWaves(Core.app.getClipboard().getContents()); groups = world.maps.readWaves(Core.app.getClipboardText());
buildGroups(); buildGroups();
}catch(Exception e){ }catch(Exception e){
ui.showError("$waves.invalid"); ui.showError("$waves.invalid");
} }
dialog.hide(); dialog.hide();
}).disabled(b -> Core.app.getClipboard().getContents() == null || Core.app.getClipboard().getContents().isEmpty()); }).disabled(b -> Core.app.getClipboardText() == null || Core.app.getClipboardText().isEmpty());
dialog.cont.row(); dialog.cont.row();
dialog.cont.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () -> { dialog.cont.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () -> {
groups = JsonIO.copy(defaultWaves.get()); groups = JsonIO.copy(defaultWaves.get());

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

@@ -65,7 +65,7 @@ public class AboutDialog extends FloatingDialog{
table.addImageButton("icon-link", iconsize, () -> { table.addImageButton("icon-link", iconsize, () -> {
if(!Core.net.openURI(link.link)){ if(!Core.net.openURI(link.link)){
ui.showError("$linkfail"); ui.showError("$linkfail");
Core.app.getClipboard().setContents(link.link); Core.app.setClipboardText(link.link);
} }
}).size(h - 5, h); }).size(h - 5, h);

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

@@ -39,12 +39,12 @@ public class DiscordDialog extends Dialog{
buttons.addButton("$back", this::hide); buttons.addButton("$back", this::hide);
buttons.addButton("$copylink", () -> { buttons.addButton("$copylink", () -> {
Core.app.getClipboard().setContents(discordURL); Core.app.setClipboardText(discordURL);
}); });
buttons.addButton("$openlink", () -> { buttons.addButton("$openlink", () -> {
if(!Core.net.openURI(discordURL)){ if(!Core.net.openURI(discordURL)){
ui.showError("$linkfail"); ui.showError("$linkfail");
Core.app.getClipboard().setContents(discordURL); Core.app.setClipboardText(discordURL);
} }
}); });
} }

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

@@ -11,7 +11,7 @@ import io.anuke.arc.scene.event.InputListener;
import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.*;
import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.Setting; import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.Setting;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Align; import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
@@ -185,7 +185,10 @@ public class SettingsMenuDialog extends SettingsDialog{
}); });
graphics.sliderPref("uiscale", 100, 25, 400, 25, s -> { graphics.sliderPref("uiscale", 100, 25, 400, 25, s -> {
Core.settings.put("uiscalechanged", true); if(Core.graphics.getFrameId() > 10){
Log.info("changed");
Core.settings.put("uiscalechanged", true);
}
return s + "%"; return s + "%";
}); });
graphics.sliderPref("fpscap", 241, 5, 241, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); graphics.sliderPref("fpscap", 241, 5, 241, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));