diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java index d33b91e855..c6d3db2e3e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -37,13 +36,13 @@ public class Henna private final int _dyeItemId; private final boolean _isPremium; private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -58,13 +57,13 @@ public class Henna _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -91,7 +90,7 @@ public class Henna return _isPremium; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -106,7 +105,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -114,7 +113,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -122,7 +121,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -130,7 +129,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -162,16 +161,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -179,6 +178,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java index 50b4611f63..dc63215d41 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -36,11 +36,11 @@ public class Henna private final int _int; private final int _men; private final int _wit; - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; - private final List _wear_class; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final List _wearClass; public Henna(StatSet set) { @@ -52,11 +52,11 @@ public class Henna _int = set.getInt("int", 0); _men = set.getInt("men", 0); _wit = set.getInt("wit", 0); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); - _wear_class = new ArrayList<>(); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _wearClass = new ArrayList<>(); } /** @@ -128,7 +128,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -136,7 +136,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -144,7 +144,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -152,7 +152,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -160,16 +160,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -177,6 +177,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java index 50b4611f63..dc63215d41 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -36,11 +36,11 @@ public class Henna private final int _int; private final int _men; private final int _wit; - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; - private final List _wear_class; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final List _wearClass; public Henna(StatSet set) { @@ -52,11 +52,11 @@ public class Henna _int = set.getInt("int", 0); _men = set.getInt("men", 0); _wit = set.getInt("wit", 0); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); - _wear_class = new ArrayList<>(); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _wearClass = new ArrayList<>(); } /** @@ -128,7 +128,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -136,7 +136,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -144,7 +144,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -152,7 +152,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -160,16 +160,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -177,6 +177,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java index 3eba2d0961..2b706795e5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; /** * Class for the Henna object. @@ -36,13 +35,13 @@ public class Henna private final int _dyeId; private final int _dyeItemId; private final Map _baseStats = new HashMap<>(); - private final int _wear_fee; - private final int _wear_count; - private final int _cancel_fee; - private final int _cancel_count; + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; private final int _duration; private final List _skills; - private final List _wear_class; + private final List _wearClass; public Henna(StatSet set) { @@ -54,13 +53,13 @@ public class Henna _baseStats.put(BaseStat.INT, set.getInt("int", 0)); _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wear_fee = set.getInt("wear_fee"); - _wear_count = set.getInt("wear_count"); - _cancel_fee = set.getInt("cancel_fee"); - _cancel_count = set.getInt("cancel_count"); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); _duration = set.getInt("duration", -1); _skills = new ArrayList<>(); - _wear_class = new ArrayList<>(); + _wearClass = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class Henna return _dyeItemId; } - public int getBaseStats(Stat stat) + public int getBaseStats(BaseStat stat) { return _baseStats.getOrDefault(stat, 0); } @@ -94,7 +93,7 @@ public class Henna */ public int getWearFee() { - return _wear_fee; + return _wearFee; } /** @@ -102,7 +101,7 @@ public class Henna */ public int getWearCount() { - return _wear_count; + return _wearCount; } /** @@ -110,7 +109,7 @@ public class Henna */ public int getCancelFee() { - return _cancel_fee; + return _cancelFee; } /** @@ -118,7 +117,7 @@ public class Henna */ public int getCancelCount() { - return _cancel_count; + return _cancelCount; } /** @@ -150,16 +149,16 @@ public class Henna */ public List getAllowedWearClass() { - return _wear_class; + return _wearClass; } /** - * @param c the class trying to wear this dye. + * @param classId the class trying to wear this dye. * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. */ - public boolean isAllowedClass(ClassId c) + public boolean isAllowedClass(ClassId classId) { - return _wear_class.contains(c); + return _wearClass.contains(classId); } /** @@ -167,6 +166,6 @@ public class Henna */ public void setWearClassIds(List wearClassIds) { - _wear_class.addAll(wearClassIds); + _wearClass.addAll(wearClassIds); } } \ No newline at end of file