From 032327c0f769d4addffd6e7539ff5a1a0de99b10 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 1 Nov 2022 15:27:16 +0100
Subject: [PATCH] Improves display of NPC names

---
 .../trait/BlacksmithHandler.java              |  4 +--
 .../dynmapcitizens/trait/MinstrelHandler.java |  6 ++--
 .../dynmapcitizens/trait/SentinelHandler.java |  2 +-
 .../trait/quests/QuestsHandler.java           | 34 ++++++++++++++-----
 4 files changed, 31 insertions(+), 15 deletions(-)

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 <p>A string describing the blacksmith</p>
      */
     private String getDetailedBlacksmithInfo(NPC npc, NPCSettings npcSettings) {
-        String info = "<b>Blacksmith name:</b> " + npc.getName() + "<br><b>Blacksmith title:</b> " +
-                npcSettings.getBlacksmithTitle() + "<br><b>Fail chance:</b> " + npcSettings.getFailChance() +
+        String info = "<h2>" + npc.getName() + " the " +
+                npcSettings.getBlacksmithTitle() + "</h2><b>Fail chance:</b> " + npcSettings.getFailChance() +
                 "<br><b>Enchantment chance:</b> " + npcSettings.getExtraEnchantmentChance() + "<br><b>Delay:</b> " +
                 npcSettings.getMinReforgeDelay() + " to " + npcSettings.getMaxReforgeDelay() +
                 " seconds<br><b>Cool-down:</b> " + npcSettings.getReforgeCoolDown() + " seconds<br><b>Drop item:</b> " +
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 <p>A string describing the minstrel</p>
      */
     private String getDetailedMinstrelInfo(NPC npc, MinstrelTrait trait) {
-        StringBuilder info = new StringBuilder("<b>Minstrel name:</b> " + npc.getName());
-        info.append("<br><b>Songs:</b><ul>");
+        StringBuilder info = new StringBuilder("<h2>" + npc.getName() + "</h2>");
+        info.append("<b>Songs:</b><ul>");
         for (Song song : trait.getPlaylist().getSongs()) {
-            info.append("<li>Category: ").append(song.getCategory()).append(" Sound: ").append(song.getSound()).append("</li>");
+            info.append("<li>Category: ").append(song.getCategory()).append("<br>Sound: ").append(song.getSound()).append("</li>");
         }
         info.append("</ul>");
         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 = "<b>Name:</b> " + npc.getName() + "<br><b>Armor:</b> " +
+                String description = "<h2>" + npc.getName() + "</h2><b>Armor:</b> " +
                         trait.armor + "<br><b>Health:</b> " + 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("<h2>").append(registry.getByUniqueId(npcId).getName()).append("</h2>");
 
             if (!questStarts.isEmpty()) {
-                markerDescription.append("<br><h3>Quests offered:</h3><ul>");
+                markerDescription.append("<h3>Quests offered:</h3><ul>");
                 for (IQuest quest : questStarts) {
                     markerDescription.append("<li><h4><b>").append(quest.getName()).append("</b></h4><h5><b>- ");
                     markerDescription.append(quest.getDescription()).append("</b></h5>").append(getQuestStagesInfo(quest));
@@ -173,16 +173,28 @@ public class QuestsHandler extends AbstractTraitHandler {
             requirementInfo.append("<li>").append(requirements.getExp()).append(" exp</li>");
         }
 
-        for (IQuest blockQuest : requirements.getBlockQuests()) {
-            requirementInfo.append("<li>Blocked by quest: ").append(blockQuest.getName()).append("</li>");
+        if (!requirements.getBlockQuests().isEmpty()) {
+            requirementInfo.append("<li>Blocked by quests:<ul>");
+            for (IQuest blockQuest : requirements.getBlockQuests()) {
+                requirementInfo.append("<li>").append(blockQuest.getName()).append("</li>");
+            }
+            requirementInfo.append("</ul></li>");
         }
 
-        for (IQuest neededQuest : requirements.getNeededQuests()) {
-            requirementInfo.append("<li>Requires quest: ").append(neededQuest.getName()).append("</li>");
+        if (!requirements.getNeededQuests().isEmpty()) {
+            requirementInfo.append("<li>Required quests:<ul>");
+            for (IQuest neededQuest : requirements.getNeededQuests()) {
+                requirementInfo.append("<li>").append(neededQuest.getName()).append("</li>");
+            }
+            requirementInfo.append("</ul></li>");
         }
 
-        for (ItemStack item : requirements.getItems()) {
-            requirementInfo.append("<li>Requires item: ").append(uppercaseFirst(getItemStackString(item))).append("</li>");
+        if (!requirements.getItems().isEmpty()) {
+            requirementInfo.append("<li>Required items:<ul>");
+            for (ItemStack item : requirements.getItems()) {
+                requirementInfo.append("<li>").append(uppercaseFirst(getItemStackString(item))).append("</li>");
+            }
+            requirementInfo.append("</ul></li>");
         }
 
         if (!requirements.getMcmmoSkills().isEmpty()) {
@@ -194,8 +206,12 @@ public class QuestsHandler extends AbstractTraitHandler {
             }
         }
 
-        for (String permission : requirements.getPermissions()) {
-            requirementInfo.append("<li>Requires permission: ").append(permission).append("</li>");
+        if (!requirements.getPermissions().isEmpty()) {
+            requirementInfo.append("<li>Required permissions:<ul>");
+            for (String permission : requirements.getPermissions()) {
+                requirementInfo.append("<li>").append(permission).append("</li>");
+            }
+            requirementInfo.append("</ul></li>");
         }
 
         Map<String, Map<String, Object>> customRequirementPlugins = requirements.getCustomRequirements();