Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleData

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:48:28 +02:00
parent 48f2647742
commit 2281aec440
64 changed files with 432 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/server/quest/MapleQuest.java
View File

@@ -25,7 +25,7 @@ import client.Character;
import client.QuestStatus;
import client.QuestStatus.Status;
import config.YamlConfig;
import provider.MapleData;
import provider.Data;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
@@ -69,20 +69,20 @@ public class MapleQuest {
private boolean repeatable = false;
private String name = "", parent = "";
private final static MapleDataProvider questData = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST);
private final static MapleData questInfo = questData.getData("QuestInfo.img");
private final static MapleData questAct = questData.getData("Act.img");
private final static MapleData questReq = questData.getData("Check.img");
private final static Data questInfo = questData.getData("QuestInfo.img");
private final static Data questAct = questData.getData("Act.img");
private final static Data questReq = questData.getData("Check.img");
private MapleQuest(int id) {
this.id = (short) id;
MapleData reqData = questReq.getChildByPath(String.valueOf(id));
Data reqData = questReq.getChildByPath(String.valueOf(id));
if (reqData == null) {//most likely infoEx
return;
}
if(questInfo != null) {
MapleData reqInfo = questInfo.getChildByPath(String.valueOf(id));
Data reqInfo = questInfo.getChildByPath(String.valueOf(id));
if(reqInfo != null) {
name = MapleDataTool.getString("name", reqInfo, "");
parent = MapleDataTool.getString("parent", reqInfo, "");
@@ -100,14 +100,14 @@ public class MapleQuest {
}
}
MapleData startReqData = reqData.getChildByPath("0");
Data startReqData = reqData.getChildByPath("0");
if (startReqData != null) {
for (MapleData startReq : startReqData.getChildren()) {
for (Data startReq : startReqData.getChildren()) {
MapleQuestRequirementType type = MapleQuestRequirementType.getByWZName(startReq.getName());
if (type.equals(MapleQuestRequirementType.INTERVAL)) {
repeatable = true;
} else if (type.equals(MapleQuestRequirementType.MOB)) {
for (MapleData mob : startReq.getChildren()) {
for (Data mob : startReq.getChildren()) {
relevantMobs.add(MapleDataTool.getInt(mob.getChildByPath("id")));
}
}
@@ -121,9 +121,9 @@ public class MapleQuest {
}
}
MapleData completeReqData = reqData.getChildByPath("1");
Data completeReqData = reqData.getChildByPath("1");
if (completeReqData != null) {
for (MapleData completeReq : completeReqData.getChildren()) {
for (Data completeReq : completeReqData.getChildren()) {
MapleQuestRequirementType type = MapleQuestRequirementType.getByWZName(completeReq.getName());
MapleQuestRequirement req = this.getRequirement(type, completeReq);
@@ -132,20 +132,20 @@ public class MapleQuest {
}
if (type.equals(MapleQuestRequirementType.MOB)) {
for (MapleData mob : completeReq.getChildren()) {
for (Data mob : completeReq.getChildren()) {
relevantMobs.add(MapleDataTool.getInt(mob.getChildByPath("id")));
}
}
completeReqs.put(type, req);
}
}
MapleData actData = questAct.getChildByPath(String.valueOf(id));
Data actData = questAct.getChildByPath(String.valueOf(id));
if (actData == null) {
return;
}
final MapleData startActData = actData.getChildByPath("0");
final Data startActData = actData.getChildByPath("0");
if (startActData != null) {
for (MapleData startAct : startActData.getChildren()) {
for (Data startAct : startActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(startAct.getName());
MapleQuestAction act = this.getAction(questActionType, startAct);
@@ -155,9 +155,9 @@ public class MapleQuest {
startActs.put(questActionType, act);
}
}
MapleData completeActData = actData.getChildByPath("1");
Data completeActData = actData.getChildByPath("1");
if (completeActData != null) {
for (MapleData completeAct : completeActData.getChildren()) {
for (Data completeAct : completeActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(completeAct.getName());
MapleQuestAction act = this.getAction(questActionType, completeAct);
@@ -460,7 +460,7 @@ public class MapleQuest {
quests.clear();
}
private MapleQuestRequirement getRequirement(MapleQuestRequirementType type, MapleData data) {
private MapleQuestRequirement getRequirement(MapleQuestRequirementType type, Data data) {
MapleQuestRequirement ret = null;
switch(type) {
case END_DATE:
@@ -534,7 +534,7 @@ public class MapleQuest {
return ret;
}
private MapleQuestAction getAction(MapleQuestActionType type, MapleData data) {
private MapleQuestAction getAction(MapleQuestActionType type, Data data) {
MapleQuestAction ret = null;
switch(type) {
case BUFF:
@@ -653,7 +653,7 @@ public class MapleQuest {
final Map<Integer, MapleQuest> loadedQuests = new HashMap<>();
final Map<Integer, Integer> loadedInfoNumberQuests = new HashMap<>();
for (MapleData quest : questInfo.getChildren()) {
for (Data quest : questInfo.getChildren()) {
int questID = Integer.parseInt(quest.getName());
MapleQuest q = new MapleQuest(questID);

6
src/main/java/server/quest/actions/BuffAction.java
View File

@@ -22,7 +22,7 @@
package server.quest.actions;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
@@ -35,7 +35,7 @@ import server.quest.MapleQuestActionType;
public class BuffAction extends MapleQuestAction {
int itemEffect;
public BuffAction(MapleQuest quest, MapleData data) {
public BuffAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.BUFF, quest);
processData(data);
}
@@ -46,7 +46,7 @@ public class BuffAction extends MapleQuestAction {
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
itemEffect = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/actions/ExpAction.java
View File

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import config.YamlConfig;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -35,14 +35,14 @@ import server.quest.MapleQuestActionType;
public class ExpAction extends MapleQuestAction {
int exp;
public ExpAction(MapleQuest quest, MapleData data) {
public ExpAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.EXP, quest);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
exp = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/actions/FameAction.java
View File

@@ -22,7 +22,7 @@
package server.quest.actions;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -34,7 +34,7 @@ import server.quest.MapleQuestActionType;
public class FameAction extends MapleQuestAction {
int fame;
public FameAction(MapleQuest quest, MapleData data) {
public FameAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.FAME, quest);
questID = quest.getId();
processData(data);
@@ -42,7 +42,7 @@ public class FameAction extends MapleQuestAction {
@Override
public void processData(MapleData data) {
public void processData(Data data) {
fame = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/actions/InfoAction.java
View File

@@ -20,7 +20,7 @@
package server.quest.actions;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -34,14 +34,14 @@ public class InfoAction extends MapleQuestAction {
private String info;
private int questID;
public InfoAction(MapleQuest quest, MapleData data) {
public InfoAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.INFO, quest);
questID = quest.getId();
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
info = MapleDataTool.getString(data, "");
}

10
src/main/java/server/quest/actions/ItemAction.java
View File

@@ -27,7 +27,7 @@ import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import constants.inventory.ItemConstants;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
@@ -50,21 +50,21 @@ import java.util.List;
public class ItemAction extends MapleQuestAction {
List<ItemData> items = new ArrayList<>();
public ItemAction(MapleQuest quest, MapleData data) {
public ItemAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.ITEM, quest);
processData(data);
}
@Override
public void processData(MapleData data) {
for (MapleData iEntry : data.getChildren()) {
public void processData(Data data) {
for (Data iEntry : data.getChildren()) {
int id = MapleDataTool.getInt(iEntry.getChildByPath("id"));
int count = MapleDataTool.getInt(iEntry.getChildByPath("count"), 1);
int period = MapleDataTool.getInt(iEntry.getChildByPath("period"), 0);
Integer prop = null;
MapleData propData = iEntry.getChildByPath("prop");
Data propData = iEntry.getChildByPath("prop");
if(propData != null)
prop = MapleDataTool.getInt(propData);

4
src/main/java/server/quest/actions/MapleQuestAction.java
View File

@@ -19,7 +19,7 @@
package server.quest.actions;
import client.Character;
import provider.MapleData;
import provider.Data;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -40,7 +40,7 @@ public abstract class MapleQuestAction {
}
public abstract void run(Character chr, Integer extSelection);
public abstract void processData(MapleData data);
public abstract void processData(Data data);
public boolean check(Character chr, Integer extSelection) {
return true;

6
src/main/java/server/quest/actions/MesoAction.java
View File

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import config.YamlConfig;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -35,7 +35,7 @@ import server.quest.MapleQuestActionType;
public class MesoAction extends MapleQuestAction {
int mesos;
public MesoAction(MapleQuest quest, MapleData data) {
public MesoAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.MESO, quest);
questID = quest.getId();
processData(data);
@@ -43,7 +43,7 @@ public class MesoAction extends MapleQuestAction {
@Override
public void processData(MapleData data) {
public void processData(Data data) {
mesos = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/actions/NextQuestAction.java
View File

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import client.QuestStatus;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -36,14 +36,14 @@ import tools.PacketCreator;
public class NextQuestAction extends MapleQuestAction {
int nextQuest;
public NextQuestAction(MapleQuest quest, MapleData data) {
public NextQuestAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.NEXTQUEST, quest);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
nextQuest = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/actions/PetSkillAction.java
View File

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import client.QuestStatus;
import constants.inventory.ItemConstants;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -36,7 +36,7 @@ import server.quest.MapleQuestActionType;
public class PetSkillAction extends MapleQuestAction {
int flag;
public PetSkillAction(MapleQuest quest, MapleData data) {
public PetSkillAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.PETSKILL, quest);
questID = quest.getId();
processData(data);
@@ -44,7 +44,7 @@ public class PetSkillAction extends MapleQuestAction {
@Override
public void processData(MapleData data) {
public void processData(Data data) {
flag = MapleDataTool.getInt("petskill", data);
}

6
src/main/java/server/quest/actions/PetSpeedAction.java
View File

@@ -22,7 +22,7 @@ package server.quest.actions;
import client.Character;
import client.Client;
import client.inventory.Pet;
import provider.MapleData;
import provider.Data;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -32,14 +32,14 @@ import server.quest.MapleQuestActionType;
*/
public class PetSpeedAction extends MapleQuestAction {
public PetSpeedAction(MapleQuest quest, MapleData data) {
public PetSpeedAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.PETTAMENESS, quest);
questID = quest.getId();
}
@Override
public void processData(MapleData data) {}
public void processData(Data data) {}
@Override
public void run(Character chr, Integer extSelection) {

6
src/main/java/server/quest/actions/PetTamenessAction.java
View File

@@ -22,7 +22,7 @@ package server.quest.actions;
import client.Character;
import client.Client;
import client.inventory.Pet;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -34,7 +34,7 @@ import server.quest.MapleQuestActionType;
public class PetTamenessAction extends MapleQuestAction {
int tameness;
public PetTamenessAction(MapleQuest quest, MapleData data) {
public PetTamenessAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.PETTAMENESS, quest);
questID = quest.getId();
processData(data);
@@ -42,7 +42,7 @@ public class PetTamenessAction extends MapleQuestAction {
@Override
public void processData(MapleData data) {
public void processData(Data data) {
tameness = MapleDataTool.getInt(data);
}

8
src/main/java/server/quest/actions/QuestAction.java
View File

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import client.QuestStatus;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -39,7 +39,7 @@ public class QuestAction extends MapleQuestAction {
int mesos;
Map<Integer, Integer> quests = new HashMap<>();
public QuestAction(MapleQuest quest, MapleData data) {
public QuestAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.QUEST, quest);
questID = quest.getId();
processData(data);
@@ -47,8 +47,8 @@ public class QuestAction extends MapleQuestAction {
@Override
public void processData(MapleData data) {
for (MapleData qEntry : data) {
public void processData(Data data) {
for (Data qEntry : data) {
int questid = MapleDataTool.getInt(qEntry.getChildByPath("id"));
int stat = MapleDataTool.getInt(qEntry.getChildByPath("state"));
quests.put(questid, stat);

14
src/main/java/server/quest/actions/SkillAction.java
View File

@@ -25,7 +25,7 @@ import client.Character;
import client.Job;
import client.Skill;
import client.SkillFactory;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -43,26 +43,26 @@ public class SkillAction extends MapleQuestAction {
int itemEffect;
Map<Integer, SkillData> skillData = new HashMap<>();
public SkillAction(MapleQuest quest, MapleData data) {
public SkillAction(MapleQuest quest, Data data) {
super(MapleQuestActionType.SKILL, quest);
processData(data);
}
@Override
public void processData(MapleData data) {
for (MapleData sEntry : data) {
public void processData(Data data) {
for (Data sEntry : data) {
byte skillLevel = 0;
int skillid = MapleDataTool.getInt(sEntry.getChildByPath("id"));
MapleData skillLevelData = sEntry.getChildByPath("skillLevel");
Data skillLevelData = sEntry.getChildByPath("skillLevel");
if(skillLevelData != null)
skillLevel = (byte) MapleDataTool.getInt(skillLevelData);
int masterLevel = MapleDataTool.getInt(sEntry.getChildByPath("masterLevel"));
List<Integer> jobs = new ArrayList<>();
MapleData applicableJobs = sEntry.getChildByPath("job");
Data applicableJobs = sEntry.getChildByPath("job");
if(applicableJobs != null) {
for (MapleData applicableJob : applicableJobs.getChildren()) {
for (Data applicableJob : applicableJobs.getChildren()) {
jobs.add(MapleDataTool.getInt(applicableJob));
}
}

6
src/main/java/server/quest/requirements/BuffExceptRequirement.java
View File

@@ -20,7 +20,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -32,13 +32,13 @@ import server.quest.MapleQuestRequirementType;
public class BuffExceptRequirement extends MapleQuestRequirement {
private int buffId = -1;
public BuffExceptRequirement(MapleQuest quest, MapleData data) {
public BuffExceptRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.BUFF);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
// item buffs are negative
buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
}

6
src/main/java/server/quest/requirements/BuffRequirement.java
View File

@@ -20,7 +20,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -32,13 +32,13 @@ import server.quest.MapleQuestRequirementType;
public class BuffRequirement extends MapleQuestRequirement {
private int buffId = 1;
public BuffRequirement(MapleQuest quest, MapleData data) {
public BuffRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.BUFF);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
// item buffs are negative
buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
}

6
src/main/java/server/quest/requirements/CompletedQuestRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,13 +35,13 @@ public class CompletedQuestRequirement extends MapleQuestRequirement {
private int reqQuest;
public CompletedQuestRequirement(MapleQuest quest, MapleData data) {
public CompletedQuestRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.COMPLETED_QUEST);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
reqQuest = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/requirements/EndDateRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -37,7 +37,7 @@ public class EndDateRequirement extends MapleQuestRequirement {
private String timeStr;
public EndDateRequirement(MapleQuest quest, MapleData data) {
public EndDateRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.END_DATE);
processData(data);
}
@@ -47,7 +47,7 @@ public class EndDateRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
public void processData(Data data) {
timeStr = MapleDataTool.getString(data);
}

8
src/main/java/server/quest/requirements/FieldEnterRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,14 +35,14 @@ public class FieldEnterRequirement extends MapleQuestRequirement {
private int mapId = -1;
public FieldEnterRequirement(MapleQuest quest, MapleData data) {
public FieldEnterRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.FIELD_ENTER);
processData(data);
}
@Override
public void processData(MapleData data) {
MapleData zeroField = data.getChildByPath("0");
public void processData(Data data) {
Data zeroField = data.getChildByPath("0");
if (zeroField != null) {
mapId = MapleDataTool.getInt(zeroField);
}

10
src/main/java/server/quest/requirements/InfoExRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -39,17 +39,17 @@ public class InfoExRequirement extends MapleQuestRequirement {
private int questID;
public InfoExRequirement(MapleQuest quest, MapleData data) {
public InfoExRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.INFO_EX);
questID = quest.getId();
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
// Because we have to...
for(MapleData infoEx : data.getChildren()) {
MapleData value = infoEx.getChildByPath("value");
for(Data infoEx : data.getChildren()) {
Data value = infoEx.getChildByPath("value");
infoExpected.add(MapleDataTool.getString(value, ""));
}
}

6
src/main/java/server/quest/requirements/InfoNumberRequirement.java
View File

@@ -20,7 +20,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -34,14 +34,14 @@ public class InfoNumberRequirement extends MapleQuestRequirement {
private short infoNumber;
private int questID;
public InfoNumberRequirement(MapleQuest quest, MapleData data) {
public InfoNumberRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.INFO_NUMBER);
questID = quest.getId();
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
infoNumber = (short) MapleDataTool.getIntConvert(data, 0);
}

6
src/main/java/server/quest/requirements/IntervalRequirement.java
View File

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -36,7 +36,7 @@ public class IntervalRequirement extends MapleQuestRequirement {
private int interval = -1;
private int questID;
public IntervalRequirement(MapleQuest quest, MapleData data) {
public IntervalRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.INTERVAL);
questID = quest.getId();
processData(data);
@@ -47,7 +47,7 @@ public class IntervalRequirement extends MapleQuestRequirement {
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
interval = MapleDataTool.getInt(data) * 60 * 1000;
}

8
src/main/java/server/quest/requirements/ItemRequirement.java
View File

@@ -25,7 +25,7 @@ import client.Character;
import client.inventory.InventoryType;
import client.inventory.Item;
import constants.inventory.ItemConstants;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
@@ -42,14 +42,14 @@ public class ItemRequirement extends MapleQuestRequirement {
Map<Integer, Integer> items = new HashMap<>();
public ItemRequirement(MapleQuest quest, MapleData data) {
public ItemRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.ITEM);
processData(data);
}
@Override
public void processData(MapleData data) {
for (MapleData itemEntry : data.getChildren()) {
public void processData(Data data) {
for (Data itemEntry : data.getChildren()) {
int itemId = MapleDataTool.getInt(itemEntry.getChildByPath("id"));
int count = MapleDataTool.getInt(itemEntry.getChildByPath("count"), 0);

8
src/main/java/server/quest/requirements/JobRequirement.java
View File

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import client.Job;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -38,7 +38,7 @@ import java.util.List;
public class JobRequirement extends MapleQuestRequirement {
List<Integer> jobs = new ArrayList<>();
public JobRequirement(MapleQuest quest, MapleData data) {
public JobRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.JOB);
processData(data);
}
@@ -48,8 +48,8 @@ public class JobRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
for (MapleData jobEntry : data.getChildren()) {
public void processData(Data data) {
for (Data jobEntry : data.getChildren()) {
jobs.add(MapleDataTool.getInt(jobEntry));
}
}

4
src/main/java/server/quest/requirements/MapleQuestRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import server.quest.MapleQuestRequirementType;
/**
@@ -48,7 +48,7 @@ public abstract class MapleQuestRequirement {
* Processes the data and stores it in the class for future use.
* @param data The data to process.
*/
public abstract void processData(MapleData data);
public abstract void processData(Data data);
public MapleQuestRequirementType getType() {
return type;

6
src/main/java/server/quest/requirements/MaxLevelRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,7 +35,7 @@ public class MaxLevelRequirement extends MapleQuestRequirement {
private int maxLevel;
public MaxLevelRequirement(MapleQuest quest, MapleData data) {
public MaxLevelRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MAX_LEVEL);
processData(data);
}
@@ -45,7 +45,7 @@ public class MaxLevelRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
public void processData(Data data) {
maxLevel = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/requirements/MesoRequirement.java
View File

@@ -20,7 +20,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -32,13 +32,13 @@ import server.quest.MapleQuestRequirementType;
public class MesoRequirement extends MapleQuestRequirement {
private int meso = 0;
public MesoRequirement(MapleQuest quest, MapleData data) {
public MesoRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MESO);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
meso = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/requirements/MinLevelRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,14 +35,14 @@ public class MinLevelRequirement extends MapleQuestRequirement {
private int minLevel;
public MinLevelRequirement(MapleQuest quest, MapleData data) {
public MinLevelRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MIN_LEVEL);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
minLevel = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/requirements/MinTamenessRequirement.java
View File

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import client.inventory.Pet;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -36,7 +36,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement {
private int minTameness;
public MinTamenessRequirement(MapleQuest quest, MapleData data) {
public MinTamenessRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MIN_PET_TAMENESS);
processData(data);
}
@@ -46,7 +46,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
public void processData(Data data) {
minTameness = MapleDataTool.getInt(data);
}

8
src/main/java/server/quest/requirements/MobRequirement.java
View File

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -40,7 +40,7 @@ public class MobRequirement extends MapleQuestRequirement {
Map<Integer, Integer> mobs = new HashMap<>();
private int questID;
public MobRequirement(MapleQuest quest, MapleData data) {
public MobRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MOB);
questID = quest.getId();
processData(data);
@@ -51,8 +51,8 @@ public class MobRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
for (MapleData questEntry : data.getChildren()) {
public void processData(Data data) {
for (Data questEntry : data.getChildren()) {
int mobID = MapleDataTool.getInt(questEntry.getChildByPath("id"));
int countReq = MapleDataTool.getInt(questEntry.getChildByPath("count"));
mobs.put(mobID, countReq);

6
src/main/java/server/quest/requirements/MonsterBookCountRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,13 +35,13 @@ public class MonsterBookCountRequirement extends MapleQuestRequirement {
private int reqCards;
public MonsterBookCountRequirement(MapleQuest quest, MapleData data) {
public MonsterBookCountRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.MONSTER_BOOK);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
reqCards = MapleDataTool.getInt(data);
}

6
src/main/java/server/quest/requirements/NpcRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -34,13 +34,13 @@ import server.quest.MapleQuestRequirementType;
public class NpcRequirement extends MapleQuestRequirement {
private int reqNPC;
public NpcRequirement(MapleQuest quest, MapleData data) {
public NpcRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.NPC);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
reqNPC = MapleDataTool.getInt(data);
}

8
src/main/java/server/quest/requirements/PetRequirement.java
View File

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import client.inventory.Pet;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -39,15 +39,15 @@ public class PetRequirement extends MapleQuestRequirement {
List<Integer> petIDs = new ArrayList<>();
public PetRequirement(MapleQuest quest, MapleData data) {
public PetRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.PET);
processData(data);
}
@Override
public void processData(MapleData data) {
for(MapleData petData : data.getChildren()) {
public void processData(Data data) {
for(Data petData : data.getChildren()) {
petIDs.add(MapleDataTool.getInt(petData.getChildByPath("id")));
}
}

8
src/main/java/server/quest/requirements/QuestRequirement.java
View File

@@ -20,7 +20,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -35,7 +35,7 @@ import java.util.Map;
public class QuestRequirement extends MapleQuestRequirement {
Map<Integer, Integer> quests = new HashMap<>();
public QuestRequirement(MapleQuest quest, MapleData data) {
public QuestRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.QUEST);
processData(data);
}
@@ -45,8 +45,8 @@ public class QuestRequirement extends MapleQuestRequirement {
* @param data
*/
@Override
public void processData(MapleData data) {
for (MapleData questEntry : data.getChildren()) {
public void processData(Data data) {
for (Data questEntry : data.getChildren()) {
int questID = MapleDataTool.getInt(questEntry.getChildByPath("id"));
int stateReq = MapleDataTool.getInt(questEntry.getChildByPath("state"));
quests.put(questID, stateReq);

6
src/main/java/server/quest/requirements/ScriptRequirement.java
View File

@@ -20,7 +20,7 @@
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.Data;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -32,13 +32,13 @@ import server.quest.MapleQuestRequirementType;
public class ScriptRequirement extends MapleQuestRequirement {
private boolean reqScript;
public ScriptRequirement(MapleQuest quest, MapleData data) {
public ScriptRequirement(MapleQuest quest, Data data) {
super(MapleQuestRequirementType.BUFF);
processData(data);
}
@Override
public void processData(MapleData data) {
public void processData(Data data) {
reqScript = !MapleDataTool.getString(data, "").isEmpty();
}