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

Replaced '$' formatting with '@'

Browse Source
This commit is contained in:
Anuken
2020-08-04 10:18:01 -04:00
parent 8dd4839f53
commit f60afc39f1
68 changed files with 458 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/net/BeControl.java
View File

@@ -85,13 +85,13 @@ public class BeControl{
if(!headless){
checkUpdates = false;
ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "$be.update.confirm", "$ok", "$be.ignore", () -> {
ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "@be.update.confirm", "@ok", "@be.ignore", () -> {
boolean[] cancel = {false};
float[] progress = {0};
int[] length = {0};
Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
BaseDialog dialog = new BaseDialog("$be.updating");
BaseDialog dialog = new BaseDialog("@be.updating");
download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
try{
Runtime.getRuntime().exec(new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()});
@@ -105,7 +105,7 @@ public class BeControl{
});
dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f);
dialog.buttons.button("$cancel", Icon.cancel, () -> {
dialog.buttons.button("@cancel", Icon.cancel, () -> {
cancel[0] = true;
dialog.hide();
}).size(210f, 64f);

2
core/src/mindustry/net/Net.java
View File

@@ -70,7 +70,7 @@ public class Net{
}
if(isError){
ui.showException("$error.any", e);
ui.showException("@error.any", e);
}else{
ui.showText("", Core.bundle.format("connectfail", error));
}