Merge pull request #28 from 4drian3d/improved-usage

Improved plugin usage

Author: hyperdefined

pom.xml

@@ -29,7 +29,7 @@
     <name>VelocityBlockVersion</name>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -115,13 +115,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.12.0</version>
+            <version>3.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/lol/hyper/velocityblockversion/VelocityBlockVersion.java

@@ -18,18 +18,19 @@
 package lol.hyper.velocityblockversion;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
 import com.velocitypowered.api.command.CommandManager;
 import com.velocitypowered.api.command.CommandMeta;
-import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.event.EventManager;
 import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.proxy.ProxyServer;
 import lol.hyper.githubreleaseapi.GitHubRelease;
 import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
 import lol.hyper.velocityblockversion.commands.CommandReload;
 import lol.hyper.velocityblockversion.events.JoinEvent;
 import lol.hyper.velocityblockversion.tools.ConfigHandler;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.velocity.Metrics;
 import org.slf4j.Logger;
 
@@ -44,37 +45,37 @@
         url = "https://github.com/hyperdefined/VelocityBlockVersion"
 )
 public class VelocityBlockVersion {
-
-    public ConfigHandler configHandler;
-    public JoinEvent joinEvent;
-    public CommandReload commandReload;
-    public final String VERSION = "1.0.7";
-
-    public final Logger logger;
-    private final Metrics.Factory metricsFactory;
-    private final ProxyServer server;
-    private final CommandManager commandManager;
-    public final MiniMessage miniMessage = MiniMessage.miniMessage();
+    public static final String VERSION = "1.0.7";
 
     @Inject
-    public VelocityBlockVersion(ProxyServer server, Logger logger, Metrics.Factory metricsFactory, CommandManager commandManager) {
-        this.server = server;
-        this.logger = logger;
-        this.metricsFactory = metricsFactory;
-        this.commandManager = commandManager;
-    }
+    private Logger logger;
+    @Inject
+    private Metrics.Factory metricsFactory;
+    @Inject
+    private ProxyServer server;
+    @Inject
+    private CommandManager commandManager;
+    @Inject
+    private EventManager eventManager;
+    @Inject
+    private Injector injector;
 
     @Subscribe
-    public void onProxyInitialization(ProxyInitializeEvent event) {
-        configHandler = new ConfigHandler(this);
-        joinEvent = new JoinEvent(this);
-        commandReload = new CommandReload(this);
-        configHandler.loadConfig();
+    public void onProxyInitialization(final ProxyInitializeEvent event) {
+        final ConfigHandler configHandler = injector.getInstance(ConfigHandler.class);
+        if (!configHandler.loadConfig()) {
+            return;
+        }
+
         metricsFactory.make(this, 13308);
+
         server.getScheduler().buildTask(this, this::checkForUpdates).schedule();
-        server.getEventManager().register(this, joinEvent);
 
-        CommandMeta meta = commandManager.metaBuilder("vbvreload").build();
+        final JoinEvent joinEvent = injector.getInstance(JoinEvent.class);
+        eventManager.register(this, joinEvent);
+
+        final CommandReload commandReload = injector.getInstance(CommandReload.class);
+        final CommandMeta meta = commandManager.metaBuilder("vbvreload").plugin(this).build();
         commandManager.register(meta, commandReload);
     }
 
@@ -83,12 +84,11 @@ public void checkForUpdates() {
         try {
             api = new GitHubReleaseAPI("velocityblockversion", "hyperdefined");
         } catch (IOException e) {
-            logger.warn("Unable to check updates!");
-            e.printStackTrace();
+            logger.warn("Unable to check updates!", e);
             return;
         }
-        GitHubRelease current = api.getReleaseByTag(VERSION);
-        GitHubRelease latest = api.getLatestVersion();
+        final GitHubRelease current = api.getReleaseByTag(VERSION);
+        final GitHubRelease latest = api.getLatestVersion();
         if (current == null) {
             logger.warn("You are running a version that does not exist on GitHub. If you are in a dev environment, you can ignore this. Otherwise, this is a bug!");
             return;
@@ -97,7 +97,7 @@ public void checkForUpdates() {
         if (buildsBehind == 0) {
             logger.info("You are running the latest version.");
         } else {
-            logger.warn("A new version is available (" + latest.getTagVersion() + ")! You are running version " + current.getTagVersion() + ". You are " + buildsBehind + " version(s) behind.");
+            logger.warn("A new version is available ({})! You are running version {}. You are " + buildsBehind + " version(s) behind.", latest.getTagVersion(), current.getTagVersion());
         }
     }
 }

src/main/java/lol/hyper/velocityblockversion/commands/CommandReload.java

@@ -17,28 +17,27 @@
 
 package lol.hyper.velocityblockversion.commands;
 
+import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
-import lol.hyper.velocityblockversion.VelocityBlockVersion;
+import lol.hyper.velocityblockversion.tools.ConfigHandler;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 
-public class CommandReload implements SimpleCommand{
+public final class CommandReload implements SimpleCommand {
+    @Inject
+    private ConfigHandler configHandler;
 
-    private final VelocityBlockVersion velocityBlockVersion;
-
-    public CommandReload(VelocityBlockVersion velocityBlockVersion) {
-        this.velocityBlockVersion = velocityBlockVersion;
+    @Override
+    public void execute(final Invocation invocation) {
+        final CommandSource source = invocation.source();
+        if (configHandler.loadConfig()) {
+            source.sendMessage(Component.text("Config reloaded!", NamedTextColor.GREEN));
+        }
     }
 
     @Override
-    public void execute(SimpleCommand.Invocation invocation) {
-        CommandSource source = invocation.source();
-        if (source.hasPermission("velocityBlockVersion.reload")) {
-            velocityBlockVersion.configHandler.loadConfig();
-            source.sendMessage(Component.text("Config reloaded!").color(NamedTextColor.GREEN));
-        } else {
-            source.sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
-        }
+    public boolean hasPermission(final Invocation invocation) {
+        return invocation.source().hasPermission("velocityBlockVersion.reload");
     }
 }

src/main/java/lol/hyper/velocityblockversion/events/JoinEvent.java

@@ -17,43 +17,53 @@
 
 package lol.hyper.velocityblockversion.events;
 
+import com.google.inject.Inject;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PreLoginEvent;
-import lol.hyper.velocityblockversion.VelocityBlockVersion;
+import com.velocitypowered.api.network.ProtocolVersion;
 import lol.hyper.velocityblockversion.tools.ConfigHandler;
 import lol.hyper.velocityblockversion.tools.VersionToStrings;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.slf4j.Logger;
 
-public class JoinEvent {
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 
-    private final VelocityBlockVersion velocityBlockVersion;
-    private final ConfigHandler configHandler;
-
-    public JoinEvent(VelocityBlockVersion velocityBlockVersion) {
-        this.velocityBlockVersion = velocityBlockVersion;
-        this.configHandler = velocityBlockVersion.configHandler;
-    }
+public final class JoinEvent {
+    @Inject
+    private Logger logger;
+    @Inject
+    private ConfigHandler configHandler;
 
     @Subscribe(order = PostOrder.FIRST)
-    public void onPlayerLogin(PreLoginEvent event) {
-        int version = event.getConnection().getProtocolVersion().getProtocol();
-        if (configHandler.config.getBoolean("log_connection_versions")) {
-            velocityBlockVersion.logger.info("Player is connecting with protocol version: " + version);
+    public void onPlayerLogin(final PreLoginEvent event) {
+        final int version = event.getConnection().getProtocolVersion().getProtocol();
+        if (configHandler.getConfig().getBoolean("log_connection_versions", false)) {
+            logger.info("Player is connecting with protocol version: {}", version);
         }
-        if (configHandler.blockVersions.contains(version)) {
-            String allowedVersions = VersionToStrings.allowedVersions(configHandler.blockVersions);
-            String blockedMessage = configHandler.config.getString("disconnect_message");
-            if (allowedVersions == null) {
-                blockedMessage = "<red>All versions are currently blocked from playing.</red>";
-            }
-            if (blockedMessage.contains("{VERSIONS}")) {
-                blockedMessage = blockedMessage.replace("{VERSIONS}", allowedVersions);
-            }
-            Component message = velocityBlockVersion.miniMessage.deserialize(blockedMessage);
-            event.setResult(PreLoginEvent.PreLoginComponentResult.denied(message));
-            velocityBlockVersion.logger.info("Blocking player " + event.getUsername() + " because they are playing on version "
-                    + VersionToStrings.versionStrings.get(version) + " which is blocked!");
+
+        if (!configHandler.getBlockVersions().contains(version)) {
+            return;
         }
+
+        String allowedVersions = VersionToStrings.allowedVersions(configHandler.getBlockVersions());
+        String blockedMessage = configHandler.getConfig().getString("disconnect_message");
+
+        if (allowedVersions == null) {
+            blockedMessage = "<red>All versions are currently blocked from playing.";
+            allowedVersions = "";
+        }
+
+        final Component message = miniMessage().deserialize(
+                blockedMessage,
+                Placeholder.unparsed("versions", allowedVersions)
+        );
+        event.setResult(PreLoginEvent.PreLoginComponentResult.denied(message));
+        logger.info(
+                "Blocking player {} because they are playing on version {} which is blocked!",
+                event.getUsername(),
+                ProtocolVersion.getProtocolVersion(version).getMostRecentSupportedVersion()
+        );
     }
 }