From 32da53f459160758e261bfbc46da4fb1a9069b92 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Thu, 2 Feb 2012 19:31:34 -0600 Subject: [PATCH] Preemptive EssentialsChat 3.x support, since they'll be removing the old local chat integration method; new implementation will need improvement to support relation coloring, but for now it otherwise works. When chat event hits an UnknownFormatConversionException which requires better chat configuration, the quick dirty fix of setting chatTagInsertIndex to 0 is now automatically applied. --- lib/EssentialsChat.jar | Bin 0 -> 12944 bytes src/com/massivecraft/factions/P.java | 29 ++++++++- .../integration/EssentialsFeatures.java | 41 ++++++------ .../EssentialsOldVersionFeatures.java | 59 ++++++++++++++++++ .../listeners/FactionsPlayerListener.java | 9 +-- 5 files changed, 113 insertions(+), 25 deletions(-) create mode 100644 lib/EssentialsChat.jar create mode 100644 src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java diff --git a/lib/EssentialsChat.jar b/lib/EssentialsChat.jar new file mode 100644 index 0000000000000000000000000000000000000000..ec0a3cfa2fbb5e0ecdfa995533e8e292afad37a5 GIT binary patch literal 12944 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 G!2bc-)2Ipn literal 0 HcmV?d00001 diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index 0e6935fb..e2e296ac 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -19,6 +19,7 @@ import com.massivecraft.factions.cmd.CmdAutoHelp; import com.massivecraft.factions.cmd.FCmdRoot; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.EssentialsFeatures; +import com.massivecraft.factions.integration.EssentialsOldVersionFeatures; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; //import com.massivecraft.factions.integration.Worldguard; @@ -176,7 +177,25 @@ public class P extends MPlugin if (test != null && test.isEnabled()) { essChat = (EssentialsChat)test; - EssentialsFeatures.integrateChat(essChat); + + // try newer Essentials 3.x integration method + try + { + Class.forName("com.earth2me.essentials.chat.EssentialsLocalChatEvent"); + EssentialsFeatures.integrateChat(essChat); + } + catch (ClassNotFoundException ex) + { + // no? try older Essentials 2.x integration method + try + { + EssentialsOldVersionFeatures.integrateChat(essChat); + } + catch (NoClassDefFoundError ex2) + { + // no known method for hooking into Essentials chat stuff + } + } } } @@ -184,7 +203,13 @@ public class P extends MPlugin { if (essChat != null) { - EssentialsFeatures.unhookChat(); + try + { + EssentialsOldVersionFeatures.unhookChat(); + } + catch (NoClassDefFoundError ex) + { + } } } diff --git a/src/com/massivecraft/factions/integration/EssentialsFeatures.java b/src/com/massivecraft/factions/integration/EssentialsFeatures.java index a642f8a1..d8f63406 100644 --- a/src/com/massivecraft/factions/integration/EssentialsFeatures.java +++ b/src/com/massivecraft/factions/integration/EssentialsFeatures.java @@ -1,15 +1,22 @@ package com.massivecraft.factions.integration; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; import com.earth2me.essentials.chat.EssentialsChat; -import com.earth2me.essentials.chat.IEssentialsChatListener; +import com.earth2me.essentials.chat.EssentialsLocalChatEvent; +/* + * This Essentials integration handler is for newer 3.x.x versions of Essentials which don't have "IEssentialsChatListener" + */ + public class EssentialsFeatures { private static EssentialsChat essChat; @@ -19,21 +26,11 @@ public class EssentialsFeatures essChat = instance; try { - essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener() - { - public boolean shouldHandleThisChat(PlayerChatEvent event) - { - return P.p.shouldLetFactionsHandleThisChat(event); - } - public String modifyMessage(PlayerChatEvent event, Player target, String message) - { - return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer())); - } - }); - P.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName()); + Bukkit.getServer().getPluginManager().registerEvents(new LocalChatListener(), P.p); + P.p.log("Found and will integrate chat with newer "+essChat.getDescription().getFullName()); - // As of Essentials 2.8+, curly braces are not accepted and are instead replaced with square braces, so... deal with it - if (essChat.getDescription().getVersion().startsWith("2.8.") && Conf.chatTagReplaceString.contains("{")) + // curly braces used to be accepted by the format string EssentialsChat but no longer are, so... deal with chatTagReplaceString which might need updating + if (Conf.chatTagReplaceString.contains("{")) { Conf.chatTagReplaceString = Conf.chatTagReplaceString.replace("{", "[").replace("}", "]"); P.p.log("NOTE: as of Essentials 2.8+, we've had to switch the default chat replacement tag from \"{FACTION}\" to \"[FACTION]\". This has automatically been updated for you."); @@ -45,11 +42,17 @@ public class EssentialsFeatures } } - public static void unhookChat() + private static class LocalChatListener implements Listener { - if (essChat != null) + @EventHandler(priority = EventPriority.NORMAL) + public void onPlayerChat(EssentialsLocalChatEvent event) { - essChat.removeEssentialsChatListener("Factions"); + Player speaker = event.getPlayer(); + String format = event.getFormat(); + format = format.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTag(speaker)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(speaker)); + event.setFormat(format); + // NOTE: above doesn't do relation coloring. if/when we can get a local recipient list from EssentialsLocalChatEvent, we'll probably + // want to pass it on to FactionsPlayerListener.onPlayerChat(PlayerChatEvent event) rather than duplicating code } } } diff --git a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java new file mode 100644 index 00000000..e867820a --- /dev/null +++ b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java @@ -0,0 +1,59 @@ +package com.massivecraft.factions.integration; + +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerChatEvent; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.P; + +import com.earth2me.essentials.chat.EssentialsChat; +import com.earth2me.essentials.chat.IEssentialsChatListener; + + +/* + * This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener" + */ + +public class EssentialsOldVersionFeatures +{ + private static EssentialsChat essChat; + + public static void integrateChat(EssentialsChat instance) + { + essChat = instance; + try + { + essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener() + { + public boolean shouldHandleThisChat(PlayerChatEvent event) + { + return P.p.shouldLetFactionsHandleThisChat(event); + } + public String modifyMessage(PlayerChatEvent event, Player target, String message) + { + return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer())); + } + }); + P.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName()); + + // As of Essentials 2.8+, curly braces are not accepted and are instead replaced with square braces, so... deal with it + if (essChat.getDescription().getVersion().startsWith("2.8.") && Conf.chatTagReplaceString.contains("{")) + { + Conf.chatTagReplaceString = Conf.chatTagReplaceString.replace("{", "[").replace("}", "]"); + P.p.log("NOTE: as of Essentials 2.8+, we've had to switch the default chat replacement tag from \"{FACTION}\" to \"[FACTION]\". This has automatically been updated for you."); + } + } + catch (NoSuchMethodError ex) + { + essChat = null; + } + } + + public static void unhookChat() + { + if (essChat != null) + { + essChat.removeEssentialsChatListener("Factions"); + } + } +} diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 4519a0d8..a50b22ad 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -74,10 +74,10 @@ public class FactionsPlayerListener implements Listener if (!Conf.chatTagReplaceString.isEmpty() && eventFormat.contains(Conf.chatTagReplaceString)) { // we're using the "replace" method of inserting the faction tags - // if they stuck "{FACTION_TITLE}" in there, go ahead and do it too - if (eventFormat.contains("{FACTION_TITLE}")) + // if they stuck "[FACTION_TITLE]" in there, go ahead and do it too + if (eventFormat.contains("[FACTION_TITLE]")) { - eventFormat = eventFormat.replace("{FACTION_TITLE}", me.getTitle()); + eventFormat = eventFormat.replace("[FACTION_TITLE]", me.getTitle()); } InsertIndex = eventFormat.indexOf(Conf.chatTagReplaceString); eventFormat = eventFormat.replace(Conf.chatTagReplaceString, ""); @@ -124,8 +124,9 @@ public class FactionsPlayerListener implements Listener } catch (UnknownFormatConversionException ex) { + Conf.chatTagInsertIndex = 0; P.p.log(Level.SEVERE, "Critical error in chat message formatting!"); - P.p.log(Level.SEVERE, "NOTE: To fix this quickly, running this command should work: f config chatTagInsertIndex 0"); + P.p.log(Level.SEVERE, "NOTE: This has been automatically fixed right now by setting chatTagInsertIndex to 0."); P.p.log(Level.SEVERE, "For a more proper fix, please read this regarding chat configuration: http://massivecraft.com/plugins/factions/config#Chat_configuration"); return; }