Bugfix

weihao · May 11, 2018 · c557f7b · c557f7b
1 parent 63b94d2
commit c557f7b
Show file tree

Hide file tree

Showing 8 changed files with 233 additions and 93 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/events/blacksmith/SecretBook.java b/src/main/java/org/pixeltime/enchantmentsenhance/events/blacksmith/SecretBook.java
@@ -7,6 +7,7 @@
 import org.pixeltime.enchantmentsenhance.util.Util;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -20,7 +21,9 @@ public class SecretBook {
      * @param player Targeted player.
      */
     public static void addFailstackToStorage(Player player) {
-        storage.get(player.getName()).add(Failstack.getLevel(player));
+        List<Integer> temp = storage.get(player.getName());
+        temp.add(Failstack.getLevel(player));
+        Collections.sort(temp);
         Failstack.resetLevel(player);
         Util.sendMessage(SettingsManager.lang.getString("Save.createFailstack")
                 .replaceAll("%failstack%", Integer.toString(Failstack.getLevel(

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/manager/language/Language_en_us.java b/src/main/java/org/pixeltime/enchantmentsenhance/manager/language/Language_en_us.java
@@ -46,7 +46,7 @@ public static void addLang() {
         SettingsManager.lang.addDefault("Messages.madeTradeable", "&2It is now trade available!");
         SettingsManager.lang.addDefault("Messages.madeUnbound", "&2It is now unbound!");
         SettingsManager.lang.addDefault("Messages.noDrop", "&4This item cannot be dropped!");
-        SettingsManager.lang.addDefault("Messages.moStorage", "&4This item cannot be stored!");
+        SettingsManager.lang.addDefault("Messages.noStorage", "&4This item cannot be stored!");
 
         SettingsManager.lang.addDefault("Save.createFailstack", "&6You created &9Advice of Valks+%failstack%");
         SettingsManager.lang.addDefault("Save.noFailstack", "&cYou don't have any &9Advice of Valks!");
@@ -65,7 +65,6 @@ public static void addLang() {
         SettingsManager.lang.addDefault("Help.debug", "&6collect debugging information for developer to fix issues.");
         SettingsManager.lang.addDefault("Help.reform", "&6upgrade the grade of the gear.");
 
-
         SettingsManager.lang.addDefault("Menu.gui.title", "Enhancement");
         SettingsManager.lang.addDefault("Menu.gui.enhance", "Enhance");
         SettingsManager.lang.addDefault("Menu.gui.force", "Force");
@@ -105,9 +104,9 @@ public static void addLang() {
                 "0 = weapon stone, 1 = armor stone, 2 = conc weapon, 3 = conc armor");
 
         SettingsManager.lang.addDefault("Add.successful", "&aYou gave %player% %number% of %stone%.");
-
         SettingsManager.lang.addDefault("Reform.gui.title", "Item Reform");
         SettingsManager.lang.addDefault("Reform.reform", "Reform Item");
+
         SettingsManager.lang.options().copyDefaults(true);
         SettingsManager.saveLang();
     }

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/manager/language/Language_zh_cn.java b/src/main/java/org/pixeltime/enchantmentsenhance/manager/language/Language_zh_cn.java
@@ -60,6 +60,8 @@ public static void addLang() {
         SettingsManager.lang.addDefault("Help.inventory", "&6查看你已收集的道具.");
         SettingsManager.lang.addDefault("Help.select", "&6/enhance select {n} 来使用巴尔克斯的忠告.");
         SettingsManager.lang.addDefault("Help.add", "&6给予一个玩家指定黑石.");
+        SettingsManager.lang.addDefault("Help.debug", "&6收集数据以帮助开发者解决问题.");
+        SettingsManager.lang.addDefault("Help.reform", "&6打开改良道具的面板.");
 
         SettingsManager.lang.addDefault("Menu.gui.title", "潜力突破界面");
         SettingsManager.lang.addDefault("Menu.gui.enhance", "强化");
@@ -79,27 +81,6 @@ public static void addLang() {
         SettingsManager.lang.addDefault("Menu.lore.ifDowngrade", "&6潜力突破失败会使物品&c降级");
         SettingsManager.lang.addDefault("Menu.lore.ifDestroy", "&6潜力突破失败会使物品&4炸裂");
 
-        SettingsManager.lang.addDefault("Name.0", "+1 ");
-        SettingsManager.lang.addDefault("Name.1", "+2 ");
-        SettingsManager.lang.addDefault("Name.2", "+3 ");
-        SettingsManager.lang.addDefault("Name.3", "+4 ");
-        SettingsManager.lang.addDefault("Name.4", "+5 ");
-        SettingsManager.lang.addDefault("Name.5", "+6 ");
-        SettingsManager.lang.addDefault("Name.6", "+7 ");
-        SettingsManager.lang.addDefault("Name.7", "+8 ");
-        SettingsManager.lang.addDefault("Name.8", "+9 ");
-        SettingsManager.lang.addDefault("Name.9", "+10 ");
-        SettingsManager.lang.addDefault("Name.10", "+11 ");
-        SettingsManager.lang.addDefault("Name.11", "+12 ");
-        SettingsManager.lang.addDefault("Name.12", "+13 ");
-        SettingsManager.lang.addDefault("Name.13", "+14 ");
-        SettingsManager.lang.addDefault("Name.14", "+15 ");
-        SettingsManager.lang.addDefault("Name.15", "I 场");
-        SettingsManager.lang.addDefault("Name.16", "II 光");
-        SettingsManager.lang.addDefault("Name.17", "III 高");
-        SettingsManager.lang.addDefault("Name.18", "IV 有");
-        SettingsManager.lang.addDefault("Name.19", "V 同");
-
         SettingsManager.lang.addDefault("Item.title", "&6你已收集以下道具:");
         SettingsManager.lang.addDefault("Item.listing", "&e%ITEM% &f: &c%COUNT%");
         SettingsManager.lang.addDefault("Item.0", "&6黑石 (武器)");
@@ -117,7 +98,11 @@ public static void addLang() {
 
         SettingsManager.lang.addDefault("Example.command.add.guide", "enhance add <玩家> <附魔石类型> <数量>");
         SettingsManager.lang.addDefault("Example.command.add.stone", "0 = 黑石 (武器), 1 = 黑石 (防具), 2 = 凝聚魔力的黑石 (武器), 3 = 凝聚魔力的黑石 (防具)");
+
         SettingsManager.lang.addDefault("Add.successful", "你给%player%了%number%个%stone%.");
+        SettingsManager.lang.addDefault("Reform.gui.title", "道具改良");
+        SettingsManager.lang.addDefault("Reform.reform", "改良道具");
+
         SettingsManager.lang.options().copyDefaults(true);
         SettingsManager.saveLang();
     }

diff --git a/src/main/kotlin/org/pixeltime/enchantmentsenhance/KotlinManager.kt b/src/main/kotlin/org/pixeltime/enchantmentsenhance/KotlinManager.kt
@@ -9,7 +9,7 @@ class KM {
             getMain().logger.info("Kotlin module is enabled: Hello World!")
         }
         @JvmStatic
-        fun sorting(a: IntArray)
+        fun sortArray(a: IntArray)
         {
             a.sort()
         }