diff --git a/README.md b/README.md index 7bd70957..42d5b11a 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ Forge/Fabric/NeoForge类服务器 3.3.0:删除登录接口改用cookie 3.3.1:修复控制台权限 3.3.2:修复folia卡死问题 +3.3.5:修复tab补全出现的问题 ``` ## 配置文件说明 diff --git a/core/command/ACommand.java b/core/command/ACommand.java index 55187d68..c44a773d 100644 --- a/core/command/ACommand.java +++ b/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/core/command/CommandBan.java b/core/command/CommandBan.java index c706b21e..f78ac01e 100644 --- a/core/command/CommandBan.java +++ b/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/core/command/CommandBanPlayer.java b/core/command/CommandBanPlayer.java index 4d076b99..c76e2ed9 100644 --- a/core/command/CommandBanPlayer.java +++ b/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/core/command/CommandCancel.java b/core/command/CommandCancel.java index 973e528c..6ec07035 100644 --- a/core/command/CommandCancel.java +++ b/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/core/command/CommandDelete.java b/core/command/CommandDelete.java index c53e8e4d..b1b57039 100644 --- a/core/command/CommandDelete.java +++ b/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/core/command/CommandEX.java b/core/command/CommandEX.java index 188bc8a7..19810b7d 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -26,6 +26,7 @@ public class CommandEX { this.add("hud"); this.add("push"); }}; + /** * 管理员的指令 */ @@ -153,12 +154,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 @@ -206,14 +206,13 @@ public class CommandEX { AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.noID); } - private static boolean isAdmin(String name) - { + private static boolean isAdmin(String name) { for (String item : AllMusic.getConfig().adminList) { if (item.equalsIgnoreCase(name)) { 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/core/command/CommandHud.java b/core/command/CommandHud.java index 0d50e656..ac6d29cb 100644 --- a/core/command/CommandHud.java +++ b/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/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index 49a2eb1b..1ae9cef6 100644 --- a/core/command/CommandHudSet.java +++ b/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/core/command/CommandPush.java b/core/command/CommandPush.java index 7cda4c83..d6d9b04c 100644 --- a/core/command/CommandPush.java +++ b/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/core/command/CommandSelect.java b/core/command/CommandSelect.java index 158e939f..d0960cd9 100644 --- a/core/command/CommandSelect.java +++ b/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/core/command/ICommand.java b/core/command/ICommand.java index 9d6c06c6..e913607d 100644 --- a/core/command/ICommand.java +++ b/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/fabric_1_16_5/build.gradle b/fabric_1_16_5/build.gradle index 4854a3c1..d4a545fb 100644 --- a/fabric_1_16_5/build.gradle +++ b/fabric_1_16_5/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 8 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 1.8 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 1.8 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_16_5/gradle/wrapper/gradle-wrapper.properties b/fabric_1_16_5/gradle/wrapper/gradle-wrapper.properties index b82aa23a..cea7a793 100644 --- a/fabric_1_16_5/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_16_5/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index 88e6524d..41f2f55c 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + ServerCommandSource item = context.getSource(); + String input = context.getInput(); String[] temp = input.split(" "); String[] arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_18_2/build.gradle b/fabric_1_18_2/build.gradle index 213b04a2..eebf39dc 100644 --- a/fabric_1_18_2/build.gradle +++ b/fabric_1_18_2/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_18_2/gradle.properties b/fabric_1_18_2/gradle.properties index cec46fde..623f4bb3 100644 --- a/fabric_1_18_2/gradle.properties +++ b/fabric_1_18_2/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.18.2 yarn_mappings=1.18.2+build.4 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties diff --git a/fabric_1_18_2/gradle/wrapper/gradle-wrapper.properties b/fabric_1_18_2/gradle/wrapper/gradle-wrapper.properties index b82aa23a..cea7a793 100644 --- a/fabric_1_18_2/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_18_2/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_19_2/build.gradle b/fabric_1_19_2/build.gradle index 976b7583..c1685298 100644 --- a/fabric_1_19_2/build.gradle +++ b/fabric_1_19_2/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_19_2/gradle.properties b/fabric_1_19_2/gradle.properties index a47556c3..7964ef0d 100644 --- a/fabric_1_19_2/gradle.properties +++ b/fabric_1_19_2/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.19.2 yarn_mappings=1.19.2+build.28 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties diff --git a/fabric_1_19_2/gradle/wrapper/gradle-wrapper.properties b/fabric_1_19_2/gradle/wrapper/gradle-wrapper.properties index b82aa23a..cea7a793 100644 --- a/fabric_1_19_2/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_19_2/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_19_3/build.gradle b/fabric_1_19_3/build.gradle index 976b7583..c1685298 100644 --- a/fabric_1_19_3/build.gradle +++ b/fabric_1_19_3/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_19_3/gradle.properties b/fabric_1_19_3/gradle.properties index 727f4291..384debe8 100644 --- a/fabric_1_19_3/gradle.properties +++ b/fabric_1_19_3/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties diff --git a/fabric_1_19_3/gradle/wrapper/gradle-wrapper.properties b/fabric_1_19_3/gradle/wrapper/gradle-wrapper.properties index b82aa23a..cea7a793 100644 --- a/fabric_1_19_3/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_19_3/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_20/build.gradle b/fabric_1_20/build.gradle index 976b7583..3d9fd31c 100644 --- a/fabric_1_20/build.gradle +++ b/fabric_1_20/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.+" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_20/gradle.properties b/fabric_1_20/gradle.properties index f467683b..29d0aca3 100644 --- a/fabric_1_20/gradle.properties +++ b/fabric_1_20/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties @@ -14,4 +14,4 @@ maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20]AllMusic_Server # Dependencies -fabric_version=0.92.1+1.20.1 +fabric_version=0.92.3+1.20.1 diff --git a/fabric_1_20/gradle/wrapper/gradle-wrapper.properties b/fabric_1_20/gradle/wrapper/gradle-wrapper.properties index b82aa23a..cea7a793 100644 --- a/fabric_1_20/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_20/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_20_2/build.gradle b/fabric_1_20_2/build.gradle index 8c96a5f7..c1685298 100644 --- a/fabric_1_20_2/build.gradle +++ b/fabric_1_20_2/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_20_2/gradle.properties b/fabric_1_20_2/gradle.properties index 558d9431..b800a500 100644 --- a/fabric_1_20_2/gradle.properties +++ b/fabric_1_20_2/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.20.2 yarn_mappings=1.20.2+build.4 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties diff --git a/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties b/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties index 94113f20..cea7a793 100644 --- a/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_20_2/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_20_6/build.gradle b/fabric_1_20_6/build.gradle index 8c96a5f7..c1685298 100644 --- a/fabric_1_20_6/build.gradle +++ b/fabric_1_20_6/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" +// id "org.jetbrains.kotlin.jvm" version "1.9.23" } def getVersionFromFile() { @@ -61,11 +61,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 17 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 17 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_20_6/gradle.properties b/fabric_1_20_6/gradle.properties index f2bc2822..d91eef49 100644 --- a/fabric_1_20_6/gradle.properties +++ b/fabric_1_20_6/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.20.6 yarn_mappings=1.20.6+build.1 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties diff --git a/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties b/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties index 94113f20..cea7a793 100644 --- a/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_20_6/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_21/build.gradle b/fabric_1_21/build.gradle index d03d1810..ca88686a 100644 --- a/fabric_1_21/build.gradle +++ b/fabric_1_21/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "2.0.0" +// id "org.jetbrains.kotlin.jvm" version "2.0.0" } def getVersionFromFile() { @@ -56,11 +56,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 21 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 21 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 21 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_21/gradle.properties b/fabric_1_21/gradle.properties index 21790aeb..38174c47 100644 --- a/fabric_1_21/gradle.properties +++ b/fabric_1_21/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.21 yarn_mappings=1.21+build.1 -loader_version=0.15.11 +loader_version=0.16.10 fabric_kotlin_version=1.11.0+kotlin.2.0.0 # Mod Properties diff --git a/fabric_1_21/gradle/wrapper/gradle-wrapper.properties b/fabric_1_21/gradle/wrapper/gradle-wrapper.properties index 94113f20..cea7a793 100644 --- a/fabric_1_21/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_21/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_21_4/build.gradle b/fabric_1_21_4/build.gradle index fd3357ae..3ab2e70d 100644 --- a/fabric_1_21_4/build.gradle +++ b/fabric_1_21_4/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "2.1.0" +// id "org.jetbrains.kotlin.jvm" version "2.1.0" } def getVersionFromFile() { @@ -56,11 +56,11 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 21 } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 21 - } -} +//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +// kotlinOptions { +// jvmTarget = 21 +// } +//} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/fabric_1_21_4/gradle/wrapper/gradle-wrapper.properties b/fabric_1_21_4/gradle/wrapper/gradle-wrapper.properties index 94113f20..cea7a793 100644 --- a/fabric_1_21_4/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_21_4/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index ab8138e0..16da503c 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -45,6 +45,8 @@ public class CommandFabric implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = CommandEX.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(item, item.getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java index 054dc33b..b0113df4 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java @@ -22,7 +22,7 @@ public class CommandFolia implements CommandExecutor, TabExecutor { @Override public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { if (command.getName().equalsIgnoreCase("music")) { - return CommandEX.getTabList(sender.getName(), args); + return CommandEX.getTabList(sender, sender.getName(), args); } return null; } diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index b6fbabc5..f948c8bb 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -28,7 +28,7 @@ public class CommandForge extends CommandBase { @Override public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) { - return CommandEX.getTabList(sender.getName(), args); + return CommandEX.getTabList(sender, sender.getName(), args); } @Override diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 93ef2726..af65496b 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + CommandSource source = context.getSource(); + String input = context.getInput(); String[] temp = input.split(" "); String[] arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(source, source.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 50a7ccaf..5b7d4ee3 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -25,7 +25,7 @@ public class CommandForge extends CommandBase { @Override public List addTabCompletionOptions(ICommandSender sender, String[] args) { - return CommandEX.getTabList(sender.getCommandSenderName(), args); + return CommandEX.getTabList(sender, sender.getCommandSenderName(), args); } @Override diff --git a/img/allmusic_1.jpg b/img/allmusic_1.jpg new file mode 100644 index 00000000..746f7182 Binary files /dev/null and b/img/allmusic_1.jpg differ diff --git a/img/allmusic_1.psd b/img/allmusic_1.psd new file mode 100644 index 00000000..a554bacd Binary files /dev/null and b/img/allmusic_1.psd differ diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index a7c2cbce..7d049fe0 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -45,6 +45,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -53,7 +55,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index f04e9a9a..5784aad1 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -46,6 +46,8 @@ public class CommandForge implements Command, Predicate getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var item = context.getSource(); + var input = context.getInput(); var temp = input.split(" "); var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; @@ -54,7 +56,7 @@ public class CommandForge implements Command, Predicate results = CommandEX.getTabList(context.getSource().getTextName(), arg); + List results = CommandEX.getTabList(item, item.getTextName(), arg); for (String s : results) { builder.suggest(s); diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java index 067293c4..a831a6ee 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java @@ -24,7 +24,7 @@ public class CommandBukkit implements CommandExecutor, TabExecutor { @Override public List onTabComplete(@NotNull CommandSender sender, Command command, @NotNull String alias, @NotNull String[] args) { if (command.getName().equalsIgnoreCase("music")) { - return CommandEX.getTabList(sender.getName().toLowerCase(Locale.ROOT), args); + return CommandEX.getTabList(sender, sender.getName().toLowerCase(Locale.ROOT), args); } return null; } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java index a0c085e6..8978a662 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java @@ -16,6 +16,6 @@ public class CommandBC extends Command implements TabExecutor { } public Iterable onTabComplete(CommandSender sender, String[] args) { - return CommandEX.getTabList(sender.getName(), args); + return CommandEX.getTabList(sender, sender.getName(), args); } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java index 18163fa9..d16ba55b 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/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(); } diff --git a/version b/version index 2c6109e5..0163af7e 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.3.4 \ No newline at end of file +3.3.5 \ No newline at end of file