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

Rename and clean up MapleDataTool

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:52:32 +02:00
parent 5089f23f79
commit 2332458ed9
56 changed files with 493 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import config.YamlConfig;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
import provider.MapleDataTool;
import provider.DataTool;
import provider.wz.WZFiles;
import server.quest.actions.*;
import server.quest.requirements.*;
@@ -84,16 +84,16 @@ public class MapleQuest {
if(questInfo != null) {
Data reqInfo = questInfo.getChildByPath(String.valueOf(id));
if(reqInfo != null) {
name = MapleDataTool.getString("name", reqInfo, "");
parent = MapleDataTool.getString("parent", reqInfo, "");
name = DataTool.getString("name", reqInfo, "");
parent = DataTool.getString("parent", reqInfo, "");
timeLimit = MapleDataTool.getInt("timeLimit", reqInfo, 0);
timeLimit2 = MapleDataTool.getInt("timeLimit2", reqInfo, 0);
autoStart = MapleDataTool.getInt("autoStart", reqInfo, 0) == 1;
autoPreComplete = MapleDataTool.getInt("autoPreComplete", reqInfo, 0) == 1;
autoComplete = MapleDataTool.getInt("autoComplete", reqInfo, 0) == 1;
timeLimit = DataTool.getInt("timeLimit", reqInfo, 0);
timeLimit2 = DataTool.getInt("timeLimit2", reqInfo, 0);
autoStart = DataTool.getInt("autoStart", reqInfo, 0) == 1;
autoPreComplete = DataTool.getInt("autoPreComplete", reqInfo, 0) == 1;
autoComplete = DataTool.getInt("autoComplete", reqInfo, 0) == 1;
int medalid = MapleDataTool.getInt("viewMedalItem", reqInfo, 0);
int medalid = DataTool.getInt("viewMedalItem", reqInfo, 0);
if(medalid != 0) medals.put(this.id, medalid);
} else {
System.out.println("no data " + id);
@@ -108,7 +108,7 @@ public class MapleQuest {
repeatable = true;
} else if (type.equals(MapleQuestRequirementType.MOB)) {
for (Data mob : startReq.getChildren()) {
relevantMobs.add(MapleDataTool.getInt(mob.getChildByPath("id")));
relevantMobs.add(DataTool.getInt(mob.getChildByPath("id")));
}
}
@@ -133,7 +133,7 @@ public class MapleQuest {
if (type.equals(MapleQuestRequirementType.MOB)) {
for (Data mob : completeReq.getChildren()) {
relevantMobs.add(MapleDataTool.getInt(mob.getChildByPath("id")));
relevantMobs.add(DataTool.getInt(mob.getChildByPath("id")));
}
}
completeReqs.put(type, req);

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

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -47,7 +47,7 @@ public class BuffAction extends MapleQuestAction {
@Override
public void processData(Data data) {
itemEffect = MapleDataTool.getInt(data);
itemEffect = DataTool.getInt(data);
}
@Override

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

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import config.YamlConfig;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -43,7 +43,7 @@ public class ExpAction extends MapleQuestAction {
@Override
public void processData(Data data) {
exp = MapleDataTool.getInt(data);
exp = DataTool.getInt(data);
}
@Override

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

@@ -23,7 +23,7 @@ package server.quest.actions;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -43,7 +43,7 @@ public class FameAction extends MapleQuestAction {
@Override
public void processData(Data data) {
fame = MapleDataTool.getInt(data);
fame = DataTool.getInt(data);
}
@Override

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

@@ -21,7 +21,7 @@ package server.quest.actions;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -42,7 +42,7 @@ public class InfoAction extends MapleQuestAction {
@Override
public void processData(Data data) {
info = MapleDataTool.getString(data, "");
info = DataTool.getString(data, "");
}

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

@@ -28,7 +28,7 @@ import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import constants.inventory.ItemConstants;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -59,22 +59,22 @@ public class ItemAction extends MapleQuestAction {
@Override
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);
int id = DataTool.getInt(iEntry.getChildByPath("id"));
int count = DataTool.getInt(iEntry.getChildByPath("count"), 1);
int period = DataTool.getInt(iEntry.getChildByPath("period"), 0);
Integer prop = null;
Data propData = iEntry.getChildByPath("prop");
if(propData != null)
prop = MapleDataTool.getInt(propData);
prop = DataTool.getInt(propData);
int gender = 2;
if (iEntry.getChildByPath("gender") != null)
gender = MapleDataTool.getInt(iEntry.getChildByPath("gender"));
gender = DataTool.getInt(iEntry.getChildByPath("gender"));
int job = -1;
if (iEntry.getChildByPath("job") != null)
job = MapleDataTool.getInt(iEntry.getChildByPath("job"));
job = DataTool.getInt(iEntry.getChildByPath("job"));
items.add(new ItemData(Integer.parseInt(iEntry.getName()), id, count, prop, job, gender, period));
}

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

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import config.YamlConfig;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -44,7 +44,7 @@ public class MesoAction extends MapleQuestAction {
@Override
public void processData(Data data) {
mesos = MapleDataTool.getInt(data);
mesos = DataTool.getInt(data);
}
@Override

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

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import client.QuestStatus;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
import tools.PacketCreator;
@@ -44,7 +44,7 @@ public class NextQuestAction extends MapleQuestAction {
@Override
public void processData(Data data) {
nextQuest = MapleDataTool.getInt(data);
nextQuest = DataTool.getInt(data);
}
@Override

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

@@ -25,7 +25,7 @@ import client.Character;
import client.QuestStatus;
import constants.inventory.ItemConstants;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -45,7 +45,7 @@ public class PetSkillAction extends MapleQuestAction {
@Override
public void processData(Data data) {
flag = MapleDataTool.getInt("petskill", data);
flag = DataTool.getInt("petskill", data);
}
@Override

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

@@ -23,7 +23,7 @@ import client.Character;
import client.Client;
import client.inventory.Pet;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -43,7 +43,7 @@ public class PetTamenessAction extends MapleQuestAction {
@Override
public void processData(Data data) {
tameness = MapleDataTool.getInt(data);
tameness = DataTool.getInt(data);
}
@Override

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

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import client.QuestStatus;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -49,8 +49,8 @@ public class QuestAction extends MapleQuestAction {
@Override
public void processData(Data data) {
for (Data qEntry : data) {
int questid = MapleDataTool.getInt(qEntry.getChildByPath("id"));
int stat = MapleDataTool.getInt(qEntry.getChildByPath("state"));
int questid = DataTool.getInt(qEntry.getChildByPath("id"));
int stat = DataTool.getInt(qEntry.getChildByPath("state"));
quests.put(questid, stat);
}
}

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

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

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

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

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

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

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -42,7 +42,7 @@ public class CompletedQuestRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
reqQuest = MapleDataTool.getInt(data);
reqQuest = DataTool.getInt(data);
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -48,7 +48,7 @@ public class EndDateRequirement extends MapleQuestRequirement {
*/
@Override
public void processData(Data data) {
timeStr = MapleDataTool.getString(data);
timeStr = DataTool.getString(data);
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -44,7 +44,7 @@ public class FieldEnterRequirement extends MapleQuestRequirement {
public void processData(Data data) {
Data zeroField = data.getChildByPath("0");
if (zeroField != null) {
mapId = MapleDataTool.getInt(zeroField);
mapId = DataTool.getInt(zeroField);
}
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -50,7 +50,7 @@ public class InfoExRequirement extends MapleQuestRequirement {
// Because we have to...
for(Data infoEx : data.getChildren()) {
Data value = infoEx.getChildByPath("value");
infoExpected.add(MapleDataTool.getString(value, ""));
infoExpected.add(DataTool.getString(value, ""));
}
}

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

@@ -21,7 +21,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -42,7 +42,7 @@ public class InfoNumberRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
infoNumber = (short) MapleDataTool.getIntConvert(data, 0);
infoNumber = (short) DataTool.getIntConvert(data, 0);
}

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

@@ -24,7 +24,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -48,7 +48,7 @@ public class IntervalRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
interval = MapleDataTool.getInt(data) * 60 * 1000;
interval = DataTool.getInt(data) * 60 * 1000;
}
private static String getIntervalTimeLeft(Character chr, IntervalRequirement r) {

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

@@ -26,7 +26,7 @@ import client.inventory.InventoryType;
import client.inventory.Item;
import constants.inventory.ItemConstants;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -50,8 +50,8 @@ public class ItemRequirement extends MapleQuestRequirement {
@Override
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);
int itemId = DataTool.getInt(itemEntry.getChildByPath("id"));
int count = DataTool.getInt(itemEntry.getChildByPath("count"), 0);
items.put(itemId, count);
}

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

@@ -24,7 +24,7 @@ package server.quest.requirements;
import client.Character;
import client.Job;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -50,7 +50,7 @@ public class JobRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
for (Data jobEntry : data.getChildren()) {
jobs.add(MapleDataTool.getInt(jobEntry));
jobs.add(DataTool.getInt(jobEntry));
}
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -46,7 +46,7 @@ public class MaxLevelRequirement extends MapleQuestRequirement {
*/
@Override
public void processData(Data data) {
maxLevel = MapleDataTool.getInt(data);
maxLevel = DataTool.getInt(data);
}

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

@@ -21,7 +21,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -39,7 +39,7 @@ public class MesoRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
meso = MapleDataTool.getInt(data);
meso = DataTool.getInt(data);
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -43,7 +43,7 @@ public class MinLevelRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
minLevel = MapleDataTool.getInt(data);
minLevel = DataTool.getInt(data);
}

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

@@ -24,7 +24,7 @@ package server.quest.requirements;
import client.Character;
import client.inventory.Pet;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -47,7 +47,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement {
*/
@Override
public void processData(Data data) {
minTameness = MapleDataTool.getInt(data);
minTameness = DataTool.getInt(data);
}

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

@@ -24,7 +24,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import tools.FilePrinter;
@@ -53,8 +53,8 @@ public class MobRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
for (Data questEntry : data.getChildren()) {
int mobID = MapleDataTool.getInt(questEntry.getChildByPath("id"));
int countReq = MapleDataTool.getInt(questEntry.getChildByPath("count"));
int mobID = DataTool.getInt(questEntry.getChildByPath("id"));
int countReq = DataTool.getInt(questEntry.getChildByPath("count"));
mobs.put(mobID, countReq);
}
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -42,7 +42,7 @@ public class MonsterBookCountRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
reqCards = MapleDataTool.getInt(data);
reqCards = DataTool.getInt(data);
}

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

@@ -23,7 +23,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -41,7 +41,7 @@ public class NpcRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
reqNPC = MapleDataTool.getInt(data);
reqNPC = DataTool.getInt(data);
}

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

@@ -24,7 +24,7 @@ package server.quest.requirements;
import client.Character;
import client.inventory.Pet;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -48,7 +48,7 @@ public class PetRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
for(Data petData : data.getChildren()) {
petIDs.add(MapleDataTool.getInt(petData.getChildByPath("id")));
petIDs.add(DataTool.getInt(petData.getChildByPath("id")));
}
}

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

@@ -21,7 +21,7 @@ package server.quest.requirements;
import client.Character;
import client.QuestStatus;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -47,8 +47,8 @@ public class QuestRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
for (Data questEntry : data.getChildren()) {
int questID = MapleDataTool.getInt(questEntry.getChildByPath("id"));
int stateReq = MapleDataTool.getInt(questEntry.getChildByPath("state"));
int questID = DataTool.getInt(questEntry.getChildByPath("id"));
int stateReq = DataTool.getInt(questEntry.getChildByPath("state"));
quests.put(questID, stateReq);
}
}

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

@@ -21,7 +21,7 @@ package server.quest.requirements;
import client.Character;
import provider.Data;
import provider.MapleDataTool;
import provider.DataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
@@ -39,7 +39,7 @@ public class ScriptRequirement extends MapleQuestRequirement {
@Override
public void processData(Data data) {
reqScript = !MapleDataTool.getString(data, "").isEmpty();
reqScript = !DataTool.getString(data, "").isEmpty();
}
@Override