From 626d3a75a5bd661e603a3cc10d6a95861944446f Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Tue, 13 Feb 2024 23:39:27 -0500 Subject: [PATCH 1/5] feat: rc warnings --- pom.xml | 2 +- .../core/commands/subcommands/VersionsCommand.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 411d3b015c..f63e7638c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ - 4.9-UNOFFICIAL + RC - 38 2013 jar diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java index 24abb7364c..1ef24f75c6 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java @@ -5,6 +5,7 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; +import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -97,6 +98,13 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) { addJavaVersion(builder); + if (Slimefun.getUpdater().getBranch() == SlimefunBranch.STABLE) { + builder.append("\nYou are using a RC (stable) version,") + .color(ChatColor.RED) + .append("\nDO NOT report any bugs to Discord/GitHub") + .color(ChatColor.DARK_RED); + } + builder.append("\n").event((HoverEvent) null); addPluginVersions(builder); From 888087c88d98e5bea7effe3c0dfc5e0b5df48867 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Wed, 14 Feb 2024 11:02:13 -0500 Subject: [PATCH 2/5] chore: improve --- .../core/commands/subcommands/VersionsCommand.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java index 1ef24f75c6..8d5b04406c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java @@ -84,7 +84,7 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) { .append(")").color(ChatColor.GRAY); } - builder.append("\n"); + builder.append("\n").event((HoverEvent) null); // @formatter:on if (Slimefun.getMetricsService().getVersion() != null) { @@ -99,10 +99,14 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) { addJavaVersion(builder); if (Slimefun.getUpdater().getBranch() == SlimefunBranch.STABLE) { - builder.append("\nYou are using a RC (stable) version,") + builder.append("\nYou are using a RC (stable) version, " + + "\nDO NOT report any bugs to Discord/GitHub.\n") .color(ChatColor.RED) - .append("\nDO NOT report any bugs to Discord/GitHub") - .color(ChatColor.DARK_RED); + .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text( + "We do not provide support for stable versions, use with caution!\n" + + "Please do not report any bugs with this version.\n" + + "Upgrade to Dev version first for support." + ))); } builder.append("\n").event((HoverEvent) null); From 8f0df46aae672e1dc0dec39c283ff2eaa0c1b403 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Wed, 14 Feb 2024 11:02:26 -0500 Subject: [PATCH 3/5] revert: pom version change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f63e7638c3..411d3b015c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ - RC - 38 + 4.9-UNOFFICIAL 2013 jar From 8b3a39aa94eb8d28d1d3c3012207dd7c07f2fc3f Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Wed, 14 Feb 2024 11:03:41 -0500 Subject: [PATCH 4/5] chore: change import order --- .../slimefun4/core/commands/subcommands/VersionsCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java index 8d5b04406c..f4fd256085 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java @@ -5,13 +5,13 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.plugin.Plugin; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; +import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch; import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand; import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; From 5cb9f43db2aab0b9f2f3140d597e1a19efb7239b Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Thu, 15 Feb 2024 18:07:41 -0500 Subject: [PATCH 5/5] chore: change wording --- .../slimefun4/core/commands/subcommands/VersionsCommand.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java index f4fd256085..d537989f4f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/VersionsCommand.java @@ -99,11 +99,12 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) { addJavaVersion(builder); if (Slimefun.getUpdater().getBranch() == SlimefunBranch.STABLE) { - builder.append("\nYou are using a RC (stable) version, " + + builder.append("\nYou are using a stable version," + + "\nWe do not provide support to stable versions." + "\nDO NOT report any bugs to Discord/GitHub.\n") .color(ChatColor.RED) .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text( - "We do not provide support for stable versions, use with caution!\n" + + "We do not provide support for stable versions.\n" + "Please do not report any bugs with this version.\n" + "Upgrade to Dev version first for support." )));