From 42ef2fe1280140ad9bc932c2e01976374e15be81 Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Sat, 27 Jun 2015 14:00:15 +0800
Subject: [PATCH] Fix a unlocalized string.

---
 HMCL/build.gradle                                      | 10 ++++------
 .../optifine/vanilla/OptiFineDownloadFormatter.java    |  3 ++-
 .../launcher/utils/settings/Settings.java              |  2 +-
 .../jackhuang/hellominecraft/launcher/I18N.properties  |  5 +++--
 .../hellominecraft/launcher/I18N_en_US.properties      |  5 +++--
 .../hellominecraft/launcher/I18N_zh_CN.properties      |  1 +
 .../hellominecraft/launcher/I18N_zh_TW.properties      |  1 +
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/HMCL/build.gradle b/HMCL/build.gradle
index e314e01ef..c39fdd0ed 100644
--- a/HMCL/build.gradle
+++ b/HMCL/build.gradle
@@ -1,8 +1,3 @@
-
-import java.util.jar.JarOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-
 /*
  * Copyright 2013 huangyuhui <huanghongxun2008@126.com>
  * 
@@ -19,6 +14,10 @@ import java.util.zip.ZipFile
  * You should have received a copy of the GNU General Public License
  * along with this program.
  */
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
 apply plugin: 'launch4j'
 apply plugin: 'me.tatarka.retrolambda'
 
@@ -85,7 +84,6 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
     
     injars injar
     outjars outjar
-    printusage "shrinking_" + version + ".map"
     printmapping "obfuscate_" + version + ".map"
     
     configuration 'proguard.pro'
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java
index ddf74fe90..1a6f1890f 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/optifine/vanilla/OptiFineDownloadFormatter.java
@@ -18,6 +18,7 @@ package org.jackhuang.hellominecraft.launcher.utils.installers.optifine.vanilla;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.communication.PreviousResult;
 import org.jackhuang.hellominecraft.utils.NetUtils;
@@ -50,7 +51,7 @@ public class OptiFineDownloadFormatter extends Task implements PreviousResult<St
 
     @Override
     public String getInfo() {
-        return "Get OptiFine Download Link.";
+        return C.i18n("install.optifine.get_download_link");
     }
 
     @Override
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java
index ba7eb067d..2f3a0cda9 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/settings/Settings.java
@@ -86,7 +86,7 @@ public final class Settings {
                     System.exit(1);
                 }
             }
-            isFirstLoad = StrUtils.isBlank(settings.getUsername());
+            isFirstLoad = StrUtils.isBlank(c.getUsername());
         } else {
             HMCLog.log("No settings file here, may be first loading.");
             isFirstLoad = true;
diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties
index c458f4c35..90716ba3b 100644
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N.properties
@@ -36,8 +36,9 @@ install.forge.get_list=\u83b7\u53d6Forge\u5217\u8868
 install.forge.install=\u5b89\u88c5Forge
 install.forge.get_changelogs=\u83b7\u53d6Forge\u66f4\u65b0\u8bb0\u5f55
 
-install.optifine.install=\u5b89\u88c5Optifine
-install.optifine.get_list=\u83b7\u53d6Optifine\u5217\u8868
+install.optifine.install=\u5b89\u88c5OptiFine
+install.optifine.get_list=\u83b7\u53d6OptiFine\u5217\u8868
+install.optifine.get_download_link=\u83b7\u53d6OptiFine\u4e0b\u8f7d\u5730\u5740
 
 install.failed_forge=\u5b89\u88c5Forge\u5931\u8d25
 install.failed_optifine=\u5b89\u88c5Optifine\u5931\u8d25
diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties
index 1bd61d02d..bd089430c 100644
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_en_US.properties
@@ -36,8 +36,9 @@ install.forge.get_list=Get Forge List
 install.forge.install=Install Forge
 install.forge.get_changelogs=Get Forge Changelogs
 
-install.optifine.install=Install Optifine
-install.optifine.get_list=Get OptifineList
+install.optifine.install=Install OptiFine
+install.optifine.get_list=Get OptiFine Download List
+install.optifine.get_download_link=Get the Download Link of OptiFine
 
 install.failed_forge=Failed to Install Forge
 install.failed_optifine=Failed to Install Optifine
diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties
index f9d7a0574..a31bbfa84 100644
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_CN.properties
@@ -38,6 +38,7 @@ install.forge.get_changelogs=\u83b7\u53d6Forge\u66f4\u65b0\u8bb0\u5f55
 
 install.optifine.install=\u5b89\u88c5Optifine
 install.optifine.get_list=\u83b7\u53d6Optifine\u5217\u8868
+install.optifine.get_download_link=\u83b7\u53d6OptiFine\u4e0b\u8f7d\u5730\u5740
 
 install.failed_forge=\u5b89\u88c5Forge\u5931\u8d25
 install.failed_optifine=\u5b89\u88c5Optifine\u5931\u8d25
diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties
index 76593c74a..037ea660a 100644
--- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties
+++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/launcher/I18N_zh_TW.properties
@@ -38,6 +38,7 @@ install.forge.get_changelogs=\u7372\u53d6Forge\u66f4\u65b0\u8a18\u9304
 
 install.optifine.install=\u5b89\u88ddOptifine
 install.optifine.get_list=\u7372\u53d6Optifine\u5217\u8868
+install.optifine.get_download_link=\u7372\u53d6OptiFine\u4e0b\u8f7d\u5730\u5740
 
 install.failed_forge=\u5b89\u88ddForge\u5931\u6557
 install.failed_optifine=\u5b89\u88ddOptifine\u5931\u6557