From 8d2a637bd8b0944a7863d6ec92e7e5a830cebaea Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 22 Jul 2019 00:56:00 -0400
Subject: [PATCH] Fixed build errors

---
 core/src/io/anuke/mindustry/core/Control.java              | 1 +
 core/src/io/anuke/mindustry/editor/WaveInfoDialog.java     | 6 +++---
 core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java    | 2 +-
 core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java  | 4 ++--
 .../io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java  | 7 +++++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 324bc0acd9..d5e5f5e111 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -290,6 +290,7 @@ public class Control implements ApplicationListener{
 
             dialog.buttons.addButton("$ok", () -> {
                 Core.settings.put("uiscalechanged", false);
+                settings.save();
                 dialog.hide();
             });
 
diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
index 3c6e4edf4b..e74bec2ea3 100644
--- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
@@ -52,19 +52,19 @@ public class WaveInfoDialog extends FloatingDialog{
             dialog.cont.defaults().size(210f, 64f);
             dialog.cont.addButton("$waves.copy", () -> {
                 ui.showInfoFade("$waves.copied");
-                Core.app.getClipboard().setContents(world.maps.writeWaves(groups));
+                Core.app.setClipboardText(world.maps.writeWaves(groups));
                 dialog.hide();
             }).disabled(b -> groups == null);
             dialog.cont.row();
             dialog.cont.addButton("$waves.load", () -> {
                 try{
-                    groups = world.maps.readWaves(Core.app.getClipboard().getContents());
+                    groups = world.maps.readWaves(Core.app.getClipboardText());
                     buildGroups();
                 }catch(Exception e){
                     ui.showError("$waves.invalid");
                 }
                 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.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () -> {
                 groups = JsonIO.copy(defaultWaves.get());
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
index b6d1933d57..bac51b97bf 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
@@ -65,7 +65,7 @@ public class AboutDialog extends FloatingDialog{
             table.addImageButton("icon-link", iconsize, () -> {
                 if(!Core.net.openURI(link.link)){
                     ui.showError("$linkfail");
-                    Core.app.getClipboard().setContents(link.link);
+                    Core.app.setClipboardText(link.link);
                 }
             }).size(h - 5, h);
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
index e427fb9dc4..c7c343c6c6 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
@@ -39,12 +39,12 @@ public class DiscordDialog extends Dialog{
 
         buttons.addButton("$back", this::hide);
         buttons.addButton("$copylink", () -> {
-            Core.app.getClipboard().setContents(discordURL);
+            Core.app.setClipboardText(discordURL);
         });
         buttons.addButton("$openlink", () -> {
             if(!Core.net.openURI(discordURL)){
                 ui.showError("$linkfail");
-                Core.app.getClipboard().setContents(discordURL);
+                Core.app.setClipboardText(discordURL);
             }
         });
     }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index b9cbe1077d..76f9f098e4 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -11,7 +11,7 @@ import io.anuke.arc.scene.event.InputListener;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.Setting;
 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.Platform;
 import io.anuke.mindustry.graphics.Pal;
@@ -185,7 +185,10 @@ public class SettingsMenuDialog extends SettingsDialog{
         });
 
         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 + "%";
         });
         graphics.sliderPref("fpscap", 241, 5, 241, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));