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

Rename and clean up MapleDataProviderFactory

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:51:34 +02:00
parent 1592d3efc8
commit 5089f23f79
26 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<>();

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

@@ -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");

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

@@ -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");

6
src/main/java/server/MapleStorage.java
View File

@@ -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);

4
src/main/java/server/events/gm/MapleOxQuiz.java
View File

@@ -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;

8
src/main/java/server/life/MapleLifeFactory.java
View File

@@ -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()));
}

6
src/main/java/server/life/MapleMonsterInformationProvider.java
View File

@@ -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"), "");

10
src/main/java/server/life/MaplePlayerNPCFactory.java
View File

@@ -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()) {

4
src/main/java/server/life/MobAttackInfoFactory.java
View File

@@ -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);

4
src/main/java/server/life/MobSkillFactory.java
View File

@@ -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);

6
src/main/java/server/maps/MapleMapFactory.java
View File

@@ -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) {

4
src/main/java/server/maps/MapleReactorFactory.java
View File

@@ -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<>();

4
src/main/java/server/partyquest/MapleCarnivalFactory.java
View File

@@ -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<>();

4
src/main/java/server/quest/MapleQuest.java
View File

@@ -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");