From c4318bef7b3c53a28f828fa12c6d10d4c4eebe10 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 23:06:28 +0200 Subject: [PATCH] Rename and clean up MapleQuestRequirement --- src/main/java/server/quest/Quest.java | 42 +++++++-------- ...ent.java => AbstractQuestRequirement.java} | 51 ++++++++++--------- .../requirements/BuffExceptRequirement.java | 2 +- .../quest/requirements/BuffRequirement.java | 2 +- .../CompletedQuestRequirement.java | 2 +- .../requirements/EndDateRequirement.java | 2 +- .../requirements/FieldEnterRequirement.java | 2 +- .../quest/requirements/InfoExRequirement.java | 2 +- .../requirements/InfoNumberRequirement.java | 2 +- .../requirements/IntervalRequirement.java | 2 +- .../quest/requirements/ItemRequirement.java | 2 +- .../quest/requirements/JobRequirement.java | 2 +- .../requirements/MaxLevelRequirement.java | 2 +- .../quest/requirements/MesoRequirement.java | 2 +- .../requirements/MinLevelRequirement.java | 2 +- .../requirements/MinTamenessRequirement.java | 2 +- .../quest/requirements/MobRequirement.java | 2 +- .../MonsterBookCountRequirement.java | 2 +- .../quest/requirements/NpcRequirement.java | 2 +- .../quest/requirements/PetRequirement.java | 2 +- .../quest/requirements/QuestRequirement.java | 2 +- .../quest/requirements/ScriptRequirement.java | 2 +- 22 files changed, 68 insertions(+), 65 deletions(-) rename src/main/java/server/quest/requirements/{MapleQuestRequirement.java => AbstractQuestRequirement.java} (60%) diff --git a/src/main/java/server/quest/Quest.java b/src/main/java/server/quest/Quest.java index 12722f9ad6..dd12ef5ecb 100644 --- a/src/main/java/server/quest/Quest.java +++ b/src/main/java/server/quest/Quest.java @@ -58,8 +58,8 @@ public class Quest { protected short id; protected int timeLimit, timeLimit2; - protected Map startReqs = new EnumMap<>(QuestRequirementType.class); - protected Map completeReqs = new EnumMap<>(QuestRequirementType.class); + protected Map startReqs = new EnumMap<>(QuestRequirementType.class); + protected Map completeReqs = new EnumMap<>(QuestRequirementType.class); protected Map startActs = new EnumMap<>(QuestActionType.class); protected Map completeActs = new EnumMap<>(QuestActionType.class); protected List relevantMobs = new LinkedList<>(); @@ -113,7 +113,7 @@ public class Quest { } } - MapleQuestRequirement req = this.getRequirement(type, startReq); + AbstractQuestRequirement req = this.getRequirement(type, startReq); if (req == null) { continue; } @@ -127,7 +127,7 @@ public class Quest { for (Data completeReq : completeReqData.getChildren()) { QuestRequirementType type = QuestRequirementType.getByWZName(completeReq.getName()); - MapleQuestRequirement req = this.getRequirement(type, completeReq); + AbstractQuestRequirement req = this.getRequirement(type, completeReq); if (req == null) { continue; } @@ -241,7 +241,7 @@ public class Quest { return false; } - for (MapleQuestRequirement r : startReqs.values()) { + for (AbstractQuestRequirement r : startReqs.values()) { if (!r.check(chr, npcid)) { return false; } @@ -256,7 +256,7 @@ public class Quest { return false; } - for (MapleQuestRequirement r : completeReqs.values()) { + for (AbstractQuestRequirement r : completeReqs.values()) { if (!r.check(chr, npcid)) { return false; } @@ -381,7 +381,7 @@ public class Quest { } public int getStartItemAmountNeeded(int itemid) { - MapleQuestRequirement req = startReqs.get(QuestRequirementType.ITEM); + AbstractQuestRequirement req = startReqs.get(QuestRequirementType.ITEM); if (req == null) { return Integer.MIN_VALUE; } @@ -391,7 +391,7 @@ public class Quest { } public int getCompleteItemAmountNeeded(int itemid) { - MapleQuestRequirement req = completeReqs.get(QuestRequirementType.ITEM); + AbstractQuestRequirement req = completeReqs.get(QuestRequirementType.ITEM); if (req == null) { return Integer.MAX_VALUE; } @@ -401,7 +401,7 @@ public class Quest { } public int getMobAmountNeeded(int mid) { - MapleQuestRequirement req = completeReqs.get(QuestRequirementType.MOB); + AbstractQuestRequirement req = completeReqs.get(QuestRequirementType.MOB); if (req == null) { return 0; } @@ -413,9 +413,9 @@ public class Quest { public short getInfoNumber(Status qs) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_NUMBER); + AbstractQuestRequirement req = reqs.get(QuestRequirementType.INFO_NUMBER); if (req != null) { InfoNumberRequirement inReq = (InfoNumberRequirement) req; return inReq.getInfoNumber(); @@ -426,9 +426,9 @@ public class Quest { public String getInfoEx(Status qs, int index) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; try { - MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); + AbstractQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); InfoExRequirement ixReq = (InfoExRequirement) req; return ixReq.getInfo().get(index); } catch (Exception e) { @@ -438,9 +438,9 @@ public class Quest { public List getInfoEx(Status qs) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; try { - MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); + AbstractQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); InfoExRequirement ixReq = (InfoExRequirement) req; return ixReq.getInfo(); } catch (Exception e) { @@ -460,8 +460,8 @@ public class Quest { quests.clear(); } - private MapleQuestRequirement getRequirement(QuestRequirementType type, Data data) { - MapleQuestRequirement ret = null; + private AbstractQuestRequirement getRequirement(QuestRequirementType type, Data data) { + AbstractQuestRequirement ret = null; switch (type) { case END_DATE: ret = new EndDateRequirement(this, data); @@ -597,8 +597,8 @@ public class Quest { } public int getNpcRequirement(boolean checkEnd) { - Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement mqr = reqs.get(QuestRequirementType.NPC); + Map reqs = !checkEnd ? startReqs : completeReqs; + AbstractQuestRequirement mqr = reqs.get(QuestRequirementType.NPC); if (mqr != null) { return ((NpcRequirement) mqr).get(); } else { @@ -607,8 +607,8 @@ public class Quest { } public boolean hasScriptRequirement(boolean checkEnd) { - Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement mqr = reqs.get(QuestRequirementType.SCRIPT); + Map reqs = !checkEnd ? startReqs : completeReqs; + AbstractQuestRequirement mqr = reqs.get(QuestRequirementType.SCRIPT); if (mqr != null) { return ((ScriptRequirement) mqr).get(); diff --git a/src/main/java/server/quest/requirements/MapleQuestRequirement.java b/src/main/java/server/quest/requirements/AbstractQuestRequirement.java similarity index 60% rename from src/main/java/server/quest/requirements/MapleQuestRequirement.java rename to src/main/java/server/quest/requirements/AbstractQuestRequirement.java index a62bbd2ab4..e223521223 100644 --- a/src/main/java/server/quest/requirements/MapleQuestRequirement.java +++ b/src/main/java/server/quest/requirements/AbstractQuestRequirement.java @@ -27,30 +27,33 @@ import server.quest.QuestRequirementType; /** * Base class for a Quest Requirement. Quest system uses it for all requirements. + * * @author Tyler (Twdtwd) */ -public abstract class MapleQuestRequirement { - private final QuestRequirementType type; - - public MapleQuestRequirement(QuestRequirementType type) { - this.type = type; - } - - /** - * Checks the requirement to see if the player currently meets it. - * @param chr The {@link Character} to check on. - * @param npcid The NPC ID it was called from. - * @return boolean If the check was passed or not. - */ - public abstract boolean check(Character chr, Integer npcid); - - /** - * Processes the data and stores it in the class for future use. - * @param data The data to process. - */ - public abstract void processData(Data data); - - public QuestRequirementType getType() { - return type; - } +public abstract class AbstractQuestRequirement { + private final QuestRequirementType type; + + public AbstractQuestRequirement(QuestRequirementType type) { + this.type = type; + } + + /** + * Checks the requirement to see if the player currently meets it. + * + * @param chr The {@link Character} to check on. + * @param npcid The NPC ID it was called from. + * @return boolean If the check was passed or not. + */ + public abstract boolean check(Character chr, Integer npcid); + + /** + * Processes the data and stores it in the class for future use. + * + * @param data The data to process. + */ + public abstract void processData(Data data); + + public QuestRequirementType getType() { + return type; + } } \ No newline at end of file diff --git a/src/main/java/server/quest/requirements/BuffExceptRequirement.java b/src/main/java/server/quest/requirements/BuffExceptRequirement.java index 5879f4d970..c79e63ba6b 100644 --- a/src/main/java/server/quest/requirements/BuffExceptRequirement.java +++ b/src/main/java/server/quest/requirements/BuffExceptRequirement.java @@ -29,7 +29,7 @@ import server.quest.QuestRequirementType; * * @author Ronan */ -public class BuffExceptRequirement extends MapleQuestRequirement { +public class BuffExceptRequirement extends AbstractQuestRequirement { private int buffId = -1; public BuffExceptRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/BuffRequirement.java b/src/main/java/server/quest/requirements/BuffRequirement.java index 03730ad038..064f1fc39c 100644 --- a/src/main/java/server/quest/requirements/BuffRequirement.java +++ b/src/main/java/server/quest/requirements/BuffRequirement.java @@ -29,7 +29,7 @@ import server.quest.QuestRequirementType; * * @author Ronan */ -public class BuffRequirement extends MapleQuestRequirement { +public class BuffRequirement extends AbstractQuestRequirement { private int buffId = 1; public BuffRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/CompletedQuestRequirement.java b/src/main/java/server/quest/requirements/CompletedQuestRequirement.java index e6d404ca3a..6ff61ab621 100644 --- a/src/main/java/server/quest/requirements/CompletedQuestRequirement.java +++ b/src/main/java/server/quest/requirements/CompletedQuestRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class CompletedQuestRequirement extends MapleQuestRequirement { +public class CompletedQuestRequirement extends AbstractQuestRequirement { private int reqQuest; diff --git a/src/main/java/server/quest/requirements/EndDateRequirement.java b/src/main/java/server/quest/requirements/EndDateRequirement.java index fb9b9dabc3..ccf01fb10e 100644 --- a/src/main/java/server/quest/requirements/EndDateRequirement.java +++ b/src/main/java/server/quest/requirements/EndDateRequirement.java @@ -33,7 +33,7 @@ import java.util.Calendar; * * @author Tyler (Twdtwd) */ -public class EndDateRequirement extends MapleQuestRequirement { +public class EndDateRequirement extends AbstractQuestRequirement { private String timeStr; diff --git a/src/main/java/server/quest/requirements/FieldEnterRequirement.java b/src/main/java/server/quest/requirements/FieldEnterRequirement.java index 5fd58e74bd..e69b913cb0 100644 --- a/src/main/java/server/quest/requirements/FieldEnterRequirement.java +++ b/src/main/java/server/quest/requirements/FieldEnterRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class FieldEnterRequirement extends MapleQuestRequirement { +public class FieldEnterRequirement extends AbstractQuestRequirement { private int mapId = -1; diff --git a/src/main/java/server/quest/requirements/InfoExRequirement.java b/src/main/java/server/quest/requirements/InfoExRequirement.java index 6180d80c08..50e36c170b 100644 --- a/src/main/java/server/quest/requirements/InfoExRequirement.java +++ b/src/main/java/server/quest/requirements/InfoExRequirement.java @@ -34,7 +34,7 @@ import java.util.List; * * @author Tyler (Twdtwd) */ -public class InfoExRequirement extends MapleQuestRequirement { +public class InfoExRequirement extends AbstractQuestRequirement { private List infoExpected = new ArrayList<>(); private int questID; diff --git a/src/main/java/server/quest/requirements/InfoNumberRequirement.java b/src/main/java/server/quest/requirements/InfoNumberRequirement.java index ccae12a3ec..f3f78f1c2d 100644 --- a/src/main/java/server/quest/requirements/InfoNumberRequirement.java +++ b/src/main/java/server/quest/requirements/InfoNumberRequirement.java @@ -29,7 +29,7 @@ import server.quest.QuestRequirementType; * * @author Ronan */ -public class InfoNumberRequirement extends MapleQuestRequirement { +public class InfoNumberRequirement extends AbstractQuestRequirement { private short infoNumber; private int questID; diff --git a/src/main/java/server/quest/requirements/IntervalRequirement.java b/src/main/java/server/quest/requirements/IntervalRequirement.java index bfa70eac0f..be85edc793 100644 --- a/src/main/java/server/quest/requirements/IntervalRequirement.java +++ b/src/main/java/server/quest/requirements/IntervalRequirement.java @@ -32,7 +32,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class IntervalRequirement extends MapleQuestRequirement { +public class IntervalRequirement extends AbstractQuestRequirement { private int interval = -1; private int questID; diff --git a/src/main/java/server/quest/requirements/ItemRequirement.java b/src/main/java/server/quest/requirements/ItemRequirement.java index ebed5a9b23..d47554f2d2 100644 --- a/src/main/java/server/quest/requirements/ItemRequirement.java +++ b/src/main/java/server/quest/requirements/ItemRequirement.java @@ -38,7 +38,7 @@ import java.util.Map; * * @author Tyler (Twdtwd) */ -public class ItemRequirement extends MapleQuestRequirement { +public class ItemRequirement extends AbstractQuestRequirement { Map items = new HashMap<>(); diff --git a/src/main/java/server/quest/requirements/JobRequirement.java b/src/main/java/server/quest/requirements/JobRequirement.java index ae77e9a9e1..f2463af772 100644 --- a/src/main/java/server/quest/requirements/JobRequirement.java +++ b/src/main/java/server/quest/requirements/JobRequirement.java @@ -35,7 +35,7 @@ import java.util.List; * * @author Tyler (Twdtwd) */ -public class JobRequirement extends MapleQuestRequirement { +public class JobRequirement extends AbstractQuestRequirement { List jobs = new ArrayList<>(); public JobRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/MaxLevelRequirement.java b/src/main/java/server/quest/requirements/MaxLevelRequirement.java index 74287d139f..c92424614e 100644 --- a/src/main/java/server/quest/requirements/MaxLevelRequirement.java +++ b/src/main/java/server/quest/requirements/MaxLevelRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class MaxLevelRequirement extends MapleQuestRequirement { +public class MaxLevelRequirement extends AbstractQuestRequirement { private int maxLevel; diff --git a/src/main/java/server/quest/requirements/MesoRequirement.java b/src/main/java/server/quest/requirements/MesoRequirement.java index afd593ca6e..58b1542757 100644 --- a/src/main/java/server/quest/requirements/MesoRequirement.java +++ b/src/main/java/server/quest/requirements/MesoRequirement.java @@ -29,7 +29,7 @@ import server.quest.QuestRequirementType; * * @author Ronan */ -public class MesoRequirement extends MapleQuestRequirement { +public class MesoRequirement extends AbstractQuestRequirement { private int meso = 0; public MesoRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/MinLevelRequirement.java b/src/main/java/server/quest/requirements/MinLevelRequirement.java index 3d5952a848..427220f0fb 100644 --- a/src/main/java/server/quest/requirements/MinLevelRequirement.java +++ b/src/main/java/server/quest/requirements/MinLevelRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class MinLevelRequirement extends MapleQuestRequirement { +public class MinLevelRequirement extends AbstractQuestRequirement { private int minLevel; diff --git a/src/main/java/server/quest/requirements/MinTamenessRequirement.java b/src/main/java/server/quest/requirements/MinTamenessRequirement.java index 8969d77f71..8df82e76c4 100644 --- a/src/main/java/server/quest/requirements/MinTamenessRequirement.java +++ b/src/main/java/server/quest/requirements/MinTamenessRequirement.java @@ -32,7 +32,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class MinTamenessRequirement extends MapleQuestRequirement { +public class MinTamenessRequirement extends AbstractQuestRequirement { private int minTameness; diff --git a/src/main/java/server/quest/requirements/MobRequirement.java b/src/main/java/server/quest/requirements/MobRequirement.java index 9fb4154833..bece175475 100644 --- a/src/main/java/server/quest/requirements/MobRequirement.java +++ b/src/main/java/server/quest/requirements/MobRequirement.java @@ -36,7 +36,7 @@ import java.util.Map; * * @author Tyler (Twdtwd) */ -public class MobRequirement extends MapleQuestRequirement { +public class MobRequirement extends AbstractQuestRequirement { Map mobs = new HashMap<>(); private int questID; diff --git a/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java b/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java index b7af68c228..59916b1c50 100644 --- a/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java +++ b/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class MonsterBookCountRequirement extends MapleQuestRequirement { +public class MonsterBookCountRequirement extends AbstractQuestRequirement { private int reqCards; diff --git a/src/main/java/server/quest/requirements/NpcRequirement.java b/src/main/java/server/quest/requirements/NpcRequirement.java index 55834aa91a..99f1a933c2 100644 --- a/src/main/java/server/quest/requirements/NpcRequirement.java +++ b/src/main/java/server/quest/requirements/NpcRequirement.java @@ -31,7 +31,7 @@ import server.quest.QuestRequirementType; * * @author Tyler (Twdtwd) */ -public class NpcRequirement extends MapleQuestRequirement { +public class NpcRequirement extends AbstractQuestRequirement { private int reqNPC; public NpcRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/PetRequirement.java b/src/main/java/server/quest/requirements/PetRequirement.java index 4a310fdacb..d1844377a3 100644 --- a/src/main/java/server/quest/requirements/PetRequirement.java +++ b/src/main/java/server/quest/requirements/PetRequirement.java @@ -35,7 +35,7 @@ import java.util.List; * * @author Tyler (Twdtwd) */ -public class PetRequirement extends MapleQuestRequirement { +public class PetRequirement extends AbstractQuestRequirement { List petIDs = new ArrayList<>(); diff --git a/src/main/java/server/quest/requirements/QuestRequirement.java b/src/main/java/server/quest/requirements/QuestRequirement.java index 6fff9ae723..e141814a2b 100644 --- a/src/main/java/server/quest/requirements/QuestRequirement.java +++ b/src/main/java/server/quest/requirements/QuestRequirement.java @@ -32,7 +32,7 @@ import java.util.Map; * * @author Tyler (Twdtwd) */ -public class QuestRequirement extends MapleQuestRequirement { +public class QuestRequirement extends AbstractQuestRequirement { Map quests = new HashMap<>(); public QuestRequirement(Quest quest, Data data) { diff --git a/src/main/java/server/quest/requirements/ScriptRequirement.java b/src/main/java/server/quest/requirements/ScriptRequirement.java index bab9055f1c..b486d2c146 100644 --- a/src/main/java/server/quest/requirements/ScriptRequirement.java +++ b/src/main/java/server/quest/requirements/ScriptRequirement.java @@ -29,7 +29,7 @@ import server.quest.QuestRequirementType; * * @author Ronan */ -public class ScriptRequirement extends MapleQuestRequirement { +public class ScriptRequirement extends AbstractQuestRequirement { private boolean reqScript; public ScriptRequirement(Quest quest, Data data) {