diff --git a/core/AllMusic.java b/core/AllMusic.java index bfe04caf..cb61208c 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -37,15 +37,15 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.3.4"; + public static final String version = "3.4.0"; /** * 配置文件版本号 */ - public static final String configVersion = "203"; + public static final String configVersion = "204"; /** * 语言文件配置版本号 */ - public static final String messageVersion = "206"; + public static final String messageVersion = "207"; /** * 搜歌结果 * 玩家名 结果 @@ -135,7 +135,9 @@ public class AllMusic { name = name.toLowerCase(); if (server != null && AllMusic.getConfig().muteServer.contains(server)) return true; - if (AllMusic.getConfig().mutePlayer.contains(name)) + if (DataSql.checkMutePlayer(name)) + return true; + if (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList() && DataSql.checkMuteListPlayer(name)) return true; if (!checkList) return false; @@ -387,23 +389,28 @@ public class AllMusic { * @param player 用户名 */ public static void joinPlay(String player) { - player = player.toLowerCase(); - if (getConfig().mutePlayer.contains(player) || nowPlayPlayer.contains(player)) { - return; - } - - String finalPlayer = player; - AllMusic.side.runTask(() -> { - SongInfoObj music = PlayMusic.nowPlayMusic; - if (music != null && PlayMusic.url != null) { - AllMusic.side.sendHudPos(finalPlayer); - AllMusic.side.sendMusic(finalPlayer, PlayMusic.url); - if (!music.isUrl()) { - AllMusic.side.sendPic(finalPlayer, music.getPicUrl()); - } - AllMusic.side.sendPos(finalPlayer, (int)PlayMusic.musicNowTime); + DataSql.task(() -> { + String player1 = player.toLowerCase(); + if (DataSql.checkMutePlayer(player1) || nowPlayPlayer.contains(player1)) { + return; } - }, 40); + if (DataSql.checkMuteListPlayer(player1) && PlayMusic.nowPlayMusic != null + && PlayMusic.nowPlayMusic.isList()) { + return; + } + + AllMusic.side.runTask(() -> { + SongInfoObj music = PlayMusic.nowPlayMusic; + if (music != null && PlayMusic.url != null) { + AllMusic.side.sendHudPos(player1); + AllMusic.side.sendMusic(player1, PlayMusic.url); + if (!music.isUrl()) { + AllMusic.side.sendPic(player1, music.getPicUrl()); + } + AllMusic.side.sendPos(player1, (int) PlayMusic.musicNowTime); + } + }, 20); + }); } /** diff --git a/core/AllMusicAPI.java b/core/AllMusicAPI.java index abb7be65..553715b4 100644 --- a/core/AllMusicAPI.java +++ b/core/AllMusicAPI.java @@ -46,7 +46,7 @@ public class AllMusicAPI { } /** - * 获取玩家Hud信息 + * 获取玩家Hud信息,这个操作会读取数据库,首次读取会有一点卡 * * @param player 玩家 * @return Hud信息 diff --git a/core/command/CommandBan.java b/core/command/CommandBan.java index f78ac01e..0749ca60 100644 --- a/core/command/CommandBan.java +++ b/core/command/CommandBan.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; @@ -17,7 +18,7 @@ public class CommandBan extends ACommand { return; } if (Function.isInteger(args[1])) { - AllMusic.getConfig().addBanMusic(args[1]); + DataSql.addBanMusic(args[1]); AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2已禁止点歌" + args[1]); } else { AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2请输入有效的ID"); diff --git a/core/command/CommandBanPlayer.java b/core/command/CommandBanPlayer.java index c76e2ed9..78c84bab 100644 --- a/core/command/CommandBanPlayer.java +++ b/core/command/CommandBanPlayer.java @@ -1,6 +1,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; import java.util.Collections; import java.util.List; @@ -13,7 +14,7 @@ public class CommandBanPlayer implements ICommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); return; } - AllMusic.getConfig().addBanPlayer(args[1].toLowerCase(Locale.ROOT)); + DataSql.addBanPlayer(args[1]); AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2已禁止玩家" + args[1] + "点歌"); } diff --git a/core/command/CommandClearBanList.java b/core/command/CommandClearBanList.java new file mode 100644 index 00000000..0b5c9f34 --- /dev/null +++ b/core/command/CommandClearBanList.java @@ -0,0 +1,13 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; + +public class CommandClearBanList extends ACommand { + @Override + public void execute(Object sender, String name, String[] args) { + DataSql.clearBan(); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2禁止点歌列表已清空"); + } +} diff --git a/core/command/CommandClearBanPlayerList.java b/core/command/CommandClearBanPlayerList.java new file mode 100644 index 00000000..bfc8fd3f --- /dev/null +++ b/core/command/CommandClearBanPlayerList.java @@ -0,0 +1,13 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; + +public class CommandClearBanPlayerList extends ACommand { + @Override + public void execute(Object sender, String name, String[] args) { + DataSql.clearBanPlayer(); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2禁止玩家点歌列表已清空"); + } +} diff --git a/core/command/CommandClearList.java b/core/command/CommandClearList.java index b6f67c2f..7ff39245 100644 --- a/core/command/CommandClearList.java +++ b/core/command/CommandClearList.java @@ -7,6 +7,6 @@ public class CommandClearList extends ACommand { @Override public void execute(Object sender, String name, String[] args) { PlayMusic.clearIdleList(); - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2添加空闲音乐列表已清空"); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2空闲音乐列表已清空"); } } diff --git a/core/command/CommandCookie.java b/core/command/CommandCookie.java index c64f28d3..daecacca 100644 --- a/core/command/CommandCookie.java +++ b/core/command/CommandCookie.java @@ -22,7 +22,7 @@ public class CommandCookie extends ACommand { AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c请在控制台上操作"); return; } - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d设置网易云账户"); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d设置网易云账户,请点一首歌测试是否生效"); try { String cookie = args[1]; String[] cookies = cookie.split(";"); diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index 19810b7d..5d181236 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -5,6 +5,7 @@ import com.coloryr.allmusic.server.core.music.play.MusicSearch; import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.message.PAL; import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; @@ -66,11 +67,15 @@ public class CommandEX { commandAdminList.put("next", new CommandNext()); commandAdminList.put("ban", new CommandBan()); + commandAdminList.put("unban", new CommandUnban()); commandAdminList.put("banplayer", new CommandBanPlayer()); + commandAdminList.put("unbanplayer", new CommandUnbanPlayer()); commandAdminList.put("url", new CommandUrl()); commandAdminList.put("delete", new CommandDelete()); commandAdminList.put("addlist", new CommandAddList()); commandAdminList.put("clearlist", new CommandClearList()); + commandAdminList.put("clearban", new CommandClearBanList()); + commandAdminList.put("clearbanplayer", new CommandClearBanPlayerList()); commandAdminList.put("cookie", new CommandCookie()); commandAdminList.put("test", new CommandTest()); } @@ -167,15 +172,15 @@ public class CommandEX { musicID = args[0]; if (Function.isInteger(musicID)) { if (PlayMusic.getListSize() >= AllMusic.getConfig().maxPlayList) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.listFull); - } else if (AllMusic.getConfig().banMusic.contains(musicID)) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.banMusic); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.listFull); + } else if (DataSql.checkBanMusic(musicID)) { + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.banMusic); } else if (PlayMusic.haveMusic(musicID)) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.existMusic); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.existMusic); } else if (PlayMusic.isPlayerMax(name)) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.playerToMany); - } else if (AllMusic.getConfig().banPlayer.contains(name)) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.playerBan); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.playerToMany); + } else if (DataSql.checkBanPlayer(name)) { + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.playerBan); } else { if (checkMoney(sender, name, AllMusic.getConfig().cost.addMusicCost)) { return; @@ -184,7 +189,7 @@ public class CommandEX { AllMusic.getMessage().cost.addMusic)) { return; } - AllMusic.getConfig().removeNoMusicPlayer(name); + DataSql.removeMutePlayer(name); if (AllMusic.side.needPlay()) { MusicObj obj = new MusicObj(); obj.sender = sender; @@ -193,17 +198,17 @@ public class CommandEX { obj.isDefault = false; if (AllMusic.side.onMusicAdd(sender, obj)) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.cancel); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.cancel); return; } PlayMusic.addTask(obj); - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.success); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.success); } else - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.noPlayer); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.noPlayer); } } else - AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.noID); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.noID); } private static boolean isAdmin(String name) { @@ -250,7 +255,7 @@ public class CommandEX { break; case 0: default: - addMusic(sender, name, args); + DataSql.task(()-> addMusic(sender, name, args)); } } } diff --git a/core/command/CommandHelp.java b/core/command/CommandHelp.java index 6171e034..9720e057 100644 --- a/core/command/CommandHelp.java +++ b/core/command/CommandHelp.java @@ -61,6 +61,10 @@ public class CommandHelp extends ACommand { AllMusic.getMessage().click.clickCheck, "/music ban "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.banPlayer, AllMusic.getMessage().click.clickCheck, "/music banplayer "); + AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.unban, + AllMusic.getMessage().click.clickCheck, "/music unban "); + AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.unbanPlayer, + AllMusic.getMessage().click.clickCheck, "/music unbanplayer "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.url, AllMusic.getMessage().click.clickCheck, "/music url "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.delete, @@ -69,6 +73,10 @@ public class CommandHelp extends ACommand { AllMusic.getMessage().click.clickCheck, "/music addlist "); AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.admin.clearList, AllMusic.getMessage().click.clickRun, "/music clearlist"); + AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.admin.clearBanList, + AllMusic.getMessage().click.clickRun, "/music clearban"); + AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.admin.clearBanPlayerList, + AllMusic.getMessage().click.clickRun, "/music clearbanplayer"); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.cookie, AllMusic.getMessage().click.clickCheck, "/music cookie "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.test, diff --git a/core/command/CommandHud.java b/core/command/CommandHud.java index ac6d29cb..b45e8719 100644 --- a/core/command/CommandHud.java +++ b/core/command/CommandHud.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.message.PAL; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; @@ -67,7 +68,7 @@ public class CommandHud extends ACommand { public void execute(Object sender, String name, String[] args) { if (args.length == 2 || args.length == 3) { boolean temp = HudUtils.setHudEnable(name, null, args.length == 3 ? args[2] : null); - AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.state + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.state .replace(PAL.state, temp ? "启用" : "关闭") .replace(PAL.hud, AllMusic.getMessage().hudList.getHud(null))); return; diff --git a/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index 1ae9cef6..13eb7d2e 100644 --- a/core/command/CommandHudSet.java +++ b/core/command/CommandHudSet.java @@ -5,6 +5,7 @@ import com.coloryr.allmusic.server.core.objs.enums.HudDirType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.hud.PosObj; import com.coloryr.allmusic.server.core.objs.message.PAL; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; @@ -93,7 +94,7 @@ public class CommandHudSet extends AHudCommand { public void execute(Object sender, String name, String[] args) { if (args.length == 3 || args.length == 4) { boolean temp = HudUtils.setHudEnable(name, type, args.length == 4 ? args[3] : null); - AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.state + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.state .replace(PAL.state, temp ? AllMusic.getMessage().hudList.enable : AllMusic.getMessage().hudList.disable) @@ -139,11 +140,11 @@ public class CommandHudSet extends AHudCommand { } PosObj obj = HudUtils.setHudPos(name, type, args[3], args[4]); if (obj == null) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().command.error); return; } - AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.set .replace(PAL.hud, AllMusic.getMessage().hudList.getHud(type)) .replace(PAL.x, args[3]) .replace(PAL.y, args[4])); diff --git a/core/command/CommandMute.java b/core/command/CommandMute.java index b95d00a4..f7e5cd0c 100644 --- a/core/command/CommandMute.java +++ b/core/command/CommandMute.java @@ -1,13 +1,47 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; + +import java.util.ArrayList; +import java.util.List; public class CommandMute extends ACommand { @Override public void execute(Object sender, String name, String[] args) { - AllMusic.side.sendStop(name); - AllMusic.side.clearHud(name); - AllMusic.getConfig().addNoMusicPlayer(name); - AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute); + if (args.length == 2 && args[1].equalsIgnoreCase("list")) { + DataSql.task(() -> { + if (DataSql.checkMuteListPlayer(name)) { + DataSql.removeMuteListPlayer(name); + AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute2); + } else { + DataSql.addMuteListPlayer(name); + AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute1); + if (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList()) { + AllMusic.side.runTask(() -> { + AllMusic.side.sendStop(name); + AllMusic.side.clearHud(name); + }); + } + } + }); + } else { + DataSql.addMutePlayer(name); + AllMusic.side.sendStop(name); + AllMusic.side.clearHud(name); + AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute); + } + } + + @Override + public List tab(Object player, String name, String[] args, int index) { + if (args.length == index || (args.length == index + 1 && args[index].isEmpty())) { + return new ArrayList() {{ + add("list"); + }}; + } else { + return super.tab(player, name, args, index); + } } } diff --git a/core/command/CommandNext.java b/core/command/CommandNext.java index 466e898a..92159e2b 100644 --- a/core/command/CommandNext.java +++ b/core/command/CommandNext.java @@ -2,6 +2,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; public class CommandNext extends ACommand { @@ -9,6 +10,6 @@ public class CommandNext extends ACommand { public void execute(Object sender, String name, String[] args) { PlayMusic.musicLessTime = 1; AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2已强制切歌"); - AllMusic.getConfig().removeNoMusicPlayer(name); + DataSql.removeMutePlayer(name); } } diff --git a/core/command/CommandPush.java b/core/command/CommandPush.java index d6d9b04c..6b72aa21 100644 --- a/core/command/CommandPush.java +++ b/core/command/CommandPush.java @@ -4,6 +4,7 @@ import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.message.PAL; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import java.util.ArrayList; import java.util.Collections; @@ -91,7 +92,7 @@ public class CommandPush extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.arAgree); } } - AllMusic.getConfig().removeNoMusicPlayer(name); + DataSql.removeMutePlayer(name); } @Override diff --git a/core/command/CommandSelect.java b/core/command/CommandSelect.java index d0960cd9..10862c6c 100644 --- a/core/command/CommandSelect.java +++ b/core/command/CommandSelect.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.message.PAL; import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; @@ -30,7 +31,7 @@ public class CommandSelect extends ACommand { ID[0] = obj.getSong((obj.getPage() * 10) + (a - 1)); AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.choice.replace(PAL.index, "" + a)); - CommandEX.addMusic(sender, name, ID); + DataSql.task(() -> CommandEX.addMusic(sender, name, ID)); AllMusic.removeSearch(name); } else { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.errorNum); diff --git a/core/command/CommandUnban.java b/core/command/CommandUnban.java new file mode 100644 index 00000000..c221b672 --- /dev/null +++ b/core/command/CommandUnban.java @@ -0,0 +1,44 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; +import com.coloryr.allmusic.server.core.utils.Function; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class CommandUnban extends ACommand { + @Override + public void execute(Object sender, String name, String[] args) { + if (args.length != 2) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + return; + } + if (Function.isInteger(args[1])) { + DataSql.removeBanMusic(args[1]); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2已解封点歌" + args[1]); + } else { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2请输入有效的ID"); + } + } + + @Override + public List tab(Object player, String name, String[] args, int index) { +// if (args.length == index || (args.length == index + 1 && args[index].isEmpty())) { +// List list = new ArrayList<>(); +// if (PlayMusic.nowPlayMusic != null) { +// list.add(PlayMusic.nowPlayMusic.getID()); +// } +// for (SongInfoObj item : PlayMusic.getList()) { +// list.add(item.getID()); +// } +// +// return list; +// } + + return Collections.emptyList(); + } +} diff --git a/core/command/CommandUnbanPlayer.java b/core/command/CommandUnbanPlayer.java new file mode 100644 index 00000000..d897f2f5 --- /dev/null +++ b/core/command/CommandUnbanPlayer.java @@ -0,0 +1,28 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.sql.DataSql; + +import java.util.Collections; +import java.util.List; + +public class CommandUnbanPlayer implements ICommand { + @Override + public void execute(Object sender, String name, String[] args) { + if (args.length != 2) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + return; + } + DataSql.removeBanPlayer(args[1]); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2已解封玩家" + args[1] + "点歌"); + } + + @Override + public List tab(Object player, String name, String[] args, int index) { +// if (args.length == index || (args.length == index + 1 && args[index].isEmpty())) { +// return AllMusic.side.getPlayerList(); +// } + + return Collections.emptyList(); + } +} diff --git a/core/command/CommandVote.java b/core/command/CommandVote.java index d6aaa64a..d91c7009 100644 --- a/core/command/CommandVote.java +++ b/core/command/CommandVote.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server.core.command; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; import com.coloryr.allmusic.server.core.objs.message.PAL; +import com.coloryr.allmusic.server.core.sql.DataSql; public class CommandVote extends ACommand { @Override @@ -52,6 +53,6 @@ public class CommandVote extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.arAgree); } } - AllMusic.getConfig().removeNoMusicPlayer(name); + DataSql.removeMutePlayer(name); } } diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index d5012182..b6cb6cc8 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -46,18 +46,6 @@ public class ConfigObj { * 不参与点歌的服务器列表 */ public Set muteServer; - /** - * 不参与点歌的玩家列表 - */ - public Set mutePlayer; - /** - * 禁止点歌ID列表 - */ - public Set banMusic; - /** - * 禁止玩家点歌列表 - */ - public Set banPlayer; /** * 玩家点歌后是否直接从空闲歌单切换至玩家歌曲 */ @@ -138,51 +126,16 @@ public class ConfigObj { return config; } - public void addBanMusic(String id) { - banMusic.add(id); - AllMusic.saveConfig(); - } - - public void addBanPlayer(String name) { - name = name.toLowerCase(Locale.ROOT); - banPlayer.add(name); - AllMusic.saveConfig(); - } - - public void addNoMusicPlayer(String name) { - name = name.toLowerCase(Locale.ROOT); - mutePlayer.add(name); - AllMusic.saveConfig(); - } - - public void removeNoMusicPlayer(String name) { - name = name.toLowerCase(Locale.ROOT); - mutePlayer.remove(name); - AllMusic.saveConfig(); - } - public boolean check() { boolean saveConfig = false; if (adminList == null) { saveConfig = true; adminList = new HashSet<>(); } - if (banMusic == null) { - saveConfig = true; - banMusic = new HashSet<>(); - } - if (banPlayer == null) { - saveConfig = true; - banPlayer = new HashSet<>(); - } if (defaultHud == null) { saveConfig = true; defaultHud = SaveObj.make(); } - if (mutePlayer == null) { - saveConfig = true; - mutePlayer = new HashSet<>(); - } if (muteServer == null) { saveConfig = true; muteServer = new HashSet<>(); @@ -215,9 +168,6 @@ public class ConfigObj { adminList = new HashSet<>(); adminList.add("color_yr"); muteServer = new HashSet<>(); - mutePlayer = new HashSet<>(); - banMusic = new HashSet<>(); - banPlayer = new HashSet<>(); playListSwitch = true; playListRandom = true; playListEscapeDeep = 40; diff --git a/core/objs/message/AddMusicObj.java b/core/objs/message/AddMusicObj.java index 2608be33..d0b7bfa4 100644 --- a/core/objs/message/AddMusicObj.java +++ b/core/objs/message/AddMusicObj.java @@ -42,15 +42,25 @@ public class AddMusicObj { } public void init() { - listFull = "§d[AllMusic3]§c错误,队列已满"; - playerToMany = "§d[AllMusic3]§c错误,你点了太多的歌"; - playerBan = "§d[AllMusic3]§c错误,你已被禁止点歌"; - banMusic = "§d[AllMusic3]§c错误,这首歌被禁点了"; - existMusic = "§d[AllMusic3]§c错误,这首歌已经存在了"; - success = "§d[AllMusic3]§2点歌成功"; - noPlayer = "§d[AllMusic3]§c没有播放的玩家"; - noID = "§d[AllMusic3]§c错误,请输入歌曲数字ID"; - cancel = "§d[AllMusic3]§e点歌被取消"; - timeOut = "§d[AllMusic3]§e点歌被取消,音乐长度过长"; + if (listFull == null) + listFull = "§d[AllMusic3]§c错误,队列已满"; + if (playerToMany == null) + playerToMany = "§d[AllMusic3]§c错误,你点了太多的歌"; + if (playerBan == null) + playerBan = "§d[AllMusic3]§c错误,你已被禁止点歌"; + if (banMusic == null) + banMusic = "§d[AllMusic3]§c错误,这首歌被禁点了"; + if (existMusic == null) + existMusic = "§d[AllMusic3]§c错误,这首歌已经存在了"; + if (success == null) + success = "§d[AllMusic3]§2点歌成功"; + if (noPlayer == null) + noPlayer = "§d[AllMusic3]§c没有播放的玩家"; + if (noID == null) + noID = "§d[AllMusic3]§c错误,请输入歌曲数字ID"; + if (cancel == null) + cancel = "§d[AllMusic3]§e点歌被取消"; + if (timeOut == null) + timeOut = "§d[AllMusic3]§e点歌被取消,音乐长度过长"; } } diff --git a/core/objs/message/CancelObj.java b/core/objs/message/CancelObj.java index 8e002006..567bcb4d 100644 --- a/core/objs/message/CancelObj.java +++ b/core/objs/message/CancelObj.java @@ -27,10 +27,15 @@ public class CancelObj { } public void init() { - err1 = "§d[AllMusic3]§c你没有点歌"; - err2 = "§d[AllMusic3]§c歌曲" + PAL.musicName + "-" + PAL.musicAuthor + "不是你的点歌"; - err3 = "§d[AllMusic3]§c没有找到序号为" + PAL.index + "的点歌"; - err4 = "§d[AllMusic3]§c输入的序号错误"; - done = "§d[AllMusic3]§e已取消你的点歌"; + if (err1 == null) + err1 = "§d[AllMusic3]§c你没有点歌"; + if (err2 == null) + err2 = "§d[AllMusic3]§c歌曲" + PAL.musicName + "-" + PAL.musicAuthor + "不是你的点歌"; + if (err3 == null) + err3 = "§d[AllMusic3]§c没有找到序号为" + PAL.index + "的点歌"; + if (err4 == null) + err4 = "§d[AllMusic3]§c输入的序号错误"; + if (done == null) + done = "§d[AllMusic3]§e已取消你的点歌"; } } diff --git a/core/objs/message/ClickObj.java b/core/objs/message/ClickObj.java index 48f9c4a6..12950d10 100644 --- a/core/objs/message/ClickObj.java +++ b/core/objs/message/ClickObj.java @@ -18,7 +18,9 @@ public class ClickObj { } public void init() { - clickRun = "§b[§n点我选择§r§b]"; - clickCheck = "§b[§n点我查看§r§b]"; + if (clickRun == null) + clickRun = "§b[§n点我选择§r§b]"; + if (clickCheck == null) + clickCheck = "§b[§n点我查看§r§b]"; } } diff --git a/core/objs/message/CommandObj.java b/core/objs/message/CommandObj.java index 67eed871..e81f2230 100644 --- a/core/objs/message/CommandObj.java +++ b/core/objs/message/CommandObj.java @@ -18,7 +18,9 @@ public class CommandObj { } public void init() { - error = "§d[AllMusic3]§c参数错误,请输入/music help获取帮助"; - noPer = "§d[AllMusic3]§c你没有权限执行这个操作"; + if (error == null) + error = "§d[AllMusic3]§c参数错误,请输入/music help获取帮助"; + if (noPer == null) + noPer = "§d[AllMusic3]§c你没有权限执行这个操作"; } } diff --git a/core/objs/message/CostObj.java b/core/objs/message/CostObj.java index a3dc5382..c6636fcf 100644 --- a/core/objs/message/CostObj.java +++ b/core/objs/message/CostObj.java @@ -24,9 +24,13 @@ public class CostObj { } public void init() { - search = "§d[AllMusic3]§e你搜歌花费了" + PAL.cost; - addMusic = "§d[AllMusic3]§e你点歌花费了" + PAL.cost; - noMoney = "§d[AllMusic3]§c你没有足够的钱"; - costFail = "§d[AllMusic3]§c扣钱过程中错误"; + if (search == null) + search = "§d[AllMusic3]§e你搜歌花费了" + PAL.cost; + if (addMusic == null) + addMusic = "§d[AllMusic3]§e你点歌花费了" + PAL.cost; + if (noMoney == null) + noMoney = "§d[AllMusic3]§c你没有足够的钱"; + if (costFail == null) + costFail = "§d[AllMusic3]§c扣钱过程中错误"; } } diff --git a/core/objs/message/CustomObj.java b/core/objs/message/CustomObj.java index 5e780d66..a1289707 100644 --- a/core/objs/message/CustomObj.java +++ b/core/objs/message/CustomObj.java @@ -20,7 +20,9 @@ public class CustomObj { } public void init() { - info = "自定义音乐"; - idle = "空闲列表"; + if (info == null) + info = "自定义音乐"; + if (idle == null) + idle = "空闲列表"; } } diff --git a/core/objs/message/FunObj.java b/core/objs/message/FunObj.java index 8ab76ca4..66c05d36 100644 --- a/core/objs/message/FunObj.java +++ b/core/objs/message/FunObj.java @@ -17,6 +17,7 @@ public class FunObj { } public void init() { - rain = "§d[AllMusic3]§e天空开始变得湿润"; + if (rain == null) + rain = "§d[AllMusic3]§e天空开始变得湿润"; } } diff --git a/core/objs/message/HelpAdminObj.java b/core/objs/message/HelpAdminObj.java index 3a093487..d4a97a8b 100644 --- a/core/objs/message/HelpAdminObj.java +++ b/core/objs/message/HelpAdminObj.java @@ -11,6 +11,10 @@ public class HelpAdminObj { public String clearList; public String cookie; public String test; + public String unbanPlayer; + public String unban; + public String clearBanList; + public String clearBanPlayerList; public static HelpAdminObj make() { HelpAdminObj obj = new HelpAdminObj(); @@ -26,6 +30,10 @@ public class HelpAdminObj { return true; if (ban == null) return true; + if (unban == null) + return true; + if (unbanPlayer == null) + return true; if (url == null) return true; if (delete == null) @@ -38,19 +46,41 @@ public class HelpAdminObj { return true; if (test == null) return true; + if (clearBanList == null) + return true; + if (clearBanPlayerList == null) + return true; return cookie == null; } public void init() { - reload = "§d[AllMusic3]§e使用/music reload 重读配置文件"; - next = "§d[AllMusic3]§e使用/music next 强制切歌"; - ban = "§d[AllMusic3]§e使用/music ban [ID] 禁止点这首歌"; - banPlayer = "§d[AllMusic3]§e使用/music banplayer [ID] 禁止某位玩家点歌"; - url = "§d[AllMusic3]§e使用/music url [url] 播放一首自定义歌曲"; - delete = "§d[AllMusic3]§e使用/music delete [序号] 删除队列中的歌曲"; - addList = "§d[AllMusic3]§e使用/music addlist [歌单ID] 添加歌单到空闲列表"; - clearList = "§d[AllMusic3]§e使用/music clearlist 清空空闲歌单"; - cookie = "§d[AllMusic3]§e使用/music cookie [cookie] 填写cookie"; - test = "§d[AllMusic3]§e使用/music test [音乐ID] 测试解析音乐"; + if (reload == null) + reload = "§d[AllMusic3]§e使用/music reload 重读配置文件"; + if (next == null) + next = "§d[AllMusic3]§e使用/music next 强制切歌"; + if (ban == null) + ban = "§d[AllMusic3]§e使用/music ban [ID] 禁止点这首歌"; + if (banPlayer == null) + banPlayer = "§d[AllMusic3]§e使用/music banplayer [ID] 禁止某位玩家点歌"; + if (unban == null) + unban = "§d[AllMusic3]§e使用/music unban [ID] 解禁点这首歌"; + if (unbanPlayer == null) + unbanPlayer = "§d[AllMusic3]§e使用/music unbanplayer [ID] 解禁某位玩家点歌"; + if (url == null) + url = "§d[AllMusic3]§e使用/music url [url] 播放一首自定义歌曲"; + if (delete == null) + delete = "§d[AllMusic3]§e使用/music delete [序号] 删除队列中的歌曲"; + if (addList == null) + addList = "§d[AllMusic3]§e使用/music addlist [歌单ID] 添加歌单到空闲列表"; + if (clearList == null) + clearList = "§d[AllMusic3]§e使用/music clearlist 清空空闲歌单"; + if (clearBanList == null) + clearBanList = "§d[AllMusic3]§e使用/music clearban 清空禁止点歌列表"; + if (clearBanPlayerList == null) + clearBanPlayerList = "§d[AllMusic3]§e使用/music clearbanplayer 清空禁止玩家点歌列表"; + if (cookie == null) + cookie = "§d[AllMusic3]§e使用/music cookie [cookie] 填写cookie"; + if (test == null) + test = "§d[AllMusic3]§e使用/music test [音乐ID] 测试解析音乐"; } } diff --git a/core/objs/message/HelpNormalObj.java b/core/objs/message/HelpNormalObj.java index ec7c695b..92e9738b 100644 --- a/core/objs/message/HelpNormalObj.java +++ b/core/objs/message/HelpNormalObj.java @@ -11,6 +11,7 @@ public class HelpNormalObj { public String push; public String push1; public String mute; + public String mutelist; public String search; public String select; public String nextpage; @@ -54,6 +55,8 @@ public class HelpNormalObj { return true; if (mute == null) return true; + if (mutelist == null) + return true; if (search == null) return true; if (select == null) @@ -84,29 +87,55 @@ public class HelpNormalObj { } public void init() { - head = "§d[AllMusic3]§e帮助手册"; - base = "§d[AllMusic3]§e/music [音乐ID] 来点歌"; - stop = "§d[AllMusic3]§e/music stop 停止播放歌曲"; - list = "§d[AllMusic3]§e/music list 查看歌曲队列"; - cancel = "§d[AllMusic3]§e/music cancel (序号) 取消你的点歌"; - vote = "§d[AllMusic3]§e/music vote 投票切歌"; - vote1 = "§d[AllMusic3]§e/music vote cancel 取消发起的切歌"; - push = "§d[AllMusic3]§e/music push (序号) 投票将歌曲插入到队列头"; - push1 = "§d[AllMusic3]§e/music push cancel 取消发起的插歌"; - mute = "§d[AllMusic3]§e/music mute 不再参与点歌"; - search = "§d[AllMusic3]§e/music search [歌名] 搜索歌曲"; - select = "§d[AllMusic3]§e/music select [序列] 选择歌曲"; - nextpage = "§d[AllMusic3]§e/music nextpage 切换下一页歌曲搜索结果"; - lastpage = "§d[AllMusic3]§e/music lastpage 切换上一页歌曲搜索结果"; - hud9 = "§d[AllMusic3]§e/music hud enable 启用/关闭全部界面"; - hud10 = "§d[AllMusic3]§e/music hud reset 重置全部界面"; - hud1 = "§d[AllMusic3]§e/music hud [位置] enable 启用关闭单一界面"; - hud2 = "§d[AllMusic3]§e/music hud [位置] pos [x] [y] 设置某个界面的位置"; - hud6 = "§d[AllMusic3]§e/music hud [位置] dir [对齐方式] 设置某个界面的对齐方式"; - hud7 = "§d[AllMusic3]§e/music hud [位置] color [颜色HEX] 设置某个界面的颜色"; - hud8 = "§d[AllMusic3]§e/music hud [位置] reset 重置单一界面"; - hud3 = "§d[AllMusic3]§e/music hud pic size [尺寸] 设置图片尺寸"; - hud4 = "§d[AllMusic3]§e/music hud pic rotate [开关] 设置图片旋转模式"; - hud5 = "§d[AllMusic3]§e/music hud pic speed [数值] 设置图片旋转速度"; + if (head == null) + head = "§d[AllMusic3]§e帮助手册"; + if (base == null) + base = "§d[AllMusic3]§e/music [音乐ID] 来点歌"; + if (stop == null) + stop = "§d[AllMusic3]§e/music stop 停止播放歌曲"; + if (list == null) + list = "§d[AllMusic3]§e/music list 查看歌曲队列"; + if (cancel == null) + cancel = "§d[AllMusic3]§e/music cancel (序号) 取消你的点歌"; + if (vote == null) + vote = "§d[AllMusic3]§e/music vote 投票切歌"; + if (vote1 == null) + vote1 = "§d[AllMusic3]§e/music vote cancel 取消发起的切歌"; + if (push == null) + push = "§d[AllMusic3]§e/music push (序号) 投票将歌曲插入到队列头"; + if (push1 == null) + push1 = "§d[AllMusic3]§e/music push cancel 取消发起的插歌"; + if (mute == null) + mute = "§d[AllMusic3]§e/music mute 不再参与点歌"; + if (mutelist == null) + mutelist = "§d[AllMusic3]§e/music mute list 不再接收空闲列表点歌"; + if (search == null) + search = "§d[AllMusic3]§e/music search [歌名] 搜索歌曲"; + if (select == null) + select = "§d[AllMusic3]§e/music select [序列] 选择歌曲"; + if (nextpage == null) + nextpage = "§d[AllMusic3]§e/music nextpage 切换下一页歌曲搜索结果"; + if (lastpage == null) + lastpage = "§d[AllMusic3]§e/music lastpage 切换上一页歌曲搜索结果"; + if (hud9 == null) + hud9 = "§d[AllMusic3]§e/music hud enable 启用/关闭全部界面"; + if (hud10 == null) + hud10 = "§d[AllMusic3]§e/music hud reset 重置全部界面"; + if (hud1 == null) + hud1 = "§d[AllMusic3]§e/music hud [位置] enable 启用关闭单一界面"; + if (hud2 == null) + hud2 = "§d[AllMusic3]§e/music hud [位置] pos [x] [y] 设置某个界面的位置"; + if (hud6 == null) + hud6 = "§d[AllMusic3]§e/music hud [位置] dir [对齐方式] 设置某个界面的对齐方式"; + if (hud7 == null) + hud7 = "§d[AllMusic3]§e/music hud [位置] color [颜色HEX] 设置某个界面的颜色"; + if (hud8 == null) + hud8 = "§d[AllMusic3]§e/music hud [位置] reset 重置单一界面"; + if (hud3 == null) + hud3 = "§d[AllMusic3]§e/music hud pic size [尺寸] 设置图片尺寸"; + if (hud4 == null) + hud4 = "§d[AllMusic3]§e/music hud pic rotate [开关] 设置图片旋转模式"; + if (hud5 == null) + hud5 = "§d[AllMusic3]§e/music hud pic speed [数值] 设置图片旋转速度"; } } diff --git a/core/objs/message/HudNameObj.java b/core/objs/message/HudNameObj.java index 64f608b9..601a99b5 100644 --- a/core/objs/message/HudNameObj.java +++ b/core/objs/message/HudNameObj.java @@ -111,23 +111,41 @@ public class HudNameObj { } public void init() { - list = "待播放列表"; - lyric = "歌词"; - info = "歌曲信息"; - pic = "图片"; - all = "所有位置"; - picRoute = "图片旋转"; - picSpeed = "图片旋转速度"; - enable = "启用"; - disable = "关闭"; - pos1 = "左上"; - pos2 = "上"; - pos3 = "右上"; - pos4 = "左"; - pos5 = "居中"; - pos6 = "右"; - pos7 = "左下"; - pos8 = "下"; - pos9 = "右下"; + if (list == null) + list = "待播放列表"; + if (lyric == null) + lyric = "歌词"; + if (info == null) + info = "歌曲信息"; + if (pic == null) + pic = "图片"; + if (all == null) + all = "所有位置"; + if (picRoute == null) + picRoute = "图片旋转"; + if (picSpeed == null) + picSpeed = "图片旋转速度"; + if (enable == null) + enable = "启用"; + if (disable == null) + disable = "关闭"; + if (pos1 == null) + pos1 = "左上"; + if (pos2 == null) + pos2 = "上"; + if (pos3 == null) + pos3 = "右上"; + if (pos4 == null) + pos4 = "左"; + if (pos5 == null) + pos5 = "居中"; + if (pos6 == null) + pos6 = "右"; + if (pos7 == null) + pos7 = "左下"; + if (pos8 == null) + pos8 = "下"; + if (pos9 == null) + pos9 = "右下"; } } diff --git a/core/objs/message/HudObj.java b/core/objs/message/HudObj.java index cdaad543..d36b82fb 100644 --- a/core/objs/message/HudObj.java +++ b/core/objs/message/HudObj.java @@ -60,23 +60,39 @@ public class HudObj { } public void init() { - state = "§d[AllMusic3]§e设置信息位置:" + PAL.hud + ",状态:" + PAL.state; - set = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的坐标为[" + PAL.x + ", " + PAL.y + "]"; - set1 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的对齐方式为[" + PAL.dir + "]"; - set2 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的颜色为[" + PAL.color + "]"; - set3 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的阴影为[" + PAL.state + "]"; - reset = "§d[AllMusic3]§e界面[" + PAL.hud + "]恢复至默认位置"; - emptyMusic = "没有播放的音乐"; - emptyList = "队列中无歌曲"; - emptyLyric = "无歌词"; - picSize = "§d[AllMusic3]§e设置图片尺寸为[" + PAL.size + "]"; - picRotate = "§d[AllMusic3]§e设置图片旋转为[" + PAL.state + "]"; - picSpeed = "§d[AllMusic3]§e设置图片旋转速度为[" + PAL.size + "]"; - music = PAL.name + " " + PAL.allTime + "/" + PAL.nowTime - + "\n" + PAL.musicAuthor + "\n" + PAL.musicAlia + "\n" + PAL.musicAl - + "\nby: " + PAL.player; - lyric = PAL.lyric + "\n" + PAL.tlyric; - ktv = "§e" + PAL.klyric + "§f" + PAL.lyric + "§r\n" + PAL.tlyric; - list = "播放列表里面有" + PAL.size + "首歌\n" + PAL.list; + if (state == null) + state = "§d[AllMusic3]§e设置信息位置:" + PAL.hud + ",状态:" + PAL.state; + if (set == null) + set = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的坐标为[" + PAL.x + ", " + PAL.y + "]"; + if (set1 == null) + set1 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的对齐方式为[" + PAL.dir + "]"; + if (set2 == null) + set2 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的颜色为[" + PAL.color + "]"; + if (set3 == null) + set3 = "§d[AllMusic3]§e已设置[" + PAL.hud + "]的阴影为[" + PAL.state + "]"; + if (reset == null) + reset = "§d[AllMusic3]§e界面[" + PAL.hud + "]恢复至默认位置"; + if (emptyMusic == null) + emptyMusic = "没有播放的音乐"; + if (emptyList == null) + emptyList = "队列中无歌曲"; + if (emptyLyric == null) + emptyLyric = "无歌词"; + if (picSize == null) + picSize = "§d[AllMusic3]§e设置图片尺寸为[" + PAL.size + "]"; + if (picRotate == null) + picRotate = "§d[AllMusic3]§e设置图片旋转为[" + PAL.state + "]"; + if (picSpeed == null) + picSpeed = "§d[AllMusic3]§e设置图片旋转速度为[" + PAL.size + "]"; + if (music == null) + music = PAL.name + " " + PAL.allTime + "/" + PAL.nowTime + + "\n" + PAL.musicAuthor + "\n" + PAL.musicAlia + "\n" + PAL.musicAl + + "\nby: " + PAL.player; + if (lyric == null) + lyric = PAL.lyric + "\n" + PAL.tlyric; + if (ktv == null) + ktv = "§e" + PAL.klyric + "§f" + PAL.lyric + "§r\n" + PAL.tlyric; + if (list == null) + list = "播放列表里面有" + PAL.size + "首歌\n" + PAL.list; } } diff --git a/core/objs/message/ListMusicObj.java b/core/objs/message/ListMusicObj.java index 2126d250..bb811b28 100644 --- a/core/objs/message/ListMusicObj.java +++ b/core/objs/message/ListMusicObj.java @@ -23,9 +23,12 @@ public class ListMusicObj { } public void init() { - head = "§d[AllMusic3]§e队列中有歌曲数:" + PAL.count; - item = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor - + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; - get = "§d[AllMusic3]§e歌曲列表" + PAL.name + "获取成功"; + if (head == null) + head = "§d[AllMusic3]§e队列中有歌曲数:" + PAL.count; + if (item == null) + item = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor + + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; + if (get == null) + get = "§d[AllMusic3]§e歌曲列表" + PAL.name + "获取成功"; } } diff --git a/core/objs/message/LyricObj.java b/core/objs/message/LyricObj.java index 7f792a0e..ec92e85b 100644 --- a/core/objs/message/LyricObj.java +++ b/core/objs/message/LyricObj.java @@ -27,10 +27,15 @@ public class LyricObj { } public void init() { - data = PAL.lyric; - tdata = PAL.lyric + "(" + PAL.tlyric + ")"; - empty1 = "没有歌词"; - empty2 = "没有翻译歌词"; - empty3 = "没有KTV歌词"; + if (data == null) + data = PAL.lyric; + if (tdata == null) + tdata = PAL.lyric + "(" + PAL.tlyric + ")"; + if (empty1 == null) + empty1 = "没有歌词"; + if (empty2 == null) + empty2 = "没有翻译歌词"; + if (empty3 == null) + empty3 = "没有KTV歌词"; } } diff --git a/core/objs/message/MusicPlayObj.java b/core/objs/message/MusicPlayObj.java index f75af928..3ccc4b79 100644 --- a/core/objs/message/MusicPlayObj.java +++ b/core/objs/message/MusicPlayObj.java @@ -8,6 +8,8 @@ public class MusicPlayObj { public ListMusicObj listMusic; public String emptyCanPlay; public String mute; + public String mute1; + public String mute2; public String switchMusic; public String addMusic; public String checkMusic; @@ -37,6 +39,10 @@ public class MusicPlayObj { res = true; if (mute == null) res = true; + if (mute1 == null) + res = true; + if (mute2 == null) + res = true; if (switchMusic == null) res = true; if (addMusic == null) @@ -56,22 +62,40 @@ public class MusicPlayObj { } public void init() { - stopPlaying = "§d[AllMusic3]§e已停止你的音乐播放"; - emptyPlayingMusic = "§d[AllMusic3]§e无正在播放的歌曲"; - nowPlay = "§d[AllMusic3]§e正在播放:" + PAL.musicName + " | " + PAL.musicAuthor - + " by: " + PAL.player; - emptyPlay = "§d[AllMusic3]§e队列中无歌曲"; - listMusic = ListMusicObj.make(); - emptyCanPlay = "§d[AllMusic3]§c无法播放歌曲" + PAL.musicId + "可能该歌曲为VIP歌曲"; - mute = "§d[AllMusic3]§e你不会再收到点歌了!想要再次参与点歌就点一首歌吧!"; - switchMusic = "§d[AllMusic3]§e切换到玩家歌曲"; - addMusic = "§d[AllMusic3]§e音乐列表添加" + PAL.musicName + " | " + PAL.musicAuthor - + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; - checkMusic = "§d[AllMusic3]§e正在解析歌曲" + PAL.musicId; - musicInfo = PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl - + " | " + PAL.musicAlia + " | by: " + PAL.player; - trail = "§d[AllMusic3]§e该音乐为试听音乐"; - cancel = "§d[AllMusic3]§e播放被取消"; - error1 = "§d[AllMusic3]§c未知音乐类型"; + if (stopPlaying == null) + stopPlaying = "§d[AllMusic3]§e已停止你的音乐播放"; + if (emptyPlayingMusic == null) + emptyPlayingMusic = "§d[AllMusic3]§e无正在播放的歌曲"; + if (nowPlay == null) + nowPlay = "§d[AllMusic3]§e正在播放:" + PAL.musicName + " | " + PAL.musicAuthor + + " by: " + PAL.player; + if (emptyPlay == null) + emptyPlay = "§d[AllMusic3]§e队列中无歌曲"; + if (listMusic == null) + listMusic = ListMusicObj.make(); + if (emptyCanPlay == null) + emptyCanPlay = "§d[AllMusic3]§c无法播放歌曲" + PAL.musicId + "可能该歌曲为VIP歌曲"; + if (mute == null) + mute = "§d[AllMusic3]§e你不会再收到点歌了!想要再次参与点歌就点一首歌吧!"; + if (mute1 == null) + mute1 = "§d[AllMusic3]§e你不会再收到空闲歌单点歌了,再输入一次指令恢复"; + if (mute2 == null) + mute2 = "§d[AllMusic3]§e你已开始收到空闲歌单点歌"; + if (switchMusic == null) + switchMusic = "§d[AllMusic3]§e切换到玩家歌曲"; + if (addMusic == null) + addMusic = "§d[AllMusic3]§e音乐列表添加" + PAL.musicName + " | " + PAL.musicAuthor + + " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player; + if (checkMusic == null) + checkMusic = "§d[AllMusic3]§e正在解析歌曲" + PAL.musicId; + if (musicInfo == null) + musicInfo = PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl + + " | " + PAL.musicAlia + " | by: " + PAL.player; + if (trail == null) + trail = "§d[AllMusic3]§e该音乐为试听音乐"; + if (cancel == null) + cancel = "§d[AllMusic3]§e播放被取消"; + if (error1 == null) + error1 = "§d[AllMusic3]§c未知音乐类型"; } } diff --git a/core/objs/message/PAPIObj.java b/core/objs/message/PAPIObj.java index 3c100ad6..ac008c6c 100644 --- a/core/objs/message/PAPIObj.java +++ b/core/objs/message/PAPIObj.java @@ -15,6 +15,7 @@ public class PAPIObj { } public void init() { - emptyMusic = "没有播放的音乐"; + if (emptyMusic == null) + emptyMusic = "没有播放的音乐"; } } diff --git a/core/objs/message/PageObj.java b/core/objs/message/PageObj.java index 8dbf7e41..b7b1a9e2 100644 --- a/core/objs/message/PageObj.java +++ b/core/objs/message/PageObj.java @@ -23,8 +23,11 @@ public class PageObj { } public void init() { - choice = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl; - next = "§e[§n点我下一页§r§e]"; - last = "§e[§n点我上一页§r§e]"; + if (choice == null) + choice = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl; + if (next == null) + next = "§e[§n点我下一页§r§e]"; + if (last == null) + last = "§e[§n点我上一页§r§e]"; } } diff --git a/core/objs/message/PushObj.java b/core/objs/message/PushObj.java index b453b7ba..bb85dd7f 100644 --- a/core/objs/message/PushObj.java +++ b/core/objs/message/PushObj.java @@ -66,23 +66,41 @@ public class PushObj { } public void init() { - noPermission = "§d[AllMusic3]§c你没有权限插歌"; - doVote = "§d[AllMusic3]§e已发起插歌投票"; - bq = "§d[AllMusic3]§e" + PAL.player + "发起了插歌投票,将曲目" + PAL.musicName + "-" + PAL.musicAuthor + "调整到下一首播放," + PAL.time + "秒后结束,输入/music push 同意插歌。"; - bq1 = "§d[AllMusic3]§e或者点击 "; - bq2 = "§a同意插歌"; - agree = "§d[AllMusic3]§e你同意插歌"; - bqAgree = "§d[AllMusic3]§e" + PAL.player + "同意插歌,共有" + PAL.count + "名玩家同意插歌。"; - arAgree = "§d[AllMusic3]§e你已申请插歌"; - timeOut = "§d[AllMusic3]§e插歌时间结束"; - doPush = "§d[AllMusic3]§e播放顺序已调整"; - noId = "§d[AllMusic3]§c没有找到你的点歌"; - noId1 = "§d[AllMusic3]§c没有找到序号为" + PAL.index + "的点歌"; - idErr = "§d[AllMusic3]§c错误的歌曲序号"; - pushErr = "§d[AllMusic3]§c这首歌已经是下一首播放了"; - err1 = "§d[AllMusic3]§c你没有发起插歌"; - err2 = "§d[AllMusic3]§c你发起的插歌已超时"; - err3 = "§d[AllMusic3]§c发起失败,已经有人发起了插歌投票"; - cancel = "§d[AllMusic3]§e插歌投票已被发起者取消"; + if (noPermission == null) + noPermission = "§d[AllMusic3]§c你没有权限插歌"; + if (doVote == null) + doVote = "§d[AllMusic3]§e已发起插歌投票"; + if (bq == null) + bq = "§d[AllMusic3]§e" + PAL.player + "发起了插歌投票,将曲目" + PAL.musicName + "-" + PAL.musicAuthor + "调整到下一首播放," + PAL.time + "秒后结束,输入/music push 同意插歌。"; + if (bq1 == null) + bq1 = "§d[AllMusic3]§e或者点击 "; + if (bq2 == null) + bq2 = "§a同意插歌"; + if (agree == null) + agree = "§d[AllMusic3]§e你同意插歌"; + if (bqAgree == null) + bqAgree = "§d[AllMusic3]§e" + PAL.player + "同意插歌,共有" + PAL.count + "名玩家同意插歌。"; + if (arAgree == null) + arAgree = "§d[AllMusic3]§e你已申请插歌"; + if (timeOut == null) + timeOut = "§d[AllMusic3]§e插歌时间结束"; + if (doPush == null) + doPush = "§d[AllMusic3]§e播放顺序已调整"; + if (noId == null) + noId = "§d[AllMusic3]§c没有找到你的点歌"; + if (noId1 == null) + noId1 = "§d[AllMusic3]§c没有找到序号为" + PAL.index + "的点歌"; + if (idErr == null) + idErr = "§d[AllMusic3]§c错误的歌曲序号"; + if (pushErr == null) + pushErr = "§d[AllMusic3]§c这首歌已经是下一首播放了"; + if (err1 == null) + err1 = "§d[AllMusic3]§c你没有发起插歌"; + if (err2 == null) + err2 = "§d[AllMusic3]§c你发起的插歌已超时"; + if (err3 == null) + err3 = "§d[AllMusic3]§c发起失败,已经有人发起了插歌投票"; + if (cancel == null) + cancel = "§d[AllMusic3]§e插歌投票已被发起者取消"; } } diff --git a/core/objs/message/SearchObj.java b/core/objs/message/SearchObj.java index 3d271f0b..b3203ad1 100644 --- a/core/objs/message/SearchObj.java +++ b/core/objs/message/SearchObj.java @@ -39,15 +39,24 @@ public class SearchObj { } public void init() { - startSearch = "§d[AllMusic3]§e正在排队搜歌"; - noPer = "§d[AllMusic3]§c你没有权限搜歌"; - cantSearch = "§d[AllMusic3]§c无法搜索歌曲:" + PAL.name; - res = "§d[AllMusic3]§e搜索结果"; - emptySearch = "§d[AllMusic3]§c你没有搜索音乐"; - errorNum = "§d[AllMusic3]§c请输入正确的序号"; - choice = "§d[AllMusic3]§e你选择了序号:" + PAL.index; - cantNext = "§d[AllMusic3]§c无法下一页"; - cantLast = "§d[AllMusic3]§c无法上一页"; + if (startSearch == null) + startSearch = "§d[AllMusic3]§e正在排队搜歌"; + if (noPer == null) + noPer = "§d[AllMusic3]§c你没有权限搜歌"; + if (cantSearch == null) + cantSearch = "§d[AllMusic3]§c无法搜索歌曲:" + PAL.name; + if (res == null) + res = "§d[AllMusic3]§e搜索结果"; + if (emptySearch == null) + emptySearch = "§d[AllMusic3]§c你没有搜索音乐"; + if (errorNum == null) + errorNum = "§d[AllMusic3]§c请输入正确的序号"; + if (choice == null) + choice = "§d[AllMusic3]§e你选择了序号:" + PAL.index; + if (cantNext == null) + cantNext = "§d[AllMusic3]§c无法下一页"; + if (cantLast == null) + cantLast = "§d[AllMusic3]§c无法上一页"; } } diff --git a/core/objs/message/VoteObj.java b/core/objs/message/VoteObj.java index f13a1d9f..7dde36f3 100644 --- a/core/objs/message/VoteObj.java +++ b/core/objs/message/VoteObj.java @@ -54,19 +54,33 @@ public class VoteObj { } public void init() { - noPermission = "§d[AllMusic3]§c你没有权限切歌"; - doVote = "§d[AllMusic3]§e已发起切歌投票"; - bq = "§d[AllMusic3]§e" + PAL.player + "发起了切歌投票," + PAL.time + "秒后结束,输入/music vote 同意切歌。"; - bq1 = "§d[AllMusic3]§e或者点击 "; - bq2 = "§a同意切歌"; - agree = "§d[AllMusic3]§e你同意切歌"; - bqAgree = "§d[AllMusic3]§e" + PAL.player + "同意切歌,共有" + PAL.count + "名玩家同意切歌。"; - arAgree = "§d[AllMusic3]§e你已申请切歌"; - timeOut = "§d[AllMusic3]§e切歌时间结束"; - err1 = "§d[AllMusic3]§c你没有发起切歌"; - err2 = "§d[AllMusic3]§c你发起的切歌已超时"; - err3 = "§d[AllMusic3]§c已经有人发起了切歌"; - voteDone = "§d[AllMusic3]§e已切歌"; - cancel = "§d[AllMusic3]§e切歌投票已被发起者取消"; + if (noPermission == null) + noPermission = "§d[AllMusic3]§c你没有权限切歌"; + if (doVote == null) + doVote = "§d[AllMusic3]§e已发起切歌投票"; + if (bq == null) + bq = "§d[AllMusic3]§e" + PAL.player + "发起了切歌投票," + PAL.time + "秒后结束,输入/music vote 同意切歌。"; + if (bq1 == null) + bq1 = "§d[AllMusic3]§e或者点击 "; + if (bq2 == null) + bq2 = "§a同意切歌"; + if (agree == null) + agree = "§d[AllMusic3]§e你同意切歌"; + if (bqAgree == null) + bqAgree = "§d[AllMusic3]§e" + PAL.player + "同意切歌,共有" + PAL.count + "名玩家同意切歌。"; + if (arAgree == null) + arAgree = "§d[AllMusic3]§e你已申请切歌"; + if (timeOut == null) + timeOut = "§d[AllMusic3]§e切歌时间结束"; + if (err1 == null) + err1 = "§d[AllMusic3]§c你没有发起切歌"; + if (err2 == null) + err2 = "§d[AllMusic3]§c你发起的切歌已超时"; + if (err3 == null) + err3 = "§d[AllMusic3]§c已经有人发起了切歌"; + if (voteDone == null) + voteDone = "§d[AllMusic3]§e已切歌"; + if (cancel == null) + cancel = "§d[AllMusic3]§e切歌投票已被发起者取消"; } } diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index 59967a32..c7d9ad4f 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -24,7 +24,7 @@ public class DataSql { */ private static final String table = "CREATE TABLE IF NOT EXISTS \"allmusic\" (\n" + " \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n" + - " \"name\" TEXT(20),\n" + + " \"name\" TEXT(60),\n" + " \"info_x\" integer(6),\n" + " \"info_y\" integer(6),\n" + " \"info_color\" integer(20),\n" + @@ -57,6 +57,26 @@ public class DataSql { " \"sid\" TEXT(40)\n" + ");"; + private static final String table2 = "CREATE TABLE IF NOT EXISTS \"allmusic_mute\" (\n" + + " \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n" + + " \"sid\" TEXT(60)\n" + + ");"; + + private static final String table3 = "CREATE TABLE IF NOT EXISTS \"allmusic_mutelist\" (\n" + + " \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n" + + " \"sid\" TEXT(60)\n" + + ");"; + + private static final String table4 = "CREATE TABLE IF NOT EXISTS \"allmusic_banlist\" (\n" + + " \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n" + + " \"sid\" TEXT(40)\n" + + ");"; + + private static final String table5 = "CREATE TABLE IF NOT EXISTS \"allmusic_banplayer\" (\n" + + " \"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,\n" + + " \"sid\" TEXT(60)\n" + + ");"; + /** * 数据库文件 */ @@ -80,6 +100,10 @@ public class DataSql { Statement stat = connection.createStatement(); stat.execute(table); stat.execute(table1); + stat.execute(table2); + stat.execute(table3); + stat.execute(table4); + stat.execute(table5); stat.close(); } catch (Exception e) { e.printStackTrace(); @@ -222,86 +246,88 @@ public class DataSql { /** * 读取所有数据 */ - private static void readAll() { + public static SaveObj readHud(String name) { try { AllMusic.log.info("正在读取玩家数据"); if (connection.isReadOnly() || connection.isClosed()) { init(); } Statement stat = connection.createStatement(); - ResultSet set = stat.executeQuery("SELECT name,info_x,info_y,info_enable,lyric_x," + + ResultSet set = stat.executeQuery("SELECT info_x,info_y,info_enable,lyric_x," + "lyric_y,lyric_enable,list_x,list_y,list_enable,pic_x,pic_y,pic_enable,pic_size," + "pic_rotate,pic_rotate_speed,info_color,info_dir,info_shadow,lyric_color," + - "lyric_dir,lyric_shadow,list_color,list_dir,list_shadow,pic_dir FROM allmusic"); + "lyric_dir,lyric_shadow,list_color,list_dir,list_shadow,pic_dir FROM allmusic WHERE name=" + name); HudDirType[] vas = HudDirType.values(); - while (set.next()) { - String name = set.getString(1); - SaveObj obj = new SaveObj(); + SaveObj obj = null; + if (set.next()) { + obj = new SaveObj(); PosObj pos1 = new PosObj(); - pos1.x = set.getInt(2); - pos1.y = set.getInt(3); + pos1.x = set.getInt(1); + pos1.y = set.getInt(2); obj.info = pos1; - obj.info.enable = set.getInt(4) == 1; + obj.info.enable = set.getInt(3) == 1; PosObj pos2 = new PosObj(); - pos2.x = set.getInt(5); - pos2.y = set.getInt(6); + pos2.x = set.getInt(4); + pos2.y = set.getInt(5); obj.lyric = pos2; - obj.lyric.enable = set.getInt(7) == 1; + obj.lyric.enable = set.getInt(6) == 1; PosObj pos3 = new PosObj(); - pos3.x = set.getInt(8); - pos3.y = set.getInt(9); + pos3.x = set.getInt(7); + pos3.y = set.getInt(8); obj.list = pos3; - obj.list.enable = set.getInt(10) == 1; + obj.list.enable = set.getInt(9) == 1; PosObj pos4 = new PosObj(); - pos4.x = set.getInt(11); - pos4.y = set.getInt(12); + pos4.x = set.getInt(10); + pos4.y = set.getInt(11); obj.pic = pos4; - obj.pic.enable = set.getInt(13) == 1; - obj.pic.color = set.getInt(14); - obj.pic.shadow = set.getInt(15) == 1; - obj.picRotateSpeed = set.getInt(16); - obj.info.color = set.getInt(17); - obj.info.dir = vas[set.getInt(18)]; - obj.info.shadow = set.getInt(19) == 1; - obj.lyric.color = set.getInt(20); - obj.lyric.dir = vas[set.getInt(21)]; - obj.lyric.shadow = set.getInt(22) == 1; - obj.list.color = set.getInt(23); - obj.list.dir = vas[set.getInt(24)]; - obj.list.shadow = set.getInt(25) == 1; - obj.pic.dir = vas[set.getInt(26)]; - HudUtils.add(name, obj); + obj.pic.enable = set.getInt(12) == 1; + obj.pic.color = set.getInt(13); + obj.pic.shadow = set.getInt(14) == 1; + obj.picRotateSpeed = set.getInt(15); + obj.info.color = set.getInt(16); + obj.info.dir = vas[set.getInt(17)]; + obj.info.shadow = set.getInt(18) == 1; + obj.lyric.color = set.getInt(19); + obj.lyric.dir = vas[set.getInt(20)]; + obj.lyric.shadow = set.getInt(21) == 1; + obj.list.color = set.getInt(22); + obj.list.dir = vas[set.getInt(23)]; + obj.list.shadow = set.getInt(24) == 1; + obj.pic.dir = vas[set.getInt(25)]; } stat.close(); + + return obj; } catch (Exception e) { AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } + + return null; } /** * 读取空闲歌单列表 */ - private static void readAllList() { + private static String readListItem() { try { AllMusic.log.info("正在读取空闲歌单"); if (connection.isReadOnly() || connection.isClosed()) { init(); } Statement stat = connection.createStatement(); - ResultSet set = stat.executeQuery("SELECT sid FROM allmusic_list"); - List list = new ArrayList<>(); - while (set.next()) { - String name = set.getString(1); - list.add(name); + ResultSet set = stat.executeQuery("SELECT sid FROM allmusic_list ORDER BY RAND() limit 1"); + String name = null; + if (set.next()) { + name = set.getString(1); } stat.close(); - - PlayMusic.addIdleList(list); + return name; } catch (Exception e) { AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } + return null; } public static void addIdleList(List list) { @@ -339,6 +365,278 @@ public class DataSql { }); } + public static void addBanMusic(String music) { + task(() -> { + try { + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("INSERT INTO allmusic_banlist (sid) VALUES (?)"); + pstmt.setString(1, music); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void removeBanMusic(String music) { + task(() -> { + try { + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("DELETE FROM allmusic_banlist WHERE sid=?"); + pstmt.setString(1, music); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + /** + * 检查玩家是否在数据库 + * + * @param name 用户名 + * @return 结果 + */ + public static boolean checkBanMusic(String name) { + try { + name = name.toLowerCase(Locale.ROOT); + boolean have = false; + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT id FROM allmusic_banlist WHERE sid ='" + name + "'"); + if (set.next()) { + have = true; + } + set.close(); + stat.close(); + return have; + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + public static void clearBan() { + task(() -> { + try { + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + stat.execute("DELETE FROM allmusic_banlist"); + stat.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void addBanPlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("INSERT INTO allmusic_banplayer (sid) VALUES (?)"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void removeBanPlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("DELETE FROM allmusic_banplayer WHERE sid=?"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + /** + * 检查玩家是否在数据库 + * + * @param name 用户名 + * @return 结果 + */ + public static boolean checkBanPlayer(String name) { + try { + name = name.toLowerCase(Locale.ROOT); + boolean have = false; + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT id FROM allmusic_banplayer WHERE sid ='" + name + "'"); + if (set.next()) { + have = true; + } + set.close(); + stat.close(); + return have; + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + public static void clearBanPlayer() { + task(() -> { + try { + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + stat.execute("DELETE FROM allmusic_banlist"); + stat.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void addMutePlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("INSERT INTO allmusic_mute (sid) VALUES (?)"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void removeMutePlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("DELETE FROM allmusic_mute WHERE sid=?"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + /** + * 检查玩家是否在数据库 + * + * @param name 用户名 + * @return 结果 + */ + public static boolean checkMutePlayer(String name) { + try { + name = name.toLowerCase(Locale.ROOT); + boolean have = false; + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT id FROM allmusic_mute WHERE sid ='" + name + "'"); + if (set.next()) { + have = true; + } + set.close(); + stat.close(); + return have; + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + public static void addMuteListPlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("INSERT INTO allmusic_mutelist (sid) VALUES (?)"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + public static void removeMuteListPlayer(String player) { + task(() -> { + try { + String player1 = player.toLowerCase(Locale.ROOT); + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + PreparedStatement pstmt = connection.prepareStatement("DELETE FROM allmusic_mutelist WHERE sid=?"); + pstmt.setString(1, player1); // 设置参数 + pstmt.execute(); + pstmt.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + /** + * 检查玩家是否在数据库 + * + * @param name 用户名 + * @return 结果 + */ + public static boolean checkMuteListPlayer(String name) { + try { + name = name.toLowerCase(Locale.ROOT); + boolean have = false; + if (connection.isReadOnly() || connection.isClosed()) { + init(); + } + Statement stat = connection.createStatement(); + ResultSet set = stat.executeQuery("SELECT id FROM allmusic_mutelist WHERE sid ='" + name + "'"); + if (set.next()) { + have = true; + } + set.close(); + stat.close(); + return have; + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + public static void task(Runnable runnable) { tasks.add(runnable); semaphore.release(); @@ -349,8 +647,6 @@ public class DataSql { */ public static void start() { init(); - readAll(); - readAllList(); Thread thread = new Thread(DataSql::run); isRun = true; thread.start(); @@ -362,7 +658,6 @@ public class DataSql { public static void stop() { isRun = false; semaphore.release(); - HudUtils.save(); } private static void run() { diff --git a/core/sql/MysqlConn.java b/core/sql/MysqlConn.java deleted file mode 100644 index c482cfb6..00000000 --- a/core/sql/MysqlConn.java +++ /dev/null @@ -1,68 +0,0 @@ -//package coloryr.allmusic.sql; -// -//import coloryr.allmusic.AllMusic; -//import org.apache.commons.dbcp2.BasicDataSource; -// -//import javax.sql.DataSource; -//import java.sql.*; -// -//public abstract class MysqlConn implements IEconomy{ -// //建立连接的驱动驱动名称 -// public final String DRIVER_CLASS_NAME = "com.mysql.cj.jdbc.Driver"; -// //最大空闲链接 -// private final int MAX_IDLE = 20; -// //最大空闲连接 -// private final int MinIdle = 8; -// //最大等待时间 -// private final long MAX_WAIT_Millis = 5000; -// //最大活动链接 -// private final int MAX_TOTAl = 5; -// //初始化时链接池的数量 -// private final int INITIAL_SIZE = 10; -// //一个被抛弃连接可以被移除的超时时间 -// private final int RemoveAbandonedTimeout = 180; -// //只会发现当前连接失效,再创建一个连接供当前查询使用 -// private final boolean TOBESTNORROW = true; -// private BasicDataSource DATA_SOURCE; -// -// public boolean start() { -// try { -// DATA_SOURCE = new BasicDataSource(); -// DATA_SOURCE.setDriverClassName(DRIVER_CLASS_NAME); -// DATA_SOURCE.setUrl(AllMusic.getConfig().getEconomys().getMysqlUrl()); -// DATA_SOURCE.setMaxTotal(MAX_TOTAl); -// DATA_SOURCE.setInitialSize(INITIAL_SIZE); -// DATA_SOURCE.setMinIdle(MinIdle); -// DATA_SOURCE.setMaxIdle(MAX_IDLE); -// DATA_SOURCE.setMaxWaitMillis(MAX_WAIT_Millis); -// DATA_SOURCE.setTestOnBorrow(TOBESTNORROW); -// DATA_SOURCE.setRemoveAbandonedTimeout(RemoveAbandonedTimeout); -// -// getConnection().createStatement().close(); -// -// return test(); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return false; -// } -// -// public abstract boolean test(); -// -// public DataSource getDateSource() { -// return DATA_SOURCE; -// } -// -// //提供获得链接 -// public Connection getConnection() throws SQLException { -// return DATA_SOURCE.getConnection(); -// } -// -// public void stop() { -// try { -// DATA_SOURCE.close(); -// } catch (SQLException e) { -// e.printStackTrace(); -// } -// } -//} diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index 7e2599d1..1ec23d96 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -19,23 +19,29 @@ import java.util.concurrent.ConcurrentHashMap; public class HudUtils { private static final Map HudList = new ConcurrentHashMap<>(); + /** + * 获取玩家的Hud储存 + * @param name 玩家名 + * @return Hud储存 + */ public static SaveObj get(String name) { name = name.toLowerCase(Locale.ROOT); if (!HudList.containsKey(name)) { - SaveObj obj = AllMusic.getConfig().defaultHud.copy(); - HudList.put(name, obj); - String finalName = name; - DataSql.task(() -> DataSql.addUser(finalName, obj)); - return obj; + SaveObj obj1 = DataSql.readHud(name); + if (obj1 == null) { + SaveObj obj = AllMusic.getConfig().defaultHud.copy(); + HudList.put(name, obj); + String finalName = name; + DataSql.task(() -> DataSql.addUser(finalName, obj)); + return obj; + } + + HudList.put(name, obj1); + return obj1; } return HudList.get(name); } - public static void add(String name, SaveObj hud) { - name = name.toLowerCase(Locale.ROOT); - HudList.put(name, hud); - } - public static void addAndSave(String name, SaveObj hud) { name = name.toLowerCase(Locale.ROOT); HudList.put(name, hud); @@ -43,12 +49,6 @@ public class HudUtils { DataSql.task(() -> DataSql.addUser(finalName, hud)); } - public static void save() { - for (Map.Entry item : HudList.entrySet()) { - DataSql.addUser(item.getKey(), item.getValue()); - } - } - /** * 设置玩家Hud位置 * diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index ad5cbe0f..28c2948f 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -338,21 +338,30 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } IGetCommandOutput output = (IGetCommandOutput) obj; if (!output.getSilent()) { output.getOutput().sendSystemMessage(Text.of(message), Util.NIL_UUID); @@ -361,11 +370,17 @@ public class SideFabric extends BaseSide { @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2ed9d053..9f4afc68 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -339,21 +339,30 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } IGetCommandOutput output = (IGetCommandOutput) obj; if (!output.getSilent()) { output.getOutput().sendSystemMessage(Text.of(message), Util.NIL_UUID); @@ -362,11 +371,17 @@ public class SideFabric extends BaseSide { @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index b45e3646..e355b9de 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -343,32 +343,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 61d4a90c..9f57daaf 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -340,32 +340,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 61d4a90c..9f57daaf 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -340,32 +340,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 871231c8..3efe2fe7 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -341,32 +341,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 19c2afc8..da9be120 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -335,32 +335,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index d36ec626..7e011325 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -338,32 +338,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 281890dd..4ea4dc0f 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -339,32 +339,47 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(data), false); + player.sendMessage(Text.of(message), false); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ServerCommandSource source = (ServerCommandSource) obj; source.sendMessage(Text.of(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } FabricApi.sendMessageSuggest(obj, message, end, command); } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index 5dbda312..a27ff1e0 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -294,16 +294,22 @@ public class SideFolia extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { - player.sendMessage(data); + player.sendMessage(message); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } SpigotApi.sendMessageBqRun(message, end, command); } @@ -322,12 +328,18 @@ public class SideFolia extends BaseSide { @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSender sender = (CommandSender) obj; sender.sendMessage(message); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } if (AllMusicFolia.spigotSet) { SpigotApi.sendMessageRun(obj, message, end, command); } else { @@ -338,6 +350,9 @@ public class SideFolia extends BaseSide { @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } if (AllMusicFolia.spigotSet) { SpigotApi.sendMessageSuggest(obj, message, end, command); } else { diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index a8a576c0..77c5273a 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -343,32 +343,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { - player.sendMessage(new TextComponentString(data)); + player.sendMessage(new TextComponentString(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ICommandSender sender = (ICommandSender) obj; sender.sendMessage(new TextComponentString(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index e4d5a10e..ab11e688 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -340,32 +340,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(new StringTextComponent(data), UUID.randomUUID()); + player.sendMessage(new StringTextComponent(message), UUID.randomUUID()); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSource sender = (CommandSource) obj; sender.sendSuccess(new StringTextComponent(message), false); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index d47f68fa..48b021a1 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -341,32 +341,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(new TextComponent(data), UUID.randomUUID()); + player.sendMessage(new TextComponent(message), UUID.randomUUID()); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack sender = (CommandSourceStack) obj; sender.sendSuccess(new TextComponent(message), false); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 7527594e..ff879560 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -340,32 +340,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack sender = (CommandSourceStack) obj; sender.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 0fd021ee..958a50be 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -340,32 +340,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack source = (CommandSourceStack) obj; source.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 6e93219f..ad863fc4 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -353,33 +353,48 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) { EntityPlayerMP player = (EntityPlayerMP) player1; if (!AllMusic.isSkip(player.getCommandSenderName(), null, false)) { - player.addChatMessage(new ChatComponentText(data)); + player.addChatMessage(new ChatComponentText(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } ICommandSender sender = (ICommandSender) obj; sender.addChatMessage(new ChatComponentText(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index bf2db687..e383797b 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -336,32 +336,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack source = (CommandSourceStack) obj; source.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index c78c1bd2..77bc3814 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -336,32 +336,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack source = (CommandSourceStack) obj; source.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index c78c1bd2..77bc3814 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -336,32 +336,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack source = (CommandSourceStack) obj; source.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index ddb323a1..9e3f31f7 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -333,32 +333,47 @@ public class SideForge extends BaseSide { } @Override - public void broadcast(String data) { + public void broadcast(String message) { + if (message == null || message.isEmpty()) { + return; + } for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(data)); + player.sendSystemMessage(Component.literal(message)); } } } @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageBqRun(message, end, command); } @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) { + return; + } CommandSourceStack source = (CommandSourceStack) obj; source.sendSystemMessage(Component.literal(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageRun(obj, message, end, command); } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) { + return; + } ForgeApi.sendMessageSuggest(obj, message, end, command); } diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index 1ee6924a..33a2e66b 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -378,6 +378,8 @@ public class SideBukkit extends BaseSide { @Override public void broadcast(String data) { + if (data == null || data.isEmpty()) + return; for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(data); @@ -387,6 +389,8 @@ public class SideBukkit extends BaseSide { @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) + return; SpigotApi.sendMessageBqRun(message, end, command); } @@ -405,27 +409,31 @@ public class SideBukkit extends BaseSide { @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) + return; CommandSender sender = (CommandSender) obj; sender.sendMessage(message); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; if (AllMusicBukkit.spigotSet) { SpigotApi.sendMessageRun(obj, message, end, command); } else { - if (!message.isEmpty()) - sendMessage(obj, message); + sendMessage(obj, message); } } @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; if (AllMusicBukkit.spigotSet) { SpigotApi.sendMessageSuggest(obj, message, end, command); } else { - if (!message.isEmpty()) - sendMessage(obj, message); + sendMessage(obj, message); } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java index bdd62367..84dd93d8 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java @@ -391,6 +391,8 @@ public class SideBC extends BaseSide implements IEconomy { @Override public void broadcast(String data) { + if (data == null || data.isEmpty()) + return; TextComponent message = new TextComponent(data); for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { if (skip(player)) @@ -401,6 +403,8 @@ public class SideBC extends BaseSide implements IEconomy { @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) + return; TextComponent send = new TextComponent(message); TextComponent endtext = new TextComponent(end); endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); @@ -426,12 +430,16 @@ public class SideBC extends BaseSide implements IEconomy { @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) + return; CommandSender sender = (CommandSender) obj; sender.sendMessage(new TextComponent(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; CommandSender sender = (CommandSender) obj; TextComponent send = new TextComponent(message); TextComponent endtext = new TextComponent(end); @@ -442,6 +450,8 @@ public class SideBC extends BaseSide implements IEconomy { @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; CommandSender sender = (CommandSender) obj; TextComponent send = new TextComponent(message); TextComponent endtext = new TextComponent(end); diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 84598812..59b9745e 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -139,6 +139,8 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public void broadcast(String data) { + if (data == null || data.isEmpty()) + return; Component message = Component.text(data); for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { if (skip(player)) { @@ -151,6 +153,8 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public void broadcastWithRun(String message, String end, String command) { + if (message == null || message.isEmpty()) + return; TextComponent endtext = Component.text(end) .clickEvent(ClickEvent.runCommand(command)); TextComponent send = Component.text(message).append(endtext); @@ -399,6 +403,8 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public void sendBar(String data) { + if (data == null || data.isEmpty()) + return; Component message = Component.text(data); for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { try { @@ -440,12 +446,16 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public void sendMessage(Object obj, String message) { + if (message == null || message.isEmpty()) + return; CommandSource sender = (CommandSource) obj; sender.sendMessage(Component.text(message)); } @Override public void sendMessageRun(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; CommandSource sender = (CommandSource) obj; TextComponent endtext = Component.text(end) .clickEvent(ClickEvent.runCommand(command)); @@ -455,11 +465,12 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public void sendMessageSuggest(Object obj, String message, String end, String command) { + if (message == null || message.isEmpty()) + return; CommandSource sender = (CommandSource) obj; TextComponent endtext = Component.text(end) .clickEvent(ClickEvent.suggestCommand(command)); TextComponent send = Component.text(message).append(endtext); - sender.sendMessage(send); } diff --git a/version b/version index 0163af7e..fbcbf738 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.3.5 \ No newline at end of file +3.4.0 \ No newline at end of file