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

StatsSet properly named as StatSet.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-26 15:07:31 +00:00
parent 9d155febb7
commit 8b5af84230
10201 changed files with 38171 additions and 38171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java
View File

@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author UnAfraid
@@ -57,7 +57,7 @@ public class ActionData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode ->
{
final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode)));
final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode)));
_actionData.put(holder.getId(), holder);
}));
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java
View File

@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.AccessLevel;
import org.l2jmobius.gameserver.model.AdminCommandAccessRight;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -72,7 +72,7 @@ public class AdminData implements IXmlReader
{
NamedNodeMap attrs;
Node attr;
StatsSet set;
StatSet set;
AccessLevel level;
AdminCommandAccessRight command;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -83,7 +83,7 @@ public class AdminData implements IXmlReader
{
if ("access".equalsIgnoreCase(d.getNodeName()))
{
set = new StatsSet();
set = new StatSet();
attrs = d.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{
@@ -99,7 +99,7 @@ public class AdminData implements IXmlReader
}
else if ("admin".equalsIgnoreCase(d.getNodeName()))
{
set = new StatsSet();
set = new StatSet();
attrs = d.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
StatsSet set;
StatSet set;
Node att;
NamedNodeMap attrs;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader
if ("skill".equalsIgnoreCase(d.getNodeName()))
{
attrs = d.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.AppearanceHolder;
import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType;
@@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader
{
if ("appearance_stone".equalsIgnoreCase(d.getNodeName()))
{
final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d)));
final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d)));
for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling())
{
switch (c.getNodeName())
@@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader
}
case "visual":
{
stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c))));
stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c))));
}
}
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
/**
@@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode ->
{
final StatsSet set = new StatsSet(parseAttributes(rewardNode));
final StatSet set = new StatSet(parseAttributes(rewardNode));
final int itemId = set.getInt("id");
final int itemCount = set.getInt("count");
if (ItemTable.getInstance().getTemplate(itemId) == null)

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.Sex;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.beautyshop.BeautyData;
import org.l2jmobius.gameserver.model.beautyshop.BeautyItem;
@@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader
public void parseDocument(Document doc, File f)
{
NamedNodeMap attrs;
StatsSet set;
StatSet set;
Node att;
Race race = null;
Sex sex = null;
@@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader
if ("hair".equalsIgnoreCase(a.getNodeName()))
{
attrs = a.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);
@@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader
if ("color".equalsIgnoreCase(g.getNodeName()))
{
attrs = g.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);
@@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader
else if ("face".equalsIgnoreCase(a.getNodeName()))
{
attrs = a.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.ClanHallGrade;
import org.l2jmobius.gameserver.enums.ClanHallType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.entity.ClanHall;
@@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader
final List<DoorInstance> doors = new ArrayList<>();
final List<Integer> npcs = new ArrayList<>();
final List<ClanHallTeleportHolder> teleports = new ArrayList<>();
final StatsSet params = new StatsSet();
final StatSet params = new StatSet();
for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling())
{

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
View File

@@ -25,7 +25,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -57,7 +57,7 @@ public class ClanMasteryData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode ->
{
final StatsSet set = new StatsSet(parseAttributes(clanNode));
final StatSet set = new StatSet(parseAttributes(clanNode));
final int id = set.getInt("mastery");
final int skill1Id = set.getInt("skill1Id");
final int skill1Level = set.getInt("skill1Level");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
View File

@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder;
import org.l2jmobius.gameserver.model.items.Item;
@@ -57,7 +57,7 @@ public class ClanShopData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "clan", productNode ->
{
final StatsSet set = new StatsSet(parseAttributes(productNode));
final StatSet set = new StatSet(parseAttributes(productNode));
final int clanLevel = set.getInt("level");
final int itemId = set.getInt("item");
final int count = set.getInt("count");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.combination.CombinationItem;
import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward;
import org.l2jmobius.gameserver.model.items.combination.CombinationItemType;
@@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode ->
{
final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode)));
final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode)));
forEach(itemNode, "reward", rewardNode ->
{

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
import org.l2jmobius.gameserver.model.cubic.CubicSkill;
import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder;
@@ -61,7 +61,7 @@ public class CubicData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode))))));
forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode))))));
}
/**
@@ -137,7 +137,7 @@ public class CubicData implements IXmlReader
{
forEach(cubicNode, "skill", skillNode ->
{
final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode)));
final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode)));
forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill));
template.getSkills().add(skill);
});

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode ->
{
final StatsSet set = new StatsSet(parseAttributes(rewardNode));
final StatSet set = new StatSet(parseAttributes(rewardNode));
final List<ItemHolder> items = new ArrayList<>(1);
forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode ->
@@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader
// Initial values in case handler doesn't exists
set.set("handler", "");
set.set("params", StatsSet.EMPTY_STATSET);
set.set("params", StatSet.EMPTY_STATSET);
// Parse handler and parameters
forEach(rewardNode, "handler", handlerNode ->
{
set.set("handler", parseString(handlerNode.getAttributes(), "name"));
final StatsSet params = new StatsSet();
final StatSet params = new StatSet();
set.set("params", params);
forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent()));
});

14
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java
View File

@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@@ -51,7 +51,7 @@ public class DoorData implements IXmlReader
// Info holders
private final Map<String, Set<Integer>> _groups = new HashMap<>();
private final Map<Integer, DoorInstance> _doors = new HashMap<>();
private final Map<Integer, StatsSet> _templates = new HashMap<>();
private final Map<Integer, StatSet> _templates = new HashMap<>();
private final Map<Integer, List<DoorInstance>> _regions = new HashMap<>();
protected DoorData()
@@ -75,9 +75,9 @@ public class DoorData implements IXmlReader
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions.");
}
public StatsSet parseDoor(Node doorNode)
public StatSet parseDoor(Node doorNode)
{
final StatsSet params = new StatsSet(parseAttributes(doorNode));
final StatSet params = new StatSet(parseAttributes(doorNode));
params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate
forEach(doorNode, IXmlReader::isNode, innerDoorNode ->
@@ -115,7 +115,7 @@ public class DoorData implements IXmlReader
/**
* @param set
*/
private void applyCollisions(StatsSet set)
private void applyCollisions(StatSet set)
{
// Insert Collision data
if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1"))
@@ -142,7 +142,7 @@ public class DoorData implements IXmlReader
* @param set
* @return
*/
public DoorInstance spawnDoor(StatsSet set)
public DoorInstance spawnDoor(StatSet set)
{
// Create door template + door instance
final DoorTemplate template = new DoorTemplate(set);
@@ -183,7 +183,7 @@ public class DoorData implements IXmlReader
return door;
}
public StatsSet getDoorTemplate(int doorId)
public StatSet getDoorTemplate(int doorId)
{
return _templates.get(doorId);
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
StatsSet set;
StatSet set;
Node att;
NamedNodeMap attrs;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader
if ("enchant".equalsIgnoreCase(d.getNodeName()))
{
attrs = d.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);
@@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader
else if ("support".equalsIgnoreCase(d.getNodeName()))
{
attrs = d.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.SkillEnchantType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode ->
{
final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode)));
final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode)));
forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount"))));
forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value"))));
forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode))))));
forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode))))));
_enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder);
}));
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -57,7 +57,7 @@ public class EquipmentUpgradeData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "upgrade", upgradeNode ->
{
final StatsSet set = new StatsSet(parseAttributes(upgradeNode));
final StatSet set = new StatSet(parseAttributes(upgradeNode));
final int id = set.getInt("id");
final String[] item = set.getString("item").split(",");
final int requiredItemId = Integer.parseInt(item[0]);

12
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
View File

@@ -34,7 +34,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager;
import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification;
import org.l2jmobius.gameserver.model.eventengine.EventScheduler;
@@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader
*/
private void parseVariables(AbstractEventManager<?> eventManager, Node innerNode)
{
final StatsSet variables = new StatsSet(LinkedHashMap::new);
final StatSet variables = new StatSet(LinkedHashMap::new);
for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling())
{
if ("variable".equals(variableNode.getNodeName()))
@@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader
{
if ("schedule".equals(scheduleNode.getNodeName()))
{
final StatsSet params = new StatsSet(LinkedHashMap::new);
final StatSet params = new StatSet(LinkedHashMap::new);
final NamedNodeMap attrs = scheduleNode.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{
@@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader
}
else if ("conditionalSchedule".equals(scheduleNode.getNodeName()))
{
final StatsSet params = new StatsSet(LinkedHashMap::new);
final StatSet params = new StatSet(LinkedHashMap::new);
final NamedNodeMap attrs = scheduleNode.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{
@@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader
* @param variableNode
*/
@SuppressWarnings("unchecked")
private void parseListVariables(AbstractEventManager<?> eventManager, StatsSet variables, Node variableNode)
private void parseListVariables(AbstractEventManager<?> eventManager, StatSet variables, Node variableNode)
{
final String name = parseString(variableNode.getAttributes(), "name");
final String type = parseString(variableNode.getAttributes(), "type");
@@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader
* @param variableNode
*/
@SuppressWarnings("unchecked")
private void parseMapVariables(AbstractEventManager<?> eventManager, StatsSet variables, Node variableNode)
private void parseMapVariables(AbstractEventManager<?> eventManager, StatSet variables, Node variableNode)
{
final String name = parseString(variableNode.getAttributes(), "name");
final String keyType = parseString(variableNode.getAttributes(), "keyType");

26
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
View File

@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.handler.ConditionHandler;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.ICondition;
import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder;
import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder;
@@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode ->
{
final StatsSet set = new StatsSet(parseAttributes(dropNode));
final StatSet set = new StatSet(parseAttributes(dropNode));
final List<ExtendDropItemHolder> items = new ArrayList<>(1);
forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode ->
@@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader
forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode ->
{
final String conditionName = parseString(conditionNode.getAttributes(), "name");
final StatsSet params = (StatsSet) parseValue(conditionNode);
final Function<StatsSet, ICondition> conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName);
final StatSet params = (StatSet) parseValue(conditionNode);
final Function<StatSet, ICondition> conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
conditions.add(conditionFunction.apply(params));
@@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader
private Object parseValue(Node node)
{
StatsSet statsSet = null;
StatSet statSet = null;
List<Object> list = null;
Object text = null;
for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
@@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader
final Object value = parseValue(node);
if (value != null)
{
if (statsSet == null)
if (statSet == null)
{
statsSet = new StatsSet();
statSet = new StatSet();
}
statsSet.set(nodeName, value);
statSet.set(nodeName, value);
}
}
}
@@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader
{
throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
}
if (statsSet != null)
if (statSet != null)
{
statsSet.set(".", list);
statSet.set(".", list);
}
else
{
@@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader
{
throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
}
if (statsSet != null)
if (statSet != null)
{
statsSet.set(".", text);
statSet.set(".", text);
}
else
{
return text;
}
}
return statsSet;
return statSet;
}
public ExtendDropDataHolder getExtendDropById(int id)

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.FakePlayerHolder;
@@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode ->
{
final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode));
final StatSet set = new StatSet(parseAttributes(fakePlayerNode));
final int npcId = set.getInt("npcId");
final NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
final String name = template.getName();

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java
View File

@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.FenceState;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldRegion;
import org.l2jmobius.gameserver.model.actor.instance.FenceInstance;
@@ -79,7 +79,7 @@ public class FenceData implements IXmlReader
private void spawnFence(Node fenceNode)
{
final StatsSet set = new StatsSet(parseAttributes(fenceNode));
final StatSet set = new StatSet(parseAttributes(fenceNode));
spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED));
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.items.Henna;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -86,7 +86,7 @@ public class HennaData implements IXmlReader
*/
private void parseHenna(Node d)
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
final List<ClassId> wearClassIds = new ArrayList<>();
final List<Skill> skills = new ArrayList<>();
NamedNodeMap attrs = d.getAttributes();

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader
{
if ("item".equalsIgnoreCase(c.getNodeName()))
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
attrs = c.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
View File

@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemPointHolder;
import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
@@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode ->
{
final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode)));
final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode)));
forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode ->
{
final StatsSet stats = new StatsSet(parseAttributes(itemNode));
final StatSet stats = new StatSet(parseAttributes(itemNode));
holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count")));
}));
forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode ->
{
holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode))));
holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode))));
}));
forEach(rewardNode, "modify_reward", uniqueRewardNode ->
@@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader
holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game"));
forEach(uniqueRewardNode, "item", itemNode ->
{
final StatsSet stats = new StatsSet(parseAttributes(itemNode));
final StatSet stats = new StatSet(parseAttributes(itemNode));
holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count")));
});
});

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.commons.util.file.filter.NumericNameFilter;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.SpecialItemType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader
{
forEach(doc, "list", listNode ->
{
final StatsSet set = new StatsSet(parseAttributes(listNode));
final StatSet set = new StatSet(parseAttributes(listNode));
final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4));
final List<MultisellEntryHolder> entries = new ArrayList<>(listNode.getChildNodes().getLength());

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java
View File

@@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope;
import org.l2jmobius.gameserver.enums.DropType;
import org.l2jmobius.gameserver.enums.MpRewardAffectType;
import org.l2jmobius.gameserver.enums.MpRewardType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.holders.DropHolder;
@@ -95,7 +95,7 @@ public class NpcData implements IXmlReader
if ("npc".equalsIgnoreCase(listNode.getNodeName()))
{
NamedNodeMap attrs = listNode.getAttributes();
final StatsSet set = new StatsSet(new HashMap<>());
final StatSet set = new StatSet(new HashMap<>());
final int npcId = parseInteger(attrs, "id");
Map<String, Object> parameters = null;
Map<Integer, Skill> skills = null;
@@ -511,11 +511,11 @@ public class NpcData implements IXmlReader
if (parameters != null)
{
// Using unmodifiable map parameters of template are not meant to be changed at runtime.
template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters)));
template.setParameters(new StatSet(Collections.unmodifiableMap(parameters)));
}
else
{
template.setParameters(StatsSet.EMPTY_STATSET);
template.setParameters(StatSet.EMPTY_STATSET);
}
if (skills != null)

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Mobius
@@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode ->
{
final StatsSet set = new StatsSet(parseAttributes(localisationNode));
final StatSet set = new StatSet(parseAttributes(localisationNode));
NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[]
{
set.getString("name"),

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.handler.EffectHandler;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.options.Options;
import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
@@ -71,7 +71,7 @@ public class OptionData implements IXmlReader
forEach(innerNode, "effect", effectNode ->
{
final String name = parseString(effectNode.getAttributes(), "name");
final StatsSet params = new StatsSet();
final StatSet params = new StatSet();
forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap())));
option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params));
});

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.MountType;
import org.l2jmobius.gameserver.model.PetData;
import org.l2jmobius.gameserver.model.PetLevelData;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* This class parse and hold all pet parameters.<br>
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader
if (s.getNodeName().equals("stat"))
{
final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue());
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling())
{
if (bean.getNodeName().equals("set"))

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
View File

@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
import org.l2jmobius.gameserver.model.base.ClassId;
@@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader
}
else if ("staticData".equalsIgnoreCase(d.getNodeName()))
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set("classId", classId);
final List<Location> creationPoints = new ArrayList<>();

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
@@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader
{
NamedNodeMap attrs = d.getAttributes();
Node att;
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java
View File

@@ -31,7 +31,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.StatusUpdateType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.RecipeHolder;
@@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader
@Override
public void parseDocument(Document doc, File f)
{
StatsSet set;
StatSet set;
Node att;
NamedNodeMap attrs;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader
if ("recipe".equalsIgnoreCase(d.getNodeName()))
{
attrs = d.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
/**
@@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader
forEach(doc, "list", list -> forEach(list, "function", func ->
{
final NamedNodeMap attrs = func.getAttributes();
final StatsSet set = new StatsSet(HashMap::new);
final StatSet set = new StatSet(HashMap::new);
for (int i = 0; i < attrs.getLength(); i++)
{
final Node node = attrs.item(i);
@@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader
forEach(func, "function", levelNode ->
{
final NamedNodeMap levelAttrs = levelNode.getAttributes();
final StatsSet levelSet = new StatsSet(HashMap::new);
final StatSet levelSet = new StatSet(HashMap::new);
levelSet.merge(set);
for (int i = 0; i < levelAttrs.getLength(); i++)
{

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
/**
@@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode ->
{
final StatsSet set = new StatsSet(parseAttributes(localisationNode));
final StatSet set = new StatSet(parseAttributes(localisationNode));
SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING));
}));
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.VehiclePathPoint;
import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance;
import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader
public void parseDocument(Document doc, File f)
{
NamedNodeMap attrs;
StatsSet set;
StatSet set;
Node att;
ShuttleDataHolder data;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader
if ("shuttle".equalsIgnoreCase(d.getNodeName()))
{
attrs = d.getAttributes();
set = new StatsSet();
set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
att = attrs.item(i);
@@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader
{
for (ShuttleDataHolder data : _shuttles.values())
{
final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet()));
final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet()));
shuttle.setData(data);
shuttle.setHeading(data.getLocation().getHeading());
shuttle.setLocationInvisible(data.getLocation());

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.SiegeScheduleDate;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.util.Util;
/**
@@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers.");
if (_scheduleData.isEmpty())
{
_scheduleData.add(new SiegeScheduleDate(new StatsSet()));
_scheduleData.add(new SiegeScheduleDate(new StatSet()));
LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers.");
}
}
@@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader
{
case "schedule":
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
final NamedNodeMap attrs = cd.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{

86
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
View File

@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.handler.EffectHandler;
import org.l2jmobius.gameserver.handler.SkillConditionHandler;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.CommonSkill;
import org.l2jmobius.gameserver.model.skills.EffectScope;
@@ -67,9 +67,9 @@ public class SkillData implements IXmlReader
private final Integer _toLevel;
private final Integer _fromSubLevel;
private final Integer _toSubLevel;
private final Map<Integer, Map<Integer, StatsSet>> _info;
private final Map<Integer, Map<Integer, StatSet>> _info;
public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map<Integer, Map<Integer, StatsSet>> info)
public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map<Integer, Map<Integer, StatSet>> info)
{
_name = name;
_fromLevel = fromLevel;
@@ -104,7 +104,7 @@ public class SkillData implements IXmlReader
return _toSubLevel;
}
public Map<Integer, Map<Integer, StatsSet>> getInfo()
public Map<Integer, Map<Integer, StatSet>> getInfo()
{
return _info;
}
@@ -241,8 +241,8 @@ public class SkillData implements IXmlReader
{
NamedNodeMap attributes = listNode.getAttributes();
final Map<Integer, Set<Integer>> levels = new HashMap<>();
final Map<Integer, Map<Integer, StatsSet>> skillInfo = new HashMap<>();
final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet());
final Map<Integer, Map<Integer, StatSet>> skillInfo = new HashMap<>();
final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet());
parseAttributes(attributes, "", generalSkillInfo);
@@ -321,7 +321,7 @@ public class SkillData implements IXmlReader
{
return;
}
subLevelMap.forEach((subLevel, statsSet) ->
subLevelMap.forEach((subLevel, statSet) ->
{
if (subLevel == -1)
{
@@ -339,7 +339,7 @@ public class SkillData implements IXmlReader
{
return;
}
subLevelMap.forEach((subLevel, statsSet) ->
subLevelMap.forEach((subLevel, statSet) ->
{
if (subLevel == -1)
{
@@ -371,31 +371,31 @@ public class SkillData implements IXmlReader
levels.forEach((level, subLevels) -> subLevels.forEach(subLevel ->
{
final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new);
skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent);
skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent);
statsSet.set(".level", level);
statsSet.set(".subLevel", subLevel);
final Skill skill = new Skill(statsSet);
final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new);
skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent);
skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent);
statSet.set(".level", level);
statSet.set(".subLevel", subLevel);
final Skill skill = new Skill(statSet);
forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) ->
{
final String effectName = params.getString(".name");
params.remove(".name");
try
{
final Function<StatsSet, AbstractEffect> effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName);
final Function<StatSet, AbstractEffect> effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName);
if (effectFunction != null)
{
skill.addEffect(effectScope, effectFunction.apply(params));
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]");
LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]");
}
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e);
}
}));
@@ -405,19 +405,19 @@ public class SkillData implements IXmlReader
params.remove(".name");
try
{
final Function<StatsSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]");
LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]");
}
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e);
}
}));
@@ -434,16 +434,16 @@ public class SkillData implements IXmlReader
}
}
private <T> void forEachNamedParamInfoParam(Map<T, List<NamedParamInfo>> paramInfo, int level, int subLevel, BiConsumer<T, StatsSet> consumer)
private <T> void forEachNamedParamInfoParam(Map<T, List<NamedParamInfo>> paramInfo, int level, int subLevel, BiConsumer<T, StatSet> consumer)
{
paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo ->
{
if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) //
&& (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel))))
{
final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new);
namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent);
namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent);
final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new);
namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent);
namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent);
params.set(".name", namedParamInfo.getName());
consumer.accept(scope, params);
}
@@ -460,7 +460,7 @@ public class SkillData implements IXmlReader
final Integer subLevel = parseInteger(attributes, "subLevel");
final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
final Map<Integer, Map<Integer, StatsSet>> info = new HashMap<>();
final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
{
if (!node.getNodeName().equals("#text"))
@@ -471,7 +471,7 @@ public class SkillData implements IXmlReader
return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
}
private void parseInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues, Map<Integer, Map<Integer, StatsSet>> info)
private void parseInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues, Map<Integer, Map<Integer, StatSet>> info)
{
Map<Integer, Map<Integer, Object>> values = parseValues(node);
final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1);
@@ -492,7 +492,7 @@ public class SkillData implements IXmlReader
}
}
values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value)));
values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value)));
}
private Map<Integer, Map<Integer, Object>> parseValues(Node node)
@@ -535,7 +535,7 @@ public class SkillData implements IXmlReader
variables.put("index", (i - fromLevel) + 1d);
variables.put("subIndex", (j - fromSubLevel) + 1d);
final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
if ((base != null) && !(base instanceof StatsSet))
if ((base != null) && !(base instanceof StatSet))
{
variables.put("base", Double.parseDouble(String.valueOf(base)));
}
@@ -555,13 +555,13 @@ public class SkillData implements IXmlReader
Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
{
StatsSet statsSet = null;
StatSet statSet = null;
List<Object> list = null;
Object text = null;
if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
{
statsSet = new StatsSet();
parseAttributes(node.getAttributes(), "", statsSet, variables);
statSet = new StatSet();
parseAttributes(node.getAttributes(), "", statSet, variables);
}
for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
{
@@ -604,12 +604,12 @@ public class SkillData implements IXmlReader
final Object value = parseValue(node, false, true, variables);
if (value != null)
{
if (statsSet == null)
if (statSet == null)
{
statsSet = new StatsSet();
statSet = new StatSet();
}
statsSet.set(nodeName, value);
statSet.set(nodeName, value);
}
}
}
@@ -620,9 +620,9 @@ public class SkillData implements IXmlReader
{
throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
}
if (statsSet != null)
if (statSet != null)
{
statsSet.set(".", list);
statSet.set(".", list);
}
else
{
@@ -635,30 +635,30 @@ public class SkillData implements IXmlReader
{
throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
}
if (statsSet != null)
if (statSet != null)
{
statsSet.set(".", text);
statSet.set(".", text);
}
else
{
return text;
}
}
return statsSet;
return statSet;
}
private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map<String, Double> variables)
private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map<String, Double> variables)
{
for (int i = 0; i < attributes.getLength(); i++)
{
final Node attributeNode = attributes.item(i);
statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables));
statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables));
}
}
private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet)
private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet)
{
parseAttributes(attributes, prefix, statsSet, Collections.emptyMap());
parseAttributes(attributes, prefix, statSet, Collections.emptyMap());
}
private Object parseNodeValue(String value, Map<String, Double> variables)

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassType;
import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.AcquireSkillType;
import org.l2jmobius.gameserver.model.base.ClassId;
@@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader
{
if ("skill".equalsIgnoreCase(c.getNodeName()))
{
final StatsSet learnSkillSet = new StatsSet();
final StatSet learnSkillSet = new StatSet();
attrs = c.getAttributes();
for (int i = 0; i < attrs.getLength(); i++)
{

16
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
View File

@@ -36,7 +36,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.ChanceLocation;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
@@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader
public void parseSpawn(Node spawnsNode, File file, Collection<SpawnTemplate> spawns)
{
final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file);
final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file);
SpawnGroup defaultGroup = null;
for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
{
@@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader
{
if (defaultGroup == null)
{
defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET);
defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
}
parseNpc(innerNode, spawnTemplate, defaultGroup);
}
@@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader
private void parseGroup(Node n, SpawnTemplate spawnTemplate)
{
final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n)));
final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n)));
forEach(n, IXmlReader::isNode, npcNode ->
{
switch (npcNode.getNodeName())
@@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader
*/
private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group)
{
final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n)));
final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n)));
final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId());
if (template == null)
{
@@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader
* @param n
* @param npcTemplate
*/
private void parseParameters(Node n, IParameterized<StatsSet> npcTemplate)
private void parseParameters(Node n, IParameterized<StatSet> npcTemplate)
{
final Map<String, Object> params = parseParameters(n);
npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET);
npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET);
}
/**
@@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader
*/
private void parseMinions(Node n, NpcSpawnTemplate npcTemplate)
{
forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode)))));
forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode)))));
}
/**

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader
if ("object".equalsIgnoreCase(d.getNodeName()))
{
final NamedNodeMap attrs = d.getAttributes();
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
final Node att = attrs.item(i);
@@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader
* Initialize an static object based on the stats set and add it to the map.
* @param set the stats set to add.
*/
private void addObject(StatsSet set)
private void addObject(StatSet set)
{
final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id"));
final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id"));
obj.setType(set.getInt("type", 0));
obj.setName(set.getString("name"));
obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0));

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.enums.TeleportType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.teleporter.TeleportHolder;
/**
@@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader
final String name = parseString(nodeAttrs, "name", type.name());
// Parse locations
final TeleportHolder holder = new TeleportHolder(name, type);
forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location))));
forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location))));
// Register holder
if (teleList.putIfAbsent(name, holder) != null)
{

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java
View File

@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.transform.Transform;
import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
@@ -70,7 +70,7 @@ public class TransformData implements IXmlReader
if ("transform".equalsIgnoreCase(d.getNodeName()))
{
NamedNodeMap attrs = d.getAttributes();
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
for (int i = 0; i < attrs.getLength(); i++)
{
final Node att = attrs.item(i);
@@ -192,7 +192,7 @@ public class TransformData implements IXmlReader
transform.setTemplate(isMale, templateData);
}
final StatsSet levelsSet = new StatsSet();
final StatSet levelsSet = new StatSet();
for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling())
{
if ("level".equals(s.getNodeName()))

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.PlayerState;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType;
@@ -177,7 +177,7 @@ public abstract class DocumentBase
protected abstract void parseDocument(Document doc);
protected abstract StatsSet getStatsSet();
protected abstract StatSet getStatSet();
protected abstract String getTableValue(String name);
@@ -1238,7 +1238,7 @@ public abstract class DocumentBase
setTable(name, array.toArray(new String[array.size()]));
}
protected void parseBeanSet(Node n, StatsSet set, Integer level)
protected void parseBeanSet(Node n, StatSet set, Integer level)
{
final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim();
final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim();
@@ -1253,7 +1253,7 @@ public abstract class DocumentBase
}
}
protected void setExtractableSkillData(StatsSet set, String value)
protected void setExtractableSkillData(StatSet set, String value)
{
set.set("capsuled_items_skill", value);
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java
View File

@@ -21,7 +21,7 @@ import java.io.File;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.Condition;
/**
@@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase
}
@Override
protected StatsSet getStatsSet()
protected StatSet getStatSet()
{
return null;
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
View File

@@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.engines.DocumentBase;
import org.l2jmobius.gameserver.enums.ItemSkillType;
import org.l2jmobius.gameserver.model.ExtractableProduct;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
import org.l2jmobius.gameserver.model.items.Item;
@@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader
}
@Override
protected StatsSet getStatsSet()
protected StatSet getStatSet()
{
return _currentItem.set;
}
@@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader
_currentItem.id = itemId;
_currentItem.name = itemName;
_currentItem.type = className;
_currentItem.set = new StatsSet();
_currentItem.set = new StatSet();
_currentItem.set.set("item_id", itemId);
_currentItem.set.set("name", itemName);
_currentItem.set.set("additionalName", additionalName);
@@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader
try
{
final Constructor<?> itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class);
final Constructor<?> itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class);
_currentItem.item = (Item) itemClass.newInstance(_currentItem.set);
}
catch (Exception e)

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.engines.items;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.Item;
public class ItemDataHolder
@@ -24,7 +24,7 @@ public class ItemDataHolder
int id;
String type;
String name;
StatsSet set;
StatSet set;
int currentLevel;
Item item;
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/ConditionHandler.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.ICondition;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
@@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
*/
public class ConditionHandler
{
private final Map<String, Function<StatsSet, ICondition>> _conditionHandlerFactories = new HashMap<>();
private final Map<String, Function<StatSet, ICondition>> _conditionHandlerFactories = new HashMap<>();
public void registerHandler(String name, Function<StatsSet, ICondition> handlerFactory)
public void registerHandler(String name, Function<StatSet, ICondition> handlerFactory)
{
_conditionHandlerFactories.put(name, handlerFactory);
}
public Function<StatsSet, ICondition> getHandlerFactory(String name)
public Function<StatSet, ICondition> getHandlerFactory(String name)
{
return _conditionHandlerFactories.get(name);
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/EffectHandler.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
@@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
*/
public class EffectHandler
{
private final Map<String, Function<StatsSet, AbstractEffect>> _effectHandlerFactories = new HashMap<>();
private final Map<String, Function<StatSet, AbstractEffect>> _effectHandlerFactories = new HashMap<>();
public void registerHandler(String name, Function<StatsSet, AbstractEffect> handlerFactory)
public void registerHandler(String name, Function<StatSet, AbstractEffect> handlerFactory)
{
_effectHandlerFactories.put(name, handlerFactory);
}
public Function<StatsSet, AbstractEffect> getHandlerFactory(String name)
public Function<StatSet, AbstractEffect> getHandlerFactory(String name)
{
return _effectHandlerFactories.get(name);
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
@@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
*/
public class SkillConditionHandler
{
private final Map<String, Function<StatsSet, ISkillCondition>> _skillConditionHandlerFactories = new HashMap<>();
private final Map<String, Function<StatSet, ISkillCondition>> _skillConditionHandlerFactories = new HashMap<>();
public void registerHandler(String name, Function<StatsSet, ISkillCondition> handlerFactory)
public void registerHandler(String name, Function<StatSet, ISkillCondition> handlerFactory)
{
_skillConditionHandlerFactories.put(name, handlerFactory);
}
public Function<StatsSet, ISkillCondition> getHandlerFactory(String name)
public Function<StatSet, ISkillCondition> getHandlerFactory(String name)
{
return _skillConditionHandlerFactories.get(name);
}

18
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java
View File

@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.model.AirShipTeleportList;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.VehiclePathPoint;
import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance;
import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance;
@@ -45,13 +45,13 @@ public class AirShipManager
private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?";
private CreatureTemplate _airShipTemplate = null;
private final Map<Integer, StatsSet> _airShipsInfo = new HashMap<>();
private final Map<Integer, StatSet> _airShipsInfo = new HashMap<>();
private final Map<Integer, AirShipInstance> _airShips = new HashMap<>();
private final Map<Integer, AirShipTeleportList> _teleports = new HashMap<>();
protected AirShipManager()
{
final StatsSet npcDat = new StatsSet();
final StatSet npcDat = new StatSet();
npcDat.set("npcId", 9);
npcDat.set("level", 0);
npcDat.set("jClass", "boat");
@@ -113,7 +113,7 @@ public class AirShipManager
public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId)
{
final StatsSet info = _airShipsInfo.get(ownerId);
final StatSet info = _airShipsInfo.get(ownerId);
if (info == null)
{
return null;
@@ -147,7 +147,7 @@ public class AirShipManager
if (ship.getOwnerId() != 0)
{
storeInDb(ship.getOwnerId());
final StatsSet info = _airShipsInfo.get(ship.getOwnerId());
final StatSet info = _airShipsInfo.get(ship.getOwnerId());
if (info != null)
{
info.set("fuel", ship.getFuel());
@@ -164,7 +164,7 @@ public class AirShipManager
{
if (!_airShipsInfo.containsKey(ownerId))
{
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("fuel", 600);
_airShipsInfo.put(ownerId, info);
@@ -264,10 +264,10 @@ public class AirShipManager
Statement s = con.createStatement();
ResultSet rs = s.executeQuery(LOAD_DB))
{
StatsSet info;
StatSet info;
while (rs.next())
{
info = new StatsSet();
info = new StatSet();
info.set("fuel", rs.getInt("fuel"));
_airShipsInfo.put(rs.getInt("owner_id"), info);
}
@@ -285,7 +285,7 @@ public class AirShipManager
private void storeInDb(int ownerId)
{
final StatsSet info = _airShipsInfo.get(ownerId);
final StatSet info = _airShipsInfo.get(ownerId);
if (info == null)
{
return;

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.VehiclePathPoint;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
@@ -57,7 +57,7 @@ public class BoatManager
return null;
}
final StatsSet npcDat = new StatsSet();
final StatSet npcDat = new StatSet();
npcDat.set("npcId", boatId);
npcDat.set("level", 0);
npcDat.set("jClass", "boat");

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode;
import org.l2jmobius.gameserver.model.CropProcure;
import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.SeedProduction;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.model.entity.Castle;
@@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable
@Override
public void parseDocument(Document doc, File f)
{
StatsSet set;
StatSet set;
NamedNodeMap attrs;
Node att;
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
@@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable
{
if ("crop".equalsIgnoreCase(c.getNodeName()))
{
set = new StatsSet();
set = new StatSet();
set.set("castleId", castleId);
attrs = c.getAttributes();

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
View File

@@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.CeremonyOfChaosState;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
}
}
getTimers().addTimer("count_down", StatsSet.valueOf("time", 60), 60 * 1000, null, null);
getTimers().addTimer("count_down", StatSet.valueOf("time", 60), 60 * 1000, null, null);
}
@ScheduleTarget
@@ -254,7 +254,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
}
@Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player)
public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{
switch (event)
{

20
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SpawnsData;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
@@ -54,7 +54,7 @@ public class DBSpawnManager
protected final Map<Integer, Npc> _npcs = new ConcurrentHashMap<>();
protected final Map<Integer, Spawn> _spawns = new ConcurrentHashMap<>();
protected final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
protected final Map<Integer, StatSet> _storedInfo = new ConcurrentHashMap<>();
protected final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
/**
@@ -161,7 +161,7 @@ public class DBSpawnManager
{
npc.setDBStatus(RaidBossStatus.ALIVE);
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", npc.getCurrentHp());
info.set("currentMP", npc.getCurrentMp());
info.set("respawnTime", 0);
@@ -181,7 +181,7 @@ public class DBSpawnManager
*/
public void updateStatus(Npc npc, boolean isNpcDead)
{
final StatsSet info = _storedInfo.get(npc.getId());
final StatSet info = _storedInfo.get(npc.getId());
if (info == null)
{
return;
@@ -254,7 +254,7 @@ public class DBSpawnManager
_npcs.put(npcId, npc);
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", currentHP);
info.set("currentMP", currentMP);
info.set("respawnTime", 0);
@@ -316,7 +316,7 @@ public class DBSpawnManager
}
npc.setDBStatus(RaidBossStatus.ALIVE);
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", npc.getMaxHp());
info.set("currentMP", npc.getMaxMp());
info.set("respawnTime", 0);
@@ -401,7 +401,7 @@ public class DBSpawnManager
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?"))
{
for (Entry<Integer, StatsSet> entry : _storedInfo.entrySet())
for (Entry<Integer, StatSet> entry : _storedInfo.entrySet())
{
final Integer npcId = entry.getKey();
if (npcId == null)
@@ -420,7 +420,7 @@ public class DBSpawnManager
updateStatus(npc, false);
}
final StatsSet info = entry.getValue();
final StatSet info = entry.getValue();
if (info == null)
{
continue;
@@ -529,7 +529,7 @@ public class DBSpawnManager
*/
public void notifySpawnNightNpc(Npc npc)
{
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("currentHP", npc.getCurrentHp());
info.set("currentMP", npc.getCurrentMp());
info.set("respawnTime", 0);
@@ -572,7 +572,7 @@ public class DBSpawnManager
* Gets the stored info.
* @return the stored info
*/
public Map<Integer, StatsSet> getStoredInfo()
public Map<Integer, StatSet> getStoredInfo()
{
return _storedInfo;
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder;
@@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader
{
forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode ->
{
final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode));
final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode));
MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers")));
}));
}

16
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.xml.impl.NpcData;
import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.interfaces.IStorable;
@@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable
protected static Map<Integer, GrandBossInstance> _bosses = new ConcurrentHashMap<>();
protected static Map<Integer, StatsSet> _storedInfo = new HashMap<>();
protected static Map<Integer, StatSet> _storedInfo = new HashMap<>();
private final Map<Integer, Integer> _bossStatus = new HashMap<>();
@@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable
final int bossId = rs.getInt("boss_id");
if (NpcData.getInstance().getTemplate(bossId) != null)
{
final StatsSet info = new StatsSet();
final StatSet info = new StatSet();
info.set("loc_x", rs.getInt("loc_x"));
info.set("loc_y", rs.getInt("loc_y"));
info.set("loc_z", rs.getInt("loc_z"));
@@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable
return _bosses.get(bossId);
}
public StatsSet getStatsSet(int bossId)
public StatSet getStatSet(int bossId)
{
return _storedInfo.get(bossId);
}
public void setStatsSet(int bossId, StatsSet info)
public void setStatSet(int bossId, StatSet info)
{
_storedInfo.put(bossId, info);
updateDb(bossId, false);
@@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable
{
try (Connection con = DatabaseFactory.getConnection())
{
for (Entry<Integer, StatsSet> e : _storedInfo.entrySet())
for (Entry<Integer, StatSet> e : _storedInfo.entrySet())
{
final GrandBossInstance boss = _bosses.get(e.getKey());
final StatsSet info = e.getValue();
final StatSet info = e.getValue();
if ((boss == null) || (info == null))
{
try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2))
@@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable
try (Connection con = DatabaseFactory.getConnection())
{
final GrandBossInstance boss = _bosses.get(bossId);
final StatsSet info = _storedInfo.get(bossId);
final StatSet info = _storedInfo.get(bossId);
if (statusOnly || (boss == null) || (info == null))
{

20
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType;
import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType;
import org.l2jmobius.gameserver.enums.InstanceTeleportType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate;
import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder;
@@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader
return;
}
final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode)));
final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode)));
// Update name if wasn't provided
if (template.getName() == null)
@@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader
{
if (doorNode.getNodeName().equals("door"))
{
final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode);
final StatsSet mergedSet = new StatsSet();
final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode);
final StatSet mergedSet = new StatSet();
final int doorId = parsedSet.getInt("id");
final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId);
final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId);
if (templateSet != null)
{
mergedSet.merge(templateSet);
@@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader
final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false);
final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false);
// Load parameters
StatsSet params = null;
StatSet params = null;
for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling())
{
if (f.getNodeName().equals("param"))
{
if (params == null)
{
params = new StatsSet();
params = new StatSet();
}
params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value"));
@@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader
// If none parameters found then set empty StatSet
if (params == null)
{
params = StatsSet.EMPTY_STATSET;
params = StatSet.EMPTY_STATSET;
}
// Now when everything is loaded register condition to template
try
{
final Class<?> clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type);
final Constructor<?> constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class);
final Constructor<?> constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class);
conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml));
}
catch (Exception ex)
@@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader
*/
public Instance createInstance()
{
return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null);
return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null);
}
/**

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AccessLevel.java
View File

@@ -52,7 +52,7 @@ public class AccessLevel
/** Flag to gain exp in party */
private boolean _gainExp = false;
public AccessLevel(StatsSet set)
public AccessLevel(StatSet set)
{
_accessLevel = set.getInt("level");
_name = set.getString("name");

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ActionDataHolder.java
View File

@@ -25,7 +25,7 @@ public class ActionDataHolder
private final String _handler;
private final int _optionId;
public ActionDataHolder(StatsSet set)
public ActionDataHolder(StatSet set)
{
_id = set.getInt("id");
_handler = set.getString("handler");

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java
View File

@@ -27,7 +27,7 @@ public class AdminCommandAccessRight
private final int _accessLevel;
private final boolean _requireConfirm;
public AdminCommandAccessRight(StatsSet set)
public AdminCommandAccessRight(StatSet set)
{
_adminCommand = set.getString("command");
_requireConfirm = set.getBoolean("confirmDlg", false);

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java
View File

@@ -36,7 +36,7 @@ public class DailyMissionDataHolder
private final List<ItemHolder> _rewardsItems;
private final List<ClassId> _classRestriction;
private final int _requiredCompletions;
private final StatsSet _params;
private final StatSet _params;
private final boolean _dailyReset;
private final boolean _isOneTime;
private final boolean _isMainClassOnly;
@@ -44,7 +44,7 @@ public class DailyMissionDataHolder
private final boolean _isDisplayedWhenNotAvailable;
private final AbstractDailyMissionHandler _handler;
public DailyMissionDataHolder(StatsSet set)
public DailyMissionDataHolder(StatSet set)
{
final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler"));
@@ -53,7 +53,7 @@ public class DailyMissionDataHolder
_requiredCompletions = set.getInt("requiredCompletion", 0);
_rewardsItems = set.getList("items", ItemHolder.class);
_classRestriction = set.getList("classRestriction", ClassId.class);
_params = set.getObject("params", StatsSet.class);
_params = set.getObject("params", StatSet.class);
_dailyReset = set.getBoolean("dailyReset", true);
_isOneTime = set.getBoolean("isOneTime", true);
_isMainClassOnly = set.getBoolean("isMainClassOnly", true);
@@ -87,7 +87,7 @@ public class DailyMissionDataHolder
return _requiredCompletions;
}
public StatsSet getParams()
public StatSet getParams()
{
return _params;
}

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Location.java
View File

@@ -49,7 +49,7 @@ public class Location implements IPositionable
this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading());
}
public Location(StatsSet set)
public Location(StatSet set)
{
_x = set.getInt("x");
_y = set.getInt("y");

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/PetLevelData.java
View File

@@ -46,7 +46,7 @@ public class PetLevelData
private final double _slowFlySpeedOnRide;
private final double _fastFlySpeedOnRide;
public PetLevelData(StatsSet set)
public PetLevelData(StatSet set)
{
_ownerExpTaken = set.getInt("get_exp_type");
_petMaxExp = set.getLong("exp");

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java
View File

@@ -35,7 +35,7 @@ public class Seed
private final long _seedReferencePrice;
private final long _cropReferencePrice;
public Seed(StatsSet set)
public Seed(StatSet set)
{
_cropId = set.getInt("id");
_seedId = set.getInt("seedId");

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java
View File

@@ -27,7 +27,7 @@ public class SiegeScheduleDate
private final int _hour;
private final int _maxConcurrent;
public SiegeScheduleDate(StatsSet set)
public SiegeScheduleDate(StatSet set)
{
_day = set.getInt("day", Calendar.SUNDAY);
_hour = set.getInt("hour", 16);

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SkillLearn.java
View File

@@ -58,7 +58,7 @@ public class SkillLearn
* Constructor for SkillLearn.
* @param set the set with the SkillLearn data.
*/
public SkillLearn(StatsSet set)
public SkillLearn(StatSet set)
{
_skillName = set.getString("skillName");
_skillId = set.getInt("skillId");

42
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatsSet.java → L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatSet.java
View File

@@ -39,25 +39,25 @@ import org.l2jmobius.gameserver.util.Util;
* They are stored as object but can be retrieved in any type wanted. As long as cast is available.<br>
* @author mkizub
*/
public class StatsSet implements IParserAdvUtils
public class StatSet implements IParserAdvUtils
{
private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName());
private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName());
/** Static empty immutable map, used to avoid multiple null checks over the source. */
public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap());
public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap());
private final Map<String, Object> _set;
public StatsSet()
public StatSet()
{
this(ConcurrentHashMap::new);
}
public StatsSet(Supplier<Map<String, Object>> mapFactory)
public StatSet(Supplier<Map<String, Object>> mapFactory)
{
this(mapFactory.get());
}
public StatsSet(Map<String, Object> map)
public StatSet(Map<String, Object> map)
{
_set = map;
}
@@ -73,9 +73,9 @@ public class StatsSet implements IParserAdvUtils
/**
* Add a set of couple values in the current set
* @param newSet : StatsSet pointing out the list of couples to add in the current set
* @param newSet : StatSet pointing out the list of couples to add in the current set
*/
public void merge(StatsSet newSet)
public void merge(StatSet newSet)
{
_set.putAll(newSet.getSet());
}
@@ -871,7 +871,7 @@ public class StatsSet implements IParserAdvUtils
return (Map<K, V>) obj;
}
public StatsSet set(String name, Object value)
public StatSet set(String name, Object value)
{
if (value == null)
{
@@ -881,49 +881,49 @@ public class StatsSet implements IParserAdvUtils
return this;
}
public StatsSet set(String key, boolean value)
public StatSet set(String key, boolean value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, byte value)
public StatSet set(String key, byte value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, short value)
public StatSet set(String key, short value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, int value)
public StatSet set(String key, int value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, long value)
public StatSet set(String key, long value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, float value)
public StatSet set(String key, float value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, double value)
public StatSet set(String key, double value)
{
_set.put(key, value);
return this;
}
public StatsSet set(String key, String value)
public StatSet set(String key, String value)
{
if (value == null)
{
@@ -933,7 +933,7 @@ public class StatsSet implements IParserAdvUtils
return this;
}
public StatsSet set(String key, Enum<?> value)
public StatSet set(String key, Enum<?> value)
{
if (value == null)
{
@@ -943,9 +943,9 @@ public class StatsSet implements IParserAdvUtils
return this;
}
public static StatsSet valueOf(String key, Object value)
public static StatSet valueOf(String key, Object value)
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.set(key, value);
return set;
}
@@ -963,6 +963,6 @@ public class StatsSet implements IParserAdvUtils
@Override
public String toString()
{
return "StatsSet{_set=" + _set + '}';
return "StatSet{_set=" + _set + '}';
}
}

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.MpRewardTask;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance;
@@ -148,7 +148,7 @@ public class Npc extends Creature
private NpcStringId _titleString;
private NpcStringId _nameString;
private StatsSet _params;
private StatSet _params;
private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */
@@ -1756,7 +1756,7 @@ public class Npc extends Creature
/**
* @return the parameters of the npc merged with the spawn parameters (if there are any)
*/
public StatsSet getParameters()
public StatSet getParameters()
{
if (_params != null)
{
@@ -1768,10 +1768,10 @@ public class Npc extends Creature
final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate();
if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty())
{
final StatsSet params = getTemplate().getParameters();
final StatSet params = getTemplate().getParameters();
if ((params != null) && !params.getSet().isEmpty())
{
final StatsSet set = new StatsSet();
final StatSet set = new StatSet();
set.merge(params);
set.merge(npcSpawnTemplate.getParameters());
_params = set;

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java
View File

@@ -21,7 +21,7 @@ import java.util.EnumMap;
import java.util.Map;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.events.ListenersContainer;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer
/** The creature's race. */
private Race _race;
public CreatureTemplate(StatsSet set)
public CreatureTemplate(StatSet set)
{
set(set);
}
public void set(StatsSet set)
public void set(StatSet set)
{
// Base stats
_baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0));

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.cubic.CubicInstance;
@@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder
private final List<ICubicCondition> _conditions = new ArrayList<>();
public List<CubicSkill> _skills = new ArrayList<>();
public CubicTemplate(StatsSet set)
public CubicTemplate(StatSet set)
{
_id = set.getInt("id");
_level = set.getInt("level");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.actor.templates;
import org.l2jmobius.gameserver.enums.DoorOpenType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
/**
@@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable
private final boolean _stealth;
private final boolean _isInverted;
public DoorTemplate(StatsSet set)
public DoorTemplate(StatSet set)
{
super(set);
_doorId = set.getInt("id");

14
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType;
import org.l2jmobius.gameserver.enums.MpRewardType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.Sex;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.DropHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private boolean _usingServerSideName;
private String _title;
private boolean _usingServerSideTitle;
private StatsSet _parameters;
private StatSet _parameters;
private Sex _sex;
private int _chestId;
private int _rhandId;
@@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
/**
* Constructor of Creature.
* @param set The StatsSet object to transfer data to the method
* @param set The StatSet object to transfer data to the method
*/
public NpcTemplate(StatsSet set)
public NpcTemplate(StatSet set)
{
super(set);
}
@Override
public void set(StatsSet set)
public void set(StatSet set)
{
super.set(set);
_id = set.getInt("id");
@@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
return _usingServerSideTitle;
}
public StatsSet getParameters()
public StatSet getParameters()
{
return _parameters;
}
public void setParameters(StatsSet set)
public void setParameters(StatSet set)
{
_parameters = set;
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java
View File

@@ -23,7 +23,7 @@ import java.util.Map;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
@@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate
private final List<Location> _creationPoints;
private final Map<Integer, Integer> _baseSlotDef;
public PlayerTemplate(StatsSet set, List<Location> creationPoints)
public PlayerTemplate(StatSet set, List<Location> creationPoints)
{
super(set);
_classId = ClassId.getClassId(set.getInt("classId"));

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
View File

@@ -23,7 +23,7 @@ import java.util.Objects;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.enums.InventoryBlockType;
import org.l2jmobius.gameserver.enums.Sex;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -57,7 +57,7 @@ public class Transform implements IIdentifiable
private TransformTemplate _maleTemplate;
private TransformTemplate _femaleTemplate;
public Transform(StatsSet set)
public Transform(StatSet set)
{
_id = set.getInt("id");
_displayId = set.getInt("displayId", _id);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
@@ -31,7 +31,7 @@ public class TransformLevelData
private final double _levelMod;
private Map<Integer, Double> _stats;
public TransformLevelData(StatsSet set)
public TransformLevelData(StatSet set)
{
_level = set.getInt("val");
_levelMod = set.getDouble("levelMod");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
View File

@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -49,7 +49,7 @@ public class TransformTemplate
private ExBasicActionList _list;
private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
public TransformTemplate(StatsSet set)
public TransformTemplate(StatSet set)
{
_collisionRadius = set.contains("radius") ? set.getDouble("radius") : null;
_collisionHeight = set.contains("height") ? set.getDouble("height") : null;

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java
View File

@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
/**
@@ -36,7 +36,7 @@ public class AlchemyCraftData
private ItemHolder _productionSuccess;
private ItemHolder _productionFailure;
public AlchemyCraftData(StatsSet set)
public AlchemyCraftData(StatSet set)
{
_id = set.getInt("id");
_level = set.getInt("level");

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Sdw
@@ -32,7 +32,7 @@ public class BeautyItem
private final int _beautyShopTicket;
private final Map<Integer, BeautyItem> _colors = new HashMap<>();
public BeautyItem(StatsSet set)
public BeautyItem(StatSet set)
{
_id = set.getInt("id");
_adena = set.getInt("adena", 0);
@@ -60,7 +60,7 @@ public class BeautyItem
return _beautyShopTicket;
}
public void addColor(StatsSet set)
public void addColor(StatSet set)
{
final BeautyItem color = new BeautyItem(set);
_colors.put(set.getInt("id"), color);

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance;
@@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance);
}
getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null);
getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null);
getTimers().addTimer("teleport_message1", 10000, null, null);
getTimers().addTimer("teleport_message2", 14000, null, null);
@@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
}
}
getTimers().cancelTimer("update", null, null);
getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null);
getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null);
EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members));
}
@@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
}
@Override
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player)
public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{
switch (event)
{

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition;
@@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder
private final List<ICubicCondition> _conditions = new ArrayList<>();
private final boolean _targetDebuff;
public CubicSkill(StatsSet set)
public CubicSkill(StatSet set)
{
super(set.getInt("id"), set.getInt("level"));
_triggerRate = set.getInt("triggerRate", 100);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java
View File

@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade;
import org.l2jmobius.gameserver.enums.ClanHallType;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence
private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?";
private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?";
public ClanHall(StatsSet params)
public ClanHall(StatSet params)
{
super(params.getInt("id"));
// Set static parameters

70
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java
View File

@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.NpcData;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -74,13 +74,13 @@ public class Hero
// delete hero items
private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)";
private static final Map<Integer, StatsSet> HEROES = new ConcurrentHashMap<>();
private static final Map<Integer, StatsSet> COMPLETE_HEROS = new ConcurrentHashMap<>();
private static final Map<Integer, StatSet> HEROES = new ConcurrentHashMap<>();
private static final Map<Integer, StatSet> COMPLETE_HEROS = new ConcurrentHashMap<>();
private static final Map<Integer, StatsSet> HERO_COUNTS = new ConcurrentHashMap<>();
private static final Map<Integer, List<StatsSet>> HERO_FIGHTS = new ConcurrentHashMap<>();
private static final Map<Integer, StatSet> HERO_COUNTS = new ConcurrentHashMap<>();
private static final Map<Integer, List<StatSet>> HERO_FIGHTS = new ConcurrentHashMap<>();
private static final Map<Integer, List<StatsSet>> HERO_DIARY = new ConcurrentHashMap<>();
private static final Map<Integer, List<StatSet>> HERO_DIARY = new ConcurrentHashMap<>();
private static final Map<Integer, String> HERO_MESSAGE = new ConcurrentHashMap<>();
public static final String COUNT = "count";
@@ -118,7 +118,7 @@ public class Hero
{
while (rset.next())
{
final StatsSet hero = new StatsSet();
final StatSet hero = new StatSet();
final int charId = rset.getInt(Olympiad.CHAR_ID);
hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME));
hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID));
@@ -137,7 +137,7 @@ public class Hero
while (rset2.next())
{
final StatsSet hero = new StatsSet();
final StatSet hero = new StatSet();
final int charId = rset2.getInt(Olympiad.CHAR_ID);
hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME));
hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID));
@@ -159,7 +159,7 @@ public class Hero
LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes.");
}
private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException
private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException
{
ps.setInt(1, charId);
try (ResultSet rs = ps.executeQuery())
@@ -224,7 +224,7 @@ public class Hero
public void loadDiary(int charId)
{
final List<StatsSet> diary = new ArrayList<>();
final List<StatSet> diary = new ArrayList<>();
int diaryentries = 0;
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC"))
@@ -234,7 +234,7 @@ public class Hero
{
while (rset.next())
{
final StatsSet diaryEntry = new StatsSet();
final StatSet diaryEntry = new StatSet();
final long time = rset.getLong("time");
final int action = rset.getInt("action");
@@ -279,8 +279,8 @@ public class Hero
public void loadFights(int charId)
{
final List<StatsSet> fights = new ArrayList<>();
final StatsSet heroCountData = new StatsSet();
final List<StatSet> fights = new ArrayList<>();
final StatSet heroCountData = new StatSet();
final Calendar data = Calendar.getInstance();
data.set(Calendar.DAY_OF_MONTH, 1);
data.set(Calendar.HOUR_OF_DAY, 0);
@@ -326,7 +326,7 @@ public class Hero
final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode();
if ((name != null) && (cls != null))
{
final StatsSet fight = new StatsSet();
final StatSet fight = new StatSet();
fight.set("oponent", name);
fight.set("oponentclass", cls);
@@ -362,7 +362,7 @@ public class Hero
final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode();
if ((name != null) && (cls != null))
{
final StatsSet fight = new StatsSet();
final StatSet fight = new StatSet();
fight.set("oponent", name);
fight.set("oponentclass", cls);
@@ -410,14 +410,14 @@ public class Hero
}
}
public Map<Integer, StatsSet> getHeroes()
public Map<Integer, StatSet> getHeroes()
{
return HEROES;
}
public int getHeroByClass(int classid)
{
for (Entry<Integer, StatsSet> e : HEROES.entrySet())
for (Entry<Integer, StatSet> e : HEROES.entrySet())
{
if (e.getValue().getInt(Olympiad.CLASS_ID) == classid)
{
@@ -438,7 +438,7 @@ public class Hero
public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page)
{
final int perpage = 10;
final List<StatsSet> mainList = HERO_DIARY.get(charid);
final List<StatSet> mainList = HERO_DIARY.get(charid);
if (mainList != null)
{
final NpcHtmlMessage diaryReply = new NpcHtmlMessage();
@@ -453,7 +453,7 @@ public class Hero
if (!mainList.isEmpty())
{
final List<StatsSet> list = new ArrayList<>(mainList);
final List<StatSet> list = new ArrayList<>(mainList);
Collections.reverse(list);
boolean color = true;
@@ -463,7 +463,7 @@ public class Hero
for (int i = (page - 1) * perpage; i < list.size(); i++)
{
breakat = i;
final StatsSet diaryEntry = list.get(i);
final StatSet diaryEntry = list.get(i);
fList.append("<tr><td>");
if (color)
{
@@ -524,7 +524,7 @@ public class Hero
int loss = 0;
int draw = 0;
final List<StatsSet> heroFights = HERO_FIGHTS.get(charid);
final List<StatSet> heroFights = HERO_FIGHTS.get(charid);
if (heroFights != null)
{
final NpcHtmlMessage fightReply = new NpcHtmlMessage();
@@ -536,7 +536,7 @@ public class Hero
if (!heroFights.isEmpty())
{
final StatsSet heroCount = HERO_COUNTS.get(charid);
final StatSet heroCount = HERO_COUNTS.get(charid);
if (heroCount != null)
{
win = heroCount.getInt("victory");
@@ -551,7 +551,7 @@ public class Hero
for (int i = (page - 1) * perpage; i < heroFights.size(); i++)
{
breakat = i;
final StatsSet fight = heroFights.get(i);
final StatSet fight = heroFights.get(i);
fList.append("<tr><td>");
if (color)
{
@@ -609,7 +609,7 @@ public class Hero
}
}
public synchronized void computeNewHeroes(List<StatsSet> newHeroes)
public synchronized void computeNewHeroes(List<StatSet> newHeroes)
{
updateHeroes(true);
@@ -659,13 +659,13 @@ public class Hero
return;
}
for (StatsSet hero : newHeroes)
for (StatSet hero : newHeroes)
{
final int charId = hero.getInt(Olympiad.CHAR_ID);
if (COMPLETE_HEROS.containsKey(charId))
{
final StatsSet oldHero = COMPLETE_HEROS.get(charId);
final StatSet oldHero = COMPLETE_HEROS.get(charId);
final int count = oldHero.getInt(COUNT);
oldHero.set(COUNT, count + 1);
oldHero.set(PLAYED, 1);
@@ -674,7 +674,7 @@ public class Hero
}
else
{
final StatsSet newHero = new StatsSet();
final StatSet newHero = new StatSet();
newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME));
newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID));
newHero.set(COUNT, 1);
@@ -700,9 +700,9 @@ public class Hero
}
else
{
StatsSet hero;
StatSet hero;
int heroId;
for (Entry<Integer, StatsSet> entry : HEROES.entrySet())
for (Entry<Integer, StatSet> entry : HEROES.entrySet())
{
hero = entry.getValue();
heroId = entry.getKey();
@@ -787,13 +787,13 @@ public class Hero
setDiaryData(charId, ACTION_RAID_KILLED, npcId);
final NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
final List<StatsSet> list = HERO_DIARY.get(charId);
final List<StatSet> list = HERO_DIARY.get(charId);
if ((list == null) || (template == null))
{
return;
}
// Prepare new data
final StatsSet diaryEntry = new StatsSet();
final StatSet diaryEntry = new StatSet();
final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis()));
diaryEntry.set("date", date);
diaryEntry.set("action", template.getName() + " was defeated");
@@ -806,13 +806,13 @@ public class Hero
setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId);
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
final List<StatsSet> list = HERO_DIARY.get(charId);
final List<StatSet> list = HERO_DIARY.get(charId);
if ((list == null) || (castle == null))
{
return;
}
// Prepare new data
final StatsSet diaryEntry = new StatsSet();
final StatSet diaryEntry = new StatSet();
final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis()));
diaryEntry.set("date", date);
diaryEntry.set("action", castle.getName() + " Castle was successfuly taken");
@@ -922,10 +922,10 @@ public class Hero
*/
public void claimHero(PlayerInstance player)
{
StatsSet hero = HEROES.get(player.getObjectId());
StatSet hero = HEROES.get(player.getObjectId());
if (hero == null)
{
hero = new StatsSet();
hero = new StatSet();
HEROES.put(player.getObjectId(), hero);
}

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java
View File

@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.atomic.AtomicReference;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop;
import org.l2jmobius.gameserver.model.events.AbstractScript;
@@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout
public abstract class AbstractEventManager<T extends AbstractEvent<?>>extends AbstractScript
{
private String _name;
private StatsSet _variables = StatsSet.EMPTY_STATSET;
private StatSet _variables = StatSet.EMPTY_STATSET;
private Set<EventScheduler> _schedulers = Collections.emptySet();
private Set<IConditionalEventScheduler> _conditionalSchedulers = Collections.emptySet();
private Map<String, IEventDrop> _rewards = Collections.emptyMap();
@@ -67,14 +67,14 @@ public abstract class AbstractEventManager<T extends AbstractEvent<?>>extends Ab
/* ********************** */
public StatsSet getVariables()
public StatSet getVariables()
{
return _variables;
}
public void setVariables(StatsSet variables)
public void setVariables(StatSet variables)
{
_variables = new StatsSet(Collections.unmodifiableMap(variables.getSet()));
_variables = new StatSet(Collections.unmodifiableMap(variables.getSet()));
}
/* ********************** */

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java
View File

@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.util.cron4j.PastPredictor;
import org.l2jmobius.gameserver.util.cron4j.Predictor;
@@ -45,7 +45,7 @@ public class EventScheduler
private List<EventMethodNotification> _notifications;
private ScheduledFuture<?> _task;
public EventScheduler(AbstractEventManager<?> manager, StatsSet set)
public EventScheduler(AbstractEventManager<?> manager, StatSet set)
{
_eventManager = manager;
_name = set.getString("name", "");

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Spawn;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer());
}
public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player)
public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player)
{
LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player);
}
public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player)
public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player)
{
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java
View File

@@ -24,7 +24,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel;
@@ -69,7 +69,7 @@ public class TimerExecutor<T>
* @param eventTimer
* @return {@code true} if timer were successfully added, {@code false} in case it exists already
*/
public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent<T> eventTimer)
public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent<T> eventTimer)
{
return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this));
}
@@ -95,7 +95,7 @@ public class TimerExecutor<T>
* @param player
* @return {@code true} if timer were successfully added, {@code false} in case it exists already
*/
public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player)
public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player)
{
return addTimer(event, params, time, npc, player, _eventListener);
}
@@ -123,7 +123,7 @@ public class TimerExecutor<T>
* @param eventTimer
* @return {@code true} if timer were successfully added, {@code false} in case it exists already
*/
private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent<T> eventTimer)
private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent<T> eventTimer)
{
return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this));
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.instancemanager.TimersManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.TimerExecutor;
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor;
public class TimerHolder<T> implements Runnable
{
private final T _event;
private final StatsSet _params;
private final StatSet _params;
private final long _time;
private final Npc _npc;
private final PlayerInstance _player;
@@ -44,7 +44,7 @@ public class TimerHolder<T> implements Runnable
private final TimerExecutor<T> _postExecutor;
private final ScheduledFuture<?> _task;
public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent<T> eventScript, IEventTimerCancel<T> cancelScript, TimerExecutor<T> postExecutor)
public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent<T> eventScript, IEventTimerCancel<T> cancelScript, TimerExecutor<T> postExecutor)
{
Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!");
Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!");
@@ -73,7 +73,7 @@ public class TimerHolder<T> implements Runnable
/**
* @return the parameters of this timer
*/
public StatsSet getParams()
public StatSet getParams()
{
return _params;
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java
View File

@@ -17,7 +17,7 @@
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType;
import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType;
import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType;
@@ -37,7 +37,7 @@ public class AppearanceHolder
private final AppearanceTargetType _targetType;
private final long _bodyPart;
public AppearanceHolder(StatsSet set)
public AppearanceHolder(StatSet set)
{
_visualId = set.getInt("id", 0);
_weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Nik
@@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder
return _requiredSkillLevel;
}
public static AttachSkillHolder fromStatsSet(StatsSet set)
public static AttachSkillHolder fromStatSet(StatSet set)
{
return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1));
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java
View File

@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Set;
import org.l2jmobius.gameserver.enums.SkillEnchantType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Sdw
@@ -36,7 +36,7 @@ public class EnchantSkillHolder
private final Map<SkillEnchantType, Integer> _chance = new EnumMap<>(SkillEnchantType.class);
private final Map<SkillEnchantType, Set<ItemHolder>> _requiredItems = new EnumMap<>(SkillEnchantType.class);
public EnchantSkillHolder(StatsSet set)
public EnchantSkillHolder(StatSet set)
{
_level = set.getInt("level");
_enchantFailLevel = set.getInt("enchantFailLevel");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.conditions.ICondition;
@@ -36,7 +36,7 @@ public class ExtendDropDataHolder
private final List<ICondition> _conditions;
private final Map<Long, SystemMessageId> _systemMessages;
public ExtendDropDataHolder(StatsSet set)
public ExtendDropDataHolder(StatSet set)
{
_id = set.getInt("id");
_items = set.getList("items", ExtendDropItemHolder.class);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Mobius
@@ -52,7 +52,7 @@ public class FakePlayerHolder
private final int _clanId;
private final int _pledgeStatus;
public FakePlayerHolder(StatsSet set)
public FakePlayerHolder(StatSet set)
{
_classId = set.getInt("classId", 182);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
/**
@@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable
private final int _id;
private final long _count;
public ItemHolder(StatsSet set)
public ItemHolder(StatSet set)
{
_id = set.getInt("id");
_count = set.getLong("count");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Sdw
@@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder
{
private final int _points;
public ItemPointHolder(StatsSet params)
public ItemPointHolder(StatSet params)
{
this(params.getInt("id"), params.getLong("count"), params.getInt("points"));
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
/**
* @author Sdw
@@ -34,7 +34,7 @@ public class LuckyGameDataHolder
private int _minModifyRewardGame;
private int _maxModifyRewardGame;
public LuckyGameDataHolder(StatsSet params)
public LuckyGameDataHolder(StatSet params)
{
_index = params.getInt("index");
_turningPoints = params.getInt("turning_point");

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders;
import java.time.Duration;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
/**
@@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable
private final long _respawnTime;
private final int _weightPoint;
public MinionHolder(StatsSet set)
public MinionHolder(StatSet set)
{
_id = set.getInt("id");
_count = set.getInt("count", 1);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java
View File

@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
/**
@@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable
}
@SuppressWarnings("unchecked")
public MultisellListHolder(StatsSet set)
public MultisellListHolder(StatSet set)
{
_listId = set.getInt("listId");
_isChanceMultisell = set.getBoolean("isChanceMultisell", false);

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java
View File

@@ -23,7 +23,7 @@ import java.util.Map.Entry;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.StatusUpdateType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable
private final double _maxOfferingBonus;
private final long _maxOffering;
public RecipeHolder(StatsSet set, List<ItemHolder> ingredients, List<ItemChanceHolder> productGroup, List<ItemHolder> npcFee, Map<StatusUpdateType, Double> statUse)
public RecipeHolder(StatSet set, List<ItemHolder> ingredients, List<ItemChanceHolder> productGroup, List<ItemHolder> npcFee, Map<StatusUpdateType, Double> statUse)
{
_id = set.getInt("id");
_level = set.getInt("level");

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType;
import org.l2jmobius.gameserver.enums.InstanceTeleportType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.TeleportWhereType;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable
private final Set<PlayerInstance> _players = ConcurrentHashMap.newKeySet(); // Players inside instance
private final Set<Npc> _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance
private final Map<Integer, DoorInstance> _doors = new HashMap<>(); // Spawned doors inside instance
private final StatsSet _parameters = new StatsSet();
private final StatSet _parameters = new StatSet();
// Timers
private final Map<Integer, ScheduledFuture<?>> _ejectDeadTasks = new ConcurrentHashMap<>();
private ScheduledFuture<?> _cleanUpTask = null;
@@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable
* Get instance world parameters.
* @return instance parameters
*/
public StatsSet getParameters()
public StatSet getParameters()
{
return _parameters;
}
@@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable
* Get parameters from instance template.<br>
* @return template parameters
*/
public StatsSet getTemplateParameters()
public StatSet getTemplateParameters()
{
return _template.getParameters();
}

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.AbstractPlayerGroup;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl
private float _spRate = Config.RATE_INSTANCE_SP;
private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP;
private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP;
private StatsSet _parameters = StatsSet.EMPTY_STATSET;
private StatSet _parameters = StatSet.EMPTY_STATSET;
private final Map<Integer, DoorTemplate> _doors = new HashMap<>();
private final List<SpawnTemplate> _spawns = new ArrayList<>();
// Locations
@@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl
/**
* @param set
*/
public InstanceTemplate(StatsSet set)
public InstanceTemplate(StatSet set)
{
_templateId = set.getInt("id", 0);
_name = set.getString("name", null);
@@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl
{
if (!set.isEmpty())
{
_parameters = new StatsSet(Collections.unmodifiableMap(set));
_parameters = new StatSet(Collections.unmodifiableMap(set));
}
}
@@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl
* Get instance template parameters.
* @return parameters of template
*/
public StatsSet getParameters()
public StatSet getParameters()
{
return _parameters;
}

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions;
import java.util.List;
import java.util.function.BiConsumer;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public abstract class Condition
{
private final InstanceTemplate _template;
private final StatsSet _parameters;
private final StatSet _parameters;
private final boolean _leaderOnly;
private final boolean _showMessageAndHtml;
private SystemMessageId _systemMsg = null;
@@ -46,7 +46,7 @@ public abstract class Condition
* @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!)
* @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send
*/
public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml)
{
_template = template;
_parameters = parameters;
@@ -58,7 +58,7 @@ public abstract class Condition
* Gets parameters of condition.
* @return set of parameters
*/
protected final StatsSet getParameters()
protected final StatSet getParameters()
{
return _parameters;
}

Some files were not shown because too many files have changed in this diff Show More