KnarCraft/DynmapCitizens
KnarCraft/DynmapCitizens
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Improves blacksmith description, and adds some missing comments

Browse Source
This commit is contained in:
Kristian Knarvik 2022-10-19 12:58:12 +02:00
parent 5fa6408f90
commit 909863a2f7
6 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/net/knarcraft/dynmapcitizens/Icon.java
View File

@ -5,11 +5,34 @@ package net.knarcraft.dynmapcitizens;
*/
public enum Icon {
/**
* An icon representing a quest giver
*/
QUEST_GIVER,
/**
* An icon representing an interactable NPC part of some quest
*/
QUEST_INTERACT,
/**
* An icon representing an NPC to be killed as part of a quest
*/
QUEST_KILL,
/**
* An icon representing an NPC taking deliveries as part of a quest
*/
QUEST_DELIVER,
/**
* An icon representing a sentinel NPC
*/
SENTINEL,
/**
* An icon representing a blacksmith NPC
*/
BLACKSMITH
}

3
src/main/java/net/knarcraft/dynmapcitizens/trait/AbstractTraitHandler.java
View File

@ -13,6 +13,9 @@ import org.dynmap.markers.MarkerSet;
import java.util.UUID;
import java.util.logging.Level;
/**
* An abstract class with useful code for all citizens-trait-handlers
*/
public abstract class AbstractTraitHandler implements CitizensTraitHandler {
protected boolean isEnabled = false;

26
src/main/java/net/knarcraft/dynmapcitizens/trait/BlacksmithHandler.java
View File

@ -53,12 +53,8 @@ public class BlacksmithHandler extends AbstractTraitHandler {
if (trait == null) {
DynmapCitizens.getInstance().getLogger().log(Level.WARNING, "Unable to get blacksmith trait");
} else {
NPCSettings npcSettings = trait.getSettings();
//TODO: Make a setting which allows disabling extra information (except title and reforge-able items?)
description = "<b>Blacksmith name:</b> " + npc.getName() + "<br><b>Blacksmith title:</b> " +
npcSettings.getBlacksmithTitle() + "<br><b>Fail chance:</b> " + npcSettings.getFailChance() +
"<br><b>Enchantment chance:</b> " + npcSettings.getExtraEnchantmentChance() +
"<br><b>Reforge-able items:</b> " + getReforgeAbleItemsString(npcSettings.getReforgeAbleItems());
description = getDetailedBlacksmithInfo(npc, trait.getSettings());
}
addNPCMarker(npc.getUniqueId(), "Blacksmith NPC: ", description,
DynmapCitizens.getInstance().getMarkerIcons().get(Icon.BLACKSMITH), blacksmithSet);
@ -66,6 +62,26 @@ public class BlacksmithHandler extends AbstractTraitHandler {
}
}
/**
* Gets detailed information about a blacksmith NPC
*
* @param npc <p>The NPC the settings belong to</p>
* @param npcSettings <p>The settings to search for information</p>
* @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() +
"<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> " +
npcSettings.getDropItem();
if (!npcSettings.getReforgeAbleItems().isEmpty()) {
info += "<br><b>Reforge-able items:</b> " + getReforgeAbleItemsString(npcSettings.getReforgeAbleItems());
}
return info;
}
/**
* Gets reforge-able items as a string
*

3
src/main/java/net/knarcraft/dynmapcitizens/trait/CitizensTraitHandler.java
View File

@ -1,5 +1,8 @@
package net.knarcraft.dynmapcitizens.trait;
/**
* A handler which takes care of everything for one citizen trait
*/
public interface CitizensTraitHandler {
/**

6
src/main/java/net/knarcraft/dynmapcitizens/trait/QuestsHandler.java
View File

@ -19,6 +19,9 @@ import java.util.Map;
import java.util.UUID;
import java.util.logging.Level;
/**
* A handler class for the quests trait
*/
public class QuestsHandler extends AbstractTraitHandler {
private QuestsAPI questsAPI;
@ -38,9 +41,10 @@ public class QuestsHandler extends AbstractTraitHandler {
questMarkerSet.setHideByDefault(false);
questAreaMarkerSet.setHideByDefault(true);
isEnabled = true;
//TODO: Initialize the dynmap drawer with the marker sets
return;
}
}
isEnabled = false;
}
@Override

3
src/main/java/net/knarcraft/dynmapcitizens/trait/SentinelHandler.java
View File

@ -1,5 +1,8 @@
package net.knarcraft.dynmapcitizens.trait;
/**
* A handler class for the sentinel trait
*/
public class SentinelHandler extends AbstractTraitHandler {
@Override