Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-01-24 18:48:26 -05:00
parent aefc4ed83c
commit 69711151a5
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/mindustry/android/AndroidLauncher.java
View File

@@ -152,6 +152,7 @@ public class AndroidLauncher extends AndroidApplication{
//new external folder //new external folder
Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath()); Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath());
Core.settings.setDataDirectory(data);
//moved to internal storage if there's no file indicating that it moved //moved to internal storage if there's no file indicating that it moved
if(!Core.files.local("files_moved").exists()){ if(!Core.files.local("files_moved").exists()){
@@ -170,8 +171,6 @@ public class AndroidLauncher extends AndroidApplication{
Log.err("Failed to move files!"); Log.err("Failed to move files!");
t.printStackTrace(); t.printStackTrace();
} }
}else{
Core.settings.setDataDirectory(data);
} }
} }

7
core/src/mindustry/core/UI.java
View File

@@ -439,7 +439,6 @@ public class UI implements ApplicationListener, Loadable{
dialog.show(); dialog.show();
} }
public void showCustomConfirm(String title, String text, String yes, String no, Runnable confirmed, Runnable denied){ public void showCustomConfirm(String title, String text, String yes, String no, Runnable confirmed, Runnable denied){
FloatingDialog dialog = new FloatingDialog(title); FloatingDialog dialog = new FloatingDialog(title);
dialog.cont.add(text).width(mobile ? 400f : 500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center); dialog.cont.add(text).width(mobile ? 400f : 500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
@@ -472,11 +471,11 @@ public class UI implements ApplicationListener, Loadable{
public String formatAmount(int number){ public String formatAmount(int number){
if(number >= 1000000){ if(number >= 1000000){
return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]"; return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.get("unit.millions") + "[]";
}else if(number >= 10000){ }else if(number >= 10000){
return number / 1000 + "[gray]k[]"; return number / 1000 + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
}else if(number >= 1000){ }else if(number >= 1000){
return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.thousands") + "[]"; return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
}else{ }else{
return number + ""; return number + "";
} }