Rename and clean up MapleDataProviderFactory
This commit is contained in:
@@ -32,7 +32,7 @@ import java.util.Map;
|
||||
|
||||
public class SkillFactory {
|
||||
private static volatile Map<Integer, Skill> 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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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<String, PetCommand> petCommands = new HashMap<>();
|
||||
private static Map<Integer, Integer> petHunger = new HashMap<>();
|
||||
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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<Integer, Set<Integer>> fetchNeighbouringMaps() {
|
||||
Map<Integer, Set<Integer>> 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());
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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<SpecialCashItem> specialcashitems = new ArrayList<>();
|
||||
|
||||
public static void loadAllCashItems() {
|
||||
DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC);
|
||||
DataProvider etc = DataProviderFactory.getDataProvider(WZFiles.ETC);
|
||||
|
||||
Map<Integer, CashItem> loadedItems = new HashMap<>();
|
||||
List<Integer> onSaleItems = new ArrayList<>();
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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<Integer, SkillBookEntry> 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");
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<Integer, MapleMonsterStats> monsterStats = new HashMap<>();
|
||||
@@ -46,7 +46,7 @@ public class MapleLifeFactory {
|
||||
private static Set<Integer> getHpBarBosses() {
|
||||
Set<Integer> 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()));
|
||||
}
|
||||
|
||||
@@ -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<Pair<Integer, String>> getMobsIDsFromName(String search) {
|
||||
DataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING);
|
||||
DataProvider dataProvider = DataProviderFactory.getDataProvider(WZFiles.STRING);
|
||||
ArrayList<Pair<Integer, String>> retMobs = new ArrayList<>();
|
||||
Data data = dataProvider.getData("Mob.img");
|
||||
List<Pair<Integer, String>> 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"), "");
|
||||
|
||||
@@ -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<Integer, List<MaplePlayerNPC>> 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()) {
|
||||
|
||||
@@ -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<String, MobAttackInfo> 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);
|
||||
|
||||
@@ -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<String, MobSkill> 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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<Integer, MapleReactorStats> reactorStats = new HashMap<>();
|
||||
|
||||
|
||||
|
||||
@@ -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<Integer, MCSkill> skills = new HashMap<>();
|
||||
private final Map<Integer, MCSkill> guardians = new HashMap<>();
|
||||
private final DataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL);
|
||||
private final DataProvider dataRoot = DataProviderFactory.getDataProvider(WZFiles.SKILL);
|
||||
|
||||
private final List<Integer> singleTargetedSkills = new ArrayList<>();
|
||||
private final List<Integer> multiTargetedSkills = new ArrayList<>();
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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<Integer, MapleMonsterStats> monsterStats = new HashMap<>();
|
||||
|
||||
|
||||
@@ -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 + "...");
|
||||
|
||||
Reference in New Issue
Block a user