diff --git a/build.gradle b/build.gradle index ffaa10132a..82b5254689 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { appName = "Mindustry" gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = 'b882f59'; + uCoreVersion = '5e4e43ed39'; } repositories { diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 54218fe975..5d8449b6ea 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -615,10 +615,10 @@ public class Control extends Module{ if(Inputs.keyTap("menu")){ if(GameState.is(State.paused)){ - ui.menu.hide(); + ui.paused.hide(); GameState.set(State.playing); }else if (!ui.restart.isShown()){ - ui.menu.show(); + ui.paused.show(); GameState.set(State.paused); } } diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index c39ad022c7..e6aab81d61 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -34,7 +34,7 @@ public class UI extends SceneModule{ public DiscordDialog discord; public JoinDialog join; public HostDialog host; - public MenuDialog menu; + public PausedDialog paused; public SettingsMenuDialog settings; public ControlsDialog controls; public MapEditorDialog editor; @@ -138,7 +138,7 @@ public class UI extends SceneModule{ upgrades = new UpgradeDialog(); levels = new LevelDialog(); settings = new SettingsMenuDialog(); - menu = new MenuDialog(); + paused = new PausedDialog(); about = new AboutDialog(); host = new HostDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index 40d77ba798..356e0cd369 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -169,10 +169,10 @@ public class LoadDialog extends FloatingDialog{ try{ slot.load(); GameState.set(State.playing); - Vars.ui.menu.hide(); + Vars.ui.paused.hide(); }catch(Exception e){ e.printStackTrace(); - Vars.ui.menu.hide(); + Vars.ui.paused.hide(); GameState.set(State.menu); Vars.control.reset(); Vars.ui.showError("$text.save.corrupted"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java similarity index 98% rename from core/src/io/anuke/mindustry/ui/dialogs/MenuDialog.java rename to core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index d79de220db..949105190d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -15,12 +15,12 @@ import io.anuke.ucore.util.Bundles; import static io.anuke.mindustry.Vars.ui; -public class MenuDialog extends FloatingDialog{ +public class PausedDialog extends FloatingDialog{ private SaveDialog save = new SaveDialog(); private LoadDialog load = new LoadDialog(); public boolean wasPaused = false; - public MenuDialog() { + public PausedDialog() { super("$text.menu"); setup(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 3ebd4a718e..dddb9bdcaf 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -44,11 +44,11 @@ public class SettingsMenuDialog extends SettingsDialog{ if(!GameState.is(State.menu)){ wasPaused = GameState.is(State.paused); if(menu.getScene() != null){ - wasPaused = ((io.anuke.mindustry.ui.dialogs.MenuDialog)menu).wasPaused; + wasPaused = ((PausedDialog)menu).wasPaused; } if(!Net.active()) GameState.set(State.paused); //TODO hide menu - Vars.ui.menu.hide(); + Vars.ui.paused.hide(); } }); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index f78d30fed5..26d55327f7 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -41,7 +41,7 @@ public class HudFragment implements Fragment{ defaults().size(dsize).left(); float isize = 40; - menu = new imagebutton("icon-menu", isize, ui.menu::show).get(); + menu = new imagebutton("icon-menu", isize, ui.paused::show).get(); flip = new imagebutton("icon-arrow-up", isize, ()->{ if(wavetable.getActions().size != 0) return;