From 24b5455f0828d62bd3d8ad693cd12126cb6dfcbb Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sun, 23 Aug 2020 07:10:11 +0200 Subject: [PATCH] Use Spigots new HoverEvent api --- src/main/java/de/diddiz/util/BukkitUtils.java | 3 ++- src/main/java/de/diddiz/util/MessagingUtil.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/util/BukkitUtils.java index d75c520..2cab998 100644 --- a/src/main/java/de/diddiz/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/util/BukkitUtils.java @@ -17,6 +17,7 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent.Action; import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.chat.hover.content.Text; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Chunk; @@ -759,7 +760,7 @@ public class BukkitUtils { } } if (metaStarted) { - msg.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, new BaseComponent[] { hover })); + msg.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, new Text(new BaseComponent[] { hover }))); } return msg; diff --git a/src/main/java/de/diddiz/util/MessagingUtil.java b/src/main/java/de/diddiz/util/MessagingUtil.java index f1c8128..b9f6a22 100644 --- a/src/main/java/de/diddiz/util/MessagingUtil.java +++ b/src/main/java/de/diddiz/util/MessagingUtil.java @@ -9,9 +9,9 @@ import de.diddiz.LogBlock.config.Config; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.chat.hover.content.Text; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -41,7 +41,7 @@ public class MessagingUtil { public static TextComponent prettyDate(long date) { TextComponent tc = brackets(BracketType.STANDARD, createTextComponentWithColor(Config.formatterShort.format(date), TypeColor.DATE.getColor())); - tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(Config.formatter.format(date)).create())); + tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Config.formatter.format(date)))); return tc; } @@ -73,7 +73,7 @@ public class MessagingUtil { int bracket2 = bdString.indexOf("]", bracket); if (bracket2 >= 0) { String state = bdString.substring(bracket + 1, bracket2).replace(',', '\n'); - tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(state).create())); + tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(state))); } } return tc; @@ -96,7 +96,7 @@ public class MessagingUtil { tc.addExtra(createTextComponentWithColor(Integer.toString(z), TypeColor.COORDINATE.getColor())); if (entryId > 0) { tc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb tp " + entryId)); - tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Teleport here").create())); + tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("Teleport here"))); } return tc; }