From d288b5c575dc2838d6097ea758fc69f609254223 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 26 Oct 2023 08:42:53 +0200 Subject: [PATCH] Updates Quests-related code for the Quests 5 pre-release --- pom.xml | 28 +++++++--------- .../handler/trait/quests/NPCQuestInfo.java | 26 +++++++-------- .../trait/quests/QuestAreaHandler.java | 28 ++++++++-------- .../quests/QuestPlannerInfoGenerator.java | 8 ++--- .../QuestRequirementsInfoGenerator.java | 24 +++++++------- .../quests/QuestRewardsInfoGenerator.java | 12 +++---- .../quests/QuestStagesInfoGenerator.java | 29 +++++++++-------- .../handler/trait/quests/QuestsHandler.java | 32 +++++++++---------- .../dynmapcitizens/util/QuestsHelper.java | 6 ++-- 9 files changed, 94 insertions(+), 99 deletions(-) diff --git a/pom.xml b/pom.xml index e3393cf..1ace142 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,6 @@ - - knarcraft-repo - https://git.knarcraft.net/api/packages/EpicKnarvik97/maven - codemc-repo https://repo.codemc.io/repository/maven-public/ @@ -96,6 +92,10 @@ jitpack.io https://jitpack.io + + knarcraft-repo + https://git.knarcraft.net/api/packages/EpicKnarvik97/maven + @@ -109,10 +109,16 @@ + + me.pikamug.quests + quests-api + 5.0.0-rc.1 + provided + org.spigotmc spigot-api - 1.19.4-R0.1-SNAPSHOT + 1.20.2-R0.1-SNAPSHOT provided @@ -128,18 +134,6 @@ - - me.blackvein.quests - quests-api - 4.8.1 - provided - - - me.blackvein.quests - quests-core - 4.8.1 - provided - us.dynmap dynmap-api diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/NPCQuestInfo.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/NPCQuestInfo.java index 7082751..e065cb0 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/NPCQuestInfo.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/NPCQuestInfo.java @@ -1,6 +1,6 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; -import me.blackvein.quests.quests.IQuest; +import me.pikamug.quests.quests.Quest; import net.knarcraft.dynmapcitizens.property.Icon; import java.util.ArrayList; @@ -11,17 +11,17 @@ import java.util.List; */ public class NPCQuestInfo { - private final List questStart = new ArrayList<>(); - private final List questKill = new ArrayList<>(); - private final List questDeliver = new ArrayList<>(); - private final List questInteract = new ArrayList<>(); + private final List questStart = new ArrayList<>(); + private final List questKill = new ArrayList<>(); + private final List questDeliver = new ArrayList<>(); + private final List questInteract = new ArrayList<>(); /** * Adds the given quest to the list of quests this NPC provides * * @param quest

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 quest

The 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 quest

The 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 quest

The quest to add

*/ - public void addQuestInteract(IQuest quest) { + public void addQuestInteract(Quest quest) { this.questInteract.add(quest); } @@ -57,7 +57,7 @@ public class NPCQuestInfo { * * @return

All quests this NPC is used to start

*/ - public List getQuestStarts() { + public List getQuestStarts() { return new ArrayList<>(this.questStart); } @@ -66,7 +66,7 @@ public class NPCQuestInfo { * * @return

All kill quests involving this NPC

*/ - public List getQuestKills() { + public List getQuestKills() { return new ArrayList<>(this.questKill); } @@ -75,7 +75,7 @@ public class NPCQuestInfo { * * @return

All quests delivering to this NPC

*/ - public List getQuestDeliveries() { + public List getQuestDeliveries() { return new ArrayList<>(this.questDeliver); } @@ -84,7 +84,7 @@ public class NPCQuestInfo { * * @return

All quests requiring interaction with this NPC

*/ - public List getQuestInteractions() { + public List getQuestInteractions() { return new ArrayList<>(this.questInteract); } diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestAreaHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestAreaHandler.java index adf80b8..3947cfa 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestAreaHandler.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestAreaHandler.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.IStage; +import me.pikamug.quests.Quests; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Stage; import net.knarcraft.dynmapcitizens.DynmapCitizens; import net.knarcraft.dynmapcitizens.settings.QuestsSettings; import net.knarcraft.dynmapcitizens.util.DynmapHelper; @@ -28,11 +28,11 @@ import static net.knarcraft.dynmapcitizens.formatting.QuestsTranslatableMessage. */ public class QuestAreaHandler { - private final QuestsAPI questsAPI; + private final Quests questsAPI; private final MarkerSet killAreaMarkerSet; private final MarkerSet reachAreaMarkerSet; private final QuestsSettings settings; - private final List unavailableQuests; + private final List unavailableQuests; private final StringFormatter formatter; /** @@ -43,8 +43,8 @@ public class QuestAreaHandler { * @param settings

The quests settings to use

* @param unavailableQuests

The list of currently unavailable quests to possibly skip

*/ - public QuestAreaHandler(QuestsAPI questsAPI, DynmapAPI dynmapAPI, QuestsSettings settings, - List unavailableQuests) { + public QuestAreaHandler(Quests questsAPI, DynmapAPI dynmapAPI, QuestsSettings settings, + List unavailableQuests) { this.questsAPI = questsAPI; this.settings = settings; this.unavailableQuests = unavailableQuests; @@ -59,12 +59,12 @@ public class QuestAreaHandler { public void updateQuestAreas() { this.killAreaMarkerSet.getCircleMarkers().forEach(GenericMarker::deleteMarker); this.reachAreaMarkerSet.getCircleMarkers().forEach(GenericMarker::deleteMarker); - for (IQuest quest : questsAPI.getLoadedQuests()) { + for (Quest quest : questsAPI.getLoadedQuests()) { //Skip marker if quest is unavailable, and unavailable quests are hidden if (settings.hideUnavailableQuests() && this.unavailableQuests.contains(quest)) { continue; } - for (IStage stage : quest.getStages()) { + for (Stage stage : quest.getStages()) { markKillLocations(quest, stage); markReachLocations(quest, stage); } @@ -78,12 +78,12 @@ public class QuestAreaHandler { * @param quest

The quest the stage belongs to

* @param stage

The 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 quest

The quest the stage belongs to

* @param stage

The 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 quest

The 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 questsAPI

The API to use for getting quest information

* @param quest

The 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 items

The items to get the names of

* @return

The names of the given items

*/ - private List getItemNames(List items) { + private List getItemNames(List items) { List itemNames = new ArrayList<>(); - for (ItemStack itemStack : items) { - itemNames.add(QuestsHelper.getUpperCasedItemStackString(itemStack)); + for (Object itemStack : items) { + itemNames.add(QuestsHelper.getUpperCasedItemStackString((ItemStack) itemStack)); } return itemNames; } @@ -148,7 +148,7 @@ public class QuestRequirementsInfoGenerator { private List getQuestNames(List questIds) { List questNames = new ArrayList<>(questIds.size()); for (String questId : questIds) { - IQuest quest = getQuest(questId); + Quest quest = getQuest(questId); if (quest != null) { questNames.add(quest.getName()); } @@ -162,8 +162,8 @@ public class QuestRequirementsInfoGenerator { * @param questId

The id of the quest to get

* @return

The 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 quest

The 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("
  • ").append("Permission: ").append(permission).append("
    • "); } - for (ItemStack item : reward.getItems()) { - rewardInfo.append("
  • ").append(QuestsHelper.getUpperCasedItemStackString(item)).append("
    • "); + for (Object item : reward.getItems()) { + rewardInfo.append("
  • ").append(QuestsHelper.getUpperCasedItemStackString((ItemStack) item)).append("
    • "); } for (String command : reward.getCommands()) { diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java index f91575d..c31d9f1 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java @@ -1,11 +1,12 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; -import me.blackvein.quests.quests.IQuest; -import me.blackvein.quests.quests.IStage; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Stage; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPCRegistry; import net.knarcraft.dynmapcitizens.util.QuestsHelper; +import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; @@ -17,14 +18,14 @@ import java.util.UUID; */ public class QuestStagesInfoGenerator { - private final IQuest quest; + private final Quest quest; /** * Instantiates a new quest stages info generator * * @param quest

    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:
      "); - for (IStage stage : quest.getStages()) { + for (Stage stage : quest.getStages()) { questInfo.append("
    • Stage ").append(stageCounter).append(" tasks:
        "); questInfo.append(getStageInfo(stage, registry)); @@ -64,11 +65,11 @@ public class QuestStagesInfoGenerator { * @param registry

        The registry to get NPC info from

        * @return

        Information 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("
      • Kill ").append(QuestsHelper.normalizeName(stage.getMobsToKill().get(i).name())); + questInfo.append("
      • Kill ").append(QuestsHelper.normalizeName(((DyeColor) stage.getMobsToKill().get(i)).name())); questInfo.append(" x ").append(stage.getMobNumToKill().get(i)); if (stage.getKillNames().size() > i) { questInfo.append(" at ").append(stage.getKillNames().get(i)); @@ -79,13 +80,13 @@ public class QuestStagesInfoGenerator { for (int i = 0; i < reachLocations; i++) { questInfo.append("
      • Reach ").append(stage.getLocationNames().get(i)).append(", within "); questInfo.append(stage.getRadiiToReachWithin().get(i)).append(" blocks of "); - questInfo.append(getLocationString(stage.getLocationsToReach().get(i))).append("
        • "); + questInfo.append(getLocationString((Location) stage.getLocationsToReach().get(i))).append(""); } int deliveries = stage.getItemDeliveryTargets().size(); for (int i = 0; i < deliveries; i++) { NPC npc = registry.getByUniqueId(stage.getItemDeliveryTargets().get(i)); - questInfo.append("
      • Deliver ").append(QuestsHelper.getItemStackString(stage.getItemsToDeliver().get(i))).append( + questInfo.append("
      • Deliver ").append(QuestsHelper.getItemStackString((ItemStack) stage.getItemsToDeliver().get(i))).append( " to ").append(npc.getName()).append("
        • "); } if (stage.getFishToCatch() != null) { @@ -113,7 +114,7 @@ public class QuestStagesInfoGenerator { int sheepTypes = stage.getSheepToShear().size(); for (int i = 0; i < sheepTypes; i++) { questInfo.append("
      • Shear ").append(stage.getSheepNumToShear().get(i)).append(" ").append( - QuestsHelper.normalizeName(stage.getSheepToShear().get(i).name())).append(" sheep").append("
        • "); + QuestsHelper.normalizeName(((DyeColor) stage.getSheepToShear().get(i)).name())).append(" sheep").append(""); } if (stage.getCowsToMilk() != null) { questInfo.append("
      • Milk ").append(stage.getCowsToMilk()).append(" cows").append("
        • "); @@ -122,7 +123,7 @@ public class QuestStagesInfoGenerator { int mobTamingEntries = stage.getMobsToTame().size(); for (int i = 0; i < mobTamingEntries; i++) { questInfo.append("
      • Tame ").append(stage.getMobNumToTame().get(i)).append(" ").append( - QuestsHelper.normalizeName(stage.getMobsToTame().get(i).name())).append("
        • "); + QuestsHelper.normalizeName(((DyeColor) stage.getMobsToTame().get(i)).name())).append(""); } return questInfo.toString(); @@ -149,10 +150,10 @@ public class QuestStagesInfoGenerator { * @param explanation

        The explanation of what the player needs to do with the items

        * @return

        A string describing the necessary tasks

        */ - private String getQuestItemsTaskString(List items, String explanation) { + private String getQuestItemsTaskString(List items, String explanation) { StringBuilder questInfo = new StringBuilder(); - for (ItemStack itemStack : items) { - questInfo.append(explanation).append(QuestsHelper.getItemStackString(itemStack)); + for (Object itemStack : items) { + questInfo.append(explanation).append(QuestsHelper.getItemStackString((ItemStack) itemStack)); } return questInfo.toString(); } diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java index b68cf7c..7a14501 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.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.IStage; +import me.pikamug.quests.Quests; +import me.pikamug.quests.quests.Quest; +import me.pikamug.quests.quests.components.Stage; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPCRegistry; import net.knarcraft.dynmapcitizens.DynmapCitizens; @@ -29,16 +29,16 @@ import java.util.UUID; */ public class QuestsHandler extends AbstractTraitHandler { - private QuestsAPI questsAPI; + private Quests questsAPI; private Map markerIcons; private final Map questGiverInfo = new HashMap<>(); private final QuestsSettings settings = new QuestsSettings(); - private final List unavailableQuests = new ArrayList<>(); + private final List unavailableQuests = new ArrayList<>(); private QuestAreaHandler questAreaHandler; @Override public void initialize() { - questsAPI = (QuestsAPI) Bukkit.getServer().getPluginManager().getPlugin("Quests"); + questsAPI = (Quests) Bukkit.getServer().getPluginManager().getPlugin("Quests"); DynmapAPI dynmapAPI = DynmapCitizens.getInstance().getDynmapAPI(); markerIcons = DynmapCitizens.getInstance().getGlobalSettings().getMarkerIcons(); if (questsAPI != null) { @@ -87,7 +87,7 @@ public class QuestsHandler extends AbstractTraitHandler { questGiverInfo.clear(); unavailableQuests.clear(); //Generation information about NPC's parts in each quest - for (IQuest quest : questsAPI.getLoadedQuests()) { + for (Quest quest : questsAPI.getLoadedQuests()) { if (QuestsHelper.isQuestUnavailable(quest)) { unavailableQuests.add(quest); //If unavailable quests aren't displayed, there is no point in continuing @@ -98,7 +98,7 @@ public class QuestsHandler extends AbstractTraitHandler { if (quest.getNpcStart() != null) { getInfo(quest.getNpcStart()).addQuestStart(quest); } - for (IStage stage : quest.getStages()) { + for (Stage stage : quest.getStages()) { for (UUID npcId : stage.getNpcsToKill()) { getInfo(npcId).addQuestKill(quest); } @@ -121,7 +121,7 @@ public class QuestsHandler extends AbstractTraitHandler { for (UUID npcId : questGiverInfo.keySet()) { NPCQuestInfo info = questGiverInfo.get(npcId); MarkerIcon icon = markerIcons.get(info.getNPCIcon()); - List offeredQuests = info.getQuestStarts(); + List offeredQuests = info.getQuestStarts(); StringBuilder markerDescription = new StringBuilder(); markerDescription.append("

        ").append(registry.getByUniqueId(npcId).getName()).append("

        "); @@ -151,9 +151,9 @@ public class QuestsHandler extends AbstractTraitHandler { * @param stringBuilder

        The string builder to append to

        * @param offeredQuests

        The list of quests the NPC offers

        */ - private void appendOfferedQuestsInfo(StringBuilder stringBuilder, List offeredQuests) { + private void appendOfferedQuestsInfo(StringBuilder stringBuilder, List offeredQuests) { stringBuilder.append("

        Quests offered:

          "); - for (IQuest quest : offeredQuests) { + for (Quest quest : offeredQuests) { stringBuilder.append("

        • ").append(quest.getName()).append("

          - "); stringBuilder.append(quest.getDescription()).append("
          "); if (settings.displayStageInfo()) { @@ -180,9 +180,9 @@ public class QuestsHandler extends AbstractTraitHandler { * @return

          Information about an NPC's involvement in different quests

          */ private String getInvolvedInQuestsString(NPCQuestInfo info) { - List questKills = info.getQuestKills(); - List questInteractions = info.getQuestInteractions(); - List questDeliveries = info.getQuestDeliveries(); + List questKills = info.getQuestKills(); + List questInteractions = info.getQuestInteractions(); + List questDeliveries = info.getQuestDeliveries(); if (questKills.isEmpty() && questInteractions.isEmpty() && questDeliveries.isEmpty()) { return ""; @@ -203,8 +203,8 @@ public class QuestsHandler extends AbstractTraitHandler { * @param quests

          The quests the NPC is involved in

          * @param builder

          The string builder to append to

          */ - private void addInvolvedInString(String prefix, List quests, StringBuilder builder) { - for (IQuest quest : new HashSet<>(quests)) { + private void addInvolvedInString(String prefix, List quests, StringBuilder builder) { + for (Quest quest : new HashSet<>(quests)) { builder.append("
        • ").append(prefix).append(": ").append(quest.getName()).append("
          • "); } } diff --git a/src/main/java/net/knarcraft/dynmapcitizens/util/QuestsHelper.java b/src/main/java/net/knarcraft/dynmapcitizens/util/QuestsHelper.java index a29f5d8..359a7ee 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/util/QuestsHelper.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/util/QuestsHelper.java @@ -1,7 +1,7 @@ package net.knarcraft.dynmapcitizens.util; -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.dynmapcitizens.handler.VaultHandler; import net.knarcraft.dynmapcitizens.handler.trait.quests.QuestNPCType; @@ -89,7 +89,7 @@ public class QuestsHelper { * @param quest

          The quest to check for availability

          * @return

          True 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();