diff --git a/src/main/java/provider/MapleData.java b/src/main/java/provider/MapleData.java index 0fd0a6883c..f61409c46f 100644 --- a/src/main/java/provider/MapleData.java +++ b/src/main/java/provider/MapleData.java @@ -21,14 +21,14 @@ */ package provider; -import provider.wz.MapleDataType; +import provider.wz.DataType; import java.util.List; public interface MapleData extends MapleDataEntity, Iterable { @Override String getName(); - MapleDataType getType(); + DataType getType(); List getChildren(); MapleData getChildByPath(String path); Object getData(); diff --git a/src/main/java/provider/MapleDataTool.java b/src/main/java/provider/MapleDataTool.java index a1761632fe..b5c01c1c03 100644 --- a/src/main/java/provider/MapleDataTool.java +++ b/src/main/java/provider/MapleDataTool.java @@ -21,7 +21,7 @@ */ package provider; -import provider.wz.MapleDataType; +import provider.wz.DataType; import java.awt.*; @@ -66,7 +66,7 @@ public class MapleDataTool { } public static int getIntConvert(MapleData data) { - if (data.getType() == MapleDataType.STRING) { + if (data.getType() == DataType.STRING) { return Integer.parseInt(getString(data)); } else { return getInt(data); @@ -77,7 +77,7 @@ public class MapleDataTool { if (data == null) { return def; } - if (data.getType() == MapleDataType.STRING) { + if (data.getType() == DataType.STRING) { String dd = getString(data); if (dd.endsWith("%")) { dd = dd.substring(0, dd.length() - 1); @@ -94,7 +94,7 @@ public class MapleDataTool { public static int getIntConvert(String path, MapleData data) { MapleData d = data.getChildByPath(path); - if (d.getType() == MapleDataType.STRING) { + if (d.getType() == DataType.STRING) { return Integer.parseInt(getString(d)); } else { return getInt(d); @@ -104,7 +104,7 @@ public class MapleDataTool { public static int getInt(MapleData data, int def) { if (data == null || data.getData() == null) { return def; - } else if (data.getType() == MapleDataType.STRING) { + } else if (data.getType() == DataType.STRING) { return Integer.parseInt(getString(data)); } else { Object numData = data.getData(); @@ -125,7 +125,7 @@ public class MapleDataTool { if (d == null) { return def; } - if (d.getType() == MapleDataType.STRING) { + if (d.getType() == DataType.STRING) { try { return Integer.parseInt(getString(d)); } catch (NumberFormatException nfe) { diff --git a/src/main/java/provider/wz/MapleDataType.java b/src/main/java/provider/wz/DataType.java similarity index 81% rename from src/main/java/provider/wz/MapleDataType.java rename to src/main/java/provider/wz/DataType.java index 517d8e55ea..4e86840609 100644 --- a/src/main/java/provider/wz/MapleDataType.java +++ b/src/main/java/provider/wz/DataType.java @@ -21,6 +21,21 @@ */ package provider.wz; -public enum MapleDataType { - NONE, IMG_0x00, SHORT, INT, FLOAT, DOUBLE, STRING, EXTENDED, PROPERTY, CANVAS, VECTOR, CONVEX, SOUND, UOL, UNKNOWN_TYPE, UNKNOWN_EXTENDED_TYPE +public enum DataType { + NONE, + IMG_0x00, + SHORT, + INT, + FLOAT, + DOUBLE, + STRING, + EXTENDED, + PROPERTY, + CANVAS, + VECTOR, + CONVEX, + SOUND, + UOL, + UNKNOWN_TYPE, + UNKNOWN_EXTENDED_TYPE } \ No newline at end of file diff --git a/src/main/java/provider/wz/XMLDomMapleData.java b/src/main/java/provider/wz/XMLDomMapleData.java index 64702b76e1..fda361e194 100644 --- a/src/main/java/provider/wz/XMLDomMapleData.java +++ b/src/main/java/provider/wz/XMLDomMapleData.java @@ -115,7 +115,7 @@ public class XMLDomMapleData implements MapleData { @Override public synchronized Object getData() { NamedNodeMap attributes = node.getAttributes(); - MapleDataType type = getType(); + DataType type = getType(); switch (type) { case DOUBLE: case FLOAT: @@ -153,34 +153,34 @@ public class XMLDomMapleData implements MapleData { } @Override - public synchronized MapleDataType getType() { + public synchronized DataType getType() { String nodeName = node.getNodeName(); switch (nodeName) { case "imgdir": - return MapleDataType.PROPERTY; + return DataType.PROPERTY; case "canvas": - return MapleDataType.CANVAS; + return DataType.CANVAS; case "convex": - return MapleDataType.CONVEX; + return DataType.CONVEX; case "sound": - return MapleDataType.SOUND; + return DataType.SOUND; case "uol": - return MapleDataType.UOL; + return DataType.UOL; case "double": - return MapleDataType.DOUBLE; + return DataType.DOUBLE; case "float": - return MapleDataType.FLOAT; + return DataType.FLOAT; case "int": - return MapleDataType.INT; + return DataType.INT; case "short": - return MapleDataType.SHORT; + return DataType.SHORT; case "string": - return MapleDataType.STRING; + return DataType.STRING; case "vector": - return MapleDataType.VECTOR; + return DataType.VECTOR; case "null": - return MapleDataType.IMG_0x00; + return DataType.IMG_0x00; } return null; } diff --git a/src/main/java/server/life/MapleLifeFactory.java b/src/main/java/server/life/MapleLifeFactory.java index 556a8953c9..859f1ef795 100644 --- a/src/main/java/server/life/MapleLifeFactory.java +++ b/src/main/java/server/life/MapleLifeFactory.java @@ -25,7 +25,7 @@ import provider.MapleData; import provider.MapleDataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; -import provider.wz.MapleDataType; +import provider.wz.DataType; import provider.wz.WZFiles; import tools.Pair; import tools.StringUtil; @@ -149,7 +149,7 @@ public class MapleLifeFactory { MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack"); int firstAttack = 0; if (firstAttackData != null) { - if (firstAttackData.getType() == MapleDataType.FLOAT) { + if (firstAttackData.getType() == DataType.FLOAT) { firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData)); } else { firstAttack = MapleDataTool.getInt(firstAttackData); diff --git a/src/main/java/tools/mapletools/MonsterStatFetcher.java b/src/main/java/tools/mapletools/MonsterStatFetcher.java index 61cbe5a2cc..e57667fd69 100644 --- a/src/main/java/tools/mapletools/MonsterStatFetcher.java +++ b/src/main/java/tools/mapletools/MonsterStatFetcher.java @@ -1,7 +1,7 @@ package tools.mapletools; import provider.*; -import provider.wz.MapleDataType; +import provider.wz.DataType; import provider.wz.WZFiles; import server.life.Element; import server.life.ElementalEffectiveness; @@ -75,7 +75,7 @@ public class MonsterStatFetcher { MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack"); int firstAttack = 0; if (firstAttackData != null) { - if (firstAttackData.getType() == MapleDataType.FLOAT) { + if (firstAttackData.getType() == DataType.FLOAT) { firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData)); } else { firstAttack = MapleDataTool.getInt(firstAttackData);