Upstream/ChestSort
1
0
Fork 0
mirror of https://github.com/JEFF-Media-GbR/ChestSort.git synced 2024-11-30 06:33:27 +01:00
Code Issues Projects Releases Wiki Activity

Update JeffChestSortListener.java

Browse Source 
comments
This commit is contained in:
JEFF 2019-04-29 00:54:49 +02:00 committed by GitHub
parent 60352e06ef
commit 2f73e28158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,39 +26,53 @@ public class JeffChestSortListener implements Listener {
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
// DEBUG
//if (event.getPlayer().getName().equalsIgnoreCase("mfnalex")) {
// plugin.debug = true;
//}
// OPs will get an update notice if a new update is available
if (event.getPlayer().isOp()) {
plugin.updateChecker.sendUpdateMessage(event.getPlayer());
}
// Put player into our perPlayerSettings map
registerPlayerIfNeeded(event.getPlayer());
}
// Put player into our perPlayerSettings map
void registerPlayerIfNeeded(Player p) {
// Players are stored by their UUID, so that name changes don't break player's settings
UUID uniqueId = p.getUniqueId();
// Add player to map only if they aren't registered already
if (!plugin.PerPlayerSettings.containsKey(uniqueId.toString())) {
// Player settings are stored in a file named after the player's UUID
File playerFile = new File(plugin.getDataFolder() + File.separator + "playerdata",
p.getUniqueId().toString() + ".yml");
YamlConfiguration playerConfig = YamlConfiguration.loadConfiguration(playerFile);
boolean activeForThisPlayer;
boolean activeForThisPlayer = false;
if (!playerFile.exists()) {
// If the player settings file does not exist for this player, set it to the default value
activeForThisPlayer = plugin.getConfig().getBoolean("sorting-enabled-by-default");
} else {
// If the file exists, check if the player has sorting enabled
activeForThisPlayer = playerConfig.getBoolean("sortingEnabled");
}
JeffChestSortPlayerSetting newSettings = new JeffChestSortPlayerSetting(activeForThisPlayer);
// when "show-message-again-after-logout" is enabled, we don't care if the player already saw the message
if (!plugin.getConfig().getBoolean("show-message-again-after-logout")) {
newSettings.hasSeenMessage = playerConfig.getBoolean("hasSeenMessage");
}
// Finally add the PlayerSetting object to the map
plugin.PerPlayerSettings.put(uniqueId.toString(), newSettings);
}
@ -69,44 +83,53 @@ public class JeffChestSortListener implements Listener {
plugin.unregisterPlayer(event.getPlayer());
}
// This event fires when someone closes an inventory
// We check if the closed inventory belongs to a chest, shulkerbox or barrel,
// and then call the Organizer to sort the inventory (if the player has
// the chestsort.use permission and has /chestsort enabled)
@EventHandler
public void onInventoryClose(InventoryCloseEvent event) {
// I don't know if this is neccesary. Have to check if getPlayer() always returns a player,
// or if it might return an OfflinePlayer under some circumstances
if (!(event.getPlayer() instanceof Player)) {
return;
}
Player p = (Player) event.getPlayer();
if (!p.hasPermission("chestsort.use")) {
return;
}
// checking in lower case for lazy admins
if(plugin.disabledWorlds.contains(p.getWorld().getName().toLowerCase())) {
return;
}
// Don't sort automatically when player is spectator or in adventure mode
// TODO: Make this configurable in config.yml
if (p.getGameMode() == GameMode.SPECTATOR || p.getGameMode() == GameMode.ADVENTURE) {
return;
}
// Fixes exception when using /reload
// Fixes exception when using Spigot's stupid /reload command
registerPlayerIfNeeded(p);
// Get the current player's settings
// We do not immediately cancel when sorting is disabled because we might want to show the hint message
JeffChestSortPlayerSetting setting = plugin.PerPlayerSettings.get(p.getUniqueId().toString());
// 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 is no BARREL prior 1.14)
// WARNING: The names are inconsistent! A chest will return org.bukkit.craftbukkit.v1_14_R1.block.CraftChest
// while a double chest returns org.bukkit.block.DoubleChest
//p.sendMessage(event.getInventory().getHolder().toString());
// Possible Fix for https://github.com/JEFF-Media-GbR/Spigot-ChestSort/issues/13
if(event.getInventory().getHolder() == null) {
return;
}
// Only continue if the inventory belongs to a chest, double chest, shulkerbox or barrel
// 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 is no BARREL prior 1.14)
// 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
// DEBUG: p.sendMessage(event.getInventory().getHolder().toString());
if (!(event.getInventory().getHolder() instanceof Chest)
&& !(event.getInventory().getHolder() instanceof DoubleChest)
&& !(event.getInventory().getHolder() instanceof ShulkerBox)
@ -114,6 +137,11 @@ public class JeffChestSortListener implements Listener {
return;
}
// Show "how to enable ChestSort" message when ALL of the following criteria are met:
// - Player has sorting disabled
// - Player has not seen the message yet (whether or not this resets after a logout
// is defined by the config setting "show-message-again-after-logout")
// - "show-message-when-using-chest" is set to true in the config.yml
if (!plugin.sortingEnabled(p)) {
if (!setting.hasSeenMessage) {
setting.hasSeenMessage = true;
@ -122,7 +150,13 @@ public class JeffChestSortListener implements Listener {
}
}
return;
} else {
}
// Show "how to disable ChestSort" message when ALL of the following criteria are met:
// - Player has sorting enabled
// - Player has not seen the message yet (whether or not this resets after a logout
// is defined by the config setting "show-message-again-after-logout")
// - "show-message-when-using-chest-and-sorting-is-enabled" is set to true in the config.yml
else {
if (!setting.hasSeenMessage) {
setting.hasSeenMessage = true;
if (plugin.getConfig().getBoolean("show-message-when-using-chest-and-sorting-is-enabled")) {
@ -131,6 +165,7 @@ public class JeffChestSortListener implements Listener {
}
}
// Finally call the Organizer to sort the inventory
plugin.organizer.sortInventory(event.getInventory());
}