Skip to content

Commit 38ea6b4

Browse files
author
Librazy
committed
LangChecker init
1 parent 06947cd commit 38ea6b4

File tree

13 files changed

+49
-17
lines changed

13 files changed

+49
-17
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ deploy:
3030
skip_cleanup: true
3131
prerelease: true
3232
api_key:
33-
secure: EDe3KykJ7BGwnIlsdiZGUVU0qev5uHd+3V5aq5be2VQYpvBIS1Ifh+MjMfLSs4DuViT9TbBXqMwRdj9Ub5CAK2uSTsCxBXC6me9ozyrX326l2EawCTbPqKwBpy3lQeKyvwb4XJJ5U5ugvzqRX0WYfdM1/n+77Tu14YIqIpyKJNruNAhZyBhnvuaQ/EfVWl/eWhXHAa51GklWq3xsIJHG991wZ7dMZsooETfSTzX0ZK3JaI0dZsgTZMsBIDJePOcdoCzSsdBCq/yQVMT4GLEDq6rFp46gGix6H3QEm4wc16w70ksX8iJgbhrHp1OZVsDAZw3Nc94BIuaJqFJbl3itRIayM5IS3sd4TIjBc8X8dVJOh+wrObL6j8EmWkfi84KedFQKQ6UYZLjy4Aaki6oqCn6JMsa73+g0r0UrTeIMt0hcyVQDwzRFd+iyKr4c+hsvGUFZAxU5h+2aMrp2PnEp7UKr0ljQZZ1zVONwBj3PrBaDbvHBl7AOFlfAkZxobbqrvjgq3p5G8BXENmyPnrfPNxByxxDsu2SpagZLOQOLrz3fXnv9SjMjL2/QrpLGmIVAOG7lPD7x5YgeGJHKJKvE/HijQcQCpdXmh4KlGH4Hpeq1JYf1ledK2cYHnzFltcCuoVscTf8i35pghmwD9yDDEIund08cIyq+6e4NEC+/r/g=
33+
secure: ${GITHUB_DEPLOY_KEY}
3434
file: './nyaautils-$TRAVIS_BRANCH-v$main_version.$TRAVIS_BUILD_NUMBER.jar'
3535
on:
3636
tags: false
@@ -41,5 +41,4 @@ branches:
4141
- "maven-repo"
4242
env:
4343
global:
44-
- secure: d87YXY8y4KW9v06Q4VmkEyUVPgfjGu334jcNhllfRdMQub9ue0ofSP1XR41bCMwcWvPyMuauIsSS6wA5TojeWTAFXV9ESzWHonLhCJpMcTL/8+Ohc62qQZCpWWWqze5wBgh0fxZiXsV9V6cGFJoB5qh/vZM86EMnYHrkTamNXy/6yVTIxRmwNZLhVRrPsBaOaThfOQm4lMw6TOzlqDmt4YBiTnF9oxC7iK8bsEf9SWoI8oeYayF2dtDZBo1SPrUR53+BDl0Xlvolx6eytKeXVEjhKs2kYmRN26WC622GHFwBfo2iIZDGwBSQP1uqr4P2DOvRPG3LNwOUkzcpbJG592YMLms9/YdQrpx1qR+wsyHlyTjICNDhcizRNrWjY6EKYRWR0NAkH3Wu8YkspuhH7qiiWyyGJNRCsppn/AfX9J+9LH8okkGV2h/OGHqlmWo6QaJGjLwTObUCj7JEml7l4eFspc8ThduSg8nTzFXhUAuygPxTKOZRt+bHF2S734vYKkbX2ARDPL1G3gbC3K7uqhEkLV3mpOyUz+57HQ0ukF0wCmTq+bZqD5gHwSA+CXmiVmMam/4y4Y+j08V+9hLwcMvTYPt2MxyXenYfLe+Cz4FL4prhUO0c26oOVSKVPPdNyU1k++jlHDm1S5CvvePoNGebq2I5DGgx8Sf/0n42Xv0=
4544
- main_version=2

build.gradle

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
apply plugin: 'java'
2-
apply plugin: 'maven-publish'
1+
plugins {
2+
id 'java'
3+
id 'maven-publish'
4+
id 'org.inferred.processors' version '1.2.11'
5+
}
36

47
sourceCompatibility = 1.8
58
targetCompatibility = 1.8
@@ -26,6 +29,11 @@ repositories {
2629
name 'vault-repo'
2730
url 'http://nexus.hc.to/content/repositories/pub_releases'
2831
}
32+
33+
maven {
34+
name 'nu-langchecker'
35+
url 'https://raw.githubusercontent.com/Librazy/NyaaUtilsLangChecker/maven-repo'
36+
}
2937
}
3038

3139
dependencies {
@@ -34,6 +42,12 @@ dependencies {
3442
compile files('lib/LocketteProAPI.jar')
3543
compile files('lib/EssentialsX-2.0.1-468.jar')
3644
compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.5'
45+
compile 'org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT'
46+
processor 'org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT'
47+
}
48+
49+
compileJava {
50+
options.compilerArgs += ["-Xplugin:NyaaUtilsLangAnnotationProcessor"]
3751
}
3852

3953
publishing {

src/main/java/cat/nyaa/nyaautils/I18n.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import cat.nyaa.utils.Internationalization;
44
import org.bukkit.plugin.java.JavaPlugin;
5+
import org.librazy.nyaautils_lang_checker.LangKey;
56

67
public class I18n extends Internationalization {
78
public static I18n instance = null;
@@ -25,7 +26,7 @@ public I18n(NyaaUtils plugin, String lang) {
2526
load();
2627
}
2728

28-
public static String format(String key, Object... args) {
29+
public static String format(@LangKey String key, Object... args) {
2930
return instance.get(key, args);
3031
}
3132
}

src/main/java/cat/nyaa/nyaautils/commandwarpper/Teleport.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
2121
import org.bukkit.event.player.PlayerTeleportEvent;
2222
import org.bukkit.permissions.PermissionAttachment;
23+
import org.librazy.nyaautils_lang_checker.LangKey;
2324

2425
import java.text.DecimalFormat;
2526
import java.util.List;
@@ -233,7 +234,7 @@ private int checkHomeLimit(final User user, String name) {
233234
return 0;
234235
}
235236

236-
private void msg(CommandSender target, String template, Object... args) {
237+
private void msg(CommandSender target, @LangKey String template, Object... args) {
237238
target.sendMessage(I18n.format(template, args));
238239
}
239240
}

src/main/java/cat/nyaa/nyaautils/dropprotect/DropProtectMode.java

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package cat.nyaa.nyaautils.dropprotect;
22

3+
import org.librazy.nyaautils_lang_checker.LangKey;
4+
import org.librazy.nyaautils_lang_checker.LangKeyType;
5+
6+
@LangKey(type = LangKeyType.SUFFIX)
37
public enum DropProtectMode {
48
OFF,
59
ON

src/main/java/cat/nyaa/nyaautils/exhibition/ExhibitionCommands.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void commandUnset(CommandSender sender, Arguments args) {
7070
} else if (p.hasPermission("nu.exhibition.forceUnset")) {
7171
f.unset();
7272
} else {
73-
msg(sender, "nu.exhibition.unset_protected");
73+
msg(sender, "user.exhibition.unset_protected");
7474
}
7575
}
7676

@@ -123,7 +123,7 @@ public void commandDesc(CommandSender sender, Arguments args) {
123123
}
124124
}
125125
} else {
126-
msg(sender, "nu.exhibition.desc_protected");
126+
msg(sender, "user.exhibition.desc_protected");
127127
}
128128
}
129129
}

src/main/java/cat/nyaa/nyaautils/lootprotect/LootProtectMode.java

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package cat.nyaa.nyaautils.lootprotect;
22

3+
import org.librazy.nyaautils_lang_checker.LangKey;
4+
import org.librazy.nyaautils_lang_checker.LangKeyType;
5+
6+
@LangKey(type = LangKeyType.SUFFIX)
37
public enum LootProtectMode {
48
OFF,
59
MAX_DAMAGE,

src/main/java/cat/nyaa/nyaautils/mailbox/MailboxCommands.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void createMailbox(Player admin, String player) {
7474
if (b.getState() instanceof Chest) {
7575
plugin.cfg.mailbox.updateNameMapping(id, player);
7676
plugin.cfg.mailbox.updateLocationMapping(id, b.getLocation());
77-
msg(admin, "user.mailbox.admin.success");
77+
msg(admin, "user.mailbox.admin.success_set");
7878
if (p.isOnline()) {
7979
Player tmp = plugin.getServer().getPlayer(id);
8080
if (tmp != null) {
@@ -83,7 +83,7 @@ public void createMailbox(Player admin, String player) {
8383
}
8484
return;
8585
}
86-
msg(admin, "user.mailbox.admin.fail");
86+
msg(admin, "user.mailbox.admin.fail_set");
8787
});
8888
msg(admin, "user.mailbox.admin.right_click_set", player);
8989
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
package cat.nyaa.nyaautils.realm;
22

3+
import org.librazy.nyaautils_lang_checker.LangKey;
4+
import org.librazy.nyaautils_lang_checker.LangKeyType;
35

6+
@LangKey(type = LangKeyType.SUFFIX)
47
public enum RealmType {PUBLIC, PRIVATE}

src/main/java/cat/nyaa/nyaautils/repair/RepairInstance.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import org.bukkit.Material;
55
import org.bukkit.inventory.ItemStack;
66
import org.bukkit.inventory.meta.Repairable;
7+
import org.librazy.nyaautils_lang_checker.LangKey;
8+
import org.librazy.nyaautils_lang_checker.LangKeyType;
79

810
public class RepairInstance {
9-
public enum RepairStat {
11+
@LangKey(type = LangKeyType.SUFFIX) public enum RepairStat {
1012
UNREPAIRABLE,
1113
UNREPAIRABLE_REPAIRED,
1214
UNREPAIRABLE_UNBREAKABLE,

src/main/java/cat/nyaa/utils/CommandReceiver.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.bukkit.entity.Player;
1010
import org.bukkit.inventory.ItemStack;
1111
import org.bukkit.plugin.java.JavaPlugin;
12+
import org.librazy.nyaautils_lang_checker.LangKey;
13+
import org.librazy.nyaautils_lang_checker.LangKeyType;
1214

1315
import java.lang.annotation.ElementType;
1416
import java.lang.annotation.Retention;
@@ -198,7 +200,7 @@ public void acceptCommand(CommandSender sender, Arguments cmd) {
198200
} catch (NoItemInHandException ex) {
199201
msg(sender, ex.isOffHand ? "internal.error.no_item_offhand" : "internal.error.no_item_hand");
200202
} catch (BadCommandException ex) {
201-
String msg = ex.getMessage();
203+
@LangKey String msg = ex.getMessage();
202204
if (msg != null && !msg.equals("")) {
203205
if (ex.objs == null) {
204206
msg(sender, msg);
@@ -251,8 +253,8 @@ public List<String> acceptTabComplete(CommandSender sender, Arguments args) thro
251253

252254
public abstract String getHelpPrefix();
253255

254-
private String getHelpContent(String type, String... subkeys) {
255-
String key = "manual";
256+
private String getHelpContent(@LangKey(type = LangKeyType.SUFFIX, skipCheck = true) String type, String... subkeys) {
257+
@LangKey String key = "manual";
256258
for (String s : subkeys) {
257259
if (s.length() > 0)
258260
key += "." + s;
@@ -286,7 +288,7 @@ public static Player asPlayer(CommandSender target) {
286288
}
287289
}
288290

289-
public void msg(CommandSender target, String template, Object... args) {
291+
public void msg(CommandSender target, @LangKey String template, Object... args) {
290292
target.sendMessage(i18n.get(template, args));
291293
}
292294

src/main/java/cat/nyaa/utils/Internationalization.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.bukkit.configuration.ConfigurationSection;
66
import org.bukkit.configuration.file.YamlConfiguration;
77
import org.bukkit.plugin.java.JavaPlugin;
8+
import org.librazy.nyaautils_lang_checker.LangKey;
89

910
import java.io.File;
1011
import java.io.IOException;
@@ -129,7 +130,7 @@ private void loadLanguageSection(Map<String, String> map, ConfigurationSection s
129130
}
130131

131132

132-
public String get(String key, Object... para) {
133+
public String get(@LangKey String key, Object... para) {
133134
String val = map.get(key);
134135
if (val == null || val.startsWith("internal.")) val = internalMap.get(key);
135136
if (val == null) {

src/main/java/cat/nyaa/utils/Message.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.bukkit.inventory.meta.BlockStateMeta;
1515
import org.bukkit.inventory.meta.BookMeta;
1616
import org.bukkit.inventory.meta.ItemMeta;
17+
import org.librazy.nyaautils_lang_checker.LangKey;
1718

1819
import java.lang.reflect.Constructor;
1920
import java.lang.reflect.InvocationTargetException;
@@ -34,7 +35,7 @@ public Message append(String text) {
3435
return this;
3536
}
3637

37-
public Message appendFormat(Internationalization i18n, String template, Object... obj) {
38+
public Message appendFormat(Internationalization i18n, @LangKey String template, Object... obj) {
3839
return append(i18n.get(template, obj));
3940
}
4041

0 commit comments

Comments
 (0)