version checking

lucko · Jul 7, 2024 · 7953663 · 7953663
1 parent 3c8016f
commit 7953663
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -30,9 +30,9 @@ include (
         'spark-velocity4',
         'spark-sponge7',
         'spark-sponge8',
-        'spark-forge',
-        'spark-neoforge',
-        'spark-fabric',
+//        'spark-forge',
+//        'spark-neoforge',
+//        'spark-fabric',
         'spark-nukkit',
         'spark-waterdog',
         //'spark-minestom', // disabled until minestom publish their maven artifacts to a proper repo

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitPlatformInfo.java
@@ -47,12 +47,14 @@ public String getName() {
     @Override
     public String getVersion() {
         final String version = this.server.getVersion();
-        String brand;
-
-        if (version.contains("Spigot")) {
-            brand = null;
-        } else {
-            brand = this.server.getName();
+        String brand = null;
+
+        if (BukkitSparkPlugin.classExists("io.papermc.paper.ServerBuildInfo")) {
+            if (version.contains("Spigot")) {
+                brand = null;
+            } else {
+                brand = this.server.getName();
+            }
         }
         return (brand == null ? "" : brand + " ") + this.server.getVersion();
     }

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java
@@ -223,7 +223,7 @@ public void registerApi(Spark api) {
         getServer().getServicesManager().register(Spark.class, api, this, ServicePriority.Normal);
     }
 
-    private static boolean classExists(String className) {
+    protected static boolean classExists(String className) {
         try {
             Class.forName(className);
             return true;