DocRock3r/ToolStats
1
0
Fork 0
mirror of https://github.com/hyperdefined/ToolStats.git synced 2025-12-06 06:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove/add hashes when enabled/disabled

Browse Source
This commit is contained in:
hyperdefined
2025-01-28 21:53:39 -05:00
parent b4be9eb741
commit 8a1759b6b1
3 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/lol/hyper/toolstats/ToolStats.java
View File

@@ -112,7 +112,7 @@ public final class ToolStats extends JavaPlugin {
*/ */
public final NamespacedKey originType = new NamespacedKey(this, "origin"); public final NamespacedKey originType = new NamespacedKey(this, "origin");
public final int CONFIG_VERSION = 9; public final int CONFIG_VERSION = 10;
public final Logger logger = this.getLogger(); public final Logger logger = this.getLogger();
public final File configFile = new File(this.getDataFolder(), "config.yml"); public final File configFile = new File(this.getDataFolder(), "config.yml");
public boolean tokens = false; public boolean tokens = false;

35
src/main/java/lol/hyper/toolstats/events/InventoryOpen.java
View File

@@ -19,8 +19,7 @@ package lol.hyper.toolstats.events;
import lol.hyper.toolstats.ToolStats; import lol.hyper.toolstats.ToolStats;
import lol.hyper.toolstats.tools.UUIDDataType; import lol.hyper.toolstats.tools.UUIDDataType;
import org.bukkit.Bukkit; import org.bukkit.entity.Player;
import org.bukkit.Location;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -47,7 +46,7 @@ public class InventoryOpen implements Listener {
} }
Inventory inventory = event.getInventory(); Inventory inventory = event.getInventory();
Location location = event.getInventory().getLocation(); Player player = (Player) event.getPlayer();
for (ItemStack itemStack : inventory) { for (ItemStack itemStack : inventory) {
if (itemStack == null) { if (itemStack == null) {
continue; continue;
@@ -75,31 +74,35 @@ public class InventoryOpen implements Listener {
} }
} }
// generate a hash if the item doesn't have one (if it's enabled in the config) // generate a hash if the item doesn't have one (and enabled)
// if hashes are disabled and the item has one, remove it.
if (toolStats.config.getBoolean("generate-hash-for-items")) { if (toolStats.config.getBoolean("generate-hash-for-items")) {
if (!container.has(toolStats.hash, PersistentDataType.STRING)) { if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
// make sure the item has an owner UUID owner = null;
if (!container.has(toolStats.itemOwner, new UUIDDataType())) { // get the current owner if there is one.
continue; if (container.has(toolStats.itemOwner, new UUIDDataType())) {
owner = container.get(toolStats.itemOwner, new UUIDDataType());
} }
UUID owner = container.get(toolStats.itemOwner, new UUIDDataType()); // if there is no owner, use the player holding it
if (owner == null) { if (owner == null) {
continue; owner = player.getUniqueId();
} }
Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG); Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
if (timestamp == null) { if (timestamp == null) {
continue; // if there is no time created, use now
timestamp = System.currentTimeMillis();
} }
String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp); String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
container.set(toolStats.hash, PersistentDataType.STRING, hash); container.set(toolStats.hash, PersistentDataType.STRING, hash);
itemStack.setItemMeta(itemMeta);
}
} else {
// if hashes are disabled but the item has one, remove it.
if (container.has(toolStats.hash, PersistentDataType.STRING)) {
container.remove(toolStats.hash);
itemStack.setItemMeta(itemMeta);
} }
} }
ItemMeta clone = itemMeta.clone();
if (location != null) {
Bukkit.getRegionScheduler().runDelayed(toolStats, location, scheduledTask -> itemStack.setItemMeta(clone), 1);
}
} }
} }
} }

39
src/main/java/lol/hyper/toolstats/events/PlayerJoin.java
View File

@@ -72,24 +72,33 @@ public class PlayerJoin implements Listener {
} }
// generate a hash if the item doesn't have one // generate a hash if the item doesn't have one
if (!container.has(toolStats.hash, PersistentDataType.STRING)) { if (toolStats.config.getBoolean("generate-hash-for-items")) {
// make sure the item has an owner if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
if (!container.has(toolStats.itemOwner, new UUIDDataType())) { UUID owner = null;
continue; // get the current owner if there is one.
if (container.has(toolStats.itemOwner, new UUIDDataType())) {
owner = container.get(toolStats.itemOwner, new UUIDDataType());
}
// if there is no owner, use the player holding it
if (owner == null) {
owner = player.getUniqueId();
}
Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
if (timestamp == null) {
// if there is no time created, use now
timestamp = System.currentTimeMillis();
}
String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
container.set(toolStats.hash, PersistentDataType.STRING, hash);
itemStack.setItemMeta(itemMeta);
} }
UUID owner = container.get(toolStats.itemOwner, new UUIDDataType()); } else {
if (owner == null) { // if hashes are disabled but the item has one, remove it.
continue; if (container.has(toolStats.hash, PersistentDataType.STRING)) {
container.remove(toolStats.hash);
itemStack.setItemMeta(itemMeta);
} }
Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
if (timestamp == null) {
continue;
}
String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
container.set(toolStats.hash, PersistentDataType.STRING, hash);
} }
ItemMeta clone = itemMeta.clone();
player.getScheduler().runDelayed(toolStats, scheduledTask -> itemStack.setItemMeta(clone), null, 1);
} }
} }
} }