The quest to add
*/ - public void addQuestStart(IQuest quest) { + public void addQuestStart(Quest quest) { this.questStart.add(quest); } @@ -30,7 +30,7 @@ public class NPCQuestInfo { * * @param questThe quest to add
*/ - public void addQuestKill(IQuest quest) { + public void addQuestKill(Quest quest) { this.questKill.add(quest); } @@ -39,7 +39,7 @@ public class NPCQuestInfo { * * @param questThe quest to add
*/ - public void addQuestDeliver(IQuest quest) { + public void addQuestDeliver(Quest quest) { this.questDeliver.add(quest); } @@ -48,7 +48,7 @@ public class NPCQuestInfo { * * @param questThe quest to add
*/ - public void addQuestInteract(IQuest quest) { + public void addQuestInteract(Quest quest) { this.questInteract.add(quest); } @@ -57,7 +57,7 @@ public class NPCQuestInfo { * * @returnAll quests this NPC is used to start
*/ - public ListAll kill quests involving this NPC
*/ - public ListAll quests delivering to this NPC
*/ - public ListAll quests requiring interaction with this NPC
*/ - public ListThe quests settings to use
* @param unavailableQuestsThe list of currently unavailable quests to possibly skip
*/ - public QuestAreaHandler(QuestsAPI questsAPI, DynmapAPI dynmapAPI, QuestsSettings settings, - ListThe quest the stage belongs to
* @param stageThe stage to search for reach locations
*/ - private void markReachLocations(IQuest quest, IStage stage) { + private void markReachLocations(Quest quest, Stage stage) { if (settings.getReachAreaSettings().isDisabled()) { return; } for (int i = 0; i < stage.getLocationsToReach().size(); i++) { - Location location = stage.getLocationsToReach().get(i); + Location location = (Location) stage.getLocationsToReach().get(i); int radius = stage.getRadiiToReachWithin().get(i); String areaName = stage.getLocationNames().get(i); @@ -106,14 +106,14 @@ public class QuestAreaHandler { * @param questThe quest the stage belongs to
* @param stageThe stage to search for kill locations
*/ - private void markKillLocations(IQuest quest, IStage stage) { + private void markKillLocations(Quest quest, Stage stage) { if (settings.getKillAreaSettings().isDisabled()) { return; } for (int i = 0; i < stage.getLocationsToKillWithin().size(); i++) { - Location location = stage.getLocationsToKillWithin().get(i); + Location location = (Location) stage.getLocationsToKillWithin().get(i); int radius = stage.getRadiiToKillWithin().get(i); - EntityType mob = stage.getMobsToKill().get(i); + EntityType mob = (EntityType) stage.getMobsToKill().get(i); int mobAmount = stage.getMobNumToKill().get(i); String areaName = stage.getKillNames().get(i); diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java index d3bce69..7e9cc81 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java @@ -1,7 +1,7 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; -import me.blackvein.quests.quests.IQuest; -import me.blackvein.quests.quests.Planner; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Planner; import net.knarcraft.dynmapcitizens.DynmapCitizens; import net.knarcraft.knarlib.formatting.TimeFormatter; @@ -14,14 +14,14 @@ import java.util.Date; */ public class QuestPlannerInfoGenerator { - private final IQuest quest; + private final Quest quest; /** * Instantiates a new quest planner info generator * * @param questThe quest to generate information about
*/ - public QuestPlannerInfoGenerator(IQuest quest) { + public QuestPlannerInfoGenerator(Quest quest) { this.quest = quest; } diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRequirementsInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRequirementsInfoGenerator.java index 03f2dc0..51aea24 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRequirementsInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRequirementsInfoGenerator.java @@ -1,8 +1,8 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; -import me.blackvein.quests.QuestsAPI; -import me.blackvein.quests.quests.IQuest; -import me.blackvein.quests.quests.Requirements; +import me.pikamug.quests.Quests; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Requirements; import net.knarcraft.dynmapcitizens.DynmapCitizens; import net.knarcraft.dynmapcitizens.util.QuestsHelper; import net.knarcraft.knarlib.formatting.StringFormatter; @@ -32,8 +32,8 @@ import static net.knarcraft.dynmapcitizens.formatting.QuestsTranslatableMessage. */ public class QuestRequirementsInfoGenerator { - private final QuestsAPI questsAPI; - private final IQuest quest; + private final Quests questsAPI; + private final Quest quest; private final StringFormatter formatter; /** @@ -42,7 +42,7 @@ public class QuestRequirementsInfoGenerator { * @param questsAPIThe API to use for getting quest information
* @param questThe quest to generate information about
*/ - public QuestRequirementsInfoGenerator(QuestsAPI questsAPI, IQuest quest) { + public QuestRequirementsInfoGenerator(Quests questsAPI, Quest quest) { this.questsAPI = questsAPI; this.quest = quest; formatter = DynmapCitizens.getFormatter(); @@ -131,10 +131,10 @@ public class QuestRequirementsInfoGenerator { * @param itemsThe items to get the names of
* @returnThe names of the given items
*/ - private ListThe id of the quest to get
* @returnThe quest, or null if not found
*/ - private IQuest getQuest(String questId) { - for (IQuest quest : questsAPI.getLoadedQuests()) { + private Quest getQuest(String questId) { + for (Quest quest : questsAPI.getLoadedQuests()) { if (quest.getId().equals(questId)) { return quest; } diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRewardsInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRewardsInfoGenerator.java index be055e7..9e0775d 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRewardsInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRewardsInfoGenerator.java @@ -1,7 +1,7 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; -import me.blackvein.quests.quests.IQuest; -import me.blackvein.quests.quests.Rewards; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Rewards; import net.knarcraft.dynmapcitizens.util.QuestsHelper; import org.bukkit.inventory.ItemStack; @@ -10,14 +10,14 @@ import org.bukkit.inventory.ItemStack; */ public class QuestRewardsInfoGenerator { - private final IQuest quest; + private final Quest quest; /** * Instantiates a new quest reward info generator * * @param questThe quest to generate information about
*/ - public QuestRewardsInfoGenerator(IQuest quest) { + public QuestRewardsInfoGenerator(Quest quest) { this.quest = quest; } @@ -47,8 +47,8 @@ public class QuestRewardsInfoGenerator { rewardInfo.append("The quest to generate information about
*/ - public QuestStagesInfoGenerator(IQuest quest) { + public QuestStagesInfoGenerator(Quest quest) { this.quest = quest; } @@ -43,7 +44,7 @@ public class QuestStagesInfoGenerator { questInfo.append(getStageInfo(quest.getStage(0), registry)); } else { questInfo.append("Stages:The registry to get NPC info from
* @returnInformation about the stage's tasks
*/ - private String getStageInfo(IStage stage, NPCRegistry registry) { + private String getStageInfo(Stage stage, NPCRegistry registry) { StringBuilder questInfo = new StringBuilder(); int mobTypes = stage.getMobsToKill().size(); for (int i = 0; i < mobTypes; i++) { - questInfo.append("The explanation of what the player needs to do with the items
* @returnA string describing the necessary tasks
*/ - private String getQuestItemsTaskString(ListThe string builder to append to
* @param offeredQuestsThe list of quests the NPC offers
*/ - private void appendOfferedQuestsInfo(StringBuilder stringBuilder, ListInformation about an NPC's involvement in different quests
*/ private String getInvolvedInQuestsString(NPCQuestInfo info) { - ListThe quests the NPC is involved in
* @param builderThe string builder to append to
*/ - private void addInvolvedInString(String prefix, ListThe quest to check for availability
* @returnTrue if the quest is unavailable
*/ - public static boolean isQuestUnavailable(IQuest quest) { + public static boolean isQuestUnavailable(Quest quest) { Planner planner = quest.getPlanner(); long currentTime = System.currentTimeMillis();