diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index daf61bf..cbbcc88 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -6,7 +6,7 @@
PurpleIRC
2.1.14-${build.number}
Minecraft IRC integration for CraftBukkit/Spigot servers.
- http://www.spigotmc.org/resources/purpleirc.2836/
+ http://dev.bukkit.org/bukkit-plugins/purpleirc/
@@ -198,9 +198,9 @@
compile
- com.cnaude.mineversechat
- MineverseChat
- 2.5.7
+ com.cnaude.venturechat
+ VentureChat
+ 2.7.2
compile
@@ -284,7 +284,7 @@
com.cnaude.protocol
ProtocolLib
- 3.6.4
+ 3.6.5
compile
diff --git a/pom.xml b/pom.xml
index 37171a4..fa36841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,14 +170,13 @@
5.6.7
-
+
- com.cnaude.mineversechat
- MineverseChat
- 2.5.7
+ com.cnaude.venturechat
+ VentureChat
+ 2.7.2
-
-
+
com.cnaude.jobs
@@ -273,7 +272,7 @@
com.cnaude.protocol
ProtocolLib
- 3.6.4
+ 3.6.5
diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Link.java b/src/main/java/com/cnaude/purpleirc/Commands/Link.java
index bd57e7a..55e11cc 100644
--- a/src/main/java/com/cnaude/purpleirc/Commands/Link.java
+++ b/src/main/java/com/cnaude/purpleirc/Commands/Link.java
@@ -20,7 +20,6 @@
import com.cnaude.purpleirc.PurpleIRC;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.apache.commons.codec.binary.Base64;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/cnaude/purpleirc/Events/MineverseChatEvent.java b/src/main/java/com/cnaude/purpleirc/Events/VentureChatEvent.java
similarity index 89%
rename from src/main/java/com/cnaude/purpleirc/Events/MineverseChatEvent.java
rename to src/main/java/com/cnaude/purpleirc/Events/VentureChatEvent.java
index d9f709c..5285a34 100644
--- a/src/main/java/com/cnaude/purpleirc/Events/MineverseChatEvent.java
+++ b/src/main/java/com/cnaude/purpleirc/Events/VentureChatEvent.java
@@ -27,7 +27,7 @@
* @author Chris Naude Event listener for plugins that want to catch command
* events from PurpleIRC
*/
-public class MineverseChatEvent extends Event {
+public class VentureChatEvent extends Event {
private static final HandlerList HANDLERS = new HandlerList();
private final AsyncPlayerChatEvent event;
@@ -38,7 +38,7 @@ public class MineverseChatEvent extends Event {
* @param event
* @param bot
*/
- public MineverseChatEvent(AsyncPlayerChatEvent event, PurpleBot bot) {
+ public VentureChatEvent(AsyncPlayerChatEvent event, PurpleBot bot) {
this.event = event;
this.bot = bot;
}
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/MineverseChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/VentureChatListener.java
similarity index 66%
rename from src/main/java/com/cnaude/purpleirc/GameListeners/MineverseChatListener.java
rename to src/main/java/com/cnaude/purpleirc/GameListeners/VentureChatListener.java
index 1409083..003ca9b 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/MineverseChatListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/VentureChatListener.java
@@ -16,7 +16,7 @@
*/
package com.cnaude.purpleirc.GameListeners;
-import com.cnaude.purpleirc.Events.MineverseChatEvent;
+import com.cnaude.purpleirc.Events.VentureChatEvent;
import com.cnaude.purpleirc.PurpleBot;
import com.cnaude.purpleirc.PurpleIRC;
import com.cnaude.purpleirc.TemplateName;
@@ -27,13 +27,12 @@
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
/**
*
* @author Chris Naude
*/
-public class MineverseChatListener implements Listener {
+public class VentureChatListener implements Listener {
final PurpleIRC plugin;
@@ -41,7 +40,7 @@ public class MineverseChatListener implements Listener {
*
* @param plugin the PurpleIRC plugin
*/
- public MineverseChatListener(PurpleIRC plugin) {
+ public VentureChatListener(PurpleIRC plugin) {
this.plugin = plugin;
}
@@ -50,18 +49,18 @@ public MineverseChatListener(PurpleIRC plugin) {
* @param event
*/
@EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
- public void onMineverseChatEvent(MineverseChatEvent event) {
- mineverseChat(event.getPlayer(), event.getMessage(), event.getBot());
+ public void onVentureChatEvent(VentureChatEvent event) {
+ ventureChat(event.getPlayer(), event.getMessage(), event.getBot());
}
/**
- * MineverseChat from game to IRC
+ * VentureChat from game to IRC
*
* @param player
* @param message
* @param bot the calling bot
*/
- public void mineverseChat(Player player, String message, PurpleBot bot) {
+ public void ventureChat(Player player, String message, PurpleBot bot) {
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(player);
ChatChannel eventChannel = mcp.getCurrentChannel();
if (mcp.isQuickChat()) { //for single message chat detection
@@ -74,24 +73,24 @@ public void mineverseChat(Player player, String message, PurpleBot bot) {
bot.sendFloodWarning(player);
return;
}
- String mvChannel = eventChannel.getName();
- String mvColor = eventChannel.getColor();
+ String vcChannel = eventChannel.getName();
+ String vcColor = eventChannel.getColor();
for (String channelName : bot.botChannels) {
if (!bot.isPlayerInValidWorld(player, channelName)) {
continue;
}
- plugin.logDebug("MV Channel: " + mvChannel);
- String channelTemplateName = "mineverse-" + mvChannel + "-chat";
+ plugin.logDebug("VC Channel: " + vcChannel);
+ String channelTemplateName = "venture-" + vcChannel + "-chat";
if (bot.isMessageEnabled(channelName, channelTemplateName)
- || bot.isMessageEnabled(channelName, TemplateName.MINEVERSE_CHAT)) {
- String template = plugin.getMineverseChatTemplate(bot.botNick, mvChannel);
- plugin.logDebug("MV Template: " + template);
+ || bot.isMessageEnabled(channelName, TemplateName.VENTURE_CHAT)) {
+ String template = plugin.getVentureChatTemplate(bot.botNick, vcChannel);
+ plugin.logDebug("VC Template: " + template);
bot.asyncIRCMessage(channelName, plugin.tokenizer
- .mineverseChatTokenizer(player, mvChannel, mvColor, message, template));
+ .ventureChatTokenizer(player, vcChannel, vcColor, message, template));
} else {
- plugin.logDebug("Player " + player.getName() + " is in Mineverse channel "
- + mvChannel + ". Message types " + channelTemplateName + " and "
- + TemplateName.MINEVERSE_CHAT + " are disabled. No message sent to IRC.");
+ plugin.logDebug("Player " + player.getName() + " is in VentureChat channel "
+ + vcChannel + ". Message types " + channelTemplateName + " and "
+ + TemplateName.VENTURE_CHAT + " are disabled. No message sent to IRC.");
}
}
}
diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/MineverseChatHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/VentureChatHook.java
similarity index 92%
rename from src/main/java/com/cnaude/purpleirc/Hooks/MineverseChatHook.java
rename to src/main/java/com/cnaude/purpleirc/Hooks/VentureChatHook.java
index 757d8c7..74d026b 100644
--- a/src/main/java/com/cnaude/purpleirc/Hooks/MineverseChatHook.java
+++ b/src/main/java/com/cnaude/purpleirc/Hooks/VentureChatHook.java
@@ -26,7 +26,7 @@
*
* @author cnaude
*/
-public class MineverseChatHook {
+public class VentureChatHook {
private final PurpleIRC plugin;
@@ -34,7 +34,7 @@ public class MineverseChatHook {
*
* @param plugin the PurpleIRC plugin
*/
- public MineverseChatHook(PurpleIRC plugin) {
+ public VentureChatHook(PurpleIRC plugin) {
this.plugin = plugin;
}
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index e81ecbd..0d17510 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -16,7 +16,7 @@
*/
package com.cnaude.purpleirc;
-import com.cnaude.purpleirc.Events.MineverseChatEvent;
+import com.cnaude.purpleirc.Events.VentureChatEvent;
import com.cnaude.purpleirc.IRCListeners.ActionListener;
import com.cnaude.purpleirc.IRCListeners.AwayListener;
import com.cnaude.purpleirc.IRCListeners.ConnectListener;
@@ -146,12 +146,12 @@ public final class PurpleBot {
public CaseInsensitiveMap invalidCommandPrivate;
public CaseInsensitiveMap invalidCommandCTCP;
public CaseInsensitiveMap logIrcToHeroChat;
- public CaseInsensitiveMap logIrcToMineverseChat;
+ public CaseInsensitiveMap logIrcToVentureChat;
public CaseInsensitiveMap enableMessageFiltering;
public CaseInsensitiveMap channelPrefix;
private final CaseInsensitiveMap shortify;
public CaseInsensitiveMap heroChannel;
- public CaseInsensitiveMap mineverseChannel;
+ public CaseInsensitiveMap ventureChatChannel;
public CaseInsensitiveMap townyChannel;
public CaseInsensitiveMap> opsList;
public CaseInsensitiveMap> banList;
@@ -233,11 +233,11 @@ public PurpleBot(File file, PurpleIRC plugin) {
this.banList = new CaseInsensitiveMap<>();
this.voicesList = new CaseInsensitiveMap<>();
this.heroChannel = new CaseInsensitiveMap<>();
- this.mineverseChannel = new CaseInsensitiveMap<>();
+ this.ventureChatChannel = new CaseInsensitiveMap<>();
this.townyChannel = new CaseInsensitiveMap<>();
this.invalidCommandCTCP = new CaseInsensitiveMap<>();
this.logIrcToHeroChat = new CaseInsensitiveMap<>();
- this.logIrcToMineverseChat = new CaseInsensitiveMap<>();
+ this.logIrcToVentureChat = new CaseInsensitiveMap<>();
this.shortify = new CaseInsensitiveMap<>();
this.invalidCommandPrivate = new CaseInsensitiveMap<>();
this.hideQuitWhenVanished = new CaseInsensitiveMap<>();
@@ -898,8 +898,8 @@ private boolean loadConfig() {
heroChannel.put(channelName, config.getString("channels." + enChannelName + ".hero-channel", "admin"));
plugin.logDebug(" HeroChannel => " + heroChannel.get(channelName));
- mineverseChannel.put(channelName, config.getString("channels." + enChannelName + ".mineverse-channel", "global"));
- plugin.logDebug(" MineverseChannel => " + mineverseChannel.get(channelName));
+ ventureChatChannel.put(channelName, config.getString("channels." + enChannelName + ".venture-channel", "global"));
+ plugin.logDebug(" VentureChatChannel => " + ventureChatChannel.get(channelName));
townyChannel.put(channelName, config.getString("channels." + enChannelName + ".towny-channel", ""));
plugin.logDebug(" TownyChannel => " + townyChannel.get(channelName));
@@ -907,8 +907,8 @@ private boolean loadConfig() {
logIrcToHeroChat.put(channelName, config.getBoolean("channels." + enChannelName + ".log-irc-to-hero-chat", false));
plugin.logDebug(" LogIrcToHeroChat => " + logIrcToHeroChat.get(channelName));
- logIrcToMineverseChat.put(channelName, config.getBoolean("channels." + enChannelName + ".log-irc-to-mineverse-chat", false));
- plugin.logDebug(" LogIrcToMineverseChat => " + logIrcToMineverseChat.get(channelName));
+ logIrcToVentureChat.put(channelName, config.getBoolean("channels." + enChannelName + ".log-irc-to-venture-chat", false));
+ plugin.logDebug(" LogIrcToVentureChat => " + logIrcToVentureChat.get(channelName));
ignoreIRCChat.put(channelName, config.getBoolean("channels." + enChannelName + ".ignore-irc-chat", false));
plugin.logDebug(" IgnoreIRCChat => " + ignoreIRCChat.get(channelName));
@@ -1222,8 +1222,8 @@ public void gameChat(AsyncPlayerChatEvent event) {
} else {
plugin.logDebug("No Factions");
}
- if (plugin.mineverseChatEnabled) {
- plugin.getServer().getPluginManager().callEvent(new MineverseChatEvent(event, this));
+ if (plugin.ventureChatEnabled) {
+ plugin.getServer().getPluginManager().callEvent(new VentureChatEvent(event, this));
}
if (isMessageEnabled(channelName, TemplateName.GAME_CHAT)) {
asyncIRCMessage(channelName, plugin.tokenizer
@@ -2745,19 +2745,19 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
}
/*
- Send messages to MineverseChat if enabled
+ Send messages to VentureChat if enabled
*/
- if (isMessageEnabled(channelName, TemplateName.IRC_MINEVERSE_CHAT) && plugin.mineverseChatEnabled) {
- String mvChannel = mineverseChannel.get(channelName);
- String mvTemplate = plugin.getIrcMineverseChatTemplate(botNick, mvChannel);
- plugin.logDebug("broadcastChat [MV]: " + mvChannel + ": " + mvTemplate);
+ if (isMessageEnabled(channelName, TemplateName.IRC_VENTURE_CHAT) && plugin.ventureChatEnabled) {
+ String vcChannel = ventureChatChannel.get(channelName);
+ String vcTemplate = plugin.getIrcVentureChatTemplate(botNick, vcChannel);
+ plugin.logDebug("broadcastChat [MV]: " + vcChannel + ": " + vcTemplate);
String rawMvMessage = filterMessage(
- plugin.tokenizer.ircChatToMineverseChatTokenizer(this, user, channel, mvTemplate, message, mvChannel), channelName);
+ plugin.tokenizer.ircChatToVentureChatTokenizer(this, user, channel, vcTemplate, message, vcChannel), channelName);
if (!rawMvMessage.isEmpty()) {
- plugin.mvHook.sendMessage(mvChannel, rawMvMessage);
+ plugin.vcHook.sendMessage(vcChannel, rawMvMessage);
messageSent = true;
- if (logIrcToMineverseChat.containsKey(channelName)) {
- if (logIrcToMineverseChat.get(channelName)) {
+ if (logIrcToVentureChat.containsKey(channelName)) {
+ if (logIrcToVentureChat.get(channelName)) {
plugin.getServer().getConsoleSender().sendMessage(rawMvMessage);
}
}
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
index e5e83b9..fc27fe4 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -33,7 +33,7 @@
import com.cnaude.purpleirc.GameListeners.GameServerCommandListener;
import com.cnaude.purpleirc.GameListeners.HeroChatListener;
import com.cnaude.purpleirc.GameListeners.McMMOChatListener;
-import com.cnaude.purpleirc.GameListeners.MineverseChatListener;
+import com.cnaude.purpleirc.GameListeners.VentureChatListener;
import com.cnaude.purpleirc.GameListeners.NTheEndAgainListener;
import com.cnaude.purpleirc.GameListeners.OreBroadcastListener;
import com.cnaude.purpleirc.GameListeners.PrismListener;
@@ -50,7 +50,7 @@
import com.cnaude.purpleirc.Hooks.GriefPreventionHook;
import com.cnaude.purpleirc.Hooks.JobsHook;
import com.cnaude.purpleirc.Hooks.McMMOChatHook;
-import com.cnaude.purpleirc.Hooks.MineverseChatHook;
+import com.cnaude.purpleirc.Hooks.VentureChatHook;
import com.cnaude.purpleirc.Hooks.ReportRTSHook;
import com.cnaude.purpleirc.Hooks.ShortifyHook;
import com.cnaude.purpleirc.Hooks.SuperVanishHook;
@@ -122,13 +122,13 @@ public class PurpleIRC extends JavaPlugin {
private final CaseInsensitiveMap> messageTmpl;
private final CaseInsensitiveMap> ircHeroChannelMessages;
private final CaseInsensitiveMap> ircHeroActionChannelMessages;
- private final CaseInsensitiveMap> ircMineverseChannelMessages;
- private final CaseInsensitiveMap> ircMineverseActionChannelMessages;
+ private final CaseInsensitiveMap> ircVentureChatChannelMessages;
+ private final CaseInsensitiveMap> ircVentureChatActionChannelMessages;
private final CaseInsensitiveMap> ircTownyChannelMessages;
private final CaseInsensitiveMap> heroChannelMessages;
private final CaseInsensitiveMap> heroActionChannelMessages;
- private final CaseInsensitiveMap> mineverseChannelMessages;
- private final CaseInsensitiveMap> mineverseActionChannelMessages;
+ private final CaseInsensitiveMap> ventureChatChannelMessages;
+ private final CaseInsensitiveMap> ventureChatActionChannelMessages;
private final Map hostCache;
public String defaultPlayerSuffix,
defaultPlayerPrefix,
@@ -175,7 +175,7 @@ public class PurpleIRC extends JavaPlugin {
private boolean listSortByName;
public boolean exactNickMatch;
public boolean ignoreChatCancel;
- public boolean mineverseChatEnabled;
+ public boolean ventureChatEnabled;
public Long ircConnCheckInterval;
public Long ircChannelCheckInterval;
public Long joinDelay;
@@ -187,7 +187,7 @@ public class PurpleIRC extends JavaPlugin {
public CaseInsensitiveMap ircBots;
public FactionChatHook fcHook;
public TownyChatHook tcHook;
- public MineverseChatHook mvHook;
+ public VentureChatHook vcHook;
public DynmapHook dynmapHook;
public JobsHook jobsHook;
public AdminPrivateChatHook adminPrivateChatHook;
@@ -234,7 +234,7 @@ public class PurpleIRC extends JavaPlugin {
final String PL_REDDITSTREAM = "RedditStream";
final String PL_PRISM = "Prism";
final String PL_TITANCHAT = "TitanChat";
- final String PL_MINEVERSECHAT = "MineverseChat";
+ final String PL_VENTURECHAT = "VentureChat";
final String PL_HEROCHAT = "Herochat";
final String PL_GRIEFPREVENTION = "GriefPrevention";
List hookList = new ArrayList<>();
@@ -254,13 +254,13 @@ public PurpleIRC() {
this.messageTmpl = new CaseInsensitiveMap<>();
this.ircHeroChannelMessages = new CaseInsensitiveMap<>();
this.ircHeroActionChannelMessages = new CaseInsensitiveMap<>();
- this.ircMineverseChannelMessages = new CaseInsensitiveMap<>();
- this.ircMineverseActionChannelMessages = new CaseInsensitiveMap<>();
+ this.ircVentureChatChannelMessages = new CaseInsensitiveMap<>();
+ this.ircVentureChatActionChannelMessages = new CaseInsensitiveMap<>();
this.ircTownyChannelMessages = new CaseInsensitiveMap<>();
this.heroChannelMessages = new CaseInsensitiveMap<>();
this.heroActionChannelMessages = new CaseInsensitiveMap<>();
- this.mineverseChannelMessages = new CaseInsensitiveMap<>();
- this.mineverseActionChannelMessages = new CaseInsensitiveMap<>();
+ this.ventureChatChannelMessages = new CaseInsensitiveMap<>();
+ this.ventureChatActionChannelMessages = new CaseInsensitiveMap<>();
this.displayNameCache = new CaseInsensitiveMap<>();
this.uuidCache = new CaseInsensitiveMap<>();
this.hostCache = new HashMap<>();
@@ -448,7 +448,7 @@ public String getMessageTemplate(String template) {
}
/**
- * Get message template for HeroChat, MineverseChat or TownyChat based on
+ * Get message template for HeroChat, VentureChat or TownyChat based on
* channel name
*
* @param templateMap map of message templates for specific chat plugin
@@ -498,20 +498,20 @@ public String getIrcHeroActionTemplate(String botName, String channel) {
return getMessageTemplate(ircHeroActionChannelMessages, botName, channel, TemplateName.IRC_HERO_ACTION);
}
- public String getMineverseChatTemplate(String botName, String channel) {
- return getMessageTemplate(mineverseChannelMessages, botName, channel, TemplateName.MINEVERSE_CHAT);
+ public String getVentureChatTemplate(String botName, String channel) {
+ return getMessageTemplate(ventureChatChannelMessages, botName, channel, TemplateName.VENTURE_CHAT);
}
- public String getMineverseActionTemplate(String botName, String channel) {
- return getMessageTemplate(mineverseActionChannelMessages, botName, channel, TemplateName.MINEVERSE_ACTION);
+ public String getVentureChatActionTemplate(String botName, String channel) {
+ return getMessageTemplate(ventureChatActionChannelMessages, botName, channel, TemplateName.VENTURE_CHAT_ACTION);
}
- public String getIrcMineverseChatTemplate(String botName, String channel) {
- return getMessageTemplate(ircMineverseChannelMessages, botName, channel, TemplateName.IRC_MINEVERSE_CHAT);
+ public String getIrcVentureChatTemplate(String botName, String channel) {
+ return getMessageTemplate(ircVentureChatChannelMessages, botName, channel, TemplateName.IRC_VENTURE_CHAT);
}
- public String getIrcMineverseActionTemplate(String botName, String channel) {
- return getMessageTemplate(ircMineverseActionChannelMessages, botName, channel, TemplateName.IRC_MINEVERSE_ACTION);
+ public String getIrcVentureChatActionTemplate(String botName, String channel) {
+ return getMessageTemplate(ircVentureChatActionChannelMessages, botName, channel, TemplateName.IRC_VENTURE_ACTION);
}
public String getIrcTownyChatTemplate(String botName, String channel) {
@@ -535,10 +535,10 @@ public void loadTemplates(YamlConfiguration config, String configName, String se
heroChannelMessages.put(configName, new CaseInsensitiveMap());
heroActionChannelMessages.put(configName, new CaseInsensitiveMap());
- ircMineverseChannelMessages.put(configName, new CaseInsensitiveMap());
- ircMineverseActionChannelMessages.put(configName, new CaseInsensitiveMap());
- mineverseChannelMessages.put(configName, new CaseInsensitiveMap());
- mineverseActionChannelMessages.put(configName, new CaseInsensitiveMap());
+ ircVentureChatChannelMessages.put(configName, new CaseInsensitiveMap());
+ ircVentureChatActionChannelMessages.put(configName, new CaseInsensitiveMap());
+ ventureChatChannelMessages.put(configName, new CaseInsensitiveMap());
+ ventureChatActionChannelMessages.put(configName, new CaseInsensitiveMap());
ircTownyChannelMessages.put(configName, new CaseInsensitiveMap());
@@ -604,45 +604,45 @@ public void loadTemplates(YamlConfiguration config, String configName, String se
}
}
- if (config.contains(section + ".mineverse-channels")) {
- for (String mvChannelName : config.getConfigurationSection(section + ".mineverse-channels").getKeys(false)) {
- mineverseChannelMessages.get(configName).put(mvChannelName,
+ if (config.contains(section + ".venture-channels")) {
+ for (String mvChannelName : config.getConfigurationSection(section + ".venture-channels").getKeys(false)) {
+ ventureChatChannelMessages.get(configName).put(mvChannelName,
ChatColor.translateAlternateColorCodes('&',
- config.getString(section + ".mineverse-channels."
+ config.getString(section + ".venture-channels."
+ mvChannelName)));
- logDebug(section + ".mineverse-channels: " + mvChannelName
- + " => " + mineverseChannelMessages.get(configName).get(mvChannelName));
+ logDebug(section + ".venture-channels: " + mvChannelName
+ + " => " + ventureChatChannelMessages.get(configName).get(mvChannelName));
}
}
- if (config.contains(section + ".mineverse-action-channels")) {
- for (String mvChannelName : config.getConfigurationSection(section + ".mineverse-action-channels").getKeys(false)) {
- mineverseActionChannelMessages.get(configName).put(mvChannelName,
+ if (config.contains(section + ".venture-action-channels")) {
+ for (String mvChannelName : config.getConfigurationSection(section + ".venture-action-channels").getKeys(false)) {
+ ventureChatActionChannelMessages.get(configName).put(mvChannelName,
ChatColor.translateAlternateColorCodes('&',
- config.getString(section + ".mineverse-action-channels."
+ config.getString(section + ".venture-action-channels."
+ mvChannelName)));
- logDebug(section + ".mineverse-action-channels: " + mvChannelName
- + " => " + mineverseActionChannelMessages.get(configName).get(mvChannelName));
+ logDebug(section + ".venture-action-channels: " + mvChannelName
+ + " => " + ventureChatActionChannelMessages.get(configName).get(mvChannelName));
}
}
- if (config.contains(section + ".irc-mineverse-channels")) {
- for (String mvChannelName : config.getConfigurationSection(section + ".irc-mineverse-channels").getKeys(false)) {
- ircMineverseChannelMessages.get(configName).put(mvChannelName,
+ if (config.contains(section + ".irc-venture-channels")) {
+ for (String mvChannelName : config.getConfigurationSection(section + ".irc-venture-channels").getKeys(false)) {
+ ircVentureChatChannelMessages.get(configName).put(mvChannelName,
ChatColor.translateAlternateColorCodes('&',
- config.getString(section + ".irc-mineverse-channels."
+ config.getString(section + ".irc-venture-channels."
+ mvChannelName)));
- logDebug(section + ".irc-mineverse-channels: " + mvChannelName
- + " => " + ircMineverseChannelMessages.get(configName).get(mvChannelName));
+ logDebug(section + ".irc-venture-channels: " + mvChannelName
+ + " => " + ircVentureChatChannelMessages.get(configName).get(mvChannelName));
}
}
- if (config.contains(section + ".irc-mineverse-action-channels")) {
- for (String mvChannelName : config.getConfigurationSection(section + ".irc-mineverse-action-channels").getKeys(false)) {
- ircMineverseActionChannelMessages.get(configName).put(mvChannelName,
+ if (config.contains(section + ".irc-venture-action-channels")) {
+ for (String mvChannelName : config.getConfigurationSection(section + ".irc-venture-action-channels").getKeys(false)) {
+ ircVentureChatActionChannelMessages.get(configName).put(mvChannelName,
ChatColor.translateAlternateColorCodes('&',
- config.getString(section + ".irc-mineverse-action-channels."
+ config.getString(section + ".irc-venture-action-channels."
+ mvChannelName)));
- logDebug(section + ".irc-mineverse-action-channels: " + mvChannelName
- + " => " + ircMineverseActionChannelMessages.get(configName).get(mvChannelName));
+ logDebug(section + ".irc-venture-action-channels: " + mvChannelName
+ + " => " + ircVentureChatActionChannelMessages.get(configName).get(mvChannelName));
}
}
} else {
@@ -1569,15 +1569,15 @@ private void detectHooks() {
} else {
hookList.add(hookFormat(PL_TITANCHAT, false));
}
- if (isPluginEnabled(PL_MINEVERSECHAT)) {
- hookList.add(hookFormat(PL_MINEVERSECHAT, true));
- mineverseChatEnabled = true;
- mvHook = new MineverseChatHook(this);
- getServer().getPluginManager().registerEvents(new MineverseChatListener(this), this);
+ if (isPluginEnabled(PL_VENTURECHAT)) {
+ hookList.add(hookFormat(PL_VENTURECHAT, true));
+ ventureChatEnabled = true;
+ vcHook = new VentureChatHook(this);
+ getServer().getPluginManager().registerEvents(new VentureChatListener(this), this);
} else {
- hookList.add(hookFormat(PL_MINEVERSECHAT, false));
- mineverseChatEnabled = false;
- mvHook = null;
+ hookList.add(hookFormat(PL_VENTURECHAT, false));
+ ventureChatEnabled = false;
+ vcHook = null;
}
if (isPluginEnabled(PL_PRISM)) {
hookList.add(hookFormat(PL_PRISM, true));
diff --git a/src/main/java/com/cnaude/purpleirc/TemplateName.java b/src/main/java/com/cnaude/purpleirc/TemplateName.java
index a58ecd8..e249bb6 100644
--- a/src/main/java/com/cnaude/purpleirc/TemplateName.java
+++ b/src/main/java/com/cnaude/purpleirc/TemplateName.java
@@ -55,8 +55,8 @@ public class TemplateName {
public final static String HERO_ACTION = "hero-action";
public final static String HERO_CHAT = "hero-chat";
- public final static String MINEVERSE_ACTION = "mineverse-action";
- public final static String MINEVERSE_CHAT = "mineverse-chat";
+ public final static String VENTURE_CHAT_ACTION = "venture-action";
+ public final static String VENTURE_CHAT = "venture-chat";
public final static String IRC_HERO_ACTION = "irc-hero-action";
public final static String IRC_HERO_CHAT = "irc-hero-chat";
@@ -66,21 +66,21 @@ public class TemplateName {
public final static String IRC_HERO_QUIT = "irc-hero-quit";
public final static String IRC_HERO_TOPIC = "irc-hero-topic";
- public final static String IRC_MINEVERSE_ACTION = "irc-mineverse-action";
- public final static String IRC_MINEVERSE_CHAT = "irc-mineverse-chat";
- public final static String IRC_MINEVERSE_KICK = "irc-mineverse-kick";
- public final static String IRC_MINEVERSE_JOIN = "irc-mineverse-join";
- public final static String IRC_MINEVERSE_PART = "irc-mineverse-part";
- public final static String IRC_MINEVERSE_QUIT = "irc-mineverse-quit";
- public final static String IRC_MINEVERSE_TOPIC = "irc-mineverse-topic";
+ public final static String IRC_VENTURE_ACTION = "irc-venture-action";
+ public final static String IRC_VENTURE_CHAT = "irc-venture-chat";
+ public final static String IRC_VENTURE_KICK = "irc-venture-kick";
+ public final static String IRC_VENTURE_JOIN = "irc-venture-join";
+ public final static String IRC_VENTURE_PART = "irc-venture-part";
+ public final static String IRC_VENTURE_QUIT = "irc-venture-quit";
+ public final static String IRC_VENTURE_TOPIC = "irc-venture-topic";
public final static String IRC_ESS_HELPOP = "irc-ess-helpop";
public final static String IRC_HERO_CHANNELS = "irc-hero-channels";
public final static String HERO_CHANNELS = "hero-channels";
- public final static String IRC_MINEVERSE_CHANNELS = "irc-mineverse-channels";
- public final static String MINEVERSE_CHANNELS = "mineverse-channels";
+ public final static String IRC_VENTURE_CHAT_CHANNELS = "irc-venture-channels";
+ public final static String VENTURE_CHAT_CHANNELS = "venture-channels";
public final static String TITAN_CHAT = "titan-chat";
public final static String IRC_TITAN_CHAT = "irc-titan-chat";
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
index 654c68d..745eeb7 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -224,7 +224,7 @@ public String ircChatToHeroChatTokenizer(PurpleBot ircBot, User user, org.pircbo
}
/**
- * IRC to Mineverse chat channel tokenizer
+ * IRC to VentureChat channel tokenizer
*
* @param ircBot
* @param user
@@ -234,7 +234,7 @@ public String ircChatToHeroChatTokenizer(PurpleBot ircBot, User user, org.pircbo
* @param hChannel
* @return
*/
- public String ircChatToMineverseChatTokenizer(PurpleBot ircBot, User user, org.pircbotx.Channel channel, String template, String message, String hChannel) {
+ public String ircChatToVentureChatTokenizer(PurpleBot ircBot, User user, org.pircbotx.Channel channel, String template, String message, String hChannel) {
String ircNick = user.getNick();
String tmpl;
Player player = this.getPlayer(ircNick);
@@ -580,20 +580,20 @@ public String titanChatTokenizer(Player player, String tChannel, String tColor,
}
/**
- * MineverseChat to IRC
+ * VentureChat to IRC
*
* @param player
- * @param mvChannel
- * @param mvColor
+ * @param vcChannel
+ * @param vcColor
* @param message
* @param template
* @return
*/
- public String mineverseChatTokenizer(Player player, String mvChannel, String mvColor, String message, String template) {
+ public String ventureChatTokenizer(Player player, String vcChannel, String vcColor, String message, String template) {
return gameChatToIRCTokenizer(player, template, message)
- .replace("%MVCHANNEL%", mvChannel)
- .replace("%MVCOLOR%", plugin.colorConverter.gameColorsToIrc(mvColor))
- .replace("%CHANNEL%", mvChannel);
+ .replace("%MVCHANNEL%", vcChannel)
+ .replace("%MVCOLOR%", plugin.colorConverter.gameColorsToIrc(vcColor))
+ .replace("%CHANNEL%", vcChannel);
}
/**
diff --git a/src/main/resources/SampleBot.yml b/src/main/resources/SampleBot.yml
index 65e26ea..f15513f 100644
--- a/src/main/resources/SampleBot.yml
+++ b/src/main/resources/SampleBot.yml
@@ -245,8 +245,8 @@ channels:
#- irc-a-chat
# Hero channel destination for IRC messages
hero-channel: admin
- # Mineverse channel destination for IRC messages
- mineverse-channel: global
+ # Venture channel destination for IRC messages
+ venture-channel: global
# Towny channel destination for IRC messages
towny-channel: irc
# Log all messages from IRC to HeroChat
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 513a453..4524987 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -171,14 +171,14 @@ message-format:
irc-hero-part: '[&3IRC&r] %NAME% has left %CHANNEL%.'
irc-hero-quit: '[&3IRC&r] %NAME% has left %CHANNEL%.'
irc-hero-topic: '[&3IRC&r] Topic changed by %NAME%: %TOPIC%.'
- # Message templates for IRC to Mineversechat messages
- irc-mineverse-action: '[&3IRC&r] ***%NAME% %MESSAGE%'
- irc-mineverse-chat: '[&3IRC&r]<%NAME%> %MESSAGE%'
- irc-mineverse-join: '[&3IRC&r] %NAME% has joined %CHANNEL%.'
- irc-mineverse-kick: '[&3IRC&r] %NAME% was kicked from %CHANNEL% by %KICKER%. (Reason- %REASON%)'
- irc-mineverse-part: '[&3IRC&r] %NAME% has left %CHANNEL%.'
- irc-mineverse-quit: '[&3IRC&r] %NAME% has left %CHANNEL%.'
- irc-mineverse-topic: '[&3IRC&r] Topic changed by %NAME%: %TOPIC%.'
+ # Message templates for IRC to VentureChat messages
+ irc-venture-action: '[&3IRC&r] ***%NAME% %MESSAGE%'
+ irc-venture-chat: '[&3IRC&r]<%NAME%> %MESSAGE%'
+ irc-venture-join: '[&3IRC&r] %NAME% has joined %CHANNEL%.'
+ irc-venture-kick: '[&3IRC&r] %NAME% was kicked from %CHANNEL% by %KICKER%. (Reason- %REASON%)'
+ irc-venture-part: '[&3IRC&r] %NAME% has left %CHANNEL%.'
+ irc-venture-quit: '[&3IRC&r] %NAME% has left %CHANNEL%.'
+ irc-venture-topic: '[&3IRC&r] Topic changed by %NAME%: %TOPIC%.'
# Message template for TitanChat to IRC messages
titan-chat: '[%CHANNEL%]<%NAME%> %MESSAGE%'
# Message templates for IRC to TitanChat messages
@@ -227,8 +227,8 @@ message-format:
# Emote message format per HeroChat channel. From game to IRC. Overrides hero-action template.
hero-action-channels:
Global: '[&2%CHANNEL%&r]***%NAME% %MESSAGE%'
- # Message format per MineverseChat channel. From IRC to game. Overrides mineverse-chat template.
- irc-mineverse-channels:
+ # Message format per VentureChat channel. From IRC to game. Overrides venture-chat template.
+ irc-venture-channels:
Global: '&f[&2Global&f] [&4IRC&f] <%NAME%>&2: %MESSAGE%'
Staff: '&f[&aStaff&f] [&4IRC&f] <%NAME%>&a: %MESSAGE%'
Admin: '&f[&cAdmin&f] [&4IRC&f] <%NAME%>&c: %MESSAGE%'
@@ -237,8 +237,8 @@ message-format:
Trade: '&f[&3Trade&f] [&4IRC&f] <%NAME%>&3: %MESSAGE%'
Local: '&f[&eLocal&f] [&4IRC&f] <%NAME%>&e: %MESSAGE%'
Network: '&f[&6Network&f] [&4IRC&f] <%NAME%>&6: %MESSAGE%'
- # Emote message format per MineverseChat channel. From IRC to game. Overrides mineverse-action template.
- irc-mineverse-action-channels:
+ # Emote message format per VentureChat channel. From IRC to game. Overrides venture-action template.
+ irc-venture-action-channels:
Global: '&f[&2Global&f] [&4IRC&f]***%NAME%&2: %MESSAGE%'
Staff: '&f[&aStaff&f] [&4IRC&f]***%NAME%&a: %MESSAGE%'
Admin: '&f[&cAdmin&f] [&4IRC&f]***%NAME%&c: %MESSAGE%'
@@ -247,8 +247,8 @@ message-format:
Trade: '&f[&3Trade&f] [&4IRC&f]***%NAME%&3: %MESSAGE%'
Local: '&f[&eLocal&f] [&4IRC&f]***%NAME%&e: %MESSAGE%'
Network: '&f[&6Network&f] [&4IRC&f]***%NAME%&6: %MESSAGE%'
- # Message format per MineverseChat channel. From game to IRC. Overrides mineverse-chat template.
- mineverse-channels:
+ # Message format per VentureChat channel. From game to IRC. Overrides venture-chat template.
+ venture-channels:
Global: '&f[&2Global&f] <%NAME%>&2: %MESSAGE%'
Staff: '&f[&aStaff&f] <%NAME%>&a: %MESSAGE%'
Admin: '&f[&cAdmin&f] <%NAME%>&c: %MESSAGE%'
@@ -257,8 +257,8 @@ message-format:
Trade: '&f[&3Trade&f] <%NAME%>&3: %MESSAGE%'
Local: '&f[&eLocal&f] <%NAME%>&e: %MESSAGE%'
Network: '&f[&6Network&f] <%NAME%>&6: %MESSAGE%'
- # Emote message format per MineverseChat channel. From game to IRC. Overrides mineverse-action template.
- mineverse-action-channels:
+ # Emote message format per VentureChat channel. From game to IRC. Overrides venture-action template.
+ venture-action-channels:
Global: '&f[&2Global&f]***%NAME%&2: %MESSAGE%'
Staff: '&f[&aStaff&f]***%NAME%&a: %MESSAGE%'
Admin: '&f[&cAdmin&f]***%NAME%&c: %MESSAGE%'