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

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java vendored
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.MultisellData;
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.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -304,7 +304,7 @@ public class AvantGarde extends AbstractNpcAI
*/
public static void showSubClassSkillList(PlayerInstance player)
{
final List<SkillLearn> subClassSkills = SkillTreesData.getInstance().getAvailableSubClassSkills(player);
final List<SkillLearn> subClassSkills = SkillTreeData.getInstance().getAvailableSubClassSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.SUBCLASS);
int count = 0;
@@ -332,7 +332,7 @@ public class AvantGarde extends AbstractNpcAI
*/
public static void showTransformSkillList(PlayerInstance player)
{
final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableTransformSkills(player);
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableTransformSkills(player);
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.TRANSFORM);
int counts = 0;
@@ -347,7 +347,7 @@ public class AvantGarde extends AbstractNpcAI
if (counts == 0)
{
final int minlevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getTransformSkillTree());
final int minlevel = SkillTreeData.getInstance().getMinLevelForNewSkill(player, SkillTreeData.getInstance().getTransformSkillTree());
if (minlevel > 0)
{
// No more skills to learn, come back when you level.

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java vendored
View File

@@ -20,7 +20,7 @@ import java.util.Collection;
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.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -93,7 +93,7 @@ public class HealerTrainer extends AbstractNpcAI
final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.TRANSFER);
int count = 0;
for (SkillLearn skillLearn : SkillTreesData.getInstance().getAvailableTransferSkills(player))
for (SkillLearn skillLearn : SkillTreeData.getInstance().getAvailableTransferSkills(player))
{
if (SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel()) != null)
{
@@ -140,7 +140,7 @@ public class HealerTrainer extends AbstractNpcAI
else
{
boolean hasSkills = false;
final Collection<SkillLearn> skills = SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values();
final Collection<SkillLearn> skills = SkillTreeData.getInstance().getTransferSkillTree(player.getClassId()).values();
for (SkillLearn skillLearn : skills)
{
final Skill skill = player.getKnownSkill(skillLearn.getSkillId());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java vendored
View File

@@ -18,7 +18,7 @@ package features.SkillTransfer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -112,7 +112,7 @@ public class SkillTransfer extends AbstractNpcAI
long count = PORMANDERS[index].getCount() - player.getInventory().getInventoryItemCount(PORMANDERS[index].getId(), -1, false);
for (Skill sk : player.getAllSkills())
{
for (SkillLearn s : SkillTreesData.getInstance().getTransferSkillTree(player.getClassId()).values())
for (SkillLearn s : SkillTreeData.getInstance().getTransferSkillTree(player.getClassId()).values())
{
if (s.getSkillId() == sk.getId())
{

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

@@ -22,7 +22,7 @@ import java.util.List;
import java.util.StringTokenizer;
import org.l2jmobius.Config;
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.WorldObject;
@@ -209,12 +209,12 @@ public class AdminBuffs implements IAdminCommandHandler
*/
public static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills)
{
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values();
final Collection<Skill> skills = toAuraSkills ? SkillTreeData.getInstance().getGMSkillTree().values() : SkillTreeData.getInstance().getGMAuraSkillTree().values();
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

4
L2J_Mobius_CT_2.6_HighFive/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;
@@ -258,7 +258,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_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java vendored
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -91,7 +91,7 @@ public class SkillList implements IBypassHandler
continue;
}
if (SkillTreesData.getInstance().getAvailableSkills(player, cid, false, false).isEmpty())
if (SkillTreeData.getInstance().getAvailableSkills(player, cid, false, false).isEmpty())
{
continue;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java vendored
View File

@@ -26,7 +26,7 @@ import org.l2jmobius.commons.enums.ServerMode;
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.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;
@@ -201,7 +201,7 @@ public class Reload implements ITelnetCommand
}
case "sets":
{
ArmorSetsData.getInstance().load();
ArmorSetData.getInstance().load();
return "Telnet Admin: Reloaded Armor sets data.";
}
case "script":