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

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

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

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

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

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

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

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

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

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

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