Monitor average tick durations & report them in /spark tps

2 files changed, 9 insertions, 8 deletions

diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeSparkPlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeSparkPlugin.java
index d221f04..ae0efef 100644
--- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeSparkPlugin.java
+++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeSparkPlugin.java
@@ -24,7 +24,7 @@ import com.google.inject.Inject;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.sampler.ThreadDumper;
-import me.lucko.spark.common.sampler.TickCounter;
+import me.lucko.spark.common.sampler.tick.TickHook;
 import org.spongepowered.api.Game;
 import org.spongepowered.api.command.CommandCallable;
 import org.spongepowered.api.command.CommandResult;
@@ -41,12 +41,13 @@ import org.spongepowered.api.text.Text;
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 
-import javax.annotation.Nullable;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import javax.annotation.Nullable;
+
 @Plugin(
         id = "spark",
         name = "spark",
@@ -119,8 +120,8 @@ public class SpongeSparkPlugin implements SparkPlugin {
     }
 
     @Override
-    public TickCounter createTickCounter() {
-        return new SpongeTickCounter(this);
+    public TickHook createTickHook() {
+        return new SpongeTickHook(this);
     }
 
     private static final class SparkCommand implements CommandCallable {
diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickHook.java
index d7823b1..2fdc459 100644
--- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java
+++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickHook.java
@@ -20,15 +20,15 @@
 
 package me.lucko.spark.sponge;
 
-import me.lucko.spark.common.sampler.AbstractTickCounter;
-import me.lucko.spark.common.sampler.TickCounter;
+import me.lucko.spark.common.sampler.tick.AbstractTickHook;
+import me.lucko.spark.common.sampler.tick.TickHook;
 import org.spongepowered.api.scheduler.Task;
 
-public class SpongeTickCounter extends AbstractTickCounter implements TickCounter, Runnable {
+public class SpongeTickHook extends AbstractTickHook implements TickHook, Runnable {
     private final SpongeSparkPlugin plugin;
     private Task task;
 
-    public SpongeTickCounter(SpongeSparkPlugin plugin) {
+    public SpongeTickHook(SpongeSparkPlugin plugin) {
         this.plugin = plugin;
     }