Writes a lot of code necessary for the scrapper

Adds the classes necessary for the new scrapper
Partly implements some scrapper functionality
Restructures some classes to reduce code duplication
Moves some classes to make some classes easier to find
Adds a bunch of TODOs where things have an unfinished implementation

src/main/java/net/knarcraft/blacksmith/trait/ReforgeSession.java

@@ -11,7 +11,7 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitScheduler;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -25,14 +25,11 @@ import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.send
 /**
  * A representation of the session between a player and a blacksmith
  */
-public class ReforgeSession implements Runnable {
+public class ReforgeSession extends Session implements Runnable {
 
     private final BlacksmithTrait blacksmithTrait;
-    private final Player player;
     private final NPC npc;
     private final ItemStack itemToReforge;
-    private int taskId;
-    private long finishTime = 0;
     private final BlacksmithNPCSettings config;
     private static final String[] enchantments = new String[Enchantment.values().length];
     private static final Random random = new Random();
@@ -45,9 +42,10 @@ public class ReforgeSession implements Runnable {
      * @param npc             <p>The Blacksmith NPC involved in the session</p>
      * @param config          <p>The config to use for the session</p>
      */
-    ReforgeSession(BlacksmithTrait blacksmithTrait, Player player, NPC npc, BlacksmithNPCSettings config) {
+    ReforgeSession(@NotNull BlacksmithTrait blacksmithTrait, @NotNull Player player, @NotNull NPC npc,
+                   @NotNull BlacksmithNPCSettings config) {
+        super(player);
         this.blacksmithTrait = blacksmithTrait;
-        this.player = player;
         this.npc = npc;
         this.itemToReforge = player.getInventory().getItemInMainHand();
         this.config = config;
@@ -61,13 +59,31 @@ public class ReforgeSession implements Runnable {
         }
     }
 
-    /**
-     * Gets the time in milliseconds when this reforging session will finish
-     *
-     * @return <p>The time the reforging will finish</p>
-     */
-    public long getFinishTime() {
-        return this.finishTime;
+    @Override
+    public boolean isSessionInvalid() {
+        // Prevent player from switching items during session
+        ItemStack itemInHand = player.getInventory().getItemInMainHand();
+        if (!itemToReforge.equals(itemInHand)) {
+            sendNPCMessage(this.npc, player, config.getItemChangedMessage());
+            return true;
+        }
+        // The player is unable to pay
+        if (EconomyManager.cannotPayForHeldItemReforge(player)) {
+            sendNPCMessage(this.npc, player, config.getInsufficientFundsMessage());
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected int getActionDelay() {
+        if (config.getMaxReforgeDelay() > 0) {
+            //Finish the reforging after a random delay between the max and min
+            return new Random().nextInt(config.getMaxReforgeDelay()) + config.getMinReforgeDelay();
+        } else {
+            //Finish the salvaging as soon as possible
+            return 0;
+        }
     }
 
     /**
@@ -85,7 +101,22 @@ public class ReforgeSession implements Runnable {
         }
 
         //Give the item back to the player
-        if (!config.getDisableDelay()) {
+        giveReforgedItem();
+
+        //Mark this blacksmith as available
+        blacksmithTrait.unsetSession();
+
+        // Start cool-down
+        Calendar wait = Calendar.getInstance();
+        wait.add(Calendar.SECOND, config.getReforgeCoolDown());
+        blacksmithTrait.addCoolDown(player.getUniqueId(), wait);
+    }
+
+    /**
+     * Gives the reforged item back to the player
+     */
+    private void giveReforgedItem() {
+        if (config.getMaxReforgeDelay() > 0) {
             //If the player isn't online, or the player cannot fit the item, drop the item to prevent it from disappearing
             if (config.getDropItem() || !player.isOnline() || player.getInventory().firstEmpty() == -1) {
                 player.getWorld().dropItemNaturally(npc.getEntity().getLocation(), itemToReforge);
@@ -96,14 +127,6 @@ public class ReforgeSession implements Runnable {
             //It can be assumed as this happens instantly, that the player still has the item's previous slot selected
             player.getInventory().setItemInMainHand(itemToReforge);
         }
-
-        //Mark this blacksmith as available
-        blacksmithTrait.unsetSession();
-
-        // Start cool-down
-        Calendar wait = Calendar.getInstance();
-        wait.add(Calendar.SECOND, config.getReforgeCoolDown());
-        blacksmithTrait.addCoolDown(player.getUniqueId(), wait);
     }
 
     /**
@@ -225,71 +248,4 @@ public class ReforgeSession implements Runnable {
         }
     }
 
-    /**
-     * Gets whether to end the current session
-     *
-     * <p>If the player has switched their item, or the player cannot pay, this returns true.</p>
-     *
-     * @return <p>True if the current session should end</p>
-     */
-    public boolean endSession() {
-        // Prevent player from switching items during session
-        ItemStack itemInHand = player.getInventory().getItemInMainHand();
-        if (!itemToReforge.equals(itemInHand)) {
-            sendNPCMessage(this.npc, player, config.getItemChangedMessage());
-            return true;
-        }
-        // The player is unable to pay
-        if (!EconomyManager.canPay(player)) {
-            sendNPCMessage(this.npc, player, config.getInsufficientFundsMessage());
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Gets whether the current session is still running
-     *
-     * @return <p>True if the current session is still running</p>
-     */
-    public boolean isRunning() {
-        return BlacksmithPlugin.getInstance().getServer().getScheduler().isQueued(taskId);
-    }
-
-    /**
-     * Gets whether the given player is currently in a reforging session
-     *
-     * @param other <p>The player to check if is in session</p>
-     * @return <p>True if the given player is in a reforge session</p>
-     */
-    public boolean isInSession(Player other) {
-        return player.getName().equals(other.getName());
-    }
-
-    /**
-     * Begins the actual item reforging
-     */
-    public void beginReforge() {
-        BukkitScheduler scheduler = BlacksmithPlugin.getInstance().getServer().getScheduler();
-        int reforgeDelay;
-        if (!config.getDisableCoolDown()) {
-            //Finish the reforging after a random delay between the max and min
-            reforgeDelay = new Random().nextInt(config.getMaxReforgeDelay()) + config.getMinReforgeDelay();
-        } else {
-            //Finish the reforging as soon as possible
-            reforgeDelay = 0;
-        }
-        this.finishTime = System.currentTimeMillis() + (reforgeDelay * 1000L);
-        taskId = scheduler.scheduleSyncDelayedTask(BlacksmithPlugin.getInstance(), this, reforgeDelay * 20L);
-    }
-
-    /**
-     * Gets the player currently in this reforge session
-     *
-     * @return <p>The player currently in this reforge session</p>
-     */
-    public Player getPlayer() {
-        return player;
-    }
-
 }