Merge branch 'PaperMC:master' into master

CONTRIBUTING.md

@@ -204,29 +204,31 @@ when making and submitting changes.
 
 ## Formatting
 
-All modifications to non-Paper files should be marked.
-
-- Multi-line changes start with `// Paper start` and end with `// Paper end`;
-- You can put a comment with an explanation if it isn't obvious, like this:
-`// Paper start - reason`.
-   - The comments should generally be about the reason the change was made, what
-  it was before, or what the change is.
-   - Multi-line messages should start with `// Paper start` and use `/* Multi
-  line message here */` for the message itself.
-- One-line changes should have `// Paper` or `// Paper - reason`.
+All modifications to non-Paper files should be marked. The one exception to this is
+when modifying javadoc comments, which should not have these markers.
+
+- You need to add a comment with a short and identifiable description of the patch:
+  `// Paper start - <COMMIT DESCRIPTION>`
+    - The comments should generally be about the reason the change was made, what
+      it was before, or what the change is.
+    - After the general commit description, you can add additional information either
+      after a `;` or in the next line.
+- Multi-line changes start with `// Paper start - <COMMIT DESCRIPTION>` and end
+  with `// Paper end - <COMMIT DESCRIPTION>`.
+- One-line changes should have `// Paper - <COMMIT DESCRIPTION>` at the end of the line.
 
 Here's an example of how to mark changes by Paper:
 
 ```java
-entity.getWorld().dontbeStupid(); // Paper - was beStupid() which is bad
+entity.getWorld().dontBeStupid(); // Paper - Was beStupid(), which is bad
 entity.getFriends().forEach(Entity::explode);
-entity.a();
-entity.b();
-// Paper start - use plugin-set spawn
+entity.updateFriends();
+
+// Paper start - Use plugin-set spawn
 // entity.getWorld().explode(entity.getWorld().getSpawn());
 Location spawnLocation = ((CraftWorld)entity.getWorld()).getSpawnLocation();
 entity.getWorld().explode(new BlockPosition(spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ()));
-// Paper end
+// Paper end - Use plugin-set spawn
 ```
 
 We generally follow the usual Java style (aka. Oracle style), or what is programmed

build-data/spigot-server-patches/re-add-asm-dependency.patch

@@ -0,0 +1,29 @@
+--- /dev/null	2024-01-13 10:03:30.400485704 -0800
++++ CraftBukkit-Patches/9999-re-add-asm-dependency.patch	2024-01-13 21:41:27.650692678 -0800
+@@ -0,0 +1,26 @@
++From e5eb4fb3bfb61dfd2dc97411cfab5fa94033b90c Mon Sep 17 00:00:00 2001
++From: Jake Potrebic <[email protected]>
++Date: Sat, 13 Jan 2024 21:41:02 -0800
++Subject: [PATCH] re add asm dependency
++
++
++diff --git a/pom.xml b/pom.xml
++index 266853a682..d18fdadf92 100644
++--- a/pom.xml
+++++ b/pom.xml
++@@ -58,6 +58,12 @@
++             <version>2.19.0</version>
++             <scope>compile</scope>
++         </dependency>
+++        <dependency>
+++            <groupId>org.ow2.asm</groupId>
+++            <artifactId>asm</artifactId>
+++            <version>9.5</version>
+++            <scope>compile</scope>
+++        </dependency>
++         <dependency>
++             <groupId>org.ow2.asm</groupId>
++             <artifactId>asm-commons</artifactId>
++--
++2.43.0
++

build.gradle.kts

@@ -93,6 +93,8 @@ paperweight {
         mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny")
         reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny")
 
+        spigotServerPatchPatchesDir = layout.projectDirectory.dir("build-data/spigot-server-patches")
+
         reobfPackagesToFix.addAll(
             "co.aikar.timings",
             "com.destroystokyo.paper",

paper-api-generator/build.gradle.kts

@@ -21,6 +21,7 @@ minecraft {
 dependencies {
     implementation("com.squareup:javapoet:1.13.0")
     implementation(project(":paper-api"))
+    implementation("io.github.classgraph:classgraph:4.8.47")
 }
 
 group = "io.papermc.paper"