From d5fe971afb872b905999032d7bbcaf3f7c5d3647 Mon Sep 17 00:00:00 2001
From: Bram <bram@bramdekker.com>
Date: Thu, 25 Apr 2024 13:05:44 +0200
Subject: [PATCH] Restructured the SpigotAntiHealthIndicator

---
 .../antihealthindicator/AHIPlatform.java      |  4 +--
 .../SpigotAntiHealthIndicator.java            | 27 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/com/deathmotion/antihealthindicator/AHIPlatform.java b/common/src/main/java/com/deathmotion/antihealthindicator/AHIPlatform.java
index f2b3a36..d5d8d93 100644
--- a/common/src/main/java/com/deathmotion/antihealthindicator/AHIPlatform.java
+++ b/common/src/main/java/com/deathmotion/antihealthindicator/AHIPlatform.java
@@ -57,11 +57,11 @@ public void commonOnDisable() {
 
     public abstract boolean hasPermission(UUID sender, String permission);
 
+    public abstract void broadcastComponent(Component component, @Nullable String permission);
+
     public abstract boolean isEntityRemoved(int entityId, @Nullable Object player);
 
     public abstract boolean getConfigurationOption(ConfigOption option);
 
     public abstract String getPluginVersion();
-
-    public abstract void broadcastComponent(Component component, @Nullable String permission);
 }
\ No newline at end of file
diff --git a/spigot/src/main/java/com/deathmotion/antihealthindicator/SpigotAntiHealthIndicator.java b/spigot/src/main/java/com/deathmotion/antihealthindicator/SpigotAntiHealthIndicator.java
index 44937e5..7c5209f 100644
--- a/spigot/src/main/java/com/deathmotion/antihealthindicator/SpigotAntiHealthIndicator.java
+++ b/spigot/src/main/java/com/deathmotion/antihealthindicator/SpigotAntiHealthIndicator.java
@@ -40,7 +40,6 @@ public class SpigotAntiHealthIndicator extends AHIPlatform<JavaPlugin> {
     private final JavaPlugin plugin;
     private ConfigManager configManager;
 
-
     public SpigotAntiHealthIndicator(JavaPlugin plugin) {
         this.plugin = plugin;
     }
@@ -49,6 +48,11 @@ void setConfigManager(ConfigManager configManager) {
         this.configManager = configManager;
     }
 
+    @Override
+    public JavaPlugin getPlatform() {
+        return this.plugin;
+    }
+
     @Override
     public Scheduler getScheduler() {
         return scheduler;
@@ -58,11 +62,6 @@ void setScheduler(Scheduler scheduler) {
         this.scheduler = scheduler;
     }
 
-    @Override
-    public JavaPlugin getPlatform() {
-        return this.plugin;
-    }
-
     @Override
     public boolean hasPermission(UUID sender, String permission) {
         CommandSender commandSender = Bukkit.getPlayer(sender);
@@ -71,6 +70,14 @@ public boolean hasPermission(UUID sender, String permission) {
         return commandSender.hasPermission(permission);
     }
 
+    @Override
+    public void broadcastComponent(Component component, @Nullable String permission) {
+        Bukkit.getOnlinePlayers().stream()
+                .filter(player -> permission == null || player.hasPermission(permission))
+                .map(player -> PacketEvents.getAPI().getPlayerManager().getUser(player))
+                .forEach(user -> user.sendMessage(component));
+    }
+
     @Override
     public boolean isEntityRemoved(int entityId, @Nullable Object playerObject) {
         if (playerObject instanceof Player) {
@@ -90,14 +97,6 @@ public String getPluginVersion() {
         return this.plugin.getDescription().getVersion();
     }
 
-    @Override
-    public void broadcastComponent(Component component, @Nullable String permission) {
-        Bukkit.getOnlinePlayers().stream()
-                .filter(player -> permission == null || player.hasPermission(permission))
-                .map(player -> PacketEvents.getAPI().getPlayerManager().getUser(player))
-                .forEach(user -> user.sendMessage(component));
-    }
-
     public void enableBStats() {
         try {
             new Metrics(this.plugin, 20803);