diff --git a/build.gradle.kts b/build.gradle.kts index a2694c5..412263d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "io.github.thehrz.allmusicreload" -version = "1.0.0" +version = "1.0.1" repositories { mavenCentral() diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/ACommand.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/ACommand.java index 702c26b..1566aec 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/ACommand.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/ACommand.java @@ -5,7 +5,7 @@ import java.util.List; public abstract class ACommand implements ICommand { @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { return Collections.emptyList(); } } diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBan.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBan.java index b6519c3..0bdd209 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBan.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBan.java @@ -25,7 +25,7 @@ public class CommandBan extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + 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) { diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBanPlayer.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBanPlayer.java index 9b2fc23..992fec6 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBanPlayer.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandBanPlayer.java @@ -18,7 +18,7 @@ public class CommandBanPlayer implements ICommand { } @Override - public List tab(String name, String[] args, int index) { + 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(); } diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandCancel.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandCancel.java index 16e2f13..afd23dc 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandCancel.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandCancel.java @@ -50,7 +50,7 @@ public class CommandCancel implements ICommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == 1 || (args.length == 2 && args[1].isEmpty())) { List list = new ArrayList<>(); List list1 = PlayMusic.getList(); diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandDelete.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandDelete.java index 6506975..f523d77 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandDelete.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandDelete.java @@ -33,7 +33,7 @@ public class CommandDelete extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == 1 || (args.length == 2 && args[1].isEmpty())) { List list = new ArrayList<>(); for (int a = 0; a < PlayMusic.getListSize(); a++) { diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandEX.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandEX.java index 6f448c0..e0fc485 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandEX.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandEX.java @@ -153,12 +153,11 @@ public class CommandEX { if (args[0].contains("id=") && !args[0].contains("/?userid")) { if (args[0].contains("&uct2")) { musicID = Function.getString(args[0], "id=", "&uct2"); - } - else if (args[0].contains("&user")) + } else if (args[0].contains("&user")) musicID = Function.getString(args[0], "id=", "&user"); else musicID = Function.getString(args[0], "id=", null); - } else if (args[0].contains("song/")) { + } else if (args[0].contains("song/")) { if (args[0].contains("/?userid")) musicID = Function.getString(args[0], "song/", "/?userid"); else @@ -213,7 +212,7 @@ public class CommandEX { return true; } } - return false; + return false; } /** @@ -263,11 +262,11 @@ public class CommandEX { * @param arg 参数 * @return 指令列表 */ - public static List getTabList(String name, String[] arg) { + public static List getTabList(Object sender, String name, String[] arg) { List arguments = new ArrayList<>(); if (arg.length == 0) { arguments.addAll(normal); - if (AllMusic.side.checkPermission(name)) { + if (AllMusic.side.checkPermission(sender)) { arguments.addAll(admin); } if (AllMusic.getSearch(name) != null) { @@ -276,7 +275,7 @@ public class CommandEX { } else { if (arg[0] == null || arg[0].isEmpty() || arg.length == 1) { arguments.addAll(normal); - if (AllMusic.side.checkPermission(name)) { + if (AllMusic.side.checkPermission(sender)) { arguments.addAll(admin); } if (arg[0] == null || arg[0].isEmpty()) { @@ -287,12 +286,12 @@ public class CommandEX { } else { ICommand command = CommandEX.commandList.get(arg[0]); if (command != null) { - arguments.addAll(command.tab(name, arg, 1)); + arguments.addAll(command.tab(sender, name, arg, 1)); } - if (AllMusic.side.checkPermission(name)) { + if (AllMusic.side.checkPermission(sender)) { command = CommandEX.commandAdminList.get(arg[0]); if (command != null) { - arguments.addAll(command.tab(name, arg, 1)); + arguments.addAll(command.tab(sender, name, arg, 1)); } } } diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHud.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHud.java index 85e1dd5..15f0a85 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHud.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHud.java @@ -45,13 +45,13 @@ public class CommandHud extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return hudlist; } else { ICommand command = commandList.get(args[index]); if (command != null) { - return command.tab(name, args, index + 1); + return command.tab(player, name, args, index + 1); } } return Collections.emptyList(); @@ -76,7 +76,7 @@ public class CommandHud extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return tf; } diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHudSet.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHudSet.java index 7611d21..8c93d77 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHudSet.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandHudSet.java @@ -65,7 +65,7 @@ public class CommandHudSet extends AHudCommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { List list = new ArrayList<>(hud); if (type == HudType.PIC) { @@ -78,7 +78,7 @@ public class CommandHudSet extends AHudCommand { } else { ICommand command = commandList.get(args[index]); if (command != null) { - return command.tab(name, args, index + 1); + return command.tab(player, name, args, index + 1); } } return Collections.emptyList(); @@ -104,7 +104,7 @@ public class CommandHudSet extends AHudCommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return tf; } @@ -181,7 +181,7 @@ public class CommandHudSet extends AHudCommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return dir; } @@ -229,7 +229,7 @@ public class CommandHudSet extends AHudCommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return tf; } @@ -263,7 +263,7 @@ public class CommandHudSet extends AHudCommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == index + 1) { return tf; } diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandPush.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandPush.java index 5219843..e3ac71b 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandPush.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandPush.java @@ -95,7 +95,7 @@ public class CommandPush extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == 1 || (args.length == 2 && args[1].isEmpty())) { List list = new ArrayList<>(); List list1 = PlayMusic.getList(); diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandSelect.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandSelect.java index 56fbfd5..656e075 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandSelect.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/CommandSelect.java @@ -38,7 +38,7 @@ public class CommandSelect extends ACommand { } @Override - public List tab(String name, String[] args, int index) { + public List tab(Object player, String name, String[] args, int index) { if (args.length == 1 || (args.length == 2 && args[1].isEmpty())) { List list = new ArrayList<>(); SearchPageObj obj = AllMusic.getSearch(name); diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/command/ICommand.java b/src/main/java/io/github/thehrz/allmusicreload/core/command/ICommand.java index e877e35..ae70cb9 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/command/ICommand.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/command/ICommand.java @@ -6,5 +6,5 @@ public interface ICommand { void execute(Object sender, String name, String[] args); - List tab(String name, String[] args, int index); + List tab(Object sender, String name, String[] args, int index); } diff --git a/src/main/java/io/github/thehrz/allmusicreload/velocity/CommandVelocity.java b/src/main/java/io/github/thehrz/allmusicreload/velocity/CommandVelocity.java index e42f976..d1f757a 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/velocity/CommandVelocity.java +++ b/src/main/java/io/github/thehrz/allmusicreload/velocity/CommandVelocity.java @@ -32,7 +32,7 @@ public class CommandVelocity implements SimpleCommand { if (invocation.source() instanceof Player) { Player player = (Player) invocation.source(); String name = player.getUsername(); - return CommandEX.getTabList(name, args); + return CommandEX.getTabList(player, name, args); } return ImmutableList.of(); }