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

10
src/main/java/client/SkillFactory.java
View File

@@ -62,8 +62,8 @@ public class SkillFactory {
private static Skill loadFromData(int id, Data data) {
Skill ret = new Skill(id);
boolean isBuff = false;
int skillType = MapleDataTool.getInt("skillType", data, -1);
String elem = MapleDataTool.getString("elemAttr", data, null);
int skillType = DataTool.getInt("skillType", data, -1);
String elem = DataTool.getString("elemAttr", data, null);
if (elem != null) {
ret.setElement(Element.getFromChar(elem.charAt(0)));
} else {
@@ -95,7 +95,7 @@ public class SkillFactory {
Data hit = data.getChildByPath("hit");
Data ball = data.getChildByPath("ball");
isBuff = effect != null && hit == null && ball == null;
isBuff |= action_ != null && MapleDataTool.getString("0", action_, "").equals("alert2");
isBuff |= action_ != null && DataTool.getString("0", action_, "").equals("alert2");
switch (id) {
case Hero.RUSH:
case Paladin.RUSH:
@@ -323,7 +323,7 @@ public class SkillFactory {
ret.setAnimationTime(0);
if (effect != null) {
for (Data effectEntry : effect) {
ret.incAnimationTime(MapleDataTool.getIntConvert("delay", effectEntry, 0));
ret.incAnimationTime(DataTool.getIntConvert("delay", effectEntry, 0));
}
}
return ret;
@@ -340,7 +340,7 @@ public class SkillFactory {
if (data.getChildByPath(skill.toString()) != null) {
for (Data skilldata : data.getChildByPath(skill.toString()).getChildren()) {
if (skilldata.getName().equals("name"))
return MapleDataTool.getString(skilldata, null);
return DataTool.getString(skilldata, null);
}
}

8
src/main/java/client/command/commands/gm2/SearchCommand.java
View File

@@ -29,7 +29,7 @@ import client.command.Command;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
import provider.MapleDataTool;
import provider.DataTool;
import provider.wz.WZFiles;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
@@ -86,7 +86,7 @@ public class SearchCommand extends Command {
if (searchType == 0) {
for (Data searchData : data.getChildren()) {
name = MapleDataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
name = DataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
if (name.toLowerCase().contains(search.toLowerCase())) {
sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(name).append("\r\n");
}
@@ -96,8 +96,8 @@ public class SearchCommand extends Command {
for (Data searchDataDir : data.getChildren()) {
for (Data searchData : searchDataDir.getChildren()) {
mapName = MapleDataTool.getString(searchData.getChildByPath("mapName"), "NO-NAME");
streetName = MapleDataTool.getString(searchData.getChildByPath("streetName"), "NO-NAME");
mapName = DataTool.getString(searchData.getChildByPath("mapName"), "NO-NAME");
streetName = DataTool.getString(searchData.getChildByPath("streetName"), "NO-NAME");
if (mapName.toLowerCase().contains(search.toLowerCase()) || streetName.toLowerCase().contains(search.toLowerCase())) {
sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(streetName).append(" - ").append(mapName).append("\r\n");

8
src/main/java/client/inventory/PetDataFactory.java
View File

@@ -24,7 +24,7 @@ package client.inventory;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
import provider.MapleDataTool;
import provider.DataTool;
import provider.wz.WZFiles;
import java.util.HashMap;
@@ -51,8 +51,8 @@ public class PetDataFactory {
int prob = 0;
int inc = 0;
if (skillData != null) {
prob = MapleDataTool.getInt("interact/" + skillId + "/prob", skillData, 0);
inc = MapleDataTool.getInt("interact/" + skillId + "/inc", skillData, 0);
prob = DataTool.getInt("interact/" + skillId + "/prob", skillData, 0);
inc = DataTool.getInt("interact/" + skillId + "/inc", skillData, 0);
}
ret = new PetCommand(petId, skillId, prob, inc);
petCommands.put(petId + "" + skillId, ret);
@@ -69,7 +69,7 @@ public class PetDataFactory {
synchronized (petHunger) {
ret = petHunger.get(petId);
if (ret == null) {
ret = MapleDataTool.getInt(dataRoot.getData("Pet/" + petId + ".img").getChildByPath("info/hungry"), 1);
ret = DataTool.getInt(dataRoot.getData("Pet/" + petId + ".img").getChildByPath("info/hungry"), 1);
}
return ret;
}

4
src/main/java/client/processor/action/SpawnPetProcessor.java
View File

@@ -27,7 +27,7 @@ import client.inventory.Pet;
import client.inventory.manipulator.InventoryManipulator;
import provider.DataProvider;
import provider.DataProviderFactory;
import provider.MapleDataTool;
import provider.DataTool;
import provider.wz.WZFiles;
import tools.PacketCreator;
@@ -55,7 +55,7 @@ public class SpawnPetProcessor {
c.sendPacket(PacketCreator.enableActions());
return;
} else {
int evolveid = MapleDataTool.getInt("info/evol1", dataRoot.getData("Pet/" + petid + ".img"));
int evolveid = DataTool.getInt("info/evol1", dataRoot.getData("Pet/" + petid + ".img"));
int petId = Pet.createPet(evolveid);
if (petId == -1) {
return;