From 7189db10027d402cdf017e378a1e567793377780 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Fri, 9 Jul 2021 23:01:14 +0200
Subject: [PATCH] Added option for shulkers in ender chest

---
 .../talismans/util/TalismanChecks.java        | 48 +++++++++++++++++--
 .../core-plugin/src/main/resources/config.yml |  1 +
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
index 1b161bd..a86bfde 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
@@ -46,6 +46,11 @@ public class TalismanChecks {
      */
     private static boolean readShulkerBoxes = true;
 
+    /**
+     * If shulker boxes in ender chests should be read.
+     */
+    private static boolean readShulkerInEnderChest = true;
+
     /**
      * If only offhand should be read.
      */
@@ -152,24 +157,36 @@ public class TalismanChecks {
         List<ItemStack> contents = new ArrayList<>();
         Set<TalismanLevel> found = new HashSet<>();
 
-        List<ItemStack> rawContents = new ArrayList<>(Arrays.asList(player.getInventory().getContents()));
+        Map<ItemStack, Boolean> rawContents = new HashMap<>();
+        for (ItemStack stack : player.getInventory().getContents()) {
+            rawContents.put(stack, false);
+        }
 
         if (readEnderChest) {
-            rawContents.addAll(Arrays.asList(player.getEnderChest().getContents()));
+            for (ItemStack stack : player.getEnderChest().getContents()) {
+                rawContents.put(stack, true);
+            }
         }
 
         if (offhandOnly) {
             rawContents.clear();
-            rawContents.add(player.getInventory().getItemInOffHand());
+            rawContents.put(player.getInventory().getItemInOffHand(), false);
         }
 
-        rawContents.addAll(Arrays.asList(extra));
+        for (ItemStack stack : extra) {
+            rawContents.put(stack, false);
+        }
 
-        for (ItemStack rawContent : rawContents) {
+        for (ItemStack rawContent : rawContents.keySet()) {
             if (rawContent == null) {
                 continue;
             }
+
             if (readShulkerBoxes) {
+                if (rawContents.get(rawContent)) {
+                    continue;
+                }
+
                 ItemMeta meta = rawContent.getItemMeta();
                 if (meta instanceof BlockStateMeta shulkerMeta) {
                     if (!shulkerMeta.hasBlockState()) {
@@ -183,6 +200,26 @@ public class TalismanChecks {
                     }
                 }
             }
+
+            if (readShulkerInEnderChest) {
+                if (!rawContents.get(rawContent)) {
+                    continue;
+                }
+
+                ItemMeta meta = rawContent.getItemMeta();
+                if (meta instanceof BlockStateMeta shulkerMeta) {
+                    if (!shulkerMeta.hasBlockState()) {
+                        continue;
+                    }
+
+                    BlockState state = shulkerMeta.getBlockState();
+                    if (state instanceof ShulkerBox shulkerBox) {
+                        contents.addAll(Arrays.asList(shulkerBox.getInventory().getContents()));
+                        continue;
+                    }
+                }
+            }
+
             contents.add(rawContent);
         }
 
@@ -242,6 +279,7 @@ public class TalismanChecks {
     public static void reload() {
         readEnderChest = PLUGIN.getConfigYml().getBool("read-enderchest");
         readShulkerBoxes = PLUGIN.getConfigYml().getBool("read-shulkerboxes");
+        readShulkerInEnderChest = PLUGIN.getConfigYml().getBool("read-enderchest-boxes");
         offhandOnly = PLUGIN.getConfigYml().getBool("offhand-only");
     }
 }
diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml
index cd253a0..85860f7 100644
--- a/eco-core/core-plugin/src/main/resources/config.yml
+++ b/eco-core/core-plugin/src/main/resources/config.yml
@@ -12,5 +12,6 @@ crafting:
 
 read-enderchest: true # If a player's ender chest should be checked for talismans
 read-shulkerboxes: true # If a player's shulker boxes should be checked for talismans
+read-enderchest-boxes: true # If shulker boxes in a player's ender chest should be checked for talismans.
 
 offhand-only: false # If talismans or shulkers of talismans need to be in the offhand to work