Upstream/ChestSort
1
0
Fork 0
mirror of https://github.com/JEFF-Media-GbR/ChestSort.git synced 2025-01-20 23:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Added Hopper, Enderchest and Minecart to sortable Inventories

Browse Source
This commit is contained in:
Felix 2020-05-09 17:14:38 +02:00
parent 2c3a794c41
commit d878407da4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/de/jeffclan/JeffChestSort/JeffChestSortListener.java
View File

@ -7,6 +7,7 @@ import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest;
import org.bukkit.block.Hopper;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
@ -19,6 +20,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryEvent;
import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.inventory.InventoryType.SlotType;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.Inventory;
@ -179,15 +181,24 @@ public class JeffChestSortListener implements Listener {
}
private boolean belongsToChestLikeBlock(Inventory inventory) {
// Special check if the inventory is an Enderchest,
// as for Enderchests getHolder() is null
if (inventory.getType() == InventoryType.ENDER_CHEST) {
return true;
}
// Possible Fix for https://github.com/JEFF-Media-GbR/Spigot-ChestSort/issues/13
if (inventory.getHolder() == null) {
return false;
}
// System.out.println(inventory.getHolder().getClass().getName());
// Only continue if the inventory belongs to a chest, double chest, shulkerbox
// or barrel
// Only continue if the inventory belongs to one of the following:
// - a chest,
// - double chest,
// - shulkerbox (MC 1.11)
// - barrel (MC 1.14)
// - hopper (MC 1.5)
// - Minecart with Chest (MC 1.0)
// NOTE: We use .getClass().toString() for new items instead of directly
// comparing the ENUM, because we
// want to keep compatability between different minecraft versions (e.g. there
@ -196,6 +207,8 @@ public class JeffChestSortListener implements Listener {
// org.bukkit.craftbukkit.v1_14_R1.block.CraftChest
// in Spigot 1.14 while a double chest returns org.bukkit.block.DoubleChest
if (!(inventory.getHolder() instanceof Chest) && !(inventory.getHolder() instanceof DoubleChest)
&& !(inventory.getHolder() instanceof Hopper)
&& !(inventory.getHolder().getClass().toString().endsWith(".CraftMinecartChest"))
&& !(inventory.getHolder().getClass().toString().endsWith(".CraftShulkerBox"))
&& !(inventory.getHolder().getClass().toString().endsWith(".CraftBarrel"))) {
return false;