diff --git a/android/build.gradle b/android/build.gradle index b1b9ef5628..5dba2016c9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript{ } dependencies{ - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.4.1' } } diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index aebe5859b0..111142e76f 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -215,7 +215,7 @@ public class Maps implements Disposable{ return filters; }else{ try{ - return JsonIO.read(Array.class, str); + return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry")); }catch(Exception e){ e.printStackTrace(); return readFilters(""); diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java index 2832ddaed2..f3c9062b5e 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java @@ -17,7 +17,6 @@ public class MirrorFilter extends GenerateFilter{ { options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)); - buffered = true; } @Override diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index 124b90df6d..62b4f24a79 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -106,7 +106,7 @@ public class PausedDialog extends FloatingDialog{ return; } - if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || Net.client()){ + if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || wasClient){ state.set(State.menu); logic.reset(); return; diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index 9ba2b3e6d4..722c897f27 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -39,7 +39,8 @@ public class DesktopPlatform extends Platform{ if(useDiscord){ try{ DiscordEventHandlers handlers = new DiscordEventHandlers(); - DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, ""); + DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "1127400"); + Log.info("Initialized Discord rich presence."); Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown)); }catch(Throwable t){ @@ -141,8 +142,8 @@ public class DesktopPlatform extends Platform{ @Override public void updateRPC(){ - if(!useDiscord) return; + Log.info("Updating discord RPC status."); DiscordRichPresence presence = new DiscordRichPresence();