Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Commit

Permalink
Minecraft 1.8.5 compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnaude
cnaude committed May 23, 2015
1 parent 86fab80 commit 389b17d
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 47 deletions.
6 changes: 6 additions & 0 deletions dependency-reduced-pom.xml
View file
Expand Up @@ -148,6 +148,12 @@
<version>1.8.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit-185</artifactId>
<version>1.8.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
View file
Expand Up @@ -93,6 +93,14 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit-185</artifactId>
<version>1.8.5</version>
<type>jar</type>
<scope>provided</scope>
</dependency>

<!-- PircBotX -->
<dependency>
<groupId>com.cnaude.pircbotx</groupId>
Expand Down
93 changes: 50 additions & 43 deletions src/main/java/com/cnaude/purpleirc/PurpleBot.java
View file
Expand Up @@ -102,7 +102,7 @@ public final class PurpleBot {
public String nick;
public String botNick;
public List<String> altNicks;
int nickIndex = 0;
private int nickIndex = 0;
public String botLogin;
public String botRealName;
public int ircMaxLineLength;
Expand Down Expand Up @@ -1056,8 +1056,7 @@ public void gameChat(Player player, String message) {
}

private void sendFloodWarning(Player player) {
String message = plugin.getMsgTemplate(
botNick, "", TemplateName.GAME_FLOOD_WARNING)
String message = plugin.getMsgTemplate(botNick, "", TemplateName.GAME_FLOOD_WARNING)
.replace("%COOLDOWN%", floodChecker.getCoolDown(player));
if (!message.isEmpty()) {
player.sendMessage(message);
Expand Down Expand Up @@ -1112,8 +1111,8 @@ public void mcMMOAdminChat(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.MCMMO_ADMIN_CHAT)) {
plugin.logDebug("Sending message because " + TemplateName.MCMMO_ADMIN_CHAT + " is enabled.");
asyncIRCMessage(channelName, plugin.tokenizer
.mcMMOChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.MCMMO_ADMIN_CHAT), message));
.mcMMOChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.MCMMO_ADMIN_CHAT), message));
} else {
plugin.logDebug("Player " + player.getName()
+ " is in mcMMO AdminChat but " + TemplateName.MCMMO_ADMIN_CHAT + " is disabled.");
Expand All @@ -1135,8 +1134,8 @@ public void mcMMOPartyChat(Player player, String partyName, String message) {
if (isMessageEnabled(channelName, TemplateName.MCMMO_PARTY_CHAT)) {
plugin.logDebug("Sending message because " + TemplateName.MCMMO_PARTY_CHAT + " is enabled.");
asyncIRCMessage(channelName, plugin.tokenizer
.mcMMOPartyChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.MCMMO_PARTY_CHAT), message, partyName));
.mcMMOPartyChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.MCMMO_PARTY_CHAT), message, partyName));
} else {
plugin.logDebug("Player " + player.getName()
+ " is in mcMMO PartyChat but " + TemplateName.MCMMO_PARTY_CHAT + " is disabled.");
Expand All @@ -1158,8 +1157,8 @@ public void mcMMOChat(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.MCMMO_CHAT)) {
plugin.logDebug("Sending message because " + TemplateName.MCMMO_CHAT + " is enabled.");
asyncIRCMessage(channelName, plugin.tokenizer
.mcMMOChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.MCMMO_CHAT), message));
.mcMMOChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.MCMMO_CHAT), message));
} else {
plugin.logDebug("Player " + player.getName()
+ " is in mcMMO Chat but " + TemplateName.MCMMO_CHAT + " is disabled.");
Expand Down Expand Up @@ -1244,8 +1243,8 @@ public void gameChat(Player player, String channelName, String message) {
}
if (isValidChannel(channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_SEND), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_SEND), message));
}
}

Expand All @@ -1262,7 +1261,8 @@ public void cleverChat(String cleverBotName, String message) {
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, "clever-chat")) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(cleverBotName, plugin.getMsgTemplate(botNick, channelName, TemplateName.CLEVER_SEND), message));
.gameChatToIRCTokenizer(cleverBotName, plugin
.getMsgTemplate(botNick, channelName, TemplateName.CLEVER_SEND), message));
}
}
}
Expand All @@ -1281,7 +1281,8 @@ public void adminChat(String name, String message, String world) {
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.GAME_A_CHAT)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(name, plugin.getMsgTemplate(botNick, channelName, TemplateName.GAME_A_CHAT), message)
.gameChatToIRCTokenizer(name, plugin.
getMsgTemplate(botNick, channelName, TemplateName.GAME_A_CHAT), message)
.replace("%WORLD%", world)
);
}
Expand All @@ -1304,7 +1305,8 @@ public void reportRTSNotify(String pName, Ticket ticket,
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, messageType)) {
asyncIRCMessage(channelName, plugin.tokenizer
.reportRTSTokenizer(pName, plugin.getMsgTemplate(botNick, channelName, messageType), ticket));
.reportRTSTokenizer(pName, plugin
.getMsgTemplate(botNick, channelName, messageType), ticket));
}
}
}
Expand Down Expand Up @@ -1332,8 +1334,8 @@ public void consoleChat(String channelName, String message) {
}
if (isValidChannel(channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer("CONSOLE", message, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_SEND)));
.gameChatToIRCTokenizer("CONSOLE", message, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_SEND)));
}
}

Expand All @@ -1348,8 +1350,8 @@ public void consoleChat(String message) {
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.CONSOLE_CHAT)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(plugin.getMsgTemplate(
botNick, channelName, TemplateName.CONSOLE_CHAT),
.gameChatToIRCTokenizer(plugin
.getMsgTemplate(botNick, channelName, TemplateName.CONSOLE_CHAT),
ChatColor.translateAlternateColorCodes('&', message)));
}
}
Expand Down Expand Up @@ -1409,7 +1411,9 @@ public void gameOreBroadcast(Player player, String message) {
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.ORE_BROADCAST)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(botNick, channelName, TemplateName.ORE_BROADCAST), ChatColor.translateAlternateColorCodes('&', message)));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.ORE_BROADCAST),
ChatColor.translateAlternateColorCodes('&', message)));
}
}
}
Expand All @@ -1429,8 +1433,8 @@ public void dynmapWebChat(String source, String name, String message) {
if (isMessageEnabled(channelName, TemplateName.DYNMAP_WEB_CHAT)) {
plugin.logDebug("dynmapWebChat: sending message");
asyncIRCMessage(channelName, plugin.tokenizer
.dynmapWebChatToIRCTokenizer(source, name, plugin.getMsgTemplate(
botNick, channelName, TemplateName.DYNMAP_WEB_CHAT),
.dynmapWebChatToIRCTokenizer(source, name, plugin
.getMsgTemplate(botNick, channelName, TemplateName.DYNMAP_WEB_CHAT),
ChatColor.translateAlternateColorCodes('&', message)));
}
}
Expand All @@ -1447,8 +1451,9 @@ public void consoleBroadcast(String message) {
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.BROADCAST_CONSOLE_MESSAGE)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(plugin.getMsgTemplate(
botNick, channelName, TemplateName.BROADCAST_CONSOLE_MESSAGE), ChatColor.translateAlternateColorCodes('&', message)));
.gameChatToIRCTokenizer(plugin
.getMsgTemplate(botNick, channelName, TemplateName.BROADCAST_CONSOLE_MESSAGE),
ChatColor.translateAlternateColorCodes('&', message)));
}
}
}
Expand All @@ -1463,7 +1468,9 @@ public void redditStreamBroadcast(String message) {
}
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.REDDIT_MESSAGES)) {
asyncIRCMessage(channelName, plugin.tokenizer.gameChatToIRCTokenizer(plugin.getMsgTemplate(botNick, channelName, TemplateName.REDDIT_MESSAGES), message));
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(plugin
.getMsgTemplate(botNick, channelName, TemplateName.REDDIT_MESSAGES), message));
}
}
}
Expand All @@ -1486,8 +1493,8 @@ public void gameJoin(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.GAME_JOIN)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_JOIN), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_JOIN), message));
}
}
}
Expand All @@ -1510,8 +1517,8 @@ public void gameQuit(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.GAME_QUIT)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_QUIT), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_QUIT), message));
}
}
}
Expand All @@ -1529,8 +1536,8 @@ public void gameFakeJoin(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.FAKE_JOIN)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.FAKE_JOIN), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.FAKE_JOIN), message));
}
}
}
Expand All @@ -1548,8 +1555,8 @@ public void gameFakeQuit(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.FAKE_QUIT)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.FAKE_QUIT), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.FAKE_QUIT), message));
}
}
}
Expand All @@ -1568,8 +1575,8 @@ public void gameAchievement(Player player, Achievement achievement) {
if (isMessageEnabled(channelName, TemplateName.GAME_ACHIEVEMENT)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_ACHIEVEMENT), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_ACHIEVEMENT), message));
}
}
}
Expand All @@ -1588,8 +1595,8 @@ public void gameModeChange(Player player, GameMode gameMode) {
if (isMessageEnabled(channelName, TemplateName.GAME_MODE)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_MODE), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_MODE), message));
}
}
}
Expand All @@ -1608,8 +1615,8 @@ public void gameKick(Player player, String message, String reason) {
if (isMessageEnabled(channelName, TemplateName.GAME_KICK)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameKickTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_KICK), message, reason));
.gameKickTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_KICK), message, reason));
}
}
}
Expand All @@ -1631,8 +1638,8 @@ public void gameAction(Player player, String message) {
if (isMessageEnabled(channelName, TemplateName.GAME_ACTION)
&& isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, TemplateName.GAME_ACTION), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_ACTION), message));
}
}
}
Expand All @@ -1651,8 +1658,8 @@ public void gameDeath(Player player, String message, String templateName) {
if (isMessageEnabled(channelName, templateName)) {
if (isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, channelName, templateName), message));
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, channelName, templateName), message));
}
}
}
Expand Down Expand Up @@ -2676,7 +2683,7 @@ public void broadcastIRCNotice(User user, String message, String notice, org.pir
*
* @param user
* @param channel
*/
*/
public void broadcastIRCJoin(User user, org.pircbotx.Channel channel) {
String channelName = channel.getName();
if (isMessageEnabled(channel, TemplateName.IRC_JOIN)) {
Expand Down
2 changes: 1 addition & 1 deletion ...de/purpleirc/Utilities/NetPacket_184.java → ...urpleirc/Utilities/NetPacket_184_185.java
View file
Expand Up @@ -30,7 +30,7 @@
*
* @author cnaude
*/
public class NetPacket_184 {
public class NetPacket_184_185 {

public static PacketContainer add(String displayName) {
UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
View file
Expand Up @@ -135,13 +135,13 @@ private PacketContainer tabPacket(String name, boolean add) {
} catch (Exception ex) {
plugin.logError("tabPacket: " + ex.getMessage());
}
} else if (version.contains("MC: 1.8.4")) {
} else if (version.contains("MC: 1.8.4") || version.contains("MC: 1.8.5")) {
try {
if (add) {
return NetPacket_184.add(displayName);
return NetPacket_184_185.add(displayName);
} else {
plugin.logDebug("T: Removing: " + name);
return NetPacket_184.rem(displayName);
return NetPacket_184_185.rem(displayName);
}
} catch (Exception ex) {
plugin.logError("tabPacket: " + ex.getMessage());
Expand Down

0 comments on commit 389b17d

Please sign in to comment.