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

Rename and clean up MapleDataFileEntry

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:50:40 +02:00
parent eb935b4143
commit ae59916e98
9 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -685,7 +685,7 @@ public class GameConstants {
continue;
}
for (MapleDataFileEntry obj : objData.getFiles()) {
for (DataFileEntry obj : objData.getFiles()) {
for (Data l0 : mapSource.getData(objData.getName() + "/" + obj.getName()).getChildren()) {
for (Data l1 : l0.getChildren()) {
for (Data l2 : l1.getChildren()) {

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

@@ -28,6 +28,6 @@ import java.util.List;
*/
public interface DataDirectoryEntry extends DataEntry {
List<DataDirectoryEntry> getSubdirectories();
List<MapleDataFileEntry> getFiles();
List<DataFileEntry> getFiles();
DataEntry getEntry(String name);
}

3
src/main/java/provider/MapleDataFileEntry.java → src/main/java/provider/DataFileEntry.java
View File

@@ -22,9 +22,8 @@
package provider;
/**
*
* @author Matze
*/
public interface MapleDataFileEntry extends DataEntry {
public interface DataFileEntry extends DataEntry {
void setOffset(int offset);
}

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

@@ -24,13 +24,13 @@ package provider.wz;
import provider.DataDirectoryEntry;
import provider.DataEntity;
import provider.DataEntry;
import provider.MapleDataFileEntry;
import provider.DataFileEntry;
import java.util.*;
public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
private List<DataDirectoryEntry> subdirs = new ArrayList<>();
private List<MapleDataFileEntry> files = new ArrayList<>();
private List<DataFileEntry> files = new ArrayList<>();
private Map<String, DataEntry> entries = new HashMap<>();
public WZDirectoryEntry(String name, int size, int checksum, DataEntity parent) {
@@ -46,7 +46,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
entries.put(dir.getName(), dir);
}
public void addFile(MapleDataFileEntry fileEntry) {
public void addFile(DataFileEntry fileEntry) {
files.add(fileEntry);
entries.put(fileEntry.getName(), fileEntry);
}
@@ -55,7 +55,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
return Collections.unmodifiableList(subdirs);
}
public List<MapleDataFileEntry> getFiles() {
public List<DataFileEntry> getFiles() {
return Collections.unmodifiableList(files);
}

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

@@ -22,9 +22,9 @@
package provider.wz;
import provider.DataEntity;
import provider.MapleDataFileEntry;
import provider.DataFileEntry;
public class WZFileEntry extends WZEntry implements MapleDataFileEntry {
public class WZFileEntry extends WZEntry implements DataFileEntry {
private int offset;
public WZFileEntry(String name, int size, int checksum, DataEntity parent) {

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

@@ -273,7 +273,7 @@ public class MapleItemInformationProvider {
String idStr = "0" + String.valueOf(itemId);
DataDirectoryEntry root = itemData.getRoot();
for (DataDirectoryEntry topDir : root.getSubdirectories()) {
for (MapleDataFileEntry iFile : topDir.getFiles()) {
for (DataFileEntry iFile : topDir.getFiles()) {
if (iFile.getName().equals(idStr.substring(0, 4) + ".img")) {
ret = itemData.getData(topDir.getName() + "/" + iFile.getName());
if (ret == null) {
@@ -288,7 +288,7 @@ public class MapleItemInformationProvider {
}
root = equipData.getRoot();
for (DataDirectoryEntry topDir : root.getSubdirectories()) {
for (MapleDataFileEntry iFile : topDir.getFiles()) {
for (DataFileEntry 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

@@ -23,7 +23,7 @@ public class MonsterStatFetcher {
DataDirectoryEntry root = data.getRoot();
System.out.print("Parsing mob stats... ");
for (MapleDataFileEntry mFile : root.getFiles()) {
for (DataFileEntry mFile : root.getFiles()) {
try {
String fileName = mFile.getName();

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

@@ -166,7 +166,7 @@ public class NoItemNameFetcher {
private static void readEquipNodeData(MapleDataProvider data, DataDirectoryEntry mDir, String wzFileName, String dirName) {
EquipType eqType = getEquipTypeFromDirectoryName(dirName);
for (MapleDataFileEntry mFile : mDir.getFiles()) {
for (DataFileEntry mFile : mDir.getFiles()) {
String fileName = mFile.getName();
try {
@@ -224,7 +224,7 @@ public class NoItemNameFetcher {
curType = getItemTypeFromDirectoryName(dirName);
if (!dirName.contentEquals("Pet")) {
for (MapleDataFileEntry mFile : mDir.getFiles()) {
for (DataFileEntry mFile : mDir.getFiles()) {
String fileName = mFile.getName();
Data fileData = data.getData(dirName + "/" + fileName);