Addition of inventory getPaperdollItemCount method.

Contributed by Sahar.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2206,4 +2206,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2225,4 +2225,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2522,4 +2522,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2522,4 +2522,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2506,4 +2506,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2231,4 +2231,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2522,4 +2522,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2522,4 +2522,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -296,6 +296,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2506,4 +2506,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -211,6 +211,6 @@ public class ArmorSet
 	 */
 	public long getPiecesCount(PlayerInstance player, Function<ItemInstance, Integer> idProvider)
 	{
-		return player.getInventory().getPaperdollItems(item -> _requiredItems.contains(idProvider.apply(item))).size();
+		return player.getInventory().getPaperdollItemCount(item -> _requiredItems.contains(idProvider.apply(item)));
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -2212,4 +2212,15 @@ public abstract class Inventory extends ItemContainer
 		}
 		return Arrays.stream(_paperdoll).filter(filter).collect(Collectors.toCollection(LinkedList::new));
 	}
+	
+	@SafeVarargs
+	public final long getPaperdollItemCount(Predicate<ItemInstance>... filters)
+	{
+		Predicate<ItemInstance> filter = Objects::nonNull;
+		for (Predicate<ItemInstance> additionalFilter : filters)
+		{
+			filter = filter.and(additionalFilter);
+		}
+		return Arrays.stream(_paperdoll).filter(filter).count();
+	}
 }