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

2
src/main/java/client/SkillFactory.java
View File

@@ -32,7 +32,7 @@ import java.util.Map;
public class SkillFactory {
private static volatile Map<Integer, Skill> 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);

4
src/main/java/client/command/commands/gm2/SearchCommand.java
View File

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

4
src/main/java/client/inventory/PetDataFactory.java
View File

@@ -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<String, PetCommand> petCommands = new HashMap<>();
private static Map<Integer, Integer> petHunger = new HashMap<>();

4
src/main/java/client/processor/action/SpawnPetProcessor.java
View File

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

2
src/main/java/constants/game/GameConstants.java
View File

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

2
src/main/java/provider/MapleDataProvider.java → src/main/java/provider/DataProvider.java
View File

@@ -21,7 +21,7 @@
*/
package provider;
public interface MapleDataProvider {
public interface DataProvider {
Data getData(String path);
DataDirectoryEntry getRoot();
}

4
src/main/java/provider/MapleDataProviderFactory.java
View File

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

4
src/main/java/provider/wz/XMLWZFile.java
View File

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

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

@@ -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<SpecialCashItem> specialcashitems = new ArrayList<>();
public static void loadAllCashItems() {
MapleDataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC);
DataProvider etc = MapleDataProviderFactory.getDataProvider(WZFiles.ETC);
Map<Integer, CashItem> loadedItems = new HashMap<>();
List<Integer> onSaleItems = new ArrayList<>();

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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<Integer, MapleReactorStats> reactorStats = new HashMap<>();

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

@@ -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<Integer, MCSkill> skills = new HashMap<>();
private final Map<Integer, MCSkill> guardians = new HashMap<>();
private final MapleDataProvider dataRoot = MapleDataProviderFactory.getDataProvider(WZFiles.SKILL);
private final DataProvider dataRoot = MapleDataProviderFactory.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

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

4
src/main/java/tools/mapletools/MonsterStatFetcher.java
View File

@@ -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<Integer, MapleMonsterStats> monsterStats = new HashMap<>();

8
src/main/java/tools/mapletools/NoItemNameFetcher.java
View File

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