Better MOTD formatting.

Update to pircbotx 2.0.2 (custom version includes motd fix).
cnaude · Feb 8, 2015 · e14d74c · e14d74c
1 parent 7f6be3c
commit e14d74c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -319,12 +319,6 @@
       <version>0.4.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.cnaude.purpleirc</groupId>
-      <artifactId>PurpleIRC-API</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
   <distributionManagement>
     <repository>

diff --git a/pom.xml b/pom.xml
@@ -229,11 +229,10 @@
 
         <!-- PircBotX -->
         <dependency>
-            <groupId>org.pircbotx</groupId>
+            <groupId>com.cnaude.pircbotx</groupId>
             <artifactId>pircbotx</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
-
 
         <!-- CleverNotch -->
         <dependency>
@@ -352,6 +351,7 @@
                             <minimizeJar>true</minimizeJar>
                             <artifactSet>
                                 <includes>
+                                    <include>com.cnaude.pircbotx</include>
                                     <include>org.pircbotx</include>
                                     <include>org.slf4j</include>                                    
                                     <include>org.apache.commons</include>
@@ -360,6 +360,10 @@
                             <filters>
                             </filters>
                             <relocations>
+                                <relocation>
+                                    <pattern>com.cnaude.pircbotx</pattern>
+                                    <shadedPattern>com.cnaude.pircbotx</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>org.pircbotx</pattern>
                                     <shadedPattern>org.pircbotx</shadedPattern>

diff --git a/src/main/java/com/cnaude/purpleirc/IRCListeners/MotdListener.java b/src/main/java/com/cnaude/purpleirc/IRCListeners/MotdListener.java
@@ -47,7 +47,11 @@ public MotdListener(PurpleIRC plugin, PurpleBot ircBot) {
     @Override
     public void onMotd(MotdEvent event) {
         if (ircBot.showMOTD) {
-            plugin.logInfo(event.getMotd());
+            plugin.logInfo("- " + ircBot.botServer + " - Message of the Day -");
+            for (String s : event.getMotd().split("\n")) {
+                plugin.logInfo("- " + s);
+            }
+            plugin.logInfo("- End of MOTD command.");
         }
     }
 }