diff options
10 files changed, 25 insertions, 29 deletions
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java index fbab3e7..3b95399 100644 --- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java +++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java @@ -27,14 +27,13 @@ import org.bukkit.scheduler.BukkitTask; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.atomic.LongAdder; public class BukkitTickCounter implements TickCounter, Runnable { private final Plugin plugin; private BukkitTask task; private final Set<Runnable> tasks = new HashSet<>(); - private final LongAdder tick = new LongAdder(); + private int tick = 0; public BukkitTickCounter(Plugin plugin) { this.plugin = plugin; @@ -42,10 +41,10 @@ public class BukkitTickCounter implements TickCounter, Runnable { @Override public void run() { - for (Runnable r : this.tasks){ + for (Runnable r : this.tasks) { r.run(); } - this.tick.increment(); + this.tick++; } @Override @@ -59,8 +58,8 @@ public class BukkitTickCounter implements TickCounter, Runnable { } @Override - public long getCurrentTick() { - return this.tick.longValue(); + public int getCurrentTick() { + return this.tick; } @Override diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/Command.java b/spark-common/src/main/java/me/lucko/spark/common/command/Command.java index a28320b..fb440b1 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/Command.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/Command.java @@ -63,8 +63,8 @@ public class Command<S> { } public static final class Builder<S> { - private ImmutableList.Builder<String> aliases = ImmutableList.builder(); - private ImmutableList.Builder<ArgumentInfo> arguments = ImmutableList.builder(); + private final ImmutableList.Builder<String> aliases = ImmutableList.builder(); + private final ImmutableList.Builder<ArgumentInfo> arguments = ImmutableList.builder(); private Executor<S> executor = null; private TabCompleter<S> tabCompleter = null; diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java index cf43c18..608d6b4 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java @@ -86,7 +86,7 @@ public class MonitoringModule<S> implements CommandModule<S> { @Override protected void sendMessage(String message) { - platform.sendPrefixedMessage(message); + this.platform.sendPrefixedMessage(message); } } } diff --git a/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java b/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java index f3eb441..abb6148 100644 --- a/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java +++ b/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java @@ -37,7 +37,7 @@ public abstract class TickMonitor implements Runnable, AutoCloseable { // data private volatile double lastTickTime = 0; private State state = null; - private DoubleSummaryStatistics averageTickTime = new DoubleSummaryStatistics(); + private final DoubleSummaryStatistics averageTickTime = new DoubleSummaryStatistics(); private double avg; public TickMonitor(TickCounter tickCounter, int percentageChangeThreshold, boolean monitorGc) { diff --git a/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java b/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java index d6b754b..059e420 100644 --- a/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java @@ -41,7 +41,7 @@ public interface TickCounter extends AutoCloseable { * * @return the current tick */ - long getCurrentTick(); + int getCurrentTick(); /** * Adds a task to be called each time the tick increments diff --git a/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java index dc241a9..2c68b02 100644 --- a/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java @@ -65,7 +65,7 @@ public class TickedDataAggregator implements DataAggregator { private final Object mutex = new Object(); // state - private long currentTick = -1; + private int currentTick = -1; private TickList currentData = new TickList(0); public TickedDataAggregator(ExecutorService workerPool, TickCounter tickCounter, ThreadGrouper threadGrouper, int interval, boolean includeLineNumbers, int tickLengthThreshold) { @@ -82,7 +82,7 @@ public class TickedDataAggregator implements DataAggregator { @Override public void insertData(String threadName, StackTraceElement[] stack) { synchronized (this.mutex) { - long tick = this.tickCounter.getCurrentTick(); + int tick = this.tickCounter.getCurrentTick(); if (this.currentTick != tick) { pushCurrentTick(); this.currentTick = tick; diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java index 5b62f3f..f5a2c9e 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java @@ -27,7 +27,6 @@ import me.lucko.spark.sampler.ThreadDumper; import net.kyori.text.TextComponent; import net.kyori.text.serializer.ComponentSerializers; -import net.minecraft.command.CommandException; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; @@ -90,7 +89,7 @@ public abstract class ForgeSparkPlatform extends SparkPlatform<ICommandSender> i @Override public void runAsync(Runnable r) { - worker.execute(r); + this.worker.execute(r); } @Override @@ -106,7 +105,7 @@ public abstract class ForgeSparkPlatform extends SparkPlatform<ICommandSender> i } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + public void execute(MinecraftServer server, ICommandSender sender, String[] args) { if (!checkPermission(server, sender)) { TextComponentString msg = new TextComponentString("You do not have permission to use this command."); Style style = msg.getStyle(); diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java index 97903ac..17f595b 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java @@ -28,13 +28,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.atomic.LongAdder; public class ForgeTickCounter implements TickCounter { private final TickEvent.Type type; private final Set<Runnable> tasks = new HashSet<>(); - private final LongAdder tick = new LongAdder(); + private int tick = 0; public ForgeTickCounter(TickEvent.Type type) { this.type = type; @@ -53,7 +52,7 @@ public class ForgeTickCounter implements TickCounter { for (Runnable r : this.tasks){ r.run(); } - this.tick.increment(); + this.tick++; } @Override @@ -67,8 +66,8 @@ public class ForgeTickCounter implements TickCounter { } @Override - public long getCurrentTick() { - return this.tick.longValue(); + public int getCurrentTick() { + return this.tick; } @Override diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java index aa42efd..01052cb 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java @@ -116,7 +116,7 @@ public class SparkSpongePlugin implements CommandCallable { @Override public void runAsync(Runnable r) { - asyncExecutor.execute(r); + SparkSpongePlugin.this.asyncExecutor.execute(r); } @Override @@ -139,7 +139,7 @@ public class SparkSpongePlugin implements CommandCallable { @Listener public void onServerStart(GameStartedServerEvent event) { - game.getCommandManager().register(this, this, "spark"); + this.game.getCommandManager().register(this, this, "spark"); } @Override @@ -149,7 +149,7 @@ public class SparkSpongePlugin implements CommandCallable { return CommandResult.empty(); } - sparkPlatform.executeCommand(source, arguments.split(" ")); + this.sparkPlatform.executeCommand(source, arguments.split(" ")); return CommandResult.empty(); } diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java index a3eba45..14b30b8 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java @@ -26,14 +26,13 @@ import org.spongepowered.api.scheduler.Task; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.atomic.LongAdder; public class SpongeTickCounter implements TickCounter, Runnable { private final SparkSpongePlugin plugin; private Task task; private final Set<Runnable> tasks = new HashSet<>(); - private final LongAdder tick = new LongAdder(); + private int tick = 0; public SpongeTickCounter(SparkSpongePlugin plugin) { this.plugin = plugin; @@ -44,7 +43,7 @@ public class SpongeTickCounter implements TickCounter, Runnable { for (Runnable r : this.tasks){ r.run(); } - this.tick.increment(); + this.tick++; } @Override @@ -58,8 +57,8 @@ public class SpongeTickCounter implements TickCounter, Runnable { } @Override - public long getCurrentTick() { - return this.tick.longValue(); + public int getCurrentTick() { + return this.tick; } @Override |