From 26a311ee70ef42ece5f53035af2bc807466bf0b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 21:22:26 +0000 Subject: [PATCH 1/2] Update dependency io.papermc.paper:paper-api to v1.21.9-pre2-R0.1-SNAPSHOT --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index dc996e0..6a85f83 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ repositories { dependencies { compileOnly("net.thenextlvl.services:service-io:2.3.1") - compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.9-pre2-R0.1-SNAPSHOT") implementation("net.thenextlvl.core:adapters:2.0.3") implementation("net.thenextlvl.core:files:3.0.1") From 12511b05e9ad15e833cd707ee54a2fcd69f07d7e Mon Sep 17 00:00:00 2001 From: david Date: Sun, 21 Sep 2025 17:35:34 +0200 Subject: [PATCH 2/2] Update to 1.21.9 - Exclude temporary dependencies for `i18n` until adventure is stable - Update Minecraft version to 1.21.9 - Update API version to 1.21.9 - Update supported game versions in `gradle.properties` --- build.gradle.kts | 10 +++++++--- gradle.properties | 2 +- .../net/thenextlvl/tweaks/model/CommandConfig.java | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6a85f83..8edeec9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,11 @@ dependencies { implementation("net.thenextlvl.core:adapters:2.0.3") implementation("net.thenextlvl.core:files:3.0.1") - implementation("net.thenextlvl.core:i18n:3.2.2") + implementation("net.thenextlvl.core:i18n:3.2.2") { + // todo: remove – temp solution until adventure is stable + exclude("net.kyori", "adventure-text-logger-slf4j") + exclude("net.kyori", "adventure-text-minimessage") + } implementation("net.thenextlvl.core:paper:2.3.1") implementation("net.thenextlvl:nbt:3.0.1") implementation("org.bstats:bstats-bukkit:3.1.1-SNAPSHOT") @@ -47,14 +51,14 @@ tasks.shadowJar { } tasks.runServer { - minecraftVersion("1.21.7") + minecraftVersion("1.21.9") } paper { name = "Tweaks" main = "net.thenextlvl.tweaks.TweaksPlugin" description = "A useful command collection" - apiVersion = "1.21.5" + apiVersion = "1.21.9" website = "https://thenextlvl.net" authors = listOf("CyntrixAlgorithm", "NonSwag") load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD diff --git a/gradle.properties b/gradle.properties index 76700e0..9df79e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -gameVersions=1.21.5,1.21.6,1.21.7,1.21.8 \ No newline at end of file +gameVersions=1.21.9 \ No newline at end of file diff --git a/src/main/java/net/thenextlvl/tweaks/model/CommandConfig.java b/src/main/java/net/thenextlvl/tweaks/model/CommandConfig.java index 27e6d3f..177b3fc 100644 --- a/src/main/java/net/thenextlvl/tweaks/model/CommandConfig.java +++ b/src/main/java/net/thenextlvl/tweaks/model/CommandConfig.java @@ -93,8 +93,7 @@ public final class CommandConfig { private boolean isProxyEnabled() { var plugin = JavaPlugin.getPlugin(TweaksPlugin.class); - return plugin.getServer().spigot().getPaperConfig().getBoolean("proxies.velocity.enabled") - || plugin.getServer().spigot().getSpigotConfig().getBoolean("settings.bungeecord"); + return plugin.getServer().getServerConfig().isProxyEnabled(); } public static class CommandDefinition {