diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/BlacksmithHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/BlacksmithHandler.java
index c4a3d06..601d559 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/BlacksmithHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/BlacksmithHandler.java
@@ -71,13 +71,16 @@ public class BlacksmithHandler extends AbstractTraitHandler {
*/
private String getDetailedBlacksmithInfo(NPC npc, NPCSettings npcSettings) {
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: " +
- npcSettings.getDropItem() + "
Max enchantments: " + npcSettings.getMaxEnchantments();
- if (!npcSettings.getReforgeAbleItems().isEmpty()) {
- info += "
Reforge-able items: " + getReforgeAbleItemsString(npcSettings.getReforgeAbleItems());
+ npcSettings.getBlacksmithTitle() + "";
+ if (settings.displayBlacksmithSettings()) {
+ info += "Fail chance: " + npcSettings.getFailChance() +
+ "
Enchantment chance: " + npcSettings.getExtraEnchantmentChance() + "
Delay: " +
+ npcSettings.getMinReforgeDelay() + " to " + npcSettings.getMaxReforgeDelay() +
+ " seconds
Cool-down: " + npcSettings.getReforgeCoolDown() + " seconds
Drop item: " +
+ npcSettings.getDropItem() + "
Max enchantments: " + npcSettings.getMaxEnchantments();
+ if (!npcSettings.getReforgeAbleItems().isEmpty()) {
+ info += "
Reforge-able items: " + getReforgeAbleItemsString(npcSettings.getReforgeAbleItems());
+ }
}
return info;
}
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/SentinelHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/SentinelHandler.java
index 24fb7e9..28a7993 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/SentinelHandler.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/SentinelHandler.java
@@ -46,12 +46,14 @@ public class SentinelHandler extends AbstractTraitHandler {
if (trait.squad != null) {
description += "
Squad: " + trait.squad;
}
- description += "
Invincible: " + trait.invincible + "
Armor: " +
- trait.armor + "
Health: " + trait.health + "
Accuracy: " + trait.accuracy +
- "
Damage: " + trait.damage + "
Allow knockback: " + trait.allowKnockback;
- description += "
Range: " + trait.range + "
Reach: " + trait.reach;
- description += "
Targets: " + trait.allTargets.toAllInOneString() + "
Avoids: " +
- trait.allAvoids.toAllInOneString() + "
Ignores: " + trait.allIgnores.toAllInOneString();
+ if (settings.displaySentinelStats()) {
+ description += "
Invincible: " + trait.invincible + "
Armor: " +
+ trait.armor + "
Health: " + trait.health + "
Accuracy: " + trait.accuracy +
+ "
Damage: " + trait.damage + "
Allow knockback: " + trait.allowKnockback;
+ description += "
Range: " + trait.range + "
Reach: " + trait.reach;
+ description += "
Targets: " + trait.allTargets.toAllInOneString() + "
Avoids: " +
+ trait.allAvoids.toAllInOneString() + "
Ignores: " + trait.allIgnores.toAllInOneString();
+ }
addNPCMarker(npc.getUniqueId(), "Sentinel NPC: ", description,
DynmapCitizens.getInstance().getGlobalSettings().getMarkerIcons().get(Icon.SENTINEL), super.markerSet);
}
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/settings/BlacksmithSettings.java b/src/main/java/net/knarcraft/dynmapcitizens/settings/BlacksmithSettings.java
index 4faade9..533c21d 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/settings/BlacksmithSettings.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/settings/BlacksmithSettings.java
@@ -7,9 +7,12 @@ import org.bukkit.configuration.file.FileConfiguration;
*/
public class BlacksmithSettings extends AbstractTraitSettings {
+ private boolean displayBlacksmithSettings;
+
@Override
public void load(FileConfiguration configuration) {
super.load(configuration);
+ displayBlacksmithSettings = configuration.getBoolean(getTraitConfigRoot() + ".displayBlacksmithSettings", true);
}
@Override
@@ -17,4 +20,13 @@ public class BlacksmithSettings extends AbstractTraitSettings {
return "traits.blacksmith";
}
+ /**
+ * Gets whether to display information about a blacksmith's settings, such as cool-down, in the marker description
+ *
+ * @return True if blacksmith settings should be displayed
+ */
+ public boolean displayBlacksmithSettings() {
+ return displayBlacksmithSettings;
+ }
+
}
diff --git a/src/main/java/net/knarcraft/dynmapcitizens/settings/SentinelSettings.java b/src/main/java/net/knarcraft/dynmapcitizens/settings/SentinelSettings.java
index c3a2849..9b4c665 100644
--- a/src/main/java/net/knarcraft/dynmapcitizens/settings/SentinelSettings.java
+++ b/src/main/java/net/knarcraft/dynmapcitizens/settings/SentinelSettings.java
@@ -7,9 +7,12 @@ import org.bukkit.configuration.file.FileConfiguration;
*/
public class SentinelSettings extends AbstractTraitSettings {
+ private boolean displaySentinelStats;
+
@Override
public void load(FileConfiguration configuration) {
super.load(configuration);
+ displaySentinelStats = configuration.getBoolean(getTraitConfigRoot() + ".displaySentinelStats", true);
}
@Override
@@ -17,4 +20,13 @@ public class SentinelSettings extends AbstractTraitSettings {
return "traits.sentinel";
}
+ /**
+ * Gets whether to display information about a sentinel such as health, attack and targets in marker descriptions
+ *
+ * @return True if sentinel stats should be displayed
+ */
+ public boolean displaySentinelStats() {
+ return displaySentinelStats;
+ }
+
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 6ea95aa..b269c49 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -112,7 +112,7 @@ traits:
# Whether to hide the sentinel icon layer by default
markersHiddenByDefault: false
# Whether to display information about a sentinel's health, armor and damage in the marker description
- displaySentinelStrength: true
+ displaySentinelStats: true
# Settings for the minstrel trait
minstrel:
enabled: true