From 406772b971d34aa70e96e45b391fb288d4f0ad17 Mon Sep 17 00:00:00 2001
From: mfnalex <1122571+mfnalex@users.noreply.github.com>
Date: Mon, 12 Dec 2022 18:23:26 +0100
Subject: [PATCH] 13.5.0 fixed #157
---
pom.xml | 8 ++++----
.../java/de/jeff_media/chestsort/ChestSortPlugin.java | 6 +++---
.../de/jeff_media/chestsort/commands/AdminCommand.java | 2 +-
.../java/de/jeff_media/chestsort/config/Messages.java | 2 +-
src/main/java/de/jeff_media/chestsort/gui/NewUI.java | 4 ++--
.../de/jeff_media/chestsort/hooks/GenericGUIHook.java | 1 +
.../jeff_media/chestsort/listeners/ChestSortListener.java | 4 ++--
7 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d5b547..b418148 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
ChestSort
https://www.chestsort.de
Allows automatic chest sorting!
- 13.4.0
+ 13.5.0
jar
@@ -62,7 +62,7 @@
- de.jeff_media.jefflib
+ com.jeff_media.jefflib
de.jeff_media.chestsort.jefflib
@@ -205,9 +205,9 @@
- de.jeff_media
+ com.jeff_media
JeffLib
- 9.0.0-SNAPSHOT
+ 12.0.0
compile
diff --git a/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
index 69d737d..941d767 100644
--- a/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
+++ b/src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
@@ -50,9 +50,9 @@ import de.jeff_media.chestsort.hooks.PlayerVaultsHook;
import de.jeff_media.chestsort.listeners.ChestSortListener;
import de.jeff_media.chestsort.placeholders.Placeholders;
import de.jeff_media.chestsort.utils.Utils;
-import de.jeff_media.jefflib.JeffLib;
-import de.jeff_media.jefflib.McVersion;
-import de.jeff_media.jefflib.NBTAPI;
+import com.jeff_media.jefflib.JeffLib;
+import com.jeff_media.jefflib.McVersion;
+import com.jeff_media.jefflib.NBTAPI;
import io.papermc.lib.PaperLib;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
diff --git a/src/main/java/de/jeff_media/chestsort/commands/AdminCommand.java b/src/main/java/de/jeff_media/chestsort/commands/AdminCommand.java
index 6be8415..17cd489 100644
--- a/src/main/java/de/jeff_media/chestsort/commands/AdminCommand.java
+++ b/src/main/java/de/jeff_media/chestsort/commands/AdminCommand.java
@@ -1,7 +1,7 @@
package de.jeff_media.chestsort.commands;
import de.jeff_media.chestsort.ChestSortPlugin;
-import de.jeff_media.jefflib.NBTAPI;
+import com.jeff_media.jefflib.NBTAPI;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/de/jeff_media/chestsort/config/Messages.java b/src/main/java/de/jeff_media/chestsort/config/Messages.java
index a160360..4731ca0 100644
--- a/src/main/java/de/jeff_media/chestsort/config/Messages.java
+++ b/src/main/java/de/jeff_media/chestsort/config/Messages.java
@@ -1,7 +1,7 @@
package de.jeff_media.chestsort.config;
import de.jeff_media.chestsort.ChestSortPlugin;
-import de.jeff_media.jefflib.TextUtils;
+import com.jeff_media.jefflib.TextUtils;
import org.bukkit.ChatColor;
public class Messages {
diff --git a/src/main/java/de/jeff_media/chestsort/gui/NewUI.java b/src/main/java/de/jeff_media/chestsort/gui/NewUI.java
index 5ba1a06..3ace300 100644
--- a/src/main/java/de/jeff_media/chestsort/gui/NewUI.java
+++ b/src/main/java/de/jeff_media/chestsort/gui/NewUI.java
@@ -2,8 +2,8 @@ package de.jeff_media.chestsort.gui;
import de.jeff_media.chestsort.ChestSortPlugin;
import de.jeff_media.chestsort.enums.Hotkey;
-import de.jeff_media.jefflib.ItemStackUtils;
-import de.jeff_media.jefflib.TextUtils;
+import com.jeff_media.jefflib.ItemStackUtils;
+import com.jeff_media.jefflib.TextUtils;
import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java b/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
index a9e624d..1870fad 100644
--- a/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
+++ b/src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
@@ -20,6 +20,7 @@ public class GenericGUIHook {
public boolean isPluginGUI(Inventory inv) {
if(inv.getHolder()!=null && (inv.getHolder().getClass().getName().toLowerCase().contains("gui")
+ || inv.getHolder().getClass().getName().endsWith(".FastInv")
|| inv.getHolder().getClass().getName().toLowerCase().contains("menu"))) {
main.debug("Generic GUI detected by class name containing \"gui\" or \"menu\"");
return true;
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 30afd6a..6c9fe4c 100644
--- a/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
+++ b/src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
@@ -10,7 +10,7 @@ import de.jeff_media.chestsort.api.*;
import de.jeff_media.chestsort.data.PlayerSetting;
import de.jeff_media.chestsort.hooks.*;
import de.jeff_media.chestsort.utils.LlamaUtils;
-import de.jeff_media.jefflib.ProtectionUtils;
+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;
@@ -82,7 +82,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(!playerSetting.leftClickOutside) return;
if(plugin.getConfig().getBoolean("mute-protection-plugins")) {
- if (!ProtectionUtils.canInteract(event.getPlayer(), clickedBlock, 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;
}