mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-11-01 15:19:42 -04:00
parent 6f19685255
commit 6d6fe41bc5
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@ -95,6 +95,7 @@ mods.report = Report Bug
mod.enabled = [lightgray]Enabled mod.enabled = [lightgray]Enabled
mod.disabled = [scarlet]Disabled mod.disabled = [scarlet]Disabled
mod.disable = Disable mod.disable = Disable
mod.delete.error = Unable to delete mod. File may be in use.
mod.missingdependencies = [scarlet]Missing dependencies: {0} 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.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 mod.enable = Enable

13
core/src/io/anuke/mindustry/mod/Mods.java
View File

@ -150,10 +150,15 @@ public class Mods implements Loadable{
/** Removes a mod file and marks it for requiring a restart. */ /** Removes a mod file and marks it for requiring a restart. */
public void removeMod(LoadedMod mod){ public void removeMod(LoadedMod mod){
if(mod.file.isDirectory()){ if(mod.root instanceof ZipFileHandle){
mod.file.deleteDirectory(); Log.info("Deleting zip file.");
}else{ mod.root.delete();
mod.file.delete(); }
boolean deleted = mod.file.isDirectory() ? mod.file.deleteDirectory() : mod.file.delete();
if(!deleted){
ui.showErrorMessage("$mod.delete.error");
return;
} }
loaded.remove(mod); loaded.remove(mod);
disabled.remove(mod); disabled.remove(mod);

2
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@ -108,7 +108,7 @@ public class DesktopLauncher extends ClientLauncher{
t.touchable(Touchable.disabled); t.touchable(Touchable.disabled);
t.top().left(); t.top().left();
t.update(() -> { 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]; visible[0] = !visible[0];
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=aea47cc96715e7b588a9f39eb41f4c288fa1d37d archash=35bd829fddd24bd90b2384d954bc76da173e8a0f