Skip to content

Commit 69574d2

Browse files
committed
update update update
1 parent d55f7f0 commit 69574d2

3 files changed

Lines changed: 31 additions & 37 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>dev.padrewin</groupId>
88
<artifactId>colddev</artifactId>
9-
<version>1.5.3</version>
9+
<version>1.5.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>ColdDev</name>

src/main/java/dev/padrewin/colddev/command/rwd/RwdCommand.java

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,16 @@
88
import dev.padrewin.colddev.objects.ColdPluginData;
99
import dev.padrewin.colddev.utils.HexUtils;
1010
import dev.padrewin.colddev.utils.ColdDevUtils;
11-
import java.util.ArrayList;
1211
import java.util.List;
13-
import net.md_5.bungee.api.chat.ClickEvent;
14-
import net.md_5.bungee.api.chat.ComponentBuilder;
15-
import net.md_5.bungee.api.chat.ComponentBuilder.FormatRetention;
16-
import net.md_5.bungee.api.chat.HoverEvent;
17-
import net.md_5.bungee.api.chat.HoverEvent.Action;
18-
import net.md_5.bungee.api.chat.TextComponent;
19-
import net.md_5.bungee.api.chat.hover.content.Text;
12+
import net.kyori.adventure.text.Component;
13+
import net.kyori.adventure.text.event.ClickEvent;
14+
import net.kyori.adventure.text.event.HoverEvent;
15+
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
2016

21-
@SuppressWarnings("deprecation")
2217
public class RwdCommand extends BaseColdCommand {
2318

19+
private static final LegacyComponentSerializer LEGACY = LegacyComponentSerializer.legacySection();
20+
2421
public RwdCommand(ColdPlugin coldPlugin) {
2522
super(coldPlugin);
2623
}
@@ -36,35 +33,33 @@ protected CommandInfo createCommandInfo() {
3633
public void execute(CommandContext context) {
3734
List<ColdPluginData> pluginData = this.coldPlugin.getLoadedColdPluginsData();
3835

39-
ComponentBuilder builder = new ComponentBuilder();
40-
builder.append(TextComponent.fromLegacyText(HexUtils.colorify(
41-
ColdDevUtils.PREFIX + "&7Plugins installed using " + ColdDevUtils.GRADIENT + "ColdDev &7by " + ColdDevUtils.GRADIENT + "Cold Development&7. Click to view info: ")));
36+
Component message = LEGACY.deserialize(HexUtils.colorify(
37+
ColdDevUtils.PREFIX + "&7Plugins installed using " + ColdDevUtils.GRADIENT + "ColdDev &7by " + ColdDevUtils.GRADIENT + "Cold Development&7. Click to view info: "));
4238

4339
boolean first = true;
4440
for (ColdPluginData data : pluginData) {
4541
if (!first)
46-
builder.append(TextComponent.fromLegacyText(HexUtils.colorify("&7, ")), FormatRetention.NONE);
42+
message = message.append(LEGACY.deserialize(HexUtils.colorify("&7, ")));
4743
first = false;
4844

4945
String updateVersion = data.updateVersion();
5046
String website = data.website();
5147

52-
List<Text> content = new ArrayList<>();
53-
content.add(new Text(TextComponent.fromLegacyText(HexUtils.colorify("&cVersion: &4" + data.version()))));
54-
content.add(new Text(TextComponent.fromLegacyText(HexUtils.colorify("\n&cColdDev Version: &4" + data.coldDevVersion()))));
48+
Component hoverContent = LEGACY.deserialize(HexUtils.colorify("&cVersion: &4" + data.version()))
49+
.append(LEGACY.deserialize(HexUtils.colorify("\n&cColdDev Version: &4" + data.coldDevVersion())));
5550
if (updateVersion != null)
56-
content.add(new Text(TextComponent.fromLegacyText(HexUtils.colorify("\n&cAn update (&4" + updateVersion + "&c) is available! Click to open the GitHub page."))));
51+
hoverContent = hoverContent.append(LEGACY.deserialize(HexUtils.colorify("\n&cAn update (&4" + updateVersion + "&c) is available! Click to open the GitHub page.")));
5752

58-
TextComponent pluginName = new TextComponent(TextComponent.fromLegacyText(HexUtils.colorify(ColdDevUtils.GRADIENT + data.name())));
59-
pluginName.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, content.toArray(new Text[0])));
53+
Component pluginName = LEGACY.deserialize(HexUtils.colorify(ColdDevUtils.GRADIENT + data.name()))
54+
.hoverEvent(HoverEvent.showText(hoverContent));
6055

6156
if (website != null)
62-
pluginName.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, data.website()));
57+
pluginName = pluginName.clickEvent(ClickEvent.openUrl(website));
6358

64-
builder.append(pluginName);
59+
message = message.append(pluginName);
6560
}
6661

67-
context.getSender().spigot().sendMessage(builder.create());
62+
context.getSender().sendMessage(message);
6863
}
6964

7065
}

src/main/java/dev/padrewin/colddev/manager/PluginUpdateManager.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import java.net.HttpURLConnection;
1212
import java.net.URL;
1313

14-
import net.md_5.bungee.api.ChatColor;
15-
import net.md_5.bungee.api.chat.ClickEvent;
16-
import net.md_5.bungee.api.chat.HoverEvent;
17-
import net.md_5.bungee.api.chat.TextComponent;
18-
import net.md_5.bungee.api.chat.hover.content.Text;
14+
import net.kyori.adventure.text.Component;
15+
import net.kyori.adventure.text.event.ClickEvent;
16+
import net.kyori.adventure.text.event.HoverEvent;
17+
import net.kyori.adventure.text.format.NamedTextColor;
18+
import net.kyori.adventure.text.format.TextDecoration;
1919
import org.bukkit.Bukkit;
2020
import org.bukkit.entity.Player;
2121
import org.bukkit.event.EventHandler;
@@ -193,15 +193,14 @@ public void run() {
193193
ColdDevUtils.sendMessage(player, updateMessage, placeholders);
194194

195195
if (website != null) {
196-
TextComponent clickHereComponent = new TextComponent("Click here to update");
197-
clickHereComponent.setUnderlined(true);
198-
clickHereComponent.setColor(ChatColor.GREEN);
199-
200-
clickHereComponent.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, website));
201-
clickHereComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("Click to open GitHub.")));
202-
203-
player.spigot().sendMessage(clickHereComponent);
204-
player.sendMessage("");
196+
Component clickHereComponent = Component.text("Click here to update")
197+
.color(NamedTextColor.GREEN)
198+
.decorate(TextDecoration.UNDERLINED)
199+
.clickEvent(ClickEvent.openUrl(website))
200+
.hoverEvent(HoverEvent.showText(Component.text("Click to open GitHub.")));
201+
202+
player.sendMessage(clickHereComponent);
203+
player.sendMessage(Component.empty());
205204
}
206205
}
207206
}.runTaskLater(this.coldPlugin, 150L);

0 commit comments

Comments
 (0)