add spigot servers

flake.nix

@@ -22,6 +22,18 @@
         ];
       };
 
+      jdk21 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk21_headless
+        ];
+      };
+
+      jdk17 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk17_headless
+        ];
+      };
+
       jdk8 = pkgs.mkShellNoCC {
         buildInputs = with pkgs; [
           jdk8_headless

test-env/init.sh

@@ -29,6 +29,44 @@ create_server() {
   popd &> /dev/null
 }
 
+create_spigot_server() {
+  local version=$1
+  local port=$2
+  local nixshell=$3
+
+  if [ ! -f "cache/spigot-$version.jar" ]; then
+    echo Running BuildTools for Spigot $version
+
+    local root=$(pwd)
+
+    pushd cache &> /dev/null
+
+    mkdir -p "spigot-$version"
+    pushd "spigot-$version" &> /dev/null
+    nix develop ".#$nixshell" -c java -jar ../buildtools.jar --disable-java-check --nogui --rev "$version"
+
+    if [ -f "$root/patches/spigot-$version-server.patch" ]; then
+      echo Applying spigot-$version-server.patch
+      pushd Spigot/Spigot-Server &> /dev/null
+      git apply "$root/patches/spigot-$version-server.patch"
+      popd &> /dev/null
+
+      pushd Spigot &> /dev/null
+      bash ../apache-maven-*/bin/mvn package
+      mv Spigot-Server/target/spigot-*.jar "../spigot-$version.jar"
+      popd &> /dev/null
+    fi
+
+    mv "spigot-$version.jar" ..
+    popd &> /dev/null
+    rm -rf "spigot-$version"
+
+    popd &> /dev/null
+  fi
+
+  create_server "spigot-$version" "$port" "$nixshell"
+}
+
 download_file() {
   local name=$1
   local url=$2
@@ -50,39 +88,60 @@ download_file() {
   fi
 }
 
+download_file "buildtools.jar" "https://hub.spigotmc.org/jenkins/job/BuildTools/197/artifact/target/BuildTools.jar" "9a5b059ace22eaef28fb62f96970f0abe1490f06c860229b94627cd72eaf6ea5"
+
 # --- 1.21.11 ---
 download_file "paper-1.21.11.jar" "https://fill-data.papermc.io/v1/objects/4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649/paper-1.21.11-100.jar" "4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649"
 create_server "paper-1.21.11" "25560" "jdk25"
 
+create_spigot_server "1.21.11" "25561" "jdk25"
+
 # --- 1.21.9 ---
 download_file "paper-1.21.9.jar" "https://fill-data.papermc.io/v1/objects/aec002e77c7566e49494fdf05430b96078ffd1d7430e652d4f338fef951e7a10/paper-1.21.9-59.jar" "aec002e77c7566e49494fdf05430b96078ffd1d7430e652d4f338fef951e7a10"
 create_server "paper-1.21.9" "25562" "jdk25"
 
+# spigot doesnt have 1.21.9
+create_spigot_server "1.21.10" "25563" "jdk25"
+
 # --- 1.21.6 ---
 download_file "paper-1.21.6.jar" "https://fill-data.papermc.io/v1/objects/35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214/paper-1.21.6-48.jar" "35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214"
 create_server "paper-1.21.6" "25564" "jdk25"
 
+create_spigot_server "1.21.6" "25565" "jdk21"
+
 # --- 1.21.5 ---
 download_file "paper-1.21.5.jar" "https://fill-data.papermc.io/v1/objects/2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e/paper-1.21.5-114.jar" "2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e"
 create_server "paper-1.21.5" "25566" "jdk25"
 
+create_spigot_server "1.21.5" "25567" "jdk21"
+
 # --- 1.21.3 ---
 download_file "paper-1.21.3.jar" "https://fill-data.papermc.io/v1/objects/87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e/paper-1.21.3-83.jar" "87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e"
 create_server "paper-1.21.3" "25568" "jdk25"
 
+create_spigot_server "1.21.3" "25569" "jdk21"
+
 # --- 1.20.5 ---
 download_file "paper-1.20.5.jar" "https://fill-data.papermc.io/v1/objects/3cd7da2f8df92e082a501a39c674aab3c0343edd179b86f5baccaebfc9974132/paper-1.20.5-22.jar" "3cd7da2f8df92e082a501a39c674aab3c0343edd179b86f5baccaebfc9974132"
 create_server "paper-1.20.5" "25570" "jdk25"
 
+# spigot doesn't have 1.20.5
+create_spigot_server "1.20.6" "25571" "jdk21"
+
 # --- 1.20.4 ---
 download_file "paper-1.20.4.jar" "https://fill-data.papermc.io/v1/objects/e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7/paper-1.20.4-499-mojang.jar" "e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7"
 create_server "paper-1.20.4" "25572" "jdk25"
 
+create_spigot_server "1.20.4" "25573" "jdk21"
+
 # --- 1.20.2 ---
 download_file "paper-1.20.2.jar" "https://fill-data.papermc.io/v1/objects/07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69/paper-1.20.2-318-mojang.jar" "07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69"
 create_server "paper-1.20.2" "25574" "jdk25"
 
+create_spigot_server "1.20.2" "25575" "jdk21"
+
 # --- 1.17 ---
 download_file "paper-1.17.jar" "https://fill-data.papermc.io/v1/objects/760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871/paper-1.17-79.jar" "760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871"
 create_server "paper-1.17" "25576" "jdk25"
 
+create_spigot_server "1.17" "25577" "jdk17"

test-env/patches/spigot-1.17-server.patch

@@ -0,0 +1,13 @@
+diff --git i/src/main/java/org/bukkit/craftbukkit/Main.java w/src/main/java/org/bukkit/craftbukkit/Main.java
+index 02e5090db..5f4215b35 100644
+--- i/src/main/java/org/bukkit/craftbukkit/Main.java
++++ w/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -161,7 +161,7 @@ public class Main {
+                 System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 16. Check your Java version with the command 'java -version'.");
+                 return;
+             }
+-            if (javaVersion > 60.0) {
++            if (javaVersion > 60.0 && false) {
+                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 16 is supported.");
+                 return;
+             }

test-plugin/src/main/java/net/megavex/scoreboardlibrary/testplugin/ScoreboardPlugin.java

@@ -7,6 +7,7 @@ import net.megavex.scoreboardlibrary.testplugin.module.Module;
 import net.megavex.scoreboardlibrary.testplugin.module.ObjectivesModule;
 import net.megavex.scoreboardlibrary.testplugin.module.SidebarModule;
 import net.megavex.scoreboardlibrary.testplugin.module.TeamsModule;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -49,15 +50,16 @@ public final class ScoreboardPlugin extends JavaPlugin implements Listener {
     for (final Module module : this.modules) {
       module.onDisable();
     }
-    this.modules = null;
     this.lib.close();
-    this.lib = null;
     GlobalTranslator.get().removeSource(this.translator);
   }
 
   @EventHandler
   public void onJoin(PlayerJoinEvent event) {
-    event.getPlayer().setOp(true);
+    final Player player = event.getPlayer();
+    player.setOp(true);
+    player.sendMessage("Server software: " + this.getServer().getName());
+    player.sendMessage("Server version: " + this.getServer().getVersion());
   }
 
   public ScoreboardLibrary scoreboardLibrary() {