From 1ffdd2602779cec1f0795d07df261e15a9439945 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Fri, 7 Aug 2020 23:22:59 -0500 Subject: [PATCH] Remove faulty getOfflinePlayer API method and revert PAPI change Support PAPI 2.10.9 Update plugin version --- MineverseChat/bungee.yml | 2 +- MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java | 4 ---- .../mineverse/Aust1n46/chat/api/MineverseChatPlayer.java | 5 ----- .../mineverse/Aust1n46/chat/listeners/ChatListener.java | 2 +- .../mineverse/Aust1n46/chat/utilities/Format.java | 8 ++++---- MineverseChat/plugin.yml | 2 +- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml index a374b9c..0ed96ad 100644 --- a/MineverseChat/bungee.yml +++ b/MineverseChat/bungee.yml @@ -1,4 +1,4 @@ name: VentureChat main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee -version: 2.19.2 +version: 2.19.3 author: Aust1n46 \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index dcdb74d..c123131 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -111,8 +111,6 @@ import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.utility.MinecraftReflection; -import me.clip.placeholderapi.PlaceholderAPIPlugin; - public class MineverseChat extends JavaPlugin implements PluginMessageListener { // Listeners -------------------------------- private ChatListener chatListener; @@ -406,8 +404,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { if(pluginManager.isPluginEnabled("PlaceholderAPI")) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling PlaceholderAPI Hook")); } - //PlaceholderAPIPlugin.getInstance().getLocalExpansionManager().register(new VentureChatPlaceholders()); - //Deprecated because reasons...??? new VentureChatPlaceholders().register(); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Loading player data")); BukkitScheduler scheduler = Bukkit.getServer().getScheduler(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java b/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java index 8705f41..2d6d0b9 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java +++ b/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java @@ -12,7 +12,6 @@ import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.json.JsonFormat; import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; //Wrapper class for Player, this class stores additional information along with a players Player pointer. @@ -329,10 +328,6 @@ public class MineverseChatPlayer { public Player getPlayer() { return this.online ? this.player : null; } - - public OfflinePlayer getOfflinePlayer() { - return Bukkit.getOfflinePlayer(uuid); - } public boolean hasPlayed() { return this.hasPlayed; diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index df85d33..8b84df1 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -323,7 +323,7 @@ public class ChatListener implements Listener { chDistance = eventChannel.getDistance(); } - format = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getOfflinePlayer(), Format.FormatStringAll(plugin.getConfig().getConfigurationSection("channels." + eventChannel.getName()).getString("format")))); + format = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), Format.FormatStringAll(plugin.getConfig().getConfigurationSection("channels." + eventChannel.getName()).getString("format")))); if(plugin.getConfig().getBoolean("formatcleaner", false)) { format = format.replace("[]", " "); format = format.replace(" ", " ").replace(" ", " ").replace(" ", " "); diff --git a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java index 480dc17..35cac53 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java +++ b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java @@ -99,26 +99,26 @@ public class Format { String hover = ""; if(placeholder.contains(prefix)) { action = format.getClickPrefix(); - text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getOfflinePlayer(), format.getClickPrefixText())); + text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), format.getClickPrefixText())); for(String st : format.getHoverTextPrefix()) { hover += Format.FormatStringAll(st) + "\n"; } } if(placeholder.contains(nickname)) { action = format.getClickName(); - text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getOfflinePlayer(), format.getClickNameText())); + text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), format.getClickNameText())); for(String st : format.getHoverTextName()) { hover += Format.FormatStringAll(st) + "\n"; } } if(placeholder.contains(suffix)) { action = format.getClickSuffix(); - text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getOfflinePlayer(), format.getClickSuffixText())); + text = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), format.getClickSuffixText())); for(String st : format.getHoverTextSuffix()) { hover += Format.FormatStringAll(st) + "\n"; } } - hover = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getOfflinePlayer(), hover.substring(0, hover.length() - 1))); + hover = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), hover.substring(0, hover.length() - 1))); temp += convertToJsonColors(lastCode + placeholder, ",\"clickEvent\":{\"action\":\"" + action + "\",\"value\":\"" + text + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[" + convertToJsonColors(hover) + "]}}") + ","; lastCode = getLastCode(lastCode + placeholder); remaining = remaining.substring(indexEnd); diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index 33e61d8..40d23c0 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -1,5 +1,5 @@ name: VentureChat -version: 2.19.2 +version: 2.19.3 api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI]