hardfork from paper 😊

Author: granny

CONTRIBUTING.md

@@ -45,25 +45,16 @@ javac 21.0.5
 
 ## Understanding Patches
 
-Unlike the Purpur API and its implementation, modifications to Paper and Minecraft source files
+Unlike the Purpur API and its implementation, modifications to the Minecraft source files
 are done through patches. These patches/extensions are split into three different sets of two
 categories, which are formatted like so:
 
-Under `purpur-api`:
-
-- `paper-patches` (applies to the `paper-server/` git repo)
-    - `sources`: Per-file patches to Paper API classes;
-    - `features`: Larger feature patches that modify multiple Paper API classes.
-
 Under `purpur-server`:
 
 - `minecraft-patches` (applies to the `purpur-server//` git repo)
   - `sources`: Per-file patches to Minecraft classes;
   - `resources`: Per-file patches to Minecraft data files;
   - `features`: Larger feature patches that modify multiple classes.
-- `paper-patches`
-  - `sources`: Per-file patches to Paper Server classes;
-  - `features`: Larger feature patches that modify multiple Paper Server classes.
 
 Because this entire structure is based on patches and git, a basic understanding
 of how to use git is required. A basic tutorial can be found here:
@@ -72,16 +63,14 @@ of how to use git is required. A basic tutorial can be found here:
 Assuming you have already forked the repository:
 
 1. Clone your fork to your local machine;
-2. Type `./gradlew applyAllPatches` in a terminal to apply the patches to both paper and minecraft classes.
+2. Type `./gradlew applyPatches` in a terminal to apply the patches to minecraft classes.
    On Windows, remove `./` from the beginning of `gradlew` commands;
-3. cd into `purpur-server` for server changes, `purpur-api` for API changes,
-   `paper-api` for Paper API changes, and `paper-server` for Paper Server changes.
+3. cd into `purpur-server` for server changes, `purpur-api` for API changes.
 
 `purpur-server/src/minecraft/java` and `purpur-server/src/minecraft/java/resources` are not git repositories in the traditional sense.
 Its initial commits are the decompiled and deobfuscated Minecraft source and resource files. The per-file
 patches are applied on top of these files as a single, large commit, which is then followed
-by the individual feature-patch commits. `paper-api/` and `paper-server/`
-follow the same concept; each paper "project" has its own git repository that also includes it's own feature and per-file patches.
+by the individual feature-patch commits.
 
 ## Understanding the Gradle Tasks
 
@@ -98,12 +87,12 @@ Each "project" that includes a local git repository has the following available
 
 Some additional useful tasks are listed below:
 
-- `./gradlew applyAllPatches` - Applies all patches defined in the paperweight-patcher project and the server project. (equivalent to running `applyPaperPatches` and then `applyAllServerPatches` in a second Gradle invocation)
+- `./gradlew applyAllPatches` - Applies all patches defined in the paperweight-patcher project and the server project. (equivalent to running `applyPatches` and then `applyAllServerPatches` in a second Gradle invocation)
 - `./gradlew applyAllServerFeaturePatches` - Applies all Minecraft and upstream server feature patches (equivalent to `applyMinecraftFeaturePatches applyServerFeaturePatches`)
 - `./gradlew applyAllServerFilePatches` - Applies all Minecraft and upstream server file patches (equivalent to `applyMinecraftFilePatches applyServerFilePatches`)
 - `./gradlew applyAllServerPatches` - Applies all Minecraft and upstream server patches (equivalent to `applyMinecraftPatches applyServerPatches`)
 
-- `./gradlew rebuildPaperSingleFilePatches` - Fixups and rebuilds all paper single-file patches. This is how you'd make changes to the `build.gradle.kts` files located under `purpur-api` and `purpur-server`
+- `./gradlew rebuildSingleFilePatches` - Fixups and rebuilds all single-file patches. This is how you'd make changes to the `build.gradle.kts` files located under `purpur-api` and `purpur-server`
 
 ## Modifying (per-file) patches
 
@@ -229,7 +218,7 @@ when making and submitting changes.
 
 ## Formatting
 
-All modifications to Minecraft files and Paper files should be marked. For historical reasons,
+All modifications to Minecraft files should be marked. For historical reasons,
 API and API-implementation contain a lot of these too, but they are no longer
 required.
 
@@ -273,7 +262,7 @@ into most IDEs and formatters by default. There are a few notes, however:
   hard to parse generics in a case where the base type itself is already obvious.
 
 ### Imports
-When adding new imports to a Minecraft or Paper class, use the fully qualified class name
+When adding new imports to a Minecraft class, use the fully qualified class name
 instead of adding a new import to the top of the file. If you are using a type a significant number of times, you
 can add an import with a comment. However, if it's only used a couple of times, the FQN is preferred to prevent future
 patch conflicts in the import section of the file.

README.md

@@ -15,7 +15,7 @@
 [![Forks](https://img.shields.io/github/forks/PurpurMC/Purpur?label=forks&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNCYN3/YeAAAA/UlEQVQ4y7WTQUoDQRBFf01czlJcxUyOINGjjAvFHMFzZGdygOwDwTtk6UZcqLlAxCAuMigug89FamIzdAIN+qGhq/6v6qrqbumvAJwBj8AHMAQs4DJgBHy65jSW4Bl4AaZsUAbcufumrnmquSzIcSzpTtLA7XbA1fuBa9qxCob8YgUUAdcFqoC/iSXIgLELOhG+49w4nM+2BTP7ljR3M4/MufbNzYxdN1E0Sm2ialZnsVIllZKOJF24eyLpXdKtmS1S3sYMmO3THOwJziUdbrbkZvaVcnILeAh6vweylAQ9D7z2BXCS0sJS0lrSpdtrSW+pn6sPLIFX4Er/hR9C0wl1FTBzNwAAAABJRU5ErkJggg==)](https://github.com/PurpurMC/Purpur/network/members)
 [![Watchers](https://img.shields.io/github/watchers/PurpurMC/Purpur?label=watchers&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNw4TRw0nAAAA3UlEQVQ4y83SP04CURAG8I0lewHOwAFUaiwkdmAlp8CL4FHopfIvtOIJWE3opIBK489mQPKy6xYWOskkL9/MN/PNzMuyf2fIcYkZVuGzwPI68gle8Yl7jMIfAntBp4o8wAeecFgSP8I8cgZp8DwC12j8oLCBCd7R34ItbHCzT8ZZSC7QTYrcYo1WhjGWaCbdCt+2SGLN4IwPfnu07QjrkhG6oWKB0+TMd7sRAuzHYuqWmO8tsVd1xjmOS8htPEfORVWHTmweHnEVPg2sqPxIicxhFFjhLd7D2q/8J/YFHSJt9VSqQ08AAAAASUVORK5CYII=)](https://github.com/PurpurMC/Purpur/watchers)
 
-Purpur is a drop-in replacement for [Paper](https://github.com/PaperMC/Paper) servers designed for configurability, new fun and exciting gameplay features, and performance built on top of [Paper](https://github.com/PaperMC/Paper/).
+Purpur is a drop-in replacement for [Spigot](https://github.com/SpigotMC/Spigot) servers designed for configurability, new fun and exciting gameplay features, and performance built on top of [Spigot](https://github.com/SpigotMC/Spigot).
 
 </div>
 
@@ -44,7 +44,7 @@ All patches are licensed under the MIT license, unless otherwise noted in the pa
 
 [![MIT License](https://img.shields.io/github/license/PurpurMC/Purpur?&logo=github)](LICENSE)
 
-See [PaperMC/Paper](https://github.com/PaperMC/Paper), and [PaperMC/Paperweight](https://github.com/PaperMC/paperweight) for the license of material used by this project.
+See [SpigotMC/Spigot](https://github.com/SpigotMC/Spigot), and [PaperMC/Paperweight](https://github.com/PaperMC/paperweight) for the license of material used by this project.
 
 ## bStats
 
@@ -84,7 +84,7 @@ dependencies {
 }
 ```
 
-Yes, this also includes all API provided by Paper, Spigot, and Bukkit.
+Yes, this also includes all API provided by Spigot and Bukkit.
 
 ## Building and setting up
 

build.gradle.kts

@@ -6,27 +6,27 @@ plugins {
     id("io.papermc.paperweight.patcher") version "2.0.0-beta.16"
 }
 
-val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
+val spigotMavenPublicUrl = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
 
 paperweight {
-    upstreams.paper {
-        ref = providers.gradleProperty("paperCommit")
+    upstreams.spigot {
+        ref = providers.gradleProperty("spigotCommit")
 
         patchFile {
-            path = "paper-server/build.gradle.kts"
+            path = "spigot-server/build.gradle.kts"
             outputFile = file("purpur-server/build.gradle.kts")
             patchFile = file("purpur-server/build.gradle.kts.patch")
         }
         patchFile {
-            path = "paper-api/build.gradle.kts"
+            path = "spigot-api/build.gradle.kts"
             outputFile = file("purpur-api/build.gradle.kts")
             patchFile = file("purpur-api/build.gradle.kts.patch")
         }
-        patchDir("paperApi") {
-            upstreamPath = "paper-api"
+        patchDir("spigotApi") {
+            upstreamPath = "spigot-api"
             excludes = setOf("build.gradle.kts")
-            patchesDir = file("purpur-api/paper-patches")
-            outputDir = file("paper-api")
+            patchesDir = file("purpur-api/spigot-patches")
+            outputDir = file("spigot-api")
         }
     }
 }
@@ -66,7 +66,7 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven(paperMavenPublicUrl)
+        maven(spigotMavenPublicUrl)
         maven("https://jitpack.io")
     }
 

purpur-api/build.gradle.kts.patch

@@ -1,42 +1,18 @@
---- a/paper-api/build.gradle.kts
-+++ b/paper-api/build.gradle.kts
+--- a/spigot-api/build.gradle.kts
++++ b/spigot-api/build.gradle.kts
 @@ -93,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
 
--val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
-+val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
- idea {
-     module {
-         generatedSourceDirs.add(generatedDir.toFile())
-@@ -103,6 +_,18 @@
-     main {
-         java {
-             srcDir(generatedDir)
-+            srcDir(file("../paper-api/src/main/java"))
-+        }
-+        resources {
-+            srcDir(file("../paper-api/src/main/resources"))
-+        }
-+    }
-+    test {
-+        java {
-+            srcDir(file("../paper-api/src/test/java"))
-+        }
-+        resources {
-+            srcDir(file("../paper-api/src/test/resources"))
-         }
-     }
- }
 @@ -168,8 +_,10 @@
  val services = objects.newInstance<Services>()
 
  tasks.withType<Javadoc> {
 +    //(options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
-+    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings
++    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Spigot's bajillion javadoc warnings
      val options = options as StandardJavadocDocletOptions
 -    options.overview = "src/main/javadoc/overview.html"
-+    options.overview = "../paper-api/src/main/javadoc/overview.html"
++    options.overview = "../spigot-api/src/main/javadoc/overview.html"
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
@@ -45,12 +21,12 @@
 
      // workaround for https://github.com/gradle/gradle/issues/4046
 -    inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
-+    inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset")
++    inputs.dir("../spigot-api/src/main/javadoc").withPropertyName("javadoc-sourceset")
      val fsOps = services.fileSystemOperations
      doLast {
          fsOps.copy {
 -            from("src/main/javadoc") {
-+            from("../paper-api/src/main/javadoc") {
++            from("../spigot-api/src/main/javadoc") {
                  include("**/doc-files/**")
              }
              into("build/docs/javadoc")

purpur-api/paper-patches/features/0001-Rebrand.patch

@@ -9,8 +9,8 @@ index 53ad1696d02afbebf27663dd753fa93e41cfeb4e..cec387842895d617b0dcf9158f080fe0
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2369,6 +2369,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+            throw new UnsupportedOperationException("Not supported yet.");
          }
-         // Paper end
 
 +        // Purpur start
 +        @NotNull

purpur-api/paper-patches/files/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch

@@ -4,45 +4,45 @@
       * @return Timing
       */
      @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      Timing startTiming();
 
      /**
 @@ -46,6 +_,7 @@
       *
       * Will automatically be called when this Timing is used with try-with-resources
       */
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      void stopTiming();
 
      /**
 @@ -56,6 +_,7 @@
       * @return Timing
       */
      @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      Timing startTimingIfSync();
 
      /**
 @@ -65,12 +_,14 @@
       *
       * But only if we are on the primary thread.
       */
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      void stopTimingIfSync();
 
      /**
       * @deprecated Doesn't do anything - Removed
       */
      @Deprecated
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      void abort();
 
      /**
 @@ -82,5 +_,6 @@
      TimingHandler getTimingHandler();
 
      @Override
-+    @io.papermc.paper.annotation.DoNotUse // Purpur - Remove Timings
++    @org.purpurmc.purpur.annotation.DoNotUse // Purpur - Remove Timings
      void close();
  }

purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch

@@ -1,9 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -3616,4 +_,40 @@
-         return this.asItemType().getDefaultDataTypes();
-     }
-     // Paper end - data component API
 +
 +    // Purpur start - ItemStack convenience methods
 +    public boolean isArmor() {