Skip to content

Commit

Permalink
1.修复查询结果
Browse files Browse the repository at this point in the history 
2.修复游戏内命令addBind
3.修复qq用户执行查询
  • Loading branch information
@RegadPoleCN
RegadPoleCN committed Jun 24, 2024
1 parent c8de514 commit 86141b7
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 98 deletions.
82 changes: 41 additions & 41 deletions plumbot-bukkit/src/main/java/me/regadpole/plumbot/command/Commands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ public Commands(PlumBot plugin){
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

if (args.length == 0) {
sender.sendMessage("请使用/pb help查看命令使用方法");
sender.sendMessage(plugin.getEnvironment().prefix+"§c请使用/pb help查看命令使用方法");
return true;
}

switch (args[0]) {
case "info":
StringBuilder stringbuilder = new StringBuilder();
stringbuilder.append("§1---PlumBot 信息---").append("\n");
stringbuilder.append("§a作者: ").append("§f").append(plugin.getEnvironment().author).append("\n");
stringbuilder.append("§a版本: ").append("§f").append(plugin.getEnvironment().version).append("\n");
stringbuilder.append("§a机器人平台: ").append("§f").append(Config.getBotMode()).append("\n");
stringbuilder.append("§a数据库模式: ").append("§f").append(DataBase.type()).append("\n");
stringbuilder.append("§a服务端版本: ").append("§f").append(Bukkit.getVersion()).append("\n");
stringbuilder.append("§a兼容插件: ").append("\n");
stringbuilder.append("\t").append("§bAuthMe: ").append(plugin.getEnvironment().authme).append("\n");
stringbuilder.append("\t").append("§bGriefDefender: ").append(plugin.getEnvironment().griefdefender).append("\n");
stringbuilder.append("\t").append("§bResidence: ").append(plugin.getEnvironment().residence).append("\n");
stringbuilder.append("\t").append("§bQuickShop: ").append(plugin.getEnvironment().quickshop).append("\n");
stringbuilder.append("\t").append("§bQuickShopHikari: ").append(plugin.getEnvironment().quickshophikari).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§1---PlumBot 信息---").append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a作者: ").append("§f").append(plugin.getEnvironment().author).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a版本: ").append("§f").append(plugin.getEnvironment().version).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a机器人平台: ").append("§f").append(Config.getBotMode()).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a数据库模式: ").append("§f").append(DataBase.type()).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a服务端版本: ").append("§f").append(Bukkit.getVersion()).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("§a兼容插件: ").append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("\t").append("§bAuthMe: ").append(plugin.getEnvironment().authme).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("\t").append("§bGriefDefender: ").append(plugin.getEnvironment().griefdefender).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("\t").append("§bResidence: ").append(plugin.getEnvironment().residence).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("\t").append("§bQuickShop: ").append(plugin.getEnvironment().quickshop).append("\n");
stringbuilder.append(plugin.getEnvironment().prefix).append("\t").append("§bQuickShopHikari: ").append(plugin.getEnvironment().quickshophikari).append("\n");
sender.sendMessage(stringbuilder.toString());
break;
case "reload":
Expand All @@ -57,90 +57,90 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
Config.loadConfig();
DatabaseManager.start();
PlumBot.getBot().start();
sender.sendMessage("PlumBot已重载");
sender.sendMessage(plugin.getEnvironment().prefix+"§aPlumBot已重载");
break;
case "help":
if (args.length != 1) return true;
sender.sendMessage("§6PlumBot 机器人帮助菜单");
sender.sendMessage("§6/pb reload :§f重载插件");
sender.sendMessage("§6/pb help :§f获取插件帮助");
sender.sendMessage("§6/pb info :§f插件基本信息");
sender.sendMessage("§6/pb kook help :§f获取kook帮助");
sender.sendMessage("§6/pb kook plugins :§f获取kook插件列表");
sender.sendMessage("§6/pb queryBind <id:ID或qq:qq> :§f查询id或qq绑定数据");
sender.sendMessage("§6/pb addBind <qq> <id> :§f为qq添加ID白名单");
sender.sendMessage(plugin.getEnvironment().prefix+"§6PlumBot 机器人帮助菜单");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb reload :§f重载插件");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb help :§f获取插件帮助");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb info :§f插件基本信息");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb kook help :§f获取kook帮助");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb kook plugins :§f获取kook插件列表");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb queryBind <id:ID或qq:qq> :§f查询id或qq绑定数据");
sender.sendMessage(plugin.getEnvironment().prefix+"§6/pb addBind <qq> <id> :§f为qq添加ID白名单");
break;
case "queryBind":
if (args.length == 1) {
sender.sendMessage("命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
sender.sendMessage(plugin.getEnvironment().prefix+"§c命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
return true;
}
if (args.length > 2) {
sender.sendMessage("命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
sender.sendMessage(plugin.getEnvironment().prefix+"§c命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
return true;
}
if (args.length == 2) {
if (args[1].startsWith("id:")) {
String name = args[1].substring(3);
if (name.isEmpty()) {
sender.sendMessage("id不能为空");
sender.sendMessage(plugin.getEnvironment().prefix+"§cid不能为空");
return true;
}
PlumBot.getScheduler().runTaskAsynchronously(() -> {
long qq = DatabaseManager.getBindId(name, DataBase.type().toLowerCase(), PlumBot.getDatabase());
if (qq==0L) {
sender.sendMessage("ID尚未申请白名单");
sender.sendMessage(plugin.getEnvironment().prefix+"§cID尚未申请白名单");
return;
}
sender.sendMessage(name+"的申请用户为"+qq);
sender.sendMessage(plugin.getEnvironment().prefix+"§a"+name+"的申请用户为"+qq);
});
return true;
} else if (args[1].startsWith("qq:")) {
String qq = args[1].substring(3);
if (qq.isEmpty()) {
sender.sendMessage("QQ不能为空");
sender.sendMessage(plugin.getEnvironment().prefix+"§cQQ不能为空");
return true;
}
PlumBot.getScheduler().runTaskAsynchronously(() -> {
List<String> id = DatabaseManager.getBind(qq, DataBase.type().toLowerCase(), PlumBot.getDatabase());
if (id.isEmpty()) {
sender.sendMessage(qq+"尚未申请白名单");
sender.sendMessage(plugin.getEnvironment().prefix+"§c"+qq+"尚未申请白名单");
return;
}
sender.sendMessage(qq+"拥有白名单ID："+id);
sender.sendMessage(plugin.getEnvironment().prefix+"§a"+qq+"拥有白名单ID："+id);
});
return true;
}
break;
}
case "addBind":
if (args.length == 1) {
sender.sendMessage("命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
if (args.length < 3) {
sender.sendMessage(plugin.getEnvironment().prefix+"§c命令错误，格式：/plumbot addBind <qq> <id>");
return true;
}
if (args.length > 2) {
sender.sendMessage("命令错误，格式：/plumbot queryBind <id:ID或qq:QQ>");
if (args.length > 3) {
sender.sendMessage(plugin.getEnvironment().prefix+"§c命令错误，格式：/plumbot addBind <qq> <id>");
return true;
}
if (args.length == 2) {
if (args.length == 3) {
if (!WhitelistHelper.checkIDNotExist(args[1])) {
sender.sendMessage("绑定失败，此ID已绑定用户" + DatabaseManager.getBindId(args[1], DataBase.type().toLowerCase(), PlumBot.getDatabase()));
sender.sendMessage(plugin.getEnvironment().prefix+"§c绑定失败，此ID已绑定用户" + DatabaseManager.getBindId(args[1], DataBase.type().toLowerCase(), PlumBot.getDatabase()));
return true;
}
List<String> id = WhitelistHelper.addAndGet(args[1], args[0], DataBase.type().toLowerCase(), PlumBot.getDatabase());
sender.sendMessage("成功申请白名单，" + args[0] + "目前的白名单为" + id);
sender.sendMessage(plugin.getEnvironment().prefix+"§a成功申请白名单，" + args[0] + "目前的白名单为" + id);
}
break;
case "kook":
if (args.length == 1) {
sender.sendMessage("命令错误，格式：/plumbot kook <value>");
sender.sendMessage("value可选值：plugins，help");
sender.sendMessage(plugin.getEnvironment().prefix+"§c命令错误，格式：/plumbot kook <value>");
sender.sendMessage(plugin.getEnvironment().prefix+"§cvalue可选值：plugins，help");
return true;
}
if (args.length > 2) return true;
if (args.length == 2) {
if (KookBot.isKookEnabled()) {
sender.sendMessage("kook客户端未启动");
sender.sendMessage(plugin.getEnvironment().prefix+"§ckook客户端未启动");
return true;
}
switch (args[1]) {
Expand All @@ -156,7 +156,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
break;
default:
if (args.length != 1) return true;
sender.sendMessage("错误的指令用法，请使用/pb help查看命令使用方法");
sender.sendMessage(plugin.getEnvironment().prefix+"§c错误的指令用法，请使用/pb help查看命令使用方法");
break;
}
return true;
Expand Down
Loading

0 comments on commit 86141b7

Please sign in to comment.