First step at properly supporting Velocity 2

Andre601 · May 17, 2021 · b413a9f · b413a9f
1 parent 5f478c1
commit b413a9f
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 2 deletions.
diff --git a/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java b/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java
@@ -105,6 +105,13 @@ public String getVersion(){
         return core.getVersion();
     }
 
+    @Override
+    public String getProxyVersion(){
+        String[] version = getProxy().getVersion().split(":");
+
+        return String.format("%s (Build #%s)", version[2], version[4]);
+    }
+
     public ServerPing.PlayerInfo[] getPlayers(List<String> lines, List<Integer> serverProtocols, int userProtocol, boolean majorOnly){
         return core.getPlayers(ServerPing.PlayerInfo.class, lines, serverProtocols, userProtocol, majorOnly)
                    .toArray(new ServerPing.PlayerInfo[0]);

diff --git a/bungeecord/src/main/resources/plugin.yml b/bungeecord/src/main/resources/plugin.yml
@@ -1,6 +1,7 @@
 name: OneVersionRemake
 author: Andre_601
 version: ${project.version}
+description: ${project.description}
 
 main: com.andre601.oneversionremake.bungeecord.BungeeCore
 

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java b/core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java
@@ -20,6 +20,7 @@
 
 import com.andre601.oneversionremake.core.commands.CommandHandler;
 import com.andre601.oneversionremake.core.enums.ProtocolVersion;
+import com.andre601.oneversionremake.core.enums.ProxyPlatform;
 import com.andre601.oneversionremake.core.files.ConfigHandler;
 import com.andre601.oneversionremake.core.interfaces.PluginCore;
 import com.andre601.oneversionremake.core.interfaces.ProxyLogger;
@@ -118,6 +119,14 @@ public <T> List<T> getPlayers(Class<T> clazz, List<String> lines, List<Integer>
 
     private void start(){
         loadVersion();
+
+        if((pluginCore.getProxyPlatform() != ProxyPlatform.BUNGEECORD) && (pluginCore.getProxyPlatform() != ProxyPlatform.WATERFALL)){
+            if((isNewVelocity() && isLegacyPlugin()) || (!isNewVelocity() && !isLegacyPlugin())){
+                printIncompatabilityWarning();
+                return;
+            }
+        }
+
         printBanner();
 
         if(configHandler.loadConfig()){
@@ -168,7 +177,7 @@ private void printBanner(){
         getProxyLogger().info("\\____/ |___/_/ |_|");
         getProxyLogger().info("");
         getProxyLogger().info("OneVersionRemake v" + getVersion());
-        getProxyLogger().info("Platform: " + pluginCore.getProxyPlatform().getName());
+        getProxyLogger().info("Platform: " + pluginCore.getProxyPlatform().getName() + " v" + pluginCore.getProxyVersion());
         getProxyLogger().info("");
     }
 
@@ -186,6 +195,15 @@ private void printWarning(){
         getProxyLogger().warn("================================================================================");
     }
 
+    private void printIncompatabilityWarning(){
+        getProxyLogger().warn("================================================================================");
+        getProxyLogger().warn("WARNING!");
+        getProxyLogger().warn("You're using Velocity 2 while the plugin itself is for Velocity 1.1.0!");
+        getProxyLogger().warn("");
+        getProxyLogger().warn("The Legacy-plugin is incompatible with Velocity 2 and will be disabled...");
+        getProxyLogger().warn("================================================================================");
+    }
+
     private void loadVersion(){
         try(InputStream is = getClass().getResourceAsStream("/core.properties")){
             Properties properties = new Properties();
@@ -197,4 +215,18 @@ private void loadVersion(){
             version = "UNKNOWN";
         }
     }
+
+    private boolean isNewVelocity(){
+        try{
+            int maj = Integer.parseInt(pluginCore.getProxyVersion().split("\\.")[0]);
+
+            return maj >= 2;
+        }catch(NumberFormatException ex){
+            return false;
+        }
+    }
+
+    private boolean isLegacyPlugin(){
+        return pluginCore.getProxyPlatform() == ProxyPlatform.VELOCITY_LEGACY;
+    }
 }
diff --git a/core/src/main/java/com/andre601/oneversionremake/core/interfaces/PluginCore.java b/core/src/main/java/com/andre601/oneversionremake/core/interfaces/PluginCore.java
@@ -43,4 +43,6 @@ public interface PluginCore{
     CommandHandler getCommandHandler();
 
     String getVersion();
+
+    String getProxyVersion();
 }
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <plugin.version>3.5.0</plugin.version>
+        <plugin.description>Only allow specific client versions on your Network.</plugin.description>
+
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
     </properties>

diff --git a/velocity-legacy/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java b/velocity-legacy/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java
@@ -121,6 +121,11 @@ public String getVersion(){
         return core.getVersion();
     }
 
+    @Override
+    public String getProxyVersion(){
+        return getProxy().getVersion().getVersion();
+    }
+
     public ProxyServer getProxy(){
         return proxy;
     }

diff --git a/velocity-legacy/src/main/resources/velocity-plugin.json b/velocity-legacy/src/main/resources/velocity-plugin.json
@@ -2,7 +2,7 @@
   "id": "oneversionremake",
   "name": "OneVersionRemake",
   "version": "${project.version}",
-  "description": "Block connections from Players with versions not matching your Network's.",
+  "description": "${project.description}",
   "authors": [
     "Andre_601"
   ],

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -25,6 +25,7 @@
     <artifactId>velocity</artifactId>
     <packaging>jar</packaging>
     <version>${plugin.version}</version>
+    <description>${plugin.description}</description>
 
     <parent>
         <artifactId>parent</artifactId>

diff --git a/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java b/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java
@@ -121,6 +121,11 @@ public String getVersion(){
         return core.getVersion();
     }
 
+    @Override
+    public String getProxyVersion(){
+        return getProxy().version().version();
+    }
+
     public ProxyServer getProxy(){
         return proxy;
     }

diff --git a/velocity/src/main/resources/velocity-plugin-info.json b/velocity/src/main/resources/velocity-plugin-info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "id": "oneversionremake",
+    "name": "OneVersionRemake",
+    "version": "${project.version}",
+    "description": "${project.description}",
+    "authors": [
+      "Andre_601"
+    ],
+    "main": "com.andre601.oneversionremake.velocity.VelocityCore"
+  }
+]