diff --git a/TerminatorPlus-API/build.gradle.kts b/TerminatorPlus-API/build.gradle.kts index 6e3eb1d..003c001 100644 --- a/TerminatorPlus-API/build.gradle.kts +++ b/TerminatorPlus-API/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("java") + id("net.nuggetmc.java-conventions") } group = "net.nuggetmc" -version = "3.3.1-BETA" repositories { mavenCentral() diff --git a/TerminatorPlus-Plugin/build.gradle.kts b/TerminatorPlus-Plugin/build.gradle.kts index c30389a..9d71604 100644 --- a/TerminatorPlus-Plugin/build.gradle.kts +++ b/TerminatorPlus-Plugin/build.gradle.kts @@ -1,10 +1,10 @@ plugins { `java-library` id("io.papermc.paperweight.userdev") version "1.3.7" + id("net.nuggetmc.java-conventions") } group = "net.nuggetmc" -version = "3.3.1-BETA" description = "TerminatorPlus" java { diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java index b553648..4ee7060 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java @@ -233,18 +233,21 @@ public class BotCommand extends CommandInstance { public List infoAutofill(CommandSender sender, String[] args) { return args.length == 2 ? manager.fetchNames() : null; } - + @Command( - name = "count", - desc = "Counts the amount of bots on screen by name." + name = "count", + desc = "Counts the amount of bots on screen by name.", + aliases = { + "list" + } ) public void count(CommandSender sender) { List names = manager.fetchNames(); Map freqMap = names.stream().collect(Collectors.toMap(s -> s, s -> 1, Integer::sum)); List> entries = freqMap.entrySet().stream() .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).collect(Collectors.toList()); - - sender.sendMessage(ChatUtils.LINE); + + sender.sendMessage(ChatUtils.LINE); entries.forEach(en -> sender.sendMessage(ChatColor.GREEN + en.getKey() + ChatColor.RESET + " - " + ChatColor.BLUE + en.getValue().toString() + ChatColor.RESET)); sender.sendMessage("Total bots: " + ChatColor.BLUE + freqMap.values().stream().reduce(0, Integer::sum) + ChatColor.RESET); @@ -519,7 +522,7 @@ public class BotCommand extends CommandInstance { public void debug(CommandSender sender, @Arg("expression") String expression) { new Debugger(sender).execute(expression); } - + private double parseDoubleOrRelative(String pos, Location loc, int type) { if (loc == null || pos.length() == 0 || pos.charAt(0) != '~') return Double.parseDouble(pos); diff --git a/build.gradle.kts b/build.gradle.kts index f3fb69c..ce722f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,8 @@ plugins { id("java") + id("net.nuggetmc.java-conventions") } -group = "net.nuggetmc" -version = "3.3.1-BETA" - val jarName = "TerminatorPlus-" + version; repositories { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..e9b9926 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} +dependencies { +} diff --git a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts new file mode 100644 index 0000000..9b58428 --- /dev/null +++ b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts @@ -0,0 +1,6 @@ +plugins { + `java-library` +} + +group = "net.nuggetmc" +version = "4.0.0-BETA" diff --git a/settings.gradle.kts b/settings.gradle.kts index 480e09f..1a494a1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,3 +8,5 @@ pluginManagement { rootProject.name = "TerminatorPlus" include("TerminatorPlus-Plugin") include("TerminatorPlus-API") + +// set the version