From 6bac84a605c6032dcbf6708419c50b9b30b40dd8 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 6 Aug 2022 10:15:01 +0000 Subject: [PATCH] Renamed EnchantSkillGroupsTable to EnchantSkillTreesTable. --- .../java/org/l2jmobius/gameserver/GameServer.java | 4 ++-- ...roupsTable.java => EnchantSkillTreesTable.java} | 14 +++++++------- .../gameserver/model/actor/instance/Folk.java | 4 ++-- .../clientpackets/RequestExEnchantSkill.java | 4 ++-- .../clientpackets/RequestExEnchantSkillInfo.java | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) rename L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/{EnchantSkillGroupsTable.java => EnchantSkillTreesTable.java} (88%) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/GameServer.java index c3de5d7406..c374feb5d2 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.CrestTable; -import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; +import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -225,7 +225,7 @@ public class GameServer printSection("Skills"); EffectHandler.getInstance().executeScript(); - EnchantSkillGroupsTable.getInstance(); + EnchantSkillTreesTable.getInstance(); SkillTreeData.getInstance(); SkillData.getInstance(); PetSkillData.getInstance(); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillGroupsTable.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillTreesTable.java similarity index 88% rename from L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillGroupsTable.java rename to L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillTreesTable.java index 3282aab13b..9e85e1cf8c 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillGroupsTable.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillTreesTable.java @@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.skill.Skill; * @author Mobius * @implNote Adapted from old C6 project */ -public class EnchantSkillGroupsTable +public class EnchantSkillTreesTable { - private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsTable.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantSkillTreesTable.class.getName()); private final List _enchantSkillTrees = new ArrayList<>(); - protected EnchantSkillGroupsTable() + protected EnchantSkillTreesTable() { load(); } @@ -77,10 +77,10 @@ public class EnchantSkillGroupsTable } catch (Exception e) { - LOGGER.warning("EnchantSkillGroupsTable: Error while creating enchant skill table " + e); + LOGGER.warning("EnchantSkillTreesTable: Error while creating enchant skill table " + e); } - LOGGER.info("EnchantSkillGroupsTable: Loaded " + _enchantSkillTrees.size() + " enchant skills."); + LOGGER.info("EnchantSkillTreesTable: Loaded " + _enchantSkillTrees.size() + " enchant skills."); } public List getAvailableEnchantSkills(Player player) @@ -182,13 +182,13 @@ public class EnchantSkillGroupsTable return 0; } - public static EnchantSkillGroupsTable getInstance() + public static EnchantSkillTreesTable getInstance() { return SingletonHolder.INSTANCE; } private static class SingletonHolder { - protected static final EnchantSkillGroupsTable INSTANCE = new EnchantSkillGroupsTable(); + protected static final EnchantSkillTreesTable INSTANCE = new EnchantSkillTreesTable(); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java index 6d9fa687e6..b3a94e930e 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; +import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.AcquireSkillType; @@ -160,7 +160,7 @@ public class Folk extends Npc final ExEnchantSkillList esl = new ExEnchantSkillList(); int count = 0; - for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) + for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player)) { final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel()); if (sk == null) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 6d30d4a798..a9f6b89884 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; +import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; @@ -103,7 +103,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket byte rate = 0; int baseLevel = 1; - for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) + for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player)) { final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel()); if ((sk == null) || (sk != skill) || !trainer.getTemplate().canTeach(player.getClassId())) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index 4fa9f3d473..f601ed8cc0 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; +import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -87,7 +87,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } boolean canTeach = false; - for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) + for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player)) { if ((s.getId() == _skillId) && (s.getLevel() == _skillLevel)) { @@ -101,9 +101,9 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; // cheater } - final int requiredSp = EnchantSkillGroupsTable.getInstance().getSkillSpCost(player, skill); - final int requiredExp = EnchantSkillGroupsTable.getInstance().getSkillExpCost(player, skill); - final byte rate = EnchantSkillGroupsTable.getInstance().getSkillRate(player, skill); + final int requiredSp = EnchantSkillTreesTable.getInstance().getSkillSpCost(player, skill); + final int requiredExp = EnchantSkillTreesTable.getInstance().getSkillExpCost(player, skill); + final byte rate = EnchantSkillTreesTable.getInstance().getSkillRate(player, skill); final ExEnchantSkillInfo asi = new ExEnchantSkillInfo(_skillId, _skillLevel, requiredSp, requiredExp, rate); if (Config.ES_SP_BOOK_NEEDED && ((_skillLevel == 101) || (_skillLevel == 141))) // only first level requires book {