diff --git a/build.gradle b/build.gradle index d28eec0..8488fe2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '2.1.0' +version = '2.1.1' repositories { mavenCentral() diff --git a/libs/VentureChat-3.4.4.jar b/libs/VentureChat-3.4.4.jar new file mode 100644 index 0000000..a76749e Binary files /dev/null and b/libs/VentureChat-3.4.4.jar differ diff --git a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java index 984b95e..a7cccd2 100644 --- a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java +++ b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java @@ -111,6 +111,9 @@ public final class CustomNameplates extends JavaPlugin { if (placeholderManager != null) { placeholderManager.unload(); } + if (widthManager != null) { + widthManager.unload(); + } if (dataManager != null) { dataManager.disable(); } diff --git a/src/main/java/net/momirealms/customnameplates/listener/ChatListener.java b/src/main/java/net/momirealms/customnameplates/listener/ChatListener.java index e91d09c..014be12 100644 --- a/src/main/java/net/momirealms/customnameplates/listener/ChatListener.java +++ b/src/main/java/net/momirealms/customnameplates/listener/ChatListener.java @@ -38,7 +38,7 @@ public class ChatListener implements Listener { public void onChat(AsyncPlayerChatEvent event) { if (!event.isCancelled()) { Bukkit.getScheduler().runTask(CustomNameplates.plugin, () -> { - chatBubblesManager.onChat(event.getPlayer(), MiniMessage.miniMessage().stripTags(ChatColor.stripColor(event.getMessage()))); + chatBubblesManager.onChat(event.getPlayer(), ChatColor.stripColor(event.getMessage())); }); } } diff --git a/src/main/java/net/momirealms/customnameplates/listener/TrChatListener.java b/src/main/java/net/momirealms/customnameplates/listener/TrChatListener.java index f312c79..e3d6a9f 100644 --- a/src/main/java/net/momirealms/customnameplates/listener/TrChatListener.java +++ b/src/main/java/net/momirealms/customnameplates/listener/TrChatListener.java @@ -21,6 +21,7 @@ import me.arasple.mc.trchat.api.event.TrChatEvent; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.manager.ChatBubblesManager; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -35,7 +36,7 @@ public record TrChatListener(ChatBubblesManager chatBubblesManager) implements L if (channelName.equals(channel)) return; } Bukkit.getScheduler().runTask(CustomNameplates.plugin, () -> { - chatBubblesManager.onChat(event.getSession().getPlayer(), event.getMessage()); + chatBubblesManager.onChat(event.getSession().getPlayer(), ChatColor.stripColor(event.getMessage())); }); } } \ No newline at end of file diff --git a/src/main/java/net/momirealms/customnameplates/listener/VentureChatListener.java b/src/main/java/net/momirealms/customnameplates/listener/VentureChatListener.java new file mode 100644 index 0000000..bf586e0 --- /dev/null +++ b/src/main/java/net/momirealms/customnameplates/listener/VentureChatListener.java @@ -0,0 +1,29 @@ +package net.momirealms.customnameplates.listener; + +import mineverse.Aust1n46.chat.api.events.VentureChatEvent; +import net.momirealms.customnameplates.CustomNameplates; +import net.momirealms.customnameplates.manager.ChatBubblesManager; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class VentureChatListener implements Listener { + + private final ChatBubblesManager chatBubblesManager; + + public VentureChatListener(ChatBubblesManager chatBubblesManager) { + this.chatBubblesManager = chatBubblesManager; + } + + @EventHandler + public void onVentureChat(VentureChatEvent event) { + String channelName = event.getChannel().getName(); + for (String channel : ChatBubblesManager.channels) { + if (channelName.equals(channel)) return; + } + Bukkit.getScheduler().runTask(CustomNameplates.plugin, () -> { + chatBubblesManager.onChat(event.getMineverseChatPlayer().getPlayer(), ChatColor.stripColor(event.getChat()).substring(1)); + }); + } +} diff --git a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java index 6e33158..666726d 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java @@ -29,6 +29,7 @@ import net.momirealms.customnameplates.hook.ImageParser; import net.momirealms.customnameplates.hook.OXImageHook; import net.momirealms.customnameplates.listener.ChatListener; import net.momirealms.customnameplates.listener.TrChatListener; +import net.momirealms.customnameplates.listener.VentureChatListener; import net.momirealms.customnameplates.objects.nameplates.ArmorStandManager; import net.momirealms.customnameplates.objects.nameplates.BubbleConfig; import net.momirealms.customnameplates.objects.nameplates.FakeArmorStand; @@ -49,6 +50,7 @@ public class ChatBubblesManager extends EntityTag { private final BBPacketsHandle packetsHandle; private ChatListener chatListener; private TrChatListener trChatListener; + private VentureChatListener ventureChatListener; private ImageParser imageParser; public static String defaultBubble; public static String defaultFormat; @@ -92,6 +94,10 @@ public class ChatBubblesManager extends EntityTag { this.trChatListener = new TrChatListener(this); Bukkit.getPluginManager().registerEvents(trChatListener, CustomNameplates.plugin); } + else if (ConfigManager.ventureChat_Hook) { + this.ventureChatListener = new VentureChatListener(this); + Bukkit.getPluginManager().registerEvents(ventureChatListener, CustomNameplates.plugin); + } else { this.chatListener = new ChatListener(this); Bukkit.getPluginManager().registerEvents(chatListener, CustomNameplates.plugin); @@ -124,6 +130,10 @@ public class ChatBubblesManager extends EntityTag { HandlerList.unregisterAll(trChatListener); trChatListener = null; } + if (ventureChatListener != null) { + HandlerList.unregisterAll(ventureChatListener); + ventureChatListener = null; + } } public ArmorStandManager getArmorStandManager(Player player) { diff --git a/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java b/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java index 886e86f..aa073c5 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java @@ -27,6 +27,7 @@ public class ConfigManager extends Function { public static boolean oraxenHook; public static boolean extract; public static boolean trChat_Hook; + public static boolean ventureChat_Hook; public static List offsets; public static char start; public static Key key; @@ -58,6 +59,7 @@ public class ConfigManager extends Function { oraxenHook = config.getBoolean("config.integrations.Oraxen",false); if (oraxenHook && Bukkit.getPluginManager().getPlugin("Oraxen") == null) oraxenHook = false; trChat_Hook = config.getBoolean("config.integrations.TrChat",false); + ventureChat_Hook = config.getBoolean("config.integrations.VentureChat",false); offsets = config.getIntegerList("config.ascii-y-offset.offset"); extract = config.getBoolean("config.extract-shader",true); diff --git a/src/main/java/net/momirealms/customnameplates/objects/team/TABbcHook.java b/src/main/java/net/momirealms/customnameplates/objects/team/TABbcHook.java index f68584a..6c0e2ab 100644 --- a/src/main/java/net/momirealms/customnameplates/objects/team/TABbcHook.java +++ b/src/main/java/net/momirealms/customnameplates/objects/team/TABbcHook.java @@ -31,7 +31,7 @@ public class TABbcHook implements TeamNameInterface { String teamName = teamNames.get(player.getName()); if (teamName == null) { sendRequest(player); - return null; + return player.getName(); } else { return teamName; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index dcf7d06..7b6a97d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,5 @@ # Do not change -config-version: '13' +config-version: '14' config: # Language @@ -20,6 +20,8 @@ config: TAB-BC: false # TrChat TrChat: false + # VentureChat + VentureChat: false # Your namespace # If you don't know how font works, don't change this