From d051495ab2ec00e1c71a22930fc449bf84a4a404 Mon Sep 17 00:00:00 2001 From: xGinko Date: Tue, 26 Mar 2024 22:12:37 +0100 Subject: [PATCH] some more minor cleanup --- build.gradle.kts | 5 +++-- .../me/xginko/betterworldstats/PAPIExpansion.java | 1 - .../betterworldstats/subcommands/VersionSubCmd.java | 11 +++-------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7db14a5..ffe35c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ repositories { dependencies { compileOnly("com.destroystokyo.paper:paper-api:1.12.2-R0.1-SNAPSHOT") + compileOnly("org.jetbrains:annotations:24.1.0") compileOnly("me.clip:placeholderapi:2.11.5") implementation("net.kyori:adventure-platform-bukkit:4.3.2") @@ -32,7 +33,7 @@ dependencies { implementation("org.bstats:bstats-bukkit:3.0.2") implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.1") - implementation("com.github.ben-manes.caffeine:caffeine:2.9.3") + implementation("com.github.ben-manes.caffeine:caffeine:2.9.3") // 2.X for Java 8 targets } group = "me.xginko.betterworldstats" @@ -64,8 +65,8 @@ tasks { archiveFileName.set("BetterWorldStats-${version}.jar") relocate("net.kyori", "me.xginko.betterworldstats.libs.kyori") relocate("org.bstats", "me.xginko.betterworldstats.libs.bstats") - relocate("io.github.thatsmusic99.configurationmaster", "me.xginko.betterworldstats.libs.configmaster") relocate("com.github.benmanes.caffeine", "me.xginko.betterworldstats.libs.caffeine") + relocate("io.github.thatsmusic99.configurationmaster", "me.xginko.betterworldstats.libs.configmaster") } processResources { diff --git a/src/main/java/me/xginko/betterworldstats/PAPIExpansion.java b/src/main/java/me/xginko/betterworldstats/PAPIExpansion.java index 2dfaeb4..e75977b 100644 --- a/src/main/java/me/xginko/betterworldstats/PAPIExpansion.java +++ b/src/main/java/me/xginko/betterworldstats/PAPIExpansion.java @@ -36,7 +36,6 @@ public boolean canRegister() { } @Override - @SuppressWarnings({"deprecation"}) public @NotNull String getVersion() { return BetterWorldStats.getInstance().getDescription().getVersion(); } diff --git a/src/main/java/me/xginko/betterworldstats/commands/betterworldstats/subcommands/VersionSubCmd.java b/src/main/java/me/xginko/betterworldstats/commands/betterworldstats/subcommands/VersionSubCmd.java index 48a884a..baa0d56 100644 --- a/src/main/java/me/xginko/betterworldstats/commands/betterworldstats/subcommands/VersionSubCmd.java +++ b/src/main/java/me/xginko/betterworldstats/commands/betterworldstats/subcommands/VersionSubCmd.java @@ -36,22 +36,17 @@ public void perform(CommandSender sender, String[] args) { return; } - String name, version, website, author; final PluginDescriptionFile pluginYML = BetterWorldStats.getInstance().getDescription(); - name = pluginYML.getName(); - version = pluginYML.getVersion(); - website = pluginYML.getWebsite(); - author = pluginYML.getAuthors().get(0); KyoriUtil.sendMessage(sender, Component.newline() .append( - Component.text(name + " " + version) + Component.text(pluginYML.getName() + " " + pluginYML.getVersion()) .color(NamedTextColor.GOLD) - .clickEvent(ClickEvent.openUrl(website)) + .clickEvent(ClickEvent.openUrl(pluginYML.getWebsite())) ) .append(Component.text(" by ").color(NamedTextColor.GRAY)) .append( - Component.text(author) + Component.text(pluginYML.getAuthors().get(0)) .color(NamedTextColor.WHITE) .clickEvent(ClickEvent.openUrl("https://github.com/xGinko")) )