more work

Update pom.xml
imports
2025-12-06 06:41:44 +00:00 · 2023-08-30 17:02:50 -04:00 · 2023-08-30 16:38:13 -04:00 · 2023-08-30 16:37:36 -04:00 · 2023-08-29 10:41:08 -04:00 · 2023-07-17 19:24:45 -04:00
21 changed files with 964 additions and 549 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@

    <groupId>lol.hyper</groupId>
    <artifactId>toolstats</artifactId>
-    <version>1.5</version>
+    <version>1.7</version>
    <packaging>jar</packaging>

    <name>ToolStats</name>
@@ -37,7 +37,7 @@
        <plugins>
            <plugin>
                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                <executions>
                    <execution>
                        <id>auto-clean</id>
@@ -51,7 +51,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
@@ -60,7 +60,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.0</version>
                <configuration>
                    <relocations>
                        <relocation>
@@ -75,6 +75,10 @@
                            <pattern>lol.hyper.githubreleaseapi</pattern>
                            <shadedPattern>lol.hyper.toolstats.updater</shadedPattern>
                        </relocation>
+                        <relocation>
+                            <pattern>space.arim.morepaperlib</pattern>
+                            <shadedPattern>lol.hyper.toolstats.morepaperlib</shadedPattern>
+                        </relocation>
                    </relocations>
                </configuration>
                <executions>
@@ -103,6 +107,10 @@
            <id>spigotmc-repo</id>
            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
        </repository>
+        <repository>
+            <id>arim-mvn-lgpl3</id>
+            <url>https://mvn-repo.arim.space/lesser-gpl3/</url>
+        </repository>
    </repositories>

    <dependencies>
@@ -115,7 +123,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -127,13 +135,19 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.11.0</version>
+            <version>4.14.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.1.2</version>
+            <version>4.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>space.arim.morepaperlib</groupId>
+            <artifactId>morepaperlib</artifactId>
+            <version>0.4.3</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
--- a/src/main/java/lol/hyper/toolstats/ToolStats.java
+++ b/src/main/java/lol/hyper/toolstats/ToolStats.java
@@ -21,46 +21,76 @@ import lol.hyper.githubreleaseapi.GitHubRelease;
 import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
 import lol.hyper.toolstats.commands.CommandToolStats;
 import lol.hyper.toolstats.events.*;
+import lol.hyper.toolstats.tools.ItemLore;
+import lol.hyper.toolstats.tools.NumberFormat;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.NamespacedKey;
+import org.bukkit.*;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import space.arim.morepaperlib.MorePaperLib;

 import java.io.File;
 import java.io.IOException;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
 import java.util.logging.Logger;

 public final class ToolStats extends JavaPlugin {

-    // stores who created an item
+    /**
+     * Stores who created an item.
+     */
    public final NamespacedKey genericOwner = new NamespacedKey(this, "owner");
-    // stores when an item was created
+    /**
+     * Stores when the item was created.
+     */
    public final NamespacedKey timeCreated = new NamespacedKey(this, "time-created");
-    // stores how many player kills by sword
+    /**
+     * Stores how many player kills.
+     */
    public final NamespacedKey swordPlayerKills = new NamespacedKey(this, "player-kills");
-    // stores how many mob kills by sword
+    /**
+     * Stores how many mob kills.
+     */
    public final NamespacedKey swordMobKills = new NamespacedKey(this, "mob-kills");
-    // stores how blocks mined (used for all tools)
+    /**
+     * Stores how many blocks were mined.
+     */
    public final NamespacedKey genericMined = new NamespacedKey(this, "generic-mined");
-    // stores how many fish were caught
+    /**
+     * Stores how many fish were caught.
+     */
    public final NamespacedKey fishingRodCaught = new NamespacedKey(this, "fish-caught");
-    // stores how many times sheep were sheared
+    /**
+     * Stores how many sheep were sheared.
+     */
    public final NamespacedKey shearsSheared = new NamespacedKey(this, "sheared");
-    // stores how much damage armor has taken
+    /**
+     * Stores how much damage an armor piece has taken.
+     */
    public final NamespacedKey armorDamage = new NamespacedKey(this, "damage-taken");
-    // used for tracking new elytras
+    /**
+     * Stores how much damage an armor piece has taken (as an int).
+     */
+    public final NamespacedKey armorDamageInt = new NamespacedKey(this, "damage-taken-int");
+    /**
+     * Key for tracking new elytras that spawn.
+     */
    public final NamespacedKey newElytra = new NamespacedKey(this, "new");
+    /**
+     * Stores how an item was created.
+     * 0 = crafted.
+     * 1 = dropped.
+     * 2 = looted.
+     * 3 = traded.
+     * 4 = founded (for elytras).
+     * 5 = fished.
+     */
+    public final NamespacedKey originType = new NamespacedKey(this, "origin");

-    public SimpleDateFormat dateFormat;
    public BlocksMined blocksMined;
    public ChunkPopulate chunkPopulate;
    public CraftItem craftItem;
@@ -73,17 +103,24 @@ public final class ToolStats extends JavaPlugin {
    public SheepShear sheepShear;
    public VillagerTrade villagerTrade;
    public CommandToolStats commandToolStats;
+    public ItemLore itemLore;
+    public InventoryOpen inventoryOpen;
+    public PlayerJoin playerJoin;
+    public NumberFormat numberFormat;

    public final Logger logger = this.getLogger();
    public final File configFile = new File(this.getDataFolder(), "config.yml");
    public FileConfiguration config;
-    public final int CONFIG_VERSION = 3;
+    public final int CONFIG_VERSION = 5;

    private BukkitAudiences adventure;
+    public MorePaperLib morePaperLib;
+

    @Override
    public void onEnable() {
        this.adventure = BukkitAudiences.create(this);
+        morePaperLib = new MorePaperLib(this);
        if (!configFile.exists()) {
            this.saveResource("config.yml", true);
            logger.info("Copying default config!");
@@ -101,6 +138,9 @@ public final class ToolStats extends JavaPlugin {
        sheepShear = new SheepShear(this);
        villagerTrade = new VillagerTrade(this);
        commandToolStats = new CommandToolStats(this);
+        itemLore = new ItemLore(this);
+        inventoryOpen = new InventoryOpen(this);
+        playerJoin = new PlayerJoin(this);

        Bukkit.getServer().getPluginManager().registerEvents(blocksMined, this);
        Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
@@ -113,12 +153,14 @@ public final class ToolStats extends JavaPlugin {
        Bukkit.getServer().getPluginManager().registerEvents(playerInteract, this);
        Bukkit.getServer().getPluginManager().registerEvents(sheepShear, this);
        Bukkit.getServer().getPluginManager().registerEvents(villagerTrade, this);
+        Bukkit.getServer().getPluginManager().registerEvents(inventoryOpen, this);
+        Bukkit.getServer().getPluginManager().registerEvents(playerJoin, this);

        this.getCommand("toolstats").setExecutor(commandToolStats);

        new Metrics(this, 14110);

-        Bukkit.getScheduler().runTaskAsynchronously(this, this::checkForUpdates);
+        morePaperLib.scheduling().asyncScheduler().run(this::checkForUpdates);
    }

    public void loadConfig() {
@@ -127,19 +169,7 @@ public final class ToolStats extends JavaPlugin {
            logger.warning("Your config file is outdated! Please regenerate the config.");
        }

-        String dateFormatConfig = config.getString("date-format");
-        if (dateFormatConfig != null) {
-            try {
-                dateFormat = new SimpleDateFormat(dateFormatConfig, Locale.getDefault());
-            } catch (IllegalArgumentException exception) {
-                logger.severe("date-format is NOT a valid format! Using default American English format.");
-                exception.printStackTrace();
-                dateFormat = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
-            }
-        } else {
-            logger.warning("date-format is missing from your config! Using default American English format.");
-            dateFormat = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
-        }
+        numberFormat = new NumberFormat(this);
    }

    public void checkForUpdates() {
@@ -281,4 +311,16 @@ public final class ToolStats extends JavaPlugin {
        }
        return this.adventure;
    }
+
+    public void scheduleEntity(BukkitRunnable runnable, Entity entity, int delay) {
+        morePaperLib.scheduling().entitySpecificScheduler(entity).runDelayed(runnable, null, delay);
+    }
+
+    public void scheduleGlobal(BukkitRunnable runnable, int delay) {
+        morePaperLib.scheduling().globalRegionalScheduler().runDelayed(runnable, delay);
+    }
+
+    public void scheduleRegion(BukkitRunnable runnable, World world, Chunk chunk, int delay) {
+        morePaperLib.scheduling().regionSpecificScheduler(world, chunk.getX(), chunk.getZ()).runDelayed(runnable, delay);
+    }
 }
--- a/src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java
+++ b/src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java
@@ -18,7 +18,7 @@
 package lol.hyper.toolstats.commands;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.NumberFormat;
+import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
@@ -26,6 +26,7 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -72,6 +73,10 @@ public class CommandToolStats implements TabExecutor {
                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
                    return true;
                }
+                if (sender instanceof ConsoleCommandSender) {
+                    audiences.sender(sender).sendMessage(Component.text("You must be a player for this command.").color(NamedTextColor.RED));
+                    return true;
+                }
                if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
                    if (!sender.hasPermission("toolstats.reset.confirm")) {
                        audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
@@ -79,8 +84,8 @@ public class CommandToolStats implements TabExecutor {
                    }
                    Player player = (Player) sender;
                    ItemStack heldItem = player.getInventory().getItemInMainHand();
-                    if (heldItem.getType() == Material.AIR) {
-                        audiences.sender(sender).sendMessage(Component.text("You must hold an item!").color(NamedTextColor.RED));
+                    if (!ItemChecker.isValidItem(heldItem.getType())) {
+                        audiences.sender(sender).sendMessage(Component.text("You must hold a valid item.").color(NamedTextColor.RED));
                        return true;
                    }
                    fixItemLore(heldItem, player);
@@ -124,24 +129,15 @@ public class CommandToolStats implements TabExecutor {
            return;
        }

-        // determine how the item was originally created
-        // this doesn't get saved, so we just rely on the lore
-        // if there isn't a tag, default to crafted
-        String type = "DEFAULT";
-        if (finalMeta.hasLore()) {
-            if (finalMeta.getLore() != null) {
-                for (String line : finalMeta.getLore()) {
-                    if (line.contains(caughtByLore)) {
-                        type = "CAUGHT";
-                    }
-                    if (line.contains(lootedByLore)) {
-                        type = "LOOTED";
-                    }
-                    if (line.contains(tradedByLore)) {
-                        type = "TRADED";
-                    }
-                }
-            }
+        // set how the item was obtained
+        Integer origin = -1;
+        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+            origin = container.get(toolStats.originType, PersistentDataType.INTEGER);
+        }
+
+        // set to -1 if it's invalid
+        if (origin == null) {
+            origin = -1;
        }

        // hard code elytras
@@ -151,7 +147,7 @@ public class CommandToolStats implements TabExecutor {
                if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
                    Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
                    if (time != null) {
-                        lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                        lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
                    }
                }
                finalMeta.setLore(lore);
@@ -166,21 +162,25 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.genericOwner, new UUIDDataType())) {
                container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
                // show how the item was created based on the previous lore
-                switch (type) {
-                    case "DEFAULT": {
+                switch (origin) {
+                    case 0: {
                        lore.add(toolStats.getLoreFromConfig("created.created-by", true).replace("{player}", player.getName()));
                        break;
                    }
-                    case "CAUGHT": {
-                        lore.add(toolStats.getLoreFromConfig("fished.caught-by", true).replace("{player}", player.getName()));
+                    case 2: {
+                        lore.add(toolStats.getLoreFromConfig("looted.looted-by", true).replace("{player}", player.getName()));
                        break;
                    }
-                    case "LOOTED": {
+                    case 3: {
+                        lore.add(toolStats.getLoreFromConfig("traded.traded-by", true).replace("{player}", player.getName()));
+                        break;
+                    }
+                    case 4: {
                        lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
                        break;
                    }
-                    case "TRADED": {
-                        lore.add(toolStats.getLoreFromConfig("traded.traded-by", true).replace("{player}", player.getName()));
+                    case 5: {
+                        lore.add(toolStats.getLoreFromConfig("fished.caught-by", true).replace("{player}", player.getName()));
                        break;
                    }
                }
@@ -191,21 +191,25 @@ public class CommandToolStats implements TabExecutor {
                Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
                if (time != null) {
                    // show how when the item was created based on the previous lore
-                    switch (type) {
-                        case "DEFAULT": {
-                            lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                    switch (origin) {
+                        case 0: {
+                            lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
                            break;
                        }
-                        case "CAUGHT": {
-                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                        case 2: {
+                            lore.add(toolStats.getLoreFromConfig("looted.looted-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
                            break;
                        }
-                        case "LOOTED": {
-                            lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                        case 3: {
+                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
                            break;
                        }
-                        case "TRADED": {
-                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                        case 4: {
+                            lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            break;
+                        }
+                        case 5: {
+                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
                            break;
                        }
                    }
@@ -216,7 +220,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
                Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
                if (kills != null) {
-                    lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", NumberFormat.formatInt(kills)));
+                    lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", toolStats.numberFormat.formatInt(kills)));
                }
            }
        }
@@ -224,7 +228,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
                Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
                if (kills != null) {
-                    lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", NumberFormat.formatInt(kills)));
+                    lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", toolStats.numberFormat.formatInt(kills)));
                }
            }
        }
@@ -232,7 +236,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
                Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
                if (blocksMined != null) {
-                    lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", NumberFormat.formatInt(blocksMined)));
+                    lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", toolStats.numberFormat.formatInt(blocksMined)));
                }
            }
        }
@@ -240,7 +244,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
                Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
                if (fish != null) {
-                    lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", NumberFormat.formatInt(fish)));
+                    lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", toolStats.numberFormat.formatInt(fish)));
                }
            }
        }
@@ -248,7 +252,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
                Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
                if (sheep != null) {
-                    lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", NumberFormat.formatInt(sheep)));
+                    lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", toolStats.numberFormat.formatInt(sheep)));
                }
            }
        }
@@ -256,7 +260,7 @@ public class CommandToolStats implements TabExecutor {
            if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
                Double damage = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
                if (damage != null) {
-                    lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", NumberFormat.formatDouble(damage)));
+                    lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", toolStats.numberFormat.formatDouble(damage)));
                }
            }
        }
--- a/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
+++ b/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
@@ -19,20 +19,18 @@ package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
-import lol.hyper.toolstats.tools.NumberFormat;
 import org.bukkit.GameMode;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.ArrayList;
 import java.util.List;

 public class BlocksMined implements Listener {
@@ -43,7 +41,7 @@ public class BlocksMined implements Listener {
        this.toolStats = toolStats;
    }

-    @EventHandler (priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onBreak(BlockBreakEvent event) {
        if (event.isCancelled()) {
            return;
@@ -53,16 +51,13 @@ public class BlocksMined implements Listener {
            return;
        }
        // if the player mines something with their fist
-        int heldItemSlot = player.getInventory().getHeldItemSlot();
-        ItemStack heldItem = player.getInventory().getItem(heldItemSlot);
-        if (heldItem == null || heldItem.getType() == Material.AIR) {
-            return;
-        }
+        PlayerInventory inventory = player.getInventory();
+        ItemStack heldItem = inventory.getItemInMainHand();
        // only check certain items
        if (!ItemChecker.isMineTool(heldItem.getType())) {
            return;
        }
-        // if it's an item we want, update the stats
+        // update the blocks mined
        updateBlocksMined(heldItem);
    }

@@ -88,40 +83,12 @@ public class BlocksMined implements Listener {
        blocksMined++;
        container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);

-        String configLore = toolStats.getLoreFromConfig("blocks-mined", false);
-        String configLoreRaw = toolStats.getLoreFromConfig("blocks-mined", true);
+        String blocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{blocks}", blocksMinedFormatted, "blocks-mined");

-        if (configLore == null || configLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.blocks-mined!");
-            return;
-        }
-
-        List<String> lore;
-        String newLine = configLoreRaw.replace("{blocks}", NumberFormat.formatInt(blocksMined));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(configLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
        // do we add the lore based on the config?
        if (toolStats.checkConfig(playerTool, "blocks-mined")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        playerTool.setItemMeta(meta);
    }
--- a/src/main/java/lol/hyper/toolstats/events/ChunkPopulate.java
+++ b/src/main/java/lol/hyper/toolstats/events/ChunkPopulate.java
@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -32,11 +31,12 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.scheduler.BukkitRunnable;

 public class ChunkPopulate implements Listener {

    // this tags all elytras with a "new" tag
-    // this let's us track any new elytras player loot
+    // this lets us track any new elytras player loot

    private final ToolStats toolStats;

@@ -51,18 +51,22 @@ public class ChunkPopulate implements Listener {
        }
        // this is delayed because entities are not loaded instantly
        // we just check 1 second later
-        Bukkit.getScheduler().runTaskLater(toolStats, () -> {
-            Chunk chunk = event.getChunk();
-            for (Entity entity : chunk.getEntities()) {
-                // if there is a new item frame
-                if (entity instanceof ItemFrame) {
+        Chunk chunk = event.getChunk();
+        BukkitRunnable runnable = new BukkitRunnable() {
+            @Override
+            public void run() {
+                for (Entity entity : chunk.getEntities()) {
+                    // if there is a new item frame
+                    if (!(entity instanceof ItemFrame)) {
+                        continue;
+                    }
                    ItemFrame itemFrame = (ItemFrame) entity;
                    // if the item frame has an elytra
                    if (itemFrame.getItem().getType() == Material.ELYTRA) {
                        ItemStack elytraCopy = itemFrame.getItem();
                        ItemMeta meta = elytraCopy.getItemMeta();
                        if (meta == null) {
-                            return;
+                            continue;
                        }
                        // add the new tag so we know it's new
                        PersistentDataContainer container = meta.getPersistentDataContainer();
@@ -72,6 +76,7 @@ public class ChunkPopulate implements Listener {
                    }
                }
            }
-        }, 20);
+        };
+        toolStats.scheduleRegion(runnable, chunk.getWorld(), chunk, 20);
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/CraftItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/CraftItem.java
@@ -106,6 +106,7 @@ public class CraftItem implements Listener {

        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 0);

        String createdByRaw = toolStats.getLoreFromConfig("created.created-by", true);
        String createdOnRaw = toolStats.getLoreFromConfig("created.created-on", true);
@@ -128,7 +129,7 @@ public class CraftItem implements Listener {
        }
        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "created-date")) {
-            lore.add(createdOnRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
+            lore.add(createdOnRaw.replace("{date}", toolStats.numberFormat.formatDate(finalDate)));
        }
        if (toolStats.checkConfig(itemStack, "created-by")) {
            lore.add(createdByRaw.replace("{player}", owner.getName()));
--- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
@@ -19,7 +19,6 @@ package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
-import lol.hyper.toolstats.tools.NumberFormat;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
@@ -47,7 +46,7 @@ public class EntityDamage implements Listener {
        this.toolStats = toolStats;
    }

-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onDamage(EntityDamageByEntityEvent event) {
        if (event.isCancelled()) {
            return;
@@ -56,7 +55,7 @@ public class EntityDamage implements Listener {
        if (!(event.getEntity() instanceof LivingEntity)) {
            return;
        }
-        LivingEntity livingEntity = (LivingEntity) event.getEntity();
+        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();

        // ignore void and /kill damage
        EntityDamageEvent.DamageCause cause = event.getCause();
@@ -65,89 +64,103 @@ public class EntityDamage implements Listener {
        }

        // mob is going to die
-        if (livingEntity.getHealth() - event.getFinalDamage() <= 0) {
+        if (mobBeingAttacked.getHealth() - event.getFinalDamage() <= 0) {
            // a player is killing something
            if (event.getDamager() instanceof Player) {
-                Player player = (Player) event.getDamager();
-                if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
-                    return;
-                }
-                // a player killed something with their fist
-                ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
-                if (heldItem == null || heldItem.getType() == Material.AIR) {
+                Player attackingPlayer = (Player) event.getDamager();
+                if (attackingPlayer.getGameMode() == GameMode.CREATIVE || attackingPlayer.getGameMode() == GameMode.SPECTATOR) {
                    return;
                }
+                PlayerInventory attackingPlayerInventory = attackingPlayer.getInventory();
+                ItemStack heldItem = attackingPlayerInventory.getItemInMainHand();
                // only check certain items
                if (!ItemChecker.isMeleeWeapon(heldItem.getType())) {
                    return;
                }
                // a player is killing another player
-                if (livingEntity instanceof Player) {
-                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updatePlayerKills(heldItem));
+                if (mobBeingAttacked instanceof Player) {
+                    updatePlayerKills(heldItem);
                    return;
                }
                // player is killing regular mob
-                player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updateMobKills(heldItem));
-                trackedMobs.add(livingEntity.getUniqueId());
+                updateMobKills(heldItem);
+                trackedMobs.add(mobBeingAttacked.getUniqueId());
            }
            // trident is being thrown at something
            if (event.getDamager() instanceof Trident) {
                Trident trident = (Trident) event.getDamager();
-                ItemStack clone;
+                ItemStack newTrident;
                // trident is killing player
-                if (livingEntity instanceof Player) {
-                    clone = updatePlayerKills(trident.getItem());
+                if (mobBeingAttacked instanceof Player) {
+                    newTrident = tridentPlayerKills(trident.getItem());
                } else {
-                    clone = updateMobKills(trident.getItem());
+                    // trident is killing a mob
+                    newTrident = tridentMobKills(trident.getItem());
+                    trackedMobs.add(mobBeingAttacked.getUniqueId());
                }
-                if (clone == null) {
-                    return;
+                if (newTrident != null) {
+                    trident.setItem(newTrident);
                }
-                trident.setItem(clone);
            }
            // arrow is being shot
            if (event.getDamager() instanceof Arrow) {
                Arrow arrow = (Arrow) event.getDamager();
                // if the shooter is a player
                if (arrow.getShooter() instanceof Player) {
-                    Player player = (Player) arrow.getShooter();
-                    if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                    Player shootingPlayer = (Player) arrow.getShooter();
+                    if (shootingPlayer.getGameMode() == GameMode.CREATIVE || shootingPlayer.getGameMode() == GameMode.SPECTATOR) {
                        return;
                    }
-                    ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
-                    if (heldItem == null) {
+                    PlayerInventory inventory = shootingPlayer.getInventory();
+                    boolean isMainHand = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
+                    boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
+                    ItemStack heldBow = null;
+                    if (isMainHand) {
+                        heldBow = inventory.getItemInMainHand();
+                    }
+                    if (isOffHand) {
+                        heldBow = inventory.getItemInOffHand();
+                    }
+
+                    // if the player is hold a bow in both hands
+                    // default to main hand since that takes priority
+                    if (isMainHand && isOffHand) {
+                        heldBow = inventory.getItemInMainHand();
+                    }
+
+                    // player swapped
+                    if (heldBow == null) {
                        return;
                    }
-                    // if the player is holding the bow/crossbow
-                    // if they switch then oh well
-                    if (heldItem.getType() == Material.BOW || heldItem.getType() == Material.CROSSBOW) {
-                        if (livingEntity instanceof Player) {
-                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updatePlayerKills(heldItem));
-                        } else {
-                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updateMobKills(heldItem));
-                        }
+
+                    // player is shooting another player
+                    if (mobBeingAttacked instanceof Player) {
+                        updatePlayerKills(heldBow);
+                    } else {
+                        updateMobKills(heldBow);
+                        trackedMobs.add(mobBeingAttacked.getUniqueId());
                    }
                }
            }
        }
        // player is taken damage but not being killed
-        if (livingEntity instanceof Player) {
-            Player player = (Player) livingEntity;
-            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (mobBeingAttacked instanceof Player) {
+            Player playerTakingDamage = (Player) mobBeingAttacked;
+            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
-            PlayerInventory inventory = player.getInventory();
-            for (ItemStack armor : inventory.getArmorContents()) {
-                if (armor != null) {
-                    if (ItemChecker.isArmor(armor.getType())) {
-                        updateArmorDamage(armor, event.getFinalDamage());
+            PlayerInventory playerInventory = playerTakingDamage.getInventory();
+            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
+                if (armorPiece != null) {
+                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
            }
        }
    }

-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onDamage(EntityDamageEvent event) {
        if (!(event.getEntity() instanceof LivingEntity)) {
            return;
@@ -159,25 +172,25 @@ public class EntityDamage implements Listener {
            return;
        }

-        LivingEntity livingEntity = (LivingEntity) event.getEntity();
+        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
        // player is taken damage but not being killed
-        if (livingEntity instanceof Player) {
-            Player player = (Player) livingEntity;
-            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (mobBeingAttacked instanceof Player) {
+            Player playerTakingDamage = (Player) mobBeingAttacked;
+            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
-            PlayerInventory inventory = player.getInventory();
-            for (ItemStack armor : inventory.getArmorContents()) {
-                if (armor != null) {
-                    if (ItemChecker.isArmor(armor.getType())) {
-                        updateArmorDamage(armor, event.getFinalDamage());
+            PlayerInventory playerInventory = playerTakingDamage.getInventory();
+            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
+                if (armorPiece != null) {
+                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
            }
        }
    }

-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onDamage(EntityDamageByBlockEvent event) {
        if (!(event.getEntity() instanceof LivingEntity)) {
            return;
@@ -189,18 +202,18 @@ public class EntityDamage implements Listener {
            return;
        }

-        LivingEntity livingEntity = (LivingEntity) event.getEntity();
+        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
        // player is taken damage but not being killed
-        if (livingEntity instanceof Player) {
-            Player player = (Player) livingEntity;
-            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (mobBeingAttacked instanceof Player) {
+            Player playerTakingDamage = (Player) mobBeingAttacked;
+            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
-            PlayerInventory inventory = player.getInventory();
-            for (ItemStack armor : inventory.getArmorContents()) {
-                if (armor != null) {
-                    if (ItemChecker.isArmor(armor.getType())) {
-                        updateArmorDamage(armor, event.getFinalDamage());
+            PlayerInventory playerInventory = playerTakingDamage.getInventory();
+            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
+                if (armorPiece != null) {
+                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
            }
@@ -211,14 +224,12 @@ public class EntityDamage implements Listener {
     * Updates a weapon's player kills.
     *
     * @param itemStack The item to update.
-     * @return A copy of the item.
     */
-    private ItemStack updatePlayerKills(ItemStack itemStack) {
-        ItemStack finalItem = itemStack.clone();
-        ItemMeta meta = finalItem.getItemMeta();
+    private void updatePlayerKills(ItemStack itemStack) {
+        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
-            return null;
+            return;
        }
        Integer playerKills = 0;
        PersistentDataContainer container = meta.getPersistentDataContainer();
@@ -234,57 +245,26 @@ public class EntityDamage implements Listener {
        playerKills++;
        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills);

-        String playerKillsLore = toolStats.getLoreFromConfig("kills.player", false);
-        String playerKillsLoreRaw = toolStats.getLoreFromConfig("kills.player", true);
+        String playerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{kills}", playerKillsFormatted, "kills.player");

-        if (playerKillsLore == null || playerKillsLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.kills.player!");
-            return null;
-        }
-
-        List<String> lore;
-        String newLine = playerKillsLoreRaw.replace("{kills}", NumberFormat.formatInt(playerKills));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(playerKillsLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "player-kills")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
-        finalItem.setItemMeta(meta);
-        return finalItem;
+        itemStack.setItemMeta(meta);
    }

    /**
     * Updates a weapon's mob kills.
     *
     * @param itemStack The item to update.
-     * @return A copy of the item.
     */
-    private ItemStack updateMobKills(ItemStack itemStack) {
-        ItemStack finalItem = itemStack.clone();
-        ItemMeta meta = finalItem.getItemMeta();
+    private void updateMobKills(ItemStack itemStack) {
+        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
-            return null;
+            return;
        }
        Integer mobKills = 0;
        PersistentDataContainer container = meta.getPersistentDataContainer();
@@ -300,43 +280,14 @@ public class EntityDamage implements Listener {
        mobKills++;
        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills);

-        String mobKillsLore = toolStats.getLoreFromConfig("kills.mob", false);
-        String mobKillsLoreRaw = toolStats.getLoreFromConfig("kills.mob", true);
+        String mobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{kills}", mobKillsFormatted, "kills.mob");

-        if (mobKillsLore == null || mobKillsLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.kills.mob!");
-            return null;
-        }
-
-        List<String> lore;
-        String newLine = mobKillsLoreRaw.replace("{kills}", NumberFormat.formatInt(mobKills));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(mobKillsLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "mob-kills")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
-        finalItem.setItemMeta(meta);
-        return finalItem;
+        itemStack.setItemMeta(meta);
    }

    /**
@@ -345,7 +296,7 @@ public class EntityDamage implements Listener {
     * @param itemStack The armor piece.
     * @param damage    How much damage is being added.
     */
-    private void updateArmorDamage(ItemStack itemStack, double damage) {
+    private void updateDamage(ItemStack itemStack, double damage) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
@@ -364,41 +315,88 @@ public class EntityDamage implements Listener {

        damageTaken = damageTaken + damage;
        container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken);
+        container.set(toolStats.armorDamageInt, PersistentDataType.INTEGER, damageTaken.intValue());

-        String damageTakenLore = toolStats.getLoreFromConfig("damage-taken", false);
-        String damageTakenLoreRaw = toolStats.getLoreFromConfig("damage-taken", true);
+        String damageTakenFormatted = toolStats.numberFormat.formatDouble(damageTaken);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{damage}", damageTakenFormatted, "damage-taken");

-        if (damageTakenLore == null || damageTakenLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.damage-taken!");
-            return;
-        }
-
-        List<String> lore;
-        String newLine = damageTakenLoreRaw.replace("{damage}", NumberFormat.formatDouble(damageTaken));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(damageTakenLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
        if (toolStats.config.getBoolean("enabled.armor-damage")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        itemStack.setItemMeta(meta);
    }
+
+    /**
+     * Updates a trident's mob kills.
+     *
+     * @param trident The item to update.
+     */
+    private ItemStack tridentMobKills(ItemStack trident) {
+        ItemStack newTrident = trident.clone();
+        ItemMeta meta = newTrident.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(newTrident + " does NOT have any meta! Unable to update stats.");
+            return null;
+        }
+        Integer mobKills = 0;
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
+            mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
+        }
+
+        if (mobKills == null) {
+            mobKills = 0;
+            toolStats.logger.warning(newTrident + " does not have valid mob-kills set! Resting to zero. This should NEVER happen.");
+        }
+
+        mobKills++;
+        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills);
+
+        String mobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{kills}", mobKillsFormatted, "kills.mob");
+
+        // do we add the lore based on the config?
+        if (toolStats.checkConfig(newTrident, "mob-kills")) {
+            meta.setLore(newLore);
+        }
+        newTrident.setItemMeta(meta);
+        return newTrident;
+    }
+
+    /**
+     * Updates a trident's player kills.
+     *
+     * @param trident The item to update.
+     */
+    private ItemStack tridentPlayerKills(ItemStack trident) {
+        ItemStack newTrident = trident.clone();
+        ItemMeta meta = newTrident.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(newTrident + " does NOT have any meta! Unable to update stats.");
+            return null;
+        }
+        Integer playerKills = 0;
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
+            playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
+        }
+
+        if (playerKills == null) {
+            playerKills = 0;
+            toolStats.logger.warning(newTrident + " does not have valid player-kills set! Resting to zero. This should NEVER happen.");
+        }
+
+        playerKills++;
+        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills);
+
+        String playerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{kills}", playerKillsFormatted, "kills.player");
+
+        // do we add the lore based on the config?
+        if (toolStats.checkConfig(newTrident, "player-kills")) {
+            meta.setLore(newLore);
+        }
+        newTrident.setItemMeta(meta);
+        return newTrident;
+    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/EntityDeath.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDeath.java
@@ -27,6 +27,8 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;

 import java.util.*;

@@ -48,9 +50,17 @@ public class EntityDeath implements Listener {
        // if it's a mob we are tracking that matters
        if (toolStats.mobKill.trackedMobs.contains(livingEntityUUID)) {
            for (int i = 0; i < event.getDrops().size(); i++) {
-                ItemStack current = event.getDrops().get(i);
-                if (ItemChecker.isValidItem(current.getType())) {
-                    ItemStack newItem = addLore(current, livingEntity.getName());
+                ItemStack droppedItem = event.getDrops().get(i);
+                ItemMeta droppedItemMeta = droppedItem.getItemMeta();
+                if (droppedItemMeta != null) {
+                    PersistentDataContainer container = droppedItemMeta.getPersistentDataContainer();
+                    if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                        continue; // ignore any items that have our tags
+                    }
+
+                }
+                if (ItemChecker.isValidItem(droppedItem.getType())) {
+                    ItemStack newItem = addLore(droppedItem, livingEntity.getName());
                    if (newItem != null) {
                        event.getDrops().set(i, newItem);
                    }
@@ -64,7 +74,7 @@ public class EntityDeath implements Listener {
     * Adds "drop by" tag to item.
     *
     * @param oldItem The item to add lore to.
-     * @param mob       The mob or player name.
+     * @param mob     The mob or player name.
     */
    private ItemStack addLore(ItemStack oldItem, String mob) {
        ItemStack newItem = oldItem.clone();
@@ -72,35 +82,14 @@ public class EntityDeath implements Listener {
        if (meta == null) {
            return null;
        }
-        boolean hasTag = false;

-        String droppedByLore = toolStats.getLoreFromConfig("dropped-by", false);
-        String droppedByLoreRaw = toolStats.getLoreFromConfig("dropped-by", true);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 1);

-        if (droppedByLore == null || droppedByLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.dropped-by!");
-            return null;
-        }
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{name}", mob, "dropped-by");

-        List<String> lore;
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(droppedByLore)) {
-                    // replace existing tag
-                    lore.set(x, droppedByLoreRaw.replace("{name}", mob));
-                    hasTag = true;
-                }
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-        }
-        if (!hasTag) {
-            lore.add(droppedByLoreRaw.replace("{name}", mob));
-        }
        if (toolStats.config.getBoolean("enabled.dropped-by")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        newItem.setItemMeta(meta);
        return newItem;
--- a/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
+++ b/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
@@ -20,7 +20,6 @@ package lol.hyper.toolstats.events;
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -37,8 +36,8 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.scheduler.BukkitRunnable;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@@ -78,26 +77,29 @@ public class GenerateLoot implements Listener {
                return;
            }

-            // run task later since if it runs on the same tick it breaks idk
+            // run task later since if it runs on the same tick it breaks
            Block finalOpenedChest = openedChest;
-            Bukkit.getScheduler().runTaskLater(toolStats, () -> {
-                Player player = toolStats.playerInteract.openedChests.get(finalOpenedChest);
-                // do a classic for loop, so we keep track of chest index of item
-                for (int i = 0; i < chestInv.getContents().length; i++) {
-                    ItemStack itemStack = chestInv.getItem(i);
-                    // ignore air
-                    if (itemStack == null || itemStack.getType() == Material.AIR) {
-                        continue;
-                    }
-                    if (ItemChecker.isValidItem(itemStack.getType())) {
-                        ItemStack newItem = addLore(itemStack, player);
-                        if (newItem != null) {
-                            chestInv.setItem(i, newItem);
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    Player player = toolStats.playerInteract.openedChests.get(finalOpenedChest);
+                    // keep track of chest index of item
+                    for (int i = 0; i < chestInv.getContents().length; i++) {
+                        ItemStack itemStack = chestInv.getItem(i);
+                        // ignore air
+                        if (itemStack == null || itemStack.getType() == Material.AIR) {
+                            continue;
+                        }
+                        if (ItemChecker.isValidItem(itemStack.getType())) {
+                            ItemStack newItem = addLore(itemStack, player);
+                            if (newItem != null) {
+                                chestInv.setItem(i, newItem);
+                            }
                        }
                    }
                }
-
-            }, 1);
+            };
+            toolStats.scheduleRegion(runnable, lootLocation.getWorld(), lootLocation.getChunk(), 1);
        }
        if (inventoryHolder instanceof StorageMinecart) {
            StorageMinecart mineCart = (StorageMinecart) inventoryHolder;
@@ -144,26 +146,14 @@ public class GenerateLoot implements Listener {

        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 2);

-        String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
-        String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);

-        if (foundByLoreRaw == null || foundOnLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.looted!");
-            return null;
-        }
-
-        List<String> lore;
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-        } else {
-            lore = new ArrayList<>();
-        }
        if (toolStats.checkConfig(newItem, "looted-tag")) {
-            lore.add(foundOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
-            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
+            meta.setLore(newLore);
        }
-        meta.setLore(lore);
        newItem.setItemMeta(meta);
        return newItem;
    }
--- a/src/main/java/lol/hyper/toolstats/events/InventoryOpen.java
+++ b/src/main/java/lol/hyper/toolstats/events/InventoryOpen.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.ItemChecker;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.List;
+
+public class InventoryOpen implements Listener {
+
+    private final ToolStats toolStats;
+
+    public InventoryOpen(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onOpen(InventoryOpenEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Inventory inventory = event.getInventory();
+        for (ItemStack itemStack : inventory) {
+            if (itemStack == null) {
+                continue;
+            }
+            ItemMeta itemMeta = itemStack.getItemMeta();
+            if (itemMeta == null) {
+                continue;
+            }
+            PersistentDataContainer container = itemMeta.getPersistentDataContainer();
+            // ignore any items that already have the origin tag
+            if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+                continue;
+            }
+            // ignore items that are not the right type
+            if (!ItemChecker.isValidItem(itemStack.getType())) {
+                continue;
+            }
+
+            ItemMeta newMeta = toolStats.itemLore.getOrigin(itemMeta, itemStack.getType() == Material.ELYTRA);
+            if (newMeta == null) {
+                continue;
+            }
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    itemStack.setItemMeta(newMeta);
+                }
+            };
+            Location location = inventory.getLocation();
+            // only run for actual inventories
+            if (location != null) {
+                toolStats.scheduleRegion(runnable, location.getWorld(), location.getChunk(), 1);
+            }
+        }
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/PickupItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/PickupItem.java
@@ -31,7 +31,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@@ -92,27 +91,15 @@ public class PickupItem implements Listener {
        PersistentDataContainer container = meta.getPersistentDataContainer();
        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 4);
        container.remove(toolStats.newElytra);

-        String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
-        String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);

-        if (foundByLoreRaw == null || foundOnLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.looted!");
-            return null;
-        }
-
-        List<String> lore;
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-        } else {
-            lore = new ArrayList<>();
-        }
        if (toolStats.config.getBoolean("enabled.elytra-tag")) {
-            lore.add(foundOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
-            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
+            meta.setLore(newLore);
        }
-        meta.setLore(lore);
        finalItem.setItemMeta(meta);
        return finalItem;
    }
--- a/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
@@ -19,7 +19,6 @@ package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
-import lol.hyper.toolstats.tools.NumberFormat;
 import lol.hyper.toolstats.tools.UUIDDataType;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -30,11 +29,11 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@@ -46,7 +45,7 @@ public class PlayerFish implements Listener {
        this.toolStats = toolStats;
    }

-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onFish(PlayerFishEvent event) {
        if (event.isCancelled()) {
            return;
@@ -61,12 +60,32 @@ public class PlayerFish implements Listener {
            return;
        }
        // make sure the player is holding a fishing rod
-        ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
-        if (heldItem == null || heldItem.getType() == Material.AIR || heldItem.getType() != Material.FISHING_ROD) {
+        // player can fish with their offhand
+        PlayerInventory inventory = player.getInventory();
+        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
+        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
+        ItemStack fishingRod = null;
+        if (isMainHand) {
+            fishingRod = inventory.getItemInMainHand();
+        }
+        if (isOffHand) {
+            fishingRod = inventory.getItemInOffHand();
+        }
+
+        // if the player is hold fishing rods in both hands
+        // default to main hand since that takes priority
+        if (isMainHand && isOffHand) {
+            fishingRod = inventory.getItemInMainHand();
+        }
+
+        // player swapped items?
+        if (fishingRod == null) {
            return;
        }
-        // update the fishing rod to the new one
-        updateFishCount(heldItem);
+
+        // update the fishing rod!
+        updateFishCount(fishingRod);
+
        // check if the player caught an item
        if (event.getCaught() == null) {
            return;
@@ -83,6 +102,7 @@ public class PlayerFish implements Listener {

    /**
     * Update a fishing rod's fish count.
+     *
     * @param fishingRod The fishing rod to update.
     */
    private void updateFishCount(ItemStack fishingRod) {
@@ -105,60 +125,20 @@ public class PlayerFish implements Listener {
        fishCaught++;
        container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught);

-        String fishCaughtLore = toolStats.getLoreFromConfig("fished.fish-caught", false);
-        String fishCaughtLoreRaw = toolStats.getLoreFromConfig("fished.fish-caught", true);
-
-        if (fishCaughtLore == null || fishCaughtLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.fish-caught!");
-            return;
-        }
-
-        List<String> lore;
-        String newLine = fishCaughtLoreRaw.replace("{fish}", NumberFormat.formatInt(fishCaught));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(fishCaughtLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
-
-        /*
-        if (Bukkit.getPluginManager().isPluginEnabled("EvenMoreFish")) {
-            ListIterator<String> iterator = lore.listIterator();
-            while (iterator.hasNext()) {
-                String line = iterator.next();
-                toolStats.logger.info(line);
-                if (line.equalsIgnoreCase("§f")) {
-                    iterator.remove();
-                }
-            }
-        }*/
+        String fishCaughtFormatted = toolStats.numberFormat.formatInt(fishCaught);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{fish}", fishCaughtFormatted, "fished.fish-caught");

        if (toolStats.config.getBoolean("enabled.fish-caught")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        fishingRod.setItemMeta(meta);
    }

    /**
     * Add lore to newly caught item.
+     *
     * @param originalItem The original item to add lore.
-     * @param owner The player who caught it.
+     * @param owner        The player who caught it.
     * @return A copy of the new item with lore.
     */
    private ItemStack addNewLore(ItemStack originalItem, Player owner) {
@@ -177,26 +157,13 @@ public class PlayerFish implements Listener {

        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 5);

-        String caughtByLoreRaw = toolStats.getLoreFromConfig("fished.caught-by", true);
-        String caughtOnLoreRaw = toolStats.getLoreFromConfig("fished.caught-on", true);
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);

-        if (caughtByLoreRaw == null || caughtOnLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.fished!");
-            return null;
-        }
-
-        List<String> lore;
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            assert lore != null;
-        } else {
-            lore = new ArrayList<>();
-        }
        if (toolStats.checkConfig(newItem, "fished-tag")) {
-            lore.add(caughtOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
-            lore.add(caughtByLoreRaw.replace("{player}", owner.getName()));
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        newItem.setItemMeta(meta);
        return newItem;
--- a/src/main/java/lol/hyper/toolstats/events/PlayerInteract.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerInteract.java
@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -31,6 +30,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.scheduler.BukkitRunnable;

 import java.util.HashMap;

@@ -63,7 +63,13 @@ public class PlayerInteract implements Listener {
        // store when a player opens a chest
        if (block.getType() != Material.AIR && block.getType() == Material.CHEST) {
            openedChests.put(block, player);
-            Bukkit.getScheduler().runTaskLater(toolStats, () -> openedChests.remove(block), 20);
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    openedChests.remove(block);
+                }
+            };
+            toolStats.scheduleGlobal(runnable, 20);
        }
    }

@@ -78,7 +84,13 @@ public class PlayerInteract implements Listener {
        if (clicked.getType() == EntityType.MINECART_CHEST) {
            StorageMinecart storageMinecart = (StorageMinecart) clicked;
            openedMineCarts.put(storageMinecart, player);
-            Bukkit.getScheduler().runTaskLater(toolStats, () -> openedMineCarts.remove(storageMinecart), 20);
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    openedMineCarts.remove(storageMinecart);
+                }
+            };
+            toolStats.scheduleGlobal(runnable, 20);
        }
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/PlayerJoin.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerJoin.java
@@ -0,0 +1,83 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.ItemChecker;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class PlayerJoin implements Listener {
+
+    private final ToolStats toolStats;
+
+    public PlayerJoin(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        Inventory inventory = player.getInventory();
+        for (ItemStack itemStack : inventory) {
+            if (itemStack == null) {
+                continue;
+            }
+            ItemMeta itemMeta = itemStack.getItemMeta();
+            if (itemMeta == null) {
+                continue;
+            }
+            PersistentDataContainer container = itemMeta.getPersistentDataContainer();
+            // ignore any items that already have the origin tag
+            if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+                continue;
+            }
+            // ignore items that are not the right type
+            if (!ItemChecker.isValidItem(itemStack.getType())) {
+                continue;
+            }
+
+            ItemMeta newMeta = toolStats.itemLore.getOrigin(itemMeta, itemStack.getType() == Material.ELYTRA);
+            if (newMeta == null) {
+                continue;
+            }
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    itemStack.setItemMeta(newMeta);
+                }
+            };
+            Location location = inventory.getLocation();
+            // only run for actual inventories
+            if (location != null) {
+                toolStats.scheduleRegion(runnable, location.getWorld(), location.getChunk(), 1);
+            }
+        }
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/SheepShear.java
+++ b/src/main/java/lol/hyper/toolstats/events/SheepShear.java
@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.NumberFormat;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
@@ -29,11 +28,11 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.ArrayList;
 import java.util.List;

 public class SheepShear implements Listener {
@@ -44,7 +43,7 @@ public class SheepShear implements Listener {
        this.toolStats = toolStats;
    }

-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.MONITOR)
    public void onShear(PlayerInteractEntityEvent event) {
        if (event.isCancelled()) {
            return;
@@ -57,34 +56,52 @@ public class SheepShear implements Listener {
        if (!(entity instanceof Sheep)) {
            return;
        }
-        // check if the player is right-clicking with shears only
-        int heldItemSlot = player.getInventory().getHeldItemSlot();
-        ItemStack heldItem = player.getInventory().getItem(heldItemSlot);
-        if (heldItem == null || heldItem.getType() == Material.AIR || heldItem.getType() != Material.SHEARS) {
+
+        // make sure the player is holding shears
+        // player can shear with their offhand
+        PlayerInventory inventory = player.getInventory();
+        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.SHEARS;
+        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
+        ItemStack shears = null;
+        if (isMainHand) {
+            shears = inventory.getItemInMainHand();
+        }
+        if (isOffHand) {
+            shears = inventory.getItemInOffHand();
+        }
+
+        // if the player is hold fishing rods in both hands
+        // default to main hand since that takes priority
+        if (isMainHand && isOffHand) {
+            shears = inventory.getItemInMainHand();
+        }
+
+        // player swapped items?
+        if (shears == null) {
            return;
        }

        Sheep sheep = (Sheep) entity;
        // make sure the sheep is not sheared
-        if (!sheep.isSheared()) {
-            ItemStack newShears = addLore(heldItem);
-            if (newShears != null) {
-                player.getInventory().setItem(heldItemSlot, newShears);
-            }
+        if (sheep.isSheared()) {
+            return;
        }
+
+        // update the stats
+        ItemStack finalShears = shears;
+        addLore(finalShears);
    }

    /**
     * Adds tags to shears.
     *
-     * @param oldShears The shears.
+     * @param newShears The shears.
     */
-    private ItemStack addLore(ItemStack oldShears) {
-        ItemStack newShears = oldShears.clone();
+    private void addLore(ItemStack newShears) {
        ItemMeta meta = newShears.getItemMeta();
        if (meta == null) {
            toolStats.logger.warning(newShears + " does NOT have any meta! Unable to update stats.");
-            return null;
+            return;
        }
        Integer sheepSheared = 0;
        PersistentDataContainer container = meta.getPersistentDataContainer();
@@ -100,41 +117,12 @@ public class SheepShear implements Listener {
        sheepSheared++;
        container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared);

-        String sheepShearedLore = toolStats.getLoreFromConfig("sheep-sheared", false);
-        String sheepShearedLoreRaw = toolStats.getLoreFromConfig("sheep-sheared", true);
+        String sheepShearedFormatted = toolStats.numberFormat.formatInt(sheepSheared);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{sheep}", sheepShearedFormatted, "sheep-sheared");

-        if (sheepShearedLore == null || sheepShearedLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.sheep-sheared!");
-            return null;
-        }
-
-        List<String> lore;
-        String newLine = sheepShearedLoreRaw.replace("{sheep}", NumberFormat.formatInt(sheepSheared));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(sheepShearedLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
        if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        newShears.setItemMeta(meta);
-        return newShears;
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
+++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
@@ -20,7 +20,6 @@ package lol.hyper.toolstats.events;
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -36,7 +35,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@@ -67,20 +65,21 @@ public class VillagerTrade implements Listener {
            if (event.getSlotType() == InventoryType.SlotType.RESULT) {
                ItemStack item = event.getCurrentItem();
                // only check items we want
-                if (ItemChecker.isValidItem(item.getType())) {
-                    // if the player shift clicks, show the warning
-                    if (event.isShiftClick()) {
-                        String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
-                        if (configMessage != null) {
-                            event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                        }
-                    }
-                    ItemStack newItem = addLore(item, player);
-                    if (newItem != null) {
-                        // this gets delayed since villager inventories suck for no reason
-                        Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5);
+                if (!ItemChecker.isValidItem(item.getType())) {
+                    return;
+                }
+                // if the player shift clicks, show the warning
+                if (event.isShiftClick()) {
+                    String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
+                    if (configMessage != null) {
+                        player.sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
                    }
                }
+                ItemStack newItem = addLore(item, player);
+                if (newItem != null) {
+                    // set the new item
+                    inventory.setItem(event.getSlot(), newItem);
+                }
            }
        }
    }
@@ -109,25 +108,13 @@ public class VillagerTrade implements Listener {

        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 3);

-        String tradedByLoreRaw = toolStats.getLoreFromConfig("traded.traded-by", true);
-        String tradedOnLoreRaw = toolStats.getLoreFromConfig("traded.traded-on", true);
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);

-        if (tradedByLoreRaw == null || tradedOnLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.traded!");
-            return null;
-        }
-
-        List<String> lore;
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-        } else {
-            lore = new ArrayList<>();
-        }
        if (toolStats.checkConfig(newItem, "traded-tag")) {
-            lore.add(tradedOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
-            lore.add(tradedByLoreRaw.replace("{player}", owner.getName()));
-            meta.setLore(lore);
+            meta.setLore(newLore);
        }
        newItem.setItemMeta(meta);
        return newItem;
--- a/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
+++ b/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
@@ -24,7 +24,7 @@ import java.util.Locale;

 public class ItemChecker {

-    private static final String[] validItems = { "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing" };
+    private static final String[] validItems = { "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing", "elytra" };
    private static final String[] validArmor = { "helmet", "chestplate", "leggings", "boots" };
    private static final String[] validMelee = {"sword", "trident", "axe"};
    private static final String[] validMine = { "pickaxe", "axe", "hoe", "shovel", "shear" };
--- a/src/main/java/lol/hyper/toolstats/tools/ItemLore.java
+++ b/src/main/java/lol/hyper/toolstats/tools/ItemLore.java
@@ -0,0 +1,200 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ItemLore {
+
+    private final ToolStats toolStats;
+
+    public ItemLore(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Adds new lore to an item.
+     *
+     * @param placeholder      The placeholder from the config. ex: {kills}
+     * @param placeholderValue The value to replace the placeholder.
+     * @param configLorePath   The path to the config message.
+     * @return The item's new lore.
+     */
+    public List<String> addItemLore(ItemMeta itemMeta, String placeholder, String placeholderValue, String configLorePath) {
+        String configLore = toolStats.getLoreFromConfig(configLorePath, false);
+        String configLoreRaw = toolStats.getLoreFromConfig(configLorePath, true);
+
+        if (configLore == null || configLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages." + configLorePath + "!");
+            toolStats.logger.warning("Unable to update lore for item.");
+            return itemMeta.getLore();
+        }
+
+        List<String> newLore;
+        // replace the placeholder with the value
+        // ex: {kills} -> a number
+        String newLine = configLoreRaw.replace(placeholder, placeholderValue);
+
+        if (itemMeta.hasLore()) {
+            newLore = itemMeta.getLore();
+            // keep track of line index
+            // this doesn't mess the lore of existing items
+            for (int x = 0; x < newLore.size(); x++) {
+                // check to see if the line matches the config value
+                // this means we update this line only!
+                if (newLore.get(x).contains(configLore)) {
+                    newLore.set(x, newLine);
+                    return newLore;
+                }
+            }
+            // if the item has lore, but we didn't find the line
+            newLore.add(newLine);
+        } else {
+            // if the item has no lore, create a new list and add the line
+            newLore = new ArrayList<>();
+            newLore.add(newLine);
+        }
+        return newLore;
+    }
+
+    /**
+     * Adds new ownership tag to an item.
+     *
+     * @param itemMeta      The item meta.
+     * @param playerName    The new owner of item.
+     * @param formattedDate The date of the ownership.
+     * @return The item's new lore.
+     */
+    public List<String> addNewOwner(ItemMeta itemMeta, String playerName, String formattedDate) {
+        String dateCreated = null;
+        String itemOwner = null;
+        Integer origin = null;
+        PersistentDataContainer container = itemMeta.getPersistentDataContainer();
+        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+            origin = container.get(toolStats.originType, PersistentDataType.INTEGER);
+        }
+
+        if (origin == null) {
+            origin = -1;
+        }
+
+        switch (origin) {
+            case 2: {
+                dateCreated = toolStats.getLoreFromConfig("looted.looted-on", true);
+                itemOwner = toolStats.getLoreFromConfig("looted.looted-by", true);
+                break;
+            }
+            case 3: {
+                dateCreated = toolStats.getLoreFromConfig("traded.traded-on", true);
+                itemOwner = toolStats.getLoreFromConfig("traded.traded-by", true);
+                break;
+            }
+            case 4: {
+                dateCreated = toolStats.getLoreFromConfig("looted.found-on", true);
+                itemOwner = toolStats.getLoreFromConfig("looted.found-by", true);
+                break;
+            }
+            case 5: {
+                dateCreated = toolStats.getLoreFromConfig("fished.caught-on", true);
+                itemOwner = toolStats.getLoreFromConfig("fished.caught-by", true);
+                break;
+            }
+        }
+
+        if (dateCreated == null || itemOwner == null) {
+            toolStats.logger.info("Unable to determine origin of item for " + itemMeta);
+            return itemMeta.getLore();
+        }
+
+        List<String> newLore;
+        if (itemMeta.hasLore()) {
+            newLore = itemMeta.getLore();
+        } else {
+            newLore = new ArrayList<>();
+        }
+
+        newLore.add(dateCreated.replace("{date}", formattedDate));
+        newLore.add(itemOwner.replace("{player}", playerName));
+        return newLore;
+    }
+
+    /**
+     * Determine an item's origin based on lore.
+     *
+     * @param itemMeta The item's meta.
+     * @param elytra   If they item is an elytra.
+     * @return The new item meta with the new origin tag. Returns null if origin cannot be determined.
+     */
+    public ItemMeta getOrigin(ItemMeta itemMeta, boolean elytra) {
+        List<String> lore;
+        if (!itemMeta.hasLore()) {
+            return null;
+        }
+        lore = itemMeta.getLore();
+        Integer origin = null;
+
+        for (String line : lore) {
+            // this is the worst code I have ever written
+            String createdBy = toolStats.getLoreFromConfig("created.created-by", false);
+            String createdOn = toolStats.getLoreFromConfig("created.created-on", false);
+            String caughtBy = toolStats.getLoreFromConfig("fished.caught-by", false);
+            String lootedBy = toolStats.getLoreFromConfig("looted.looted-by", false);
+            String foundBy = toolStats.getLoreFromConfig("looted.found-by", false);
+            String tradedBy = toolStats.getLoreFromConfig("traded.traded-by", false);
+
+            if (createdBy != null && line.contains(createdBy)) {
+                origin = 0;
+            }
+            if (createdOn != null && line.contains(createdOn)) {
+                origin = 0;
+            }
+            if (caughtBy != null && line.contains(caughtBy)) {
+                origin = 5;
+            }
+            if (lootedBy != null && line.contains(lootedBy)) {
+                origin = 2;
+            }
+            // because the config changed, "found-by" was being used for ALL looted items
+            // this includes elytras, so we have to check for this mistake
+            if (foundBy != null && line.contains(foundBy)) {
+                if (elytra) {
+                    origin = 4;
+                } else {
+                    origin = 5;
+                }
+            }
+            if (tradedBy != null && line.contains(tradedBy)) {
+                origin = 3;
+            }
+        }
+
+        if (origin == null) {
+            return null;
+        }
+
+        PersistentDataContainer container = itemMeta.getPersistentDataContainer();
+        container.set(toolStats.originType, PersistentDataType.INTEGER, origin);
+        return itemMeta;
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/NumberFormat.java
+++ b/src/main/java/lol/hyper/toolstats/tools/NumberFormat.java
@@ -17,40 +17,123 @@

 package lol.hyper.toolstats.tools;

+import lol.hyper.toolstats.ToolStats;
+
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;

 public class NumberFormat {

-    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#,###.00", new DecimalFormatSymbols(Locale.getDefault()));
-    private static final DecimalFormat COMMA_FORMAT = new DecimalFormat("#,###", new DecimalFormatSymbols(Locale.getDefault()));
+    private DecimalFormat DECIMAL_FORMAT;
+    private DecimalFormat COMMA_FORMAT;
+    private SimpleDateFormat DATE_FORMAT;
+
+    /**
+     * Utility class to format different numbers
+     * @param toolStats Plugin instance.
+     */
+    public NumberFormat(ToolStats toolStats) {
+
+        String dateFormat = toolStats.config.getString("date-format");
+        String decimalSeparator = toolStats.config.getString("number-formats.decimal-separator");
+        String commaSeparator = toolStats.config.getString("number-formats.comma-separator");
+        String commaFormat = toolStats.config.getString("number-formats.comma-format");
+        String decimalFormat = toolStats.config.getString("number-formats.decimal-format");
+
+        // if these config values are missing, use the default ones
+        if (dateFormat == null) {
+            dateFormat = "M/dd/yyyy";
+            toolStats.logger.warning("date-format is missing! Using default American English format.");
+        }
+
+        if (decimalSeparator == null) {
+            decimalSeparator = ".";
+            toolStats.logger.warning("number-formats.decimal-separator is missing! Using default \".\" instead.");
+        }
+
+        if (commaSeparator == null) {
+            commaSeparator = ",";
+            toolStats.logger.warning("number-formats.comma-separator is missing! Using default \",\" instead.");
+        }
+
+        if (commaFormat == null) {
+            commaFormat = "#,###";
+            toolStats.logger.warning("number-formats.comma-format is missing! Using default #,### instead.");
+        }
+
+        if (decimalFormat == null) {
+            decimalFormat = "#,###.00";
+            toolStats.logger.warning("number-formats.comma-separator is missing! Using default #,###.00 instead.");
+        }
+
+        // test the date format
+        try {
+            DATE_FORMAT = new SimpleDateFormat(dateFormat, Locale.getDefault());
+        } catch (NullPointerException | IllegalArgumentException exception) {
+            toolStats.logger.warning("date-format is NOT a valid format! Using default American English format.");
+            exception.printStackTrace();
+            DATE_FORMAT = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
+        }
+
+        // set the separators
+        DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols(Locale.getDefault());
+        formatSymbols.setDecimalSeparator(decimalSeparator.charAt(0));
+        formatSymbols.setGroupingSeparator(commaSeparator.charAt(0));
+
+
+        // test the comma format
+        try {
+            COMMA_FORMAT = new DecimalFormat(commaFormat, formatSymbols);
+        } catch (NullPointerException | IllegalArgumentException exception) {
+            toolStats.logger.warning("number-formats.comma-format is NOT a valid format! Using default #,### instead.");
+            exception.printStackTrace();
+            COMMA_FORMAT = new DecimalFormat("#,###", formatSymbols);
+        }
+
+        // test the decimal format
+        try {
+            DECIMAL_FORMAT = new DecimalFormat(decimalFormat, formatSymbols);
+        } catch (NullPointerException | IllegalArgumentException exception) {
+            toolStats.logger.warning("number-formats.decimal-format is NOT a valid format! Using default #,###.00 instead.");
+            exception.printStackTrace();
+            DECIMAL_FORMAT = new DecimalFormat("#,###.00", formatSymbols);
+        }
+    }

    /**
     * Formats a number to make it pretty. Example: 4322 to 4,322
+     *
     * @param number The number to format.
     * @return The formatted number.
     */
-    public static String formatInt(int number) {
+    public String formatInt(int number) {
        String finalNumber = COMMA_FORMAT.format(number);
-        // hardcode French system because Minecraft bad
-        if (Locale.getDefault() == Locale.FRANCE || Locale.getDefault() == Locale.FRENCH) {
-            finalNumber = finalNumber.replaceAll("[\\x{202f}\\x{00A0}]", " ");
-        }
+        finalNumber = finalNumber.replaceAll("[\\x{202f}\\x{00A0}]", " ");
        return finalNumber;
    }

    /**
     * Formats a number to make it pretty. Example: 4322.33 to 4,322.33
+     *
     * @param number The number to format.
     * @return The formatted number.
     */
-    public static String formatDouble(double number) {
+    public String formatDouble(double number) {
        String finalNumber = DECIMAL_FORMAT.format(number);
-        // hardcode French system because Minecraft bad
-        if (Locale.getDefault() == Locale.FRANCE || Locale.getDefault() == Locale.FRENCH) {
-            finalNumber = finalNumber.replaceAll("[\\x{202f}\\x{00A0}]", " ");
-        }
+        finalNumber = finalNumber.replaceAll("[\\x{202f}\\x{00A0}]", " ");
        return finalNumber;
    }
+
+    /**
+     * Formats a date into the readable format.
+     *
+     * @param date The date to format.
+     * @return The date into a readable format.
+     */
+    public String formatDate(Date date) {
+        return DATE_FORMAT.format(date);
+    }
 }
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -80,6 +80,8 @@ messages:
    caught-on: "&7Caught on: &8{date}"
    fish-caught: "&7Fish caught: &8{fish}"
  looted:
+    looted-by: "&7Looted by: &8{player}"
+    looted-on: "&7Looted on: &8{date}"
    found-by: "&7Found by: &8{player}"
    found-on: "&7Found on: &8{date}"
  traded:
@@ -100,7 +102,15 @@ messages:

 # Change the default formatting for dates.
 # See: https://www.digitalocean.com/community/tutorials/java-simpledateformat-java-date-format
-# Example: "dd/mm/yyyy"
+# Example: "dd/MM/yyyy"
 date-format: "M/dd/yyyy"

-config-version: 3
+# Change number formatting.
+# You probably do not need to touch this.
+number-formats:
+  comma-separator: ","
+  decimal-separator: "."
+  comma-format: "#,###"
+  decimal-format: "#,###.00"
+
+config-version: 5
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,6 +4,7 @@ main: lol.hyper.toolstats.ToolStats
 api-version: 1.15
 author: hyperdefined
 description: Track various tool stats!
+folia-supported: true
 commands:
  toolstats:
    usage: /toolstats
Author	SHA1	Message	Date
hyperdefined	a55cea4b5d	more work	2023-08-30 17:02:50 -04:00
hyperdefined	d0fcd4fc61	Update pom.xml	2023-08-30 16:38:13 -04:00
hyperdefined	f14b9bc474	imports	2023-08-30 16:37:36 -04:00
hyperdefined	366a54052a	basic folia support	2023-08-29 10:41:08 -04:00
hyperdefined	fe96235ed1	removed unused function	2023-07-17 19:24:45 -04:00
hyperdefined	fe8052f9d6	add origin tag to existing items	2023-07-17 19:23:04 -04:00
hyperdefined	884bdef444	add missing elytra to item list	2023-07-17 19:22:32 -04:00
hyperdefined	be31202f65	config changes	2023-07-17 15:29:33 -04:00
hyperdefined	39d8a42110	clean this up a bit	2023-07-17 15:29:26 -04:00
hyperdefined	91090dd6cc	fix this	2023-07-17 15:28:56 -04:00
hyperdefined	29a2a5150c	update various things for origin NBT	2023-07-13 19:16:02 -04:00
hyperdefined	b38d2825cb	added NBT for origins of items	2023-07-13 19:04:29 -04:00
hyperdefined	fd6c120a58	Merge pull request #36 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-clean-plugin-3.3.1 Bump maven-clean-plugin from 3.2.0 to 3.3.1	2023-06-20 18:50:48 -04:00
dependabot[bot]	459569a1dc	Bump maven-clean-plugin from 3.2.0 to 3.3.1 Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.2.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.2.0...maven-clean-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-20 11:59:37 +00:00
hyperdefined	9ba6200415	Merge pull request #35 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.5.0 Bump maven-shade-plugin from 3.4.1 to 3.5.0	2023-06-19 13:24:21 -04:00
dependabot[bot]	b94e0e8c36	Bump maven-shade-plugin from 3.4.1 to 3.5.0 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.1...maven-shade-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-16 11:59:30 +00:00
hyperdefined	a42c526198	Merge pull request #34 from hyperdefined/dependabot/maven/net.kyori-adventure-text-minimessage-4.14.0 Bump adventure-text-minimessage from 4.13.1 to 4.14.0	2023-06-07 12:35:33 -04:00
dependabot[bot]	851a494935	Bump adventure-text-minimessage from 4.13.1 to 4.14.0 Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.13.1 to 4.14.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.13.1...v4.14.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-07 11:59:12 +00:00
hyperdefined	72e869d5e2	Update pom.xml	2023-05-22 20:22:02 -04:00
hyperdefined	300fe56c5a	use continue here, not return closes #33	2023-05-22 20:21:16 -04:00
hyperdefined	fe5e55d746	Update pom.xml	2023-05-22 00:05:00 -04:00
hyperdefined	0574fb61a6	fix `traded-by` tags :3333	2023-05-22 00:03:42 -04:00
hyperdefined	433ab547cb	minor adjustments	2023-05-21 23:49:07 -04:00
hyperdefined	9746789f2b	added int damage value	2023-04-21 15:31:54 -04:00
hyperdefined	fd3c3ca8ed	Merge pull request #31 from hyperdefined/dependabot/maven/org.bstats-bstats-bukkit-3.0.2 Bump bstats-bukkit from 3.0.1 to 3.0.2	2023-04-10 16:38:20 -04:00
hyperdefined	c6dc2c3368	Merge pull request #32 from hyperdefined/dependabot/maven/net.kyori-adventure-text-minimessage-4.13.1 Bump adventure-text-minimessage from 4.13.0 to 4.13.1	2023-04-10 16:36:01 -04:00
dependabot[bot]	d11211b1c7	Bump adventure-text-minimessage from 4.13.0 to 4.13.1 Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.13.0 to 4.13.1. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.13.0...v4.13.1) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-10 12:02:00 +00:00
dependabot[bot]	e8c2296bd7	Bump bstats-bukkit from 3.0.1 to 3.0.2 Bumps [bstats-bukkit](https://github.com/Bastian/bStats-Metrics) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: org.bstats:bstats-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-29 12:00:34 +00:00
hyperdefined	d8f296a085	Merge pull request #29 from hyperdefined/dependabot/maven/net.kyori-adventure-text-minimessage-4.13.0 Bump adventure-text-minimessage from 4.12.0 to 4.13.0	2023-03-16 10:42:18 -04:00
hyperdefined	58dee809f3	Merge pull request #30 from hyperdefined/dependabot/maven/net.kyori-adventure-platform-bukkit-4.3.0 Bump adventure-platform-bukkit from 4.2.0 to 4.3.0	2023-03-16 10:40:21 -04:00
dependabot[bot]	590cf6e8b0	Bump adventure-platform-bukkit from 4.2.0 to 4.3.0 Bumps [adventure-platform-bukkit](https://github.com/KyoriPowered/adventure-platform) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/KyoriPowered/adventure-platform/releases) - [Commits](https://github.com/KyoriPowered/adventure-platform/compare/v4.2.0...v4.3.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-platform-bukkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-16 12:00:42 +00:00
dependabot[bot]	a7cc8671bd	Bump adventure-text-minimessage from 4.12.0 to 4.13.0 Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.12.0 to 4.13.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.12.0...v4.13.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-14 12:00:26 +00:00
hyperdefined	37a7c642d3	Merge pull request #28 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.11.0 Bump maven-compiler-plugin from 3.10.1 to 3.11.0	2023-02-27 18:57:28 -05:00
dependabot[bot]	31acdd9527	Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-27 12:10:48 +00:00
hyperdefined	9b0ac2d912	stfu deepsource	2023-02-20 22:28:33 -05:00
hyperdefined	4ea9e1600b	return item lore back rather than nulling it	2023-02-20 22:02:48 -05:00
hyperdefined	72b8b31779	Merge pull request #27 from hyperdefined/dependabot/maven/org.bstats-bstats-bukkit-3.0.1 Bump bstats-bukkit from 3.0.0 to 3.0.1	2023-02-16 17:43:01 -05:00
dependabot[bot]	fce135f2f8	Bump bstats-bukkit from 3.0.0 to 3.0.1 Bumps [bstats-bukkit](https://github.com/Bastian/bStats-Metrics) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: org.bstats:bstats-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-13 12:09:50 +00:00
hyperdefined	425b315104	Revert "Update ToolStats.java" This reverts commit `f2739cf433`.	2023-01-16 13:41:50 -05:00
hyperdefined	50a0bc800c	small command changes	2022-12-12 17:05:46 -05:00
hyperdefined	583cd824f4	Update EntityDamage.java	2022-12-12 12:06:06 -05:00
hyperdefined	d63f00166d	Update NumberFormat.java	2022-12-12 11:30:26 -05:00
hyperdefined	0bcb0c7370	added missing tracking for mobs	2022-12-12 11:21:06 -05:00
hyperdefined	e4859de614	Merge pull request #26 from hyperdefined/dependabot/maven/net.kyori-adventure-platform-bukkit-4.2.0 Bump adventure-platform-bukkit from 4.1.2 to 4.2.0	2022-12-11 23:41:50 -05:00
dependabot[bot]	f7c1af153f	Bump adventure-platform-bukkit from 4.1.2 to 4.2.0 Bumps [adventure-platform-bukkit](https://github.com/KyoriPowered/adventure-platform) from 4.1.2 to 4.2.0. - [Release notes](https://github.com/KyoriPowered/adventure-platform/releases) - [Commits](https://github.com/KyoriPowered/adventure-platform/compare/v4.1.2...v4.2.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-platform-bukkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-09 11:05:50 +00:00
hyperdefined	946dc591f5	Update pom.xml	2022-12-08 13:40:27 -05:00
hyperdefined	d279569199	Update EntityDamage.java	2022-12-08 13:40:12 -05:00
hyperdefined	f2739cf433	Update ToolStats.java	2022-12-07 16:21:14 -05:00
hyperdefined	bef854be14	removed logging	2022-12-07 15:19:32 -05:00
hyperdefined	2c971da1b9	unify lore management	2022-12-07 14:56:57 -05:00
hyperdefined	2e0ee18594	more possible plugin compatibility?	2022-12-01 17:56:41 -05:00
hyperdefined	98a5f20a86	better offhand/main hand detection	2022-11-30 14:41:34 -05:00
hyperdefined	dd8a0db3b6	fix using rods in offhand	2022-11-30 14:22:35 -05:00
hyperdefined	fee7d5cd99	Merge pull request #25 from hyperdefined/dependabot/maven/net.kyori-adventure-text-minimessage-4.12.0 Bump adventure-text-minimessage from 4.11.0 to 4.12.0	2022-11-29 23:21:12 -05:00
hyperdefined	70ebf49958	Merge branch 'master' of https://github.com/hyperdefined/ToolStats	2022-11-29 20:06:40 -05:00
dependabot[bot]	50d2ec0507	Bump adventure-text-minimessage from 4.11.0 to 4.12.0 Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.11.0 to 4.12.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.11.0...v4.12.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-28 11:09:14 +00:00
hyperdefined	6428925e40	support for complete customization of numbers closes #24	2022-11-24 00:44:59 -05:00
hyperdefined	1d4faa89a1	Merge branch 'master' of https://github.com/hyperdefined/ToolStats	2022-11-23 02:22:46 -05:00
hyperdefined	1ad650f42b	Merge pull request #23 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.4.1 Bump maven-shade-plugin from 3.4.0 to 3.4.1	2022-11-06 19:20:20 -05:00
hyperdefined	fdb6626c42	update all items 1 tick later this should fix #18	2022-11-04 20:26:55 -04:00
dependabot[bot]	cd80e6a675	Bump maven-shade-plugin from 3.4.0 to 3.4.1 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.0...maven-shade-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-27 11:23:52 +00:00
hyperdefined	03d45ea8f7	Update pom.xml	2022-10-26 18:10:22 -04:00
hyperdefined	91a98cf664	fix the symbols regardless of Locale	2022-10-26 18:08:00 -04:00
hyperdefined	72b00e96f6	fix example date format in config	2022-10-24 21:27:40 -04:00
hyperdefined	07458bfc11	ignore mob drops with our tags fixes #22	2022-10-24 21:21:45 -04:00