From 2ff2ec75bf9b9a0cbe47403acad22dee065a5ee7 Mon Sep 17 00:00:00 2001 From: jameslfc19 Date: Sun, 12 Jul 2020 18:29:57 +0100 Subject: [PATCH] Commands now filter searched terms. --- .../minecraft/chests/commands/AutoCraftCommand.java | 6 +++--- .../minecraft/chests/commands/ChestLinkCommand.java | 6 +++--- .../chests/storage/abstracts/StorageType.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java index 30164e0..ba95a4f 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java @@ -183,10 +183,10 @@ public class AutoCraftCommand extends ServerCommand { switch (OPTIONS.valueOf(args[0].toUpperCase())) { case ADD: case OPEN: - return Config.getAutoCraft().getOpenableStorageList(player); + return Config.getAutoCraft().getOpenableStorageList(player, args[1]); case REMOVE: case RENAME: - return Config.getAutoCraft().getStorageList(player); + return Config.getAutoCraft().getStorageList(player, args[1]); case MEMBER: return Arrays.asList("add","remove","list"); } @@ -196,7 +196,7 @@ public class AutoCraftCommand extends ServerCommand { try { switch (OPTIONS.valueOf(args[0].toUpperCase())) { case MEMBER: - return Config.getAutoCraft().getStorageList(player); + return Config.getAutoCraft().getStorageList(player, args[2]); } } catch (IllegalArgumentException ignored) { } } diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/ChestLinkCommand.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/ChestLinkCommand.java index 3f04533..7f03bd6 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/ChestLinkCommand.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/ChestLinkCommand.java @@ -204,11 +204,11 @@ public class ChestLinkCommand extends ServerCommand { switch (OPTIONS.valueOf(args[0].toUpperCase())) { case ADD: case OPEN: - return Config.getChestLink().getOpenableStorageList(player); + return Config.getChestLink().getOpenableStorageList(player, args[1]); case REMOVE: case SORT: case RENAME: - return Config.getChestLink().getStorageList(player); + return Config.getChestLink().getStorageList(player, args[1]); case MEMBER: return Arrays.asList("add","remove","list"); } @@ -218,7 +218,7 @@ public class ChestLinkCommand extends ServerCommand { try { switch (OPTIONS.valueOf(args[0].toUpperCase())) { case MEMBER: - return Config.getChestLink().getStorageList(player); + return Config.getChestLink().getStorageList(player, args[2]); case SORT: return SortMethod.valuesList; } diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/storage/abstracts/StorageType.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/storage/abstracts/StorageType.java index 628df03..e81ea3a 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/storage/abstracts/StorageType.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/storage/abstracts/StorageType.java @@ -329,13 +329,13 @@ public abstract class StorageType { } } - public List getStorageList(Player player){ - return getStorageMap(player.getUniqueId()).values().stream().map(AbstractStorage::getIdentifier).collect(Collectors.toList()); + public List getStorageList(Player player, String searchedArg){ + return getStorageMap(player.getUniqueId()).values().stream().filter(t -> t.getIdentifier().contains(searchedArg)).map(AbstractStorage::getIdentifier).collect(Collectors.toList()); } - public List getOpenableStorageList(Player player){ - List playerList = getStorageList(player); - List memberList = getStorageMemberOf(player).stream().map(storage -> storage.getOwner().getName()+":"+storage.getIdentifier()).collect(Collectors.toList()); + public List getOpenableStorageList(Player player, String searchedArg){ + List playerList = getStorageList(player, searchedArg); + List memberList = getStorageMemberOf(player).stream().filter(t -> t.getIdentifier().contains(searchedArg)).map(storage -> storage.getOwner().getName()+":"+storage.getIdentifier()).collect(Collectors.toList()); playerList.addAll(memberList); return playerList; }