From 51c73798e425530cbc8a53d91c123f7d4430afe1 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Thu, 6 Jun 2019 09:33:50 +0100 Subject: [PATCH] Add support for named AllRequirementsCollections --- .../clues/item/AllRequirementsCollection.java | 11 +++++++++-- .../cluescrolls/clues/item/ItemRequirements.java | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java index 8641e58d78..a9187bb5a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java @@ -29,11 +29,18 @@ import net.runelite.api.Item; public class AllRequirementsCollection implements ItemRequirement { + private String name; private ItemRequirement[] requirements; + public AllRequirementsCollection(String name, ItemRequirement... requirements) + { + this.name = name; + this.requirements = requirements; + } + public AllRequirementsCollection(ItemRequirement... requirements) { - this.requirements = requirements; + this("N/A", requirements); } @Override @@ -67,6 +74,6 @@ public class AllRequirementsCollection implements ItemRequirement @Override public String getCollectiveName(Client client) { - return "N/A"; + return name; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/ItemRequirements.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/ItemRequirements.java index e7d839faa6..4254e0c597 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/ItemRequirements.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/ItemRequirements.java @@ -53,6 +53,11 @@ public class ItemRequirements return new AllRequirementsCollection(requirements); } + public static AllRequirementsCollection all(String name, ItemRequirement... requirements) + { + return new AllRequirementsCollection(name, requirements); + } + public static SlotLimitationRequirement emptySlot(String description, EquipmentInventorySlot... slots) { return new SlotLimitationRequirement(description, slots);