Closed #69 #67 #57
This commit is contained in:
Color_yr committed 2025-08-28 13:49:55 +08:00
1 parent fe18a2b64a
commit 3a705fa351
32 files changed
+215 -107

No files matched your search

+8
View File
@@ -121,6 +121,14 @@ public class AllMusic {
}
}
/**
* 获取正在播放的玩家列表
* @return 列表
*/
public static Set<String> getNowPlayPlayer() {
return nowPlayPlayer;
}
/**
* 检查是否需要放歌
*
+16 -5
View File
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.sub.*;
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;
@@ -225,7 +226,7 @@ public class CommandEX {
return;
}
if (isAdmin(name) || AllMusic.side.checkPermission(sender)) {
if (checkAdmin(sender, name)) {
command = commandAdminList.get(args[0]);
if (command != null) {
command.execute(sender, name, args);
@@ -233,7 +234,7 @@ public class CommandEX {
}
}
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(sender, "allmusic.addmusic"))
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_ADD_MUSIC))
AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.noPer);
else {
switch (AllMusic.getConfig().defaultAddMusic) {
@@ -258,7 +259,7 @@ public class CommandEX {
List<String> arguments = new ArrayList<>();
if (arg.length == 0) {
arguments.addAll(normal);
if (isAdmin(name) || AllMusic.side.checkPermission(sender)) {
if (checkAdmin(sender, name)) {
arguments.addAll(admin);
}
if (AllMusic.getSearch(name) != null) {
@@ -267,7 +268,7 @@ public class CommandEX {
} else {
if (arg[0] == null || arg[0].isEmpty() || arg.length == 1) {
arguments.addAll(normal);
if (isAdmin(name) || AllMusic.side.checkPermission(sender)) {
if (checkAdmin(sender, name)) {
arguments.addAll(admin);
}
if (arg[0] == null || arg[0].isEmpty()) {
@@ -280,7 +281,7 @@ public class CommandEX {
if (command != null) {
arguments.addAll(command.tab(sender, name, arg, 1));
}
if (isAdmin(name) || AllMusic.side.checkPermission(sender)) {
if (checkAdmin(sender, name)) {
command = CommandEX.commandAdminList.get(arg[0]);
if (command != null) {
arguments.addAll(command.tab(sender, name, arg, 1));
@@ -291,4 +292,14 @@ public class CommandEX {
return arguments;
}
/**
* 检查是否为管理员
* @param sender 用户
* @param name 用户名
* @return 是否为管理员
*/
public static boolean checkAdmin(Object sender, String name) {
return isAdmin(name) || AllMusic.side.checkPermission(sender);
}
}
-56
View File
@@ -1,56 +0,0 @@
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) {
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.task(() -> {
if (DataSql.checkMutePlayer(name)) {
DataSql.removeMutePlayer(name);
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute3);
} else {
DataSql.addMutePlayer(name);
AllMusic.side.runTask(() -> {
AllMusic.side.sendStop(name);
AllMusic.side.clearHud(name);
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute);
});
}
});
}
}
@Override
public List<String> tab(Object player, String name, String[] args, int index) {
if (args.length == index || (args.length == index + 1 )) {
return new ArrayList<String>() {{
add("list");
}};
} else {
return super.tab(player, name, args, index);
}
}
}
-15
View File
@@ -1,15 +0,0 @@
package com.coloryr.allmusic.server.core.command;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.utils.HudUtils;
public class CommandStop extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
AllMusic.side.clearHud(name);
AllMusic.side.sendStop(name);
HudUtils.clearHud(name);
AllMusic.removeNowPlayPlayer(name);
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.stopPlaying);
}
}
+8
View File
@@ -0,0 +1,8 @@
package com.coloryr.allmusic.server.core.command;
public class PermissionList {
public static final String PERMISSION_VOTE = "allmusic.vote";
public static final String PERMISSION_ADD_MUSIC = "allmusic.addmusic";
public static final String PERMISSION_SEARCH = "allmusic.search";
public static final String PERMISSION_PUSH = "allmusic.push";
}
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.utils.Function;
public class CommandAddList extends ACommand {
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
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;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ICommand;
import com.coloryr.allmusic.server.core.sql.Cache;
import com.coloryr.allmusic.server.core.sql.DataSql;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ICommand;
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;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.sql.DataSql;
public class CommandClearBanList extends ACommand {
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.sql.DataSql;
public class CommandClearBanPlayerList extends ACommand {
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
public class CommandClearList extends ACommand {
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import okhttp3.Cookie;
import java.util.ArrayList;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
import com.coloryr.allmusic.server.core.utils.Function;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
public class CommandHelp extends ACommand {
@@ -1,6 +1,8 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.ICommand;
import com.coloryr.allmusic.server.core.objs.enums.HudType;
import com.coloryr.allmusic.server.core.objs.message.PAL;
import com.coloryr.allmusic.server.core.utils.HudUtils;
@@ -1,6 +1,9 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.AHudCommand;
import com.coloryr.allmusic.server.core.command.ICommand;
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;
@@ -1,6 +1,8 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.PermissionList;
import com.coloryr.allmusic.server.core.music.play.MusicSearch;
import com.coloryr.allmusic.server.core.objs.music.SearchPageObj;
@@ -8,7 +10,7 @@ public class CommandLastPage extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(name, "allmusic.search")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_SEARCH)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer);
return;
}
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
import com.coloryr.allmusic.server.core.objs.message.PAL;
+83
View File
@@ -0,0 +1,83 @@
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.CommandEX;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
import com.coloryr.allmusic.server.core.sql.DataSql;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class CommandMute extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (args.length == 2) {
if (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 if (CommandEX.checkAdmin(sender, name)) {
String finalName = args[1];
DataSql.task(() -> {
if (DataSql.checkMutePlayer(finalName)) {
DataSql.removeMutePlayer(finalName);
AllMusic.side.sendMessage(sender, "已取消玩家:" + finalName + "的静音");
} else {
DataSql.addMutePlayer(finalName);
AllMusic.side.runTask(() -> {
AllMusic.side.sendStop(finalName);
AllMusic.side.clearHud(finalName);
AllMusic.side.sendMessage(sender, "已设置玩家:" + finalName + "的静音");
});
}
});
}
} else {
DataSql.task(() -> {
if (DataSql.checkMutePlayer(name)) {
DataSql.removeMutePlayer(name);
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute3);
} else {
DataSql.addMutePlayer(name);
AllMusic.side.runTask(() -> {
AllMusic.side.sendStop(name);
AllMusic.side.clearHud(name);
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.mute);
});
}
});
}
}
@Override
public List<String> tab(Object player, String name, String[] args, int index) {
if (args.length == index || (args.length == index + 1)) {
if (CommandEX.checkAdmin(player, name)) {
List<String> players = new ArrayList<>();
for (Object item : AllMusic.side.getPlayers()) {
players.add(AllMusic.side.getPlayerName(item));
}
return players;
}
return new ArrayList<>() {{
add("list");
}};
} else {
return super.tab(player, name, args, index);
}
}
}
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
import com.coloryr.allmusic.server.core.sql.DataSql;
@@ -1,6 +1,8 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.PermissionList;
import com.coloryr.allmusic.server.core.music.play.MusicSearch;
import com.coloryr.allmusic.server.core.objs.music.SearchPageObj;
@@ -8,7 +10,7 @@ public class CommandNextPage extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(name, "allmusic.search")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_SEARCH)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer);
return;
}
@@ -1,6 +1,8 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.PermissionList;
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;
@@ -14,7 +16,7 @@ public class CommandPush extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(name, "allmusic.push")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_PUSH)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.noPermission);
return;
}
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
public class CommandReload extends ACommand {
@Override
@@ -1,12 +1,15 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.CommandEX;
import com.coloryr.allmusic.server.core.command.PermissionList;
public class CommandSearch extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(sender, "allmusic.search")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_SEARCH)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer);
return;
}
@@ -1,6 +1,9 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.CommandEX;
import com.coloryr.allmusic.server.core.command.PermissionList;
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;
@@ -14,7 +17,7 @@ public class CommandSelect extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(name, "allmusic.search")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_SEARCH)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer);
return;
}
+33
View File
@@ -0,0 +1,33 @@
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.CommandEX;
import com.coloryr.allmusic.server.core.utils.HudUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class CommandStop extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (args.length == 2 && CommandEX.checkAdmin(sender, name)) {
name = args[1];
AllMusic.side.sendMessage(sender, "已停止玩家:" + name + "的音乐播放");
} else {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().musicPlay.stopPlaying);
}
AllMusic.side.sendStop(name);
HudUtils.clearHud(name);
}
@Override
public List<String> tab(Object player, String name, String[] args, int index) {
if (args.length == index || (args.length == index + 1) && CommandEX.checkAdmin(player, name)) {
return new ArrayList<>(AllMusic.getNowPlayPlayer());
} else {
return Collections.emptyList();
}
}
}
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.api.APIMain;
import com.coloryr.allmusic.server.core.objs.music.SongInfoObj;
import com.coloryr.allmusic.server.core.utils.Function;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.sql.Cache;
import com.coloryr.allmusic.server.core.sql.DataSql;
import com.coloryr.allmusic.server.core.utils.Function;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ICommand;
import com.coloryr.allmusic.server.core.sql.Cache;
import com.coloryr.allmusic.server.core.sql.DataSql;
@@ -1,6 +1,7 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
import com.coloryr.allmusic.server.core.objs.music.MusicObj;
@@ -1,6 +1,8 @@
package com.coloryr.allmusic.server.core.command;
package com.coloryr.allmusic.server.core.command.sub;
import com.coloryr.allmusic.server.core.AllMusic;
import com.coloryr.allmusic.server.core.command.ACommand;
import com.coloryr.allmusic.server.core.command.PermissionList;
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;
@@ -9,7 +11,7 @@ public class CommandVote extends ACommand {
@Override
public void execute(Object sender, String name, String[] args) {
if (AllMusic.getConfig().needPermission &&
!AllMusic.side.checkPermission(name, "allmusic.vote")) {
!AllMusic.side.checkPermission(sender, PermissionList.PERMISSION_VOTE)) {
AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.noPermission);
return;
} else if (PlayMusic.getListSize() == 0 && PlayMusic.getIdleListSize() == 0) {