diff --git a/.classpath b/.classpath index 7811cce..7fc367e 100644 --- a/.classpath +++ b/.classpath @@ -1,5 +1,6 @@ + @@ -24,8 +25,6 @@ - - diff --git a/.project b/.project index 53cff1f..73647cf 100644 --- a/.project +++ b/.project @@ -5,17 +5,12 @@ org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javabuilder - - org.eclipse.buildship.core.gradleprojectbuilder - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index dfe0bf5..cbd9ab0 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Wed Jul 10 14:47:02 CST 2019 +#Wed Jul 10 15:19:10 CST 2019 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/src/main/java/ren/taske/nativebot/bot/chatting/Chatting.java b/src/main/java/ren/taske/nativebot/bot/chatting/Chatting.java index 168b440..84b31d9 100644 --- a/src/main/java/ren/taske/nativebot/bot/chatting/Chatting.java +++ b/src/main/java/ren/taske/nativebot/bot/chatting/Chatting.java @@ -5,6 +5,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; import cc.moecraft.icq.event.events.message.EventMessage; import cc.moecraft.icq.user.User; import cc.moecraft.icq.utils.CQUtils; +import cn.glycol.t18n.I18n; import ren.taske.nativebot.MinecraftPlugin; import ren.taske.nativebot.commons.Config; import ren.taske.nativebot.core.NativeBot; @@ -51,7 +52,7 @@ public class Chatting { message = CQUtils.removeCqCode(message); StringBuffer sb = new StringBuffer(); - sb.append("<").append(username).append("> ").append("\u00a7r"); + sb.append("<").append(username).append("> ").append("\u00a7r"); // \u007a = § sb.append(message); plugin.getServer().broadcastMessage(sb.toString()); @@ -75,14 +76,14 @@ public class Chatting { } if(um.getTencentId() == -1L) { - evt.getPlayer().sendMessage("Please set your Tencent userid first!"); + evt.getPlayer().sendMessage(I18n.format("message.using.set-qq-first")); return; } UserTencent ut = UserTencent.of(um.getTencentId()); if(!ut.hasPermission(NODE_CHATTING_MINECRAFT)) { - evt.getPlayer().sendMessage("You're Unauthorized!"); + evt.getPlayer().sendMessage(I18n.format("message.unauthorized")); return; } diff --git a/src/main/java/ren/taske/nativebot/core/profile/UserMinecraft.java b/src/main/java/ren/taske/nativebot/core/profile/UserMinecraft.java index b1d9d99..f49ce66 100644 --- a/src/main/java/ren/taske/nativebot/core/profile/UserMinecraft.java +++ b/src/main/java/ren/taske/nativebot/core/profile/UserMinecraft.java @@ -21,52 +21,52 @@ public class UserMinecraft extends User { UserMinecraft user = new UserMinecraft(userid); PROFILES.put(userid, user); } - return PROFILES.get(userid); + return PROFILES.get(userid); } @Override public SimpleDataStorage getData() { - return data; + return getTencentUser().getData(); } @Override public void onUnload() { - data.save(); + getTencentUser().onUnload(); } @Override public void reload() { - data.save(); + getTencentUser().reload(); } + /** 获取玩家对应QQ的权限 */ public boolean hasPermission(String node) { - return hasPermission(node, false); - } - - public boolean hasPermission(String node, boolean defaultVal) { - if(node != null) { - data.setDefault(node, defaultVal); - data.save(); - } - return data.getBoolean(node, false); + return getTencentUser().hasPermission(node); } + /** 设置玩家对应QQ的权限 */ public void setPermission(String node, boolean val) { - data.setBoolean(node, val); - data.save(); + getTencentUser().setPermission(node, val); } public static final String _TENCENT_UID = "tencent.uid"; + /** 设置该用户的QQ号 */ public void setTencentId(long uid) { data.setLong(_TENCENT_UID, uid); data.save(); } + /** 获取该用户的QQ号 */ public long getTencentId() { data.setDefault(_TENCENT_UID, -1L); data.save(); return data.getLong(_TENCENT_UID, -1L); } + /** 获取该用户的TencentUser */ + public UserTencent getTencentUser() { + return UserTencent.of(getTencentId()); + } + } diff --git a/src/main/java/ren/taske/nativebot/core/profile/UserTencent.java b/src/main/java/ren/taske/nativebot/core/profile/UserTencent.java index ddf4954..a4bfe56 100644 --- a/src/main/java/ren/taske/nativebot/core/profile/UserTencent.java +++ b/src/main/java/ren/taske/nativebot/core/profile/UserTencent.java @@ -69,5 +69,4 @@ public class UserTencent extends User { data.save(); } } - } diff --git a/src/main/resources/i18n.txt b/src/main/resources/i18n.txt index a312486..ad45f4d 100644 --- a/src/main/resources/i18n.txt +++ b/src/main/resources/i18n.txt @@ -1,5 +1,9 @@ message.common.welcome=欢迎使用! +message.using.set-qq-first=请先绑定QQ! + +message.unauthorized=您没有权限! + command.common.done=完成! command.common.fail=失败! command.common.argument=参数错误!