Update upstream

2021-09-03 00:46:37 -04:00
parent 0769f8995c
commit 28a4865c2b
16 changed files with 145 additions and 140 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,41 +1,47 @@
+import io.papermc.paperweight.util.constants.*
+
 plugins {
    java
+    `maven-publish`
    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.1.8"
+    id("io.papermc.paperweight.patcher") version "1.1.11"
 }

 repositories {
    mavenCentral()
    maven("https://papermc.io/repo/repository/maven-public/") {
-        content {
-            onlyForConfigurations("paperclip")
-        }
-    }
-    maven("https://maven.quiltmc.org/repository/release/") {
-        content {
-            onlyForConfigurations("remapper")
-        }
+        content { onlyForConfigurations(PAPERCLIP_CONFIG) }
    }
 }

 dependencies {
-    remapper("org.quiltmc:tiny-remapper:0.4.1")
-    paperclip("io.papermc:paperclip:2.0.1@jar")
+    remapper("org.quiltmc:tiny-remapper:0.4.3")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.12")
+    paperclip("io.papermc:paperclip:2.0.1")
 }

-subprojects {
+allprojects {
    apply(plugin = "java")
+    apply(plugin = "maven-publish")

    java {
        toolchain {
            languageVersion.set(JavaLanguageVersion.of(16))
        }
    }
+}

+subprojects {
    tasks.withType<JavaCompile>().configureEach {
-        options.encoding = "UTF-8"
+        options.encoding = Charsets.UTF_8.name()
        options.release.set(16)
    }
+    tasks.withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    tasks.withType<ProcessResources> {
+        filteringCharset = Charsets.UTF_8.name()
+    }

    repositories {
        mavenCentral()
@@ -51,6 +57,9 @@ subprojects {
 paperweight {
    serverProject.set(project(":Parchment-Server"))

+    remapRepo.set("https://maven.quiltmc.org/repository/release/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
+
    usePaperUpstream(providers.gradleProperty("paperRef")) {
        withPaperPatcher {
            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
@@ -61,3 +70,50 @@ paperweight {
        }
    }
 }
+
+//
+// Everything below here is optional if you don't care about publishing API or dev bundles to your repository
+//
+
+tasks.generateDevelopmentBundle {
+    apiCoordinates.set("me.lexikiq:parchment-api")
+    mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
+    libraryRepositories.set(
+            listOf(
+                    "https://libraries.minecraft.net/",
+                    "https://maven.quiltmc.org/repository/release/",
+                    "https://repo.aikar.co/content/groups/aikar",
+                    "https://ci.emc.gs/nexus/content/groups/aikar/",
+                    "https://papermc.io/repo/repository/maven-public/", // for paper-mojangapi
+                    "https://sonatype.projecteden.gg/repository/maven-public/"
+            )
+    )
+}
+
+allprojects {
+    // Publishing API:
+    // ./gradlew :Parchment-API:publish[ToMavenLocal]
+    publishing {
+        repositories {
+            maven {
+                name = "edenSnapshots"
+                url = uri("https://sonatype.projecteden.gg/repository/maven-snapshots/")
+                // See Gradle docs for how to provide credentials to PasswordCredentials
+                // https://docs.gradle.org/current/samples/sample_publishing_credentials.html
+                credentials(PasswordCredentials::class)
+            }
+        }
+    }
+}
+
+publishing {
+    // Publishing dev bundle:
+    // ./gradlew publishDevBundlePublicationTo(MavenLocal|EdenSnapshotsRepository) -PpublishDevBundle
+    if (project.hasProperty("publishDevBundle")) {
+        publications.create<MavenPublication>("devBundle") {
+            artifact(tasks.generateDevelopmentBundle) {
+                artifactId = "dev-bundle"
+            }
+        }
+    }
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,5 +2,8 @@ group = me.lexikiq
 version = 1.17.1-R0.1-SNAPSHOT

 mcVersion = 1.17.1
-packageVersion = 1_17_R1
-paperRef = 6855505490ca1b107d74412f0706950a0fc6c934
+paperRef = 2cd4bcfba17affba734619682800fa47ed8e2c7f
+
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.vfs.watch=false
--- a/patches/api/0001-Build-changes.patch
+++ b/patches/api/0001-Build-changes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Build changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 15b8f4708887535383bb74bd922f893231737599..feeb5a5808d8a97408b0295078fb3b8d7e922573 100644
+index 689d470ebe2c7e25e4c87f6127978d1d283e55b5..2715c109829dbdb93de12b06652988f5cd3353c5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -27,6 +27,7 @@ dependencies {
-     api("net.kyori:adventure-text-serializer-legacy")
-     api("net.kyori:adventure-text-serializer-plain")
+@@ -39,6 +39,7 @@ dependencies {
+     apiAndDocs("net.kyori:adventure-text-serializer-plain")
     api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+     api("org.slf4j:slf4j-api:1.7.30") // Paper
 +    api(project(":Parchment-Common")) // Parchment
 
     implementation("org.ow2.asm:asm:9.1")
--- a/patches/api/0002-Add-Getter-interfaces.patch
+++ b/patches/api/0002-Add-Getter-interfaces.patch
@@ -566,7 +566,7 @@ index 0000000000000000000000000000000000000000..314bf6e8cacfe8891f1354952c5ccfe7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index c9b953aa55eeee87e81b9b712c0f501a58e641fb..87188e22137243d91e1c8d0fc4a2062cccb394db 100644
+index 8321441b8f528a05e297f485672f928e76fe017d..e6a66494941ccaeb62ec13c26a0e05c52e3af159 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -30,7 +30,7 @@ import org.bukkit.entity.Player;
@@ -659,15 +659,15 @@ index ff8f1231f3e2e71740fd24fa8d4dac5d0e550ae7..4a1e40e0c7cff6ef8898771adf3bc600
     private final UUID uuid;
     private final String name;
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index ca488173a20bcf3427906f0a6548f06a97c9dc36..6ebf6f2bf02550ad69fad45cb79b6d92549df980 100644
+index ad8bce01ba459a036cd4ebbbe4fc974021924fe2..e328ec2b922a839dd57bcc33d02a94eb90fbf307 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
  * (i.e. lighting and power) may not be able to be safely accessed during world
  * generation when used in cases like BlockPhysicsEvent!!!!
  */
-public interface Block extends Metadatable {
-+public interface Block extends Metadatable, me.lexikiq.HasLocation { // Parchment
+-public interface Block extends Metadatable, net.kyori.adventure.translation.Translatable { // Paper - translatable
+public interface Block extends Metadatable, net.kyori.adventure.translation.Translatable, me.lexikiq.HasLocation { // Paper - translatable
 
     /**
      * Gets the metadata for this block
@@ -745,7 +745,7 @@ index 0ad7a3d4d40d58eb950e34668f9554bb73f934fb..0a5aa083d9a69403c76ab280254d259a
     /**
      * Returns the name of this player
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5e8814cc317a705eaf8bdd9f3876a5366c0a0226..31c118dbe08f6d00f76f002ba8746eb89026b5b9 100644
+index afa245018192a63e5db8bc568ddea2790bf5b8a2..69f5047f2bd2a7d42c972a38a76ca53f47f273d6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
--- a/patches/api/0009-Expose-MCUtil-Executors.patch
+++ b/patches/api/0009-Expose-MCUtil-Executors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors


 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 024da3febe3fd6c54aa30e99cb08300bc38ddb92..356ff9613dc200c9fb4852d9b6db9134287041dd 100644
+index 83870d54a5ff1017ad7455e9c931fdee54354434..96ee097f7a7ba7116dda2aabc4f0ae974837f158 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1787,4 +1787,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1789,4 +1789,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
     @NotNull
     io.papermc.paper.datapack.DatapackManager getDatapackManager();
     // Paper end
--- a/patches/api/0011-Add-Furnace-Recipe-API.patch
+++ b/patches/api/0011-Add-Furnace-Recipe-API.patch
@@ -64,18 +64,10 @@ index 0000000000000000000000000000000000000000..f8f707483bf08142cdaf6c6ff9b12418
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8ae9198ba7fdb006dc420504a984627add20dbb5..a01e98c1128bd5e21a9b6e1eee1ab6f862ea66b5 100644
+index dc497606ebf9903c2d32276ecddda3231457346a..021f24fdbc6e711faabaa2955b7acdde219f1990 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -26,7 +26,6 @@ import org.bukkit.entity.LightningStrike;
- import org.bukkit.entity.LivingEntity;
- import org.bukkit.entity.Player;
- import org.bukkit.generator.BlockPopulator;
-import org.bukkit.generator.ChunkGenerator;
- import org.bukkit.inventory.ItemStack;
- import org.bukkit.material.MaterialData;
- import org.bukkit.metadata.Metadatable;
-@@ -3706,6 +3705,36 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
+@@ -3669,6 +3669,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
     @Nullable
     public DragonBattle getEnderDragonBattle();
 
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,21 +5,21 @@ Subject: [PATCH] Build changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index b50463c2356301a1b47a0bf4f50dc1f121d363a1..de932184e6bfe6e620ad7f3e43b22ae8bd5a0f48 100644
+index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653be53a62d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -28,8 +28,8 @@ repositories {
+@@ -29,8 +29,8 @@ repositories {
 }
 
 dependencies {
 -    implementation(project(":Paper-API"))
 -    implementation(project(":Paper-MojangAPI"))
 +    implementation(project(":Parchment-API")) // Parchment
-+    implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // Parchment
+    implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Parchment
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.12.1")
     implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -80,7 +80,7 @@ tasks.jar {
+@@ -82,7 +82,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index b50463c2356301a1b47a0bf4f50dc1f121d363a1..de932184e6bfe6e620ad7f3e43b22ae8
             "Implementation-Vendor" to date, // Paper
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
-@@ -102,6 +102,26 @@ publishing {
+@@ -104,6 +104,26 @@ publishing {
             classifier = null
         }
         artifact(tasks.shadowJar)
@@ -55,7 +55,7 @@ index b50463c2356301a1b47a0bf4f50dc1f121d363a1..de932184e6bfe6e620ad7f3e43b22ae8
     }
 }
 
-@@ -112,7 +132,7 @@ tasks.shadowJar {
+@@ -147,7 +167,7 @@ tasks.shadowJar {
 
     // Needed for Paperclip's install to maven local feature
     from(generatePom) {
@@ -64,7 +64,7 @@ index b50463c2356301a1b47a0bf4f50dc1f121d363a1..de932184e6bfe6e620ad7f3e43b22ae8
         rename { "pom.xml" }
     }
 
-@@ -176,7 +196,7 @@ tasks.test {
+@@ -207,7 +227,7 @@ tasks.test {
 fun TaskContainer.registerRunTask(
     name: String, block: JavaExec.() -> Unit
 ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -111,10 +111,10 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93
                 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
             }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3dded5c491ace6b073a7bc3178976bd70f0b9393..2373f056cbe868491bafa02e3b711a63f2e428aa 100644
+index 099db3a627c1d3c08f3b923bb02a1cb8a0a268ab..457e46324bb2abb6aacfea66f4274c1a8e06c40c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1651,7 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
@@ -124,10 +124,10 @@ index 3dded5c491ace6b073a7bc3178976bd70f0b9393..2373f056cbe868491bafa02e3b711a63
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9954e45c32a4b6d80fe912ed9d55cd4fc8c4e98b..65e520dbfaf294ef500f263aeb8fb0adf98e8321 100644
+index 4687827c096ecf8872ab39b00fbf9261ba5c3689..cbf96eeaed245632e5386f824168ba42113038e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -239,7 +239,7 @@ import javax.annotation.Nullable; // Paper
+@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
 import javax.annotation.Nonnull; // Paper
 
 public final class CraftServer implements Server {
@@ -137,7 +137,7 @@ index 9954e45c32a4b6d80fe912ed9d55cd4fc8c4e98b..65e520dbfaf294ef500f263aeb8fb0ad
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ea7df53656766a8dc4ab5fe66de894301db634e1..6de638292a6126460c8b0e0a5d3ab6e4d28c2892 100644
+index 22e9dd17f62103c5061435099ce96a3d70d54808..3344a9f976c0eaf88c62831ed8ec4952b400cca1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {
@@ -163,10 +163,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..fbba763d909c4636174e79c680745b83
 
         if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index dcfbe77bdb25d9c58ffb7b75c48bdb580bc0de47..ace8cde0cb0d44e0df9d57ddabc664bf4f79802f 100644
+index bee38307494188800886a1622fed229b88dbd8f1..104d9f4fcad6d5895a1f4e3cd1966dccc4530da7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -91,7 +91,7 @@ public class WatchdogThread extends Thread
+@@ -163,7 +163,7 @@ public class WatchdogThread extends Thread
                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
                 log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--- a/patches/server/0003-Add-SoundEvent.patch
+++ b/patches/server/0003-Add-SoundEvent.patch
@@ -5,21 +5,10 @@ Subject: [PATCH] Add SoundEvent


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index baa25df9f446c8edea9666983425df31c32a13ff..5feb2a6877f1731ff50343d481b54d79a62bbd8a 100644
+index cebaf0fb8187335ca303621a2cb412bb22584e23..429eb67fb264a0d8ec7900c02c1abdfac0c9bd7d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -55,8 +55,8 @@ import net.minecraft.network.protocol.game.ClientboundExplodePacket;
- import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
- import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
- import net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket;
-import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
-+//import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket; // Parchment
-+//import net.minecraft.network.protocol.game.ClientboundSoundPacket; // Parchment
- import net.minecraft.network.protocol.game.DebugPackets;
- import net.minecraft.resources.ResourceKey;
- import net.minecraft.server.MCUtil;
-@@ -1269,12 +1269,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1489,12 +1489,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
     @Override
     public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -35,19 +24,10 @@ index baa25df9f446c8edea9666983425df31c32a13ff..5feb2a6877f1731ff50343d481b54d79
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e32da100eabf0d3de12375402e9378c726811358..977bb52e7b7ddafb5e766ec670d27109c998bbea 100644
+index 483df59a805d2724551042aa4470bc439fc2e7e9..f7fbd53b371598789e2450d59cc948d1940c6f0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -67,7 +67,7 @@ import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
- import net.minecraft.network.protocol.game.ClientboundSetCameraPacket;
- import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
- import net.minecraft.network.protocol.game.ClientboundSetHealthPacket;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
-+//import net.minecraft.network.protocol.game.ClientboundSoundPacket; // Parchment
- import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
- import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
- import net.minecraft.resources.ResourceKey;
-@@ -2137,7 +2137,7 @@ public class ServerPlayer extends Player {
+@@ -2176,7 +2176,7 @@ public class ServerPlayer extends Player {
 
     @Override
     public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {
@@ -57,18 +37,9 @@ index e32da100eabf0d3de12375402e9378c726811358..977bb52e7b7ddafb5e766ec670d27109
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..9be83da618d2359951c602fa5dfcdd608270a23e 100644
+index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..4032f499fd533e8d35d050758ea2358ad6878b94 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -60,7 +60,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
- import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
- import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
- import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
-+//import net.minecraft.network.protocol.game.ClientboundSoundPacket; // Parchment
- import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
- import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
- import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -964,7 +964,7 @@ public abstract class PlayerList {
         if (flag2 && !isLocAltered) {
             BlockState data = worldserver1.getBlockState(blockposition);
@@ -79,19 +50,10 @@ index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..9be83da618d2359951c602fa5dfcdd60
         }
         // Added from changeDimension
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d8780f06efc261a42389e466573a0bcf10c333f6..c2034b711e5b3f2b82d86776c58dac4db83ea44d 100644
+index cea92f1dc663bf0648b2bd877d86ca380a517bc9..266d676118e17af48e21370211c015898eba9691 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -30,7 +30,7 @@ import net.minecraft.network.chat.MutableComponent;
- import net.minecraft.network.chat.TextComponent;
- import net.minecraft.network.chat.TranslatableComponent;
- import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
-+//import net.minecraft.network.protocol.game.ClientboundSoundPacket; // Parchment
- import net.minecraft.network.syncher.EntityDataAccessor;
- import net.minecraft.network.syncher.EntityDataSerializers;
- import net.minecraft.network.syncher.SynchedEntityData;
-@@ -1827,7 +1827,7 @@ public abstract class Player extends LivingEntity {
+@@ -1832,7 +1832,7 @@ public abstract class Player extends LivingEntity {
     private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
         fromEntity.level.playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself
         if (fromEntity instanceof ServerPlayer) {
@@ -123,10 +85,10 @@ index a79ba23ecf887ecbb6e095140f019ebb6fd0a6f7..5112edc5e68a386e9bb16ac0ec9d998e
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d01d4ca873f8225d3503ecb102ce2eb7bfced421..7c2583ed7b39a5a906131a487d6f8a93603cfb54 100644
+index db6c0917824b9127abd9f9250dc195a9f1d56f4f..edaebb2566a414718d0910d4306c3b53e061814c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1855,4 +1855,77 @@ public class CraftEventFactory {
+@@ -1858,4 +1858,77 @@ public class CraftEventFactory {
         return event.callEvent();
     }
     // Paper end
--- a/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch
+++ b/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch
@@ -5,18 +5,10 @@ Subject: [PATCH] Add PlayerUseRespawnAnchorEvent


 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index af4eb4a8814491afef449a2874521636957d7557..93fae52a7531e1697e4fa63c82aef6ef24d0fb25 100644
+index 0a5d563700c9f806139001181f01fa9d0111f792..88439b8f82a97a9763dadfc6c9dbaf0912ab3eb7 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList;
- import com.google.common.collect.ImmutableList.Builder;
- import java.util.Optional;
- import java.util.Random;
-+import me.lexikiq.event.player.PlayerUseRespawnAnchorEvent; // Parchment
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.Vec3i;
-@@ -52,33 +53,51 @@ public class RespawnAnchorBlock extends Block {
+@@ -52,33 +52,51 @@ public class RespawnAnchorBlock extends Block {
     @Override
     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
         ItemStack itemStack = player.getItemInHand(hand);
@@ -24,30 +16,30 @@ index af4eb4a8814491afef449a2874521636957d7557..93fae52a7531e1697e4fa63c82aef6ef
 +        // Parchment start -- PlayerUseRespawnAnchorEvent
 +        org.bukkit.entity.Player bukkitPlayer = player.getBukkitEntity() instanceof org.bukkit.entity.Player ? (org.bukkit.entity.Player) player.getBukkitEntity() : null;
 +        org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+        PlayerUseRespawnAnchorEvent.RespawnAnchorResult result;
+        me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult result;
         if (hand == InteractionHand.MAIN_HAND && !isRespawnFuel(itemStack) && isRespawnFuel(player.getItemInHand(InteractionHand.OFF_HAND))) {
             return InteractionResult.PASS;
         } else if (isRespawnFuel(itemStack) && canBeCharged(state)) {
-+            result = PlayerUseRespawnAnchorEvent.RespawnAnchorResult.CHARGE;
+            result = me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.CHARGE;
 +        } else if (state.getValue(CHARGE) == 0) {
-+            result = PlayerUseRespawnAnchorEvent.RespawnAnchorResult.NOTHING;
+            result = me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.NOTHING;
 +        } else if (!canSetSpawn(world) && !world.isClientSide) {
-+            result = PlayerUseRespawnAnchorEvent.RespawnAnchorResult.EXPLODE;
+            result = me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.EXPLODE;
 +        } else if (!world.isClientSide) {
-+            result = PlayerUseRespawnAnchorEvent.RespawnAnchorResult.SET_SPAWN;
+            result = me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.SET_SPAWN;
 +        } else {
 +            return InteractionResult.SUCCESS;
 +        }
 +
 +        if (bukkitPlayer != null) {
-+            PlayerUseRespawnAnchorEvent event = new PlayerUseRespawnAnchorEvent(bukkitPlayer, block, result);
+            me.lexikiq.event.player.PlayerUseRespawnAnchorEvent event = new me.lexikiq.event.player.PlayerUseRespawnAnchorEvent(bukkitPlayer, block, result);
 +            event.callEvent();
 +            result = event.getResult();
 +        }
 +
-+        if (result == PlayerUseRespawnAnchorEvent.RespawnAnchorResult.NOTHING) {
+        if (result == me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.NOTHING) {
 +            return InteractionResult.PASS;
-+        } else if (result == PlayerUseRespawnAnchorEvent.RespawnAnchorResult.CHARGE) {
+        } else if (result == me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.CHARGE) {
             charge(world, pos, state);
             if (!player.getAbilities().instabuild) {
                 itemStack.shrink(1);
@@ -62,20 +54,20 @@ index af4eb4a8814491afef449a2874521636957d7557..93fae52a7531e1697e4fa63c82aef6ef
 -            }
 -
 -            return InteractionResult.sidedSuccess(world.isClientSide);
-+        } else if (result == PlayerUseRespawnAnchorEvent.RespawnAnchorResult.EXPLODE) {
+        } else if (result == me.lexikiq.event.player.PlayerUseRespawnAnchorEvent.RespawnAnchorResult.EXPLODE) {
 +            this.explode(state, world, pos);
 +            return InteractionResult.CONSUME;
         } else {
 -            if (!world.isClientSide) {
 -                ServerPlayer serverPlayer = (ServerPlayer)player;
 -                if (serverPlayer.getRespawnDimension() != world.dimension() || !pos.equals(serverPlayer.getRespawnPosition())) {
-                    serverPlayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true);
+-                    serverPlayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.RESPAWN_ANCHOR); // Paper - PlayerSetSpawnEvent
 -                    world.playSound((Player)null, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
 -                    return InteractionResult.SUCCESS;
 -                }
 +            ServerPlayer serverPlayer = (ServerPlayer)player;
 +            if (serverPlayer.getRespawnDimension() != world.dimension() || !pos.equals(serverPlayer.getRespawnPosition())) {
-+                serverPlayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true);
+                serverPlayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.RESPAWN_ANCHOR); // Paper - PlayerSetSpawnEvent
 +                world.playSound((Player)null, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
 +                return InteractionResult.SUCCESS;
             }
--- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
+++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
@@ -114,7 +114,7 @@ index 132140e00865fcf84ebe03ffcbc2f30ac11a0b35..8245ec990c7a37839b0eedbcdbf834df
 
         NONE, BREAK, DESTROY;
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 163a7861f987c3832aac51cc6df950c768546731..1bd2d982569c6cd8a65f1f4c58d41a0e4a14e686 100644
+index e3ff04fe21761db65fb03c5e58ecd5823f0507c6..943857d58d68628d3a79d2d687006a4fb89b75f3 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
@@ -146,7 +146,10 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
@@ -130,10 +130,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..1bd2d982569c6cd8a65f1f4c58d41a0e
             }
         }
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 93fae52a7531e1697e4fa63c82aef6ef24d0fb25..2620b42f7a6088aaecf3ccf8f05c5f4d5a4038f0 100644
+index 88439b8f82a97a9763dadfc6c9dbaf0912ab3eb7..73a9b765b58bb547712c014c8b9086535b3cf6fa 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -139,7 +139,10 @@ public class RespawnAnchorBlock extends Block {
+@@ -138,7 +138,10 @@ public class RespawnAnchorBlock extends Block {
                 return pos.equals(explodedPos) && bl2 ? Optional.of(Blocks.WATER.getExplosionResistance()) : super.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState);
             }
         };
@@ -146,10 +146,10 @@ index 93fae52a7531e1697e4fa63c82aef6ef24d0fb25..2620b42f7a6088aaecf3ccf8f05c5f4d
 
     public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 67e87bc1e2dbac1d905c144e4bd8b1600d9557a2..b70468351e8470112ab3e3a1d5479d11c101fa1f 100644
+index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963cf4b0890 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -949,7 +949,7 @@ public class CraftEventFactory {
+@@ -950,7 +950,7 @@ public class CraftEventFactory {
             CraftEventFactory.entityDamage = null;
             EntityDamageEvent event;
             if (damager == null) {
@@ -158,7 +158,7 @@ index 67e87bc1e2dbac1d905c144e4bd8b1600d9557a2..b70468351e8470112ab3e3a1d5479d11
             } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
                 event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
             } else {
-@@ -985,7 +985,7 @@ public class CraftEventFactory {
+@@ -986,7 +986,7 @@ public class CraftEventFactory {
 
             return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
         } else if (source == DamageSource.OUT_OF_WORLD) {
@@ -167,7 +167,7 @@ index 67e87bc1e2dbac1d905c144e4bd8b1600d9557a2..b70468351e8470112ab3e3a1d5479d11
             event.setCancelled(cancelled);
             CraftEventFactory.callEvent(event);
             if (!event.isCancelled()) {
-@@ -993,7 +993,7 @@ public class CraftEventFactory {
+@@ -994,7 +994,7 @@ public class CraftEventFactory {
             }
             return event;
         } else if (source == DamageSource.LAVA) {
--- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
+++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn


 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7a8db8d481e9487ea83a640af208242f4987ad28..dd7feb07e210ef64b5823cf9829b5f30cd0940a9 100644
+index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..cb34cf21a536ade5689062651ad9c694fcdf2b47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -512,6 +512,55 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -511,6 +511,55 @@ public final class CraftMagicNumbers implements UnsafeValues {
     }
     // Paper end
 
--- a/patches/server/0007-Expose-EntityType-Ordinals.patch
+++ b/patches/server/0007-Expose-EntityType-Ordinals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose EntityType Ordinals


 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index ac99265aacd4a28490705e3079ed04023fb1c54a..598b28021d5dc270dc018f5178c0f190aa74750e 100644
+index 1c446dba5de89698397041ee38a2e1a00bec8a56..d12e936920c03cafd18f6c9a509c85c31ab7ba45 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -149,6 +149,8 @@ import org.apache.logging.log4j.Logger;
@@ -51,10 +51,10 @@ index ac99265aacd4a28490705e3079ed04023fb1c54a..598b28021d5dc270dc018f5178c0f190
         return Registry.ENTITY_TYPE.getKey(type);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ade8807ef37b853c59944480bc539bf1c4a64357..f0c331599e629a9c0f4b062cc3a4dc0e1d07962b 100644
+index cb34cf21a536ade5689062651ad9c694fcdf2b47..4341a3b6e2d7aea17cfdda555fba5aaeb9318ef6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -559,6 +559,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -558,6 +558,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
         final net.minecraft.world.item.context.BlockPlaceContext ctx = context;
         return future.completeAsync(() -> blockItem.canPlace(ctx, blockState), net.minecraft.server.MCUtil.MAIN_EXECUTOR);
     }
--- a/patches/server/0008-Add-Player-setGameProfile.patch
+++ b/patches/server/0008-Add-Player-setGameProfile.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile


 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c2034b711e5b3f2b82d86776c58dac4db83ea44d..c796dd411ca0cddddb3f1ba94b539d212cb882ba 100644
+index 266d676118e17af48e21370211c015898eba9691..16bc55fb8efbbda971b704446a07e9f732c1dfa5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1446,6 +1446,12 @@ public abstract class Player extends LivingEntity {
+@@ -1451,6 +1451,12 @@ public abstract class Player extends LivingEntity {
         return this.gameProfile;
     }
 
--- a/patches/server/0009-Expose-MCUtil-Executors.patch
+++ b/patches/server/0009-Expose-MCUtil-Executors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 65e520dbfaf294ef500f263aeb8fb0adf98e8321..4911d31fef5eb5df51b6e4cfb67e3ecbcbfa16ec 100644
+index cbf96eeaed245632e5386f824168ba42113038e1..d01354f10d0db28fc5711cf4d598cdc01fa4cc80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2605,4 +2605,16 @@ public final class CraftServer implements Server {
+@@ -2667,4 +2667,16 @@ public final class CraftServer implements Server {
     }
 
     // Paper end
--- a/patches/server/0011-Add-BlockDropResourcesEvent.patch
+++ b/patches/server/0011-Add-BlockDropResourcesEvent.patch
@@ -8,7 +8,7 @@ to easily get the items being dropped by any
 block instead of only blocks broken by players.

 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index d6a3f3a2edae806b0ebf5bf5ac445116c0d64535..de47a0db1a2e439dbbbc7d5e34a38a05fe2ebeab 100644
+index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..4ca85a02a1eb46b5958aae55946c67cefb85f461 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -306,7 +306,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -38,7 +38,7 @@ index d6a3f3a2edae806b0ebf5bf5ac445116c0d64535..de47a0db1a2e439dbbbc7d5e34a38a05
                 Block.popResource((Level) ((ServerLevel) world), pos, itemstack);
             });
             state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
-@@ -334,7 +334,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -351,7 +351,7 @@ public class Block extends BlockBehaviour implements ItemLike {
 
     public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, Entity entity, ItemStack stack) {
         if (world instanceof ServerLevel) {
@@ -48,10 +48,10 @@ index d6a3f3a2edae806b0ebf5bf5ac445116c0d64535..de47a0db1a2e439dbbbc7d5e34a38a05
             });
             state.spawnAfterBreak((ServerLevel) world, pos, stack);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3c37bf3683abccd4533ccbff0aa7f4848df2494c..1dafdb27b3bdd528d2e3b1c29372e2d8b8eb517a 100644
+index 3d4ff819bb46b346cb84844c68a9e963cf4b0890..9f35b873f928d4cbf5b6653e1e2dd3148ff03483 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1927,5 +1927,11 @@ public class CraftEventFactory {
+@@ -1930,5 +1930,11 @@ public class CraftEventFactory {
         final double posZ = pos.getZ();
         playSoundEvent(event, packet -> playerList.broadcast(player, posX, posY, posZ, radius, world, packet));
     }
--- a/patches/server/0013-Add-Furnace-Recipe-API.patch
+++ b/patches/server/0013-Add-Furnace-Recipe-API.patch
@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e6d1e8faafe3fec48df51e5a25acef56
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7dc26321e20e26821096e79356a358879306cd78..b8e6da2bd68df0001da1638e511e79f4729d633e 100644
+index 7e56d6e60f1e1bd8dbf768afcbe06addcd5c5a60..a054852d253a428a0845742939f1f046bf769c08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2750,4 +2750,11 @@ public class CraftWorld implements World {
+@@ -2103,4 +2103,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
         return this.spigot;
     }
     // Spigot end