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

Rename and clean up MapleDataType

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:47:26 +02:00
parent 63a2aeee10
commit 48f2647742
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/provider/MapleData.java
View File

@@ -21,14 +21,14 @@
*/ */
package provider; package provider;
import provider.wz.MapleDataType; import provider.wz.DataType;
import java.util.List; import java.util.List;
public interface MapleData extends MapleDataEntity, Iterable<MapleData> { public interface MapleData extends MapleDataEntity, Iterable<MapleData> {
@Override @Override
String getName(); String getName();
MapleDataType getType(); DataType getType();
List<MapleData> getChildren(); List<MapleData> getChildren();
MapleData getChildByPath(String path); MapleData getChildByPath(String path);
Object getData(); Object getData();

12
src/main/java/provider/MapleDataTool.java
View File

@@ -21,7 +21,7 @@
*/ */
package provider; package provider;
import provider.wz.MapleDataType; import provider.wz.DataType;
import java.awt.*; import java.awt.*;
@@ -66,7 +66,7 @@ public class MapleDataTool {
} }
public static int getIntConvert(MapleData data) { public static int getIntConvert(MapleData data) {
if (data.getType() == MapleDataType.STRING) { if (data.getType() == DataType.STRING) {
return Integer.parseInt(getString(data)); return Integer.parseInt(getString(data));
} else { } else {
return getInt(data); return getInt(data);
@@ -77,7 +77,7 @@ public class MapleDataTool {
if (data == null) { if (data == null) {
return def; return def;
} }
if (data.getType() == MapleDataType.STRING) { if (data.getType() == DataType.STRING) {
String dd = getString(data); String dd = getString(data);
if (dd.endsWith("%")) { if (dd.endsWith("%")) {
dd = dd.substring(0, dd.length() - 1); dd = dd.substring(0, dd.length() - 1);
@@ -94,7 +94,7 @@ public class MapleDataTool {
public static int getIntConvert(String path, MapleData data) { public static int getIntConvert(String path, MapleData data) {
MapleData d = data.getChildByPath(path); MapleData d = data.getChildByPath(path);
if (d.getType() == MapleDataType.STRING) { if (d.getType() == DataType.STRING) {
return Integer.parseInt(getString(d)); return Integer.parseInt(getString(d));
} else { } else {
return getInt(d); return getInt(d);
@@ -104,7 +104,7 @@ public class MapleDataTool {
public static int getInt(MapleData data, int def) { public static int getInt(MapleData data, int def) {
if (data == null || data.getData() == null) { if (data == null || data.getData() == null) {
return def; return def;
} else if (data.getType() == MapleDataType.STRING) { } else if (data.getType() == DataType.STRING) {
return Integer.parseInt(getString(data)); return Integer.parseInt(getString(data));
} else { } else {
Object numData = data.getData(); Object numData = data.getData();
@@ -125,7 +125,7 @@ public class MapleDataTool {
if (d == null) { if (d == null) {
return def; return def;
} }
if (d.getType() == MapleDataType.STRING) { if (d.getType() == DataType.STRING) {
try { try {
return Integer.parseInt(getString(d)); return Integer.parseInt(getString(d));
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {

19
src/main/java/provider/wz/MapleDataType.java → src/main/java/provider/wz/DataType.java
View File

@@ -21,6 +21,21 @@
*/ */
package provider.wz; package provider.wz;
public enum MapleDataType { public enum DataType {
NONE, IMG_0x00, SHORT, INT, FLOAT, DOUBLE, STRING, EXTENDED, PROPERTY, CANVAS, VECTOR, CONVEX, SOUND, UOL, UNKNOWN_TYPE, UNKNOWN_EXTENDED_TYPE NONE,
IMG_0x00,
SHORT,
INT,
FLOAT,
DOUBLE,
STRING,
EXTENDED,
PROPERTY,
CANVAS,
VECTOR,
CONVEX,
SOUND,
UOL,
UNKNOWN_TYPE,
UNKNOWN_EXTENDED_TYPE
} }

28
src/main/java/provider/wz/XMLDomMapleData.java
View File

@@ -115,7 +115,7 @@ public class XMLDomMapleData implements MapleData {
@Override @Override
public synchronized Object getData() { public synchronized Object getData() {
NamedNodeMap attributes = node.getAttributes(); NamedNodeMap attributes = node.getAttributes();
MapleDataType type = getType(); DataType type = getType();
switch (type) { switch (type) {
case DOUBLE: case DOUBLE:
case FLOAT: case FLOAT:
@@ -153,34 +153,34 @@ public class XMLDomMapleData implements MapleData {
} }
@Override @Override
public synchronized MapleDataType getType() { public synchronized DataType getType() {
String nodeName = node.getNodeName(); String nodeName = node.getNodeName();
switch (nodeName) { switch (nodeName) {
case "imgdir": case "imgdir":
return MapleDataType.PROPERTY; return DataType.PROPERTY;
case "canvas": case "canvas":
return MapleDataType.CANVAS; return DataType.CANVAS;
case "convex": case "convex":
return MapleDataType.CONVEX; return DataType.CONVEX;
case "sound": case "sound":
return MapleDataType.SOUND; return DataType.SOUND;
case "uol": case "uol":
return MapleDataType.UOL; return DataType.UOL;
case "double": case "double":
return MapleDataType.DOUBLE; return DataType.DOUBLE;
case "float": case "float":
return MapleDataType.FLOAT; return DataType.FLOAT;
case "int": case "int":
return MapleDataType.INT; return DataType.INT;
case "short": case "short":
return MapleDataType.SHORT; return DataType.SHORT;
case "string": case "string":
return MapleDataType.STRING; return DataType.STRING;
case "vector": case "vector":
return MapleDataType.VECTOR; return DataType.VECTOR;
case "null": case "null":
return MapleDataType.IMG_0x00; return DataType.IMG_0x00;
} }
return null; return null;
} }

4
src/main/java/server/life/MapleLifeFactory.java
View File

@@ -25,7 +25,7 @@ import provider.MapleData;
import provider.MapleDataProvider; import provider.MapleDataProvider;
import provider.MapleDataProviderFactory; import provider.MapleDataProviderFactory;
import provider.MapleDataTool; import provider.MapleDataTool;
import provider.wz.MapleDataType; import provider.wz.DataType;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import tools.Pair; import tools.Pair;
import tools.StringUtil; import tools.StringUtil;
@@ -149,7 +149,7 @@ public class MapleLifeFactory {
MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack"); MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack");
int firstAttack = 0; int firstAttack = 0;
if (firstAttackData != null) { if (firstAttackData != null) {
if (firstAttackData.getType() == MapleDataType.FLOAT) { if (firstAttackData.getType() == DataType.FLOAT) {
firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData)); firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData));
} else { } else {
firstAttack = MapleDataTool.getInt(firstAttackData); firstAttack = MapleDataTool.getInt(firstAttackData);

4
src/main/java/tools/mapletools/MonsterStatFetcher.java
View File

@@ -1,7 +1,7 @@
package tools.mapletools; package tools.mapletools;
import provider.*; import provider.*;
import provider.wz.MapleDataType; import provider.wz.DataType;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import server.life.Element; import server.life.Element;
import server.life.ElementalEffectiveness; import server.life.ElementalEffectiveness;
@@ -75,7 +75,7 @@ public class MonsterStatFetcher {
MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack"); MapleData firstAttackData = monsterInfoData.getChildByPath("firstAttack");
int firstAttack = 0; int firstAttack = 0;
if (firstAttackData != null) { if (firstAttackData != null) {
if (firstAttackData.getType() == MapleDataType.FLOAT) { if (firstAttackData.getType() == DataType.FLOAT) {
firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData)); firstAttack = Math.round(MapleDataTool.getFloat(firstAttackData));
} else { } else {
firstAttack = MapleDataTool.getInt(firstAttackData); firstAttack = MapleDataTool.getInt(firstAttackData);