Merge bc6a6c5f44 into c58e591e43

core/pom.xml

@@ -24,6 +24,11 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <!-- NBT API -->
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
         <repository>
             <!-- Citizens, Denizen -->
             <id>citizens-repo</id>
@@ -163,6 +168,11 @@
             <artifactId>LocaleLib</artifactId>
             <version>3.7</version>
         </dependency>
+        <dependency>
+            <groupId>de.tr7zw</groupId>
+            <artifactId>item-nbt-api-plugin</artifactId>
+            <version>2.12.3</version>
+        </dependency>
         <dependency>
             <groupId>xyz.upperlevel.spigot.book</groupId>
             <artifactId>spigot-book-api</artifactId>
@@ -207,10 +217,11 @@
             </resource>
             <resource>
                 <targetPath>.</targetPath>
-                <directory>${basedir}/</directory>
+                <directory>${basedir}</directory>
                 <filtering>false</filtering>
                 <includes>
                     <include>README.md</include>
+                    <include>LICENSE.txt</include>
                 </includes>
             </resource>
         </resources>
@@ -254,6 +265,7 @@
                         <includes>
                             <include>me.*</include>
                             <include>com.github.PikaMug:LocaleLib</include>
+                            <include>de.tr7zw:item-nbt-api-plugin</include>
                             <include>org.slf4j:slf4j-simple</include>
                             <include>org.slf4j:slf4j-api</include>
                             <include>xyz.upperlevel.spigot.book:spigot-book-api</include>
@@ -264,6 +276,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.MF</exclude>
+                                <exclude>LICENSE</exclude>
                             </excludes>
                         </filter>
                         <filter>
@@ -278,6 +291,10 @@
                             <pattern>me.pikamug.localelib</pattern>
                             <shadedPattern>me.pikamug.quests.libs.localelib</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>de.tr7zw</pattern>
+                            <shadedPattern>me.pikamug.quests.libs.nbtapi</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>org.slf4j</pattern>
                             <shadedPattern>me.pikamug.quests.libs.slf4j</shadedPattern>

core/src/main/java/me/pikamug/quests/item/BukkitQuestJournal.java

@@ -101,7 +101,9 @@ public class BukkitQuestJournal {
                                 builder.add(ChatColor.AQUA + BukkitItemUtil.getPrettyItemName(goal.getType().name()));
                             }
                         }
-                        builder.add(split[1]).newLine();
+                        if (split.length > 1) {
+                            builder.add(split[1]).newLine();
+                        }
                     }
                     if (message.contains("<mob>") && objective.getGoalAsMob() != null) {
                         split = message.split("<mob>");
@@ -114,7 +116,9 @@ public class BukkitQuestJournal {
                         } else {
                             builder.add(BukkitMiscUtil.snakeCaseToUpperCamelCase(objective.getGoalAsMob().getEntityType().name()));
                         }
-                        builder.add(split[1]).newLine();
+                        if (split.length > 1) {
+                            builder.add(split[1]).newLine();
+                        }
                     }
                     if (split == null) {
                         builder.add(message).newLine();