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

13.5.0 fixed #157

Browse Source
This commit is contained in:
mfnalex 2022-12-12 18:23:26 +01:00
parent 3afb5e49f8
commit 406772b971
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -9,7 +9,7 @@
<name>ChestSort</name> <name>ChestSort</name>
<url>https://www.chestsort.de</url> <url>https://www.chestsort.de</url>
<description>Allows automatic chest sorting!</description> <description>Allows automatic chest sorting!</description>
<version>13.4.0</version> <version>13.5.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -62,7 +62,7 @@
<relocations> <relocations>
<relocation> <relocation>
<pattern>de.jeff_media.jefflib</pattern> <pattern>com.jeff_media.jefflib</pattern>
<shadedPattern>de.jeff_media.chestsort.jefflib</shadedPattern> <shadedPattern>de.jeff_media.chestsort.jefflib</shadedPattern>
</relocation> </relocation>
@ -205,9 +205,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.jeff_media</groupId> <groupId>com.jeff_media</groupId>
<artifactId>JeffLib</artifactId> <artifactId>JeffLib</artifactId>
<version>9.0.0-SNAPSHOT</version> <version>12.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

6
src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
View File

@ -50,9 +50,9 @@ import de.jeff_media.chestsort.hooks.PlayerVaultsHook;
import de.jeff_media.chestsort.listeners.ChestSortListener; import de.jeff_media.chestsort.listeners.ChestSortListener;
import de.jeff_media.chestsort.placeholders.Placeholders; import de.jeff_media.chestsort.placeholders.Placeholders;
import de.jeff_media.chestsort.utils.Utils; import de.jeff_media.chestsort.utils.Utils;
import de.jeff_media.jefflib.JeffLib; import com.jeff_media.jefflib.JeffLib;
import de.jeff_media.jefflib.McVersion; import com.jeff_media.jefflib.McVersion;
import de.jeff_media.jefflib.NBTAPI; import com.jeff_media.jefflib.NBTAPI;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
src/main/java/de/jeff_media/chestsort/commands/AdminCommand.java
View File

@ -1,7 +1,7 @@
package de.jeff_media.chestsort.commands; package de.jeff_media.chestsort.commands;
import de.jeff_media.chestsort.ChestSortPlugin; 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.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

2
src/main/java/de/jeff_media/chestsort/config/Messages.java
View File

@ -1,7 +1,7 @@
package de.jeff_media.chestsort.config; package de.jeff_media.chestsort.config;
import de.jeff_media.chestsort.ChestSortPlugin; import de.jeff_media.chestsort.ChestSortPlugin;
import de.jeff_media.jefflib.TextUtils; import com.jeff_media.jefflib.TextUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class Messages { public class Messages {

4
src/main/java/de/jeff_media/chestsort/gui/NewUI.java
View File

@ -2,8 +2,8 @@ package de.jeff_media.chestsort.gui;
import de.jeff_media.chestsort.ChestSortPlugin; import de.jeff_media.chestsort.ChestSortPlugin;
import de.jeff_media.chestsort.enums.Hotkey; import de.jeff_media.chestsort.enums.Hotkey;
import de.jeff_media.jefflib.ItemStackUtils; import com.jeff_media.jefflib.ItemStackUtils;
import de.jeff_media.jefflib.TextUtils; import com.jeff_media.jefflib.TextUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;

1
src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
View File

@ -20,6 +20,7 @@ public class GenericGUIHook {
public boolean isPluginGUI(Inventory inv) { public boolean isPluginGUI(Inventory inv) {
if(inv.getHolder()!=null && (inv.getHolder().getClass().getName().toLowerCase().contains("gui") if(inv.getHolder()!=null && (inv.getHolder().getClass().getName().toLowerCase().contains("gui")
|| inv.getHolder().getClass().getName().endsWith(".FastInv")
|| inv.getHolder().getClass().getName().toLowerCase().contains("menu"))) { || inv.getHolder().getClass().getName().toLowerCase().contains("menu"))) {
main.debug("Generic GUI detected by class name containing \"gui\" or \"menu\""); main.debug("Generic GUI detected by class name containing \"gui\" or \"menu\"");
return true; return true;

4
src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
View File

@ -10,7 +10,7 @@ import de.jeff_media.chestsort.api.*;
import de.jeff_media.chestsort.data.PlayerSetting; import de.jeff_media.chestsort.data.PlayerSetting;
import de.jeff_media.chestsort.hooks.*; import de.jeff_media.chestsort.hooks.*;
import de.jeff_media.chestsort.utils.LlamaUtils; 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.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -82,7 +82,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(!playerSetting.leftClickOutside) return; if(!playerSetting.leftClickOutside) return;
if(plugin.getConfig().getBoolean("mute-protection-plugins")) { 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!"); //System.out.println("ChestSort: cannot interact!");
return; return;
} }