diff --git a/src/main/java/net/knarcraft/dynmapcitizens/trait/BlacksmithHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/trait/BlacksmithHandler.java
index 0bec979..b0055ef 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/trait/BlacksmithHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/trait/BlacksmithHandler.java
@@ -77,8 +77,8 @@ public class BlacksmithHandler extends AbstractTraitHandler {
* @return
A string describing the blacksmith
*/
private String getDetailedBlacksmithInfo(NPC npc, NPCSettings npcSettings) {
- String info = "Blacksmith name: " + npc.getName() + "
Blacksmith title: " +
- npcSettings.getBlacksmithTitle() + "
Fail chance: " + npcSettings.getFailChance() +
+ String info = "" + npc.getName() + " the " +
+ npcSettings.getBlacksmithTitle() + "
Fail chance: " + npcSettings.getFailChance() +
"
Enchantment chance: " + npcSettings.getExtraEnchantmentChance() + "
Delay: " +
npcSettings.getMinReforgeDelay() + " to " + npcSettings.getMaxReforgeDelay() +
" seconds
Cool-down: " + npcSettings.getReforgeCoolDown() + " seconds
Drop item: " +
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/trait/MinstrelHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/trait/MinstrelHandler.java
index ada20cb..f5f834c 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/trait/MinstrelHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/trait/MinstrelHandler.java
@@ -73,10 +73,10 @@ public class MinstrelHandler extends AbstractTraitHandler {
* @return A string describing the minstrel
*/
private String getDetailedMinstrelInfo(NPC npc, MinstrelTrait trait) {
- StringBuilder info = new StringBuilder("Minstrel name: " + npc.getName());
- info.append("
Songs:");
+ StringBuilder info = new StringBuilder("" + npc.getName() + "
");
+ info.append("Songs:");
for (Song song : trait.getPlaylist().getSongs()) {
- info.append("- Category: ").append(song.getCategory()).append(" Sound: ").append(song.getSound()).append("
");
+ info.append("- Category: ").append(song.getCategory()).append("
Sound: ").append(song.getSound()).append(" ");
}
info.append("
");
return info.toString();
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/trait/SentinelHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/trait/SentinelHandler.java
index 4361045..7506784 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/trait/SentinelHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/trait/SentinelHandler.java
@@ -49,7 +49,7 @@ public class SentinelHandler extends AbstractTraitHandler {
for (NPC npc : CitizensAPI.getNPCRegistry()) {
if (npc.hasTrait(sentinelTrait)) {
SentinelTrait trait = CitizensAPI.getTraitFactory().getTrait("sentinel");
- String description = "Name: " + npc.getName() + "
Armor: " +
+ String description = "" + npc.getName() + "
Armor: " +
trait.armor + "
Health: " + trait.health;
addNPCMarker(npc.getUniqueId(), "Sentinel NPC: ", description,
DynmapCitizens.getInstance().getMarkerIcons().get(Icon.SENTINEL), sentinelSet);
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/trait/quests/QuestsHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/trait/quests/QuestsHandler.java
index 5a70e75..eb98d59 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/trait/quests/QuestsHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/trait/quests/QuestsHandler.java
@@ -121,7 +121,7 @@ public class QuestsHandler extends AbstractTraitHandler {
markerDescription.append("").append(registry.getByUniqueId(npcId).getName()).append("
");
if (!questStarts.isEmpty()) {
- markerDescription.append("
Quests offered:
");
+ markerDescription.append("Quests offered:
");
for (IQuest quest : questStarts) {
markerDescription.append("").append(quest.getName()).append("
- ");
markerDescription.append(quest.getDescription()).append("
").append(getQuestStagesInfo(quest));
@@ -173,16 +173,28 @@ public class QuestsHandler extends AbstractTraitHandler {
requirementInfo.append("- ").append(requirements.getExp()).append(" exp
");
}
- for (IQuest blockQuest : requirements.getBlockQuests()) {
- requirementInfo.append("- Blocked by quest: ").append(blockQuest.getName()).append("
");
+ if (!requirements.getBlockQuests().isEmpty()) {
+ requirementInfo.append("- Blocked by quests:
");
+ for (IQuest blockQuest : requirements.getBlockQuests()) {
+ requirementInfo.append("- ").append(blockQuest.getName()).append("
");
+ }
+ requirementInfo.append("
");
}
- for (IQuest neededQuest : requirements.getNeededQuests()) {
- requirementInfo.append("- Requires quest: ").append(neededQuest.getName()).append("
");
+ if (!requirements.getNeededQuests().isEmpty()) {
+ requirementInfo.append("- Required quests:
");
+ for (IQuest neededQuest : requirements.getNeededQuests()) {
+ requirementInfo.append("- ").append(neededQuest.getName()).append("
");
+ }
+ requirementInfo.append("
");
}
- for (ItemStack item : requirements.getItems()) {
- requirementInfo.append("- Requires item: ").append(uppercaseFirst(getItemStackString(item))).append("
");
+ if (!requirements.getItems().isEmpty()) {
+ requirementInfo.append("- Required items:
");
+ for (ItemStack item : requirements.getItems()) {
+ requirementInfo.append("- ").append(uppercaseFirst(getItemStackString(item))).append("
");
+ }
+ requirementInfo.append("
");
}
if (!requirements.getMcmmoSkills().isEmpty()) {
@@ -194,8 +206,12 @@ public class QuestsHandler extends AbstractTraitHandler {
}
}
- for (String permission : requirements.getPermissions()) {
- requirementInfo.append("- Requires permission: ").append(permission).append("
");
+ if (!requirements.getPermissions().isEmpty()) {
+ requirementInfo.append("- Required permissions:
");
+ for (String permission : requirements.getPermissions()) {
+ requirementInfo.append("- ").append(permission).append("
");
+ }
+ requirementInfo.append("
");
}
Map> customRequirementPlugins = requirements.getCustomRequirements();