From 5089f23f7972ff08181dda0c4dac47c70a2dee03 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:51:34 +0200 Subject: [PATCH] Rename and clean up MapleDataProviderFactory --- src/main/java/client/SkillFactory.java | 4 ++-- .../client/command/commands/gm2/MaxSkillCommand.java | 4 ++-- .../client/command/commands/gm2/ResetSkillCommand.java | 4 ++-- .../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 +- .../partysearch/PartySearchCoordinator.java | 4 ++-- ...taProviderFactory.java => DataProviderFactory.java} | 2 +- .../java/scripting/npc/NPCConversationManager.java | 4 ++-- src/main/java/server/CashShop.java | 4 ++-- src/main/java/server/MapleItemInformationProvider.java | 8 ++++---- .../java/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 ++++---- .../server/life/MapleMonsterInformationProvider.java | 6 +++--- src/main/java/server/life/MaplePlayerNPCFactory.java | 10 +++++----- src/main/java/server/life/MobAttackInfoFactory.java | 4 ++-- src/main/java/server/life/MobSkillFactory.java | 4 ++-- src/main/java/server/maps/MapleMapFactory.java | 6 +++--- src/main/java/server/maps/MapleReactorFactory.java | 4 ++-- .../java/server/partyquest/MapleCarnivalFactory.java | 4 ++-- src/main/java/server/quest/MapleQuest.java | 4 ++-- src/main/java/tools/mapletools/MonsterStatFetcher.java | 4 ++-- src/main/java/tools/mapletools/NoItemNameFetcher.java | 6 +++--- 26 files changed, 61 insertions(+), 61 deletions(-) rename src/main/java/provider/{MapleDataProviderFactory.java => DataProviderFactory.java} (96%) diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java index 90c53a5a83..1342e28635 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 DataProvider datasource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private static final DataProvider datasource = DataProviderFactory.getDataProvider(WZFiles.SKILL); public static Skill getSkill(int id) { return skills.get(id); @@ -330,7 +330,7 @@ public class SkillFactory { } public static String getSkillName(int skillid) { - Data data = MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img"); + Data data = DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img"); StringBuilder skill = new StringBuilder(); skill.append(skillid); if (skill.length() == 4) { diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index c65903ff29..99ac7d4bdf 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java @@ -27,7 +27,7 @@ import client.Character; import client.*; import client.command.Command; import provider.Data; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.wz.WZFiles; public class MaxSkillCommand extends Command { @@ -38,7 +38,7 @@ public class MaxSkillCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - for (Data skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { + for (Data skill_ : DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); player.changeSkillLevel(skill, (byte) skill.getMaxLevel(), skill.getMaxLevel(), -1); diff --git a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java index 6bf660584d..a1724f5d4a 100644 --- a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java @@ -27,7 +27,7 @@ import client.Character; import client.*; import client.command.Command; import provider.Data; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.wz.WZFiles; public class ResetSkillCommand extends Command { @@ -38,7 +38,7 @@ public class ResetSkillCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - for (Data skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { + for (Data skill_ : DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); player.changeSkillLevel(skill, (byte) 0, skill.getMaxLevel(), -1); diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index 3897b825de..444b3f73e4 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/src/main/java/client/command/commands/gm2/SearchCommand.java @@ -28,7 +28,7 @@ import client.Client; import client.command.Command; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.MapleItemInformationProvider; @@ -44,7 +44,7 @@ public class SearchCommand extends Command { { setDescription("Search String.wz."); - DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = DataProviderFactory.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 c23fe77aa4..7d54e5a8d1 100644 --- a/src/main/java/client/inventory/PetDataFactory.java +++ b/src/main/java/client/inventory/PetDataFactory.java @@ -23,7 +23,7 @@ package client.inventory; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -35,7 +35,7 @@ import java.util.Map; * @author Danny (Leifde) */ public class PetDataFactory { - private static DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + private static DataProvider dataRoot = DataProviderFactory.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 4c6c454bbd..74db6d577a 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -26,7 +26,7 @@ import client.inventory.InventoryType; import client.inventory.Pet; import client.inventory.manipulator.InventoryManipulator; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.PacketCreator; @@ -38,7 +38,7 @@ import java.awt.*; * @author RonanLana - just added locking on OdinMS' SpawnPetHandler method body */ public class SpawnPetProcessor { - private static final DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + private static final DataProvider dataRoot = DataProviderFactory.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 479c72e419..07c3b9b526 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() { - DataProvider mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); + DataProvider mapSource = DataProviderFactory.getDataProvider(WZFiles.MAP); int maxMobDmg = 0; DataDirectoryEntry root = mapSource.getRoot(); diff --git a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java index 1e3ea8bf2b..8298340a24 100644 --- a/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java +++ b/src/main/java/net/server/coordinator/partysearch/PartySearchCoordinator.java @@ -32,7 +32,7 @@ import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.world.Party; import provider.Data; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.PacketCreator; @@ -67,7 +67,7 @@ public class PartySearchCoordinator { private static Map> fetchNeighbouringMaps() { Map> mapLinks = new HashMap<>(); - Data data = MapleDataProviderFactory.getDataProvider(WZFiles.ETC).getData("MapNeighbors.img"); + Data data = DataProviderFactory.getDataProvider(WZFiles.ETC).getData("MapNeighbors.img"); if (data != null) { for (Data mapdata : data.getChildren()) { int mapid = Integer.parseInt(mapdata.getName()); diff --git a/src/main/java/provider/MapleDataProviderFactory.java b/src/main/java/provider/DataProviderFactory.java similarity index 96% rename from src/main/java/provider/MapleDataProviderFactory.java rename to src/main/java/provider/DataProviderFactory.java index cd26c02395..dc15004cb0 100644 --- a/src/main/java/provider/MapleDataProviderFactory.java +++ b/src/main/java/provider/DataProviderFactory.java @@ -26,7 +26,7 @@ import provider.wz.XMLWZFile; import java.io.File; -public class MapleDataProviderFactory { +public class DataProviderFactory { private static DataProvider getWZ(File in) { return new XMLWZFile(in); } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index 33b0c5f478..695b4f3a07 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -39,7 +39,7 @@ import net.server.guild.GuildPackets; import net.server.world.Party; import net.server.world.PartyCharacter; import provider.Data; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.wz.WZFiles; import scripting.AbstractPlayerInteraction; import server.*; @@ -384,7 +384,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void maxMastery() { - for (Data skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { + for (Data skill_ : DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); getPlayer().changeSkillLevel(skill, (byte) 0, skill.getMaxLevel(), -1); diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index b2c7b3a72d..cd0e95e7d1 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -29,7 +29,7 @@ import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.DatabaseConnection; @@ -149,7 +149,7 @@ public class CashShop { private static volatile List specialcashitems = new ArrayList<>(); public static void loadAllCashItems() { - DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + DataProvider etc = DataProviderFactory.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 4059fc6190..30ae99d7ec 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -117,10 +117,10 @@ public class MapleItemInformationProvider { private MapleItemInformationProvider() { loadCardIdData(); - itemData = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); - equipData = MapleDataProviderFactory.getDataProvider(WZFiles.CHARACTER); - stringData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); - etcData = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + itemData = DataProviderFactory.getDataProvider(WZFiles.ITEM); + equipData = DataProviderFactory.getDataProvider(WZFiles.CHARACTER); + stringData = DataProviderFactory.getDataProvider(WZFiles.STRING); + etcData = DataProviderFactory.getDataProvider(WZFiles.ETC); cashStringData = stringData.getData("Cash.img"); consumeStringData = stringData.getData("Consume.img"); eqpStringData = stringData.getData("Eqp.img"); diff --git a/src/main/java/server/MapleSkillbookInformationProvider.java b/src/main/java/server/MapleSkillbookInformationProvider.java index 22a8ff39f7..b8c97ded56 100644 --- a/src/main/java/server/MapleSkillbookInformationProvider.java +++ b/src/main/java/server/MapleSkillbookInformationProvider.java @@ -22,7 +22,7 @@ package server; import client.Character; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.DatabaseConnection; @@ -116,7 +116,7 @@ public class MapleSkillbookInformationProvider { } private static Map fetchSkillbooksFromQuests() { - DataProvider questDataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); + DataProvider questDataProvider = DataProviderFactory.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 d1290923da..fa1d788601 100644 --- a/src/main/java/server/MapleStorage.java +++ b/src/main/java/server/MapleStorage.java @@ -27,7 +27,7 @@ import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.DatabaseConnection; @@ -310,7 +310,7 @@ public class MapleStorage { if(fee == null) { fee = 100; - DataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + DataProvider npc = DataProviderFactory.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; - DataProvider npc = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + DataProvider npc = DataProviderFactory.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 1b606e4a30..b1574012e2 100644 --- a/src/main/java/server/events/gm/MapleOxQuiz.java +++ b/src/main/java/server/events/gm/MapleOxQuiz.java @@ -23,7 +23,7 @@ package server.events.gm; import client.Character; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.TimerManager; @@ -43,7 +43,7 @@ public final class MapleOxQuiz { private int question = 1; private MapleMap map = null; private int expGain = 200; - private static DataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + private static DataProvider stringData = DataProviderFactory.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 8139e3b0e8..0e6af775f3 100644 --- a/src/main/java/server/life/MapleLifeFactory.java +++ b/src/main/java/server/life/MapleLifeFactory.java @@ -23,7 +23,7 @@ package server.life; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.DataType; import provider.wz.WZFiles; @@ -36,8 +36,8 @@ import java.util.*; public class MapleLifeFactory { - private static DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); - private final static DataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + private static DataProvider data = DataProviderFactory.getDataProvider(WZFiles.MOB); + private final static DataProvider stringDataWZ = DataProviderFactory.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<>(); - DataProvider uiDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.UI); + DataProvider uiDataWZ = DataProviderFactory.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 3fc5282994..6fd4b906cb 100644 --- a/src/main/java/server/life/MapleMonsterInformationProvider.java +++ b/src/main/java/server/life/MapleMonsterInformationProvider.java @@ -24,7 +24,7 @@ import config.YamlConfig; import constants.inventory.ItemConstants; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.MapleItemInformationProvider; @@ -227,7 +227,7 @@ public class MapleMonsterInformationProvider { } public static ArrayList> getMobsIDsFromName(String search) { - DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = DataProviderFactory.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) { - DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider dataProvider = DataProviderFactory.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 383c403261..19a87e9a61 100644 --- a/src/main/java/server/life/MaplePlayerNPCFactory.java +++ b/src/main/java/server/life/MaplePlayerNPCFactory.java @@ -22,7 +22,7 @@ package server.life; import net.server.Server; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; @@ -37,7 +37,7 @@ import java.util.Map; */ public class MaplePlayerNPCFactory { - private static DataProvider npcData = MapleDataProviderFactory.getDataProvider(WZFiles.NPC); + private static DataProvider npcData = DataProviderFactory.getDataProvider(WZFiles.NPC); private static final Map> dnpcMaps = new HashMap<>(); private static Integer runningDeveloperOid = 2147483000; // 647 slots, long enough @@ -49,11 +49,11 @@ public class MaplePlayerNPCFactory { private static void loadDeveloperRoomMetadata(DataProvider npc) { Data thisData = npc.getData("9977777.img"); if(thisData != null) { - DataProvider map = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); + DataProvider map = DataProviderFactory.getDataProvider(WZFiles.MAP); thisData = map.getData("Map/Map7/777777777.img"); if(thisData != null) { - DataProvider sound = MapleDataProviderFactory.getDataProvider(WZFiles.SOUND); + DataProvider sound = DataProviderFactory.getDataProvider(WZFiles.SOUND); thisData = sound.getData("Field.img"); if(thisData != null) { @@ -70,7 +70,7 @@ public class MaplePlayerNPCFactory { DataProvider npc = npcData; loadDeveloperRoomMetadata(npc); - DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC); + DataProvider etc = DataProviderFactory.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 2b217d82bd..d56c2fd607 100644 --- a/src/main/java/server/life/MobAttackInfoFactory.java +++ b/src/main/java/server/life/MobAttackInfoFactory.java @@ -23,7 +23,7 @@ package server.life; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import tools.StringUtil; @@ -37,7 +37,7 @@ import java.util.Map; */ public class MobAttackInfoFactory { private static Map mobAttacks = new HashMap<>(); - private static DataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); + private static DataProvider dataSource = DataProviderFactory.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 86fa7a6f36..010ac4f362 100644 --- a/src/main/java/server/life/MobSkillFactory.java +++ b/src/main/java/server/life/MobSkillFactory.java @@ -29,7 +29,7 @@ import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; 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 DataProvider dataSource = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private final static DataProvider dataSource = DataProviderFactory.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 c70781063e..3bb64089a0 100644 --- a/src/main/java/server/maps/MapleMapFactory.java +++ b/src/main/java/server/maps/MapleMapFactory.java @@ -23,7 +23,7 @@ package server.maps; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import scripting.event.EventInstanceManager; @@ -47,8 +47,8 @@ public class MapleMapFactory { private static DataProvider mapSource; static { - nameData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Map.img"); - mapSource = MapleDataProviderFactory.getDataProvider(WZFiles.MAP); + nameData = DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Map.img"); + mapSource = DataProviderFactory.getDataProvider(WZFiles.MAP); } private static void loadLifeFromWz(MapleMap map, Data mapData) { diff --git a/src/main/java/server/maps/MapleReactorFactory.java b/src/main/java/server/maps/MapleReactorFactory.java index f66585d460..4c829b3199 100644 --- a/src/main/java/server/maps/MapleReactorFactory.java +++ b/src/main/java/server/maps/MapleReactorFactory.java @@ -23,7 +23,7 @@ package server.maps; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.maps.MapleReactorStats.StateData; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; public class MapleReactorFactory { - private static DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.REACTOR); + private static DataProvider data = DataProviderFactory.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 7a4f7579bb..b949f010f7 100644 --- a/src/main/java/server/partyquest/MapleCarnivalFactory.java +++ b/src/main/java/server/partyquest/MapleCarnivalFactory.java @@ -3,7 +3,7 @@ package server.partyquest; import client.Disease; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.life.MobSkill; @@ -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 DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL); + private final DataProvider dataRoot = DataProviderFactory.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 4336c107f7..9f6ef3098e 100644 --- a/src/main/java/server/quest/MapleQuest.java +++ b/src/main/java/server/quest/MapleQuest.java @@ -27,7 +27,7 @@ import client.QuestStatus.Status; import config.YamlConfig; import provider.Data; import provider.DataProvider; -import provider.MapleDataProviderFactory; +import provider.DataProviderFactory; import provider.MapleDataTool; import provider.wz.WZFiles; import server.quest.actions.*; @@ -68,7 +68,7 @@ public class MapleQuest { private boolean autoPreComplete, autoComplete; private boolean repeatable = false; private String name = "", parent = ""; - private final static DataProvider questData = MapleDataProviderFactory.getDataProvider(WZFiles.QUEST); + private final static DataProvider questData = DataProviderFactory.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 d11e4e2f73..1e926c8d93 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 DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.MOB); - private static final DataProvider stringDataWZ = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + private static final DataProvider data = DataProviderFactory.getDataProvider(WZFiles.MOB); + private static final DataProvider stringDataWZ = DataProviderFactory.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 5c011fffec..07cb92b1db 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..."); - DataProvider stringData = MapleDataProviderFactory.getDataProvider(WZFiles.STRING); + DataProvider stringData = DataProviderFactory.getDataProvider(WZFiles.STRING); Data cashStringData = stringData.getData("Cash.img"); readStringSubdirectoryData(cashStringData, 0); @@ -195,7 +195,7 @@ public class NoItemNameFetcher { private static void readEquipWZData() { String wzFileName = "Character.wz"; - DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.CHARACTER); + DataProvider data = DataProviderFactory.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"; - DataProvider data = MapleDataProviderFactory.getDataProvider(WZFiles.ITEM); + DataProvider data = DataProviderFactory.getDataProvider(WZFiles.ITEM); DataDirectoryEntry root = data.getRoot(); System.out.println("Parsing " + wzFileName + "...");