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

Rename and clean up MapleDataProvider

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:51:05 +02:00
parent ae59916e98
commit 1592d3efc8
24 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
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<Integer, MapleMonsterStats> monsterStats = new HashMap<>();
@@ -46,7 +46,7 @@ public class MapleLifeFactory {
private static Set<Integer> getHpBarBosses() {
Set<Integer> 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()));
}

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

@@ -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<Pair<Integer, String>> getMobsIDsFromName(String search) {
MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(WZFiles.STRING);
DataProvider dataProvider = MapleDataProviderFactory.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) {
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"), "");

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

@@ -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<Integer, List<MaplePlayerNPC>> 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()) {

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

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

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

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