unify lore management

Author: hyperdefined

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -21,6 +21,7 @@
 import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
 import lol.hyper.toolstats.commands.CommandToolStats;
 import lol.hyper.toolstats.events.*;
+import lol.hyper.toolstats.tools.ItemLore;
 import lol.hyper.toolstats.tools.NumberFormat;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
@@ -69,6 +70,7 @@ public final class ToolStats extends JavaPlugin {
     public SheepShear sheepShear;
     public VillagerTrade villagerTrade;
     public CommandToolStats commandToolStats;
+    public ItemLore itemLore;
 
     public final Logger logger = this.getLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
@@ -99,6 +101,7 @@ public void onEnable() {
         sheepShear = new SheepShear(this);
         villagerTrade = new VillagerTrade(this);
         commandToolStats = new CommandToolStats(this);
+        itemLore = new ItemLore(this);
 
         Bukkit.getServer().getPluginManager().registerEvents(blocksMined, this);
         Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);

src/main/java/lol/hyper/toolstats/events/BlocksMined.java

@@ -19,9 +19,7 @@
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.ItemChecker;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -33,7 +31,6 @@
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class BlocksMined implements Listener {
@@ -60,8 +57,8 @@ public void onBreak(BlockBreakEvent event) {
         if (!ItemChecker.isMineTool(heldItem.getType())) {
             return;
         }
-        // if it's an item we want, update the stats
-        Bukkit.getScheduler().runTaskLater(toolStats, () -> updateBlocksMined(heldItem), 1);
+        // update the blocks mined
+        updateBlocksMined(heldItem);
     }
 
     private void updateBlocksMined(ItemStack playerTool) {
@@ -86,40 +83,17 @@ private void updateBlocksMined(ItemStack playerTool) {
         blocksMined++;
         container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);
 
-        String configLore = toolStats.getLoreFromConfig("blocks-mined", false);
-        String configLoreRaw = toolStats.getLoreFromConfig("blocks-mined", true);
+        String blocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
+        List<String> newLore = toolStats.itemLore.addItemLore(meta, "{blocks}", blocksMinedFormatted, "blocks-mined");
 
-        if (configLore == null || configLoreRaw == null) {
-            toolStats.logger.warning("There is no lore message for messages.blocks-mined!");
+        // if the list returned null, don't add it
+        if (newLore == null) {
             return;
         }
 
-        List<String> lore;
-        String newLine = configLoreRaw.replace("{blocks}", toolStats.numberFormat.formatInt(blocksMined));
-        if (meta.hasLore()) {
-            lore = meta.getLore();
-            boolean hasLore = false;
-            // we do a for loop like this, we can keep track of index
-            // this doesn't mess the lore up of existing items
-            for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains(configLore)) {
-                    hasLore = true;
-                    lore.set(x, newLine);
-                    break;
-                }
-            }
-            // if the item has lore but doesn't have the tag, add it
-            if (!hasLore) {
-                lore.add(newLine);
-            }
-        } else {
-            // if the item has no lore, create a new list and add the string
-            lore = new ArrayList<>();
-            lore.add(newLine);
-        }
         // do we add the lore based on the config?
         if (toolStats.checkConfig(playerTool, "blocks-mined")) {
-            meta.setLore(lore);
+            meta.setLore(newLore);
         }
         playerTool.setItemMeta(meta);
     }