Refactor and tidy up, more consistent code style

10 files changed, 24 insertions, 10 deletions

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitCommandSender.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitCommandSender.java
index 11f7e9e..df6f658 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitCommandSender.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitCommandSender.java
@@ -21,9 +21,11 @@
 package me.lucko.spark.bukkit;
 
 import me.lucko.spark.common.command.sender.AbstractCommandSender;
+
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
+
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java
index cbeaf8e..3f0c155 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java
@@ -21,6 +21,7 @@
 package me.lucko.spark.bukkit;
 
 import me.lucko.spark.common.platform.AbstractPlatformInfo;
+
 import org.bukkit.Server;
 
 import java.lang.reflect.Field;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
index 23c5756..53a9a7d 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
@@ -26,9 +26,11 @@ import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.sampler.ThreadDumper;
-import me.lucko.spark.common.sampler.tick.TickHook;
-import me.lucko.spark.common.sampler.tick.TickReporter;
+import me.lucko.spark.common.tick.TickHook;
+import me.lucko.spark.common.tick.TickReporter;
+
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickHook.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickHook.java
index 184656e..6547971 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickHook.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickHook.java
@@ -20,8 +20,9 @@
 
 package me.lucko.spark.bukkit;
 
-import me.lucko.spark.common.sampler.tick.AbstractTickHook;
-import me.lucko.spark.common.sampler.tick.TickHook;
+import me.lucko.spark.common.tick.AbstractTickHook;
+import me.lucko.spark.common.tick.TickHook;
+
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
index 8d3c125..5c4d0db 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/CommandMapUtil.java
@@ -26,6 +26,7 @@
 package me.lucko.spark.bukkit;
 
 import com.google.common.base.Preconditions;
+
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickHook.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickHook.java
index 5ad7b57..43d5a24 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickHook.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickHook.java
@@ -21,8 +21,10 @@
 package me.lucko.spark.bukkit;
 
 import com.destroystokyo.paper.event.server.ServerTickStartEvent;
-import me.lucko.spark.common.sampler.tick.AbstractTickHook;
-import me.lucko.spark.common.sampler.tick.TickHook;
+
+import me.lucko.spark.common.tick.AbstractTickHook;
+import me.lucko.spark.common.tick.TickHook;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickReporter.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickReporter.java
index a51be66..f4a1ee9 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickReporter.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickReporter.java
@@ -21,8 +21,10 @@
 package me.lucko.spark.bukkit;
 
 import com.destroystokyo.paper.event.server.ServerTickEndEvent;
-import me.lucko.spark.common.sampler.tick.AbstractTickReporter;
-import me.lucko.spark.common.sampler.tick.TickReporter;
+
+import me.lucko.spark.common.tick.AbstractTickReporter;
+import me.lucko.spark.common.tick.TickReporter;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkMVdWPlaceholders.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkMVdWPlaceholders.java
index cc769c4..078d027 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkMVdWPlaceholders.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkMVdWPlaceholders.java
@@ -20,11 +20,12 @@
 
 package me.lucko.spark.bukkit.placeholder;
 
+import me.lucko.spark.bukkit.BukkitSparkPlugin;
+import me.lucko.spark.common.SparkPlatform;
+
 import be.maximvdw.placeholderapi.PlaceholderAPI;
 import be.maximvdw.placeholderapi.PlaceholderReplaceEvent;
 import be.maximvdw.placeholderapi.PlaceholderReplacer;
-import me.lucko.spark.bukkit.BukkitSparkPlugin;
-import me.lucko.spark.common.SparkPlatform;
 
 public class SparkMVdWPlaceholders implements PlaceholderReplacer {
     private final SparkPlatform platform;
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderApi.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderApi.java
index 1eb2732..69dca72 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderApi.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderApi.java
@@ -23,6 +23,7 @@ package me.lucko.spark.bukkit.placeholder;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.lucko.spark.bukkit.BukkitSparkPlugin;
 import me.lucko.spark.common.SparkPlatform;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderProvider.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderProvider.java
index 842ac72..6e14bdb 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderProvider.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/placeholder/SparkPlaceholderProvider.java
@@ -24,6 +24,7 @@ import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.command.modules.HealthModule;
 import me.lucko.spark.common.monitor.cpu.CpuMonitor;
 import me.lucko.spark.common.monitor.tick.TickStatistics;
+
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;