From 1592d3efc8953105f758cc18bde85b723ea27db3 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:51:05 +0200 Subject: [PATCH] Rename and clean up MapleDataProvider --- src/main/java/client/SkillFactory.java | 2 +- .../client/command/commands/gm2/SearchCommand.java | 4 ++-- src/main/java/client/inventory/PetDataFactory.java | 4 ++-- .../client/processor/action/SpawnPetProcessor.java | 4 ++-- src/main/java/constants/game/GameConstants.java | 2 +- .../{MapleDataProvider.java => DataProvider.java} | 2 +- .../java/provider/MapleDataProviderFactory.java | 4 ++-- src/main/java/provider/wz/XMLWZFile.java | 4 ++-- src/main/java/server/CashShop.java | 4 ++-- .../java/server/MapleItemInformationProvider.java | 8 ++++---- .../server/MapleSkillbookInformationProvider.java | 4 ++-- src/main/java/server/MapleStorage.java | 6 +++--- src/main/java/server/events/gm/MapleOxQuiz.java | 4 ++-- src/main/java/server/life/MapleLifeFactory.java | 8 ++++---- .../life/MapleMonsterInformationProvider.java | 6 +++--- .../java/server/life/MaplePlayerNPCFactory.java | 14 +++++++------- .../java/server/life/MobAttackInfoFactory.java | 4 ++-- src/main/java/server/life/MobSkillFactory.java | 4 ++-- src/main/java/server/maps/MapleMapFactory.java | 4 ++-- src/main/java/server/maps/MapleReactorFactory.java | 4 ++-- .../server/partyquest/MapleCarnivalFactory.java | 4 ++-- src/main/java/server/quest/MapleQuest.java | 4 ++-- .../java/tools/mapletools/MonsterStatFetcher.java | 4 ++-- .../java/tools/mapletools/NoItemNameFetcher.java | 8 ++++---- 24 files changed, 58 insertions(+), 58 deletions(-) rename src/main/java/provider/{MapleDataProvider.java => DataProvider.java} (96%) diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java index 8a80c8d06b..90c53a5a83 100644 --- a/src/main/java/client/SkillFactory.java +++ b/src/main/java/client/SkillFactory.java @@ -32,7 +32,7 @@ import java.util.Map; public class SkillFactory { private static volatile Map skills = new HashMap<>(); - private static final MapleDataProvider datasource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private static final DataProvider datasource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); public static Skill getSkill(int id) { return skills.get(id); diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index 0b82ab1a26..3897b825de 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/src/main/java/client/command/commands/gm2/SearchCommand.java @@ -27,7 +27,7 @@ import client.Character; import client.Client; import client.command.Command; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -44,7 +44,7 @@ public class SearchCommand extends Command { { setDescription("Search String.wz."); - MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); npcStringData = dataProvider.getData("Npc.img"); mobStringData = dataProvider.getData("Mob.img"); skillStringData = dataProvider.getData("Skill.img"); diff --git a/src/main/java/client/inventory/PetDataFactory.java b/src/main/java/client/inventory/PetDataFactory.java index e1d271e07b..c23fe77aa4 100644 --- a/src/main/java/client/inventory/PetDataFactory.java +++ b/src/main/java/client/inventory/PetDataFactory.java @@ -22,7 +22,7 @@ package client.inventory; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -35,7 +35,7 @@ import java.util.Map; * @author Danny (Leifde) */ public class PetDataFactory { - private static MapleDataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + private static DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); private static Map petCommands = new HashMap<>(); private static Map petHunger = new HashMap<>(); diff --git a/src/main/java/client/processor/action/SpawnPetProcessor.java b/src/main/java/client/processor/action/SpawnPetProcessor.java index 90170b4273..4c6c454bbd 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -25,7 +25,7 @@ import client.SkillFactory; import client.inventory.InventoryType; import client.inventory.Pet; import client.inventory.manipulator.InventoryManipulator; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -38,7 +38,7 @@ import java.awt.*; * @author RonanLana - just added locking on OdinMS' SpawnPetHandler method body */ public class SpawnPetProcessor { - private static final MapleDataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + private static final DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); public static void processSpawnPet(Client c, byte slot, boolean lead) { if (c.tryacquireClient()) { diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java index 05d5c6d5ed..479c72e419 100644 --- a/src/main/java/constants/game/GameConstants.java +++ b/src/main/java/constants/game/GameConstants.java @@ -676,7 +676,7 @@ public class GameConstants { } private static int getMaxObstacleMobDamageFromWz() { - MapleDataProvider mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); + DataProvider mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); int maxMobDmg = 0; DataDirectoryEntry root = mapSource.getRoot(); diff --git a/src/main/java/provider/MapleDataProvider.java b/src/main/java/provider/DataProvider.java similarity index 96% rename from src/main/java/provider/MapleDataProvider.java rename to src/main/java/provider/DataProvider.java index ba9768c8e2..9fbed8ba19 100644 --- a/src/main/java/provider/MapleDataProvider.java +++ b/src/main/java/provider/DataProvider.java @@ -21,7 +21,7 @@ */ package provider; -public interface MapleDataProvider { +public interface DataProvider { Data getData(String path); DataDirectoryEntry getRoot(); } diff --git a/src/main/java/provider/MapleDataProviderFactory.java b/src/main/java/provider/MapleDataProviderFactory.java index b932250a6b..cd26c02395 100644 --- a/src/main/java/provider/MapleDataProviderFactory.java +++ b/src/main/java/provider/MapleDataProviderFactory.java @@ -27,11 +27,11 @@ import provider.wz.XMLWZFile; import java.io.File; public class MapleDataProviderFactory { - private static MapleDataProvider getWZ(File in) { + private static DataProvider getWZ(File in) { return new XMLWZFile(in); } - public static MapleDataProvider getDataProvider(WZFiles in) { + public static DataProvider getDataProvider(WZFiles in) { return getWZ(in.getFile()); } } \ No newline at end of file diff --git a/src/main/java/provider/wz/XMLWZFile.java b/src/main/java/provider/wz/XMLWZFile.java index b43e0240d9..70f98d77f2 100644 --- a/src/main/java/provider/wz/XMLWZFile.java +++ b/src/main/java/provider/wz/XMLWZFile.java @@ -23,14 +23,14 @@ package provider.wz; import provider.Data; import provider.DataDirectoryEntry; -import provider.MapleDataProvider; +import provider.DataProvider; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -public class XMLWZFile implements MapleDataProvider { +public class XMLWZFile implements DataProvider { private File root; private WZDirectoryEntry rootForNavigation; diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index 1af9e4ec9f..b2c7b3a72d 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -28,7 +28,7 @@ import net.server.Server; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -149,7 +149,7 @@ public class CashShop { private static volatile List specialcashitems = new ArrayList<>(); public static void loadAllCashItems() { - MapleDataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); Map loadedItems = new HashMap<>(); List onSaleItems = new ArrayList<>(); diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index 1c4f69cf75..4059fc6190 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -58,10 +58,10 @@ public class MapleItemInformationProvider { return instance; } - protected MapleDataProvider itemData; - protected MapleDataProvider equipData; - protected MapleDataProvider stringData; - protected MapleDataProvider etcData; + protected DataProvider itemData; + protected DataProvider equipData; + protected DataProvider stringData; + protected DataProvider etcData; protected Data cashStringData; protected Data consumeStringData; protected Data eqpStringData; diff --git a/src/main/java/server/MapleSkillbookInformationProvider.java b/src/main/java/server/MapleSkillbookInformationProvider.java index f7e34eaeaf..22a8ff39f7 100644 --- a/src/main/java/server/MapleSkillbookInformationProvider.java +++ b/src/main/java/server/MapleSkillbookInformationProvider.java @@ -21,7 +21,7 @@ package server; import client.Character; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -116,7 +116,7 @@ public class MapleSkillbookInformationProvider { } private static Map fetchSkillbooksFromQuests() { - MapleDataProvider questDataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); + DataProvider questDataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); Data actData = questDataProvider.getData("Act.img"); Data checkData = questDataProvider.getData("Check.img"); diff --git a/src/main/java/server/MapleStorage.java b/src/main/java/server/MapleStorage.java index e3ccf14624..d1290923da 100644 --- a/src/main/java/server/MapleStorage.java +++ b/src/main/java/server/MapleStorage.java @@ -26,7 +26,7 @@ import constants.game.GameConstants; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -310,7 +310,7 @@ public class MapleStorage { if(fee == null) { fee = 100; - MapleDataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + DataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); Data npcData = npc.getData(npcId + ".img"); if(npcData != null) { fee = MapleDataTool.getIntConvert("info/trunkPut", npcData, 100); @@ -328,7 +328,7 @@ public class MapleStorage { if(fee == null) { fee = 0; - MapleDataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + DataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); Data npcData = npc.getData(npcId + ".img"); if(npcData != null) { fee = MapleDataTool.getIntConvert("info/trunkGet", npcData, 0); diff --git a/src/main/java/server/events/gm/MapleOxQuiz.java b/src/main/java/server/events/gm/MapleOxQuiz.java index 0c066fc5f5..1b606e4a30 100644 --- a/src/main/java/server/events/gm/MapleOxQuiz.java +++ b/src/main/java/server/events/gm/MapleOxQuiz.java @@ -22,7 +22,7 @@ package server.events.gm; import client.Character; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -43,7 +43,7 @@ public final class MapleOxQuiz { private int question = 1; private MapleMap map = null; private int expGain = 200; - private static MapleDataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + private static DataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); public MapleOxQuiz(MapleMap map) { this.map = map; diff --git a/src/main/java/server/life/MapleLifeFactory.java b/src/main/java/server/life/MapleLifeFactory.java index fee38754e9..8139e3b0e8 100644 --- a/src/main/java/server/life/MapleLifeFactory.java +++ b/src/main/java/server/life/MapleLifeFactory.java @@ -22,7 +22,7 @@ along with this program. If not, see . package server.life; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.DataType; @@ -36,8 +36,8 @@ import java.util.*; public class MapleLifeFactory { - private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); - private final static MapleDataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + private static DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); + private final static DataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); private static Data mobStringData = stringDataWZ.getData("Mob.img"); private static Data npcStringData = stringDataWZ.getData("Npc.img"); private static Map monsterStats = new HashMap<>(); @@ -46,7 +46,7 @@ public class MapleLifeFactory { private static Set getHpBarBosses() { Set ret = new HashSet<>(); - MapleDataProvider uiDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.UI); + DataProvider uiDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.UI); for (Data bossData : uiDataWZ.getData("UIWindow.img").getChildByPath("MobGage/Mob").getChildren()) { ret.add(Integer.valueOf(bossData.getName())); } diff --git a/src/main/java/server/life/MapleMonsterInformationProvider.java b/src/main/java/server/life/MapleMonsterInformationProvider.java index a637214cb0..3fc5282994 100644 --- a/src/main/java/server/life/MapleMonsterInformationProvider.java +++ b/src/main/java/server/life/MapleMonsterInformationProvider.java @@ -23,7 +23,7 @@ package server.life; import config.YamlConfig; import constants.inventory.ItemConstants; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -227,7 +227,7 @@ public class MapleMonsterInformationProvider { } public static ArrayList> getMobsIDsFromName(String search) { - MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); ArrayList> retMobs = new ArrayList<>(); Data data = dataProvider.getData("Mob.img"); List> mobPairList = new LinkedList<>(); @@ -267,7 +267,7 @@ public class MapleMonsterInformationProvider { public String getMobNameFromId(int id) { String mobName = mobNameCache.get(id); if (mobName == null) { - MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); Data mobData = dataProvider.getData("Mob.img"); mobName = MapleDataTool.getString(mobData.getChildByPath(id + "/name"), ""); diff --git a/src/main/java/server/life/MaplePlayerNPCFactory.java b/src/main/java/server/life/MaplePlayerNPCFactory.java index 515172a3b0..383c403261 100644 --- a/src/main/java/server/life/MaplePlayerNPCFactory.java +++ b/src/main/java/server/life/MaplePlayerNPCFactory.java @@ -21,7 +21,7 @@ package server.life; import net.server.Server; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -37,7 +37,7 @@ import java.util.Map; */ public class MaplePlayerNPCFactory { - private static MapleDataProvider npcData = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + private static DataProvider npcData = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); private static final Map> dnpcMaps = new HashMap<>(); private static Integer runningDeveloperOid = 2147483000; // 647 slots, long enough @@ -46,14 +46,14 @@ public class MaplePlayerNPCFactory { return npcData.getData(scriptid + ".img") != null; } - private static void loadDeveloperRoomMetadata(MapleDataProvider npc) { + private static void loadDeveloperRoomMetadata(DataProvider npc) { Data thisData = npc.getData("9977777.img"); if(thisData != null) { - MapleDataProvider map = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); + DataProvider map = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); thisData = map.getData("Map/Map7/777777777.img"); if(thisData != null) { - MapleDataProvider sound = MapleDataProviderFactory.getDataProvider(WZFiles.SOUND); + DataProvider sound = MapleDataProviderFactory.getDataProvider(WZFiles.SOUND); thisData = sound.getData("Field.img"); if(thisData != null) { @@ -67,10 +67,10 @@ public class MaplePlayerNPCFactory { } public synchronized static void loadFactoryMetadata() { - MapleDataProvider npc = npcData; + DataProvider npc = npcData; loadDeveloperRoomMetadata(npc); - MapleDataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); Data dnpcData = etc.getData("DeveloperNpc.img"); if(dnpcData != null) { for (Data data : dnpcData.getChildren()) { diff --git a/src/main/java/server/life/MobAttackInfoFactory.java b/src/main/java/server/life/MobAttackInfoFactory.java index 822509a938..2b217d82bd 100644 --- a/src/main/java/server/life/MobAttackInfoFactory.java +++ b/src/main/java/server/life/MobAttackInfoFactory.java @@ -22,7 +22,7 @@ package server.life; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -37,7 +37,7 @@ import java.util.Map; */ public class MobAttackInfoFactory { private static Map mobAttacks = new HashMap<>(); - private static MapleDataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); + private static DataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); public static MobAttackInfo getMobAttackInfo(MapleMonster mob, int attack) { MobAttackInfo ret = mobAttacks.get(mob.getId() + "" + attack); diff --git a/src/main/java/server/life/MobSkillFactory.java b/src/main/java/server/life/MobSkillFactory.java index eae919d7fa..86fa7a6f36 100644 --- a/src/main/java/server/life/MobSkillFactory.java +++ b/src/main/java/server/life/MobSkillFactory.java @@ -28,7 +28,7 @@ import net.server.audit.locks.MonitoredWriteLock; import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -46,7 +46,7 @@ import java.util.Map; public class MobSkillFactory { private static Map mobSkills = new HashMap<>(); - private final static MapleDataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private final static DataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); private static Data skillRoot = dataSource.getData("MobSkill.img"); private final static MonitoredReentrantReadWriteLock dataLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MOBSKILL_FACTORY); private final static MonitoredReadLock rL = MonitoredReadLockFactory.createLock(dataLock); diff --git a/src/main/java/server/maps/MapleMapFactory.java b/src/main/java/server/maps/MapleMapFactory.java index a55eefedc3..c70781063e 100644 --- a/src/main/java/server/maps/MapleMapFactory.java +++ b/src/main/java/server/maps/MapleMapFactory.java @@ -22,7 +22,7 @@ package server.maps; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -44,7 +44,7 @@ import java.util.List; public class MapleMapFactory { private static Data nameData; - private static MapleDataProvider mapSource; + private static DataProvider mapSource; static { nameData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Map.img"); diff --git a/src/main/java/server/maps/MapleReactorFactory.java b/src/main/java/server/maps/MapleReactorFactory.java index c331d22cfa..f66585d460 100644 --- a/src/main/java/server/maps/MapleReactorFactory.java +++ b/src/main/java/server/maps/MapleReactorFactory.java @@ -22,7 +22,7 @@ package server.maps; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; public class MapleReactorFactory { - private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.REACTOR); + private static DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.REACTOR); private static Map reactorStats = new HashMap<>(); diff --git a/src/main/java/server/partyquest/MapleCarnivalFactory.java b/src/main/java/server/partyquest/MapleCarnivalFactory.java index e99a1bff7b..7a4f7579bb 100644 --- a/src/main/java/server/partyquest/MapleCarnivalFactory.java +++ b/src/main/java/server/partyquest/MapleCarnivalFactory.java @@ -2,7 +2,7 @@ package server.partyquest; import client.Disease; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -22,7 +22,7 @@ public class MapleCarnivalFactory { private final static MapleCarnivalFactory instance = new MapleCarnivalFactory(); private final Map skills = new HashMap<>(); private final Map guardians = new HashMap<>(); - private final MapleDataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private final DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); private final List singleTargetedSkills = new ArrayList<>(); private final List multiTargetedSkills = new ArrayList<>(); diff --git a/src/main/java/server/quest/MapleQuest.java b/src/main/java/server/quest/MapleQuest.java index d812a627e2..4336c107f7 100644 --- a/src/main/java/server/quest/MapleQuest.java +++ b/src/main/java/server/quest/MapleQuest.java @@ -26,7 +26,7 @@ import client.QuestStatus; import client.QuestStatus.Status; import config.YamlConfig; import provider.Data; -import provider.MapleDataProvider; +import provider.DataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -68,7 +68,7 @@ public class MapleQuest { private boolean autoPreComplete, autoComplete; private boolean repeatable = false; private String name = "", parent = ""; - private final static MapleDataProvider questData = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); + private final static DataProvider questData = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); private final static Data questInfo = questData.getData("QuestInfo.img"); private final static Data questAct = questData.getData("Act.img"); private final static Data questReq = questData.getData("Check.img"); diff --git a/src/main/java/tools/mapletools/MonsterStatFetcher.java b/src/main/java/tools/mapletools/MonsterStatFetcher.java index 4f3ba06db3..d11e4e2f73 100644 --- a/src/main/java/tools/mapletools/MonsterStatFetcher.java +++ b/src/main/java/tools/mapletools/MonsterStatFetcher.java @@ -14,8 +14,8 @@ import tools.Pair; import java.util.*; public class MonsterStatFetcher { - private static final MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); - private static final MapleDataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + private static final DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); + private static final DataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); private static final Data mobStringData = stringDataWZ.getData("Mob.img"); private static final Map monsterStats = new HashMap<>(); diff --git a/src/main/java/tools/mapletools/NoItemNameFetcher.java b/src/main/java/tools/mapletools/NoItemNameFetcher.java index 7e4a9e65a1..5c011fffec 100644 --- a/src/main/java/tools/mapletools/NoItemNameFetcher.java +++ b/src/main/java/tools/mapletools/NoItemNameFetcher.java @@ -80,7 +80,7 @@ public class NoItemNameFetcher { private static void readStringWZData() { System.out.println("Parsing String.wz..."); - MapleDataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); Data cashStringData = stringData.getData("Cash.img"); readStringSubdirectoryData(cashStringData, 0); @@ -163,7 +163,7 @@ public class NoItemNameFetcher { }; } - private static void readEquipNodeData(MapleDataProvider data, DataDirectoryEntry mDir, String wzFileName, String dirName) { + private static void readEquipNodeData(DataProvider data, DataDirectoryEntry mDir, String wzFileName, String dirName) { EquipType eqType = getEquipTypeFromDirectoryName(dirName); for (DataFileEntry mFile : mDir.getFiles()) { @@ -195,7 +195,7 @@ public class NoItemNameFetcher { private static void readEquipWZData() { String wzFileName = "Character.wz"; - MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.CHARACTER); + DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.CHARACTER); DataDirectoryEntry root = data.getRoot(); System.out.println("Parsing " + wzFileName + "..."); @@ -212,7 +212,7 @@ public class NoItemNameFetcher { private static void readItemWZData() { String wzFileName = "Item.wz"; - MapleDataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); DataDirectoryEntry root = data.getRoot(); System.out.println("Parsing " + wzFileName + "...");