add material list to avoid false positives

Author: xGinko

AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java

@@ -4,20 +4,44 @@
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import me.xginko.aef.modules.AEFModule;
 import me.xginko.aef.utils.enums.Platform;
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class TridentDupe extends AEFModule implements Listener {
 
+    private final Set<Material> dupePreventedMaterial;
+
     public TridentDupe() {
         super("dupe-preventions.trident-dupe",
                 Platform.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_21_4), """
                 Prevents trident dupe from working in 1.13 - 1.21.4
                 This dupe was originally found by Autism inc and turned into
                 a mod by Killet, Laztec, and Ionar.""");
+        this.dupePreventedMaterial = config.getList(configPath + ".materials",
+                        Stream.of(XMaterial.TRIDENT, XMaterial.ARROW, XMaterial.TIPPED_ARROW,
+                                        XMaterial.SPECTRAL_ARROW, XMaterial.EGG, XMaterial.WIND_CHARGE)
+                                .filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()))
+                .stream()
+                .map(configuredMaterial -> {
+                    try {
+                        return Material.valueOf(configuredMaterial);
+                    } catch (IllegalArgumentException e) {
+                        notRecognized(Material.class, configuredMaterial);
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toCollection(() -> EnumSet.noneOf(Material.class)));
     }
 
     @Override
@@ -32,7 +56,7 @@ public void disable() {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onInventoryClick(InventoryClickEvent event) {
-        if (event.getWhoClicked().getActiveItem().getType() != XMaterial.AIR.get()) {
+        if (dupePreventedMaterial.contains(event.getWhoClicked().getActiveItem().getType())) {
             event.setCancelled(true);
         }
     }

AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java

@@ -4,21 +4,45 @@
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import me.xginko.aef.modules.AEFModule;
 import me.xginko.aef.utils.enums.Platform;
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class TridentDupe extends AEFModule implements Listener {
 
+    private final Set<Material> dupePreventedMaterial;
+
     public TridentDupe() {
         super("dupe-preventions.trident-dupe",
                 Platform.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_21_4)
                 && Platform.getServerVersion().isNewerThan(ServerVersion.V_1_12_2),
                 "Prevents trident dupe from working in 1.13 - 1.21.4\n"+
                 "This dupe was originally found by Autism inc and turned into\n"+
                 "a mod by Killet, Laztec, and Ionar.");
+        this.dupePreventedMaterial = config.getList(configPath + ".materials",
+                        Stream.of(XMaterial.TRIDENT, XMaterial.ARROW, XMaterial.TIPPED_ARROW,
+                                        XMaterial.SPECTRAL_ARROW, XMaterial.EGG, XMaterial.WIND_CHARGE)
+                        .filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()))
+                .stream()
+                .map(configuredMaterial -> {
+                    try {
+                        return Material.valueOf(configuredMaterial);
+                    } catch (IllegalArgumentException e) {
+                        notRecognized(Material.class, configuredMaterial);
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toCollection(() -> EnumSet.noneOf(Material.class)));
     }
 
     @Override
@@ -34,7 +58,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onInventoryClick(InventoryClickEvent event) {
         if (event.getWhoClicked().getActiveItem() != null
-                && event.getWhoClicked().getActiveItem().getType() != XMaterial.AIR.get()) {
+                && dupePreventedMaterial.contains(event.getWhoClicked().getActiveItem().getType())) {
             event.setCancelled(true);
         }
     }