Merge branch 'master' into add-percent-placeholder

Author: iGabyTM

pom.xml

@@ -2,32 +2,36 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.extendedclip.papi.expansion.server</groupId>
   <artifactId>server-expansion</artifactId>
-  <version>2.5.0</version>
+  <version>2.6.0</version>
   <name>PAPI-Expansion-Server</name>
   <description>PlaceholderAPI expansion for server placeholders</description>
-    
+
     <repositories>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/dev/</url>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.4-R0.1-SNAPSHOT</version>
+            <version>1.17-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.9</version>
+            <version>2.10.10</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -47,8 +51,8 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-    
-    <build>     
+
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/com/extendedclip/papi/expansion/server/ServerExpansion.java

@@ -43,6 +43,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ServerExpansion extends PlaceholderExpansion implements Cacheable, Configurable {
 
@@ -66,7 +68,11 @@ public class ServerExpansion extends PlaceholderExpansion implements Cacheable,
 	public ServerExpansion() {
 		try {
 			version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-			craftServer = Class.forName("net.minecraft.server." + version + ".MinecraftServer").getMethod("getServer").invoke(null);
+			if (minecraftVersion() >= 17) {
+				craftServer = Class.forName("net.minecraft.server.MinecraftServer").getMethod("getServer").invoke(null);
+			} else {
+				craftServer = Class.forName("net.minecraft.server." + version + ".MinecraftServer").getMethod("getServer").invoke(null);
+			}
 			tps = craftServer.getClass().getField("recentTps");
 			variant = initializeVariant();
 		} catch (Exception e) {
@@ -462,4 +468,24 @@ private String getPercent(double tps){
 		return Math.min(Math.round(100 / 20.0 * tps), 100.0) + "%";
 	}
 
+	/**
+	 * Helper method to return the major version that the server is running.
+	 *
+	 * This is needed because in 1.17, NMS is no longer versioned.
+	 *
+	 * @return the major version of Minecraft the server is running
+	 */
+	public static int minecraftVersion() {
+		try {
+			final Matcher matcher = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?\\)").matcher(Bukkit.getVersion());
+			if (matcher.find()) {
+				return Integer.parseInt(matcher.toMatchResult().group(2), 10);
+			} else {
+				throw new IllegalArgumentException(String.format("No match found in '%s'", Bukkit.getVersion()));
+			}
+		} catch (final IllegalArgumentException ex) {
+			throw new RuntimeException("Failed to determine Minecraft version", ex);
+		}
+	}
+
 }