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

11.5.2

Browse Source
This commit is contained in:
mfnalex 2021-09-28 14:35:03 +02:00
parent e9e5c2cf43
commit db1ceaa809
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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>11.5.1</version> <version>11.5.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -187,7 +187,7 @@
<dependency> <dependency>
<groupId>de.jeff_media</groupId> <groupId>de.jeff_media</groupId>
<artifactId>JeffLib</artifactId> <artifactId>JeffLib</artifactId>
<version>1.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

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

@ -49,8 +49,8 @@ import de.jeff_media.chestsort.listeners.Listener;
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 de.jeff_media.jefflib.JeffLib;
import de.jeff_media.jefflib.McVersion;
import de.jeff_media.jefflib.NBTAPI; import de.jeff_media.jefflib.NBTAPI;
import de.jeff_media.jefflib.VersionUtil;
import de.jeff_media.updatechecker.UpdateChecker; import de.jeff_media.updatechecker.UpdateChecker;
import io.papermc.lib.PaperLib; import io.papermc.lib.PaperLib;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
@ -657,8 +657,9 @@ public class ChestSortPlugin extends JavaPlugin {
boolean rightClick; boolean rightClick;
boolean leftClickFromOutside; boolean leftClickFromOutside;
boolean changed; boolean changed;
boolean hasSeenMessage;
if (playerFile.exists() || VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_14_4_R01)) { if (playerFile.exists() || !McVersion.isAtLeast(1,14,4)) {
// If the player settings file does not exist for this player, set it to the // If the player settings file does not exist for this player, set it to the
// default value // default value
activeForThisPlayer = playerConfig.getBoolean("sortingEnabled"); activeForThisPlayer = playerConfig.getBoolean("sortingEnabled");
@ -670,10 +671,11 @@ public class ChestSortPlugin extends JavaPlugin {
leftClickFromOutside = playerConfig.getBoolean("leftClickOutside"); leftClickFromOutside = playerConfig.getBoolean("leftClickOutside");
leftClick = playerConfig.getBoolean("leftClick"); leftClick = playerConfig.getBoolean("leftClick");
rightClick = playerConfig.getBoolean("rightClick"); rightClick = playerConfig.getBoolean("rightClick");
hasSeenMessage = playerConfig.getBoolean("hasSeenMessage");
changed = true; changed = true;
if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_4_R01)) { if (McVersion.isAtLeast(1,14,4)) {
if (playerFile.delete()) { if (playerFile.delete()) {
this.getLogger().info("Converted old .yml playerdata file to NBT tags for player " + p.getName()); this.getLogger().info("Converted old .yml playerdata file to NBT tags for player " + p.getName());
} else { } else {
@ -692,16 +694,22 @@ public class ChestSortPlugin extends JavaPlugin {
leftClick = Boolean.parseBoolean(NBTAPI.getNBT(p, "leftClick", String.valueOf(playerConfig.getBoolean("leftClick", getConfig().getBoolean("additional-hotkeys.left-click"))))); leftClick = Boolean.parseBoolean(NBTAPI.getNBT(p, "leftClick", String.valueOf(playerConfig.getBoolean("leftClick", getConfig().getBoolean("additional-hotkeys.left-click")))));
rightClick = Boolean.parseBoolean(NBTAPI.getNBT(p, "rightClick", String.valueOf(playerConfig.getBoolean("rightClick", getConfig().getBoolean("additional-hotkeys.right-click"))))); rightClick = Boolean.parseBoolean(NBTAPI.getNBT(p, "rightClick", String.valueOf(playerConfig.getBoolean("rightClick", getConfig().getBoolean("additional-hotkeys.right-click")))));
leftClickFromOutside = Boolean.parseBoolean(NBTAPI.getNBT(p, "leftClickOutside", String.valueOf(playerConfig.getBoolean("leftClickOutside", getConfig().getBoolean("left-click-to-sort-enabled-by-default"))))); leftClickFromOutside = Boolean.parseBoolean(NBTAPI.getNBT(p, "leftClickOutside", String.valueOf(playerConfig.getBoolean("leftClickOutside", getConfig().getBoolean("left-click-to-sort-enabled-by-default")))));
hasSeenMessage = Boolean.parseBoolean(NBTAPI.getNBT(p, "hasSeenMessage", String.valueOf("false")));
//System.out.println("Loading playersetting from NBT");
if(getConfig().getBoolean("show-message-again-after-logout")) {
//System.out.println("show-message-again-after-logout is true, sooo...");
hasSeenMessage = false;
}
changed = true; changed = true;
} }
PlayerSetting newSettings = new PlayerSetting(activeForThisPlayer, invActiveForThisPlayer, middleClick, shiftClick, doubleClick, shiftRightClick, leftClick, rightClick, leftClickFromOutside, changed); PlayerSetting newSettings = new PlayerSetting(activeForThisPlayer, invActiveForThisPlayer, middleClick, shiftClick, doubleClick, shiftRightClick, leftClick, rightClick, leftClickFromOutside, changed, hasSeenMessage);
// when "show-message-again-after-logout" is enabled, we don't care if the // when "show-message-again-after-logout" is enabled, we don't care if the
// player already saw the message // player already saw the message
if (!getConfig().getBoolean("show-message-again-after-logout")) { if (!getConfig().getBoolean("show-message-again-after-logout")) {
if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_4_R01) && !playerFile.exists()) { if (McVersion.isAtLeast(1,14,4) && !playerFile.exists()) {
NBTAPI.getNBT(p, "hasSeenMessage", String.valueOf(false)); NBTAPI.getNBT(p, "hasSeenMessage", String.valueOf(false));
} else { } else {
newSettings.hasSeenMessage = playerConfig.getBoolean("hasSeenMessage"); newSettings.hasSeenMessage = playerConfig.getBoolean("hasSeenMessage");
@ -865,7 +873,7 @@ public class ChestSortPlugin extends JavaPlugin {
if (getPerPlayerSettings().containsKey(uniqueId.toString())) { if (getPerPlayerSettings().containsKey(uniqueId.toString())) {
PlayerSetting setting = getPerPlayerSettings().get(p.getUniqueId().toString()); PlayerSetting setting = getPerPlayerSettings().get(p.getUniqueId().toString());
if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_4_R01)) { if (McVersion.isAtLeast(1,14,4)) {
NBTAPI.addNBT(p, "sortingEnabled", String.valueOf(setting.sortingEnabled)); NBTAPI.addNBT(p, "sortingEnabled", String.valueOf(setting.sortingEnabled));
NBTAPI.addNBT(p, "invSortingEnabled", String.valueOf(setting.invSortingEnabled)); NBTAPI.addNBT(p, "invSortingEnabled", String.valueOf(setting.invSortingEnabled));
NBTAPI.addNBT(p, "hasSeenMessage", String.valueOf(setting.hasSeenMessage)); NBTAPI.addNBT(p, "hasSeenMessage", String.valueOf(setting.hasSeenMessage));

3
src/main/java/de/jeff_media/chestsort/data/PlayerSetting.java
View File

@ -40,7 +40,7 @@ public class PlayerSetting {
NONE, RIGHT_CLICK, LEFT_CLICK NONE, RIGHT_CLICK, LEFT_CLICK
} }
public PlayerSetting(boolean sortingEnabled, boolean invSortingEnabled, boolean middleClick, boolean shiftClick, boolean doubleClick, boolean shiftRightClick, boolean leftClick, boolean rightClick, boolean leftCLickOutside, boolean changed) { public PlayerSetting(boolean sortingEnabled, boolean invSortingEnabled, boolean middleClick, boolean shiftClick, boolean doubleClick, boolean shiftRightClick, boolean leftClick, boolean rightClick, boolean leftCLickOutside, boolean changed, boolean hasSeenMessage) {
this.sortingEnabled = sortingEnabled; this.sortingEnabled = sortingEnabled;
this.middleClick = middleClick; this.middleClick = middleClick;
this.shiftClick = shiftClick; this.shiftClick = shiftClick;
@ -51,6 +51,7 @@ public class PlayerSetting {
this.rightClick = rightClick; this.rightClick = rightClick;
this.leftClickOutside = leftCLickOutside; this.leftClickOutside = leftCLickOutside;
this.changed = changed; this.changed = changed;
this.hasSeenMessage = hasSeenMessage;
} }
public DoubleClickType getCurrentDoubleClick(ChestSortPlugin plugin, DoubleClickType click) { public DoubleClickType getCurrentDoubleClick(ChestSortPlugin plugin, DoubleClickType click) {

5
src/main/java/de/jeff_media/chestsort/listeners/Listener.java
View File

@ -9,6 +9,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 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;
@ -62,6 +63,10 @@ public class Listener implements org.bukkit.event.Listener {
if(!plugin.getConfig().getBoolean("allow-left-click-to-sort")) return; if(!plugin.getConfig().getBoolean("allow-left-click-to-sort")) return;
Block clickedBlock = event.getClickedBlock(); Block clickedBlock = event.getClickedBlock();
if(!(clickedBlock.getState() instanceof Container)) return; if(!(clickedBlock.getState() instanceof Container)) return;
if(!ProtectionUtils.canInteract(event.getPlayer(), clickedBlock)) {
//System.out.println("ChestSort: cannot interact!");
return;
}
plugin.registerPlayerIfNeeded(event.getPlayer()); plugin.registerPlayerIfNeeded(event.getPlayer());
PlayerSetting playerSetting = plugin.getPlayerSetting(event.getPlayer()); PlayerSetting playerSetting = plugin.getPlayerSetting(event.getPlayer());
if(!playerSetting.leftClickOutside) return; if(!playerSetting.leftClickOutside) return;