fix handling empty messages

Update README.md
Update hangar.yml
2025-12-06 06:41:44 +00:00 · 2025-01-18 13:06:38 -05:00 · 2024-12-31 13:21:41 -05:00 · 2024-12-30 23:29:24 -05:00 · 2024-12-30 23:28:35 -05:00 · 2024-12-30 23:27:11 -05:00
35 changed files with 1768 additions and 735 deletions
--- a/.github/workflows/hangar.yml
+++ b/.github/workflows/hangar.yml
@@ -0,0 +1,31 @@
+name: Update Hangar Description
+on:
+  push:
+    branches: [ master ]
+jobs:
+  update-hangar-page:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Authenticate with Hangar
+        id: authenticate
+        run: |
+          RESPONSE=$(curl -s -X POST "https://hangar.papermc.io/api/v1/authenticate?apiKey=${{ secrets.HANGAR }}" -H 'accept: application/json')
+          TOKEN=$(echo $RESPONSE | jq -r '.token')
+          if [[ "$TOKEN" == "null" ]]; then
+            echo "Error: Unable to fetch JWT token"
+            exit 1
+          fi
+          echo "::add-mask::$TOKEN"
+          echo "token=$TOKEN" >> $GITHUB_OUTPUT
+
+      - name: Update Project Description
+        run: |
+          README_CONTENT=$(cat README.md | jq -Rs .)
+          curl -s -X PATCH "https://hangar.papermc.io/api/v1/pages/editmain/ToolStats" \
+            -H "content-type: application/json" \
+            -H "Authorization: HangarAuth ${{ steps.authenticate.outputs.token }}" \
+            -d "{\"content\":$README_CONTENT}"
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,10 +15,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
--- a/.github/workflows/modrinth.yml
+++ b/.github/workflows/modrinth.yml
@@ -0,0 +1,13 @@
+name: Update Modrinth Description
+on:
+  push:
+    branches: [ master ]
+jobs:
+  modrinth-desc:
+    runs-on: 'ubuntu-latest'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: funnyboy-roks/modrinth-auto-desc@v1.6
+      with:
+        auth-token: ${{ secrets.MODRINTH }}
+        slug: 'oBZj9E15'
--- a/README.md
+++ b/README.md
@@ -1,27 +1,30 @@
 <h1 align="center">ToolStats</h1>

 <p align="center">
-	<img src="https://img.shields.io/badge/Minecraft-1.15--1.19.2-orange" alt="Minecraft versions">
-	<img src="https://img.shields.io/github/v/release/hyperdefined/ToolStats" alt="GitHub release (latest by date)">
-	<a href="https://github.com/hyperdefined/ToolStats/releases"><img src="https://img.shields.io/github/downloads/hyperdefined/ToolStats/total?logo=github" alt="Downloads"></a>
-	<a href="https://ko-fi.com/hyperdefined"><img src="https://img.shields.io/badge/Donate-Ko--fi-red" alt="Donate via Ko-fi"></a>
-	<a href="https://www.gnu.org/licenses/gpl-3.0"><img src="https://img.shields.io/badge/License-GPLv3-blue.svg" alt="License: GPL v3"></a>
-	<a href="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4"><img src="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4.svg" alt="wakatime"></a>
+	<a href="https://modrinth.com/plugin/ToolStats"><img alt="modrinth" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg"></a>
+	<a href="https://hangar.papermc.io/hyperdefined/ToolStats"><img alt="hangar" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/hangar_vector.svg"></a>
+	<a href="https://papermc.io"><img alt="paper" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg"></a>
+	<a href="https://github.com/hyperdefined/ToolStats/wiki"><img alt="ghpages" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/documentation/ghpages_vector.svg"></a>
+	<a href="https://discord.gg/rJuQXVcJz8"><img alt="discord-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/discord-singular_vector.svg"></a>
+	<a href="https://buymeacoffee.com/hyperdefined"><img alt="buymeacoffee-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/donate/buymeacoffee-singular_vector.svg"></a>
 </p>

-ToolStats is a small plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can disable/enable which stats are shown on which tools via the config. Note: stats are tracked regardless of config setting. The config is to disable the lore on the item.
+ToolStats is a Paper plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can disable/enable which stats are shown on which tools via the config. Note: stats are tracked regardless of config setting. The config is to disable the lore on the item.

 Here is everything it tracks:
 * Blocks mined (pickaxes, shovels, axes, hoes, shears)
-* Player/mob kills (swords, axes, tridents, bows/crossbows)
-* Ownership of items when crafted, looted (from chests), traded, and caught from fishing.
+* Crops mined (hoes)
+* Player/mob kills (swords, axes, tridents, bows/crossbows, mace)
+* Ownership of items when crafted, looted (from chests), traded, spawned via creative, and caught from fishing.
 * Armor damage taken.
 * Fish caught.
 * Sheep sheared.
+* Arrows shot (bows/crossbows)
+* Flight time with elytras.

 The best part is, this data is stored on the item itself. You can also change how the lore is displayed on the items!

-If item lore is ever incorrect, you can run `/toolstats reset` to reset the item lore so it's correct.
+If item lore is ever incorrect/missing, you can run `/toolstats reset`. This command fixes the lore on whatever item you are holding.

 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image2.png)
@@ -33,6 +36,8 @@ If item lore is ever incorrect, you can run `/toolstats reset` to reset the item
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image8.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image9.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image10.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image11.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image12.png)

 ## Documentation
 Visit the [wiki](https://github.com/hyperdefined/ToolStats/wiki) for help.
--- a/images/image11.png
+++ b/images/image11.png
--- a/images/image12.png
+++ b/images/image12.png
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@

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

    <name>ToolStats</name>

    <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>

@@ -37,7 +37,7 @@
        <plugins>
            <plugin>
                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</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.11.0</version>
+                <version>3.13.0</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
@@ -60,25 +60,17 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                <configuration>
                    <relocations>
                        <relocation>
                            <pattern>org.bstats</pattern>
                            <shadedPattern>lol.hyper.toolstats.bstats</shadedPattern>
                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori.adventure</pattern>
-                            <shadedPattern>lol.hyper.toolstats.adventure</shadedPattern>
-                        </relocation>
                        <relocation>
                            <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>
@@ -104,50 +96,28 @@

    <repositories>
        <repository>
-            <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>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
        </repository>
    </repositories>

    <dependencies>
        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>lol.hyper</groupId>
            <artifactId>github-release-api</artifactId>
-            <version>1.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.14.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>space.arim.morepaperlib</groupId>
-            <artifactId>morepaperlib</artifactId>
-            <version>0.4.3</version>
+            <version>1.0.5</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,18 +21,19 @@ 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.HashMaker;
+import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.ItemLore;
 import lol.hyper.toolstats.tools.NumberFormat;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import lol.hyper.toolstats.tools.config.ConfigTools;
+import lol.hyper.toolstats.tools.config.ConfigUpdater;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.*;
-import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 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;
@@ -60,6 +61,10 @@ public final class ToolStats extends JavaPlugin {
     * Stores how many blocks were mined.
     */
    public final NamespacedKey genericMined = new NamespacedKey(this, "generic-mined");
+    /**
+     * Stores how many crops were harvested.
+     */
+    public final NamespacedKey cropsHarvested = new NamespacedKey(this, "crops-mined");
    /**
     * Stores how many fish were caught.
     */
@@ -72,14 +77,22 @@ public final class ToolStats extends JavaPlugin {
     * Stores how much damage an armor piece has taken.
     */
    public final NamespacedKey armorDamage = new NamespacedKey(this, "damage-taken");
-    /**
-     * 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");
+    /**
+     * Key for item has.
+     */
+    public final NamespacedKey hash = new NamespacedKey(this, "hash");
+    /**
+     * Key for arrows shot.
+     */
+    public final NamespacedKey arrowsShot = new NamespacedKey(this, "arrows-shot");
+    /**
+     * Key for tracking flight time.
+     */
+    public final NamespacedKey flightTime = new NamespacedKey(this, "flightTime");
    /**
     * Stores how an item was created.
     * 0 = crafted.
@@ -88,9 +101,14 @@ public final class ToolStats extends JavaPlugin {
     * 3 = traded.
     * 4 = founded (for elytras).
     * 5 = fished.
+     * 6 = spawned in (creative).
     */
    public final NamespacedKey originType = new NamespacedKey(this, "origin");

+    public final int CONFIG_VERSION = 8;
+    public final Logger logger = this.getLogger();
+    public final File configFile = new File(this.getDataFolder(), "config.yml");
+
    public BlocksMined blocksMined;
    public ChunkPopulate chunkPopulate;
    public CraftItem craftItem;
@@ -107,25 +125,22 @@ public final class ToolStats extends JavaPlugin {
    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 = 5;
-
-    private BukkitAudiences adventure;
-    public MorePaperLib morePaperLib;
-
+    public YamlConfiguration config;
+    public HashMaker hashMaker;
+    public CreativeEvent creativeEvent;
+    public PlayerMove playerMove;
+    public ItemChecker itemChecker;
+    public ShootBow shootBow;
+    public ConfigTools configTools;

    @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!");
        }
        loadConfig();
+        hashMaker = new HashMaker(this);
        blocksMined = new BlocksMined(this);
        craftItem = new CraftItem(this);
        chunkPopulate = new ChunkPopulate(this);
@@ -141,6 +156,11 @@ public final class ToolStats extends JavaPlugin {
        itemLore = new ItemLore(this);
        inventoryOpen = new InventoryOpen(this);
        playerJoin = new PlayerJoin(this);
+        creativeEvent = new CreativeEvent(this);
+        playerMove = new PlayerMove(this);
+        itemChecker = new ItemChecker();
+        shootBow = new ShootBow(this);
+        configTools = new ConfigTools(this);

        Bukkit.getServer().getPluginManager().registerEvents(blocksMined, this);
        Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
@@ -155,18 +175,22 @@ public final class ToolStats extends JavaPlugin {
        Bukkit.getServer().getPluginManager().registerEvents(villagerTrade, this);
        Bukkit.getServer().getPluginManager().registerEvents(inventoryOpen, this);
        Bukkit.getServer().getPluginManager().registerEvents(playerJoin, this);
+        Bukkit.getServer().getPluginManager().registerEvents(creativeEvent, this);
+        Bukkit.getServer().getPluginManager().registerEvents(shootBow, this);
+        Bukkit.getServer().getPluginManager().registerEvents(playerMove, this);

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

        new Metrics(this, 14110);
-
-        morePaperLib.scheduling().asyncScheduler().run(this::checkForUpdates);
+        Bukkit.getAsyncScheduler().runNow(this, scheduledTask -> checkForUpdates());
    }

    public void loadConfig() {
        config = YamlConfiguration.loadConfiguration(configFile);
        if (config.getInt("config-version") != CONFIG_VERSION) {
-            logger.warning("Your config file is outdated! Please regenerate the config.");
+            logger.warning("Your config file is outdated! We will try to update it, but you should regenerate it!");
+            ConfigUpdater configUpdater = new ConfigUpdater(this);
+            configUpdater.updateConfig();
        }

        numberFormat = new NumberFormat(this);
@@ -194,133 +218,4 @@ public final class ToolStats extends JavaPlugin {
            logger.warning("A new version is available (" + latest.getTagVersion() + ")! You are running version " + current.getTagVersion() + ". You are " + buildsBehind + " version(s) behind.");
        }
    }
-
-    /**
-     * Checks the config to see if we want to show lore on certain items.
-     *
-     * @param itemStack  The item to check.
-     * @param configName The config we are checking under.
-     * @return If we want to allow lore or not.
-     */
-    public boolean checkConfig(ItemStack itemStack, String configName) {
-        String itemName = itemStack.getType().toString().toLowerCase();
-        String itemType = null;
-        if (itemName.contains("bow") || itemName.contains("shears") || itemName.contains("trident")) {
-            if (itemName.contains("bow")) {
-                itemType = "bow";
-            }
-            if (itemName.contains("shears")) {
-                itemType = "shears";
-            }
-            if (itemName.contains("trident")) {
-                itemType = "trident";
-            }
-        } else {
-            itemType = itemName.substring(itemName.indexOf('_') + 1);
-        }
-
-        if (itemType == null) {
-            return false;
-        }
-
-        switch (itemType) {
-            case "pickaxe": {
-                return config.getBoolean("enabled." + configName + ".pickaxe");
-            }
-            case "sword": {
-                return config.getBoolean("enabled." + configName + ".sword");
-            }
-            case "shovel": {
-                return config.getBoolean("enabled." + configName + ".shovel");
-            }
-            case "axe": {
-                return config.getBoolean("enabled." + configName + ".axe");
-            }
-            case "hoe": {
-                return config.getBoolean("enabled." + configName + ".hoe");
-            }
-            case "shears": {
-                return config.getBoolean("enabled." + configName + ".shears");
-            }
-            case "bow": {
-                return config.getBoolean("enabled." + configName + ".bow");
-            }
-            case "trident": {
-                return config.getBoolean("enabled." + configName + ".trident");
-            }
-            case "helmet":
-            case "chestplate":
-            case "leggings":
-            case "boots": {
-                return config.getBoolean("enabled." + configName + ".armor");
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Gets the lore message from the config.
-     *
-     * @param configName The config name, "messages." is already in front.
-     * @param raw        If you want the raw message with the formatting codes and placeholders.
-     * @return The lore message.
-     */
-    public String getLoreFromConfig(String configName, boolean raw) {
-        String lore = config.getString("messages." + configName);
-        if (lore == null) {
-            return null;
-        }
-        if (raw) {
-            return ChatColor.translateAlternateColorCodes('&', lore);
-        } else {
-            // we basically add the color codes then remove them
-            // this is a dirty trick to remove color codes
-            lore = ChatColor.translateAlternateColorCodes('&', lore);
-            lore = ChatColor.stripColor(lore);
-            if (lore.contains("{player}")) {
-                lore = lore.replace("{player}", "");
-            }
-            if (lore.contains("{date}")) {
-                lore = lore.replace("{date}", "");
-            }
-            if (lore.contains("{name}")) {
-                lore = lore.replace("{name}", "");
-            }
-            if (lore.contains("{kills}")) {
-                lore = lore.replace("{kills}", "");
-            }
-            if (lore.contains("{blocks}")) {
-                lore = lore.replace("{blocks}", "");
-            }
-            if (lore.contains("{sheep}")) {
-                lore = lore.replace("{sheep}", "");
-            }
-            if (lore.contains("{damage}")) {
-                lore = lore.replace("{damage}", "");
-            }
-            if (lore.contains("{fish}")) {
-                lore = lore.replace("{fish}", "");
-            }
-        }
-        return lore;
-    }
-
-    public BukkitAudiences getAdventure() {
-        if (this.adventure == null) {
-            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
-        }
-        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,12 +18,12 @@
 package lol.hyper.toolstats.commands;

 import lol.hyper.toolstats.ToolStats;
-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;
 import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -41,65 +41,63 @@ import java.util.*;
 public class CommandToolStats implements TabExecutor {

    private final ToolStats toolStats;
-    private final BukkitAudiences audiences;

    public CommandToolStats(ToolStats toolStats) {
        this.toolStats = toolStats;
-        this.audiences = toolStats.getAdventure();
    }

    @Override
    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
        if (!sender.hasPermission("toolstats.command")) {
-            audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+            sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
            return true;
        }
        if (args.length == 0) {
-            audiences.sender(sender).sendMessage(Component.text("ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.").color(NamedTextColor.GREEN));
+            sender.sendMessage(Component.text("ToolStats version " + toolStats.getPluginMeta().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
            return true;
        }
        switch (args[0]) {
            case "reload": {
                if (sender.hasPermission("toolstats.reload")) {
                    toolStats.loadConfig();
-                    audiences.sender(sender).sendMessage(Component.text("Configuration reloaded!").color(NamedTextColor.GREEN));
+                    sender.sendMessage(Component.text("Configuration reloaded!", NamedTextColor.GREEN));
                } else {
-                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
                }
                return true;
            }
            case "reset": {
                if (!sender.hasPermission("toolstats.reset")) {
-                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+                    sender.sendMessage(Component.text("You do not have permission for this command.", 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));
+                    sender.sendMessage(Component.text("You must be a player for this command.", 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));
+                        sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
                        return true;
                    }
                    Player player = (Player) sender;
                    ItemStack heldItem = player.getInventory().getItemInMainHand();
-                    if (!ItemChecker.isValidItem(heldItem.getType())) {
-                        audiences.sender(sender).sendMessage(Component.text("You must hold a valid item.").color(NamedTextColor.RED));
+                    if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
+                        sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
                        return true;
                    }
                    fixItemLore(heldItem, player);
-                    audiences.sender(sender).sendMessage(Component.text("The lore was reset!").color(NamedTextColor.GREEN));
+                    sender.sendMessage(Component.text("The lore was reset!", NamedTextColor.GREEN));
                    return true;
                }
-                audiences.sender(sender).sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.").color(NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("The item owner will be who ever is currently running this command.").color(NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("Only use this if the tags on the tool are incorrect.").color(NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("Type /toolstats reset confirm to confirm this.").color(NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("If the owner of the item is broken, it will reset to the person holding it.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("Only use this if the tags on the tool are incorrect.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("Type /toolstats reset confirm to confirm this.", NamedTextColor.GREEN));
                return true;
            }
            default: {
-                audiences.sender(sender).sendMessage(Component.text("Invalid sub-command.").color(NamedTextColor.RED));
+                sender.sendMessage(Component.text("Invalid sub-command.", NamedTextColor.RED));
            }
        }
        return true;
@@ -118,16 +116,7 @@ public class CommandToolStats implements TabExecutor {
            return;
        }
        PersistentDataContainer container = finalMeta.getPersistentDataContainer();
-        List<String> lore = new ArrayList<>();
-
-        String caughtByLore = toolStats.getLoreFromConfig("fished.caught-by", false);
-        String lootedByLore = toolStats.getLoreFromConfig("looted.found-by", false);
-        String tradedByLore = toolStats.getLoreFromConfig("traded.traded-by", false);
-
-        // make sure the config messages are not null
-        if (caughtByLore == null || lootedByLore == null || tradedByLore == null) {
-            return;
-        }
+        List<Component> lore = new ArrayList<>();

        // set how the item was obtained
        Integer origin = -1;
@@ -142,101 +131,146 @@ public class CommandToolStats implements TabExecutor {

        // hard code elytras
        if (finalItem.getType() == Material.ELYTRA) {
-            if (toolStats.config.getBoolean("enabled.elytra-tag")) {
-                lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
-                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.numberFormat.formatDate(new Date(time))));
-                    }
-                }
-                finalMeta.setLore(lore);
-                finalItem.setItemMeta(finalMeta);
-                int slot = player.getInventory().getHeldItemSlot();
-                player.getInventory().setItem(slot, finalItem);
-                return;
+            Long flightTime = null;
+            Long timeCreated = null;
+            if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                timeCreated = container.get(toolStats.timeCreated, PersistentDataType.LONG);
            }
+            if (container.has(toolStats.flightTime, PersistentDataType.LONG)) {
+                flightTime = container.get(toolStats.flightTime, PersistentDataType.LONG);
+            }
+
+            if (flightTime != null) {
+                if (toolStats.config.getBoolean("enabled.flight-time")) {
+                    Component line = toolStats.configTools.formatLore("flight-time", "{time}", toolStats.numberFormat.formatDouble((double) flightTime / 1000));
+                    lore.add(line);
+                }
+            }
+
+            if (timeCreated != null) {
+                Component timeCreatedLine = toolStats.configTools.formatLore("looted.found-by", "{player}", player.getName());
+                Component playerOwnerLine = toolStats.configTools.formatLore("looted.found-on", "{date}", toolStats.numberFormat.formatDate(new Date(timeCreated)));
+                lore.add(timeCreatedLine);
+                lore.add(playerOwnerLine);
+            }
+
+            finalMeta.lore(lore);
+            finalItem.setItemMeta(finalMeta);
+            int slot = player.getInventory().getHeldItemSlot();
+            player.getInventory().setItem(slot, finalItem);
        }

-        if (toolStats.checkConfig(original, "created-by")) {
+        if (toolStats.configTools.checkConfig(original.getType(), "created-by")) {
            if (container.has(toolStats.genericOwner, new UUIDDataType())) {
-                container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
+                UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
+                String ownerName = null;
+                // if we can read the current owner
+                if (owner != null) {
+                    OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
+                    ownerName = offlinePlayer.getName();
+                }
+
+                // if the owner's name is null for whatever reason, set the new owner
+                // to the current player running the command
+                if (ownerName == null) {
+                    player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
+                    ownerName = player.getName();
+                    container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
+                }
+
                // show how the item was created based on the previous lore
                switch (origin) {
                    case 0: {
-                        lore.add(toolStats.getLoreFromConfig("created.created-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.configTools.formatLore("created.created-by", "{player}", ownerName));
                        break;
                    }
                    case 2: {
-                        lore.add(toolStats.getLoreFromConfig("looted.looted-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.configTools.formatLore("looted.looted-by", "{player}", ownerName));
                        break;
                    }
                    case 3: {
-                        lore.add(toolStats.getLoreFromConfig("traded.traded-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.configTools.formatLore("traded.traded-by", "{player}", ownerName));
                        break;
                    }
                    case 4: {
-                        lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.configTools.formatLore("looted.found-by", "{player}", ownerName));
                        break;
                    }
                    case 5: {
-                        lore.add(toolStats.getLoreFromConfig("fished.caught-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.configTools.formatLore("fished.caught-by", "{player}", ownerName));
+                        break;
+                    }
+                    case 6: {
+                        lore.add(toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", ownerName));
                        break;
                    }
                }
            }
        }
-        if (toolStats.checkConfig(original, "created-date")) {
+        if (toolStats.configTools.checkConfig(original.getType(), "created-date")) {
            if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
                Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
                if (time != null) {
+                    String date = toolStats.numberFormat.formatDate(new Date(time));
                    // show how when the item was created based on the previous lore
                    switch (origin) {
                        case 0: {
-                            lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            lore.add(toolStats.configTools.formatLore("created.created-on", "{date}", date));
                            break;
                        }
                        case 2: {
-                            lore.add(toolStats.getLoreFromConfig("looted.looted-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            lore.add(toolStats.configTools.formatLore("looted.looted-on", "{date}", date));
                            break;
                        }
                        case 3: {
-                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            lore.add(toolStats.configTools.formatLore("traded.traded-on", "{date}", date));
                            break;
                        }
                        case 4: {
-                            lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            lore.add(toolStats.configTools.formatLore("looted.found-on", "{date}", date));
                            break;
                        }
                        case 5: {
-                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", toolStats.numberFormat.formatDate(new Date(time))));
+                            lore.add(toolStats.configTools.formatLore("fished.caught-on", "{date}", date));
+                            break;
+                        }
+                        case 6: {
+                            lore.add(toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", date));
                            break;
                        }
                    }
                }
            }
        }
-        if (toolStats.checkConfig(original, "player-kills")) {
+        if (toolStats.configTools.checkConfig(original.getType(), "player-kills")) {
            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}", toolStats.numberFormat.formatInt(kills)));
+                    lore.add(toolStats.configTools.formatLore("kills.player", "{kills}", toolStats.numberFormat.formatInt(kills)));
                }
            }
        }
-        if (toolStats.checkConfig(original, "mob-kills")) {
+        if (toolStats.configTools.checkConfig(original.getType(), "mob-kills")) {
            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}", toolStats.numberFormat.formatInt(kills)));
+                    lore.add(toolStats.configTools.formatLore("kills.mob", "{kills}", toolStats.numberFormat.formatInt(kills)));
                }
            }
        }
-        if (toolStats.checkConfig(original, "blocks-mined")) {
+        if (toolStats.configTools.checkConfig(original.getType(), "blocks-mined")) {
+            if (original.getType().toString().toLowerCase(Locale.ROOT).contains("hoe")) {
+                if (container.has(toolStats.cropsHarvested, PersistentDataType.INTEGER)) {
+                    Integer crops = container.get(toolStats.cropsHarvested, PersistentDataType.INTEGER);
+                    if (crops != null) {
+                        lore.add(toolStats.configTools.formatLore("crops-harvested", "{crops}", toolStats.numberFormat.formatInt(crops)));
+                    }
+                }
+            }
            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}", toolStats.numberFormat.formatInt(blocksMined)));
+                    lore.add(toolStats.configTools.formatLore("blocks-mined", "{blocks}", toolStats.numberFormat.formatInt(blocksMined)));
                }
            }
        }
@@ -244,7 +278,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}", toolStats.numberFormat.formatInt(fish)));
+                    lore.add(toolStats.configTools.formatLore("fished.fish-caught", "{fish}", toolStats.numberFormat.formatInt(fish)));
                }
            }
        }
@@ -252,7 +286,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}", toolStats.numberFormat.formatInt(sheep)));
+                    lore.add(toolStats.configTools.formatLore("sheep-sheared", "{sheep}", toolStats.numberFormat.formatInt(sheep)));
                }
            }
        }
@@ -260,11 +294,19 @@ 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}", toolStats.numberFormat.formatDouble(damage)));
+                    lore.add(toolStats.configTools.formatLore("damage-taken", "{damage}", toolStats.numberFormat.formatDouble(damage)));
                }
            }
        }
-        finalMeta.setLore(lore);
+        if (toolStats.config.getBoolean("enabled.arrows-shot")) {
+            if (container.has(toolStats.arrowsShot, PersistentDataType.INTEGER)) {
+                Integer arrows = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
+                if (arrows != null) {
+                    lore.add(toolStats.configTools.formatLore("arrows-shot", "{arrows}", toolStats.numberFormat.formatInt(arrows)));
+                }
+            }
+        }
+        finalMeta.lore(lore);
        finalItem.setItemMeta(finalMeta);
        int slot = player.getInventory().getHeldItemSlot();
        player.getInventory().setItem(slot, finalItem);
--- a/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
+++ b/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
@@ -17,9 +17,14 @@

 package lol.hyper.toolstats.events;

+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.Ageable;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -30,8 +35,11 @@ import org.bukkit.inventory.PlayerInventory;
 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;
+import java.util.Locale;
+import java.util.function.Consumer;

 public class BlocksMined implements Listener {

@@ -50,15 +58,29 @@ public class BlocksMined implements Listener {
        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
            return;
        }
-        // if the player mines something with their fist
        PlayerInventory inventory = player.getInventory();
        ItemStack heldItem = inventory.getItemInMainHand();
+        Block block = event.getBlock();
+
+        if (block.getType() == Material.CHEST) {
+            toolStats.playerInteract.openedChests.put(block, player);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> toolStats.playerInteract.openedChests.remove(block), 20);
+        }
+
        // only check certain items
-        if (!ItemChecker.isMineTool(heldItem.getType())) {
+        if (!toolStats.itemChecker.isMineTool(heldItem.getType())) {
            return;
        }
-        // update the blocks mined
-        updateBlocksMined(heldItem);
+
+        if (heldItem.getType().toString().toLowerCase(Locale.ROOT).contains("hoe")) {
+            // player is breaking crops with a hoe
+            if (block.getBlockData() instanceof Ageable) {
+                updateCropsMined(heldItem, (Ageable) block.getBlockData());
+            }
+        } else {
+            // update the blocks mined
+            updateBlocksMined(heldItem);
+        }
    }

    private void updateBlocksMined(ItemStack playerTool) {
@@ -80,15 +102,60 @@ public class BlocksMined implements Listener {
            toolStats.logger.warning(playerTool + " does not have valid generic-mined set! Resting to zero. This should NEVER happen.");
        }

-        blocksMined++;
-        container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);
-
-        String blocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
-        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{blocks}", blocksMinedFormatted, "blocks-mined");
+        container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined + 1);

        // do we add the lore based on the config?
-        if (toolStats.checkConfig(playerTool, "blocks-mined")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(playerTool.getType(), "blocks-mined")) {
+            String oldBlocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
+            String newBlocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined + 1);
+            Component oldLine = toolStats.configTools.formatLore("blocks-mined", "{blocks}", oldBlocksMinedFormatted);
+            Component newLine = toolStats.configTools.formatLore("blocks-mined", "{blocks}", newBlocksMinedFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
+        }
+        playerTool.setItemMeta(meta);
+    }
+
+    private void updateCropsMined(ItemStack playerTool, Ageable block) {
+        // ignore crops that are not fully grown
+        if (block.getAge() != block.getMaximumAge()) {
+            return;
+        }
+
+        ItemMeta meta = playerTool.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(playerTool + " does NOT have any meta! Unable to update stats.");
+            return;
+        }
+        // read the current stats from the item
+        // if they don't exist, then start from 0
+        Integer cropsMined = 0;
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (container.has(toolStats.cropsHarvested, PersistentDataType.INTEGER)) {
+            cropsMined = container.get(toolStats.cropsHarvested, PersistentDataType.INTEGER);
+        }
+
+        if (cropsMined == null) {
+            cropsMined = 0;
+            toolStats.logger.warning(playerTool + " does not have valid crops-mined set! Resting to zero. This should NEVER happen.");
+        }
+
+        container.set(toolStats.cropsHarvested, PersistentDataType.INTEGER, cropsMined + 1);
+
+        // do we add the lore based on the config?
+        if (toolStats.configTools.checkConfig(playerTool.getType(), "blocks-mined")) {
+            String oldCropsMinedFormatted = toolStats.numberFormat.formatInt(cropsMined);
+            String newCropsMinedFormatted = toolStats.numberFormat.formatInt(cropsMined + 1);
+            Component oldLine = toolStats.configTools.formatLore("crops-harvested", "{crops}", oldCropsMinedFormatted);
+            Component newLine = toolStats.configTools.formatLore("crops-harvested", "{crops}", newCropsMinedFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(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,6 +18,7 @@
 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;
@@ -31,7 +32,6 @@ 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 {

@@ -49,34 +49,30 @@ public class ChunkPopulate implements Listener {
        if (event.getChunk().getWorld().getEnvironment() != World.Environment.THE_END) {
            return;
        }
+        World world = event.getChunk().getWorld();
        // this is delayed because entities are not loaded instantly
        // we just check 1 second later
        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)) {
+        Bukkit.getRegionScheduler().runDelayed(toolStats, world, chunk.getX(), chunk.getZ(), scheduledTask -> {
+            for (Entity entity : chunk.getEntities()) {
+                // if there is a new item frame
+                if (!(entity instanceof ItemFrame itemFrame)) {
+                    continue;
+                }
+                // if the item frame has an elytra
+                if (itemFrame.getItem().getType() == Material.ELYTRA) {
+                    ItemStack elytraCopy = itemFrame.getItem();
+                    ItemMeta meta = elytraCopy.getItemMeta();
+                    if (meta == null) {
                        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) {
-                            continue;
-                        }
-                        // add the new tag so we know it's new
-                        PersistentDataContainer container = meta.getPersistentDataContainer();
-                        container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
-                        elytraCopy.setItemMeta(meta);
-                        itemFrame.setItem(elytraCopy);
-                    }
+                    // add the new tag so we know it's new
+                    PersistentDataContainer container = meta.getPersistentDataContainer();
+                    container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
+                    elytraCopy.setItemMeta(meta);
+                    itemFrame.setItem(elytraCopy);
                }
            }
-        };
-        toolStats.scheduleRegion(runnable, chunk.getWorld(), chunk, 20);
+        }, 20);
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/CraftItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/CraftItem.java
@@ -18,9 +18,8 @@
 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.ChatColor;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -33,7 +32,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

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

 public class CraftItem implements Listener {

@@ -57,19 +58,18 @@ public class CraftItem implements Listener {
            return;
        }
        // only check certain items
-        if (!ItemChecker.isValidItem(itemStack.getType())) {
+        if (!toolStats.itemChecker.isValidItem(itemStack.getType())) {
            return;
        }

        // if the player shift clicks, send them this warning
        if (event.isShiftClick()) {
-            String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
-            if (configMessage != null) {
-                if (configMessage.length() != 0) {
-                    event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                }
+            Component component = toolStats.configTools.formatLore("shift-click-warning.crafting", null, null);
+            if (component != null) {
+                event.getWhoClicked().sendMessage(component);
            }
        }
+
        // test the item before setting it
        ItemStack newItem = addLore(itemStack, player);
        if (newItem != null) {
@@ -104,37 +104,41 @@ public class CraftItem implements Listener {
            return null;
        }

+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
        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);
-
-        if (createdOnRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.created.created-on!");
-            return null;
-        }
-        if (createdByRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.created.created-by!");
-            return null;
-        }
-
-        List<String> lore;
+        List<Component> lore;
        // get the current lore the item
        if (meta.hasLore()) {
-            lore = meta.getLore();
+            lore = meta.lore();
        } else {
            lore = new ArrayList<>();
        }
        // do we add the lore based on the config?
-        if (toolStats.checkConfig(itemStack, "created-date")) {
-            lore.add(createdOnRaw.replace("{date}", toolStats.numberFormat.formatDate(finalDate)));
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "created-date")) {
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component newLine = toolStats.configTools.formatLore("created.created-on", "{date}", date);
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
        }
-        if (toolStats.checkConfig(itemStack, "created-by")) {
-            lore.add(createdByRaw.replace("{player}", owner.getName()));
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "created-by")) {
+            Component newLine = toolStats.configTools.formatLore("created.created-by", "{player}", owner.getName());
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
        }
-        meta.setLore(lore);
        newItem.setItemMeta(meta);
        return newItem;
    }
--- a/src/main/java/lol/hyper/toolstats/events/CreativeEvent.java
+++ b/src/main/java/lol/hyper/toolstats/events/CreativeEvent.java
@@ -0,0 +1,115 @@
+/*
+ * 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.UUIDDataType;
+import net.kyori.adventure.text.Component;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryCreativeEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.Date;
+import java.util.List;
+
+public class CreativeEvent implements Listener {
+
+    private final ToolStats toolStats;
+
+    public CreativeEvent(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onCreativeEvent(InventoryCreativeEvent event) {
+        Player player = (Player) event.getWhoClicked();
+        // make sure they are in creative mode
+        if (player.getGameMode() != GameMode.CREATIVE) {
+            return;
+        }
+        ItemStack spawnedItem = event.getCursor();
+        if (!toolStats.itemChecker.isValidItem(spawnedItem.getType())) {
+            return;
+        }
+
+        ItemMeta spawnedItemMeta = spawnedItem.getItemMeta();
+        if (spawnedItemMeta == null) {
+            return;
+        }
+        // if the item already has an origin set, don't add it again
+        // this is needed since you can spam click an item and the event will fire again
+        PersistentDataContainer container = spawnedItemMeta.getPersistentDataContainer();
+        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+            return;
+        }
+
+        // add the tags to the item
+        ItemStack newItem = addLore(spawnedItem, player);
+        if (newItem != null) {
+            event.setCursor(newItem);
+        }
+    }
+
+    /**
+     * Adds tags to newly spawned items in creative.
+     *
+     * @param spawnedItem The item.
+     */
+    private ItemStack addLore(ItemStack spawnedItem, Player owner) {
+        ItemStack newSpawnedItem = spawnedItem.clone();
+        ItemMeta meta = newSpawnedItem.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(newSpawnedItem + " does NOT have any meta! Unable to update stats.");
+            return null;
+        }
+
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate = new Date(timeCreated);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        // if the item already has an origin set, don't add it again
+        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+            return null;
+        }
+
+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(spawnedItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
+
+        if (toolStats.configTools.checkConfig(newSpawnedItem.getType(), "spawned-in")) {
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(newLore);
+        }
+
+        newSpawnedItem.setItemMeta(meta);
+        return newSpawnedItem;
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
@@ -18,7 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
@@ -40,7 +40,7 @@ public class EntityDamage implements Listener {

    private final ToolStats toolStats;
    public final Set<UUID> trackedMobs = new HashSet<>();
-    private final List<EntityDamageEvent.DamageCause> ignoredCauses = Arrays.asList(EntityDamageEvent.DamageCause.SUICIDE, EntityDamageEvent.DamageCause.VOID, EntityDamageEvent.DamageCause.CUSTOM);
+    private final List<EntityDamageEvent.DamageCause> ignoredCauses = Arrays.asList(EntityDamageEvent.DamageCause.SUICIDE, EntityDamageEvent.DamageCause.VOID, EntityDamageEvent.DamageCause.CUSTOM, EntityDamageEvent.DamageCause.KILL);

    public EntityDamage(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -52,10 +52,9 @@ public class EntityDamage implements Listener {
            return;
        }

-        if (!(event.getEntity() instanceof LivingEntity)) {
+        if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
            return;
        }
-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();

        // ignore void and /kill damage
        EntityDamageEvent.DamageCause cause = event.getCause();
@@ -66,15 +65,14 @@ public class EntityDamage implements Listener {
        // mob is going to die
        if (mobBeingAttacked.getHealth() - event.getFinalDamage() <= 0) {
            // a player is killing something
-            if (event.getDamager() instanceof Player) {
-                Player attackingPlayer = (Player) event.getDamager();
+            if (event.getDamager() instanceof Player attackingPlayer) {
                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())) {
+                if (!toolStats.itemChecker.isMeleeWeapon(heldItem.getType())) {
                    return;
                }
                // a player is killing another player
@@ -87,27 +85,24 @@ public class EntityDamage implements Listener {
                trackedMobs.add(mobBeingAttacked.getUniqueId());
            }
            // trident is being thrown at something
-            if (event.getDamager() instanceof Trident) {
-                Trident trident = (Trident) event.getDamager();
+            if (event.getDamager() instanceof Trident trident) {
                ItemStack newTrident;
                // trident is killing player
                if (mobBeingAttacked instanceof Player) {
-                    newTrident = tridentPlayerKills(trident.getItem());
+                    newTrident = tridentPlayerKills(trident.getItemStack());
                } else {
                    // trident is killing a mob
-                    newTrident = tridentMobKills(trident.getItem());
+                    newTrident = tridentMobKills(trident.getItemStack());
                    trackedMobs.add(mobBeingAttacked.getUniqueId());
                }
                if (newTrident != null) {
-                    trident.setItem(newTrident);
+                    trident.setItemStack(newTrident);
                }
            }
            // arrow is being shot
-            if (event.getDamager() instanceof Arrow) {
-                Arrow arrow = (Arrow) event.getDamager();
+            if (event.getDamager() instanceof Arrow arrow) {
                // if the shooter is a player
-                if (arrow.getShooter() instanceof Player) {
-                    Player shootingPlayer = (Player) arrow.getShooter();
+                if (arrow.getShooter() instanceof Player shootingPlayer) {
                    if (shootingPlayer.getGameMode() == GameMode.CREATIVE || shootingPlayer.getGameMode() == GameMode.SPECTATOR) {
                        return;
                    }
@@ -122,7 +117,7 @@ public class EntityDamage implements Listener {
                        heldBow = inventory.getItemInOffHand();
                    }

-                    // if the player is hold a bow in both hands
+                    // if the player is holding a bow in both hands
                    // default to main hand since that takes priority
                    if (isMainHand && isOffHand) {
                        heldBow = inventory.getItemInMainHand();
@@ -144,15 +139,14 @@ public class EntityDamage implements Listener {
            }
        }
        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
+        if (mobBeingAttacked instanceof Player playerTakingDamage) {
            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
            PlayerInventory playerInventory = playerTakingDamage.getInventory();
            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
                if (armorPiece != null) {
-                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
@@ -162,7 +156,7 @@ public class EntityDamage implements Listener {

    @EventHandler(priority = EventPriority.MONITOR)
    public void onDamage(EntityDamageEvent event) {
-        if (!(event.getEntity() instanceof LivingEntity)) {
+        if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
            return;
        }

@@ -172,17 +166,15 @@ public class EntityDamage implements Listener {
            return;
        }

-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
+        if (mobBeingAttacked instanceof Player playerTakingDamage) {
            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
            PlayerInventory playerInventory = playerTakingDamage.getInventory();
            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
                if (armorPiece != null) {
-                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
@@ -192,7 +184,7 @@ public class EntityDamage implements Listener {

    @EventHandler(priority = EventPriority.MONITOR)
    public void onDamage(EntityDamageByBlockEvent event) {
-        if (!(event.getEntity() instanceof LivingEntity)) {
+        if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
            return;
        }

@@ -202,17 +194,15 @@ public class EntityDamage implements Listener {
            return;
        }

-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
+        if (mobBeingAttacked instanceof Player playerTakingDamage) {
            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
            PlayerInventory playerInventory = playerTakingDamage.getInventory();
            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
                if (armorPiece != null) {
-                    if (ItemChecker.isArmor(armorPiece.getType())) {
+                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
                        updateDamage(armorPiece, event.getFinalDamage());
                    }
                }
@@ -242,15 +232,19 @@ public class EntityDamage implements Listener {
            toolStats.logger.warning(itemStack + " 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");
+        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills + 1);

        // do we add the lore based on the config?
-        if (toolStats.checkConfig(itemStack, "player-kills")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "player-kills")) {
+            String oldPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
+            String newPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills + 1);
+            Component oldLine = toolStats.configTools.formatLore("kills.player", "{kills}", oldPlayerKillsFormatted);
+            Component newLine = toolStats.configTools.formatLore("kills.player", "{kills}", newPlayerKillsFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        itemStack.setItemMeta(meta);
    }
@@ -277,15 +271,19 @@ public class EntityDamage implements Listener {
            toolStats.logger.warning(itemStack + " 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");
+        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills + 1);

        // do we add the lore based on the config?
-        if (toolStats.checkConfig(itemStack, "mob-kills")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "mob-kills")) {
+            String oldMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
+            String newMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills + 1);
+            Component oldLine = toolStats.configTools.formatLore("kills.mob", "{kills}", oldMobKillsFormatted);
+            Component newLine = toolStats.configTools.formatLore("kills.mob", "{kills}", newMobKillsFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        itemStack.setItemMeta(meta);
    }
@@ -297,6 +295,10 @@ public class EntityDamage implements Listener {
     * @param damage    How much damage is being added.
     */
    private void updateDamage(ItemStack itemStack, double damage) {
+        // ignore if the damage is zero or negative
+        if (damage < 0) {
+            return;
+        }
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
@@ -313,15 +315,18 @@ public class EntityDamage implements Listener {
            toolStats.logger.warning(itemStack + " does not have valid damage-taken set! Resting to zero. This should NEVER happen.");
        }

-        damageTaken = damageTaken + damage;
-        container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken);
-        container.set(toolStats.armorDamageInt, PersistentDataType.INTEGER, damageTaken.intValue());
-
-        String damageTakenFormatted = toolStats.numberFormat.formatDouble(damageTaken);
-        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{damage}", damageTakenFormatted, "damage-taken");
+        container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken + damage);

        if (toolStats.config.getBoolean("enabled.armor-damage")) {
-            meta.setLore(newLore);
+            String oldDamageFormatted = toolStats.numberFormat.formatDouble(damageTaken);
+            String newDamageFormatted = toolStats.numberFormat.formatDouble(damageTaken + damage);
+            Component oldLine = toolStats.configTools.formatLore("damage-taken", "{damage}", oldDamageFormatted);
+            Component newLine = toolStats.configTools.formatLore("damage-taken", "{damage}", newDamageFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        itemStack.setItemMeta(meta);
    }
@@ -349,15 +354,19 @@ public class EntityDamage implements Listener {
            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");
+        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills + 1);

        // do we add the lore based on the config?
-        if (toolStats.checkConfig(newTrident, "mob-kills")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(newTrident.getType(), "mob-kills")) {
+            String oldMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
+            String newMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills + 1);
+            Component oldLine = toolStats.configTools.formatLore("kills.mob", "{kills}", oldMobKillsFormatted);
+            Component newLine = toolStats.configTools.formatLore("kills.mob", "{kills}", newMobKillsFormatted);
+            if (oldLine == null || newLine == null) {
+                return null;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        newTrident.setItemMeta(meta);
        return newTrident;
@@ -386,15 +395,19 @@ public class EntityDamage implements Listener {
            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");
+        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills + 1);

        // do we add the lore based on the config?
-        if (toolStats.checkConfig(newTrident, "player-kills")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(newTrident.getType(), "player-kills")) {
+            String oldPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
+            String newPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills + 1);
+            Component oldLine = toolStats.configTools.formatLore("kills.player", "{kills}", oldPlayerKillsFormatted);
+            Component newLine = toolStats.configTools.formatLore("kills.player", "{kills}", newPlayerKillsFormatted);
+            if (oldLine == null || newLine == null) {
+                return null;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(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
@@ -18,7 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -30,7 +30,8 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.util.*;
+import java.util.List;
+import java.util.UUID;

 public class EntityDeath implements Listener {

@@ -54,13 +55,13 @@ public class EntityDeath implements Listener {
                ItemMeta droppedItemMeta = droppedItem.getItemMeta();
                if (droppedItemMeta != null) {
                    PersistentDataContainer container = droppedItemMeta.getPersistentDataContainer();
-                    if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                    if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
                        continue; // ignore any items that have our tags
                    }

                }
-                if (ItemChecker.isValidItem(droppedItem.getType())) {
-                    ItemStack newItem = addLore(droppedItem, livingEntity.getName());
+                if (toolStats.itemChecker.isValidItem(droppedItem.getType())) {
+                    ItemStack newItem = addLore(droppedItem, livingEntity);
                    if (newItem != null) {
                        event.getDrops().set(i, newItem);
                    }
@@ -74,9 +75,9 @@ 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 entity  The mob dying.
     */
-    private ItemStack addLore(ItemStack oldItem, String mob) {
+    private ItemStack addLore(ItemStack oldItem, LivingEntity entity) {
        ItemStack newItem = oldItem.clone();
        ItemMeta meta = newItem.getItemMeta();
        if (meta == null) {
@@ -86,10 +87,14 @@ public class EntityDeath implements Listener {
        PersistentDataContainer container = meta.getPersistentDataContainer();
        container.set(toolStats.originType, PersistentDataType.INTEGER, 1);

-        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{name}", mob, "dropped-by");
-
        if (toolStats.config.getBoolean("enabled.dropped-by")) {
-            meta.setLore(newLore);
+            String mobName = toolStats.config.getString("messages.mob." + entity.getType());
+            if (mobName == null) {
+                mobName = entity.getName();
+            }
+            Component newLine = toolStats.configTools.formatLore("dropped-by", "{name}", mobName);
+            List<Component> newLore = toolStats.itemLore.addItemLore(meta, newLine);
+            meta.lore(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
@@ -18,8 +18,8 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -30,13 +30,11 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.LootGenerateEvent;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 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.Date;
 import java.util.List;
@@ -56,12 +54,11 @@ public class GenerateLoot implements Listener {
            return;
        }
        Location lootLocation = event.getLootContext().getLocation();
-        Inventory chestInv = inventoryHolder.getInventory();

        if (inventoryHolder instanceof Chest) {
            Block openedChest = null;
            // look at the current list of opened chest and get the distance
-            // between the lootcontext location and chest location
+            // between the LootContext location and chest location
            // if the distance is less than 1, it's the same chest
            for (Block chest : toolStats.playerInteract.openedChests.keySet()) {
                Location chestLocation = chest.getLocation();
@@ -77,48 +74,13 @@ public class GenerateLoot implements Listener {
                return;
            }

-            // run task later since if it runs on the same tick it breaks
-            Block finalOpenedChest = openedChest;
-            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);
-                            }
-                        }
-                    }
-                }
-            };
-            toolStats.scheduleRegion(runnable, lootLocation.getWorld(), lootLocation.getChunk(), 1);
+            Player player = toolStats.playerInteract.openedChests.get(openedChest);
+            setLoot(event.getLoot(), player);
        }
-        if (inventoryHolder instanceof StorageMinecart) {
-            StorageMinecart mineCart = (StorageMinecart) inventoryHolder;
+        if (inventoryHolder instanceof StorageMinecart mineCart) {
            if (toolStats.playerInteract.openedMineCarts.containsKey(mineCart)) {
                Player player = toolStats.playerInteract.openedMineCarts.get(mineCart);
-                // player clicked this minecart
-                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);
-                        }
-                    }
-                }
+                setLoot(event.getLoot(), player);
            }
        }
    }
@@ -144,17 +106,44 @@ public class GenerateLoot implements Listener {
            return null;
        }

+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
        container.set(toolStats.originType, PersistentDataType.INTEGER, 2);

-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-
-        if (toolStats.checkConfig(newItem, "looted-tag")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(newItem.getType(), "looted-tag")) {
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(newLore);
        }
        newItem.setItemMeta(meta);
        return newItem;
    }
+
+    /**
+     * Add tags to the generated loot.
+     *
+     * @param loot   The loot from the event.
+     * @param player The player triggering the event.
+     */
+    private void setLoot(List<ItemStack> loot, Player player) {
+        for (int i = 0; i < loot.size(); i++) {
+            ItemStack itemStack = loot.get(i);
+            // ignore air
+            if (itemStack == null || itemStack.getType() == Material.AIR) {
+                continue;
+            }
+            if (toolStats.itemChecker.isValidItem(itemStack.getType())) {
+                ItemStack newItem = addLore(itemStack, player);
+                if (newItem != null) {
+                    loot.set(i, newItem);
+                }
+            }
+        }
+    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/InventoryOpen.java
+++ b/src/main/java/lol/hyper/toolstats/events/InventoryOpen.java
@@ -17,11 +17,11 @@

 package lol.hyper.toolstats.events;

+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 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.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -32,7 +32,8 @@ import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scheduler.BukkitRunnable;

-import java.util.List;
+import java.util.UUID;
+import java.util.function.Consumer;

 public class InventoryOpen implements Listener {

@@ -49,38 +50,44 @@ public class InventoryOpen implements Listener {
        }

        Inventory inventory = event.getInventory();
+        Location location = event.getInventory().getLocation();
        for (ItemStack itemStack : inventory) {
            if (itemStack == null) {
                continue;
            }
+            // ignore items that are not the right type
+            if (!toolStats.itemChecker.isValidItem(itemStack.getType())) {
+                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);
+            // generate a hash if the item doesn't have one (if it's enabled in the config)
+            if (toolStats.config.getBoolean("generate-hash-for-items")) {
+                if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
+                    // make sure the item has an owner
+                    if (!container.has(toolStats.genericOwner, new UUIDDataType())) {
+                        continue;
+                    }
+                    UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
+                    if (owner == null) {
+                        continue;
+                    }
+                    Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                    if (timestamp == null) {
+                        continue;
+                    }
+                    String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
+                    toolStats.logger.info(hash);
+                    container.set(toolStats.hash, PersistentDataType.STRING, hash);
                }
-            };
-            Location location = inventory.getLocation();
-            // only run for actual inventories
+            }
+            ItemMeta clone = itemMeta.clone();
            if (location != null) {
-                toolStats.scheduleRegion(runnable, location.getWorld(), location.getChunk(), 1);
+                Bukkit.getRegionScheduler().runDelayed(toolStats, location, scheduledTask -> itemStack.setItemMeta(clone), 1);
            }
        }
    }
--- a/src/main/java/lol/hyper/toolstats/events/PickupItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/PickupItem.java
@@ -19,6 +19,7 @@ package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
@@ -48,13 +49,12 @@ public class PickupItem implements Listener {
            return;
        }
        Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            Player player = (Player) entity;
+        if (entity instanceof Player player) {
            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
                return;
            }
            Item item = event.getItem();
-            if (item.getType() == EntityType.DROPPED_ITEM) {
+            if (item.getType() == EntityType.ITEM) {
                ItemStack itemStack = event.getItem().getItemStack();
                ItemMeta meta = itemStack.getItemMeta();
                if (meta == null) {
@@ -89,16 +89,22 @@ public class PickupItem implements Listener {
        long timeCreated = System.currentTimeMillis();
        Date finalDate = new Date(timeCreated);
        PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(finalItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
        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 formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-
        if (toolStats.config.getBoolean("enabled.elytra-tag")) {
-            meta.setLore(newLore);
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(newLore);
        }
        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
@@ -18,8 +18,8 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Item;
@@ -33,6 +33,7 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.Nullable;

 import java.util.Date;
 import java.util.List;
@@ -59,8 +60,31 @@ public class PlayerFish implements Listener {
        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
            return;
        }
-        // make sure the player is holding a fishing rod
-        // player can fish with their offhand
+
+        ItemStack fishingRod = getItemStack(player);
+        // player swapped items?
+        if (fishingRod == null) {
+            return;
+        }
+
+        // update the fishing rod!
+        updateFishCount(fishingRod);
+
+        // check if the player caught an item
+        if (event.getCaught() == null) {
+            return;
+        }
+        ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
+        Item caughtItemEntity = (Item) event.getCaught();
+        if (toolStats.itemChecker.isValidItem(caughtItem.getType())) {
+            ItemStack newItem = addNewLore(caughtItem, player);
+            if (newItem != null) {
+                caughtItemEntity.setItemStack(newItem);
+            }
+        }
+    }
+
+    private static @Nullable ItemStack getItemStack(Player player) {
        PlayerInventory inventory = player.getInventory();
        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
@@ -77,27 +101,7 @@ public class PlayerFish implements Listener {
        if (isMainHand && isOffHand) {
            fishingRod = inventory.getItemInMainHand();
        }
-
-        // player swapped items?
-        if (fishingRod == null) {
-            return;
-        }
-
-        // update the fishing rod!
-        updateFishCount(fishingRod);
-
-        // check if the player caught an item
-        if (event.getCaught() == null) {
-            return;
-        }
-        ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
-        Item caughtItemEntity = (Item) event.getCaught();
-        if (ItemChecker.isValidItem(caughtItem.getType())) {
-            ItemStack newItem = addNewLore(caughtItem, player);
-            if (newItem != null) {
-                caughtItemEntity.setItemStack(newItem);
-            }
-        }
+        return fishingRod;
    }

    /**
@@ -122,14 +126,18 @@ public class PlayerFish implements Listener {
            toolStats.logger.warning(fishingRod + " does not have valid fish-caught set! Resting to zero. This should NEVER happen.");
        }

-        fishCaught++;
-        container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught);
-
-        String fishCaughtFormatted = toolStats.numberFormat.formatInt(fishCaught);
-        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{fish}", fishCaughtFormatted, "fished.fish-caught");
+        container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught + 1);

        if (toolStats.config.getBoolean("enabled.fish-caught")) {
-            meta.setLore(newLore);
+            String oldFishFormatted = toolStats.numberFormat.formatInt(fishCaught);
+            String newFishFormatted = toolStats.numberFormat.formatInt(fishCaught + 1);
+            Component oldLine = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", oldFishFormatted);
+            Component newLine = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", newFishFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        fishingRod.setItemMeta(meta);
    }
@@ -155,15 +163,17 @@ public class PlayerFish implements Listener {
            return null;
        }

+        String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+
+        container.set(toolStats.hash, PersistentDataType.STRING, hash);
        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
        container.set(toolStats.originType, PersistentDataType.INTEGER, 5);

-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-
-        if (toolStats.checkConfig(newItem, "fished-tag")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(newItem.getType(), "fished-tag")) {
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(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
@@ -17,7 +17,9 @@

 package lol.hyper.toolstats.events;

+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -33,13 +35,15 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.scheduler.BukkitRunnable;

 import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;

 public class PlayerInteract implements Listener {

    private final ToolStats toolStats;

-    public final HashMap<Block, Player> openedChests = new HashMap<>();
-    public final HashMap<StorageMinecart, Player> openedMineCarts = new HashMap<>();
+    public final Map<Block, Player> openedChests = new HashMap<>();
+    public final Map<StorageMinecart, Player> openedMineCarts = new HashMap<>();

    public PlayerInteract(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -63,13 +67,7 @@ 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);
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    openedChests.remove(block);
-                }
-            };
-            toolStats.scheduleGlobal(runnable, 20);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> openedChests.remove(block), 20);
        }
    }

@@ -81,16 +79,10 @@ public class PlayerInteract implements Listener {
            return;
        }
        // store when a player opens a minecart
-        if (clicked.getType() == EntityType.MINECART_CHEST) {
+        if (clicked.getType() == EntityType.CHEST_MINECART) {
            StorageMinecart storageMinecart = (StorageMinecart) clicked;
            openedMineCarts.put(storageMinecart, player);
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    openedMineCarts.remove(storageMinecart);
-                }
-            };
-            toolStats.scheduleGlobal(runnable, 20);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> openedMineCarts.remove(storageMinecart), 20);
        }
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/PlayerJoin.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerJoin.java
@@ -17,10 +17,9 @@

 package lol.hyper.toolstats.events;

+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import lol.hyper.toolstats.tools.UUIDDataType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -32,6 +31,9 @@ import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scheduler.BukkitRunnable;

+import java.util.UUID;
+import java.util.function.Consumer;
+
 public class PlayerJoin implements Listener {

    private final ToolStats toolStats;
@@ -49,35 +51,35 @@ public class PlayerJoin implements Listener {
            if (itemStack == null) {
                continue;
            }
+            // ignore items that are not the right type
+            if (!toolStats.itemChecker.isValidItem(itemStack.getType())) {
+                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);
+            // generate a hash if the item doesn't have one
+            if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
+                // make sure the item has an owner
+                if (!container.has(toolStats.genericOwner, new UUIDDataType())) {
+                    continue;
                }
-            };
-            Location location = inventory.getLocation();
-            // only run for actual inventories
-            if (location != null) {
-                toolStats.scheduleRegion(runnable, location.getWorld(), location.getChunk(), 1);
+                UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
+                if (owner == null) {
+                    continue;
+                }
+                Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                if (timestamp == null) {
+                    continue;
+                }
+                String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
+                container.set(toolStats.hash, PersistentDataType.STRING, hash);
            }
+            ItemMeta clone = itemMeta.clone();
+            player.getScheduler().runDelayed(toolStats, scheduledTask -> itemStack.setItemMeta(clone), null, 1);
        }
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/PlayerMove.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerMove.java
@@ -0,0 +1,108 @@
+/*
+ * 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 net.kyori.adventure.text.Component;
+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.player.PlayerMoveEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class PlayerMove implements Listener {
+
+    private final ToolStats toolStats;
+    private final Map<Player, Long> playerStartFlight = new HashMap<>();
+
+    public PlayerMove(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onCraft(PlayerMoveEvent event) {
+        Player player = event.getPlayer();
+        // player starts to fly
+        if (player.isGliding()) {
+            // if they are flying, and we don't have them tracked, add them
+            if (!playerStartFlight.containsKey(player)) {
+                playerStartFlight.put(player, System.currentTimeMillis());
+            }
+        } else {
+            // player is not flying
+            if (playerStartFlight.containsKey(player)) {
+                trackFlight(player, playerStartFlight.get(player));
+                playerStartFlight.remove(player);
+            }
+        }
+    }
+
+    private void trackFlight(Player player, long startTime) {
+        ItemStack chest = player.getInventory().getChestplate();
+        // make sure their chest piece is an elytra
+        if (chest == null || chest.getType() != Material.ELYTRA) {
+            return;
+        }
+        ItemMeta meta = chest.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(chest + " does NOT have any meta! Unable to update stats.");
+            return;
+        }
+
+        // read the current stats from the item
+        // if they don't exist, then start from 0
+        Long flightTime = 0L;
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (container.has(toolStats.flightTime, PersistentDataType.LONG)) {
+            flightTime = container.get(toolStats.flightTime, PersistentDataType.LONG);
+        }
+
+        if (flightTime == null) {
+            flightTime = 0L;
+            toolStats.logger.warning(flightTime + " does not have valid flight-time set! Resting to zero. This should NEVER happen.");
+        }
+
+        // get the duration of the flight
+        long duration = (System.currentTimeMillis() - startTime);
+        double newDuration = flightTime + duration;
+        container.set(toolStats.flightTime, PersistentDataType.LONG, flightTime + duration);
+
+        // do we add the lore based on the config?
+        if (toolStats.config.getBoolean("enabled.flight-time")) {
+            String oldFlightFormatted = toolStats.numberFormat.formatDouble((double) flightTime / 1000);
+            String newFlightFormatted = toolStats.numberFormat.formatDouble(newDuration / 1000);
+            Component oldLine = toolStats.configTools.formatLore("flight-time", "{time}", oldFlightFormatted);
+            Component newLine = toolStats.configTools.formatLore("flight-time", "{time}", newFlightFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
+        }
+        chest.setItemMeta(meta);
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/SheepShear.java
+++ b/src/main/java/lol/hyper/toolstats/events/SheepShear.java
@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
@@ -32,6 +33,7 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.Nullable;

 import java.util.List;

@@ -53,12 +55,26 @@ public class SheepShear implements Listener {
            return;
        }
        Entity entity = event.getRightClicked();
-        if (!(entity instanceof Sheep)) {
+        if (!(entity instanceof Sheep sheep)) {
            return;
        }

-        // make sure the player is holding shears
-        // player can shear with their offhand
+        ItemStack shears = getShears(player);
+        // player swapped items?
+        if (shears == null) {
+            return;
+        }
+
+        // make sure the sheep is not sheared
+        if (sheep.isSheared()) {
+            return;
+        }
+
+        // update the stats
+        addLore(shears);
+    }
+
+    private static @Nullable ItemStack getShears(Player player) {
        PlayerInventory inventory = player.getInventory();
        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.SHEARS;
        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
@@ -70,26 +86,12 @@ public class SheepShear implements Listener {
            shears = inventory.getItemInOffHand();
        }

-        // if the player is hold fishing rods in both hands
+        // if the player is hold shears 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()) {
-            return;
-        }
-
-        // update the stats
-        ItemStack finalShears = shears;
-        addLore(finalShears);
+        return shears;
    }

    /**
@@ -114,14 +116,18 @@ public class SheepShear implements Listener {
            toolStats.logger.warning(newShears + " does not have valid sheared set! Resting to zero. This should NEVER happen.");
        }

-        sheepSheared++;
-        container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared);
-
-        String sheepShearedFormatted = toolStats.numberFormat.formatInt(sheepSheared);
-        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{sheep}", sheepShearedFormatted, "sheep-sheared");
+        container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared + 1);

        if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
-            meta.setLore(newLore);
+            String oldSheepFormatted = toolStats.numberFormat.formatInt(sheepSheared);
+            String newSheepFormatted = toolStats.numberFormat.formatInt(sheepSheared + 1);
+            Component oldLine = toolStats.configTools.formatLore("sheep-sheared", "{sheep}", oldSheepFormatted);
+            Component newLine = toolStats.configTools.formatLore("sheep-sheared", "{sheep}", newSheepFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
        }
        newShears.setItemMeta(meta);
    }
--- a/src/main/java/lol/hyper/toolstats/events/ShootBow.java
+++ b/src/main/java/lol/hyper/toolstats/events/ShootBow.java
@@ -0,0 +1,124 @@
+/*
+ * 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 net.kyori.adventure.text.Component;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityShootBowEvent;
+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 org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class ShootBow implements Listener {
+
+    private final ToolStats toolStats;
+
+    public ShootBow(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onShoot(EntityShootBowEvent event) {
+        Entity shooter = event.getEntity();
+        // only listen for players
+        if (!(shooter instanceof Player player)) {
+            return;
+        }
+
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.ADVENTURE) {
+            return;
+        }
+
+        PlayerInventory inventory = player.getInventory();
+        ItemStack heldBow = getBow(inventory);
+
+        // player swapped
+        if (heldBow == null) {
+            return;
+        }
+
+        updateArrowsShot(heldBow);
+    }
+
+    private static @Nullable ItemStack getBow(PlayerInventory inventory) {
+        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 holding a bow in both hands
+        // default to main hand since that takes priority
+        if (isMainHand && isOffHand) {
+            heldBow = inventory.getItemInMainHand();
+        }
+        return heldBow;
+    }
+
+    private void updateArrowsShot(ItemStack bow) {
+        ItemMeta meta = bow.getItemMeta();
+        if (meta == null) {
+            toolStats.logger.warning(bow + " does NOT have any meta! Unable to update stats.");
+            return;
+        }
+        // read the current stats from the item
+        // if they don't exist, then start from 0
+        Integer arrowsShot = 0;
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (container.has(toolStats.arrowsShot, PersistentDataType.INTEGER)) {
+            arrowsShot = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
+        }
+
+        if (arrowsShot == null) {
+            arrowsShot = 0;
+            toolStats.logger.warning(arrowsShot + " does not have valid arrows-shot set! Resting to zero. This should NEVER happen.");
+        }
+
+        container.set(toolStats.arrowsShot, PersistentDataType.INTEGER, arrowsShot + 1);
+
+        // do we add the lore based on the config?
+        if (toolStats.config.getBoolean("enabled.arrows-shot")) {
+            String oldArrowsFormatted = toolStats.numberFormat.formatInt(arrowsShot);
+            String newArrowsFormatted = toolStats.numberFormat.formatInt(arrowsShot + 1);
+            Component oldLine = toolStats.configTools.formatLore("arrows-shot", "{arrows}", oldArrowsFormatted);
+            Component newLine = toolStats.configTools.formatLore("arrows-shot", "{arrows}", newArrowsFormatted);
+            if (oldLine == null || newLine == null) {
+                return;
+            }
+            List<Component> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
+            meta.lore(newLore);
+        }
+        bow.setItemMeta(meta);
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
+++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
@@ -18,8 +18,8 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.ItemChecker;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -52,10 +52,9 @@ public class VillagerTrade implements Listener {
            return;
        }
        Inventory inventory = event.getClickedInventory();
-        if (!(event.getWhoClicked() instanceof Player)) {
+        if (!(event.getWhoClicked() instanceof Player player)) {
            return;
        }
-        Player player = (Player) event.getWhoClicked();
        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
            return;
        }
@@ -65,14 +64,14 @@ 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 (!toolStats.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));
+                    Component component = toolStats.configTools.formatLore("shift-click-warning.trading", null, null);
+                    if (component != null) {
+                        event.getWhoClicked().sendMessage(component);
                    }
                }
                ItemStack newItem = addLore(item, player);
@@ -106,15 +105,20 @@ public class VillagerTrade implements Listener {
            return null;
        }

+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
        container.set(toolStats.originType, PersistentDataType.INTEGER, 3);

-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-
-        if (toolStats.checkConfig(newItem, "traded-tag")) {
-            meta.setLore(newLore);
+        if (toolStats.configTools.checkConfig(newItem.getType(), "traded-tag")) {
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(newLore);
        }
        newItem.setItemMeta(meta);
        return newItem;
--- a/src/main/java/lol/hyper/toolstats/tools/HashMaker.java
+++ b/src/main/java/lol/hyper/toolstats/tools/HashMaker.java
@@ -0,0 +1,60 @@
+/*
+ * 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.Material;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
+public class HashMaker {
+
+    private final ToolStats toolStats;
+
+    public HashMaker(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    public String makeHash(Material itemType, UUID player, long timestamp) {
+        String input = itemType.toString() + player.toString() + timestamp;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] hashBytes = md.digest(input.getBytes(StandardCharsets.UTF_8));
+
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : hashBytes) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) {
+                    hexString.append('0');
+                }
+                hexString.append(hex);
+            }
+
+            return hexString.toString();
+        } catch (NoSuchAlgorithmException exception) {
+            toolStats.logger.warning("Unable to generate hash for " + player + "!");
+            toolStats.logger.warning("Generating a random UUID instead.");
+            exception.printStackTrace();
+            return java.util.UUID.randomUUID().toString();
+        }
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
+++ b/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
@@ -19,15 +19,52 @@ package lol.hyper.toolstats.tools;

 import org.bukkit.Material;

-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;

 public class ItemChecker {

-    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" };
+    private final List<Material> validItems = new ArrayList<>();
+    private final List<Material> armorItems = new ArrayList<>();
+    private final List<Material> meleeItems = new ArrayList<>();
+    private final List<Material> mineItems = new ArrayList<>();
+
+    /**
+     * Creates an item checker and saves all valid items we want.
+     */
+    public ItemChecker() {
+        for (Material material : Material.values()) {
+            String lowerCase = material.toString().toLowerCase(Locale.ROOT);
+            if (lowerCase.contains("_pickaxe") || lowerCase.contains("_axe") || lowerCase.contains("_hoe") || lowerCase.contains("_shovel")) {
+                mineItems.add(material);
+            }
+
+            if (lowerCase.contains("_sword") || lowerCase.contains("_axe")) {
+                meleeItems.add(material);
+            }
+
+            if (lowerCase.contains("_helmet") || lowerCase.contains("_chestplate") || lowerCase.contains("_leggings") || lowerCase.contains("_boots")) {
+                armorItems.add(material);
+            }
+            if (lowerCase.equalsIgnoreCase("mace")) {
+                meleeItems.add(material);
+            }
+        }
+
+        // hardcode these
+        mineItems.add(Material.SHEARS);
+        meleeItems.add(Material.TRIDENT);
+        validItems.add(Material.BOW);
+        validItems.add(Material.FISHING_ROD);
+        validItems.add(Material.CROSSBOW);
+        validItems.add(Material.ELYTRA);
+
+        // combine the lists
+        validItems.addAll(armorItems);
+        validItems.addAll(meleeItems);
+        validItems.addAll(mineItems);
+    }

    /**
     * Check if item is an armor piece.
@@ -35,8 +72,8 @@ public class ItemChecker {
     * @param itemType The item type, not name.
     * @return If the item is an armor piece.
     */
-    public static boolean isArmor(Material itemType) {
-        return Arrays.stream(validArmor).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    public boolean isArmor(Material itemType) {
+        return armorItems.contains(itemType);
    }

    /**
@@ -45,8 +82,8 @@ public class ItemChecker {
     * @param itemType The item type, not name.
     * @return If the item something we want to track.
     */
-    public static boolean isValidItem(Material itemType) {
-        return Arrays.stream(validItems).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    public boolean isValidItem(Material itemType) {
+        return validItems.contains(itemType);
    }

    /**
@@ -55,8 +92,8 @@ public class ItemChecker {
     * @param itemType The item type, not name.
     * @return If the item is a melee weapon.
     */
-    public static boolean isMeleeWeapon(Material itemType) {
-        return Arrays.stream(validMelee).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    public boolean isMeleeWeapon(Material itemType) {
+        return meleeItems.contains(itemType);
    }

    /**
@@ -65,7 +102,7 @@ public class ItemChecker {
     * @param itemType The item type, not name.
     * @return If the item is a mining tool.
     */
-    public static boolean isMineTool(Material itemType) {
-        return Arrays.stream(validMine).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    public boolean isMineTool(Material itemType) {
+        return mineItems.contains(itemType);
    }
 }
--- a/src/main/java/lol/hyper/toolstats/tools/ItemLore.java
+++ b/src/main/java/lol/hyper/toolstats/tools/ItemLore.java
@@ -18,6 +18,8 @@
 package lol.hyper.toolstats.tools;

 import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
@@ -34,167 +36,172 @@ public class ItemLore {
    }

    /**
-     * Adds new lore to an item.
+     * Updates existing lore on 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.
+     * @param itemMeta The item's meta.
+     * @param oldLine  The old line to replace.
+     * @param newLine  The new line to replace oldLine.
     * @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);
-
+    public List<Component> updateItemLore(ItemMeta itemMeta, Component oldLine, Component newLine) {
+        List<Component> itemLore;
        if (itemMeta.hasLore()) {
-            newLore = itemMeta.getLore();
+            itemLore = itemMeta.lore();
            // 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
+            for (int x = 0; x < itemLore.size(); x++) {
+                Component line = itemLore.get(x);
+                // find the old line to update, keeping index
                // this means we update this line only!
-                if (newLore.get(x).contains(configLore)) {
-                    newLore.set(x, newLine);
-                    return newLore;
+                if (line.equals(oldLine)) {
+                    itemLore.set(x, newLine);
+                    return itemLore;
                }
            }
            // if the item has lore, but we didn't find the line
-            newLore.add(newLine);
+            itemLore.add(newLine);
        } else {
            // if the item has no lore, create a new list and add the line
-            newLore = new ArrayList<>();
-            newLore.add(newLine);
+            itemLore = new ArrayList<>();
+            itemLore.add(newLine);
        }
-        return newLore;
+        return itemLore;
+    }
+
+    public List<Component> addItemLore(ItemMeta itemMeta, Component newLine) {
+        List<Component> itemLore;
+        if (itemMeta.hasLore()) {
+            itemLore = itemMeta.lore();
+            itemLore.add(newLine);
+        } else {
+            itemLore = new ArrayList<>();
+            itemLore.add(newLine);
+        }
+        return itemLore;
    }

    /**
-     * Adds new ownership tag to an item.
+     * Adds new ownership 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;
+    public List<Component> addNewOwner(ItemMeta itemMeta, String playerName, String formattedDate) {
+        Component dateCreatedLore;
+        Component itemOwnerLore;
        Integer origin = null;
        PersistentDataContainer container = itemMeta.getPersistentDataContainer();
        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
            origin = container.get(toolStats.originType, PersistentDataType.INTEGER);
        }

+        // if the origin is broken, don't try to set the lore
        if (origin == null) {
-            origin = -1;
+            toolStats.logger.info("Unable to determine origin for item " + itemMeta.getAsString());
+            toolStats.logger.info("This IS a bug, please report this to the GitHub.");
+            return itemMeta.lore();
        }

+        // set the lore based on the origin
        switch (origin) {
            case 2: {
-                dateCreated = toolStats.getLoreFromConfig("looted.looted-on", true);
-                itemOwner = toolStats.getLoreFromConfig("looted.looted-by", true);
+                dateCreatedLore = toolStats.configTools.formatLore("looted.looted-on", "{date}", formattedDate);
+                itemOwnerLore = toolStats.configTools.formatLore("looted.looted-by", "{player}", playerName);
+
+                if (dateCreatedLore == null) {
+                    toolStats.logger.warning("messages.looted.looted-on is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                if (itemOwnerLore == null) {
+                    toolStats.logger.warning("messages.looted.looted-by is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
                break;
            }
            case 3: {
-                dateCreated = toolStats.getLoreFromConfig("traded.traded-on", true);
-                itemOwner = toolStats.getLoreFromConfig("traded.traded-by", true);
+                dateCreatedLore = toolStats.configTools.formatLore("traded.traded-on", "{date}", formattedDate);
+                itemOwnerLore = toolStats.configTools.formatLore("traded.traded-by", "{player}", playerName);
+
+                if (dateCreatedLore == null) {
+                    toolStats.logger.warning("messages.traded.traded-on is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                if (itemOwnerLore == null) {
+                    toolStats.logger.warning("messages.traded.traded-by is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
                break;
            }
            case 4: {
-                dateCreated = toolStats.getLoreFromConfig("looted.found-on", true);
-                itemOwner = toolStats.getLoreFromConfig("looted.found-by", true);
+                dateCreatedLore = toolStats.configTools.formatLore("looted.found-on", "{date}", formattedDate);
+                itemOwnerLore = toolStats.configTools.formatLore("looted.found-by", "{player}", playerName);
+
+                if (dateCreatedLore == null) {
+                    toolStats.logger.warning("messages.looted.found-on is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                if (itemOwnerLore == null) {
+                    toolStats.logger.warning("messages.looted.found-by is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
                break;
            }
            case 5: {
-                dateCreated = toolStats.getLoreFromConfig("fished.caught-on", true);
-                itemOwner = toolStats.getLoreFromConfig("fished.caught-by", true);
+                dateCreatedLore = toolStats.configTools.formatLore("fished.caught-on", "{date}", formattedDate);
+                itemOwnerLore = toolStats.configTools.formatLore("fished.caught-by", "{player}", playerName);
+
+                if (dateCreatedLore == null) {
+                    toolStats.logger.warning("messages.fished.caught-on is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                if (itemOwnerLore == null) {
+                    toolStats.logger.warning("messages.fished.caught-by is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
                break;
            }
+            case 6: {
+                dateCreatedLore = toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", formattedDate);
+                itemOwnerLore = toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", playerName);
+
+                if (dateCreatedLore == null) {
+                    toolStats.logger.warning("messages.spawned-in.spawned-on is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                if (itemOwnerLore == null) {
+                    toolStats.logger.warning("messages.spawned-in.spawned-by is not set in your config!");
+                    toolStats.logger.warning("Unable to update lore for item.");
+                    return itemMeta.lore();
+                }
+                break;
+            }
+            default: {
+                toolStats.logger.warning("Origin " + origin + " was found. Data was modified OR something REALLY broke.");
+                toolStats.logger.warning(itemMeta.getAsString());
+                return itemMeta.lore();
+            }
        }

-        if (dateCreated == null || itemOwner == null) {
-            toolStats.logger.info("Unable to determine origin of item for " + itemMeta);
-            return itemMeta.getLore();
-        }
-
-        List<String> newLore;
+        List<Component> newLore;
        if (itemMeta.hasLore()) {
-            newLore = itemMeta.getLore();
+            newLore = itemMeta.lore();
        } else {
            newLore = new ArrayList<>();
        }

-        newLore.add(dateCreated.replace("{date}", formattedDate));
-        newLore.add(itemOwner.replace("{player}", playerName));
+        newLore.add(dateCreatedLore);
+        newLore.add(itemOwnerLore);
        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/config/ConfigTools.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java
@@ -0,0 +1,145 @@
+/*
+ * 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.config;
+
+import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.Material;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ConfigTools {
+
+    private final ToolStats toolStats;
+    public static final Pattern COLOR_CODES = Pattern.compile("[&§]([0-9a-fk-or])");
+    public static final Pattern CONFIG_HEX_PATTERN = Pattern.compile("[&§]#([A-Fa-f0-9]{6})");
+    public static final Pattern MINECRAFT_HEX_PATTERN = Pattern.compile("§x(?:§[a-fA-F0-9]){6}|§[a-fA-F0-9]");
+
+    public ConfigTools(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Checks the config to see if we want to show lore on certain items.
+     *
+     * @param material   The item type to check.
+     * @param configName The config we are checking under.
+     * @return If we want to allow lore or not.
+     */
+    public boolean checkConfig(Material material, String configName) {
+        String itemName = material.toString().toLowerCase();
+        String itemType = null;
+        // hardcode these
+        if (material == Material.BOW || material == Material.CROSSBOW || material == Material.SHEARS || material == Material.TRIDENT || material == Material.FISHING_ROD) {
+            switch (material) {
+                case CROSSBOW:
+                case BOW: {
+                    itemType = "bow";
+                    break;
+                }
+                case SHEARS: {
+                    itemType = "shears";
+                    break;
+                }
+                case TRIDENT: {
+                    itemType = "trident";
+                    break;
+                }
+                case FISHING_ROD: {
+                    itemType = "fishing-rod";
+                    break;
+                }
+            }
+        } else {
+            itemType = itemName.substring(itemName.indexOf('_') + 1);
+        }
+
+        return switch (itemType) {
+            case "pickaxe" -> toolStats.config.getBoolean("enabled." + configName + ".pickaxe");
+            case "sword" -> toolStats.config.getBoolean("enabled." + configName + ".sword");
+            case "shovel" -> toolStats.config.getBoolean("enabled." + configName + ".shovel");
+            case "axe" -> toolStats.config.getBoolean("enabled." + configName + ".axe");
+            case "hoe" -> toolStats.config.getBoolean("enabled." + configName + ".hoe");
+            case "shears" -> toolStats.config.getBoolean("enabled." + configName + ".shears");
+            case "crossbow", "bow" -> toolStats.config.getBoolean("enabled." + configName + ".bow");
+            case "trident" -> toolStats.config.getBoolean("enabled." + configName + ".trident");
+            case "fishing-rod" -> toolStats.config.getBoolean("enabled." + configName + ".fishing-rod");
+            case "mace" -> toolStats.config.getBoolean("enabled." + configName + ".mace");
+            case "helmet", "chestplate", "leggings", "boots" ->
+                    toolStats.config.getBoolean("enabled." + configName + ".armor");
+            default -> false;
+        };
+    }
+
+    /**
+     * Format a string to be ready for lore usage.
+     *
+     * @param configName  The message to use.
+     * @param placeHolder The placeholder text in the message.
+     * @param value       The value to set the placeholder.
+     * @return Formatted string, null if the configName doesn't exist.
+     */
+    public Component formatLore(String configName, String placeHolder, Object value) {
+        String lore = toolStats.config.getString("messages." + configName);
+        if (lore == null) {
+            toolStats.logger.warning("Unable to find config message for: messages." + configName);
+            return null;
+        }
+
+        // if the config message is empty, don't send it
+        if (lore.isEmpty()) {
+            return null;
+        }
+
+        // the final component for this lore
+        Component component;
+
+        // set the placeholder to the value
+        if (placeHolder != null && value != null) {
+            lore = lore.replace(placeHolder, String.valueOf(value));
+        }
+
+        // if we match the old color codes, then format them as so
+        Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(lore);
+        Matcher colorMatcher = COLOR_CODES.matcher(lore);
+        if (hexMatcher.find() || colorMatcher.find()) {
+            component = LegacyComponentSerializer.legacyAmpersand().deserialize(lore);
+        } else {
+            // otherwise format them normally
+            component = Component.text(lore);
+        }
+
+        return component.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE);
+    }
+
+    /**
+     * Remove all color codes from a message.
+     *
+     * @param message The message.
+     * @return The message without color codes.
+     */
+    public String removeColor(String message) {
+        message = MINECRAFT_HEX_PATTERN.matcher(message).replaceAll("");
+        message = COLOR_CODES.matcher(message).replaceAll("");
+        message = CONFIG_HEX_PATTERN.matcher(message).replaceAll("");
+        return message;
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/config/ConfigUpdater.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/ConfigUpdater.java
@@ -0,0 +1,74 @@
+/*
+ * 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/>.
+ */
+
+/*
+ * 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.config;
+
+import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.config.versions.Version6;
+import lol.hyper.toolstats.tools.config.versions.Version7;
+import lol.hyper.toolstats.tools.config.versions.Version8;
+
+public class ConfigUpdater {
+
+    private final ToolStats toolStats;
+
+    public ConfigUpdater(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    public void updateConfig() {
+        int version = toolStats.config.getInt("config-version");
+
+        switch(version) {
+            case 5: {
+                // Version 5 to 6
+                Version6 version6 = new Version6(toolStats);
+                version6.update();
+                break;
+            }
+            case 6: {
+                // Version 6 to 7
+                Version7 version7 = new Version7(toolStats);
+                version7.update();
+                break;
+            }
+            case 7: {
+                // Version 7 to 8
+                Version8 version8 = new Version8(toolStats);
+                version8.update();
+                break;
+            }
+        }
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/config/versions/Version6.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/versions/Version6.java
@@ -0,0 +1,116 @@
+/*
+ * 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.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Version6 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 5 to 6.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version6(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-5.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-5.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 6.");
+        toolStats.config.set("config-version", 6);
+        toolStats.logger.info("Adding enabled.spawned-in.pickaxe to config.yml.");
+        toolStats.config.set("enabled.spawned-in.pickaxe", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.sword to config.yml.");
+        toolStats.config.set("enabled.spawned-in.sword", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.shovel to config.yml.");
+        toolStats.config.set("enabled.spawned-in.shovel", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.axe to config.yml.");
+        toolStats.config.set("enabled.spawned-in.axe", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.hoe to config.yml.");
+        toolStats.config.set("enabled.spawned-in.hoe", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.fishing-rod to config.yml.");
+        toolStats.config.set("enabled.spawned-in.fishing-rod", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.shears to config.yml.");
+        toolStats.config.set("enabled.spawned-in.shears", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.bow to config.yml.");
+        toolStats.config.set("enabled.spawned-in.bow", true);
+
+        toolStats.logger.info("Adding enabled.spawned-in.armor to config.yml.");
+        toolStats.config.set("enabled.spawned-in.armor", true);
+
+        toolStats.logger.info("Adding messages.spawned-in.spawned-by to config.yml.");
+        toolStats.config.set("messages.spawned-in.spawned-by", "&7Spawned in by: &8{player}");
+
+        toolStats.logger.info("Adding messages.spawned-in.spawned-on to config.yml.");
+        toolStats.config.set("messages.spawned-in.spawned-on", "&7Spawned on: &8{date}");
+
+        toolStats.logger.info("Adding generate-hash-for-items to config.yml.");
+        toolStats.config.set("generate-hash-for-items", true);
+
+        toolStats.logger.info("Adding enabled.arrows-shot to config.yml.");
+        toolStats.config.set("enabled.arrows-shot", true);
+
+        toolStats.logger.info("Adding messages.arrows-shot to config.yml.");
+        toolStats.config.set("messages.arrows-shot", "&7Arrows shot: &8{arrows}");
+
+        List<String> hashComments = new ArrayList<>();
+        hashComments.add("When any tool is created, it will generate a hash for the item.");
+        hashComments.add("This hash is not on the item lore, only stored in the NBT data.");
+        hashComments.add("This has no use currently, but can be used for future features for dupe detection.");
+        toolStats.config.setComments("generate-hash-for-items", hashComments);
+
+        toolStats.config.setComments("enabled.spawned-in", Collections.singletonList("Will show \"Spawned in by <player>\""));
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 6. A copy of version 5 has been saved as config-5.yml");
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/config/versions/Version7.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/versions/Version7.java
@@ -0,0 +1,70 @@
+/*
+ * 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.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Version7 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 6 to 7.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version7(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-6.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-6.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 7.");
+        toolStats.config.set("config-version", 7);
+
+        toolStats.logger.info("Adding messages.flight-time to config.yml.");
+        toolStats.config.set("messages.flight-time", "&7Flight time: &8{time}");
+
+        toolStats.logger.info("Adding enabled.flight-time to config.yml.");
+        toolStats.config.set("enabled.flight-time", true);
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 7. A copy of version 6 has been saved as config-6.yml");
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/config/versions/Version8.java
+++ b/src/main/java/lol/hyper/toolstats/tools/config/versions/Version8.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.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Version8 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 7 to 8.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version8(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-7.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-7.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 8.");
+        toolStats.config.set("config-version", 8);
+
+        // Add example to setting mob names
+        toolStats.logger.info("Adding example for messages.mob.ZOMBIE");
+        toolStats.config.set("messages.mob.ZOMBIE", "Zombie");
+
+        // Add mace to enabled sections
+        toolStats.logger.info("Adding entry for enabled.created-by.mace");
+        toolStats.config.set("enabled.created-by.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.created-date.mace");
+        toolStats.config.set("enabled.created-date.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.player-kills.mace");
+        toolStats.config.set("enabled.player-kills.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.mob-kills.mace");
+        toolStats.config.set("enabled.mob-kills.mace", true);
+
+        List<String> mobComments = new ArrayList<>();
+        mobComments.add("Set display name for mobs. See: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html");
+        toolStats.config.setComments("messages.mob", mobComments);
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 8. A copy of version 7 has been saved as config-7.yml");
+    }
+}
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -9,6 +9,7 @@ enabled:
    shears: true
    bow: true
    armor: true
+    mace: true
  # Will show time the item is created
  created-date:
    pickaxe: true
@@ -19,6 +20,7 @@ enabled:
    shears: true
    bow: true
    armor: true
+    mace: true
  # Will show "Fished by <player>"
  fished-tag:
    pickaxe: true
@@ -54,22 +56,37 @@ enabled:
    axe: true
    trident: true
    bow: true
+    mace: true
  mob-kills:
    sword: true
    axe: true
    trident: true
    bow: true
+    mace: true
  blocks-mined:
    pickaxe: true
    shovel: true
    axe: true
    hoe: true
    shears: true
+  # Will show "Spawned in by <player>"
+  spawned-in:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+    mace: true
  fish-caught: true
  sheep-sheared: true
  armor-damage: true
  dropped-by: true
  elytra-tag: true
+  arrows-shot: true
+  flight-time: true

 messages:
  created:
@@ -90,15 +107,24 @@ messages:
  kills:
    mob: "&7Mob kills: &8{kills}"
    player: "&7Player kills: &8{kills}"
+  spawned-in:
+    spawned-by: "&7Spawned in by: &8{player}"
+    spawned-on: "&7Spawned on: &8{date}"
  blocks-mined: "&7Blocks mined: &8{blocks}"
+  crops-harvested: "&7Crops harvested: &8{crops}"
  sheep-sheared: "&7Sheep sheared: &8{sheep}"
  dropped-by: "&7Dropped by: &8{name}" # name will be player/mob name
  damage-taken: "&7Damage taken: &8{damage}"
+  arrows-shot: "&7Arrows shot: &8{arrows}"
+  flight-time: "&7Flight time: &8{time}"
  # Display this message if the player shift click trades/crafts items. It's not really easy to get every single item
  # that is crafted. The tag will only be added to the first item. If you don't want this message, simply replace them both with ""
  shift-click-warning:
    crafting: "&cCrafting items via shift clicking does not fully apply tags to each item. This is a limitation with the Bukkit API."
    trading: "&cTrading items via shift clicking does not fully apply tags to each item. This is a limitation with the Bukkit API."
+  # Set display name for mobs. See: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html
+  mobs:
+    ZOMBIE: "Zombie"

 # Change the default formatting for dates.
 # See: https://www.digitalocean.com/community/tutorials/java-simpledateformat-java-date-format
@@ -113,4 +139,9 @@ number-formats:
  comma-format: "#,###"
  decimal-format: "#,###.00"

-config-version: 5
+# When any tool is created, it will generate a hash for the item.
+# This hash is not on the item lore, only stored in the NBT data.
+# This has no use currently, but can be used for future features for dupe detection.
+generate-hash-for-items: true
+
+config-version: 7
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,9 +1,10 @@
 name: ToolStats
 version: '${project.version}'
 main: lol.hyper.toolstats.ToolStats
-api-version: 1.15
+api-version: 1.21
 author: hyperdefined
 description: Track various tool stats!
+website: https://github.com/hyperdefined/ToolStats
 folia-supported: true
 commands:
  toolstats: