diff options
6 files changed, 72 insertions, 127 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 44a69cb..2a71257 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 @@ -20,30 +20,22 @@ package me.lucko.spark.bukkit; +import me.lucko.spark.common.sampler.AbstractTickCounter; import me.lucko.spark.common.sampler.TickCounter; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; -import java.util.HashSet; -import java.util.Set; - -public class BukkitTickCounter implements TickCounter, Runnable { +public class BukkitTickCounter extends AbstractTickCounter implements TickCounter, Runnable { private final Plugin plugin; private BukkitTask task; - private final Set<TickTask> tasks = new HashSet<>(); - private int tick = 0; - public BukkitTickCounter(Plugin plugin) { this.plugin = plugin; } @Override public void run() { - for (TickTask r : this.tasks) { - r.onTick(this); - } - this.tick++; + onTick(); } @Override @@ -56,18 +48,4 @@ public class BukkitTickCounter implements TickCounter, Runnable { this.task.cancel(); } - @Override - public int getCurrentTick() { - return this.tick; - } - - @Override - public void addTickTask(TickTask runnable) { - this.tasks.add(runnable); - } - - @Override - public void removeTickTask(TickTask runnable) { - this.tasks.remove(runnable); - } } diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickCounter.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickCounter.java index e545687..7189429 100644 --- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickCounter.java +++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/PaperTickCounter.java @@ -21,31 +21,23 @@ package me.lucko.spark.bukkit; import com.destroystokyo.paper.event.server.ServerTickStartEvent; +import me.lucko.spark.common.sampler.AbstractTickCounter; import me.lucko.spark.common.sampler.TickCounter; import org.bukkit.event.EventHandler; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; -import java.util.HashSet; -import java.util.Set; - -public class PaperTickCounter implements TickCounter, Listener { +public class PaperTickCounter extends AbstractTickCounter implements TickCounter, Listener { private final Plugin plugin; - private final Set<TickTask> tasks = new HashSet<>(); - private int tick = 0; - public PaperTickCounter(Plugin plugin) { this.plugin = plugin; } @EventHandler public void onServerTickEvent(ServerTickStartEvent e) { - for (TickTask r : this.tasks) { - r.onTick(this); - } - this.tick++; + onTick(); } @Override @@ -58,18 +50,4 @@ public class PaperTickCounter implements TickCounter, Listener { HandlerList.unregisterAll(this); } - @Override - public int getCurrentTick() { - return this.tick; - } - - @Override - public void addTickTask(TickTask runnable) { - this.tasks.add(runnable); - } - - @Override - public void removeTickTask(TickTask runnable) { - this.tasks.remove(runnable); - } } diff --git a/spark-common/src/main/java/me/lucko/spark/common/sampler/AbstractTickCounter.java b/spark-common/src/main/java/me/lucko/spark/common/sampler/AbstractTickCounter.java new file mode 100644 index 0000000..4633024 --- /dev/null +++ b/spark-common/src/main/java/me/lucko/spark/common/sampler/AbstractTickCounter.java @@ -0,0 +1,53 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) <luck@lucko.me> + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package me.lucko.spark.common.sampler; + +import java.util.HashSet; +import java.util.Set; + +public abstract class AbstractTickCounter implements TickCounter { + + private final Set<TickTask> tasks = new HashSet<>(); + private int tick = 0; + + protected void onTick() { + for (TickTask r : this.tasks) { + r.onTick(this); + } + this.tick++; + } + + @Override + public int getCurrentTick() { + return this.tick; + } + + @Override + public void addTickTask(TickTask runnable) { + this.tasks.add(runnable); + } + + @Override + public void removeTickTask(TickTask runnable) { + this.tasks.remove(runnable); + } + +} diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricTickCounter.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricTickCounter.java index b189e3f..ce58dcf 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricTickCounter.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricTickCounter.java @@ -20,35 +20,14 @@ package me.lucko.spark.fabric; +import me.lucko.spark.common.sampler.AbstractTickCounter; import me.lucko.spark.common.sampler.TickCounter; -import java.util.HashSet; -import java.util.Set; - -public abstract class FabricTickCounter implements TickCounter { - private final Set<TickTask> tasks = new HashSet<>(); - private int tick = 0; - - public void onTick() { - for (TickTask r : this.tasks) { - r.onTick(this); - } - this.tick++; - } - - @Override - public int getCurrentTick() { - return this.tick; - } - - @Override - public void addTickTask(TickTask runnable) { - this.tasks.add(runnable); - } +public abstract class FabricTickCounter extends AbstractTickCounter implements TickCounter { @Override - public void removeTickTask(TickTask runnable) { - this.tasks.remove(runnable); + public void onTick() { + super.onTick(); } public static final class Server extends FabricTickCounter { 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 2ff3f1d..7e387a7 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 @@ -20,20 +20,15 @@ package me.lucko.spark.forge; +import me.lucko.spark.common.sampler.AbstractTickCounter; import me.lucko.spark.common.sampler.TickCounter; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import java.util.HashSet; -import java.util.Set; - -public class ForgeTickCounter implements TickCounter { +public class ForgeTickCounter extends AbstractTickCounter implements TickCounter { private final TickEvent.Type type; - private final Set<TickTask> tasks = new HashSet<>(); - private int tick = 0; - public ForgeTickCounter(TickEvent.Type type) { this.type = type; } @@ -48,10 +43,7 @@ public class ForgeTickCounter implements TickCounter { return; } - for (TickTask r : this.tasks){ - r.onTick(this); - } - this.tick++; + onTick(); } @Override @@ -64,18 +56,4 @@ public class ForgeTickCounter implements TickCounter { MinecraftForge.EVENT_BUS.unregister(this); } - @Override - public int getCurrentTick() { - return this.tick; - } - - @Override - public void addTickTask(TickTask runnable) { - this.tasks.add(runnable); - } - - @Override - public void removeTickTask(TickTask runnable) { - this.tasks.remove(runnable); - } } 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 3c5db06..d7823b1 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 @@ -20,17 +20,13 @@ package me.lucko.spark.sponge; +import me.lucko.spark.common.sampler.AbstractTickCounter; import me.lucko.spark.common.sampler.TickCounter; +import org.spongepowered.api.scheduler.Task; -import java.util.HashSet; -import java.util.Set; - -public class SpongeTickCounter implements TickCounter, Runnable { +public class SpongeTickCounter extends AbstractTickCounter implements TickCounter, Runnable { private final SpongeSparkPlugin plugin; - private org.spongepowered.api.scheduler.Task task; - - private final Set<TickTask> tasks = new HashSet<>(); - private int tick = 0; + private Task task; public SpongeTickCounter(SpongeSparkPlugin plugin) { this.plugin = plugin; @@ -38,15 +34,12 @@ public class SpongeTickCounter implements TickCounter, Runnable { @Override public void run() { - for (TickTask r : this.tasks){ - r.onTick(this); - } - this.tick++; + onTick(); } @Override public void start() { - this.task = org.spongepowered.api.scheduler.Task.builder().intervalTicks(1).name("spark-ticker").execute(this).submit(this.plugin); + this.task = Task.builder().intervalTicks(1).name("spark-ticker").execute(this).submit(this.plugin); } @Override @@ -54,18 +47,4 @@ public class SpongeTickCounter implements TickCounter, Runnable { this.task.cancel(); } - @Override - public int getCurrentTick() { - return this.tick; - } - - @Override - public void addTickTask(TickTask runnable) { - this.tasks.add(runnable); - } - - @Override - public void removeTickTask(TickTask runnable) { - this.tasks.remove(runnable); - } } |