From 6d6fe41bc5dce40084c3e044e21116327f4a8318 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 1 Nov 2019 15:19:42 -0400
Subject: [PATCH] Bugfixes

---
 core/assets/bundles/bundle.properties               |  1 +
 core/src/io/anuke/mindustry/mod/Mods.java           | 13 +++++++++----
 .../io/anuke/mindustry/desktop/DesktopLauncher.java |  2 +-
 gradle.properties                                   |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 4dd936f376..da50c85923 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -95,6 +95,7 @@ mods.report = Report Bug
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
 mod.disable = Disable
+mod.delete.error = Unable to delete mod. File may be in use.
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
 mod.enable = Enable
diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/io/anuke/mindustry/mod/Mods.java
index e26a3df983..8e51103e3d 100644
--- a/core/src/io/anuke/mindustry/mod/Mods.java
+++ b/core/src/io/anuke/mindustry/mod/Mods.java
@@ -150,10 +150,15 @@ public class Mods implements Loadable{
 
     /** Removes a mod file and marks it for requiring a restart. */
     public void removeMod(LoadedMod mod){
-        if(mod.file.isDirectory()){
-            mod.file.deleteDirectory();
-        }else{
-            mod.file.delete();
+        if(mod.root instanceof ZipFileHandle){
+            Log.info("Deleting zip file.");
+            mod.root.delete();
+        }
+        boolean deleted = mod.file.isDirectory() ? mod.file.deleteDirectory() : mod.file.delete();
+
+        if(!deleted){
+            ui.showErrorMessage("$mod.delete.error");
+            return;
         }
         loaded.remove(mod);
         disabled.remove(mod);
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index dabd4a43bd..c9a7f926ea 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -108,7 +108,7 @@ public class DesktopLauncher extends ClientLauncher{
                     t.touchable(Touchable.disabled);
                     t.top().left();
                     t.update(() -> {
-                        if(Core.input.keyTap(KeyCode.BACKTICK) && (loadError || System.getProperty("user.name").equals("anuke"))){
+                        if(Core.input.keyTap(KeyCode.BACKTICK) && (loadError || System.getProperty("user.name").equals("anuke") || Version.modifier.contains("beta"))){
                             visible[0] = !visible[0];
                         }
 
diff --git a/gradle.properties b/gradle.properties
index 1af02dd753..9739ad7db9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=aea47cc96715e7b588a9f39eb41f4c288fa1d37d
+archash=35bd829fddd24bd90b2384d954bc76da173e8a0f