From f3cae062882ec657b0c6846c577e1954a700d31a Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:49:08 +0200 Subject: [PATCH] Rename and clean up MapleDataDirectoryEntry --- src/main/java/client/SkillFactory.java | 2 +- src/main/java/constants/game/GameConstants.java | 4 ++-- ...DataDirectoryEntry.java => DataDirectoryEntry.java} | 5 ++--- src/main/java/provider/MapleDataProvider.java | 2 +- src/main/java/provider/wz/WZDirectoryEntry.java | 10 +++++----- src/main/java/provider/wz/XMLWZFile.java | 4 ++-- src/main/java/server/MapleItemInformationProvider.java | 6 +++--- src/main/java/tools/mapletools/MonsterStatFetcher.java | 2 +- src/main/java/tools/mapletools/NoItemNameFetcher.java | 10 +++++----- 9 files changed, 22 insertions(+), 23 deletions(-) rename src/main/java/provider/{MapleDataDirectoryEntry.java => DataDirectoryEntry.java} (90%) diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java index 75819f3ea8..326b68cc3f 100644 --- a/src/main/java/client/SkillFactory.java +++ b/src/main/java/client/SkillFactory.java @@ -40,7 +40,7 @@ public class SkillFactory { public static void loadAllSkills() { final Map 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 diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java index cef007965b..3f1fc09be5 100644 --- a/src/main/java/constants/game/GameConstants.java +++ b/src/main/java/constants/game/GameConstants.java @@ -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; } diff --git a/src/main/java/provider/MapleDataDirectoryEntry.java b/src/main/java/provider/DataDirectoryEntry.java similarity index 90% rename from src/main/java/provider/MapleDataDirectoryEntry.java rename to src/main/java/provider/DataDirectoryEntry.java index 8760feb657..beeac136fa 100644 --- a/src/main/java/provider/MapleDataDirectoryEntry.java +++ b/src/main/java/provider/DataDirectoryEntry.java @@ -24,11 +24,10 @@ package provider; import java.util.List; /** - * * @author Matze */ -public interface MapleDataDirectoryEntry extends MapleDataEntry { - List getSubdirectories(); +public interface DataDirectoryEntry extends MapleDataEntry { + List getSubdirectories(); List getFiles(); MapleDataEntry getEntry(String name); } diff --git a/src/main/java/provider/MapleDataProvider.java b/src/main/java/provider/MapleDataProvider.java index eb9aa9bde2..ba9768c8e2 100644 --- a/src/main/java/provider/MapleDataProvider.java +++ b/src/main/java/provider/MapleDataProvider.java @@ -23,5 +23,5 @@ package provider; public interface MapleDataProvider { Data getData(String path); - MapleDataDirectoryEntry getRoot(); + DataDirectoryEntry getRoot(); } diff --git a/src/main/java/provider/wz/WZDirectoryEntry.java b/src/main/java/provider/wz/WZDirectoryEntry.java index a2dd1b35cc..8c2310cf72 100644 --- a/src/main/java/provider/wz/WZDirectoryEntry.java +++ b/src/main/java/provider/wz/WZDirectoryEntry.java @@ -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 subdirs = new ArrayList<>(); +public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry { + private List subdirs = new ArrayList<>(); private List files = new ArrayList<>(); private Map 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 getSubdirectories() { + public List getSubdirectories() { return Collections.unmodifiableList(subdirs); } diff --git a/src/main/java/provider/wz/XMLWZFile.java b/src/main/java/provider/wz/XMLWZFile.java index 926f7718cf..b43e0240d9 100644 --- a/src/main/java/provider/wz/XMLWZFile.java +++ b/src/main/java/provider/wz/XMLWZFile.java @@ -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; } } diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index 1cb26dff22..4cfc290bd5 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -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()); diff --git a/src/main/java/tools/mapletools/MonsterStatFetcher.java b/src/main/java/tools/mapletools/MonsterStatFetcher.java index ca9c5e8b2b..c1d316a7a0 100644 --- a/src/main/java/tools/mapletools/MonsterStatFetcher.java +++ b/src/main/java/tools/mapletools/MonsterStatFetcher.java @@ -20,7 +20,7 @@ public class MonsterStatFetcher { private static final Map monsterStats = new HashMap<>(); static Map getAllMonsterStats() { - MapleDataDirectoryEntry root = data.getRoot(); + DataDirectoryEntry root = data.getRoot(); System.out.print("Parsing mob stats... "); for (MapleDataFileEntry mFile : root.getFiles()) { diff --git a/src/main/java/tools/mapletools/NoItemNameFetcher.java b/src/main/java/tools/mapletools/NoItemNameFetcher.java index 5dc366631e..32df8d97e6 100644 --- a/src/main/java/tools/mapletools/NoItemNameFetcher.java +++ b/src/main/java/tools/mapletools/NoItemNameFetcher.java @@ -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;