diff --git a/pom.xml b/pom.xml
index 21c1406..5834993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
ChestSort
https://www.chestsort.de
Allows automatic chest sorting!
- 13.6.6
+ 14.0.0
jar
diff --git a/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
index d76bc90..e7be5e2 100644
--- a/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
@@ -65,6 +65,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import java.io.*;
import java.util.*;
+import java.util.regex.Pattern;
public class ChestSortPlugin extends JavaPlugin {
@@ -99,6 +100,8 @@ public class ChestSortPlugin extends JavaPlugin {
private YamlConfiguration guiConfig = new YamlConfiguration();
private int settingsFingerprint = 0;
+ public List blacklistedInventoryHolderClassNames = new ArrayList<>();
+
public static ChestSortPlugin getInstance() {
return instance;
}
@@ -466,6 +469,17 @@ public class ChestSortPlugin extends JavaPlugin {
saveDefaultCategories();
+ blacklistedInventoryHolderClassNames.clear();
+ for(String line : getConfig().getStringList("blocked-inventory-holders-regex")) {
+ try {
+ Pattern pattern = Pattern.compile(line);
+ blacklistedInventoryHolderClassNames.add(pattern);
+ } catch (Exception e) {
+ getLogger().warning("Invalid regex in blocked-inventory-holders-regex: " + line);
+ continue;
+ }
+ }
+
setVerbose(getConfig().getBoolean("verbose"));
setLgr(new Logger(this, getConfig().getBoolean("log")));
//noinspection InstantiationOfUtilityClass
diff --git a/src/main/java/de/jeff_media/chestsort/config/ConfigUpdater.java b/src/main/java/de/jeff_media/chestsort/config/ConfigUpdater.java
index 0700635..1d959cf 100644
--- a/src/main/java/de/jeff_media/chestsort/config/ConfigUpdater.java
+++ b/src/main/java/de/jeff_media/chestsort/config/ConfigUpdater.java
@@ -19,7 +19,7 @@ import java.util.logging.Logger;
public final class ConfigUpdater {
// Lines STARTING WITH these names will be treated as String lists
- private static final String[] LINES_CONTAINING_STRING_LISTS = {Config.DISABLED_WORLDS + ":"};
+ private static final String[] LINES_CONTAINING_STRING_LISTS = {Config.DISABLED_WORLDS + ":", "blocked-inventory-holders-regex:"};
// Lines STARTING WITH these names will never get the old value applied
private static final String[] LINES_IGNORED = {"config-version:", "plugin-version:"};
// Lines STARTING WITH these names will get no quotes although they would match one of the lists below
diff --git a/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java b/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
index b788260..45d9e36 100644
--- a/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
+++ b/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
@@ -1,22 +1,32 @@
package de.jeff_media.chestsort.listeners;
+import com.jeff_media.jefflib.ProtectionUtils;
+import de.jeff_media.chestsort.ChestSortPlugin;
import de.jeff_media.chestsort.api.ChestSortEvent;
+import de.jeff_media.chestsort.api.ChestSortPostSortEvent;
+import de.jeff_media.chestsort.api.ISortable;
import de.jeff_media.chestsort.config.Messages;
+import de.jeff_media.chestsort.data.PlayerSetting;
import de.jeff_media.chestsort.enums.Hotkey;
import de.jeff_media.chestsort.events.ChestSortLeftClickHotkeyEvent;
import de.jeff_media.chestsort.handlers.Logger;
-import de.jeff_media.chestsort.ChestSortPlugin;
-import de.jeff_media.chestsort.api.*;
-import de.jeff_media.chestsort.data.PlayerSetting;
-import de.jeff_media.chestsort.hooks.*;
+import de.jeff_media.chestsort.hooks.AdvancedChestsHook;
+import de.jeff_media.chestsort.hooks.CrateReloadedHook;
+import de.jeff_media.chestsort.hooks.GoldenCratesHook;
+import de.jeff_media.chestsort.hooks.HeadDatabaseHook;
+import de.jeff_media.chestsort.hooks.MinepacksHook;
+import de.jeff_media.chestsort.hooks.ShulkerPacksHook;
import de.jeff_media.chestsort.utils.LlamaUtils;
-import com.jeff_media.jefflib.ProtectionUtils;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
-import org.bukkit.block.*;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.Chest;
+import org.bukkit.block.Container;
+import org.bukkit.block.DoubleChest;
import org.bukkit.entity.ChestedHorse;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
@@ -34,20 +44,31 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class ChestSortListener implements org.bukkit.event.Listener {
- final ChestSortPlugin plugin;
+ final List blacklistedInventoryHolderClassNames = new ArrayList() {
+ {
+ add("ICInventoryHolder"); // Interactive Chat
+ }
+ };
+ private static Event ignoredEvent;
public final MinepacksHook minepacksHook;
+ final ChestSortPlugin plugin;
final HeadDatabaseHook headDatabaseHook;
final GoldenCratesHook goldenCratesHook;
final AdvancedChestsHook advancedChestsHook;
- private static Event ignoredEvent;
-
public ChestSortListener(ChestSortPlugin plugin) {
this.plugin = plugin;
this.minepacksHook = new MinepacksHook(plugin);
@@ -56,40 +77,101 @@ public class ChestSortListener implements org.bukkit.event.Listener {
this.advancedChestsHook = new AdvancedChestsHook(plugin);
}
+ private boolean isPossiblyBlacklisted(InventoryView view) {
+ Inventory top = view.getTopInventory();
+ Inventory bottom = view.getBottomInventory();
+ Set toCheck = new HashSet<>();
+ if (top != null) {
+ InventoryHolder holder = top.getHolder();
+ if (holder != null) {
+ String className = holder.getClass().getName();
+ toCheck.add(className);
+
+ }
+ }
+
+ if (bottom != null) {
+ InventoryHolder holder = bottom.getHolder();
+ if (holder != null) {
+ String className = holder.getClass().getName();
+ toCheck.add(className);
+ }
+ }
+
+ for (String className : toCheck) {
+ for (String blacklistedClassName : blacklistedInventoryHolderClassNames) {
+ if (className.contains(blacklistedClassName)) {
+ return true;
+ }
+ for(Pattern pattern : plugin.blacklistedInventoryHolderClassNames) {
+ Matcher matcher = pattern.matcher(className);
+ if(matcher.matches()) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
@EventHandler
public void onLeftClickChest(PlayerInteractEvent event) {
- if(event instanceof ChestSortLeftClickHotkeyEvent) {
+ if (event instanceof ChestSortLeftClickHotkeyEvent) {
return;
}
// checking in lower case for lazy admins
if (plugin.getDisabledWorlds().contains(event.getPlayer().getWorld().getName().toLowerCase())) {
return;
}
- if(!event.getPlayer().hasPermission("chestsort.use")) return;
- if(!event.getPlayer().hasPermission(Hotkey.getPermission(Hotkey.OUTSIDE))) return;
- if(event.getHand() != EquipmentSlot.HAND) return;
- if(event.getAction() != Action.LEFT_CLICK_BLOCK) return;
- if(!plugin.getConfig().getBoolean("allow-left-click-to-sort")) return;
+ if (!event.getPlayer().hasPermission("chestsort.use")) {
+ return;
+ }
+ if (!event.getPlayer().hasPermission(Hotkey.getPermission(Hotkey.OUTSIDE))) {
+ return;
+ }
+ if (event.getHand() != EquipmentSlot.HAND) {
+ return;
+ }
+ if (event.getAction() != Action.LEFT_CLICK_BLOCK) {
+ return;
+ }
+ if (!plugin.getConfig().getBoolean("allow-left-click-to-sort")) {
+ return;
+ }
Block clickedBlock = event.getClickedBlock();
- if(!(clickedBlock.getState() instanceof Container)) return;
- if(!belongsToChestLikeBlock(((Container)clickedBlock.getState()).getInventory())) return;
- if(CrateReloadedHook.isCrate(clickedBlock)) {
+ if (!(clickedBlock.getState() instanceof Container)) {
+ return;
+ }
+ if (!belongsToChestLikeBlock(((Container) clickedBlock.getState()).getInventory())) {
+ return;
+ }
+ if (CrateReloadedHook.isCrate(clickedBlock)) {
return;
}
plugin.registerPlayerIfNeeded(event.getPlayer());
PlayerSetting playerSetting = plugin.getPlayerSetting(event.getPlayer());
- if(!playerSetting.leftClickOutside) return;
+ if (!playerSetting.leftClickOutside) {
+ return;
+ }
- if(plugin.getConfig().getBoolean("mute-protection-plugins")) {
- if (!ProtectionUtils.canBreak(event.getPlayer(), clickedBlock.getLocation()/*, plugin.getConfig().getBoolean("mute-protection-plugins")*/)) {
+ if (plugin.getConfig().getBoolean("mute-protection-plugins")) {
+ if (!ProtectionUtils.canBreak(event.getPlayer(),
+ clickedBlock.getLocation()/*, plugin.getConfig().getBoolean("mute-protection-plugins")*/)) {
//System.out.println("ChestSort: cannot interact!");
return;
}
- } else {
- ChestSortLeftClickHotkeyEvent testEvent = new ChestSortLeftClickHotkeyEvent(event.getPlayer(), Action.RIGHT_CLICK_BLOCK, event.getPlayer().getInventory().getItemInMainHand(), clickedBlock, BlockFace.UP, EquipmentSlot.HAND);
+ }
+ else {
+ ChestSortLeftClickHotkeyEvent testEvent = new ChestSortLeftClickHotkeyEvent(event.getPlayer(),
+ Action.RIGHT_CLICK_BLOCK,
+ event.getPlayer().getInventory().getItemInMainHand(),
+ clickedBlock,
+ BlockFace.UP,
+ EquipmentSlot.HAND);
Bukkit.getPluginManager().callEvent(testEvent);
- if(testEvent.isCancelled() || testEvent.useInteractedBlock() == Event.Result.DENY) {
+ if (testEvent.isCancelled() || testEvent.useInteractedBlock() == Event.Result.DENY) {
return;
}
}
@@ -97,14 +179,16 @@ public class ChestSortListener implements org.bukkit.event.Listener {
Container containerState = (Container) clickedBlock.getState();
Inventory inventory = containerState.getInventory();
- try {
- if (!advancedChestsHook.handleAChestSortingIfPresent(clickedBlock.getLocation())) {
- plugin.getOrganizer().sortInventory(inventory);
- }
- } catch (Throwable ignored) {
- // TODO: Remove when everyone updated AdvancedChests
- }
- event.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messages.MSG_CONTAINER_SORTED));
+ try {
+ if (!advancedChestsHook.handleAChestSortingIfPresent(clickedBlock.getLocation())) {
+ plugin.getOrganizer().sortInventory(inventory);
+ }
+ } catch (Throwable ignored) {
+ // TODO: Remove when everyone updated AdvancedChests
+ }
+ event.getPlayer()
+ .spigot()
+ .sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messages.MSG_CONTAINER_SORTED));
}
@EventHandler
@@ -125,29 +209,40 @@ public class ChestSortListener implements org.bukkit.event.Listener {
plugin.unregisterPlayer(event.getPlayer());
}
-
@EventHandler
public void onBackPackClose(InventoryCloseEvent event) {
- if (plugin.getConfig().getString("sort-time").equalsIgnoreCase("close")
- || plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))
+ if (plugin.getConfig().getString("sort-time").equalsIgnoreCase("close") ||
+ plugin.getConfig().getString("sort-time").equalsIgnoreCase("both")) {
onBackPackUse(event.getInventory(), (Player) event.getPlayer());
+ }
}
@EventHandler
public void onBackPackOpen(InventoryOpenEvent event) {
- if (plugin.getConfig().getString("sort-time").equalsIgnoreCase("open")
- || plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))
+ if (plugin.getConfig().getString("sort-time").equalsIgnoreCase("open") ||
+ plugin.getConfig().getString("sort-time").equalsIgnoreCase("both")) {
onBackPackUse(event.getInventory(), (Player) event.getPlayer());
+ }
}
void onBackPackUse(Inventory inv, Player p) {
- if(!plugin.getConfig().getBoolean("allow-automatic-sorting")) return; //TODO: Maybe change to allow-automatic-inventory-sorting ?
- if (!minepacksHook.isMinepacksBackpack(inv)) return;
- if (!p.hasPermission("chestsort.use")) return;
- if (!p.hasPermission("chestsort.automatic")) return;
+ if (!plugin.getConfig().getBoolean("allow-automatic-sorting")) {
+ return; //TODO: Maybe change to allow-automatic-inventory-sorting ?
+ }
+ if (!minepacksHook.isMinepacksBackpack(inv)) {
+ return;
+ }
+ if (!p.hasPermission("chestsort.use")) {
+ return;
+ }
+ if (!p.hasPermission("chestsort.automatic")) {
+ return;
+ }
plugin.registerPlayerIfNeeded(p);
PlayerSetting setting = plugin.getPerPlayerSettings().get(p.getUniqueId().toString());
- if (!setting.sortingEnabled) return;
+ if (!setting.sortingEnabled) {
+ return;
+ }
plugin.getOrganizer().sortInventory(inv);
}
@@ -156,6 +251,10 @@ public class ChestSortListener implements org.bukkit.event.Listener {
plugin.debug("Attempt to automatically sort a player inventory");
+ if(isPossiblyBlacklisted(event.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
+
if (event.getInventory().getHolder() == null) {
plugin.debug("Abort: holder == null");
return;
@@ -166,7 +265,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
return;
}
if (event.getInventory().getType() != InventoryType.CRAFTING) {
- plugin.debug("Abort: type != CRAFTING, but "+event.getInventory().getType().name());
+ plugin.debug("Abort: type != CRAFTING, but " + event.getInventory().getType().name());
return; // Weird! Returns CRAFTING instead of PLAYER
}
@@ -175,8 +274,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
return;
}
-
- if(!plugin.getConfig().getBoolean("allow-automatic-inventory-sorting")) {
+ if (!plugin.getConfig().getBoolean("allow-automatic-inventory-sorting")) {
plugin.debug("allow-automatic-inventory-sorting is false");
return;
}
@@ -191,7 +289,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
PlayerSetting setting = plugin.getPerPlayerSettings().get(p.getUniqueId().toString());
if (!setting.invSortingEnabled) {
- plugin.debug("auto inv sorting not enabled for player "+p.getName());
+ plugin.debug("auto inv sorting not enabled for player " + p.getName());
return;
}
@@ -208,10 +306,16 @@ public class ChestSortListener implements org.bukkit.event.Listener {
@EventHandler
public void onChestClose(InventoryCloseEvent event) {
- if(!plugin.getConfig().getBoolean("allow-automatic-sorting")) return;
+ if (!plugin.getConfig().getBoolean("allow-automatic-sorting")) {
+ return;
+ }
- if (!(plugin.getConfig().getString("sort-time").equalsIgnoreCase("close")
- || plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))) {
+ if(isPossiblyBlacklisted(event.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
+
+ if (!(plugin.getConfig().getString("sort-time").equalsIgnoreCase("close") ||
+ plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))) {
return;
}
@@ -222,14 +326,14 @@ public class ChestSortListener implements org.bukkit.event.Listener {
Player p = (Player) event.getPlayer();
Inventory inventory = event.getInventory();
- if(!p.hasPermission("chestsort.automatic")) return;
+ if (!p.hasPermission("chestsort.automatic")) {
+ return;
+ }
- if (!isAPICall(inventory)
- && !belongsToChestLikeBlock(inventory)
- && !plugin.getEnderContainersHook().isEnderchest(inventory)
- && !LlamaUtils.belongsToLlama(inventory)
- && !advancedChestsHook.isAnAdvancedChest(inventory)
- && !plugin.getOrganizer().isMarkedAsSortable(inventory)) {
+ if (!isAPICall(inventory) && !belongsToChestLikeBlock(inventory) &&
+ !plugin.getEnderContainersHook().isEnderchest(inventory) && !LlamaUtils.belongsToLlama(inventory) &&
+ !advancedChestsHook.isAnAdvancedChest(inventory) &&
+ !plugin.getOrganizer().isMarkedAsSortable(inventory)) {
return;
}
@@ -249,7 +353,9 @@ public class ChestSortListener implements org.bukkit.event.Listener {
}
// If the involved inventory belongs to an AdvancedChest, sort all the pages.
- if(advancedChestsHook.handleAChestSortingIfPresent(event.getInventory()))return;
+ if (advancedChestsHook.handleAChestSortingIfPresent(event.getInventory())) {
+ return;
+ }
// Normal container inventories can be sorted completely
plugin.getOrganizer().sortInventory(event.getInventory());
@@ -260,10 +366,16 @@ public class ChestSortListener implements org.bukkit.event.Listener {
plugin.debug("onChestOpen (InventoryOpenEvent");
- if(!plugin.getConfig().getBoolean("allow-automatic-sorting")) return;
+ if(isPossiblyBlacklisted(event.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
- if (!(plugin.getConfig().getString("sort-time").equalsIgnoreCase("open")
- || plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))) {
+ if (!plugin.getConfig().getBoolean("allow-automatic-sorting")) {
+ return;
+ }
+
+ if (!(plugin.getConfig().getString("sort-time").equalsIgnoreCase("open") ||
+ plugin.getConfig().getString("sort-time").equalsIgnoreCase("both"))) {
return;
}
@@ -278,14 +390,14 @@ public class ChestSortListener implements org.bukkit.event.Listener {
Player p = (Player) event.getPlayer();
Inventory inventory = event.getInventory();
- if(!p.hasPermission("chestsort.automatic")) return;
+ if (!p.hasPermission("chestsort.automatic")) {
+ return;
+ }
- if (!isAPICall(inventory)
- && !belongsToChestLikeBlock(inventory)
- && !plugin.getEnderContainersHook().isEnderchest(inventory)
- && !LlamaUtils.belongsToLlama(inventory)
- && !advancedChestsHook.isAnAdvancedChest(inventory)
- && !plugin.getOrganizer().isMarkedAsSortable(inventory)) {
+ if (!isAPICall(inventory) && !belongsToChestLikeBlock(inventory) &&
+ !plugin.getEnderContainersHook().isEnderchest(inventory) && !LlamaUtils.belongsToLlama(inventory) &&
+ !advancedChestsHook.isAnAdvancedChest(inventory) &&
+ !plugin.getOrganizer().isMarkedAsSortable(inventory)) {
return;
}
@@ -297,7 +409,6 @@ public class ChestSortListener implements org.bukkit.event.Listener {
plugin.getLgr().logSort(p, Logger.SortCause.CONT_OPEN);
-
// Llama inventories need special start/end slots
if (LlamaUtils.belongsToLlama(event.getInventory())) {
ChestedHorse llama = (ChestedHorse) event.getInventory().getHolder();
@@ -306,7 +417,9 @@ public class ChestSortListener implements org.bukkit.event.Listener {
}
// If the involved inventory belongs to an AdvancedChest, sort all the pages.
- if(advancedChestsHook.handleAChestSortingIfPresent(event.getInventory()))return;
+ if (advancedChestsHook.handleAChestSortingIfPresent(event.getInventory())) {
+ return;
+ }
// Normal container inventories can be sorted completely
plugin.getOrganizer().sortInventory(event.getInventory());
@@ -316,13 +429,15 @@ public class ChestSortListener implements org.bukkit.event.Listener {
private boolean belongsToChestLikeBlock(Inventory inventory) {
// Check by InventoryType
- if (inventory.getType() == InventoryType.ENDER_CHEST || inventory.getType().name().equalsIgnoreCase("SHULKER_BOX")) {
+ if (inventory.getType() == InventoryType.ENDER_CHEST ||
+ inventory.getType().name().equalsIgnoreCase("SHULKER_BOX")) {
return true;
}
- if (inventory.getHolder() != null && inventory.getHolder().getClass().getName().toLowerCase().contains("boat")) {
- return true;
- }
+ if (inventory.getHolder() != null &&
+ inventory.getHolder().getClass().getName().toLowerCase().contains("boat")) {
+ return true;
+ }
// Possible Fix for https://github.com/JEFF-Media-GbR/Spigot-ChestSort/issues/13
if (inventory.getHolder() == null) {
@@ -344,9 +459,10 @@ public class ChestSortListener implements org.bukkit.event.Listener {
// WARNING: The names are inconsistent! A chest will return
// org.bukkit.craftbukkit.v1_14_R1.block.CraftChest
// in Spigot 1.14 while a double chest returns org.bukkit.block.DoubleChest
- return inventory.getHolder() instanceof Chest || inventory.getHolder() instanceof DoubleChest
- || inventory.getHolder().getClass().toString().endsWith(".CraftMinecartChest")
- || inventory.getHolder().getClass().toString().endsWith(".CraftShulkerBox") //Obsolete, is checked above by InventoryType
+ return inventory.getHolder() instanceof Chest || inventory.getHolder() instanceof DoubleChest ||
+ inventory.getHolder().getClass().toString().endsWith(".CraftMinecartChest") ||
+ inventory.getHolder().getClass().toString().endsWith(".CraftShulkerBox")
+ //Obsolete, is checked above by InventoryType
|| inventory.getHolder().getClass().toString().endsWith(".CraftBarrel");
}
@@ -412,7 +528,13 @@ public class ChestSortListener implements org.bukkit.event.Listener {
@EventHandler
public void onEnderChestOpen(InventoryOpenEvent event) {
- if(!plugin.getConfig().getBoolean("allow-automatic-sorting")) return;
+ if (!plugin.getConfig().getBoolean("allow-automatic-sorting")) {
+ return;
+ }
+
+ if(isPossiblyBlacklisted(event.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
if (!(event.getPlayer() instanceof Player)) {
return;
@@ -420,7 +542,9 @@ public class ChestSortListener implements org.bukkit.event.Listener {
Player p = (Player) event.getPlayer();
- if(!p.hasPermission("chestsort.automatic")) return;
+ if (!p.hasPermission("chestsort.automatic")) {
+ return;
+ }
// Check if this is an EnderChest (is there a smarter way?)
if (!event.getInventory().equals(p.getEnderChest())) {
@@ -442,12 +566,15 @@ public class ChestSortListener implements org.bukkit.event.Listener {
plugin.debug2("Hotkey?");
+ if(isPossiblyBlacklisted(event.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
+
if (!(event.getWhoClicked() instanceof Player)) {
plugin.debug2("exit: 0");
return;
}
-
Player p = (Player) event.getWhoClicked();
plugin.registerPlayerIfNeeded(p);
@@ -457,39 +584,33 @@ public class ChestSortListener implements org.bukkit.event.Listener {
return;
}
-
if (!p.hasPermission("chestsort.use") && !p.hasPermission("chestsort.use.inventory")) {
plugin.debug2("exit: 2");
return;
}
-
//InventoryHolder holder = event.getInventory().getHolder();
if (event.getClickedInventory() == null) {
plugin.debug2("exit: 3");
return;
}
-
boolean isAPICall = isAPICall(event.getClickedInventory());
// Detect generic GUIs
- if(!isAPICall &&
- (plugin.getGenericHook().isPluginGUI(event.getInventory())
- || plugin.getGenericHook().isPluginGUI(event.getInventory()))) {
+ if (!isAPICall && (plugin.getGenericHook().isPluginGUI(event.getInventory()) ||
+ plugin.getGenericHook().isPluginGUI(event.getInventory()))) {
plugin.debug("Aborting hotkey sorting: no API call & generic GUI detected");
return;
}
-
// Possible fix for #57
- if (!isAPICall && (event.getClickedInventory().getHolder() != null
- && event.getClickedInventory().getHolder() == p
- && event.getClickedInventory() != p.getInventory())) {
+ if (!isAPICall &&
+ (event.getClickedInventory().getHolder() != null && event.getClickedInventory().getHolder() == p &&
+ event.getClickedInventory() != p.getInventory())) {
return;
}
-
// End Possible fix for #57
InventoryHolder holder = event.getClickedInventory().getHolder();
@@ -503,7 +624,6 @@ public class ChestSortListener implements org.bukkit.event.Listener {
return;
}
-
// Prevent player from putting items into GUI inventory
if (event.getInventory() == setting.guiInventory) {
event.setCancelled(true);
@@ -515,19 +635,22 @@ public class ChestSortListener implements org.bukkit.event.Listener {
cause = Logger.SortCause.H_MIDDLE;
//if(plugin.getConfig().getBoolean("hotkeys.middle-click")) {
if (setting.middleClick && p.hasPermission(Hotkey.getPermission(Hotkey.MIDDLE_CLICK))) {
- if (event.getWhoClicked().getGameMode() != GameMode.CREATIVE
- || (event.getCurrentItem() == null || event.getCurrentItem().getType() == Material.AIR)) {
+ if (event.getWhoClicked().getGameMode() != GameMode.CREATIVE ||
+ (event.getCurrentItem() == null || event.getCurrentItem().getType() == Material.AIR)) {
sort = true;
}
}
break;
case DOUBLE_CLICK:
- if(event.isShiftClick()) return;
+ if (event.isShiftClick()) {
+ return;
+ }
cause = Logger.SortCause.H_DOUBLE;
//if(plugin.getConfig().getBoolean("hotkeys.double-click")) {
- if (setting.doubleClick && p.hasPermission(Hotkey.getPermission(Hotkey.DOUBLE_CLICK))) {
+ if (setting.doubleClick && p.hasPermission(Hotkey.getPermission(Hotkey.DOUBLE_CLICK))) {
// We need getCursor() instead of getCurrentItem(), because after picking up the item, it is gone into the cursor
- if (event.getCursor() == null || (event.getCursor() != null && event.getCursor().getType() == Material.AIR)) {
+ if (event.getCursor() == null ||
+ (event.getCursor() != null && event.getCursor().getType() == Material.AIR)) {
sort = true;
}
}
@@ -536,7 +659,8 @@ public class ChestSortListener implements org.bukkit.event.Listener {
cause = Logger.SortCause.H_SHIFT;
//if(plugin.getConfig().getBoolean("hotkeys.shift-click")) {
if (setting.shiftClick && p.hasPermission(Hotkey.getPermission(Hotkey.SHIFT_CLICK))) {
- if (event.getCurrentItem() == null || (event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.AIR)) {
+ if (event.getCurrentItem() == null ||
+ (event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.AIR)) {
sort = true;
}
}
@@ -545,7 +669,8 @@ public class ChestSortListener implements org.bukkit.event.Listener {
cause = Logger.SortCause.H_SHIFTRIGHT;
//if(plugin.getConfig().getBoolean("hotkeys.shift-right-click")) {
if (setting.shiftRightClick && p.hasPermission(Hotkey.getPermission(Hotkey.SHIFT_RIGHT_CLICK))) {
- if (event.getCurrentItem() == null || (event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.AIR)) {
+ if (event.getCurrentItem() == null ||
+ (event.getCurrentItem() != null && event.getCurrentItem().getType() == Material.AIR)) {
sort = true;
}
}
@@ -559,58 +684,58 @@ public class ChestSortListener implements org.bukkit.event.Listener {
}
event.setCancelled(true);
- if(plugin.isInHotkeyCooldown(p.getUniqueId())) {
+ if (plugin.isInHotkeyCooldown(p.getUniqueId())) {
plugin.debug("Skipping: hotkey cooldown");
return;
}
-
plugin.debug("Hotkey triggered: " + event.getClick().name());
- if (isAPICall
- || belongsToChestLikeBlock(event.getClickedInventory())
- || (event.getClickedInventory() != null && event.getClickedInventory().getType() == InventoryType.HOPPER)
- || plugin.getOrganizer().isMarkedAsSortable(event.getClickedInventory())
- || LlamaUtils.belongsToLlama(event.getClickedInventory())
- || minepacksHook.isMinepacksBackpack(event.getClickedInventory())
- || plugin.getPlayerVaultsHook().isPlayerVault(event.getClickedInventory())
- || plugin.getEnderContainersHook().isEnderchest(event.getClickedInventory())
- || advancedChestsHook.isAnAdvancedChest(event.getClickedInventory())) {
-
+ if (isAPICall || belongsToChestLikeBlock(event.getClickedInventory()) || (event.getClickedInventory() != null &&
+ event.getClickedInventory().getType() == InventoryType.HOPPER) ||
+ plugin.getOrganizer().isMarkedAsSortable(event.getClickedInventory()) ||
+ LlamaUtils.belongsToLlama(event.getClickedInventory()) ||
+ minepacksHook.isMinepacksBackpack(event.getClickedInventory()) ||
+ plugin.getPlayerVaultsHook().isPlayerVault(event.getClickedInventory()) ||
+ plugin.getEnderContainersHook().isEnderchest(event.getClickedInventory()) ||
+ advancedChestsHook.isAnAdvancedChest(event.getClickedInventory())) {
if (!p.hasPermission("chestsort.use")) {
return;
}
- plugin.getLgr().logSort(p,cause);
+ plugin.getLgr().logSort(p, cause);
if (LlamaUtils.belongsToLlama(event.getClickedInventory())) {
ChestedHorse llama = (ChestedHorse) event.getInventory().getHolder();
- plugin.getOrganizer().sortInventory(event.getClickedInventory(), 2, LlamaUtils.getLlamaChestSize(llama) + 1);
+ plugin.getOrganizer()
+ .sortInventory(event.getClickedInventory(), 2, LlamaUtils.getLlamaChestSize(llama) + 1);
plugin.getOrganizer().updateInventoryView(event);
return;
}
- if(advancedChestsHook.handleAChestSortingIfPresent(event.getInventory())){
+ if (advancedChestsHook.handleAChestSortingIfPresent(event.getInventory())) {
plugin.getOrganizer().updateInventoryView(event);
return;
}
plugin.getOrganizer().sortInventory(event.getClickedInventory());
plugin.getOrganizer().updateInventoryView(event);
- } else if (holder instanceof Player) {
+ }
+ else if (holder instanceof Player) {
if (!p.hasPermission("chestsort.use.inventory")) {
return;
}
if (event.getSlotType() == SlotType.QUICKBAR) {
- plugin.getLgr().logSort(p,cause);
+ plugin.getLgr().logSort(p, cause);
plugin.getOrganizer().sortInventory(p.getInventory(), 0, 8);
plugin.getOrganizer().updateInventoryView(event);
- } else if (event.getSlotType() == SlotType.CONTAINER) {
- plugin.getLgr().logSort(p,cause);
+ }
+ else if (event.getSlotType() == SlotType.CONTAINER) {
+ plugin.getLgr().logSort(p, cause);
plugin.getOrganizer().sortInventory(p.getInventory(), 9, 35);
plugin.getOrganizer().updateInventoryView(event);
@@ -619,13 +744,19 @@ public class ChestSortListener implements org.bukkit.event.Listener {
}
private boolean isAPICall(Inventory inv) {
- if(inv==null) return false;
+ if (inv == null) {
+ return false;
+ }
return inv.getHolder() instanceof ISortable || plugin.getOrganizer().isMarkedAsSortable(inv);
}
@EventHandler
public void onAdditionalHotkeys(InventoryClickEvent e) {
+ if(isPossiblyBlacklisted(e.getView())) {
+ plugin.debug("Abort: holder is blacklisted");
+ }
+
if (LlamaUtils.belongsToLlama(e.getInventory()) || LlamaUtils.belongsToLlama(e.getClickedInventory())) {
return;
}
@@ -646,84 +777,91 @@ public class ChestSortListener implements org.bukkit.event.Listener {
return;
}
- boolean isAdvancedChest = advancedChestsHook.isAnAdvancedChest(e.getClickedInventory())
- || advancedChestsHook.isAnAdvancedChest(e.getInventory());
+ boolean isAdvancedChest = advancedChestsHook.isAnAdvancedChest(e.getClickedInventory()) ||
+ advancedChestsHook.isAnAdvancedChest(e.getInventory());
// Possible fix for #57
- if (e.getInventory().getHolder() == null
- && !e.getView().getTopInventory().equals(p.getEnderChest())
- && !isAdvancedChest) {
+ if (e.getInventory().getHolder() == null && !e.getView().getTopInventory().equals(p.getEnderChest()) &&
+ !isAdvancedChest) {
return;
}
if (e.getInventory().getHolder() == p && e.getInventory() != p.getInventory()) {
return;
}
// End Possible fix for #57
- if (e.getInventory().getType() != InventoryType.CHEST
- && e.getInventory().getType() != InventoryType.DISPENSER
- && e.getInventory().getType() != InventoryType.DROPPER
- && e.getInventory().getType() != InventoryType.ENDER_CHEST
- && e.getInventory().getType() != InventoryType.HOPPER
- && !e.getInventory().getType().name().equalsIgnoreCase("SHULKER_BOX")
- && (e.getInventory().getHolder() == null || !e.getInventory().getHolder().getClass().toString().endsWith(".CraftBarrel"))
- && e.getInventory() != p.getEnderChest()
- && !(e.getInventory().getHolder() instanceof ISortable)) {
+ if (e.getInventory().getType() != InventoryType.CHEST &&
+ e.getInventory().getType() != InventoryType.DISPENSER &&
+ e.getInventory().getType() != InventoryType.DROPPER &&
+ e.getInventory().getType() != InventoryType.ENDER_CHEST &&
+ e.getInventory().getType() != InventoryType.HOPPER &&
+ !e.getInventory().getType().name().equalsIgnoreCase("SHULKER_BOX") &&
+ (e.getInventory().getHolder() == null ||
+ !e.getInventory().getHolder().getClass().toString().endsWith(".CraftBarrel")) &&
+ e.getInventory() != p.getEnderChest() && !(e.getInventory().getHolder() instanceof ISortable)) {
return;
}
// HeadDatabase hook
- if(headDatabaseHook.isHeadDB(e.getClickedInventory())
- || headDatabaseHook.isHeadDB(e.getInventory())) {
+ if (headDatabaseHook.isHeadDB(e.getClickedInventory()) || headDatabaseHook.isHeadDB(e.getInventory())) {
return;
}
// CrateReloaded hook
- if(CrateReloadedHook.isCrate(e.getClickedInventory())
- || CrateReloadedHook.isCrate(e.getInventory())) {
+ if (CrateReloadedHook.isCrate(e.getClickedInventory()) || CrateReloadedHook.isCrate(e.getInventory())) {
//if(plugin.debug) plugin.getLogger().info("Aborting hotkey because this is a CrateReloaded crate");
return;
}
// GoldenCrates hook
- if(goldenCratesHook.isCrate(e.getClickedInventory())
- || goldenCratesHook.isCrate(e.getInventory())) {
+ if (goldenCratesHook.isCrate(e.getClickedInventory()) || goldenCratesHook.isCrate(e.getInventory())) {
//if(plugin.debug) plugin.getLogger().info("Aborting hotkey because this is a CrateReloaded crate");
return;
}
// Detect generic GUIs
- if(!isAPICall(e.getInventory()) && !isAPICall(e.getClickedInventory()) &&
- (plugin.getGenericHook().isPluginGUI(e.getInventory())
- || plugin.getGenericHook().isPluginGUI(e.getInventory()))) {
+ if (!isAPICall(e.getInventory()) && !isAPICall(e.getClickedInventory()) &&
+ (plugin.getGenericHook().isPluginGUI(e.getInventory()) ||
+ plugin.getGenericHook().isPluginGUI(e.getInventory()))) {
return;
}
// Don't sort inventories belonging to BossShopPro
- if (e.getInventory() != null && e.getInventory().getHolder() != null && e.getInventory().getHolder().getClass().getName().equalsIgnoreCase("org.black_ixx.bossshop.core.BSShopHolder")) {
+ if (e.getInventory() != null && e.getInventory().getHolder() != null && e.getInventory()
+ .getHolder()
+ .getClass()
+ .getName()
+ .equalsIgnoreCase("org.black_ixx.bossshop.core.BSShopHolder")) {
return;
}
// BetterBackpacks
- if (e.getInventory() != null && e.getInventory().getHolder() != null && e.getInventory().getHolder().getClass().getName().equals("com.alonsoaliaga.betterbackpacks.others.BackpackHolder")) {
+ if (e.getInventory() != null && e.getInventory().getHolder() != null && e.getInventory()
+ .getHolder()
+ .getClass()
+ .getName()
+ .equals("com.alonsoaliaga.betterbackpacks.others.BackpackHolder")) {
return;
}
// ShulkerPacks
- if(ShulkerPacksHook.isOpenShulkerView(e.getView())) return;
+ if (ShulkerPacksHook.isOpenShulkerView(e.getView())) {
+ return;
+ }
- if (!p.hasPermission("chestsort.use")) return;
+ if (!p.hasPermission("chestsort.use")) {
+ return;
+ }
plugin.registerPlayerIfNeeded(p);
PlayerSetting setting = plugin.getPerPlayerSettings().get(p.getUniqueId().toString());
-
ChestSortEvent chestSortEvent = new ChestSortEvent(e.getInventory());
chestSortEvent.setPlayer(e.getWhoClicked());
chestSortEvent.setLocation(e.getWhoClicked().getLocation());
chestSortEvent.setSortableMaps(new HashMap<>());
ItemStack[] contents = e.getInventory().getContents();
- int contentsLength = (!isAdvancedChest) ? contents.length : contents.length-9;
+ int contentsLength = (!isAdvancedChest) ? contents.length : contents.length - 9;
for (int i = 0; i < contentsLength; i++) {
ItemStack item = contents[i];
chestSortEvent.getSortableMaps().put(item, plugin.getOrganizer().getSortableMap(item));
@@ -736,30 +874,38 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if (e.isLeftClick() && setting.leftClick && p.hasPermission(Hotkey.getPermission(Hotkey.LEFT_CLICK))) {
plugin.getLgr().logSort(p, Logger.SortCause.H_LEFT);
- if (setting.getCurrentDoubleClick(plugin, PlayerSetting.DoubleClickType.LEFT_CLICK)
- == PlayerSetting.DoubleClickType.LEFT_CLICK) {
- // Left double click: put everything into destination
- plugin.getOrganizer().stuffPlayerInventoryIntoAnother(p.getInventory(), e.getInventory(), false, chestSortEvent);
- if(isAdvancedChest){
- plugin.getOrganizer().sortInventory(e.getInventory(),0,e.getInventory().getSize()-10);
- }else{
+ if (setting.getCurrentDoubleClick(plugin, PlayerSetting.DoubleClickType.LEFT_CLICK) ==
+ PlayerSetting.DoubleClickType.LEFT_CLICK) {
+ // Left double click: put everything into destination
+ plugin.getOrganizer()
+ .stuffPlayerInventoryIntoAnother(p.getInventory(), e.getInventory(), false, chestSortEvent);
+ if (isAdvancedChest) {
+ plugin.getOrganizer().sortInventory(e.getInventory(), 0, e.getInventory().getSize() - 10);
+ }
+ else {
plugin.getOrganizer().sortInventory(e.getInventory());
}
- } else {
- // Left single click: put only matching items into destination
- plugin.getOrganizer().stuffPlayerInventoryIntoAnother(p.getInventory(), e.getInventory(), true, chestSortEvent);
+ }
+ else {
+ // Left single click: put only matching items into destination
+ plugin.getOrganizer()
+ .stuffPlayerInventoryIntoAnother(p.getInventory(), e.getInventory(), true, chestSortEvent);
}
- } else if (e.isRightClick() && setting.rightClick && p.hasPermission(Hotkey.getPermission(Hotkey.RIGHT_CLICK))) {
+ }
+ else if (e.isRightClick() && setting.rightClick && p.hasPermission(Hotkey.getPermission(Hotkey.RIGHT_CLICK))) {
plugin.getLgr().logSort(p, Logger.SortCause.H_RIGHT);
- if (setting.getCurrentDoubleClick(plugin, PlayerSetting.DoubleClickType.RIGHT_CLICK)
- == PlayerSetting.DoubleClickType.RIGHT_CLICK) {
- // Right double click: put everything into player inventory
- plugin.getOrganizer().stuffInventoryIntoAnother(e.getInventory(), p.getInventory(), e.getInventory(), false);
- plugin.getOrganizer().sortInventory(p.getInventory(),9,35);
- } else {
- // Right single click: put only matching items into player inventory
- plugin.getOrganizer().stuffInventoryIntoAnother(e.getInventory(), p.getInventory(), e.getInventory(), true);
+ if (setting.getCurrentDoubleClick(plugin, PlayerSetting.DoubleClickType.RIGHT_CLICK) ==
+ PlayerSetting.DoubleClickType.RIGHT_CLICK) {
+ // Right double click: put everything into player inventory
+ plugin.getOrganizer()
+ .stuffInventoryIntoAnother(e.getInventory(), p.getInventory(), e.getInventory(), false);
+ plugin.getOrganizer().sortInventory(p.getInventory(), 9, 35);
+ }
+ else {
+ // Right single click: put only matching items into player inventory
+ plugin.getOrganizer()
+ .stuffInventoryIntoAnother(e.getInventory(), p.getInventory(), e.getInventory(), true);
}
}
@@ -770,5 +916,4 @@ public class ChestSortListener implements org.bukkit.event.Listener {
Bukkit.getPluginManager().callEvent(new ChestSortPostSortEvent(chestSortEvent));
}
-
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index c1c809a..39fb5e0 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -326,6 +326,22 @@ prevent-sorting-null-inventories: false
# Although this should NOT cause ANY problems, it's disabled by default.
mute-protection-plugins: false
+##### Generic Detection by InventoryHolder #####
+# ChestSort can detect inventories from other plugins by their InventoryHolder.
+# If you encounter duplication issues with other plugins, or want to disabe sorting
+# for certain inventories for any other reason, you can do that here.
+# To find out the InventoryHolder name of an inventory, do the following:
+# 1. Run /chestsort debug
+# 2. Open the inventory and use a hotkey to sort
+# 3. Check the console for the InventoryHolder name, it should say something
+# like "Holder class: class com.someplugin.InventoryHolder"
+# 4. Note the name of the InventoryHolder class, e.g. "com.someplugin.InventoryHolder"
+# 5. Add \Q at the beginning, and \E at the end of the name, e.g. \Qcom.someplugin.InventoryHolder\E
+# 6. Add that to the list below. You can also use advanced regexes, e.g. ".*[Bb]ack[Pp]ack.*" would blacklist all holders
+# that contain the word "Backpack"
+blocked-inventory-holders-regex:
+- ".*[Bb]ack[Pp]ack.*"
+
##########################
##### Sorting Method #####
##########################