Allow duplicate keys in general.ignore-nbt-tags

InsightsPlugin · Jan 12, 2021 · 6c4b86d · 6c4b86d
1 parent 45df12f
commit 6c4b86d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/net/frankheijden/insights/config/Config.java b/src/main/java/net/frankheijden/insights/config/Config.java
@@ -17,7 +17,7 @@ public class Config {
     public boolean GENERAL_SUGGEST_PAPER;
     public Location GENERAL_TILEFINDER_LOCATION;
     public int GENERAL_LIMIT;
-    public Map<String, String> GENERAL_IGNORE_NBT_TAGS;
+    public Map<String, Set<String>> GENERAL_IGNORE_NBT_TAGS;
     public boolean GENERAL_ASYNC_ENABLED;
     public boolean GENERAL_ASYNC_WHITELIST;
     public Set<String> GENERAL_ASYNC_LIST;

diff --git a/src/main/java/net/frankheijden/insights/utils/BlockUtils.java b/src/main/java/net/frankheijden/insights/utils/BlockUtils.java
@@ -3,6 +3,7 @@
 import dev.frankheijden.minecraftreflection.ClassObject;
 import dev.frankheijden.minecraftreflection.MinecraftReflection;
 import java.util.Map;
+import java.util.Set;
 import net.frankheijden.insights.managers.NMSManager;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -17,14 +18,14 @@ public class BlockUtils {
     private static final MinecraftReflection nbtTagCompoundReflection = MinecraftReflection.of("net.minecraft.server.%s.NBTTagCompound");
     private static final MinecraftReflection tileEntityReflection = MinecraftReflection.of("net.minecraft.server.%s.TileEntity");
 
-    public static boolean hasAnyNBTTags(Block block, Map<String, String> tags) {
+    public static boolean hasAnyNBTTags(Block block, Map<String, Set<String>> tags) {
         Object nbt = getNBT(block);
         if (nbt == null) return false;
 
-        for (Map.Entry<String, String> entry : tags.entrySet()) {
+        for (Map.Entry<String, Set<String>> entry : tags.entrySet()) {
             if (nbtTagCompoundReflection.invoke(nbt, "hasKey", entry.getKey())) {
-                String value = entry.getValue();
-                if (value == null || value.equals(nbtTagCompoundReflection.invoke(nbt, "getString", entry.getKey()))) {
+                Set<String> values = entry.getValue();
+                if (values == null || values.contains(nbtTagCompoundReflection.invoke(nbt, "getString", entry.getKey()))) {
                     return true;
                 }
             }

diff --git a/src/main/java/net/frankheijden/insights/utils/YamlUtils.java b/src/main/java/net/frankheijden/insights/utils/YamlUtils.java
@@ -122,14 +122,14 @@ public String getString(String path, String def, Set<String> possibleValues, Str
         }
     }
 
-    public Map<String, String> getMapFromList(String path, String delimiter) {
-        Map<String, String> map = new HashMap<>();
+    public Map<String, Set<String>> getMapFromList(String path, String delimiter) {
+        Map<String, Set<String>> map = new HashMap<>();
         for (String str : getStringList(path)) {
             String[] kv = str.split(delimiter, 2);
             if (kv.length == 1) {
                 map.put(kv[0], null);
             } else if (kv.length == 2) {
-                map.put(kv[0], kv[1]);
+                map.computeIfAbsent(kv[0], k -> new HashSet<>()).add(kv[1]);
             } else { // Should never happen, split only returns >= 1, and is limited by limit = 2.
                 errors.add(new ConfigError(name, path, "invalid key/value pair (" + str + ")"));
             }