1.21.4 (hard fork) - api only, server wip

Author: Blast-MC

.gitignore

@@ -6,10 +6,10 @@ build
 
 /run
 
-/fork-server/build.gradle.kts
-/fork-server/src/minecraft
+/parchment-server/build.gradle.kts
+/parchment-server/src/minecraft
 /paper-server
-/fork-api/build.gradle.kts
+/parchment-api/build.gradle.kts
 /paper-api
 /paper-api-generator
 

README.md

@@ -0,0 +1,10 @@
+Things I've found while just trying to get this to work:
+
+- If you've made an update to either of the build.gradle.kts files in api or server, run `./gradlew rebuildPaperSingleFilePatches` after adding to git (no commit)
+- To create a file patch:
+  - Make the changes you need and have no other staged changes
+  - cd paper-api or paper-server
+  - git add .
+  - git commit --ammend
+    - This ammends it to the specific 'File Patch Commit'
+  - ./gradlew rebuildPaper<Api/Server>FilePatches

build.gradle.kts

@@ -12,23 +12,23 @@ paperweight {
 
         patchFile {
             path = "paper-server/build.gradle.kts"
-            outputFile = file("fork-server/build.gradle.kts")
-            patchFile = file("fork-server/build.gradle.kts.patch")
+            outputFile = file("parchment-server/build.gradle.kts")
+            patchFile = file("parchment-server/build.gradle.kts.patch")
         }
         patchFile {
             path = "paper-api/build.gradle.kts"
-            outputFile = file("fork-api/build.gradle.kts")
-            patchFile = file("fork-api/build.gradle.kts.patch")
+            outputFile = file("parchment-api/build.gradle.kts")
+            patchFile = file("parchment-api/build.gradle.kts.patch")
         }
         patchDir("paperApi") {
             upstreamPath = "paper-api"
             excludes = setOf("build.gradle.kts")
-            patchesDir = file("fork-api/paper-patches")
+            patchesDir = file("parchment-api/paper-patches")
             outputDir = file("paper-api")
         }
         patchDir("paperApiGenerator") {
             upstreamPath = "paper-api-generator"
-            patchesDir = file("fork-api-generator/paper-patches")
+            patchesDir = file("parchment-api-generator/paper-patches")
             outputDir = file("paper-api-generator")
         }
     }
@@ -49,6 +49,7 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
+        maven("https://sonatype.projecteden.gg/repository/maven-public/")
     }
 
     dependencies {
@@ -80,12 +81,11 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            /*
-            maven("https://repo.papermc.io/repository/maven-snapshots/") {
-                name = "paperSnapshots"
+            maven {
+                name = "edenSnapshots"
+                url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/")
                 credentials(PasswordCredentials::class)
             }
-             */
         }
     }
 }

gradle.properties

@@ -1,4 +1,4 @@
-group=fork.test
+group=gg.projecteden.parchment
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 paperRef=b03d39b5ce6b5046ce6854ddba74e8ae3641c230
@@ -7,3 +7,5 @@ org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
+
+edenVersion = 2.3.0-SNAPSHOT

parchment-api/build.gradle.kts.patch

@@ -1,5 +1,22 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
+@@ -15,6 +_,8 @@
+ val slf4jVersion = "2.0.9"
+ val log4jVersion = "2.17.1"
+ 
++val edenVersion: String by project // Parchment
++
+ val apiAndDocs: Configuration by configurations.creating {
+     attributes {
+         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+@@ -39,6 +_,7 @@
+ }
+ 
+ dependencies {
++    api("gg.projecteden:eden-interfaces:$edenVersion") // Parchment
+ 
+     // api dependencies are listed transitively to API consumers
+     api("com.google.guava:guava:33.3.1-jre")
 @@ -103,6 +_,18 @@
      main {
          java {

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
+@@ -13,7 +_,7 @@
+  * Called when a beacon effect is being applied to a player.
+  */
+ @NullMarked
+-public class BeaconEffectEvent extends BlockEvent implements Cancellable {
++public class BeaconEffectEvent extends BlockEvent implements Cancellable, gg.projecteden.parchment.HasPlayer { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
+@@ -38,7 +_,7 @@
+  * at the Enderman, according to Vanilla rules.
+  */
+ @NullMarked
+-public class EndermanAttackPlayerEvent extends EntityEvent implements Cancellable {
++public class EndermanAttackPlayerEvent extends EntityEvent implements Cancellable, gg.projecteden.parchment.HasPlayer { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
+@@ -12,7 +_,7 @@
+  * Fired when a Turtle lays eggs
+  */
+ @NullMarked
+-public class TurtleLayEggEvent extends EntityEvent implements Cancellable {
++public class TurtleLayEggEvent extends EntityEvent implements Cancellable, gg.projecteden.parchment.HasLocation { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
+@@ -12,7 +_,7 @@
+  * Fired when a Turtle starts digging to lay eggs
+  */
+ @NullMarked
+-public class TurtleStartDiggingEvent extends EntityEvent implements Cancellable {
++public class TurtleStartDiggingEvent extends EntityEvent implements Cancellable, gg.projecteden.parchment.HasLocation { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
+@@ -21,7 +_,7 @@
+  * <p>WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS</p>
+  */
+ @NullMarked
+-public class PlayerHandshakeEvent extends Event implements Cancellable {
++public class PlayerHandshakeEvent extends Event implements Cancellable, gg.projecteden.api.interfaces.OptionalUniqueId { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java.patch

@@ -0,0 +1,22 @@
+--- a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
+@@ -22,7 +_,7 @@
+  * {@link Event#isAsynchronous()}
+  */
+ @NullMarked
+-public class PreLookupProfileEvent extends Event {
++public class PreLookupProfileEvent extends Event implements gg.projecteden.api.interfaces.OptionalUniqueId { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 
+@@ -52,6 +_,10 @@
+      * @return The UUID of the profile if it has already been provided by a plugin
+      */
+     public @Nullable UUID getUUID() {
++        return this.uuid;
++    }
++
++    public UUID getUniqueId() {
+         return this.uuid;
+     }
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
++++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
+@@ -53,7 +_,7 @@
+  * Only 1 process will be allowed to provide completions, the Async Event, or the standard process.
+  */
+ @NullMarked
+-public class AsyncTabCompleteEvent extends Event implements Cancellable {
++public class AsyncTabCompleteEvent extends Event implements Cancellable, gg.projecteden.parchment.OptionalLocation { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
+@@ -8,7 +_,7 @@
+ /**
+  * Thrown when an incoming plugin message channel throws an exception
+  */
+-public class ServerPluginMessageException extends ServerPluginException {
++public class ServerPluginMessageException extends ServerPluginException implements gg.projecteden.parchment.HasPlayer { // Parchment
+ 
+     private final Player player;
+     private final String channel;

parchment-api/paper-patches/files/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java
++++ b/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java
+@@ -16,7 +_,7 @@
+  * Not intended for modifying server side state.
+  */
+ @NullMarked
+-public class PlayerChunkLoadEvent extends ChunkEvent {
++public class PlayerChunkLoadEvent extends ChunkEvent implements gg.projecteden.parchment.HasPlayer { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java
++++ b/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java
+@@ -14,7 +_,7 @@
+  * Not intended for modifying server side.
+  */
+ @NullMarked
+-public class PlayerChunkUnloadEvent extends ChunkEvent {
++public class PlayerChunkUnloadEvent extends ChunkEvent implements gg.projecteden.parchment.HasPlayer { // Parchment
+ 
+     private static final HandlerList HANDLER_LIST = new HandlerList();
+ 

parchment-api/paper-patches/files/src/main/java/org/bukkit/ChatColor.java.patch

@@ -0,0 +1,73 @@
+--- a/src/main/java/org/bukkit/ChatColor.java
++++ b/src/main/java/org/bukkit/ChatColor.java
+@@ -13,7 +_,7 @@
+  * @deprecated ChatColor has been deprecated in favor of <a href="https://docs.advntr.dev/text.html">Adventure</a> API. See {@link net.kyori.adventure.text.format.NamedTextColor} for the adventure equivalent of pre-defined text colors
+  */
+ @Deprecated // Paper
+-public enum ChatColor {
++public enum ChatColor implements net.kyori.adventure.text.format.StyleBuilderApplicable, net.kyori.adventure.text.format.TextFormat { // Parchment
+     /**
+      * Represents black
+      */
+@@ -183,6 +_,13 @@
+         public net.md_5.bungee.api.ChatColor asBungee() {
+             return net.md_5.bungee.api.ChatColor.MAGIC;
+         }
++
++        // Parchment start
++        @Override
++        public void styleApply(net.kyori.adventure.text.format.Style.@NotNull Builder style) {
++            style.apply(net.kyori.adventure.text.format.TextDecoration.OBFUSCATED);
++        }
++        // Parchment end
+     },
+     /**
+      * Makes the text bold.
+@@ -213,6 +_,13 @@
+         public net.md_5.bungee.api.ChatColor asBungee() {
+             return net.md_5.bungee.api.ChatColor.UNDERLINE;
+         }
++
++        // Parchment start
++        @Override
++        public void styleApply(net.kyori.adventure.text.format.Style.@NotNull Builder style) {
++            style.apply(net.kyori.adventure.text.format.TextDecoration.UNDERLINED);
++        }
++        // Parchment end
+     },
+     /**
+      * Makes the text italic.
+@@ -233,6 +_,16 @@
+         public net.md_5.bungee.api.ChatColor asBungee() {
+             return net.md_5.bungee.api.ChatColor.RESET;
+         }
++
++        // Parchment start
++        @Override
++        public void styleApply(net.kyori.adventure.text.format.Style.@NotNull Builder style) {
++            style.color(null);
++            for (net.kyori.adventure.text.format.TextDecoration decoration : net.kyori.adventure.text.format.TextDecoration.values()) {
++                style.decoration(decoration, net.kyori.adventure.text.format.TextDecoration.State.NOT_SET);
++            }
++        }
++        // Parchment end
+     };
+ 
+     /**
+@@ -264,6 +_,16 @@
+     public net.md_5.bungee.api.ChatColor asBungee() {
+         return net.md_5.bungee.api.ChatColor.RESET;
+     };
++
++    // Parchment start
++    @Override
++    public void styleApply(net.kyori.adventure.text.format.Style.@NotNull Builder style) {
++        if (isColor())
++            style.color(net.kyori.adventure.text.format.TextColor.color(asBungee().getColor().getRGB()));
++        else
++            style.decorate(net.kyori.adventure.text.format.TextDecoration.valueOf(name()));
++    }
++    // Parchment end
+ 
+     /**
+      * Gets the char value associated with this color

parchment-api/paper-patches/files/src/main/java/org/bukkit/Color.java.patch

@@ -0,0 +1,25 @@
+--- a/src/main/java/org/bukkit/Color.java
++++ b/src/main/java/org/bukkit/Color.java
+@@ -17,7 +_,7 @@
+  * but subject to change.
+  */
+ @SerializableAs("Color")
+-public final class Color implements ConfigurationSerializable {
++public final class Color implements ConfigurationSerializable, net.kyori.adventure.text.format.TextColor { // Parchment
+     private static final int BIT_MASK = 0xff;
+     private static final int DEFAULT_ALPHA = 255;
+ 
+@@ -309,6 +_,13 @@
+     public int asARGB() {
+         return getAlpha() << 24 | getRed() << 16 | getGreen() << 8 | getBlue();
+     }
++
++    // Parchment start
++    @Override
++    public int value() {
++        return asRGB();
++    }
++    // Parchment end
+ 
+     /**
+      * Gets the color as an BGR integer.

parchment-api/paper-patches/files/src/main/java/org/bukkit/DyeColor.java.patch

@@ -0,0 +1,40 @@
+--- a/src/main/java/org/bukkit/DyeColor.java
++++ b/src/main/java/org/bukkit/DyeColor.java
+@@ -8,7 +_,7 @@
+ /**
+  * All supported color values for dyes and cloth
+  */
+-public enum DyeColor {
++public enum DyeColor implements net.kyori.adventure.util.RGBLike, net.kyori.adventure.text.format.StyleBuilderApplicable { // Parchment
+ 
+     /**
+      * Represents white dye.
+@@ -134,6 +_,28 @@
+     public Color getFireworkColor() {
+         return firework;
+     }
++
++    // Parchment start
++    @Override
++    public @org.jetbrains.annotations.Range(from = 0L, to = 255L) int red() {
++        return color.getRed();
++    }
++
++    @Override
++    public @org.jetbrains.annotations.Range(from = 0L, to = 255L) int green() {
++        return color.getGreen();
++    }
++
++    @Override
++    public @org.jetbrains.annotations.Range(from = 0L, to = 255L) int blue() {
++        return color.getBlue();
++    }
++
++    @Override
++    public void styleApply(net.kyori.adventure.text.format.Style.@org.jetbrains.annotations.NotNull Builder style) {
++        style.color(net.kyori.adventure.text.format.TextColor.color(color));
++    }
++    // Parchment end
+ 
+     /**
+      * Gets the DyeColor with the given wool data value.