Merge pull request #55 from Andre601/feature/proper-velocity-2-support

Fully support Velocity 2

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]);

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
 

core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java

@@ -168,7 +168,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("");
     }
 

core/src/main/java/com/andre601/oneversionremake/core/interfaces/PluginCore.java

@@ -43,4 +43,6 @@ public interface PluginCore{
     CommandHandler getCommandHandler();
 
     String getVersion();
+
+    String getProxyVersion();
 }

pom.xml

@@ -11,7 +11,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <plugin.version>3.5.0</plugin.version>
+
+        <plugin.version>3.5.1</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>

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;
     }

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"
   ],

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>

velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java

@@ -35,8 +35,6 @@
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
-import org.bstats.charts.DrilldownPie;
-import org.bstats.velocity.Metrics;
 import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
@@ -48,17 +46,13 @@ public class VelocityCore implements PluginCore{
     private final ProxyServer proxy;
     private final Path path;
 
-    private final Metrics.Factory factory;
-
     private OneVersionRemake core;
 
-    @Inject
-    public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory factory){
+    @Inject // TODO: Re-Add Metrics.Factory factory once Velocity 2 supports it
+    public VelocityCore(ProxyServer proxy, @DataDirectory Path path){
         this.logger = new VelocityLogger(LoggerFactory.getLogger("OneVersionRemake"));
         this.proxy = proxy;
         this.path = path;
-
-        this.factory = factory;
     }
 
     @Subscribe
@@ -86,9 +80,11 @@ public void loadEventListeners(){
 
     @Override
     public void loadMetrics(){
-        Metrics metrics = factory.make(this, 10341);
+        // TODO: Re-Add Metrics once available for Velocity 2
+        //Metrics metrics = factory.make(this, 10341);
+
+        //metrics.addCustomChart(new DrilldownPie("allowed_protocols", () -> core.getPieMap()));
 
-        metrics.addCustomChart(new DrilldownPie("allowed_protocols", () -> core.getPieMap()));
     }
 
     @Override
@@ -121,6 +117,11 @@ public String getVersion(){
         return core.getVersion();
     }
 
+    @Override
+    public String getProxyVersion(){
+        return getProxy().version().version();
+    }
+
     public ProxyServer getProxy(){
         return proxy;
     }

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"
+  }
+]