lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper naming for various data holding classes.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-28 11:48:32 +00:00
parent 8ebd210ac3
commit 8dbfd09e0c
934 changed files with 22626 additions and 22626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
import org.l2jmobius.gameserver.data.xml.impl.TeleporterData;
import org.l2jmobius.gameserver.enums.CastleSide;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
@@ -987,7 +987,7 @@ public class CastleChamberlain extends AbstractNpcAI
else
{
final String listName = "tel" + castle.getCastleFunction(Castle.FUNC_TELEPORT).getLvl();
final TeleportHolder holder = TeleportersData.getInstance().getHolder(npc.getId(), listName);
final TeleportHolder holder = TeleporterData.getInstance().getHolder(npc.getId(), listName);
if (holder != null)
{
holder.showTeleportList(player, npc, "Quest CastleChamberlain goto");
@@ -1009,7 +1009,7 @@ public class CastleChamberlain extends AbstractNpcAI
final int funcLvl = (listId.length() >= 4) ? CommonUtil.parseInt(listId.substring(3), -1) : -1;
if (func.getLvl() == funcLvl)
{
final TeleportHolder holder = TeleportersData.getInstance().getHolder(npc.getId(), listId);
final TeleportHolder holder = TeleporterData.getInstance().getHolder(npc.getId(), listId);
if (holder != null)
{
holder.doTeleport(player, npc, CommonUtil.parseNextInt(st, -1));

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.xml.impl.ResidenceFunctionsData;
import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
import org.l2jmobius.gameserver.data.xml.impl.TeleporterData;
import org.l2jmobius.gameserver.enums.ClanHallGrade;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -177,7 +177,7 @@ public class ClanHallManager extends AbstractNpcAI
final int teleportLevel = clanHall.getFunctionLevel(ResidenceFunctionType.TELEPORT);
if (teleportLevel > 0)
{
final TeleportHolder holder = TeleportersData.getInstance().getHolder(npc.getId(), "tel" + teleportLevel);
final TeleportHolder holder = TeleporterData.getInstance().getHolder(npc.getId(), "tel" + teleportLevel);
if (holder != null)
{
if (!st.hasMoreTokens())

10
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.data.xml.impl.CategoryData;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.Race;
@@ -391,8 +391,8 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
}
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
{
player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
}
@@ -822,8 +822,8 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
}
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
{
player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
}

6
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -24,7 +24,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -278,12 +278,12 @@ public class AdminBuffs implements IAdminCommandHandler
*/
private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills)
{
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree();
final Collection<Skill> skills = toAuraSkills ? SkillTreeData.getInstance().getGMSkillTree() : SkillTreeData.getInstance().getGMAuraSkillTree();
for (Skill skill : skills)
{
gmchar.removeSkill(skill, false); // Don't Save GM skills to database
}
SkillTreesData.getInstance().addSkills(gmchar, toAuraSkills);
SkillTreeData.getInstance().addSkills(gmchar, toAuraSkills);
}
@Override

6
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassInfoType;
@@ -419,8 +419,8 @@ public class AdminEditChar implements IAdminCommandHandler
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
SkillTreeData.getInstance().cleanSkillUponAwakening(player);
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
{
player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
}

8
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java vendored
View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.sql.impl.CrestTable;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.data.xml.impl.AttendanceRewardData;
import org.l2jmobius.gameserver.data.xml.impl.BuyListData;
import org.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
@@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.PrimeShopData;
import org.l2jmobius.gameserver.data.xml.impl.SayuneData;
import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
import org.l2jmobius.gameserver.data.xml.impl.TeleporterData;
import org.l2jmobius.gameserver.data.xml.impl.TransformData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -184,7 +184,7 @@ public class AdminReload implements IAdminCommandHandler
}
case "teleport":
{
TeleportersData.getInstance().load();
TeleporterData.getInstance().load();
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Teleports.");
break;
}
@@ -291,7 +291,7 @@ public class AdminReload implements IAdminCommandHandler
}
case "sets":
{
ArmorSetsData.getInstance().load();
ArmorSetData.getInstance().load();
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Armor sets data.");
break;
}

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -23,7 +23,7 @@ import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -324,7 +324,7 @@ public class AdminSkill implements IAdminCommandHandler
activeChar.sendPacket(sm);
}
final Map<Integer, SkillLearn> skills = SkillTreesData.getInstance().getMaxPledgeSkills(clan, includeSquad);
final Map<Integer, SkillLearn> skills = SkillTreeData.getInstance().getMaxPledgeSkills(clan, includeSquad);
for (SkillLearn s : skills.values())
{
clan.addNewSkill(SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()));

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.NpcData;
import org.l2jmobius.gameserver.data.xml.impl.SpawnsData;
import org.l2jmobius.gameserver.data.xml.impl.SpawnData;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
@@ -284,7 +284,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
}
// Reload.
SpawnsData.getInstance().init();
SpawnData.getInstance().init();
DBSpawnManager.getInstance().load();
ZoneManager.getInstance().reload();
QuestManager.getInstance().reloadAllScripts();

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.xml.impl.NpcData;
import org.l2jmobius.gameserver.data.xml.impl.SpawnsData;
import org.l2jmobius.gameserver.data.xml.impl.SpawnData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.DropType;
import org.l2jmobius.gameserver.handler.CommunityBoardHandler;
@@ -300,7 +300,7 @@ public class DropSearchBoard implements IParseBoardHandler
case "_bbs_npc_trace":
{
final int npcId = Integer.parseInt(params[1]);
final List<NpcSpawnTemplate> spawnList = SpawnsData.getInstance().getNpcSpawns(npc -> npc.getId() == npcId);
final List<NpcSpawnTemplate> spawnList = SpawnData.getInstance().getNpcSpawns(npc -> npc.getId() == npcId);
if (spawnList.isEmpty())
{
player.sendMessage("Cannot find any spawn. Maybe dropped by a boss or instance monster.");

8
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java vendored
View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.sql.impl.CrestTable;
import org.l2jmobius.gameserver.data.xml.impl.AdminData;
import org.l2jmobius.gameserver.data.xml.impl.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetsData;
import org.l2jmobius.gameserver.data.xml.impl.ArmorSetData;
import org.l2jmobius.gameserver.data.xml.impl.BuyListData;
import org.l2jmobius.gameserver.data.xml.impl.DoorData;
import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.data.xml.impl.MultisellData;
import org.l2jmobius.gameserver.data.xml.impl.NpcData;
import org.l2jmobius.gameserver.data.xml.impl.SayuneData;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.data.xml.impl.TeleportersData;
import org.l2jmobius.gameserver.data.xml.impl.TeleporterData;
import org.l2jmobius.gameserver.data.xml.impl.TransformData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
@@ -145,7 +145,7 @@ public class Reload implements ITelnetCommand
}
case "teleport":
{
TeleportersData.getInstance().load();
TeleporterData.getInstance().load();
return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded Teleports.");
}
case "skill":
@@ -232,7 +232,7 @@ public class Reload implements ITelnetCommand
}
case "sets":
{
ArmorSetsData.getInstance().load();
ArmorSetData.getInstance().load();
return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded Armor sets data.");
}
case "script":