Fixed building Floodgate and added a version subcommand

core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java

@@ -42,6 +42,7 @@ import org.geysermc.floodgate.player.UserAudience;
 public final class MainCommand extends SubCommands implements FloodgateCommand {
     public MainCommand() {
         defineSubCommand(FirewallCheckSubcommand.class);
+        defineSubCommand(VersionSubcommand.class);
     }
 
     @Override

core/src/main/java/org/geysermc/floodgate/command/main/VersionSubcommand.java

@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Floodgate
+ */
+
+package org.geysermc.floodgate.command.main;
+
+import static org.geysermc.floodgate.util.Constants.COLOR_CHAR;
+
+import cloud.commandframework.context.CommandContext;
+import com.google.gson.JsonElement;
+import com.google.inject.Inject;
+import org.geysermc.floodgate.api.logger.FloodgateLogger;
+import org.geysermc.floodgate.command.WhitelistCommand.Message;
+import org.geysermc.floodgate.command.util.Permission;
+import org.geysermc.floodgate.platform.command.FloodgateSubCommand;
+import org.geysermc.floodgate.player.UserAudience;
+import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.util.HttpClient;
+
+public class VersionSubcommand extends FloodgateSubCommand {
+    @Inject
+    private HttpClient httpClient;
+
+    @Inject
+    private FloodgateLogger logger;
+
+    @Override
+    public String name() {
+        return "version";
+    }
+
+    @Override
+    public String description() {
+        return "Displays version information about Floodgate";
+    }
+
+    @Override
+    public Permission permission() {
+        return Permission.COMMAND_MAIN_VERSION;
+    }
+
+    @Override
+    public void execute(CommandContext<UserAudience> context) {
+        UserAudience sender = context.getSender();
+        sender.sendMessage(String.format(
+                COLOR_CHAR + "7You're currently on " + COLOR_CHAR + "b%s" +
+                COLOR_CHAR + "7 (branch: " + COLOR_CHAR + "b%s" + COLOR_CHAR + "7)\n" +
+                COLOR_CHAR + "eFetching latest build info...",
+                Constants.VERSION, Constants.GIT_BRANCH
+        ));
+
+        String baseUrl = String.format(
+                "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/%s/lastSuccessfulBuild/",
+                Constants.GIT_BRANCH
+        );
+
+        httpClient.asyncGet(
+                baseUrl + "buildNumber",
+                JsonElement.class
+        ).whenComplete((result, error) -> {
+            if (error != null) {
+                sender.sendMessage(COLOR_CHAR + "cCould not retrieve latest version info!");
+                error.printStackTrace();
+                return;
+            }
+
+            JsonElement response = result.getResponse();
+
+            logger.info(String.valueOf(response));
+            logger.info("{}", result.getHttpCode());
+
+            if (result.getHttpCode() == 404) {
+                sender.sendMessage(
+                        COLOR_CHAR + "cGot a 404 (not found) while requesting the latest version." +
+                        " Are you using a custom Floodgate version?"
+                );
+                return;
+            }
+
+            if (!result.isCodeOk()) {
+                //todo make it more generic instead of using a Whitelist command strings
+                logger.error(
+                        "Got an error from requesting the latest Floodgate version: {}",
+                        response.toString()
+                );
+                sender.sendMessage(Message.UNEXPECTED_ERROR);
+                return;
+            }
+
+            int buildNumber = response.getAsInt();
+
+            if (buildNumber > Constants.BUILD_NUMBER) {
+                sender.sendMessage(String.format(
+                        COLOR_CHAR + "7There is a newer version of Floodgate available!\n" +
+                        COLOR_CHAR + "7You are " + COLOR_CHAR + "e%s " + COLOR_CHAR + "7builds behind.\n" +
+                        COLOR_CHAR + "7Download the latest Floodgate version here: " + COLOR_CHAR + "b%s",
+                        buildNumber - Constants.BUILD_NUMBER, baseUrl
+                ));
+                return;
+            }
+            if (buildNumber == Constants.BUILD_NUMBER) {
+                sender.sendMessage(COLOR_CHAR + "aYou're running the latest version of Floodgate!");
+                return;
+            }
+            sender.sendMessage(COLOR_CHAR + "cCannot check version for custom Floodgate versions!");
+        });
+    }
+}

core/src/main/java/org/geysermc/floodgate/command/util/Permission.java

@@ -31,6 +31,7 @@ import static org.geysermc.floodgate.command.util.PermissionDefault.TRUE;
 public enum Permission {
     COMMAND_MAIN("floodgate.command.floodgate", TRUE),
     COMMAND_MAIN_FIREWALL(COMMAND_MAIN, "firewall", OP),
+    COMMAND_MAIN_VERSION(COMMAND_MAIN, "version", OP),
     COMMAND_LINK("floodgate.command.linkaccount", TRUE),
     COMMAND_UNLINK("floodgate.command.unlinkaccount", TRUE),
     COMMAND_WHITELIST("floodgate.command.fwhitelist", OP),

core/src/main/java/org/geysermc/floodgate/util/HttpClient.java

@@ -57,6 +57,10 @@ public class HttpClient {
         return CompletableFuture.supplyAsync(() -> get(urlString), executorService);
     }
 
+    public <T> CompletableFuture<HttpResponse<T>> asyncGet(String urlString, Class<T> response) {
+        return CompletableFuture.supplyAsync(() -> get(urlString, response), executorService);
+    }
+
     public DefaultHttpResponse get(String urlString) {
         return readDefaultResponse(request(urlString));
     }
@@ -99,12 +103,14 @@ public class HttpClient {
             return new HttpResponse<>(-1, null);
         }
 
+        int responseCode = -1;
         try {
-            int responseCode = connection.getResponseCode();
+            responseCode = connection.getResponseCode();
             T response = gson.fromJson(streamReader, clazz);
             return new HttpResponse<>(responseCode, response);
         } catch (Exception ignored) {
-            return new HttpResponse<>(-1, null);
+            // e.g. when the response isn't JSON
+            return new HttpResponse<>(responseCode, null);
         } finally {
             try {
                 streamReader.close();
@@ -149,11 +155,7 @@ public class HttpClient {
         try {
             stream = connection.getInputStream();
         } catch (Exception exception) {
-            try {
             stream = connection.getErrorStream();
-            } catch (Exception exception1) {
-                throw new RuntimeException("Both the input and the error stream failed?!");
-            }
         }
 
         // it's null for example when it couldn't connect to the server

core/src/main/java/org/geysermc/floodgate/util/Utils.java

@@ -35,6 +35,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;