From 473ab190346fb0bddee83ccc4f9738041643405f Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:43:23 +0200 Subject: [PATCH] Rename and clean up MapleQuestActionType --- src/main/java/server/quest/Quest.java | 16 +++++------ ...stActionType.java => QuestActionType.java} | 28 +++++++++++++++---- .../java/server/quest/actions/BuffAction.java | 4 +-- .../java/server/quest/actions/ExpAction.java | 4 +-- .../java/server/quest/actions/FameAction.java | 4 +-- .../java/server/quest/actions/InfoAction.java | 4 +-- .../java/server/quest/actions/ItemAction.java | 4 +-- .../quest/actions/MapleQuestAction.java | 8 +++--- .../java/server/quest/actions/MesoAction.java | 4 +-- .../server/quest/actions/NextQuestAction.java | 4 +-- .../server/quest/actions/PetSkillAction.java | 4 +-- .../server/quest/actions/PetSpeedAction.java | 4 +-- .../quest/actions/PetTamenessAction.java | 4 +-- .../server/quest/actions/QuestAction.java | 4 +-- .../server/quest/actions/SkillAction.java | 4 +-- 15 files changed, 59 insertions(+), 41 deletions(-) rename src/main/java/server/quest/{MapleQuestActionType.java => QuestActionType.java} (84%) diff --git a/src/main/java/server/quest/Quest.java b/src/main/java/server/quest/Quest.java index bd5dedbb7e..36e3498e46 100644 --- a/src/main/java/server/quest/Quest.java +++ b/src/main/java/server/quest/Quest.java @@ -60,8 +60,8 @@ public class Quest { protected int timeLimit, timeLimit2; protected Map startReqs = new EnumMap<>(MapleQuestRequirementType.class); protected Map completeReqs = new EnumMap<>(MapleQuestRequirementType.class); - protected Map startActs = new EnumMap<>(MapleQuestActionType.class); - protected Map completeActs = new EnumMap<>(MapleQuestActionType.class); + protected Map startActs = new EnumMap<>(QuestActionType.class); + protected Map completeActs = new EnumMap<>(QuestActionType.class); protected List relevantMobs = new LinkedList<>(); private boolean autoStart; private boolean autoPreComplete, autoComplete; @@ -147,7 +147,7 @@ public class Quest { final Data startActData = actData.getChildByPath("0"); if (startActData != null) { for (Data startAct : startActData.getChildren()) { - MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(startAct.getName()); + QuestActionType questActionType = QuestActionType.getByWZName(startAct.getName()); MapleQuestAction act = this.getAction(questActionType, startAct); if (act == null) { @@ -160,7 +160,7 @@ public class Quest { Data completeActData = actData.getChildByPath("1"); if (completeActData != null) { for (Data completeAct : completeActData.getChildren()) { - MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(completeAct.getName()); + QuestActionType questActionType = QuestActionType.getByWZName(completeAct.getName()); MapleQuestAction act = this.getAction(questActionType, completeAct); if (act == null) { @@ -534,7 +534,7 @@ public class Quest { return ret; } - private MapleQuestAction getAction(MapleQuestActionType type, Data data) { + private MapleQuestAction getAction(QuestActionType type, Data data) { MapleQuestAction ret = null; switch (type) { case BUFF: @@ -582,7 +582,7 @@ public class Quest { public boolean restoreLostItem(Character chr, int itemid) { if (chr.getQuest(this).getStatus().equals(QuestStatus.Status.STARTED)) { - ItemAction itemAct = (ItemAction) startActs.get(MapleQuestActionType.ITEM); + ItemAction itemAct = (ItemAction) startActs.get(QuestActionType.ITEM); if (itemAct != null) { return itemAct.restoreLostItem(chr, itemid); } @@ -618,8 +618,8 @@ public class Quest { } public boolean hasNextQuestAction() { - Map acts = completeActs; - MapleQuestAction mqa = acts.get(MapleQuestActionType.NEXTQUEST); + Map acts = completeActs; + MapleQuestAction mqa = acts.get(QuestActionType.NEXTQUEST); return mqa != null; } diff --git a/src/main/java/server/quest/MapleQuestActionType.java b/src/main/java/server/quest/QuestActionType.java similarity index 84% rename from src/main/java/server/quest/MapleQuestActionType.java rename to src/main/java/server/quest/QuestActionType.java index f009d0ff21..07cac80c67 100644 --- a/src/main/java/server/quest/MapleQuestActionType.java +++ b/src/main/java/server/quest/QuestActionType.java @@ -22,18 +22,36 @@ package server.quest; /** - * * @author Matze */ -public enum MapleQuestActionType { - UNDEFINED(-1), EXP(0), ITEM(1), NEXTQUEST(2), MESO(3), QUEST(4), SKILL(5), FAME(6), BUFF(7), PETSKILL(8), YES(9), NO(10), NPC(11), MIN_LEVEL(12), NORMAL_AUTO_START(13), PETTAMENESS(14), PETSPEED(15), INFO(16), ZERO(16); +public enum QuestActionType { + UNDEFINED(-1), + EXP(0), + ITEM(1), + NEXTQUEST(2), + MESO(3), + QUEST(4), + SKILL(5), + FAME(6), + BUFF(7), + PETSKILL(8), + YES(9), + NO(10), + NPC(11), + MIN_LEVEL(12), + NORMAL_AUTO_START(13), + PETTAMENESS(14), + PETSPEED(15), + INFO(16), + ZERO(16); + final byte type; - private MapleQuestActionType(int type) { + QuestActionType(int type) { this.type = (byte) type; } - public static MapleQuestActionType getByWZName(String name) { + public static QuestActionType getByWZName(String name) { if (name.equals("exp")) { return EXP; } else if (name.equals("money")) { diff --git a/src/main/java/server/quest/actions/BuffAction.java b/src/main/java/server/quest/actions/BuffAction.java index 7749ba11a5..2057e651e0 100644 --- a/src/main/java/server/quest/actions/BuffAction.java +++ b/src/main/java/server/quest/actions/BuffAction.java @@ -25,8 +25,8 @@ import client.Character; import provider.Data; import provider.DataTool; import server.MapleItemInformationProvider; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -36,7 +36,7 @@ public class BuffAction extends MapleQuestAction { int itemEffect; public BuffAction(Quest quest, Data data) { - super(MapleQuestActionType.BUFF, quest); + super(QuestActionType.BUFF, quest); processData(data); } diff --git a/src/main/java/server/quest/actions/ExpAction.java b/src/main/java/server/quest/actions/ExpAction.java index 2f86a15191..1dc07757b0 100644 --- a/src/main/java/server/quest/actions/ExpAction.java +++ b/src/main/java/server/quest/actions/ExpAction.java @@ -25,8 +25,8 @@ import client.Character; import config.YamlConfig; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -36,7 +36,7 @@ public class ExpAction extends MapleQuestAction { int exp; public ExpAction(Quest quest, Data data) { - super(MapleQuestActionType.EXP, quest); + super(QuestActionType.EXP, quest); processData(data); } diff --git a/src/main/java/server/quest/actions/FameAction.java b/src/main/java/server/quest/actions/FameAction.java index 851116fcaa..642192be71 100644 --- a/src/main/java/server/quest/actions/FameAction.java +++ b/src/main/java/server/quest/actions/FameAction.java @@ -24,8 +24,8 @@ package server.quest.actions; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -35,7 +35,7 @@ public class FameAction extends MapleQuestAction { int fame; public FameAction(Quest quest, Data data) { - super(MapleQuestActionType.FAME, quest); + super(QuestActionType.FAME, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/InfoAction.java b/src/main/java/server/quest/actions/InfoAction.java index f29b311074..92714bcadb 100644 --- a/src/main/java/server/quest/actions/InfoAction.java +++ b/src/main/java/server/quest/actions/InfoAction.java @@ -22,8 +22,8 @@ package server.quest.actions; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -35,7 +35,7 @@ public class InfoAction extends MapleQuestAction { private int questID; public InfoAction(Quest quest, Data data) { - super(MapleQuestActionType.INFO, quest); + super(QuestActionType.INFO, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/ItemAction.java b/src/main/java/server/quest/actions/ItemAction.java index b33673b341..33d1437932 100644 --- a/src/main/java/server/quest/actions/ItemAction.java +++ b/src/main/java/server/quest/actions/ItemAction.java @@ -30,8 +30,8 @@ import constants.inventory.ItemConstants; import provider.Data; import provider.DataTool; import server.MapleItemInformationProvider; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; import tools.FilePrinter; import tools.PacketCreator; import tools.Pair; @@ -51,7 +51,7 @@ public class ItemAction extends MapleQuestAction { List items = new ArrayList<>(); public ItemAction(Quest quest, Data data) { - super(MapleQuestActionType.ITEM, quest); + super(QuestActionType.ITEM, quest); processData(data); } diff --git a/src/main/java/server/quest/actions/MapleQuestAction.java b/src/main/java/server/quest/actions/MapleQuestAction.java index 8433c10014..824237d9d7 100644 --- a/src/main/java/server/quest/actions/MapleQuestAction.java +++ b/src/main/java/server/quest/actions/MapleQuestAction.java @@ -20,8 +20,8 @@ package server.quest.actions; import client.Character; import provider.Data; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; import java.util.ArrayList; import java.util.List; @@ -31,10 +31,10 @@ import java.util.List; * @author Tyler (Twdtwd) */ public abstract class MapleQuestAction { - private final MapleQuestActionType type; + private final QuestActionType type; protected int questID; - public MapleQuestAction(MapleQuestActionType action, Quest quest) { + public MapleQuestAction(QuestActionType action, Quest quest) { this.type = action; this.questID = quest.getId(); } @@ -46,7 +46,7 @@ public abstract class MapleQuestAction { return true; } - public MapleQuestActionType getType() { + public QuestActionType getType() { return type; } diff --git a/src/main/java/server/quest/actions/MesoAction.java b/src/main/java/server/quest/actions/MesoAction.java index f4ecbb0c59..eb78077278 100644 --- a/src/main/java/server/quest/actions/MesoAction.java +++ b/src/main/java/server/quest/actions/MesoAction.java @@ -25,8 +25,8 @@ import client.Character; import config.YamlConfig; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -36,7 +36,7 @@ public class MesoAction extends MapleQuestAction { int mesos; public MesoAction(Quest quest, Data data) { - super(MapleQuestActionType.MESO, quest); + super(QuestActionType.MESO, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/NextQuestAction.java b/src/main/java/server/quest/actions/NextQuestAction.java index 29790b1439..3bbb649a99 100644 --- a/src/main/java/server/quest/actions/NextQuestAction.java +++ b/src/main/java/server/quest/actions/NextQuestAction.java @@ -25,8 +25,8 @@ import client.Character; import client.QuestStatus; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; import tools.PacketCreator; /** @@ -37,7 +37,7 @@ public class NextQuestAction extends MapleQuestAction { int nextQuest; public NextQuestAction(Quest quest, Data data) { - super(MapleQuestActionType.NEXTQUEST, quest); + super(QuestActionType.NEXTQUEST, quest); processData(data); } diff --git a/src/main/java/server/quest/actions/PetSkillAction.java b/src/main/java/server/quest/actions/PetSkillAction.java index c3f338f177..533ad60d66 100644 --- a/src/main/java/server/quest/actions/PetSkillAction.java +++ b/src/main/java/server/quest/actions/PetSkillAction.java @@ -26,8 +26,8 @@ import client.QuestStatus; import constants.inventory.ItemConstants; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -37,7 +37,7 @@ public class PetSkillAction extends MapleQuestAction { int flag; public PetSkillAction(Quest quest, Data data) { - super(MapleQuestActionType.PETSKILL, quest); + super(QuestActionType.PETSKILL, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/PetSpeedAction.java b/src/main/java/server/quest/actions/PetSpeedAction.java index 4cddc3e649..5abb71a7ff 100644 --- a/src/main/java/server/quest/actions/PetSpeedAction.java +++ b/src/main/java/server/quest/actions/PetSpeedAction.java @@ -23,8 +23,8 @@ import client.Character; import client.Client; import client.inventory.Pet; import provider.Data; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -33,7 +33,7 @@ import server.quest.Quest; public class PetSpeedAction extends MapleQuestAction { public PetSpeedAction(Quest quest, Data data) { - super(MapleQuestActionType.PETTAMENESS, quest); + super(QuestActionType.PETTAMENESS, quest); questID = quest.getId(); } diff --git a/src/main/java/server/quest/actions/PetTamenessAction.java b/src/main/java/server/quest/actions/PetTamenessAction.java index 7a138efe24..79aef49efc 100644 --- a/src/main/java/server/quest/actions/PetTamenessAction.java +++ b/src/main/java/server/quest/actions/PetTamenessAction.java @@ -24,8 +24,8 @@ import client.Client; import client.inventory.Pet; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; /** * @@ -35,7 +35,7 @@ public class PetTamenessAction extends MapleQuestAction { int tameness; public PetTamenessAction(Quest quest, Data data) { - super(MapleQuestActionType.PETTAMENESS, quest); + super(QuestActionType.PETTAMENESS, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/QuestAction.java b/src/main/java/server/quest/actions/QuestAction.java index 0fcc8aba2f..e72bb7d105 100644 --- a/src/main/java/server/quest/actions/QuestAction.java +++ b/src/main/java/server/quest/actions/QuestAction.java @@ -25,8 +25,8 @@ import client.Character; import client.QuestStatus; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; import java.util.HashMap; import java.util.Map; @@ -40,7 +40,7 @@ public class QuestAction extends MapleQuestAction { Map quests = new HashMap<>(); public QuestAction(Quest quest, Data data) { - super(MapleQuestActionType.QUEST, quest); + super(QuestActionType.QUEST, quest); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/actions/SkillAction.java b/src/main/java/server/quest/actions/SkillAction.java index f2425193ed..2c83c944c6 100644 --- a/src/main/java/server/quest/actions/SkillAction.java +++ b/src/main/java/server/quest/actions/SkillAction.java @@ -27,8 +27,8 @@ import client.Skill; import client.SkillFactory; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestActionType; import server.quest.Quest; +import server.quest.QuestActionType; import java.util.ArrayList; import java.util.HashMap; @@ -44,7 +44,7 @@ public class SkillAction extends MapleQuestAction { Map skillData = new HashMap<>(); public SkillAction(Quest quest, Data data) { - super(MapleQuestActionType.SKILL, quest); + super(QuestActionType.SKILL, quest); processData(data); }