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

Rename and clean up MapleDataDirectoryEntry

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:49:08 +02:00
parent 2281aec440
commit f3cae06288
9 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class SkillFactory {
public static void loadAllSkills() {
final Map<Integer, Skill> loadedSkills = new HashMap<>();
final MapleDataDirectoryEntry root = datasource.getRoot();
final DataDirectoryEntry root = datasource.getRoot();
for (MapleDataFileEntry topDir : root.getFiles()) { // Loop thru jobs
if (topDir.getName().length() <= 8) {
for (Data data : datasource.getData(topDir.getName())) { // Loop thru each jobs

4
src/main/java/constants/game/GameConstants.java
View File

@@ -679,8 +679,8 @@ public class GameConstants {
MapleDataProvider mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP);
int maxMobDmg = 0;
MapleDataDirectoryEntry root = mapSource.getRoot();
for (MapleDataDirectoryEntry objData : root.getSubdirectories()) {
DataDirectoryEntry root = mapSource.getRoot();
for (DataDirectoryEntry objData : root.getSubdirectories()) {
if (!objData.getName().contentEquals("Obj")) {
continue;
}

5
src/main/java/provider/MapleDataDirectoryEntry.java → src/main/java/provider/DataDirectoryEntry.java
View File

@@ -24,11 +24,10 @@ package provider;
import java.util.List;
/**
*
* @author Matze
*/
public interface MapleDataDirectoryEntry extends MapleDataEntry {
List<MapleDataDirectoryEntry> getSubdirectories();
public interface DataDirectoryEntry extends MapleDataEntry {
List<DataDirectoryEntry> getSubdirectories();
List<MapleDataFileEntry> getFiles();
MapleDataEntry getEntry(String name);
}

2
src/main/java/provider/MapleDataProvider.java
View File

@@ -23,5 +23,5 @@ package provider;
public interface MapleDataProvider {
Data getData(String path);
MapleDataDirectoryEntry getRoot();
DataDirectoryEntry getRoot();
}

10
src/main/java/provider/wz/WZDirectoryEntry.java
View File

@@ -21,15 +21,15 @@
*/
package provider.wz;
import provider.MapleDataDirectoryEntry;
import provider.DataDirectoryEntry;
import provider.MapleDataEntity;
import provider.MapleDataEntry;
import provider.MapleDataFileEntry;
import java.util.*;
public class WZDirectoryEntry extends WZEntry implements MapleDataDirectoryEntry {
private List<MapleDataDirectoryEntry> subdirs = new ArrayList<>();
public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
private List<DataDirectoryEntry> subdirs = new ArrayList<>();
private List<MapleDataFileEntry> files = new ArrayList<>();
private Map<String, MapleDataEntry> entries = new HashMap<>();
@@ -41,7 +41,7 @@ public class WZDirectoryEntry extends WZEntry implements MapleDataDirectoryEntry
super(null, 0, 0, null);
}
public void addDirectory(MapleDataDirectoryEntry dir) {
public void addDirectory(DataDirectoryEntry dir) {
subdirs.add(dir);
entries.put(dir.getName(), dir);
}
@@ -51,7 +51,7 @@ public class WZDirectoryEntry extends WZEntry implements MapleDataDirectoryEntry
entries.put(fileEntry.getName(), fileEntry);
}
public List<MapleDataDirectoryEntry> getSubdirectories() {
public List<DataDirectoryEntry> getSubdirectories() {
return Collections.unmodifiableList(subdirs);
}

4
src/main/java/provider/wz/XMLWZFile.java
View File

@@ -22,7 +22,7 @@
package provider.wz;
import provider.Data;
import provider.MapleDataDirectoryEntry;
import provider.DataDirectoryEntry;
import provider.MapleDataProvider;
import java.io.File;
@@ -80,7 +80,7 @@ public class XMLWZFile implements MapleDataProvider {
}
@Override
public MapleDataDirectoryEntry getRoot() {
public DataDirectoryEntry getRoot() {
return rootForNavigation;
}
}

6
src/main/java/server/MapleItemInformationProvider.java
View File

@@ -271,8 +271,8 @@ public class MapleItemInformationProvider {
private Data getItemData(int itemId) {
Data ret = null;
String idStr = "0" + String.valueOf(itemId);
MapleDataDirectoryEntry root = itemData.getRoot();
for (MapleDataDirectoryEntry topDir : root.getSubdirectories()) {
DataDirectoryEntry root = itemData.getRoot();
for (DataDirectoryEntry topDir : root.getSubdirectories()) {
for (MapleDataFileEntry iFile : topDir.getFiles()) {
if (iFile.getName().equals(idStr.substring(0, 4) + ".img")) {
ret = itemData.getData(topDir.getName() + "/" + iFile.getName());
@@ -287,7 +287,7 @@ public class MapleItemInformationProvider {
}
}
root = equipData.getRoot();
for (MapleDataDirectoryEntry topDir : root.getSubdirectories()) {
for (DataDirectoryEntry topDir : root.getSubdirectories()) {
for (MapleDataFileEntry iFile : topDir.getFiles()) {
if (iFile.getName().equals(idStr + ".img")) {
return equipData.getData(topDir.getName() + "/" + iFile.getName());

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

@@ -20,7 +20,7 @@ public class MonsterStatFetcher {
private static final Map<Integer, MapleMonsterStats> monsterStats = new HashMap<>();
static Map<Integer, MapleMonsterStats> getAllMonsterStats() {
MapleDataDirectoryEntry root = data.getRoot();
DataDirectoryEntry root = data.getRoot();
System.out.print("Parsing mob stats... ");
for (MapleDataFileEntry mFile : root.getFiles()) {

10
src/main/java/tools/mapletools/NoItemNameFetcher.java
View File

@@ -163,7 +163,7 @@ public class NoItemNameFetcher {
};
}
private static void readEquipNodeData(MapleDataProvider data, MapleDataDirectoryEntry mDir, String wzFileName, String dirName) {
private static void readEquipNodeData(MapleDataProvider data, DataDirectoryEntry mDir, String wzFileName, String dirName) {
EquipType eqType = getEquipTypeFromDirectoryName(dirName);
for (MapleDataFileEntry mFile : mDir.getFiles()) {
@@ -196,10 +196,10 @@ public class NoItemNameFetcher {
String wzFileName = "Character.wz";
MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.CHARACTER);
MapleDataDirectoryEntry root = data.getRoot();
DataDirectoryEntry root = data.getRoot();
System.out.println("Parsing " + wzFileName + "...");
for (MapleDataDirectoryEntry mDir : root.getSubdirectories()) {
for (DataDirectoryEntry mDir : root.getSubdirectories()) {
String dirName = mDir.getName();
if (dirName.contentEquals("Dragon")) {
continue;
@@ -213,10 +213,10 @@ public class NoItemNameFetcher {
String wzFileName = "Item.wz";
MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM);
MapleDataDirectoryEntry root = data.getRoot();
DataDirectoryEntry root = data.getRoot();
System.out.println("Parsing " + wzFileName + "...");
for (MapleDataDirectoryEntry mDir : root.getSubdirectories()) {
for (DataDirectoryEntry mDir : root.getSubdirectories()) {
String dirName = mDir.getName();
if (dirName.contentEquals("Special")) {
continue;