Don't inject hook directly

Fixes #33

src/main/java/voruti/velocityplayerlistquery/VelocityPlayerListQuery.java

@@ -12,7 +12,7 @@
 import lombok.NonNull;
 import lombok.experimental.FieldDefaults;
 import org.slf4j.Logger;
-import voruti.velocityplayerlistquery.hook.VanishBridgeHook;
+import voruti.velocityplayerlistquery.hook.Hooks;
 import voruti.velocityplayerlistquery.model.exception.InvalidServerPingException;
 import voruti.velocityplayerlistquery.service.ConfigService;
 import voruti.velocityplayerlistquery.service.serverpingprocessor.ServerPingProcessor;
@@ -45,14 +45,15 @@ public class VelocityPlayerListQuery {
     ServerPingProcessorRegistry serverPingProcessorRegistry;
 
     @Inject
-    VanishBridgeHook vanishBridgeHook;
+    Hooks hooks;
 
 
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent ignored) {
         this.configService.reloadConfig();
 
-        if (this.vanishBridgeHook.hooked()) this.logger.info("VanishBridge found, enabling vanish support");
+        this.hooks.vanishBridge().ifPresent(unused ->
+                this.logger.info("VanishBridge found, enabling vanish support"));
 
         this.logger.info("Enabled");
     }

src/main/java/voruti/velocityplayerlistquery/hook/Hooks.java

@@ -0,0 +1,29 @@
+package voruti.velocityplayerlistquery.hook;
+
+import com.google.inject.Inject;
+import com.velocitypowered.api.proxy.ProxyServer;
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+
+import javax.inject.Singleton;
+import java.util.Optional;
+
+@Singleton
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class Hooks {
+
+    VanishBridgeHook vanishBridgeHook;
+
+
+    @Inject
+    public Hooks(ProxyServer server) {
+        this.vanishBridgeHook = server.getPluginManager().isLoaded("vanishbridge")
+                ? new VanishBridgeHook(server)
+                : null;
+    }
+
+
+    public Optional<VanishBridgeHook> vanishBridge() {
+        return Optional.ofNullable(vanishBridgeHook);
+    }
+}

src/main/java/voruti/velocityplayerlistquery/hook/VanishBridgeHook.java

@@ -1,25 +1,21 @@
 package voruti.velocityplayerlistquery.hook;
 
-import com.google.inject.Inject;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import dev.loapu.vanishbridge.api.VanishBridgeProvider;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Collection;
 
-@Singleton
-@FieldDefaults(level = AccessLevel.PRIVATE)
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class VanishBridgeHook {
-    @Inject
+
     ProxyServer server;
 
-    public boolean hooked() {
-        return server.getPluginManager().isLoaded("vanishbridge");
-    }
 
     public Collection<Player> unvanishedPlayers() {
         var allPlayers = server.getAllPlayers();

src/main/java/voruti/velocityplayerlistquery/service/serverpingprocessor/OnlinePlayerCountServerPingProcessor.java

@@ -4,6 +4,7 @@
 import com.velocitypowered.api.proxy.server.ServerPing;
 import lombok.NonNull;
 import lombok.experimental.FieldDefaults;
+import voruti.velocityplayerlistquery.hook.Hooks;
 import voruti.velocityplayerlistquery.hook.VanishBridgeHook;
 import voruti.velocityplayerlistquery.service.ConfigService;
 
@@ -21,7 +22,7 @@ public class OnlinePlayerCountServerPingProcessor extends ServerPingProcessor {
     ProxyServer proxyServer;
 
     @Inject
-    VanishBridgeHook vanishBridgeHook;
+    Hooks hooks;
 
 
     @Override
@@ -33,6 +34,10 @@ public boolean isEnabled() {
     public void applyToServerPing(@NonNull final ServerPing.Builder serverPing) {
         super.applyToServerPing(serverPing);
 
-        serverPing.onlinePlayers(this.vanishBridgeHook.hooked() ? this.vanishBridgeHook.unvanishedPlayerCount() : this.proxyServer.getPlayerCount());
+        serverPing.onlinePlayers(
+                this.hooks.vanishBridge()
+                        .map(VanishBridgeHook::unvanishedPlayerCount)
+                        .orElse(this.proxyServer.getPlayerCount())
+        );
     }
 }

src/main/java/voruti/velocityplayerlistquery/service/serverpingprocessor/PlayerListServerPingProcessor.java

@@ -5,6 +5,7 @@
 import com.velocitypowered.api.proxy.server.ServerPing;
 import lombok.NonNull;
 import lombok.experimental.FieldDefaults;
+import voruti.velocityplayerlistquery.hook.Hooks;
 import voruti.velocityplayerlistquery.hook.VanishBridgeHook;
 import voruti.velocityplayerlistquery.model.Config;
 import voruti.velocityplayerlistquery.model.Config.PlayerListMode;
@@ -36,7 +37,7 @@ public class PlayerListServerPingProcessor extends ServerPingProcessor {
     ServerListEntryBuilderService serverListEntryBuilderService;
 
     @Inject
-    VanishBridgeHook vanishBridgeHook;
+    Hooks hooks;
 
 
     @Override
@@ -55,7 +56,9 @@ public void applyToServerPing(@NonNull final ServerPing.Builder serverPing) {
         super.applyToServerPing(serverPing);
 
         // collect players:
-        final Collection<Player> players = this.vanishBridgeHook.hooked() ? this.vanishBridgeHook.unvanishedPlayers() : this.proxyServer.getAllPlayers();
+        final Collection<Player> players = this.hooks.vanishBridge()
+                .map(VanishBridgeHook::unvanishedPlayers)
+                .orElse(this.proxyServer.getAllPlayers());
         final Stream<ServerPing.SamplePlayer> playerStream = players.stream()
                 // format players:
                 .map(player -> new ServerPing.SamplePlayer(