1.4.8

Author: hyperdefined

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>bungeeblockversion</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.8</version>
     <packaging>jar</packaging>
 
     <name>BungeeBlockVersion</name>
@@ -76,6 +76,10 @@
                             <pattern>lol.hyper.githubreleaseapi</pattern>
                             <shadedPattern>lol.hyper.bungeeblockversion.updater</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.json</pattern>
+                            <shadedPattern>lol.hyper.bungeeblockversion.json</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -107,7 +111,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.1</version>
+            <version>1.20-R0.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -134,5 +138,11 @@
             <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/lol/hyper/bungeeblockversion/BungeeBlockVersion.java

@@ -30,6 +30,8 @@
 import org.bstats.bungeecord.Metrics;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Logger;
 
 public final class BungeeBlockVersion extends Plugin implements Listener {
@@ -41,6 +43,8 @@ public final class BungeeBlockVersion extends Plugin implements Listener {
     public final MiniMessage miniMessage = MiniMessage.miniMessage();
     private BungeeAudiences adventure;
 
+    public Map<Integer, String> versions = new HashMap<>();
+
     @Override
     public void onEnable() {
         this.adventure = BungeeAudiences.create(this);

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

@@ -18,14 +18,18 @@
 package lol.hyper.bungeeblockversion.events;
 
 import lol.hyper.bungeeblockversion.BungeeBlockVersion;
-import lol.hyper.bungeeblockversion.tools.VersionToStrings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.event.LoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class JoinEvent implements Listener {
 
@@ -41,6 +45,7 @@ public void onPreConnect(LoginEvent event) {
             return;
         }
         int version = event.getConnection().getVersion();
+        String playerName = event.getConnection().getName();
         if (bungeeBlockVersion.configHandler.configuration.getBoolean("log-connection-versions")) {
             bungeeBlockVersion.logger.info("Player is connecting with protocol version: " + version);
         }
@@ -51,7 +56,7 @@ public void onPreConnect(LoginEvent event) {
 
         event.setCancelled(true);
         String blockedMessage = bungeeBlockVersion.configHandler.configuration.getString("disconnect-message");
-        String allowedVersions = VersionToStrings.allowedVersions(bungeeBlockVersion.configHandler.blockedVersions);
+        String allowedVersions = allowedVersions(bungeeBlockVersion.configHandler.blockedVersions);
         if (allowedVersions == null) {
             blockedMessage = "<red>All versions are currently blocked from playing.";
         }
@@ -60,7 +65,25 @@ public void onPreConnect(LoginEvent event) {
         }
         Component blockedMessageComponent = bungeeBlockVersion.miniMessage.deserialize(blockedMessage);
         BaseComponent blockedMessageBaseComponent = new TextComponent(BungeeComponentSerializer.get().serialize(blockedMessageComponent));
-        event.setCancelReason(blockedMessageBaseComponent);
-        bungeeBlockVersion.logger.info("Blocking player " + event.getConnection().getName() + " because they are playing on version " + VersionToStrings.versionMap.get(event.getConnection().getVersion()) + " which is blocked!");
+        event.setReason(blockedMessageBaseComponent);
+        bungeeBlockVersion.logger.info("Blocking player " + playerName + " because they are playing on version " + bungeeBlockVersion.configHandler.versionMap.get(version) + " which is blocked!");
+    }
+
+    /**
+     * Builds a string that will show what versions the server supports. Example: 1.8 to 1.14.4
+     *
+     * @param deniedVersions Versions to deny.
+     * @return Returns the string of versions.
+     */
+    public String allowedVersions(List<Integer> deniedVersions) {
+        List<Integer> allVersions = new ArrayList<>(ProtocolConstants.SUPPORTED_VERSION_IDS);
+        allVersions.removeAll(deniedVersions);
+        if (allVersions.isEmpty()) {
+            return null;
+        }
+        int minVersion = Collections.min(allVersions);
+        int maxVersion = Collections.max(allVersions);
+
+        return bungeeBlockVersion.configHandler.versionMap.get(minVersion) + " to " + bungeeBlockVersion.configHandler.versionMap.get(maxVersion);
     }
 }

src/main/java/lol/hyper/bungeeblockversion/tools/ConfigHandler.java

@@ -22,19 +22,23 @@
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 import net.md_5.bungee.protocol.ProtocolConstants;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class ConfigHandler {
 
     public Configuration configuration;
     public List<Integer> blockedVersions;
+    public Map<Integer, String> versionMap = new HashMap<>();
     private final BungeeBlockVersion bungeeBlockVersion;
 
     public ConfigHandler(BungeeBlockVersion bungeeBlockVersion) {
@@ -53,8 +57,8 @@ public void loadConfig() {
                 } else {
                     bungeeBlockVersion.logger.warning("Unable to create config folder!");
                 }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+            } catch (IOException exception) {
+                throw new RuntimeException(exception);
             }
         }
         try {
@@ -76,14 +80,39 @@ public void loadConfig() {
             Iterator<Integer> iter = blockedVersions.iterator();
             while (iter.hasNext()) {
                 int version = iter.next();
+                // make sure the versions the user entered exist
                 if (!ProtocolConstants.SUPPORTED_VERSION_IDS.contains(version)) {
                     bungeeBlockVersion.logger.warning("Version " + version + " is NOT a valid version number! Ignoring this version.");
                     iter.remove();
                 }
             }
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (IOException exception) {
+            exception.printStackTrace();
             bungeeBlockVersion.logger.severe("Unable to load configuration file!");
         }
+
+        fetchVersions();
+    }
+
+    private void fetchVersions() {
+        bungeeBlockVersion.logger.info("Loading versions from GitHub...");
+        JSONUtils jsonUtils = new JSONUtils(bungeeBlockVersion);
+        JSONObject versions = jsonUtils.requestJSON("https://raw.githubusercontent.com/hyperdefined/BungeeBlockVersion/master/versions.json");
+        if (versions == null) {
+            bungeeBlockVersion.logger.severe("Unable to fetch versions from GitHub!");
+            bungeeBlockVersion.logger.severe("The plugin is unable to function normally.");
+            return;
+        }
+        bungeeBlockVersion.logger.info("Loaded " + versions.length() + " version(s) from GitHub!");
+        // key is the protocol version
+        // value is the name of the version
+        versions.keys().forEachRemaining(key -> {
+            int protocolVersion = Integer.parseInt(key);
+            String namedVersion = versions.getString(key);
+            // make sure the version exists before saving it
+            if (ProtocolConstants.SUPPORTED_VERSION_IDS.contains(protocolVersion)) {
+                versionMap.put(protocolVersion, namedVersion);
+            }
+        });
     }
 }

src/main/java/lol/hyper/bungeeblockversion/tools/JSONUtils.java

@@ -0,0 +1,69 @@
+/*
+ * This file is part of BungeeBlockVersion.
+ *
+ * BungeeBlockVersion is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * BungeeBlockVersion is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with BungeeBlockVersion.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.bungeeblockversion.tools;
+
+import lol.hyper.bungeeblockversion.BungeeBlockVersion;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.stream.Collectors;
+
+public class JSONUtils {
+
+    private final BungeeBlockVersion bungeeBlockVersion;
+
+    public JSONUtils(BungeeBlockVersion bungeeBlockVersion) {
+        this.bungeeBlockVersion = bungeeBlockVersion;
+    }
+
+    /**
+     * Get a JSONObject from a URL.
+     *
+     * @param url The URL to get JSON from.
+     * @return The response JSONObject. Returns null if there was some issue.
+     */
+    public JSONObject requestJSON(String url) {
+        String rawJSON;
+        try {
+            URLConnection conn = new URL(url).openConnection();
+            conn.setRequestProperty("User-Agent", "BungeeBlockVersion " + bungeeBlockVersion.getDescription().getVersion() + " (+https://github.com/hyperdefined/BungeeBlockVersion)");
+            conn.connect();
+
+            InputStream in = conn.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+            rawJSON = reader.lines().collect(Collectors.joining(System.lineSeparator()));
+            reader.close();
+
+        } catch (IOException exception) {
+            exception.printStackTrace();
+            bungeeBlockVersion.logger.severe("Unable to read URL " + url);
+            return null;
+        }
+
+        if (rawJSON.isEmpty()) {
+            bungeeBlockVersion.logger.severe("Read JSON from " + url + " returned an empty string!");
+            return null;
+        }
+        return new JSONObject(rawJSON);
+    }
+}