1.19 support

Author: hyperdefined

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>velocityblockversion</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
 
     <name>VelocityBlockVersion</name>
@@ -87,6 +87,11 @@
                             <!-- Replace this with your package! -->
                             <shadedPattern>lol.hyper.velocityblockversion.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>lol.hyper.githubreleaseapi</pattern>
+                            <!-- Replace this with your package! -->
+                            <shadedPattern>lol.hyper.velocityblockversion.updater</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -119,6 +124,7 @@
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
             <version>4.11.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
@@ -130,6 +136,13 @@
             <groupId>lol.hyper</groupId>
             <artifactId>github-release-api</artifactId>
             <version>1.0.2</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

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

@@ -31,53 +31,37 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.velocity.Metrics;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.stream.Collectors;
 
 @Plugin(
         id = "velocityblockversion",
         name = "VelocityBlockVersion",
-        version = "1.0.4",
+        version = "1.0.5",
         authors = {"hyperdefined"},
-        description = "Block certain Minecraft versions from connecting to your network."
+        description = "Block certain Minecraft versions from connecting to your network.",
+        url = "https://github.com/hyperdefined/VelocityBlockVersion"
 )
 public class VelocityBlockVersion {
 
     public ConfigHandler configHandler;
+    public final String VERSION = "1.0.5";
 
     public final Logger logger;
     private final Metrics.Factory metricsFactory;
-    ProxyServer server;
-    String currentVersion;
-    public MiniMessage miniMessage = MiniMessage.miniMessage();
+    private final ProxyServer server;
+    public final MiniMessage miniMessage = MiniMessage.miniMessage();
 
     @Inject
     public VelocityBlockVersion(ProxyServer server, Logger logger, Metrics.Factory metricsFactory) {
         this.server = server;
         this.logger = logger;
         this.metricsFactory = metricsFactory;
-        // this kinda sucks but whatever
-        InputStream json = VelocityBlockVersion.class.getResourceAsStream("/velocity-plugin.json");
-        if (json != null) {
-            String text = new BufferedReader(
-                    new InputStreamReader(json, StandardCharsets.UTF_8))
-                    .lines()
-                    .collect(Collectors.joining("\n"));
-            JSONObject version = new JSONObject(text);
-            currentVersion = version.getString("version");
-        }
     }
 
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
-        VersionToStrings.init();
         configHandler = new ConfigHandler(this);
         configHandler.loadConfig();
         metricsFactory.make(this, 13308);
@@ -112,7 +96,7 @@ public void checkForUpdates() {
             e.printStackTrace();
             return;
         }
-        GitHubRelease current = api.getReleaseByTag(currentVersion);
+        GitHubRelease current = api.getReleaseByTag(VERSION);
         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!");

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

@@ -31,7 +31,7 @@ public class ConfigHandler {
     public Toml config;
     private final VelocityBlockVersion velocityBlockVersion;
     public static final List<Integer> versions = new ArrayList<>();
-    public static final double CONFIG_VERSION = 2;
+    public static final double CONFIG_VERSION = 3;
 
     public ConfigHandler(VelocityBlockVersion velocityBlockVersion) {
         this.velocityBlockVersion = velocityBlockVersion;

src/main/java/lol/hyper/velocityblockversion/tools/VersionToStrings.java

@@ -27,7 +27,7 @@ public class VersionToStrings {
     // Set a list of version strings we can grab via the version number.
     public static final HashMap<Integer, String> versionStrings = new HashMap<>();
 
-    public static void init() {
+    static {
         versionStrings.put(47, "1.8");
         versionStrings.put(107, "1.9");
         versionStrings.put(108, "1.9.1");
@@ -59,6 +59,7 @@ public static void init() {
         versionStrings.put(756, "1.17.1");
         versionStrings.put(757, "1.18");
         versionStrings.put(758, "1.18.2");
+        versionStrings.put(759, "1.19");
     }
 
     /**

src/main/resources/config.toml

@@ -34,6 +34,7 @@ versions = [
   756,
   757,
   758,
+  759,
 ]
 
 # Send this message if someone connects with a blocked version.
@@ -42,4 +43,4 @@ versions = [
 disconnect_message = "<red>You cannot connect with this version! We only allow version(s) {VERSIONS}.</red>"
 
 # No touch please :)
-config_version = 2
+config_version = 3