From 1fafc90e047a0a1e126ad321a013ef568fdfe0e3 Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Sun, 2 Feb 2025 14:57:18 +0100 Subject: [PATCH] refactor(pomodoro): simplify plugin instance retrieval Replaced passing the plugin instance to PomodoroRunnable with direct access via TweaksPlugin singleton. This removes redundant code, improving clarity and maintainability. --- .../eu/m724/tweaks/module/pomodoro/PomodoroModule.java | 2 +- .../eu/m724/tweaks/module/pomodoro/PomodoroRunnable.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroModule.java b/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroModule.java index 74cdedf..89dd3d5 100644 --- a/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroModule.java +++ b/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroModule.java @@ -12,7 +12,7 @@ public class PomodoroModule extends TweaksModule { @Override protected void onInit() { registerEvents(new PomodoroListener()); - new PomodoroRunnable(getPlugin()).runTaskTimerAsynchronously(getPlugin(), 0, 20L); + new PomodoroRunnable().runTaskTimerAsynchronously(getPlugin(), 0, 20L); registerCommand("pomodoro", new PomodoroCommands()); } diff --git a/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroRunnable.java b/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroRunnable.java index 6612d6d..1b70d5f 100644 --- a/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroRunnable.java +++ b/src/main/java/eu/m724/tweaks/module/pomodoro/PomodoroRunnable.java @@ -6,6 +6,7 @@ package eu.m724.tweaks.module.pomodoro; +import eu.m724.tweaks.TweaksPlugin; import eu.m724.tweaks.config.TweaksConfig; import net.md_5.bungee.api.ChatMessageType; import org.bukkit.Bukkit; @@ -15,15 +16,12 @@ import org.bukkit.scheduler.BukkitRunnable; public class PomodoroRunnable extends BukkitRunnable { private final boolean force = TweaksConfig.getConfig().pomodoroForce(); - private final Plugin plugin; - - public PomodoroRunnable(Plugin plugin) { - this.plugin = plugin; // only used for kicking - } + private final Plugin plugin = TweaksPlugin.getInstance(); // used only to kick @Override public void run() { long now = System.nanoTime(); + Bukkit.getOnlinePlayers().forEach(player -> { PlayerPomodoro pomodoro = Pomodoros.get(player); if (pomodoro == null) return;