LangChecker init

Librazy · Librazy · commit 38ea6b4744e3 · 2017-04-27T01:44:38.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ deploy:
   skip_cleanup: true
   prerelease: true
   api_key:
-    secure: EDe3KykJ7BGwnIlsdiZGUVU0qev5uHd+3V5aq5be2VQYpvBIS1Ifh+MjMfLSs4DuViT9TbBXqMwRdj9Ub5CAK2uSTsCxBXC6me9ozyrX326l2EawCTbPqKwBpy3lQeKyvwb4XJJ5U5ugvzqRX0WYfdM1/n+77Tu14YIqIpyKJNruNAhZyBhnvuaQ/EfVWl/eWhXHAa51GklWq3xsIJHG991wZ7dMZsooETfSTzX0ZK3JaI0dZsgTZMsBIDJePOcdoCzSsdBCq/yQVMT4GLEDq6rFp46gGix6H3QEm4wc16w70ksX8iJgbhrHp1OZVsDAZw3Nc94BIuaJqFJbl3itRIayM5IS3sd4TIjBc8X8dVJOh+wrObL6j8EmWkfi84KedFQKQ6UYZLjy4Aaki6oqCn6JMsa73+g0r0UrTeIMt0hcyVQDwzRFd+iyKr4c+hsvGUFZAxU5h+2aMrp2PnEp7UKr0ljQZZ1zVONwBj3PrBaDbvHBl7AOFlfAkZxobbqrvjgq3p5G8BXENmyPnrfPNxByxxDsu2SpagZLOQOLrz3fXnv9SjMjL2/QrpLGmIVAOG7lPD7x5YgeGJHKJKvE/HijQcQCpdXmh4KlGH4Hpeq1JYf1ledK2cYHnzFltcCuoVscTf8i35pghmwD9yDDEIund08cIyq+6e4NEC+/r/g=
+    secure: ${GITHUB_DEPLOY_KEY}
   file: './nyaautils-$TRAVIS_BRANCH-v$main_version.$TRAVIS_BUILD_NUMBER.jar'
   on:
     tags: false
@@ -41,5 +41,4 @@ branches:
   - "maven-repo"
 env:
   global:
-    - secure: d87YXY8y4KW9v06Q4VmkEyUVPgfjGu334jcNhllfRdMQub9ue0ofSP1XR41bCMwcWvPyMuauIsSS6wA5TojeWTAFXV9ESzWHonLhCJpMcTL/8+Ohc62qQZCpWWWqze5wBgh0fxZiXsV9V6cGFJoB5qh/vZM86EMnYHrkTamNXy/6yVTIxRmwNZLhVRrPsBaOaThfOQm4lMw6TOzlqDmt4YBiTnF9oxC7iK8bsEf9SWoI8oeYayF2dtDZBo1SPrUR53+BDl0Xlvolx6eytKeXVEjhKs2kYmRN26WC622GHFwBfo2iIZDGwBSQP1uqr4P2DOvRPG3LNwOUkzcpbJG592YMLms9/YdQrpx1qR+wsyHlyTjICNDhcizRNrWjY6EKYRWR0NAkH3Wu8YkspuhH7qiiWyyGJNRCsppn/AfX9J+9LH8okkGV2h/OGHqlmWo6QaJGjLwTObUCj7JEml7l4eFspc8ThduSg8nTzFXhUAuygPxTKOZRt+bHF2S734vYKkbX2ARDPL1G3gbC3K7uqhEkLV3mpOyUz+57HQ0ukF0wCmTq+bZqD5gHwSA+CXmiVmMam/4y4Y+j08V+9hLwcMvTYPt2MxyXenYfLe+Cz4FL4prhUO0c26oOVSKVPPdNyU1k++jlHDm1S5CvvePoNGebq2I5DGgx8Sf/0n42Xv0=
     - main_version=2
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,8 @@
-apply plugin: 'java'
-apply plugin: 'maven-publish'
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'org.inferred.processors' version '1.2.11'
+}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -26,6 +29,11 @@ repositories {
         name 'vault-repo'
         url 'http://nexus.hc.to/content/repositories/pub_releases'
     }
+
+    maven {
+        name 'nu-langchecker'
+        url 'https://raw.githubusercontent.com/Librazy/NyaaUtilsLangChecker/maven-repo'
+    }
 }
 
 dependencies {
@@ -34,6 +42,12 @@ dependencies {
     compile files('lib/LocketteProAPI.jar')
     compile files('lib/EssentialsX-2.0.1-468.jar')
     compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.5'
+    compile 'org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT'
+    processor 'org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT'
+}
+
+compileJava {
+    options.compilerArgs += ["-Xplugin:NyaaUtilsLangAnnotationProcessor"]
 }
 
 publishing {
diff --git a/src/main/java/cat/nyaa/nyaautils/I18n.java b/src/main/java/cat/nyaa/nyaautils/I18n.java
@@ -2,6 +2,7 @@
 
 import cat.nyaa.utils.Internationalization;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.librazy.nyaautils_lang_checker.LangKey;
 
 public class I18n extends Internationalization {
     public static I18n instance = null;
@@ -25,7 +26,7 @@ public I18n(NyaaUtils plugin, String lang) {
         load();
     }
 
-    public static String format(String key, Object... args) {
+    public static String format(@LangKey String key, Object... args) {
         return instance.get(key, args);
     }
 }
diff --git a/src/main/java/cat/nyaa/nyaautils/commandwarpper/Teleport.java b/src/main/java/cat/nyaa/nyaautils/commandwarpper/Teleport.java
@@ -20,6 +20,7 @@
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.permissions.PermissionAttachment;
+import org.librazy.nyaautils_lang_checker.LangKey;
 
 import java.text.DecimalFormat;
 import java.util.List;
@@ -233,7 +234,7 @@ private int checkHomeLimit(final User user, String name) {
         return 0;
     }
 
-    private void msg(CommandSender target, String template, Object... args) {
+    private void msg(CommandSender target, @LangKey String template, Object... args) {
         target.sendMessage(I18n.format(template, args));
     }
 }
diff --git a/src/main/java/cat/nyaa/nyaautils/dropprotect/DropProtectMode.java b/src/main/java/cat/nyaa/nyaautils/dropprotect/DropProtectMode.java
@@ -1,5 +1,9 @@
 package cat.nyaa.nyaautils.dropprotect;
 
+import org.librazy.nyaautils_lang_checker.LangKey;
+import org.librazy.nyaautils_lang_checker.LangKeyType;
+
+@LangKey(type = LangKeyType.SUFFIX)
 public enum DropProtectMode {
     OFF,
     ON
diff --git a/src/main/java/cat/nyaa/nyaautils/exhibition/ExhibitionCommands.java b/src/main/java/cat/nyaa/nyaautils/exhibition/ExhibitionCommands.java
@@ -70,7 +70,7 @@ public void commandUnset(CommandSender sender, Arguments args) {
         } else if (p.hasPermission("nu.exhibition.forceUnset")) {
             f.unset();
         } else {
-            msg(sender, "nu.exhibition.unset_protected");
+            msg(sender, "user.exhibition.unset_protected");
         }
     }
 
@@ -123,7 +123,7 @@ public void commandDesc(CommandSender sender, Arguments args) {
                 }
             }
         } else {
-            msg(sender, "nu.exhibition.desc_protected");
+            msg(sender, "user.exhibition.desc_protected");
         }
     }
 }
diff --git a/src/main/java/cat/nyaa/nyaautils/lootprotect/LootProtectMode.java b/src/main/java/cat/nyaa/nyaautils/lootprotect/LootProtectMode.java
@@ -1,5 +1,9 @@
 package cat.nyaa.nyaautils.lootprotect;
 
+import org.librazy.nyaautils_lang_checker.LangKey;
+import org.librazy.nyaautils_lang_checker.LangKeyType;
+
+@LangKey(type = LangKeyType.SUFFIX)
 public enum LootProtectMode {
     OFF,
     MAX_DAMAGE,
diff --git a/src/main/java/cat/nyaa/nyaautils/mailbox/MailboxCommands.java b/src/main/java/cat/nyaa/nyaautils/mailbox/MailboxCommands.java
@@ -74,7 +74,7 @@ public void createMailbox(Player admin, String player) {
                     if (b.getState() instanceof Chest) {
                         plugin.cfg.mailbox.updateNameMapping(id, player);
                         plugin.cfg.mailbox.updateLocationMapping(id, b.getLocation());
-                        msg(admin, "user.mailbox.admin.success");
+                        msg(admin, "user.mailbox.admin.success_set");
                         if (p.isOnline()) {
                             Player tmp = plugin.getServer().getPlayer(id);
                             if (tmp != null) {
@@ -83,7 +83,7 @@ public void createMailbox(Player admin, String player) {
                         }
                         return;
                     }
-                    msg(admin, "user.mailbox.admin.fail");
+                    msg(admin, "user.mailbox.admin.fail_set");
                 });
         msg(admin, "user.mailbox.admin.right_click_set", player);
     }
diff --git a/src/main/java/cat/nyaa/nyaautils/realm/RealmType.java b/src/main/java/cat/nyaa/nyaautils/realm/RealmType.java
@@ -1,4 +1,7 @@
 package cat.nyaa.nyaautils.realm;
 
+import org.librazy.nyaautils_lang_checker.LangKey;
+import org.librazy.nyaautils_lang_checker.LangKeyType;
 
+@LangKey(type = LangKeyType.SUFFIX)
 public enum RealmType {PUBLIC, PRIVATE}
diff --git a/src/main/java/cat/nyaa/nyaautils/repair/RepairInstance.java b/src/main/java/cat/nyaa/nyaautils/repair/RepairInstance.java
@@ -4,9 +4,11 @@
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Repairable;
+import org.librazy.nyaautils_lang_checker.LangKey;
+import org.librazy.nyaautils_lang_checker.LangKeyType;
 
 public class RepairInstance {
-    public enum RepairStat {
+    @LangKey(type = LangKeyType.SUFFIX) public enum RepairStat {
         UNREPAIRABLE,
         UNREPAIRABLE_REPAIRED,
         UNREPAIRABLE_UNBREAKABLE,
diff --git a/src/main/java/cat/nyaa/utils/CommandReceiver.java b/src/main/java/cat/nyaa/utils/CommandReceiver.java
@@ -9,6 +9,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.librazy.nyaautils_lang_checker.LangKey;
+import org.librazy.nyaautils_lang_checker.LangKeyType;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -198,7 +200,7 @@ public void acceptCommand(CommandSender sender, Arguments cmd) {
         } catch (NoItemInHandException ex) {
             msg(sender, ex.isOffHand ? "internal.error.no_item_offhand" : "internal.error.no_item_hand");
         } catch (BadCommandException ex) {
-            String msg = ex.getMessage();
+            @LangKey String msg = ex.getMessage();
             if (msg != null && !msg.equals("")) {
                 if (ex.objs == null) {
                     msg(sender, msg);
@@ -251,8 +253,8 @@ public List<String> acceptTabComplete(CommandSender sender, Arguments args) thro
 
     public abstract String getHelpPrefix();
 
-    private String getHelpContent(String type, String... subkeys) {
-        String key = "manual";
+    private String getHelpContent(@LangKey(type = LangKeyType.SUFFIX, skipCheck = true) String type, String... subkeys) {
+        @LangKey String key = "manual";
         for (String s : subkeys) {
             if (s.length() > 0)
                 key += "." + s;
@@ -286,7 +288,7 @@ public static Player asPlayer(CommandSender target) {
         }
     }
 
-    public void msg(CommandSender target, String template, Object... args) {
+    public void msg(CommandSender target, @LangKey String template, Object... args) {
         target.sendMessage(i18n.get(template, args));
     }
 
diff --git a/src/main/java/cat/nyaa/utils/Internationalization.java b/src/main/java/cat/nyaa/utils/Internationalization.java
@@ -5,6 +5,7 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.librazy.nyaautils_lang_checker.LangKey;
 
 import java.io.File;
 import java.io.IOException;
@@ -129,7 +130,7 @@ private void loadLanguageSection(Map<String, String> map, ConfigurationSection s
     }
 
 
-    public String get(String key, Object... para) {
+    public String get(@LangKey String key, Object... para) {
         String val = map.get(key);
         if (val == null || val.startsWith("internal.")) val = internalMap.get(key);
         if (val == null) {
diff --git a/src/main/java/cat/nyaa/utils/Message.java b/src/main/java/cat/nyaa/utils/Message.java
@@ -14,6 +14,7 @@
 import org.bukkit.inventory.meta.BlockStateMeta;
 import org.bukkit.inventory.meta.BookMeta;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.librazy.nyaautils_lang_checker.LangKey;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -34,7 +35,7 @@ public Message append(String text) {
         return this;
     }
 
-    public Message appendFormat(Internationalization i18n, String template, Object... obj) {
+    public Message appendFormat(Internationalization i18n, @LangKey String template, Object... obj) {
         return append(i18n.get(template, obj));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import cat.nyaa.utils.Internationalization;`
`4`	`4`	`import org.bukkit.plugin.java.JavaPlugin;`
	`5`	`+import org.librazy.nyaautils_lang_checker.LangKey;`
`5`	`6`
`6`	`7`	`public class I18n extends Internationalization {`
`7`	`8`	`public static I18n instance = null;`
`@@ -25,7 +26,7 @@ public I18n(NyaaUtils plugin, String lang) {`
`25`	`26`	`load();`
`26`	`27`	`}`
`27`	`28`
`28`		`- public static String format(String key, Object... args) {`
	`29`	`+ public static String format(@LangKey String key, Object... args) {`
`29`	`30`	`return instance.get(key, args);`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import org.bukkit.event.player.PlayerCommandPreprocessEvent;`
`21`	`21`	`import org.bukkit.event.player.PlayerTeleportEvent;`
`22`	`22`	`import org.bukkit.permissions.PermissionAttachment;`
	`23`	`+import org.librazy.nyaautils_lang_checker.LangKey;`
`23`	`24`
`24`	`25`	`import java.text.DecimalFormat;`
`25`	`26`	`import java.util.List;`
`@@ -233,7 +234,7 @@ private int checkHomeLimit(final User user, String name) {`
`233`	`234`	`return 0;`
`234`	`235`	`}`
`235`	`236`
`236`		`- private void msg(CommandSender target, String template, Object... args) {`
	`237`	`+ private void msg(CommandSender target, @LangKey String template, Object... args) {`
`237`	`238`	`target.sendMessage(I18n.format(template, args));`
`238`	`239`	`}`
`239`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void commandUnset(CommandSender sender, Arguments args) {`
`70`	`70`	`} else if (p.hasPermission("nu.exhibition.forceUnset")) {`
`71`	`71`	`f.unset();`
`72`	`72`	`} else {`
`73`		`- msg(sender, "nu.exhibition.unset_protected");`
	`73`	`+ msg(sender, "user.exhibition.unset_protected");`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -123,7 +123,7 @@ public void commandDesc(CommandSender sender, Arguments args) {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`} else {`
`126`		`- msg(sender, "nu.exhibition.desc_protected");`
	`126`	`+ msg(sender, "user.exhibition.desc_protected");`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void createMailbox(Player admin, String player) {`
`74`	`74`	`if (b.getState() instanceof Chest) {`
`75`	`75`	`plugin.cfg.mailbox.updateNameMapping(id, player);`
`76`	`76`	`plugin.cfg.mailbox.updateLocationMapping(id, b.getLocation());`
`77`		`- msg(admin, "user.mailbox.admin.success");`
	`77`	`+ msg(admin, "user.mailbox.admin.success_set");`
`78`	`78`	`if (p.isOnline()) {`
`79`	`79`	`Player tmp = plugin.getServer().getPlayer(id);`
`80`	`80`	`if (tmp != null) {`
`@@ -83,7 +83,7 @@ public void createMailbox(Player admin, String player) {`
`83`	`83`	`}`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`		`- msg(admin, "user.mailbox.admin.fail");`
	`86`	`+ msg(admin, "user.mailbox.admin.fail_set");`
`87`	`87`	`});`
`88`	`88`	`msg(admin, "user.mailbox.admin.right_click_set", player);`
`89`	`89`	`}`