POM Changes

Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.

By: md_5 <git@md-5.net>

paper-server/checkstyle.xml

@@ -34,6 +34,9 @@
         <property name="checks" value="UnusedImports"/>
         <property name="files" value=".*[/\\]net[/\\]minecraft[/\\].*"/>
     </module>
+    <module name="SuppressionSingleFilter">
+        <property name="checks" value="LeftCurly|ParenPad"/>
+    </module>
 
     <module name="TreeWalker">
         <!-- See https://checkstyle.org/checks/javadoc/index.html -->
@@ -55,6 +58,13 @@
         <module name="SuppressWithNearbyCommentFilter">
             <property name="commentFormat" value="CraftBukkit"/>
         </module>
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="Spigot start"/>
+            <property name="onCommentFormat" value="Spigot end"/>
+        </module>
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="Spigot"/>
+        </module>
 
         <!-- See https://checkstyle.org/checks/imports/index.html -->
         <module name="AvoidStarImport">

paper-server/pom.xml

@@ -1,13 +1,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.bukkit</groupId>
+    <groupId>org.spigotmc</groupId>
-    <artifactId>craftbukkit</artifactId>
+    <artifactId>spigot</artifactId>
     <packaging>jar</packaging>
     <version>1.21.4-R0.1-SNAPSHOT</version>
-    <name>CraftBukkit</name>
+    <name>Spigot</name>
     <url>https://www.spigotmc.org/</url>
 
+    <parent>
+        <groupId>org.spigotmc</groupId>
+        <artifactId>spigot-parent</artifactId>
+        <version>dev-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <properties>
         <skipTests>true</skipTests>
         <groups>AllFeatures,Bundle,Legacy,Normal,VanillaFeature</groups>
@@ -28,8 +35,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.bukkit</groupId>
+            <groupId>org.spigotmc</groupId>
-            <artifactId>bukkit</artifactId>
+            <artifactId>spigot-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -387,11 +394,26 @@
                 <groupId>net.md-5</groupId>
                 <artifactId>scriptus</artifactId>
                 <version>0.5.0</version>
-                <configuration>
-                    <format>${bt.name}-Bukkit-%s</format>
-                </configuration>
                 <executions>
                     <execution>
+                        <id>ex-spigot</id>
+                        <configuration>
+                            <format>${bt.name}-Spigot-%s</format>
+                            <scmDirectory>../</scmDirectory>
+                            <descriptionProperty>spigot.desc</descriptionProperty>
+                        </configuration>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>describe</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>ex-craftbukkit</id>
+                        <configuration>
+                            <format>-%s</format>
+                            <scmDirectory>../../CraftBukkit</scmDirectory>
+                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
+                        </configuration>
                         <phase>initialize</phase>
                         <goals>
                             <goal>describe</goal>
@@ -424,7 +446,7 @@
                         <manifestEntries>
                             <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                             <Implementation-Title>CraftBukkit</Implementation-Title>
-                            <Implementation-Version>${describe}</Implementation-Version>
+                            <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
                             <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
                             <Specification-Title>Bukkit</Specification-Title>
                             <Specification-Version>${api.version}</Specification-Version>

paper-server/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

@@ -11,7 +11,7 @@ public final class Versioning {
     public static String getBukkitVersion() {
         String result = "Unknown-Version";
 
-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties");
+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
         Properties properties = new Properties();
 
         if (stream != null) {