revert later, move around a ton of projects to the new desired layout

1525 files changed, 19 insertions, 61 deletions

diff --git a/.gitignore b/.gitignore
index 603660bc12..372fe279bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,5 +69,5 @@ paperclip.properties
 
 !gradle/wrapper/gradle-wrapper.jar
 
-test-plugin.settings.gradle.kts
+paper-test-plugin.settings.gradle.kts
 paper-api-generator.settings.gradle.kts
diff --git a/Paper-MojangAPI/build.gradle.kts b/Paper-MojangAPI/build.gradle.kts
deleted file mode 100644
index a278ee93d7..0000000000
--- a/Paper-MojangAPI/build.gradle.kts
+++ /dev/null
@@ -1,36 +0,0 @@
-plugins {
-    `java-library`
-    `maven-publish`
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-dependencies {
-    implementation(project(":paper-api"))
-    api("com.mojang:brigadier:1.0.18")
-
-    compileOnly("it.unimi.dsi:fastutil:8.5.6")
-    compileOnly("org.jetbrains:annotations:23.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.hamcrest:hamcrest-library:1.3")
-    testImplementation("org.ow2.asm:asm-tree:9.2")
-}
-
-configure<PublishingExtension> {
-    publications.create<MavenPublication>("maven") {
-        from(components["java"])
-    }
-}
-
-val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
-    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
-    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-    classpath.from(configurations.compileClasspath)
-}
-tasks.check {
-    dependsOn(scanJar)
-}
diff --git a/build-data/paper.at b/build-data/paper.at
index 48a44de360..f46d572ac8 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -1,18 +1,9 @@
-# You can use this file to change the access modifiers on a member
-# This line would make the field rollAmount public in Bee
-#public net.minecraft.world.entity.animal.Bee rollAmount
-# This line would make the field public and remove the final modifier
-#public-f net.minecraft.network.protocol.game.ClientboundChatPacket sender
-# Leave out the member and it will apply to the class itself
-# More info, see here https://mcforge.readthedocs.io/en/latest/advanced/accesstransformers/#access-modifiers
-
-# Remap/Decompile fix (unclear why this is happening)
-public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
-
-# AT remap issue? todo 1.18
-public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
 public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
-
-# TODO 1.20 remapSpigotAt.at doesn't remap the return type for this method for some reason
-public net/minecraft/world/entity/Display$TextDisplay getText()Lnet/minecraft/network/chat/Component;
-public net/minecraft/world/entity/Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState;
+public net.minecraft.world.entity.Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState;
+public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
+public+f net.minecraft.CrashReport saveFile
+public+f net.minecraft.CrashReport getDetails()Ljava/lang/String;
+private+f net.minecraft.CrashReport getTitle()Ljava/lang/String;
+public+f net.minecraft.CrashReport getExceptionMessage()Ljava/lang/String;
+public net.minecraft.world.entity.Display$TextDisplay getText()Lnet/minecraft/network/chat/Component;
diff --git a/build.gradle.kts b/build.gradle.kts
index 1bcd2d628d..64177b41c2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -80,9 +80,11 @@ dependencies {
 paperweight {
     softSpoon.set(true)
 
+    // todo we shouldn't need this anymore, this should come via mache?
     minecraftVersion.set(providers.gradleProperty("mcVersion"))
     serverProject.set(project(":paper-server"))
 
+
     // only for patch remap
     paramMappingsRepo.set(paperMavenPublicUrl)
     remapRepo.set(paperMavenPublicUrl)
@@ -95,6 +97,9 @@ paperweight {
     paper {
         mappingsPatch.set(layout.projectDirectory.file("build-data/mappings-patch.tiny"))
         reobfMappingsPatch.set(layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny"))
+
+        paperApiDir.set(layout.projectDirectory.dir("paper-api"))
+        paperServerDir.set(layout.projectDirectory.dir("paper-server"))
     }
 }
 
diff --git a/Paper-API/.gitignore b/paper-api/.gitignore
index 97e78e27ee..97e78e27ee 100644
--- a/Paper-API/.gitignore
+++ b/paper-api/.gitignore
diff --git a/Paper-API/LICENCE.txt b/paper-api/LICENCE.txt
index 94a9ed024d..94a9ed024d 100644
--- a/Paper-API/LICENCE.txt
+++ b/paper-api/LICENCE.txt
diff --git a/Paper-API/build.gradle.kts b/paper-api/build.gradle.kts
index 3e3ea0e4e4..f4b22fa8de 100644
--- a/Paper-API/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -70,6 +70,8 @@ dependencies {
     testCompileOnly(checkerQual)
     // Paper end
 
+    api("com.mojang:brigadier:1.0.18")
+
     testImplementation("org.apache.commons:commons-lang3:3.12.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     testImplementation("org.hamcrest:hamcrest:2.2")
diff --git a/Paper-API/checkstyle.xml b/paper-api/checkstyle.xml
index 3e7d0cb3a2..3e7d0cb3a2 100644
--- a/Paper-API/checkstyle.xml
+++ b/paper-api/checkstyle.xml
diff --git a/Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadier.java b/paper-api/src/main/java/brigadier/PaperBrigadier.java
index 1ed5a6d271..1ed5a6d271 100644
--- a/Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadier.java
+++ b/paper-api/src/main/java/brigadier/PaperBrigadier.java
diff --git a/Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProvider.java b/paper-api/src/main/java/brigadier/PaperBrigadierProvider.java
index 7f24806384..7f24806384 100644
--- a/Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProvider.java
+++ b/paper-api/src/main/java/brigadier/PaperBrigadierProvider.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/FullServerTickHandler.java b/paper-api/src/main/java/co/aikar/timings/FullServerTickHandler.java
index 36b8fe8633..36b8fe8633 100644
--- a/Paper-API/src/main/java/co/aikar/timings/FullServerTickHandler.java
+++ b/paper-api/src/main/java/co/aikar/timings/FullServerTickHandler.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/NullTimingHandler.java b/paper-api/src/main/java/co/aikar/timings/NullTimingHandler.java
index 81671cf40f..81671cf40f 100644
--- a/Paper-API/src/main/java/co/aikar/timings/NullTimingHandler.java
+++ b/paper-api/src/main/java/co/aikar/timings/NullTimingHandler.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimedEventExecutor.java b/paper-api/src/main/java/co/aikar/timings/TimedEventExecutor.java
index 8f29c1561b..8f29c1561b 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimedEventExecutor.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimedEventExecutor.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/Timing.java b/paper-api/src/main/java/co/aikar/timings/Timing.java
index 7514fad26f..7514fad26f 100644
--- a/Paper-API/src/main/java/co/aikar/timings/Timing.java
+++ b/paper-api/src/main/java/co/aikar/timings/Timing.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingData.java b/paper-api/src/main/java/co/aikar/timings/TimingData.java
index a5d13a1e44..a5d13a1e44 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingData.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingData.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingHandler.java b/paper-api/src/main/java/co/aikar/timings/TimingHandler.java
index 199789d56d..199789d56d 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingHandler.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingHandler.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingHistory.java b/paper-api/src/main/java/co/aikar/timings/TimingHistory.java
index 02e88db63b..02e88db63b 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingHistory.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingHistory.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/paper-api/src/main/java/co/aikar/timings/TimingHistoryEntry.java
index 86d5ac6bd0..86d5ac6bd0 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingHistoryEntry.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingHistoryEntry.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingIdentifier.java b/paper-api/src/main/java/co/aikar/timings/TimingIdentifier.java
index df142a89b8..df142a89b8 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingIdentifier.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingIdentifier.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/Timings.java b/paper-api/src/main/java/co/aikar/timings/Timings.java
index 9812d668ad..9812d668ad 100644
--- a/Paper-API/src/main/java/co/aikar/timings/Timings.java
+++ b/paper-api/src/main/java/co/aikar/timings/Timings.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingsCommand.java b/paper-api/src/main/java/co/aikar/timings/TimingsCommand.java
index e801e79fa5..e801e79fa5 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingsCommand.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingsCommand.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingsManager.java b/paper-api/src/main/java/co/aikar/timings/TimingsManager.java
index 5e1558ca3f..5e1558ca3f 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingsManager.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingsManager.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/TimingsReportListener.java b/paper-api/src/main/java/co/aikar/timings/TimingsReportListener.java
index 3af5b8ea79..3af5b8ea79 100644
--- a/Paper-API/src/main/java/co/aikar/timings/TimingsReportListener.java
+++ b/paper-api/src/main/java/co/aikar/timings/TimingsReportListener.java
diff --git a/Paper-API/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/paper-api/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
index 632c496151..632c496151 100644
--- a/Paper-API/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
+++ b/paper-api/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
diff --git a/Paper-API/src/main/java/co/aikar/util/Counter.java b/paper-api/src/main/java/co/aikar/util/Counter.java
index dae8424380..dae8424380 100644
--- a/Paper-API/src/main/java/co/aikar/util/Counter.java
+++ b/paper-api/src/main/java/co/aikar/util/Counter.java
diff --git a/Paper-API/src/main/java/co/aikar/util/JSONUtil.java b/paper-api/src/main/java/co/aikar/util/JSONUtil.java
index c105a1429c..c105a1429c 100644
--- a/Paper-API/src/main/java/co/aikar/util/JSONUtil.java
+++ b/paper-api/src/main/java/co/aikar/util/JSONUtil.java
diff --git a/Paper-API/src/main/java/co/aikar/util/LoadingIntMap.java b/paper-api/src/main/java/co/aikar/util/LoadingIntMap.java
index 5753b9bce8..5753b9bce8 100644
--- a/Paper-API/src/main/java/co/aikar/util/LoadingIntMap.java
+++ b/paper-api/src/main/java/co/aikar/util/LoadingIntMap.java
diff --git a/Paper-API/src/main/java/co/aikar/util/LoadingMap.java b/paper-api/src/main/java/co/aikar/util/LoadingMap.java
index 1786eeb5cb..1786eeb5cb 100644
--- a/Paper-API/src/main/java/co/aikar/util/LoadingMap.java
+++ b/paper-api/src/main/java/co/aikar/util/LoadingMap.java
diff --git a/Paper-API/src/main/java/co/aikar/util/MRUMapCache.java b/paper-api/src/main/java/co/aikar/util/MRUMapCache.java
index 3e61a92662..3e61a92662 100644
--- a/Paper-API/src/main/java/co/aikar/util/MRUMapCache.java
+++ b/paper-api/src/main/java/co/aikar/util/MRUMapCache.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/ClientOption.java b/paper-api/src/main/java/com/destroystokyo/paper/ClientOption.java
index f89bfeba29..f89bfeba29 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/ClientOption.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/ClientOption.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/HeightmapType.java b/paper-api/src/main/java/com/destroystokyo/paper/HeightmapType.java
index 1c832d69bb..1c832d69bb 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/HeightmapType.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/HeightmapType.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/paper-api/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
index a02a02aa0c..a02a02aa0c 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/MaterialTags.java b/paper-api/src/main/java/com/destroystokyo/paper/MaterialTags.java
index 4e7a1e26d3..4e7a1e26d3 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/MaterialTags.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/MaterialTags.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/Namespaced.java b/paper-api/src/main/java/com/destroystokyo/paper/Namespaced.java
index cd1a34b828..cd1a34b828 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/Namespaced.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/Namespaced.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/paper-api/src/main/java/com/destroystokyo/paper/NamespacedTag.java
index 28f3fda950..28f3fda950 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/NamespacedTag.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/NamespacedTag.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/paper-api/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
index f45b8cfd16..f45b8cfd16 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/SkinParts.java b/paper-api/src/main/java/com/destroystokyo/paper/SkinParts.java
index 4a0c39405d..4a0c39405d 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/SkinParts.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/SkinParts.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/Title.java b/paper-api/src/main/java/com/destroystokyo/paper/Title.java
index 9e90c3df56..9e90c3df56 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/Title.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/Title.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/paper-api/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
index ec36942128..ec36942128 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/paper-api/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
index c896d17251..c896d17251 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
index 43f0622574..43f0622574 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
index a087a04c52..a087a04c52 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
index af8765b213..af8765b213 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java
index c57c5416c8..c57c5416c8 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java
index 9cd98c6fcf..9cd98c6fcf 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java
index 7024c8f484..7024c8f484 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java
index e21f757476..e21f757476 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index 0c4dbb9ef6..0c4dbb9ef6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/villager/Reputation.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/villager/Reputation.java
index 0a69e21b0b..0a69e21b0b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/villager/Reputation.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/villager/Reputation.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/entity/villager/ReputationType.java b/paper-api/src/main/java/com/destroystokyo/paper/entity/villager/ReputationType.java
index 5600fcdc97..5600fcdc97 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/entity/villager/ReputationType.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/entity/villager/ReputationType.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
index aa5c3690fb..aa5c3690fb 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
index 978813b94a..978813b94a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
index 051b2ef76a..051b2ef76a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
index 9d72215834..9d72215834 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
index e9768c919a..e9768c919a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
index 615bc4c973..615bc4c973 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
index 1915177f4b..1915177f4b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
index 8414bd805e..8414bd805e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
index f530a3d931..f530a3d931 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
index 806112a8b5..806112a8b5 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
index 07660202e4..07660202e4 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
index f0067c2e95..f0067c2e95 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
index 42fdf7a5bf..42fdf7a5bf 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
index 63e46b2fb1..63e46b2fb1 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
index e5dbbd6604..e5dbbd6604 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
index bfc69a43c2..bfc69a43c2 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
index c6802ca6ac..c6802ca6ac 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
index 1c5fa066c9..1c5fa066c9 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
index 0ce3e39771..0ce3e39771 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
index d8f3f1c354..d8f3f1c354 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
index 112a0dbf52..112a0dbf52 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
index 8b48759bf6..8b48759bf6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
index 48cff06359..48cff06359 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
index 6ae2bc3d95..6ae2bc3d95 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
index 9ce2948dfa..9ce2948dfa 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
index 473fbded8a..473fbded8a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
index 14b67da109..14b67da109 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
index c8dd49d11d..c8dd49d11d 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
index e9ba32799e..e9ba32799e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
index 4683a7237d..4683a7237d 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java
index 085d77dde8..085d77dde8 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
index 021356d151..021356d151 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
index bcc8dba50e..bcc8dba50e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
index abeb24fccd..abeb24fccd 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
index fbbace36d6..fbbace36d6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
index 57f93af14a..57f93af14a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
index 688a596aa2..688a596aa2 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
index fbebf649e8..fbebf649e8 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
index 87ea535480..87ea535480 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
index 084c31af1a..084c31af1a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
index f79685b48b..f79685b48b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
index ac99477e9f..ac99477e9f 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java
index 83bfb7276b..83bfb7276b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java
index 25e5f0354b..25e5f0354b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
index 8d8e9b16f2..8d8e9b16f2 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
index 99dac77bef..99dac77bef 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
index 57521010ff..57521010ff 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
index ebdebe7b6e..ebdebe7b6e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
index cf67dc7d46..cf67dc7d46 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
index 12c1c6fe9d..12c1c6fe9d 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
index e9a76a25fa..e9a76a25fa 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
index 59ae7bc3a0..59ae7bc3a0 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
index febd384b43..febd384b43 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
index 289a0d784a..289a0d784a 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
index 5450575459..5450575459 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
index bb7baa91fd..bb7baa91fd 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
index f7beb22d51..f7beb22d51 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
index 31f34b5480..31f34b5480 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
index 5d04a22fd6..5d04a22fd6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerRecipeBookClickEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerRecipeBookClickEvent.java
index 7fa937d339..7fa937d339 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerRecipeBookClickEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerRecipeBookClickEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java
index c615dbe6ca..c615dbe6ca 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
index b8ec7ef2d4..b8ec7ef2d4 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
index 693d119ab9..693d119ab9 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
index b64ab6eecd..b64ab6eecd 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
index a7228e248e..a7228e248e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
index 71f36e9cae..71f36e9cae 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
index 8df37c07cd..8df37c07cd 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
index 021bc86310..021bc86310 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
index 4dcf6242c9..4dcf6242c9 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
index c6f5e2b545..c6f5e2b545 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
index 9be64a95c2..9be64a95c2 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
index 77a19995f6..77a19995f6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
index e886ac04c0..e886ac04c0 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
index 306dbd975e..306dbd975e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
index dd7327c70f..dd7327c70f 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
index eac85f1f49..eac85f1f49 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
index fdd5eedb2b..fdd5eedb2b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
index 6fb39af047..6fb39af047 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
index 410b241395..410b241395 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerException.java
index c06ea39424..c06ea39424 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
index 2c3effca7c..2c3effca7c 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
index f016ba3b1b..f016ba3b1b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
index be3f92e3c6..be3f92e3c6 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
index 2faef4cb35..2faef4cb35 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
index 2d0b2d4a9b..2d0b2d4a9b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
index 5582999fe9..5582999fe9 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/paper-api/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
index 18c96aeef0..18c96aeef0 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/paper-api/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
index 7e4acfff16..7e4acfff16 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
index 92d7b853a2..92d7b853a2 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
index b387894fe8..b387894fe8 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
index 2b01a50b6e..2b01a50b6e 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
index fd184f13f5..fd184f13f5 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/paper-api/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
index 7b2af1bd72..7b2af1bd72 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/paper-api/src/main/java/com/destroystokyo/paper/network/StatusClient.java
index ffda9f6a8b..ffda9f6a8b 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/network/StatusClient.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/network/StatusClient.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/paper-api/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
index b76f13a026..b76f13a026 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/paper-api/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
index 7b3b6ef533..7b3b6ef533 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/paper-api/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
index 9db0056ab9..9db0056ab9 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/paper-api/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
index a736d7bcdc..a736d7bcdc 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/paper-api/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
index 5bb677ce58..5bb677ce58 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
diff --git a/Paper-API/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/paper-api/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
index 087ee57fe5..087ee57fe5 100644
--- a/Paper-API/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
+++ b/paper-api/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java b/paper-api/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java
index 19202e17f3..19202e17f3 100644
--- a/Paper-API/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java
+++ b/paper-api/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/annotation/DoNotUse.java b/paper-api/src/main/java/io/papermc/paper/annotation/DoNotUse.java
index 4766e49d81..4766e49d81 100644
--- a/Paper-API/src/main/java/io/papermc/paper/annotation/DoNotUse.java
+++ b/paper-api/src/main/java/io/papermc/paper/annotation/DoNotUse.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/block/LockableTileState.java b/paper-api/src/main/java/io/papermc/paper/block/LockableTileState.java
index f309961e0e..f309961e0e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/block/LockableTileState.java
+++ b/paper-api/src/main/java/io/papermc/paper/block/LockableTileState.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/block/MovingPiston.java b/paper-api/src/main/java/io/papermc/paper/block/MovingPiston.java
index ee7c85abf6..ee7c85abf6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/block/MovingPiston.java
+++ b/paper-api/src/main/java/io/papermc/paper/block/MovingPiston.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/chat/ChatRenderer.java b/paper-api/src/main/java/io/papermc/paper/chat/ChatRenderer.java
index ffe0a921cc..ffe0a921cc 100644
--- a/Paper-API/src/main/java/io/papermc/paper/chat/ChatRenderer.java
+++ b/paper-api/src/main/java/io/papermc/paper/chat/ChatRenderer.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/chat/ViewerUnawareImpl.java b/paper-api/src/main/java/io/papermc/paper/chat/ViewerUnawareImpl.java
index 2ad76b1751..2ad76b1751 100644
--- a/Paper-API/src/main/java/io/papermc/paper/chat/ViewerUnawareImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/chat/ViewerUnawareImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/command/CommandBlockHolder.java b/paper-api/src/main/java/io/papermc/paper/command/CommandBlockHolder.java
index cbca0e890a..cbca0e890a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/command/CommandBlockHolder.java
+++ b/paper-api/src/main/java/io/papermc/paper/command/CommandBlockHolder.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/datapack/Datapack.java b/paper-api/src/main/java/io/papermc/paper/datapack/Datapack.java
index 7b2ab0be10..7b2ab0be10 100644
--- a/Paper-API/src/main/java/io/papermc/paper/datapack/Datapack.java
+++ b/paper-api/src/main/java/io/papermc/paper/datapack/Datapack.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/datapack/DatapackManager.java b/paper-api/src/main/java/io/papermc/paper/datapack/DatapackManager.java
index 58f78d5e91..58f78d5e91 100644
--- a/Paper-API/src/main/java/io/papermc/paper/datapack/DatapackManager.java
+++ b/paper-api/src/main/java/io/papermc/paper/datapack/DatapackManager.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java b/paper-api/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java
index e6a40c1fce..e6a40c1fce 100644
--- a/Paper-API/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java
+++ b/paper-api/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/Bucketable.java b/paper-api/src/main/java/io/papermc/paper/entity/Bucketable.java
index 84e360a16d..84e360a16d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/Bucketable.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/Bucketable.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/CollarColorable.java b/paper-api/src/main/java/io/papermc/paper/entity/CollarColorable.java
index bb68e6a252..bb68e6a252 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/CollarColorable.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/CollarColorable.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/Frictional.java b/paper-api/src/main/java/io/papermc/paper/entity/Frictional.java
index 6eb88c664d..6eb88c664d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/Frictional.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/Frictional.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/LookAnchor.java b/paper-api/src/main/java/io/papermc/paper/entity/LookAnchor.java
index 544eec787e..544eec787e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/LookAnchor.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/LookAnchor.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/paper-api/src/main/java/io/papermc/paper/entity/SchoolableFish.java
index 39ad7d2836..39ad7d2836 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/SchoolableFish.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/SchoolableFish.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/Shearable.java b/paper-api/src/main/java/io/papermc/paper/entity/Shearable.java
index 0d5793790a..0d5793790a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/Shearable.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/Shearable.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/entity/TeleportFlag.java b/paper-api/src/main/java/io/papermc/paper/entity/TeleportFlag.java
index c8b5b570d4..c8b5b570d4 100644
--- a/Paper-API/src/main/java/io/papermc/paper/entity/TeleportFlag.java
+++ b/paper-api/src/main/java/io/papermc/paper/entity/TeleportFlag.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
index 7575ca7dd8..7575ca7dd8 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
index 34f18468b4..34f18468b4 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java
index ac14cb18fe..ac14cb18fe 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BellRingEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BellRingEvent.java
index 548aeeab7d..548aeeab7d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BellRingEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BellRingEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockBreakBlockEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BlockBreakBlockEvent.java
index ac7a60403a..ac7a60403a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockBreakBlockEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BlockBreakBlockEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java
index dab7943411..dab7943411 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BlockFailedDispenseEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockLockCheckEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BlockLockCheckEvent.java
index d298ebecaa..d298ebecaa 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockLockCheckEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BlockLockCheckEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockPreDispenseEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/BlockPreDispenseEvent.java
index 07aad3f4ff..07aad3f4ff 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/BlockPreDispenseEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/BlockPreDispenseEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
index 150c6c1468..150c6c1468 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/DragonEggFormEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/DragonEggFormEvent.java
index 5495b87330..5495b87330 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/DragonEggFormEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/DragonEggFormEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/PlayerShearBlockEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/PlayerShearBlockEvent.java
index aa7d440b79..aa7d440b79 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/PlayerShearBlockEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/PlayerShearBlockEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/block/TargetHitEvent.java b/paper-api/src/main/java/io/papermc/paper/event/block/TargetHitEvent.java
index cc067ae118..cc067ae118 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/block/TargetHitEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/block/TargetHitEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java
index 4cd551c831..4cd551c831 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/ElderGuardianAppearanceEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
index fd94caaece..fd94caaece 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
index 13862939d7..13862939d7 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityDyeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityDyeEvent.java
index aefbaccd32..aefbaccd32 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityDyeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityDyeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java
index adc596cae5..adc596cae5 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
index 109dd7e6d0..109dd7e6d0 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java
index 66e41bfe89..66e41bfe89 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java
index 245d56ba7e..245d56ba7e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
index 3c6c1d7e97..3c6c1d7e97 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java
index c15401cd20..c15401cd20 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java
index b53e9eb7df..b53e9eb7df 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
index 3585457b21..3585457b21 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java
index 70cd37aefb..70cd37aefb 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
index 6da98b535c..6da98b535c 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java b/paper-api/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java
index 4c4c645a15..4c4c645a15 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java b/paper-api/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java
index 2c1cda1126..2c1cda1126 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/packet/PlayerChunkLoadEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java b/paper-api/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java
index 12163a7b05..12163a7b05 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/packet/PlayerChunkUnloadEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/AbstractChatEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/AbstractChatEvent.java
index ed8e885f22..ed8e885f22 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/AbstractChatEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/AbstractChatEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatCommandDecorateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatCommandDecorateEvent.java
index feece00981..feece00981 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatCommandDecorateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatCommandDecorateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
index 667bfa6afc..667bfa6afc 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
index 4eada40b8a..4eada40b8a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/ChatEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/ChatEvent.java
index af025704e9..af025704e9 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/ChatEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/ChatEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
index ce76b07cfa..ce76b07cfa 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java
index e002873361..e002873361 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java
index 812712b3b2..812712b3b2 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java
index e3ee540bb0..e3ee540bb0 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerDeepSleepEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerFailMoveEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerFailMoveEvent.java
index 48610aa5ea..48610aa5ea 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerFailMoveEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerFailMoveEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerFlowerPotManipulateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerFlowerPotManipulateEvent.java
index 4c141f3d8f..4c141f3d8f 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerFlowerPotManipulateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerFlowerPotManipulateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
index 0a3e3b56b7..0a3e3b56b7 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java
index 58d18f05af..58d18f05af 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
index 451fb94a58..451fb94a58 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerLecternPageChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerLecternPageChangeEvent.java
index 26370e46e4..26370e46e4 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerLecternPageChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerLecternPageChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java
index 8cb05709f7..8cb05709f7 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
index ef9e53a73e..ef9e53a73e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerOpenSignEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerOpenSignEvent.java
index a82c0db092..a82c0db092 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerOpenSignEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerOpenSignEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java
index f3011d00c9..f3011d00c9 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
index c5648055c5..c5648055c5 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerSignCommandPreprocessEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerSignCommandPreprocessEvent.java
index dc77440374..dc77440374 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerSignCommandPreprocessEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerSignCommandPreprocessEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerStonecutterRecipeSelectEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerStonecutterRecipeSelectEvent.java
index fb1bca3a9d..fb1bca3a9d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerStonecutterRecipeSelectEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerStonecutterRecipeSelectEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerStopUsingItemEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerStopUsingItemEvent.java
index 3689551baf..3689551baf 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerStopUsingItemEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerStopUsingItemEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java
index db0a011815..db0a011815 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
index a41fc18674..a41fc18674 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java
index 683710d53e..683710d53e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java b/paper-api/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
index d49999ea59..d49999ea59 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/server/ServerResourcesReloadedEvent.java b/paper-api/src/main/java/io/papermc/paper/event/server/ServerResourcesReloadedEvent.java
index 7a8d6815c1..7a8d6815c1 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/server/ServerResourcesReloadedEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/server/ServerResourcesReloadedEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java
index 34bcdc9a3c..34bcdc9a3c 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java
index 679677cf6a..679677cf6a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
index 4342b162f6..4342b162f6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/WorldGameRuleChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/WorldGameRuleChangeEvent.java
index 20c25a0f9d..20c25a0f9d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/WorldGameRuleChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/WorldGameRuleChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java
index 126fe50b51..126fe50b51 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java
index 60eabed056..60eabed056 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderBoundsChangeFinishEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java
index 4a10c773a8..4a10c773a8 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java
index 67bd469d36..67bd469d36 100644
--- a/Paper-API/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java
+++ b/paper-api/src/main/java/io/papermc/paper/event/world/border/WorldBorderEvent.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/generated/GeneratedFrom.java b/paper-api/src/main/java/io/papermc/paper/generated/GeneratedFrom.java
index 2512dba27e..2512dba27e 100644
--- a/Paper-API/src/main/java/io/papermc/paper/generated/GeneratedFrom.java
+++ b/paper-api/src/main/java/io/papermc/paper/generated/GeneratedFrom.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/paper-api/src/main/java/io/papermc/paper/inventory/ItemRarity.java
index 74ef8395cc..74ef8395cc 100644
--- a/Paper-API/src/main/java/io/papermc/paper/inventory/ItemRarity.java
+++ b/paper-api/src/main/java/io/papermc/paper/inventory/ItemRarity.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/BlockPosition.java b/paper-api/src/main/java/io/papermc/paper/math/BlockPosition.java
index f0fdabce4a..f0fdabce4a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/BlockPosition.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/BlockPosition.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/BlockPositionImpl.java b/paper-api/src/main/java/io/papermc/paper/math/BlockPositionImpl.java
index eb5a3f26c7..eb5a3f26c7 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/BlockPositionImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/BlockPositionImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/FinePosition.java b/paper-api/src/main/java/io/papermc/paper/math/FinePosition.java
index d8df70d731..d8df70d731 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/FinePosition.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/FinePosition.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/FinePositionImpl.java b/paper-api/src/main/java/io/papermc/paper/math/FinePositionImpl.java
index 93476aaf8d..93476aaf8d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/FinePositionImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/FinePositionImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/Position.java b/paper-api/src/main/java/io/papermc/paper/math/Position.java
index 26bc5a0fa6..26bc5a0fa6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/Position.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/Position.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/Rotations.java b/paper-api/src/main/java/io/papermc/paper/math/Rotations.java
index 0ac1618113..0ac1618113 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/Rotations.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/Rotations.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/math/RotationsImpl.java b/paper-api/src/main/java/io/papermc/paper/math/RotationsImpl.java
index 53359ab4a6..53359ab4a6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/math/RotationsImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/RotationsImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/paper-api/src/main/java/io/papermc/paper/plugin/PermissionManager.java
index cdbc93b317..cdbc93b317 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/PermissionManager.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/PermissionManager.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/BootstrapContext.java b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/BootstrapContext.java
index 08f2050356..08f2050356 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/BootstrapContext.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/BootstrapContext.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/PluginBootstrap.java b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/PluginBootstrap.java
index 288c078da3..288c078da3 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/PluginBootstrap.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/PluginBootstrap.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/PluginProviderContext.java b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/PluginProviderContext.java
index 2c14693155..2c14693155 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/bootstrap/PluginProviderContext.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/PluginProviderContext.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/paper-api/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
index ef393f1f93..ef393f1f93 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/configuration/package-info.java b/paper-api/src/main/java/io/papermc/paper/plugin/configuration/package-info.java
index ddb3076124..ddb3076124 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/configuration/package-info.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/configuration/package-info.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/PluginClasspathBuilder.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/PluginClasspathBuilder.java
index 28cbc09b7c..28cbc09b7c 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/PluginClasspathBuilder.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/PluginClasspathBuilder.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/PluginLoader.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/PluginLoader.java
index c9e31f78ff..c9e31f78ff 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/PluginLoader.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/PluginLoader.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/ClassPathLibrary.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/ClassPathLibrary.java
index 1347b535d9..1347b535d9 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/ClassPathLibrary.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/ClassPathLibrary.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/LibraryLoadingException.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/LibraryLoadingException.java
index 79ba423a36..79ba423a36 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/LibraryLoadingException.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/LibraryLoadingException.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/LibraryStore.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/LibraryStore.java
index 0546fa1e9d..0546fa1e9d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/LibraryStore.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/LibraryStore.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java
index e3da0d67ca..e3da0d67ca 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
index 9af07d168b..9af07d168b 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java
index 64e46fdfa4..64e46fdfa4 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/ClassLoaderAccess.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/ConfiguredPluginClassLoader.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/ConfiguredPluginClassLoader.java
index a21bdc5756..a21bdc5756 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/ConfiguredPluginClassLoader.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/ConfiguredPluginClassLoader.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorage.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorage.java
index fefc87d5ff..fefc87d5ff 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorage.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorage.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorageAccess.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorageAccess.java
index 2c0e5ba6f8..2c0e5ba6f8 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorageAccess.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PaperClassLoaderStorageAccess.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PluginClassLoaderGroup.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PluginClassLoaderGroup.java
index 885151cb93..885151cb93 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/classloader/PluginClassLoaderGroup.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/PluginClassLoaderGroup.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/entrypoint/DependencyContext.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/entrypoint/DependencyContext.java
index 44d630c3eb..44d630c3eb 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/entrypoint/DependencyContext.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/entrypoint/DependencyContext.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/util/ProviderUtil.java b/paper-api/src/main/java/io/papermc/paper/plugin/provider/util/ProviderUtil.java
index 6bf3d212a6..6bf3d212a6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/plugin/provider/util/ProviderUtil.java
+++ b/paper-api/src/main/java/io/papermc/paper/plugin/provider/util/ProviderUtil.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/potion/PotionMix.java b/paper-api/src/main/java/io/papermc/paper/potion/PotionMix.java
index 3fc922ebf9..3fc922ebf9 100644
--- a/Paper-API/src/main/java/io/papermc/paper/potion/PotionMix.java
+++ b/paper-api/src/main/java/io/papermc/paper/potion/PotionMix.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/potion/PredicateRecipeChoice.java b/paper-api/src/main/java/io/papermc/paper/potion/PredicateRecipeChoice.java
index 3ede1e8f7b..3ede1e8f7b 100644
--- a/Paper-API/src/main/java/io/papermc/paper/potion/PredicateRecipeChoice.java
+++ b/paper-api/src/main/java/io/papermc/paper/potion/PredicateRecipeChoice.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntry.java b/paper-api/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntry.java
index c8446678e3..c8446678e3 100644
--- a/Paper-API/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntry.java
+++ b/paper-api/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntry.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntryImpl.java b/paper-api/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntryImpl.java
index e5002ccaef..e5002ccaef 100644
--- a/Paper-API/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntryImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/potion/SuspiciousEffectEntryImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/Reference.java b/paper-api/src/main/java/io/papermc/paper/registry/Reference.java
index d880810cbf..d880810cbf 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/Reference.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/Reference.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/ReferenceImpl.java b/paper-api/src/main/java/io/papermc/paper/registry/ReferenceImpl.java
index f29e76a6b6..f29e76a6b6 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/ReferenceImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/ReferenceImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/RegistryKey.java b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java
index c4b30b16ce..c4b30b16ce 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/RegistryKey.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
index 9ad300fa16..9ad300fa16 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/TypedKey.java b/paper-api/src/main/java/io/papermc/paper/registry/TypedKey.java
index 271454cd1b..271454cd1b 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/TypedKey.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/TypedKey.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java b/paper-api/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
index 3c3fd73f77..3c3fd73f77 100644
--- a/Paper-API/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/tag/BaseTag.java b/paper-api/src/main/java/io/papermc/paper/tag/BaseTag.java
index 7947879123..7947879123 100644
--- a/Paper-API/src/main/java/io/papermc/paper/tag/BaseTag.java
+++ b/paper-api/src/main/java/io/papermc/paper/tag/BaseTag.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/tag/EntitySetTag.java b/paper-api/src/main/java/io/papermc/paper/tag/EntitySetTag.java
index c89c4619aa..c89c4619aa 100644
--- a/Paper-API/src/main/java/io/papermc/paper/tag/EntitySetTag.java
+++ b/paper-api/src/main/java/io/papermc/paper/tag/EntitySetTag.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/tag/EntityTags.java b/paper-api/src/main/java/io/papermc/paper/tag/EntityTags.java
index 5376e51adf..5376e51adf 100644
--- a/Paper-API/src/main/java/io/papermc/paper/tag/EntityTags.java
+++ b/paper-api/src/main/java/io/papermc/paper/tag/EntityTags.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/text/PaperComponents.java b/paper-api/src/main/java/io/papermc/paper/text/PaperComponents.java
index 6e94562d79..6e94562d79 100644
--- a/Paper-API/src/main/java/io/papermc/paper/text/PaperComponents.java
+++ b/paper-api/src/main/java/io/papermc/paper/text/PaperComponents.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/AsyncScheduler.java b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/AsyncScheduler.java
index d9cdd04660..d9cdd04660 100644
--- a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/AsyncScheduler.java
+++ b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/AsyncScheduler.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/EntityScheduler.java b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/EntityScheduler.java
index 9f69e189be..9f69e189be 100644
--- a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/EntityScheduler.java
+++ b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/EntityScheduler.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
index 365b53fea8..365b53fea8 100644
--- a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
+++ b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/RegionScheduler.java b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/RegionScheduler.java
index 7557e170f8..7557e170f8 100644
--- a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/RegionScheduler.java
+++ b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/RegionScheduler.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/ScheduledTask.java b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/ScheduledTask.java
index a6b50c9d8a..a6b50c9d8a 100644
--- a/Paper-API/src/main/java/io/papermc/paper/threadedregions/scheduler/ScheduledTask.java
+++ b/paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/ScheduledTask.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/util/JarManifests.java b/paper-api/src/main/java/io/papermc/paper/util/JarManifests.java
index 909617079d..909617079d 100644
--- a/Paper-API/src/main/java/io/papermc/paper/util/JarManifests.java
+++ b/paper-api/src/main/java/io/papermc/paper/util/JarManifests.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/util/Tick.java b/paper-api/src/main/java/io/papermc/paper/util/Tick.java
index 10430f02e1..10430f02e1 100644
--- a/Paper-API/src/main/java/io/papermc/paper/util/Tick.java
+++ b/paper-api/src/main/java/io/papermc/paper/util/Tick.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/util/TransformingRandomAccessList.java b/paper-api/src/main/java/io/papermc/paper/util/TransformingRandomAccessList.java
index 6f560a5127..6f560a5127 100644
--- a/Paper-API/src/main/java/io/papermc/paper/util/TransformingRandomAccessList.java
+++ b/paper-api/src/main/java/io/papermc/paper/util/TransformingRandomAccessList.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/world/MoonPhase.java b/paper-api/src/main/java/io/papermc/paper/world/MoonPhase.java
index df05153397..df05153397 100644
--- a/Paper-API/src/main/java/io/papermc/paper/world/MoonPhase.java
+++ b/paper-api/src/main/java/io/papermc/paper/world/MoonPhase.java
diff --git a/Paper-API/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java b/paper-api/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java
index 1e7b53f9bc..1e7b53f9bc 100644
--- a/Paper-API/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java
+++ b/paper-api/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java
diff --git a/Paper-API/src/main/java/org/bukkit/Art.java b/paper-api/src/main/java/org/bukkit/Art.java
index 24daba85ce..24daba85ce 100644
--- a/Paper-API/src/main/java/org/bukkit/Art.java
+++ b/paper-api/src/main/java/org/bukkit/Art.java
diff --git a/Paper-API/src/main/java/org/bukkit/Axis.java b/paper-api/src/main/java/org/bukkit/Axis.java
index fd86d68d12..fd86d68d12 100644
--- a/Paper-API/src/main/java/org/bukkit/Axis.java
+++ b/paper-api/src/main/java/org/bukkit/Axis.java
diff --git a/Paper-API/src/main/java/org/bukkit/BanEntry.java b/paper-api/src/main/java/org/bukkit/BanEntry.java
index fc4da11c9d..fc4da11c9d 100644
--- a/Paper-API/src/main/java/org/bukkit/BanEntry.java
+++ b/paper-api/src/main/java/org/bukkit/BanEntry.java
diff --git a/Paper-API/src/main/java/org/bukkit/BanList.java b/paper-api/src/main/java/org/bukkit/BanList.java
index a77c0411a6..a77c0411a6 100644
--- a/Paper-API/src/main/java/org/bukkit/BanList.java
+++ b/paper-api/src/main/java/org/bukkit/BanList.java
diff --git a/Paper-API/src/main/java/org/bukkit/BlockChangeDelegate.java b/paper-api/src/main/java/org/bukkit/BlockChangeDelegate.java
index 41eff1a31a..41eff1a31a 100644
--- a/Paper-API/src/main/java/org/bukkit/BlockChangeDelegate.java
+++ b/paper-api/src/main/java/org/bukkit/BlockChangeDelegate.java
diff --git a/Paper-API/src/main/java/org/bukkit/Bukkit.java b/paper-api/src/main/java/org/bukkit/Bukkit.java
index 48fab49260..48fab49260 100644
--- a/Paper-API/src/main/java/org/bukkit/Bukkit.java
+++ b/paper-api/src/main/java/org/bukkit/Bukkit.java
diff --git a/Paper-API/src/main/java/org/bukkit/ChatColor.java b/paper-api/src/main/java/org/bukkit/ChatColor.java
index 918a045165..918a045165 100644
--- a/Paper-API/src/main/java/org/bukkit/ChatColor.java
+++ b/paper-api/src/main/java/org/bukkit/ChatColor.java
diff --git a/Paper-API/src/main/java/org/bukkit/Chunk.java b/paper-api/src/main/java/org/bukkit/Chunk.java
index eca55d8d34..eca55d8d34 100644
--- a/Paper-API/src/main/java/org/bukkit/Chunk.java
+++ b/paper-api/src/main/java/org/bukkit/Chunk.java
diff --git a/Paper-API/src/main/java/org/bukkit/ChunkSnapshot.java b/paper-api/src/main/java/org/bukkit/ChunkSnapshot.java
index dc765dea47..dc765dea47 100644
--- a/Paper-API/src/main/java/org/bukkit/ChunkSnapshot.java
+++ b/paper-api/src/main/java/org/bukkit/ChunkSnapshot.java
diff --git a/Paper-API/src/main/java/org/bukkit/CoalType.java b/paper-api/src/main/java/org/bukkit/CoalType.java
index 75e563d2a6..75e563d2a6 100644
--- a/Paper-API/src/main/java/org/bukkit/CoalType.java
+++ b/paper-api/src/main/java/org/bukkit/CoalType.java
diff --git a/Paper-API/src/main/java/org/bukkit/Color.java b/paper-api/src/main/java/org/bukkit/Color.java
index e088390ec3..e088390ec3 100644
--- a/Paper-API/src/main/java/org/bukkit/Color.java
+++ b/paper-api/src/main/java/org/bukkit/Color.java
diff --git a/Paper-API/src/main/java/org/bukkit/CropState.java b/paper-api/src/main/java/org/bukkit/CropState.java
index 519deeeb86..519deeeb86 100644
--- a/Paper-API/src/main/java/org/bukkit/CropState.java
+++ b/paper-api/src/main/java/org/bukkit/CropState.java
diff --git a/Paper-API/src/main/java/org/bukkit/Difficulty.java b/paper-api/src/main/java/org/bukkit/Difficulty.java
index 427ce8cfd6..427ce8cfd6 100644
--- a/Paper-API/src/main/java/org/bukkit/Difficulty.java
+++ b/paper-api/src/main/java/org/bukkit/Difficulty.java
diff --git a/Paper-API/src/main/java/org/bukkit/DyeColor.java b/paper-api/src/main/java/org/bukkit/DyeColor.java
index 47df858e09..47df858e09 100644
--- a/Paper-API/src/main/java/org/bukkit/DyeColor.java
+++ b/paper-api/src/main/java/org/bukkit/DyeColor.java
diff --git a/Paper-API/src/main/java/org/bukkit/Effect.java b/paper-api/src/main/java/org/bukkit/Effect.java
index b8ad6ec679..b8ad6ec679 100644
--- a/Paper-API/src/main/java/org/bukkit/Effect.java
+++ b/paper-api/src/main/java/org/bukkit/Effect.java
diff --git a/Paper-API/src/main/java/org/bukkit/EntityEffect.java b/paper-api/src/main/java/org/bukkit/EntityEffect.java
index 5341957b10..5341957b10 100644
--- a/Paper-API/src/main/java/org/bukkit/EntityEffect.java
+++ b/paper-api/src/main/java/org/bukkit/EntityEffect.java
diff --git a/Paper-API/src/main/java/org/bukkit/FeatureFlag.java b/paper-api/src/main/java/org/bukkit/FeatureFlag.java
index 775fda4b29..775fda4b29 100644
--- a/Paper-API/src/main/java/org/bukkit/FeatureFlag.java
+++ b/paper-api/src/main/java/org/bukkit/FeatureFlag.java
diff --git a/Paper-API/src/main/java/org/bukkit/FireworkEffect.java b/paper-api/src/main/java/org/bukkit/FireworkEffect.java
index 637fa73d43..637fa73d43 100644
--- a/Paper-API/src/main/java/org/bukkit/FireworkEffect.java
+++ b/paper-api/src/main/java/org/bukkit/FireworkEffect.java
diff --git a/Paper-API/src/main/java/org/bukkit/Fluid.java b/paper-api/src/main/java/org/bukkit/Fluid.java
index 7202b44a65..7202b44a65 100644
--- a/Paper-API/src/main/java/org/bukkit/Fluid.java
+++ b/paper-api/src/main/java/org/bukkit/Fluid.java
diff --git a/Paper-API/src/main/java/org/bukkit/FluidCollisionMode.java b/paper-api/src/main/java/org/bukkit/FluidCollisionMode.java
index ae28958941..ae28958941 100644
--- a/Paper-API/src/main/java/org/bukkit/FluidCollisionMode.java
+++ b/paper-api/src/main/java/org/bukkit/FluidCollisionMode.java
diff --git a/Paper-API/src/main/java/org/bukkit/GameEvent.java b/paper-api/src/main/java/org/bukkit/GameEvent.java
index 6c9689baca..6c9689baca 100644
--- a/Paper-API/src/main/java/org/bukkit/GameEvent.java
+++ b/paper-api/src/main/java/org/bukkit/GameEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/GameMode.java b/paper-api/src/main/java/org/bukkit/GameMode.java
index fdc42a79c5..fdc42a79c5 100644
--- a/Paper-API/src/main/java/org/bukkit/GameMode.java
+++ b/paper-api/src/main/java/org/bukkit/GameMode.java
diff --git a/Paper-API/src/main/java/org/bukkit/GameRule.java b/paper-api/src/main/java/org/bukkit/GameRule.java
index be827e7fef..be827e7fef 100644
--- a/Paper-API/src/main/java/org/bukkit/GameRule.java
+++ b/paper-api/src/main/java/org/bukkit/GameRule.java
diff --git a/Paper-API/src/main/java/org/bukkit/GrassSpecies.java b/paper-api/src/main/java/org/bukkit/GrassSpecies.java
index f8ae143acb..f8ae143acb 100644
--- a/Paper-API/src/main/java/org/bukkit/GrassSpecies.java
+++ b/paper-api/src/main/java/org/bukkit/GrassSpecies.java
diff --git a/Paper-API/src/main/java/org/bukkit/HeightMap.java b/paper-api/src/main/java/org/bukkit/HeightMap.java
index db6fcd635e..db6fcd635e 100644
--- a/Paper-API/src/main/java/org/bukkit/HeightMap.java
+++ b/paper-api/src/main/java/org/bukkit/HeightMap.java
diff --git a/Paper-API/src/main/java/org/bukkit/Instrument.java b/paper-api/src/main/java/org/bukkit/Instrument.java
index 8df26e0d7b..8df26e0d7b 100644
--- a/Paper-API/src/main/java/org/bukkit/Instrument.java
+++ b/paper-api/src/main/java/org/bukkit/Instrument.java
diff --git a/Paper-API/src/main/java/org/bukkit/Keyed.java b/paper-api/src/main/java/org/bukkit/Keyed.java
index e076d447da..e076d447da 100644
--- a/Paper-API/src/main/java/org/bukkit/Keyed.java
+++ b/paper-api/src/main/java/org/bukkit/Keyed.java
diff --git a/Paper-API/src/main/java/org/bukkit/Location.java b/paper-api/src/main/java/org/bukkit/Location.java
index 9bbd928f7d..9bbd928f7d 100644
--- a/Paper-API/src/main/java/org/bukkit/Location.java
+++ b/paper-api/src/main/java/org/bukkit/Location.java
diff --git a/Paper-API/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java
index f9af60356d..f9af60356d 100644
--- a/Paper-API/src/main/java/org/bukkit/Material.java
+++ b/paper-api/src/main/java/org/bukkit/Material.java
diff --git a/Paper-API/src/main/java/org/bukkit/MinecraftExperimental.java b/paper-api/src/main/java/org/bukkit/MinecraftExperimental.java
index b63e24b3c4..b63e24b3c4 100644
--- a/Paper-API/src/main/java/org/bukkit/MinecraftExperimental.java
+++ b/paper-api/src/main/java/org/bukkit/MinecraftExperimental.java
diff --git a/Paper-API/src/main/java/org/bukkit/MusicInstrument.java b/paper-api/src/main/java/org/bukkit/MusicInstrument.java
index ee5368372e..ee5368372e 100644
--- a/Paper-API/src/main/java/org/bukkit/MusicInstrument.java
+++ b/paper-api/src/main/java/org/bukkit/MusicInstrument.java
diff --git a/Paper-API/src/main/java/org/bukkit/Nameable.java b/paper-api/src/main/java/org/bukkit/Nameable.java
index 45d996878b..45d996878b 100644
--- a/Paper-API/src/main/java/org/bukkit/Nameable.java
+++ b/paper-api/src/main/java/org/bukkit/Nameable.java
diff --git a/Paper-API/src/main/java/org/bukkit/NamespacedKey.java b/paper-api/src/main/java/org/bukkit/NamespacedKey.java
index 8ac72cb0b0..8ac72cb0b0 100644
--- a/Paper-API/src/main/java/org/bukkit/NamespacedKey.java
+++ b/paper-api/src/main/java/org/bukkit/NamespacedKey.java
diff --git a/Paper-API/src/main/java/org/bukkit/NetherWartsState.java b/paper-api/src/main/java/org/bukkit/NetherWartsState.java
index f0094e6fb0..f0094e6fb0 100644
--- a/Paper-API/src/main/java/org/bukkit/NetherWartsState.java
+++ b/paper-api/src/main/java/org/bukkit/NetherWartsState.java
diff --git a/Paper-API/src/main/java/org/bukkit/Note.java b/paper-api/src/main/java/org/bukkit/Note.java
index aff8583467..aff8583467 100644
--- a/Paper-API/src/main/java/org/bukkit/Note.java
+++ b/paper-api/src/main/java/org/bukkit/Note.java
diff --git a/Paper-API/src/main/java/org/bukkit/OfflinePlayer.java b/paper-api/src/main/java/org/bukkit/OfflinePlayer.java
index bce07d84ca..bce07d84ca 100644
--- a/Paper-API/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/paper-api/src/main/java/org/bukkit/OfflinePlayer.java
diff --git a/Paper-API/src/main/java/org/bukkit/Particle.java b/paper-api/src/main/java/org/bukkit/Particle.java
index 594de70f30..594de70f30 100644
--- a/Paper-API/src/main/java/org/bukkit/Particle.java
+++ b/paper-api/src/main/java/org/bukkit/Particle.java
diff --git a/Paper-API/src/main/java/org/bukkit/PortalType.java b/paper-api/src/main/java/org/bukkit/PortalType.java
index 427cfbb8b5..427cfbb8b5 100644
--- a/Paper-API/src/main/java/org/bukkit/PortalType.java
+++ b/paper-api/src/main/java/org/bukkit/PortalType.java
diff --git a/Paper-API/src/main/java/org/bukkit/Raid.java b/paper-api/src/main/java/org/bukkit/Raid.java
index 983a8c20a0..983a8c20a0 100644
--- a/Paper-API/src/main/java/org/bukkit/Raid.java
+++ b/paper-api/src/main/java/org/bukkit/Raid.java
diff --git a/Paper-API/src/main/java/org/bukkit/RegionAccessor.java b/paper-api/src/main/java/org/bukkit/RegionAccessor.java
index 43dd6c59cc..43dd6c59cc 100644
--- a/Paper-API/src/main/java/org/bukkit/RegionAccessor.java
+++ b/paper-api/src/main/java/org/bukkit/RegionAccessor.java
diff --git a/Paper-API/src/main/java/org/bukkit/Registry.java b/paper-api/src/main/java/org/bukkit/Registry.java
index 800d23bb24..800d23bb24 100644
--- a/Paper-API/src/main/java/org/bukkit/Registry.java
+++ b/paper-api/src/main/java/org/bukkit/Registry.java
diff --git a/Paper-API/src/main/java/org/bukkit/Rotation.java b/paper-api/src/main/java/org/bukkit/Rotation.java
index 78708fe390..78708fe390 100644
--- a/Paper-API/src/main/java/org/bukkit/Rotation.java
+++ b/paper-api/src/main/java/org/bukkit/Rotation.java
diff --git a/Paper-API/src/main/java/org/bukkit/SandstoneType.java b/paper-api/src/main/java/org/bukkit/SandstoneType.java
index 10f5cfb188..10f5cfb188 100644
--- a/Paper-API/src/main/java/org/bukkit/SandstoneType.java
+++ b/paper-api/src/main/java/org/bukkit/SandstoneType.java
diff --git a/Paper-API/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java
index 9af4bc16da..9af4bc16da 100644
--- a/Paper-API/src/main/java/org/bukkit/Server.java
+++ b/paper-api/src/main/java/org/bukkit/Server.java
diff --git a/Paper-API/src/main/java/org/bukkit/ServerTickManager.java b/paper-api/src/main/java/org/bukkit/ServerTickManager.java
index aed9e09772..aed9e09772 100644
--- a/Paper-API/src/main/java/org/bukkit/ServerTickManager.java
+++ b/paper-api/src/main/java/org/bukkit/ServerTickManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/SkullType.java b/paper-api/src/main/java/org/bukkit/SkullType.java
index 49f2f11288..49f2f11288 100644
--- a/Paper-API/src/main/java/org/bukkit/SkullType.java
+++ b/paper-api/src/main/java/org/bukkit/SkullType.java
diff --git a/Paper-API/src/main/java/org/bukkit/Sound.java b/paper-api/src/main/java/org/bukkit/Sound.java
index bb1b6bc934..bb1b6bc934 100644
--- a/Paper-API/src/main/java/org/bukkit/Sound.java
+++ b/paper-api/src/main/java/org/bukkit/Sound.java
diff --git a/Paper-API/src/main/java/org/bukkit/SoundCategory.java b/paper-api/src/main/java/org/bukkit/SoundCategory.java
index 2d91924b7f..2d91924b7f 100644
--- a/Paper-API/src/main/java/org/bukkit/SoundCategory.java
+++ b/paper-api/src/main/java/org/bukkit/SoundCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/SoundGroup.java b/paper-api/src/main/java/org/bukkit/SoundGroup.java
index 1f18c6bb39..1f18c6bb39 100644
--- a/Paper-API/src/main/java/org/bukkit/SoundGroup.java
+++ b/paper-api/src/main/java/org/bukkit/SoundGroup.java
diff --git a/Paper-API/src/main/java/org/bukkit/Statistic.java b/paper-api/src/main/java/org/bukkit/Statistic.java
index 4ce888688d..4ce888688d 100644
--- a/Paper-API/src/main/java/org/bukkit/Statistic.java
+++ b/paper-api/src/main/java/org/bukkit/Statistic.java
diff --git a/Paper-API/src/main/java/org/bukkit/StructureType.java b/paper-api/src/main/java/org/bukkit/StructureType.java
index 7707def6e9..7707def6e9 100644
--- a/Paper-API/src/main/java/org/bukkit/StructureType.java
+++ b/paper-api/src/main/java/org/bukkit/StructureType.java
diff --git a/Paper-API/src/main/java/org/bukkit/Tag.java b/paper-api/src/main/java/org/bukkit/Tag.java
index 8b584130c0..8b584130c0 100644
--- a/Paper-API/src/main/java/org/bukkit/Tag.java
+++ b/paper-api/src/main/java/org/bukkit/Tag.java
diff --git a/Paper-API/src/main/java/org/bukkit/Translatable.java b/paper-api/src/main/java/org/bukkit/Translatable.java
index fd1629c2d2..fd1629c2d2 100644
--- a/Paper-API/src/main/java/org/bukkit/Translatable.java
+++ b/paper-api/src/main/java/org/bukkit/Translatable.java
diff --git a/Paper-API/src/main/java/org/bukkit/TreeSpecies.java b/paper-api/src/main/java/org/bukkit/TreeSpecies.java
index 0128530162..0128530162 100644
--- a/Paper-API/src/main/java/org/bukkit/TreeSpecies.java
+++ b/paper-api/src/main/java/org/bukkit/TreeSpecies.java
diff --git a/Paper-API/src/main/java/org/bukkit/TreeType.java b/paper-api/src/main/java/org/bukkit/TreeType.java
index d355c91748..d355c91748 100644
--- a/Paper-API/src/main/java/org/bukkit/TreeType.java
+++ b/paper-api/src/main/java/org/bukkit/TreeType.java
diff --git a/Paper-API/src/main/java/org/bukkit/UndefinedNullability.java b/paper-api/src/main/java/org/bukkit/UndefinedNullability.java
index 3babc9df26..3babc9df26 100644
--- a/Paper-API/src/main/java/org/bukkit/UndefinedNullability.java
+++ b/paper-api/src/main/java/org/bukkit/UndefinedNullability.java
diff --git a/Paper-API/src/main/java/org/bukkit/UnsafeValues.java b/paper-api/src/main/java/org/bukkit/UnsafeValues.java
index a4b38f284d..a4b38f284d 100644
--- a/Paper-API/src/main/java/org/bukkit/UnsafeValues.java
+++ b/paper-api/src/main/java/org/bukkit/UnsafeValues.java
diff --git a/Paper-API/src/main/java/org/bukkit/Utility.java b/paper-api/src/main/java/org/bukkit/Utility.java
index da66853ef2..da66853ef2 100644
--- a/Paper-API/src/main/java/org/bukkit/Utility.java
+++ b/paper-api/src/main/java/org/bukkit/Utility.java
diff --git a/Paper-API/src/main/java/org/bukkit/Vibration.java b/paper-api/src/main/java/org/bukkit/Vibration.java
index bbc01e7c19..bbc01e7c19 100644
--- a/Paper-API/src/main/java/org/bukkit/Vibration.java
+++ b/paper-api/src/main/java/org/bukkit/Vibration.java
diff --git a/Paper-API/src/main/java/org/bukkit/Warning.java b/paper-api/src/main/java/org/bukkit/Warning.java
index 3024468af4..3024468af4 100644
--- a/Paper-API/src/main/java/org/bukkit/Warning.java
+++ b/paper-api/src/main/java/org/bukkit/Warning.java
diff --git a/Paper-API/src/main/java/org/bukkit/WeatherType.java b/paper-api/src/main/java/org/bukkit/WeatherType.java
index 36b993f1c3..36b993f1c3 100644
--- a/Paper-API/src/main/java/org/bukkit/WeatherType.java
+++ b/paper-api/src/main/java/org/bukkit/WeatherType.java
diff --git a/Paper-API/src/main/java/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java
index 567a36a488..567a36a488 100644
--- a/Paper-API/src/main/java/org/bukkit/World.java
+++ b/paper-api/src/main/java/org/bukkit/World.java
diff --git a/Paper-API/src/main/java/org/bukkit/WorldBorder.java b/paper-api/src/main/java/org/bukkit/WorldBorder.java
index 3ab5700b0b..3ab5700b0b 100644
--- a/Paper-API/src/main/java/org/bukkit/WorldBorder.java
+++ b/paper-api/src/main/java/org/bukkit/WorldBorder.java
diff --git a/Paper-API/src/main/java/org/bukkit/WorldCreator.java b/paper-api/src/main/java/org/bukkit/WorldCreator.java
index 58e3e3e0e7..58e3e3e0e7 100644
--- a/Paper-API/src/main/java/org/bukkit/WorldCreator.java
+++ b/paper-api/src/main/java/org/bukkit/WorldCreator.java
diff --git a/Paper-API/src/main/java/org/bukkit/WorldType.java b/paper-api/src/main/java/org/bukkit/WorldType.java
index c48b5579f7..c48b5579f7 100644
--- a/Paper-API/src/main/java/org/bukkit/WorldType.java
+++ b/paper-api/src/main/java/org/bukkit/WorldType.java
diff --git a/Paper-API/src/main/java/org/bukkit/advancement/Advancement.java b/paper-api/src/main/java/org/bukkit/advancement/Advancement.java
index 243e5f2deb..243e5f2deb 100644
--- a/Paper-API/src/main/java/org/bukkit/advancement/Advancement.java
+++ b/paper-api/src/main/java/org/bukkit/advancement/Advancement.java
diff --git a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/paper-api/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
index aec6be7e12..aec6be7e12 100644
--- a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
+++ b/paper-api/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
diff --git a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementDisplayType.java b/paper-api/src/main/java/org/bukkit/advancement/AdvancementDisplayType.java
index 06d8b72dd5..06d8b72dd5 100644
--- a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementDisplayType.java
+++ b/paper-api/src/main/java/org/bukkit/advancement/AdvancementDisplayType.java
diff --git a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementProgress.java b/paper-api/src/main/java/org/bukkit/advancement/AdvancementProgress.java
index f9bc179da0..f9bc179da0 100644
--- a/Paper-API/src/main/java/org/bukkit/advancement/AdvancementProgress.java
+++ b/paper-api/src/main/java/org/bukkit/advancement/AdvancementProgress.java
diff --git a/Paper-API/src/main/java/org/bukkit/advancement/package-info.java b/paper-api/src/main/java/org/bukkit/advancement/package-info.java
index 665b0a29a2..665b0a29a2 100644
--- a/Paper-API/src/main/java/org/bukkit/advancement/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/advancement/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/attribute/Attributable.java b/paper-api/src/main/java/org/bukkit/attribute/Attributable.java
index 474ed1df36..474ed1df36 100644
--- a/Paper-API/src/main/java/org/bukkit/attribute/Attributable.java
+++ b/paper-api/src/main/java/org/bukkit/attribute/Attributable.java
diff --git a/Paper-API/src/main/java/org/bukkit/attribute/Attribute.java b/paper-api/src/main/java/org/bukkit/attribute/Attribute.java
index 37f93b7e9f..37f93b7e9f 100644
--- a/Paper-API/src/main/java/org/bukkit/attribute/Attribute.java
+++ b/paper-api/src/main/java/org/bukkit/attribute/Attribute.java
diff --git a/Paper-API/src/main/java/org/bukkit/attribute/AttributeInstance.java b/paper-api/src/main/java/org/bukkit/attribute/AttributeInstance.java
index 3cffffe810..3cffffe810 100644
--- a/Paper-API/src/main/java/org/bukkit/attribute/AttributeInstance.java
+++ b/paper-api/src/main/java/org/bukkit/attribute/AttributeInstance.java
diff --git a/Paper-API/src/main/java/org/bukkit/attribute/AttributeModifier.java b/paper-api/src/main/java/org/bukkit/attribute/AttributeModifier.java
index d124768378..d124768378 100644
--- a/Paper-API/src/main/java/org/bukkit/attribute/AttributeModifier.java
+++ b/paper-api/src/main/java/org/bukkit/attribute/AttributeModifier.java
diff --git a/Paper-API/src/main/java/org/bukkit/attribute/package-info.java b/paper-api/src/main/java/org/bukkit/attribute/package-info.java
index 125adf41dd..125adf41dd 100644
--- a/Paper-API/src/main/java/org/bukkit/attribute/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/attribute/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/ban/IpBanList.java b/paper-api/src/main/java/org/bukkit/ban/IpBanList.java
index f024b67ad7..f024b67ad7 100644
--- a/Paper-API/src/main/java/org/bukkit/ban/IpBanList.java
+++ b/paper-api/src/main/java/org/bukkit/ban/IpBanList.java
diff --git a/Paper-API/src/main/java/org/bukkit/ban/ProfileBanList.java b/paper-api/src/main/java/org/bukkit/ban/ProfileBanList.java
index 5248cf08ef..5248cf08ef 100644
--- a/Paper-API/src/main/java/org/bukkit/ban/ProfileBanList.java
+++ b/paper-api/src/main/java/org/bukkit/ban/ProfileBanList.java
diff --git a/Paper-API/src/main/java/org/bukkit/ban/package-info.java b/paper-api/src/main/java/org/bukkit/ban/package-info.java
index 946b72ad7e..946b72ad7e 100644
--- a/Paper-API/src/main/java/org/bukkit/ban/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/ban/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Banner.java b/paper-api/src/main/java/org/bukkit/block/Banner.java
index 4dfd4bd40c..4dfd4bd40c 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Banner.java
+++ b/paper-api/src/main/java/org/bukkit/block/Banner.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Barrel.java b/paper-api/src/main/java/org/bukkit/block/Barrel.java
index d3789b2b7d..d3789b2b7d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Barrel.java
+++ b/paper-api/src/main/java/org/bukkit/block/Barrel.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Beacon.java b/paper-api/src/main/java/org/bukkit/block/Beacon.java
index 79c04b840a..79c04b840a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Beacon.java
+++ b/paper-api/src/main/java/org/bukkit/block/Beacon.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Bed.java b/paper-api/src/main/java/org/bukkit/block/Bed.java
index f4c37ce1fe..f4c37ce1fe 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Bed.java
+++ b/paper-api/src/main/java/org/bukkit/block/Bed.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Beehive.java b/paper-api/src/main/java/org/bukkit/block/Beehive.java
index 655fd0b598..655fd0b598 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Beehive.java
+++ b/paper-api/src/main/java/org/bukkit/block/Beehive.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Bell.java b/paper-api/src/main/java/org/bukkit/block/Bell.java
index ba2db68bb7..ba2db68bb7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Bell.java
+++ b/paper-api/src/main/java/org/bukkit/block/Bell.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Biome.java b/paper-api/src/main/java/org/bukkit/block/Biome.java
index 5d8fa5b39a..5d8fa5b39a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Biome.java
+++ b/paper-api/src/main/java/org/bukkit/block/Biome.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BlastFurnace.java b/paper-api/src/main/java/org/bukkit/block/BlastFurnace.java
index 3c4d8571b6..3c4d8571b6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BlastFurnace.java
+++ b/paper-api/src/main/java/org/bukkit/block/BlastFurnace.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Block.java b/paper-api/src/main/java/org/bukkit/block/Block.java
index 4997455879..4997455879 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Block.java
+++ b/paper-api/src/main/java/org/bukkit/block/Block.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BlockFace.java b/paper-api/src/main/java/org/bukkit/block/BlockFace.java
index fe83ed9bf6..fe83ed9bf6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BlockFace.java
+++ b/paper-api/src/main/java/org/bukkit/block/BlockFace.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BlockState.java b/paper-api/src/main/java/org/bukkit/block/BlockState.java
index ef35316fa6..ef35316fa6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BlockState.java
+++ b/paper-api/src/main/java/org/bukkit/block/BlockState.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BlockSupport.java b/paper-api/src/main/java/org/bukkit/block/BlockSupport.java
index 28693ea777..28693ea777 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BlockSupport.java
+++ b/paper-api/src/main/java/org/bukkit/block/BlockSupport.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BrewingStand.java b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java
index fe155f14de..fe155f14de 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BrewingStand.java
+++ b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/BrushableBlock.java b/paper-api/src/main/java/org/bukkit/block/BrushableBlock.java
index f2557a87f4..f2557a87f4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/BrushableBlock.java
+++ b/paper-api/src/main/java/org/bukkit/block/BrushableBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/CalibratedSculkSensor.java b/paper-api/src/main/java/org/bukkit/block/CalibratedSculkSensor.java
index 2581412f6d..2581412f6d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/CalibratedSculkSensor.java
+++ b/paper-api/src/main/java/org/bukkit/block/CalibratedSculkSensor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Campfire.java b/paper-api/src/main/java/org/bukkit/block/Campfire.java
index 9c3952459e..9c3952459e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Campfire.java
+++ b/paper-api/src/main/java/org/bukkit/block/Campfire.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Chest.java b/paper-api/src/main/java/org/bukkit/block/Chest.java
index db6affbc78..db6affbc78 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Chest.java
+++ b/paper-api/src/main/java/org/bukkit/block/Chest.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/ChiseledBookshelf.java b/paper-api/src/main/java/org/bukkit/block/ChiseledBookshelf.java
index 1cc5c2021c..1cc5c2021c 100644
--- a/Paper-API/src/main/java/org/bukkit/block/ChiseledBookshelf.java
+++ b/paper-api/src/main/java/org/bukkit/block/ChiseledBookshelf.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/CommandBlock.java b/paper-api/src/main/java/org/bukkit/block/CommandBlock.java
index 02bf0f8c12..02bf0f8c12 100644
--- a/Paper-API/src/main/java/org/bukkit/block/CommandBlock.java
+++ b/paper-api/src/main/java/org/bukkit/block/CommandBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Comparator.java b/paper-api/src/main/java/org/bukkit/block/Comparator.java
index 6fb4c1a944..6fb4c1a944 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Comparator.java
+++ b/paper-api/src/main/java/org/bukkit/block/Comparator.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Conduit.java b/paper-api/src/main/java/org/bukkit/block/Conduit.java
index 5543165536..5543165536 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Conduit.java
+++ b/paper-api/src/main/java/org/bukkit/block/Conduit.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Container.java b/paper-api/src/main/java/org/bukkit/block/Container.java
index a67ee0cb0c..a67ee0cb0c 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Container.java
+++ b/paper-api/src/main/java/org/bukkit/block/Container.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Crafter.java b/paper-api/src/main/java/org/bukkit/block/Crafter.java
index fda6e8965e..fda6e8965e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Crafter.java
+++ b/paper-api/src/main/java/org/bukkit/block/Crafter.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/CreatureSpawner.java b/paper-api/src/main/java/org/bukkit/block/CreatureSpawner.java
index 5e0fae5a60..5e0fae5a60 100644
--- a/Paper-API/src/main/java/org/bukkit/block/CreatureSpawner.java
+++ b/paper-api/src/main/java/org/bukkit/block/CreatureSpawner.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/DaylightDetector.java b/paper-api/src/main/java/org/bukkit/block/DaylightDetector.java
index 702ee7fbe0..702ee7fbe0 100644
--- a/Paper-API/src/main/java/org/bukkit/block/DaylightDetector.java
+++ b/paper-api/src/main/java/org/bukkit/block/DaylightDetector.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/DecoratedPot.java b/paper-api/src/main/java/org/bukkit/block/DecoratedPot.java
index a7327b7691..a7327b7691 100644
--- a/Paper-API/src/main/java/org/bukkit/block/DecoratedPot.java
+++ b/paper-api/src/main/java/org/bukkit/block/DecoratedPot.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Dispenser.java b/paper-api/src/main/java/org/bukkit/block/Dispenser.java
index 07af1a3f01..07af1a3f01 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Dispenser.java
+++ b/paper-api/src/main/java/org/bukkit/block/Dispenser.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/DoubleChest.java b/paper-api/src/main/java/org/bukkit/block/DoubleChest.java
index a39d2f1acb..a39d2f1acb 100644
--- a/Paper-API/src/main/java/org/bukkit/block/DoubleChest.java
+++ b/paper-api/src/main/java/org/bukkit/block/DoubleChest.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Dropper.java b/paper-api/src/main/java/org/bukkit/block/Dropper.java
index c76202321e..c76202321e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Dropper.java
+++ b/paper-api/src/main/java/org/bukkit/block/Dropper.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/EnchantingTable.java b/paper-api/src/main/java/org/bukkit/block/EnchantingTable.java
index 68b9e034a6..68b9e034a6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/EnchantingTable.java
+++ b/paper-api/src/main/java/org/bukkit/block/EnchantingTable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/EndGateway.java b/paper-api/src/main/java/org/bukkit/block/EndGateway.java
index 5e76a1cf4b..5e76a1cf4b 100644
--- a/Paper-API/src/main/java/org/bukkit/block/EndGateway.java
+++ b/paper-api/src/main/java/org/bukkit/block/EndGateway.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/EnderChest.java b/paper-api/src/main/java/org/bukkit/block/EnderChest.java
index 1150b449a3..1150b449a3 100644
--- a/Paper-API/src/main/java/org/bukkit/block/EnderChest.java
+++ b/paper-api/src/main/java/org/bukkit/block/EnderChest.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/EntityBlockStorage.java b/paper-api/src/main/java/org/bukkit/block/EntityBlockStorage.java
index 739911cda3..739911cda3 100644
--- a/Paper-API/src/main/java/org/bukkit/block/EntityBlockStorage.java
+++ b/paper-api/src/main/java/org/bukkit/block/EntityBlockStorage.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Furnace.java b/paper-api/src/main/java/org/bukkit/block/Furnace.java
index 8745e5aeaa..8745e5aeaa 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Furnace.java
+++ b/paper-api/src/main/java/org/bukkit/block/Furnace.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/HangingSign.java b/paper-api/src/main/java/org/bukkit/block/HangingSign.java
index 9bef6c6597..9bef6c6597 100644
--- a/Paper-API/src/main/java/org/bukkit/block/HangingSign.java
+++ b/paper-api/src/main/java/org/bukkit/block/HangingSign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Hopper.java b/paper-api/src/main/java/org/bukkit/block/Hopper.java
index 7ade312f18..7ade312f18 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Hopper.java
+++ b/paper-api/src/main/java/org/bukkit/block/Hopper.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Jigsaw.java b/paper-api/src/main/java/org/bukkit/block/Jigsaw.java
index 02c7fa58ec..02c7fa58ec 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Jigsaw.java
+++ b/paper-api/src/main/java/org/bukkit/block/Jigsaw.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Jukebox.java b/paper-api/src/main/java/org/bukkit/block/Jukebox.java
index fa76b2a4a4..fa76b2a4a4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Jukebox.java
+++ b/paper-api/src/main/java/org/bukkit/block/Jukebox.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Lectern.java b/paper-api/src/main/java/org/bukkit/block/Lectern.java
index f835ddf0a2..f835ddf0a2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Lectern.java
+++ b/paper-api/src/main/java/org/bukkit/block/Lectern.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Lidded.java b/paper-api/src/main/java/org/bukkit/block/Lidded.java
index 30c7df0021..30c7df0021 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Lidded.java
+++ b/paper-api/src/main/java/org/bukkit/block/Lidded.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Lockable.java b/paper-api/src/main/java/org/bukkit/block/Lockable.java
index f307cb1701..f307cb1701 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Lockable.java
+++ b/paper-api/src/main/java/org/bukkit/block/Lockable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/PistonMoveReaction.java b/paper-api/src/main/java/org/bukkit/block/PistonMoveReaction.java
index a7b915ded9..a7b915ded9 100644
--- a/Paper-API/src/main/java/org/bukkit/block/PistonMoveReaction.java
+++ b/paper-api/src/main/java/org/bukkit/block/PistonMoveReaction.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/SculkCatalyst.java b/paper-api/src/main/java/org/bukkit/block/SculkCatalyst.java
index 7d53b24003..7d53b24003 100644
--- a/Paper-API/src/main/java/org/bukkit/block/SculkCatalyst.java
+++ b/paper-api/src/main/java/org/bukkit/block/SculkCatalyst.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/SculkSensor.java b/paper-api/src/main/java/org/bukkit/block/SculkSensor.java
index 95a8226130..95a8226130 100644
--- a/Paper-API/src/main/java/org/bukkit/block/SculkSensor.java
+++ b/paper-api/src/main/java/org/bukkit/block/SculkSensor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/SculkShrieker.java b/paper-api/src/main/java/org/bukkit/block/SculkShrieker.java
index 323269780a..323269780a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/SculkShrieker.java
+++ b/paper-api/src/main/java/org/bukkit/block/SculkShrieker.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/ShulkerBox.java b/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
index 5dc5318b0a..5dc5318b0a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/ShulkerBox.java
+++ b/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Sign.java b/paper-api/src/main/java/org/bukkit/block/Sign.java
index 94e8f319fe..94e8f319fe 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Sign.java
+++ b/paper-api/src/main/java/org/bukkit/block/Sign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Skull.java b/paper-api/src/main/java/org/bukkit/block/Skull.java
index 5135b8e602..5135b8e602 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Skull.java
+++ b/paper-api/src/main/java/org/bukkit/block/Skull.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Smoker.java b/paper-api/src/main/java/org/bukkit/block/Smoker.java
index 7601c30d70..7601c30d70 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Smoker.java
+++ b/paper-api/src/main/java/org/bukkit/block/Smoker.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/Structure.java b/paper-api/src/main/java/org/bukkit/block/Structure.java
index ab245d11fa..ab245d11fa 100644
--- a/Paper-API/src/main/java/org/bukkit/block/Structure.java
+++ b/paper-api/src/main/java/org/bukkit/block/Structure.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/SuspiciousSand.java b/paper-api/src/main/java/org/bukkit/block/SuspiciousSand.java
index a7c4e4baf1..a7c4e4baf1 100644
--- a/Paper-API/src/main/java/org/bukkit/block/SuspiciousSand.java
+++ b/paper-api/src/main/java/org/bukkit/block/SuspiciousSand.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/TileState.java b/paper-api/src/main/java/org/bukkit/block/TileState.java
index 5c8517c5bc..5c8517c5bc 100644
--- a/Paper-API/src/main/java/org/bukkit/block/TileState.java
+++ b/paper-api/src/main/java/org/bukkit/block/TileState.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/TrialSpawner.java b/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java
index 66ce87d236..66ce87d236 100644
--- a/Paper-API/src/main/java/org/bukkit/block/TrialSpawner.java
+++ b/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/banner/Pattern.java b/paper-api/src/main/java/org/bukkit/block/banner/Pattern.java
index 5c293ab0b7..5c293ab0b7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/banner/Pattern.java
+++ b/paper-api/src/main/java/org/bukkit/block/banner/Pattern.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/banner/PatternType.java b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
index 1c5c6303de..1c5c6303de 100644
--- a/Paper-API/src/main/java/org/bukkit/block/banner/PatternType.java
+++ b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/banner/package-info.java b/paper-api/src/main/java/org/bukkit/block/banner/package-info.java
index 7aab22b920..7aab22b920 100644
--- a/Paper-API/src/main/java/org/bukkit/block/banner/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/banner/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Ageable.java b/paper-api/src/main/java/org/bukkit/block/data/Ageable.java
index 2f7b84a3f2..2f7b84a3f2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Ageable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Ageable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/AnaloguePowerable.java b/paper-api/src/main/java/org/bukkit/block/data/AnaloguePowerable.java
index 68ec26a101..68ec26a101 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/AnaloguePowerable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/AnaloguePowerable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Attachable.java b/paper-api/src/main/java/org/bukkit/block/data/Attachable.java
index 97c7fa7281..97c7fa7281 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Attachable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Attachable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Bisected.java b/paper-api/src/main/java/org/bukkit/block/data/Bisected.java
index 7b7c0d2be7..7b7c0d2be7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Bisected.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Bisected.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/BlockData.java b/paper-api/src/main/java/org/bukkit/block/data/BlockData.java
index 647536e1f1..647536e1f1 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/BlockData.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/BlockData.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Brushable.java b/paper-api/src/main/java/org/bukkit/block/data/Brushable.java
index 4755b4f629..4755b4f629 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Brushable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Brushable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Directional.java b/paper-api/src/main/java/org/bukkit/block/data/Directional.java
index 825ff08ddd..825ff08ddd 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Directional.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Directional.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/FaceAttachable.java b/paper-api/src/main/java/org/bukkit/block/data/FaceAttachable.java
index 950266b4bb..950266b4bb 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/FaceAttachable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/FaceAttachable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Hangable.java b/paper-api/src/main/java/org/bukkit/block/data/Hangable.java
index d0aa6a84be..d0aa6a84be 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Hangable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Hangable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Hatchable.java b/paper-api/src/main/java/org/bukkit/block/data/Hatchable.java
index 7bae4b1d7f..7bae4b1d7f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Hatchable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Hatchable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Levelled.java b/paper-api/src/main/java/org/bukkit/block/data/Levelled.java
index 860f072dee..860f072dee 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Levelled.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Levelled.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Lightable.java b/paper-api/src/main/java/org/bukkit/block/data/Lightable.java
index 59a725e3ae..59a725e3ae 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Lightable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Lightable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/MultipleFacing.java b/paper-api/src/main/java/org/bukkit/block/data/MultipleFacing.java
index e10a52555b..e10a52555b 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/MultipleFacing.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/MultipleFacing.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Openable.java b/paper-api/src/main/java/org/bukkit/block/data/Openable.java
index 8554865a3e..8554865a3e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Openable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Openable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Orientable.java b/paper-api/src/main/java/org/bukkit/block/data/Orientable.java
index 5b4561a165..5b4561a165 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Orientable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Orientable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Powerable.java b/paper-api/src/main/java/org/bukkit/block/data/Powerable.java
index 994f72f53d..994f72f53d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Powerable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Powerable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Rail.java b/paper-api/src/main/java/org/bukkit/block/data/Rail.java
index c8bdab081a..c8bdab081a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Rail.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Rail.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Rotatable.java b/paper-api/src/main/java/org/bukkit/block/data/Rotatable.java
index 3f60fbce43..3f60fbce43 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Rotatable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Rotatable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Snowable.java b/paper-api/src/main/java/org/bukkit/block/data/Snowable.java
index dbb034ed8e..dbb034ed8e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Snowable.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Snowable.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/Waterlogged.java b/paper-api/src/main/java/org/bukkit/block/data/Waterlogged.java
index 400cc99711..400cc99711 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/Waterlogged.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/Waterlogged.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/package-info.java b/paper-api/src/main/java/org/bukkit/block/data/package-info.java
index 1b6b4874d4..1b6b4874d4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/AmethystCluster.java b/paper-api/src/main/java/org/bukkit/block/data/type/AmethystCluster.java
index 52b0ea4b3b..52b0ea4b3b 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/AmethystCluster.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/AmethystCluster.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Bamboo.java b/paper-api/src/main/java/org/bukkit/block/data/type/Bamboo.java
index 96b5add299..96b5add299 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Bamboo.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Bamboo.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Barrel.java b/paper-api/src/main/java/org/bukkit/block/data/type/Barrel.java
index dc94ff9116..dc94ff9116 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Barrel.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Barrel.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Bed.java b/paper-api/src/main/java/org/bukkit/block/data/type/Bed.java
index 6e7a456dc5..6e7a456dc5 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Bed.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Bed.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Beehive.java b/paper-api/src/main/java/org/bukkit/block/data/type/Beehive.java
index 7cfa05d7a7..7cfa05d7a7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Beehive.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Beehive.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Bell.java b/paper-api/src/main/java/org/bukkit/block/data/type/Bell.java
index 9b8abfff4d..9b8abfff4d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Bell.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Bell.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/BigDripleaf.java b/paper-api/src/main/java/org/bukkit/block/data/type/BigDripleaf.java
index 04285684d3..04285684d3 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/BigDripleaf.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/BigDripleaf.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/BrewingStand.java b/paper-api/src/main/java/org/bukkit/block/data/type/BrewingStand.java
index 6a7687d524..6a7687d524 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/BrewingStand.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/BrewingStand.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/BubbleColumn.java b/paper-api/src/main/java/org/bukkit/block/data/type/BubbleColumn.java
index f24d6f6f44..f24d6f6f44 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/BubbleColumn.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/BubbleColumn.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Cake.java b/paper-api/src/main/java/org/bukkit/block/data/type/Cake.java
index 65c9ea1e8d..65c9ea1e8d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Cake.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Cake.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CalibratedSculkSensor.java b/paper-api/src/main/java/org/bukkit/block/data/type/CalibratedSculkSensor.java
index ccde95be1f..ccde95be1f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CalibratedSculkSensor.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CalibratedSculkSensor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Campfire.java b/paper-api/src/main/java/org/bukkit/block/data/type/Campfire.java
index 24da69583d..24da69583d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Campfire.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Campfire.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Candle.java b/paper-api/src/main/java/org/bukkit/block/data/type/Candle.java
index 7baccce27f..7baccce27f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Candle.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Candle.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CaveVines.java b/paper-api/src/main/java/org/bukkit/block/data/type/CaveVines.java
index 859d52c8c2..859d52c8c2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CaveVines.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CaveVines.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CaveVinesPlant.java b/paper-api/src/main/java/org/bukkit/block/data/type/CaveVinesPlant.java
index a7f75a98e0..a7f75a98e0 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CaveVinesPlant.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CaveVinesPlant.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Chain.java b/paper-api/src/main/java/org/bukkit/block/data/type/Chain.java
index c0ca51db0a..c0ca51db0a 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Chain.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Chain.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Chest.java b/paper-api/src/main/java/org/bukkit/block/data/type/Chest.java
index d79c3d0007..d79c3d0007 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Chest.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Chest.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java b/paper-api/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java
index a172e22ce4..a172e22ce4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Cocoa.java b/paper-api/src/main/java/org/bukkit/block/data/type/Cocoa.java
index 092e46c720..092e46c720 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Cocoa.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Cocoa.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CommandBlock.java b/paper-api/src/main/java/org/bukkit/block/data/type/CommandBlock.java
index 3b1dab4c1c..3b1dab4c1c 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CommandBlock.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CommandBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Comparator.java b/paper-api/src/main/java/org/bukkit/block/data/type/Comparator.java
index 6cfd296604..6cfd296604 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Comparator.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Comparator.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CopperBulb.java b/paper-api/src/main/java/org/bukkit/block/data/type/CopperBulb.java
index 2257f23c2e..2257f23c2e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CopperBulb.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CopperBulb.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/CoralWallFan.java b/paper-api/src/main/java/org/bukkit/block/data/type/CoralWallFan.java
index 3b92d4f992..3b92d4f992 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/CoralWallFan.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/CoralWallFan.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Crafter.java b/paper-api/src/main/java/org/bukkit/block/data/type/Crafter.java
index 282188ffa8..282188ffa8 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Crafter.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Crafter.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/DaylightDetector.java b/paper-api/src/main/java/org/bukkit/block/data/type/DaylightDetector.java
index deefb6c62f..deefb6c62f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/DaylightDetector.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/DaylightDetector.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/DecoratedPot.java b/paper-api/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
index eb0ffa9774..eb0ffa9774 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Dispenser.java b/paper-api/src/main/java/org/bukkit/block/data/type/Dispenser.java
index fea25e1c21..fea25e1c21 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Dispenser.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Dispenser.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Door.java b/paper-api/src/main/java/org/bukkit/block/data/type/Door.java
index 5b0bba5efe..5b0bba5efe 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Door.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Door.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Dripleaf.java b/paper-api/src/main/java/org/bukkit/block/data/type/Dripleaf.java
index 31347f52bb..31347f52bb 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Dripleaf.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Dripleaf.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/EndPortalFrame.java b/paper-api/src/main/java/org/bukkit/block/data/type/EndPortalFrame.java
index 6c181d633f..6c181d633f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/EndPortalFrame.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/EndPortalFrame.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/EnderChest.java b/paper-api/src/main/java/org/bukkit/block/data/type/EnderChest.java
index 5a9e04c4ad..5a9e04c4ad 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/EnderChest.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/EnderChest.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Farmland.java b/paper-api/src/main/java/org/bukkit/block/data/type/Farmland.java
index a9fff6f611..a9fff6f611 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Farmland.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Farmland.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Fence.java b/paper-api/src/main/java/org/bukkit/block/data/type/Fence.java
index f2c6274218..f2c6274218 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Fence.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Fence.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Fire.java b/paper-api/src/main/java/org/bukkit/block/data/type/Fire.java
index 6282d021e4..6282d021e4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Fire.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Fire.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Furnace.java b/paper-api/src/main/java/org/bukkit/block/data/type/Furnace.java
index 830366ce0f..830366ce0f 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Furnace.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Furnace.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Gate.java b/paper-api/src/main/java/org/bukkit/block/data/type/Gate.java
index ebc98607b9..ebc98607b9 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Gate.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Gate.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/GlassPane.java b/paper-api/src/main/java/org/bukkit/block/data/type/GlassPane.java
index 44eaa553c7..44eaa553c7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/GlassPane.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/GlassPane.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/GlowLichen.java b/paper-api/src/main/java/org/bukkit/block/data/type/GlowLichen.java
index 93b8ad4fba..93b8ad4fba 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/GlowLichen.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/GlowLichen.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Grindstone.java b/paper-api/src/main/java/org/bukkit/block/data/type/Grindstone.java
index db48f66d36..db48f66d36 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Grindstone.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Grindstone.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/HangingSign.java b/paper-api/src/main/java/org/bukkit/block/data/type/HangingSign.java
index c5a0c14763..c5a0c14763 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/HangingSign.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/HangingSign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Hopper.java b/paper-api/src/main/java/org/bukkit/block/data/type/Hopper.java
index b176fc8b69..b176fc8b69 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Hopper.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Hopper.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Jigsaw.java b/paper-api/src/main/java/org/bukkit/block/data/type/Jigsaw.java
index c70c755cdb..c70c755cdb 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Jigsaw.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Jigsaw.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Jukebox.java b/paper-api/src/main/java/org/bukkit/block/data/type/Jukebox.java
index 5e37136207..5e37136207 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Jukebox.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Jukebox.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Ladder.java b/paper-api/src/main/java/org/bukkit/block/data/type/Ladder.java
index ee1b340f2d..ee1b340f2d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Ladder.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Ladder.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Lantern.java b/paper-api/src/main/java/org/bukkit/block/data/type/Lantern.java
index d1627f3473..d1627f3473 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Lantern.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Lantern.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Leaves.java b/paper-api/src/main/java/org/bukkit/block/data/type/Leaves.java
index cd013a7c42..cd013a7c42 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Leaves.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Leaves.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Lectern.java b/paper-api/src/main/java/org/bukkit/block/data/type/Lectern.java
index 11b4a173f9..11b4a173f9 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Lectern.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Lectern.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Light.java b/paper-api/src/main/java/org/bukkit/block/data/type/Light.java
index 832ca18ed4..832ca18ed4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Light.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Light.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/LightningRod.java b/paper-api/src/main/java/org/bukkit/block/data/type/LightningRod.java
index c99c57cbe5..c99c57cbe5 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/LightningRod.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/LightningRod.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/MangrovePropagule.java b/paper-api/src/main/java/org/bukkit/block/data/type/MangrovePropagule.java
index 6175a1339e..6175a1339e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/MangrovePropagule.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/MangrovePropagule.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/NoteBlock.java b/paper-api/src/main/java/org/bukkit/block/data/type/NoteBlock.java
index ec48ca8ca5..ec48ca8ca5 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/NoteBlock.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/NoteBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Observer.java b/paper-api/src/main/java/org/bukkit/block/data/type/Observer.java
index f40c735009..f40c735009 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Observer.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Observer.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/PinkPetals.java b/paper-api/src/main/java/org/bukkit/block/data/type/PinkPetals.java
index a84b36f758..a84b36f758 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/PinkPetals.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/PinkPetals.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Piston.java b/paper-api/src/main/java/org/bukkit/block/data/type/Piston.java
index 9eec7317ba..9eec7317ba 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Piston.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Piston.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/PistonHead.java b/paper-api/src/main/java/org/bukkit/block/data/type/PistonHead.java
index d1eaa20a02..d1eaa20a02 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/PistonHead.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/PistonHead.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/PitcherCrop.java b/paper-api/src/main/java/org/bukkit/block/data/type/PitcherCrop.java
index 8c2da21de4..8c2da21de4 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/PitcherCrop.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/PitcherCrop.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/PointedDripstone.java b/paper-api/src/main/java/org/bukkit/block/data/type/PointedDripstone.java
index ae604692f7..ae604692f7 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/PointedDripstone.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/PointedDripstone.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneRail.java b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneRail.java
index 1cf7630c35..1cf7630c35 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneRail.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneRail.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneWallTorch.java b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneWallTorch.java
index 7e1e098597..7e1e098597 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneWallTorch.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneWallTorch.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneWire.java b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneWire.java
index ba8a80ee3e..ba8a80ee3e 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/RedstoneWire.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/RedstoneWire.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Repeater.java b/paper-api/src/main/java/org/bukkit/block/data/type/Repeater.java
index a78563ed85..a78563ed85 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Repeater.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Repeater.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/RespawnAnchor.java b/paper-api/src/main/java/org/bukkit/block/data/type/RespawnAnchor.java
index 6d0a145fb2..6d0a145fb2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/RespawnAnchor.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/RespawnAnchor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Sapling.java b/paper-api/src/main/java/org/bukkit/block/data/type/Sapling.java
index a4e1c2f4c2..a4e1c2f4c2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Sapling.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Sapling.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Scaffolding.java b/paper-api/src/main/java/org/bukkit/block/data/type/Scaffolding.java
index 1f6859eeee..1f6859eeee 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Scaffolding.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Scaffolding.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkCatalyst.java b/paper-api/src/main/java/org/bukkit/block/data/type/SculkCatalyst.java
index 72adcba38d..72adcba38d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkCatalyst.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SculkCatalyst.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkSensor.java b/paper-api/src/main/java/org/bukkit/block/data/type/SculkSensor.java
index 1af390e2ec..1af390e2ec 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkSensor.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SculkSensor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkShrieker.java b/paper-api/src/main/java/org/bukkit/block/data/type/SculkShrieker.java
index 746fb4c577..746fb4c577 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkShrieker.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SculkShrieker.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkVein.java b/paper-api/src/main/java/org/bukkit/block/data/type/SculkVein.java
index 29b45c81a2..29b45c81a2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SculkVein.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SculkVein.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SeaPickle.java b/paper-api/src/main/java/org/bukkit/block/data/type/SeaPickle.java
index 62013c6afb..62013c6afb 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SeaPickle.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SeaPickle.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Sign.java b/paper-api/src/main/java/org/bukkit/block/data/type/Sign.java
index 29ef2c5bff..29ef2c5bff 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Sign.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Sign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Slab.java b/paper-api/src/main/java/org/bukkit/block/data/type/Slab.java
index cb09c32686..cb09c32686 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Slab.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Slab.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/SmallDripleaf.java b/paper-api/src/main/java/org/bukkit/block/data/type/SmallDripleaf.java
index 988d459c13..988d459c13 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/SmallDripleaf.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/SmallDripleaf.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Snow.java b/paper-api/src/main/java/org/bukkit/block/data/type/Snow.java
index 9c089cff24..9c089cff24 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Snow.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Snow.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Stairs.java b/paper-api/src/main/java/org/bukkit/block/data/type/Stairs.java
index 8bc5539566..8bc5539566 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Stairs.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Stairs.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/StructureBlock.java b/paper-api/src/main/java/org/bukkit/block/data/type/StructureBlock.java
index 3c13a9a561..3c13a9a561 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/StructureBlock.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/StructureBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Switch.java b/paper-api/src/main/java/org/bukkit/block/data/type/Switch.java
index d91a07c7bc..d91a07c7bc 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Switch.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Switch.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TNT.java b/paper-api/src/main/java/org/bukkit/block/data/type/TNT.java
index 7008c20fde..7008c20fde 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TNT.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TNT.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TechnicalPiston.java b/paper-api/src/main/java/org/bukkit/block/data/type/TechnicalPiston.java
index 4c8b6e9be9..4c8b6e9be9 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TechnicalPiston.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TechnicalPiston.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TrapDoor.java b/paper-api/src/main/java/org/bukkit/block/data/type/TrapDoor.java
index 13876b3798..13876b3798 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TrapDoor.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TrapDoor.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TrialSpawner.java b/paper-api/src/main/java/org/bukkit/block/data/type/TrialSpawner.java
index 2a20529067..2a20529067 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TrialSpawner.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TrialSpawner.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Tripwire.java b/paper-api/src/main/java/org/bukkit/block/data/type/Tripwire.java
index 567f6f00f2..567f6f00f2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Tripwire.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Tripwire.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TripwireHook.java b/paper-api/src/main/java/org/bukkit/block/data/type/TripwireHook.java
index 1e450761f6..1e450761f6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TripwireHook.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TripwireHook.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/TurtleEgg.java b/paper-api/src/main/java/org/bukkit/block/data/type/TurtleEgg.java
index 0a1873656d..0a1873656d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/TurtleEgg.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/TurtleEgg.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/Wall.java b/paper-api/src/main/java/org/bukkit/block/data/type/Wall.java
index 2a14ccd108..2a14ccd108 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/Wall.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/Wall.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/WallHangingSign.java b/paper-api/src/main/java/org/bukkit/block/data/type/WallHangingSign.java
index 283b21024d..283b21024d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/WallHangingSign.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/WallHangingSign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/WallSign.java b/paper-api/src/main/java/org/bukkit/block/data/type/WallSign.java
index 66238859d6..66238859d6 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/WallSign.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/WallSign.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/data/type/package-info.java b/paper-api/src/main/java/org/bukkit/block/data/type/package-info.java
index f613bbb497..f613bbb497 100644
--- a/Paper-API/src/main/java/org/bukkit/block/data/type/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/data/type/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/package-info.java b/paper-api/src/main/java/org/bukkit/block/package-info.java
index dc0f36a80b..dc0f36a80b 100644
--- a/Paper-API/src/main/java/org/bukkit/block/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/sign/Side.java b/paper-api/src/main/java/org/bukkit/block/sign/Side.java
index 7774c31341..7774c31341 100644
--- a/Paper-API/src/main/java/org/bukkit/block/sign/Side.java
+++ b/paper-api/src/main/java/org/bukkit/block/sign/Side.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/sign/SignSide.java b/paper-api/src/main/java/org/bukkit/block/sign/SignSide.java
index 575e545a69..575e545a69 100644
--- a/Paper-API/src/main/java/org/bukkit/block/sign/SignSide.java
+++ b/paper-api/src/main/java/org/bukkit/block/sign/SignSide.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/sign/package-info.java b/paper-api/src/main/java/org/bukkit/block/sign/package-info.java
index 5d3cc62204..5d3cc62204 100644
--- a/Paper-API/src/main/java/org/bukkit/block/sign/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/sign/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/spawner/SpawnRule.java b/paper-api/src/main/java/org/bukkit/block/spawner/SpawnRule.java
index c15ce91aae..c15ce91aae 100644
--- a/Paper-API/src/main/java/org/bukkit/block/spawner/SpawnRule.java
+++ b/paper-api/src/main/java/org/bukkit/block/spawner/SpawnRule.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java b/paper-api/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
index 0043276a80..0043276a80 100644
--- a/Paper-API/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
+++ b/paper-api/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/spawner/package-info.java b/paper-api/src/main/java/org/bukkit/block/spawner/package-info.java
index 9a8e768894..9a8e768894 100644
--- a/Paper-API/src/main/java/org/bukkit/block/spawner/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/spawner/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/structure/Mirror.java b/paper-api/src/main/java/org/bukkit/block/structure/Mirror.java
index 86e812a1b2..86e812a1b2 100644
--- a/Paper-API/src/main/java/org/bukkit/block/structure/Mirror.java
+++ b/paper-api/src/main/java/org/bukkit/block/structure/Mirror.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/structure/StructureRotation.java b/paper-api/src/main/java/org/bukkit/block/structure/StructureRotation.java
index 0d0bfca435..0d0bfca435 100644
--- a/Paper-API/src/main/java/org/bukkit/block/structure/StructureRotation.java
+++ b/paper-api/src/main/java/org/bukkit/block/structure/StructureRotation.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/structure/UsageMode.java b/paper-api/src/main/java/org/bukkit/block/structure/UsageMode.java
index 8c6528ca3d..8c6528ca3d 100644
--- a/Paper-API/src/main/java/org/bukkit/block/structure/UsageMode.java
+++ b/paper-api/src/main/java/org/bukkit/block/structure/UsageMode.java
diff --git a/Paper-API/src/main/java/org/bukkit/block/structure/package-info.java b/paper-api/src/main/java/org/bukkit/block/structure/package-info.java
index 3371526578..3371526578 100644
--- a/Paper-API/src/main/java/org/bukkit/block/structure/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/block/structure/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/BarColor.java b/paper-api/src/main/java/org/bukkit/boss/BarColor.java
index e191d9ffe8..e191d9ffe8 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/BarColor.java
+++ b/paper-api/src/main/java/org/bukkit/boss/BarColor.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/BarFlag.java b/paper-api/src/main/java/org/bukkit/boss/BarFlag.java
index 69e02998d0..69e02998d0 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/BarFlag.java
+++ b/paper-api/src/main/java/org/bukkit/boss/BarFlag.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/BarStyle.java b/paper-api/src/main/java/org/bukkit/boss/BarStyle.java
index 3e499eb779..3e499eb779 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/BarStyle.java
+++ b/paper-api/src/main/java/org/bukkit/boss/BarStyle.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/BossBar.java b/paper-api/src/main/java/org/bukkit/boss/BossBar.java
index 70274f2e2a..70274f2e2a 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/BossBar.java
+++ b/paper-api/src/main/java/org/bukkit/boss/BossBar.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/DragonBattle.java b/paper-api/src/main/java/org/bukkit/boss/DragonBattle.java
index 1d2ca775a2..1d2ca775a2 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/DragonBattle.java
+++ b/paper-api/src/main/java/org/bukkit/boss/DragonBattle.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/KeyedBossBar.java b/paper-api/src/main/java/org/bukkit/boss/KeyedBossBar.java
index 6a1fe5f916..6a1fe5f916 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/KeyedBossBar.java
+++ b/paper-api/src/main/java/org/bukkit/boss/KeyedBossBar.java
diff --git a/Paper-API/src/main/java/org/bukkit/boss/package-info.java b/paper-api/src/main/java/org/bukkit/boss/package-info.java
index 07a7e213ae..07a7e213ae 100644
--- a/Paper-API/src/main/java/org/bukkit/boss/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/boss/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/BlockCommandSender.java b/paper-api/src/main/java/org/bukkit/command/BlockCommandSender.java
index b8f2f7ebe4..b8f2f7ebe4 100644
--- a/Paper-API/src/main/java/org/bukkit/command/BlockCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/BlockCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/BufferedCommandSender.java b/paper-api/src/main/java/org/bukkit/command/BufferedCommandSender.java
index f9a00aecca..f9a00aecca 100644
--- a/Paper-API/src/main/java/org/bukkit/command/BufferedCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/BufferedCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/Command.java b/paper-api/src/main/java/org/bukkit/command/Command.java
index b791358f90..b791358f90 100644
--- a/Paper-API/src/main/java/org/bukkit/command/Command.java
+++ b/paper-api/src/main/java/org/bukkit/command/Command.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/CommandException.java b/paper-api/src/main/java/org/bukkit/command/CommandException.java
index b63015f402..b63015f402 100644
--- a/Paper-API/src/main/java/org/bukkit/command/CommandException.java
+++ b/paper-api/src/main/java/org/bukkit/command/CommandException.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/CommandExecutor.java b/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java
index 45cb8da120..45cb8da120 100644
--- a/Paper-API/src/main/java/org/bukkit/command/CommandExecutor.java
+++ b/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/CommandMap.java b/paper-api/src/main/java/org/bukkit/command/CommandMap.java
index 864c263bbd..864c263bbd 100644
--- a/Paper-API/src/main/java/org/bukkit/command/CommandMap.java
+++ b/paper-api/src/main/java/org/bukkit/command/CommandMap.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/CommandSender.java b/paper-api/src/main/java/org/bukkit/command/CommandSender.java
index 04e7cd0e4e..04e7cd0e4e 100644
--- a/Paper-API/src/main/java/org/bukkit/command/CommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/CommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/ConsoleCommandSender.java b/paper-api/src/main/java/org/bukkit/command/ConsoleCommandSender.java
index f309c2ed39..f309c2ed39 100644
--- a/Paper-API/src/main/java/org/bukkit/command/ConsoleCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/ConsoleCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 9d4f553c04..9d4f553c04 100644
--- a/Paper-API/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/MessageCommandSender.java b/paper-api/src/main/java/org/bukkit/command/MessageCommandSender.java
index 9d263ab3af..9d263ab3af 100644
--- a/Paper-API/src/main/java/org/bukkit/command/MessageCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/MessageCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/MultipleCommandAlias.java b/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java
index 8487bfe332..8487bfe332 100644
--- a/Paper-API/src/main/java/org/bukkit/command/MultipleCommandAlias.java
+++ b/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/PluginCommand.java b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java
index 551c5af6a7..551c5af6a7 100644
--- a/Paper-API/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
index ef870b864c..ef870b864c 100644
--- a/Paper-API/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
+++ b/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java b/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java
index d51e0fd604..d51e0fd604 100644
--- a/Paper-API/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/ProxiedCommandSender.java b/paper-api/src/main/java/org/bukkit/command/ProxiedCommandSender.java
index 5c813ac024..5c813ac024 100644
--- a/Paper-API/src/main/java/org/bukkit/command/ProxiedCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/ProxiedCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/RemoteConsoleCommandSender.java b/paper-api/src/main/java/org/bukkit/command/RemoteConsoleCommandSender.java
index 53656a9cbf..53656a9cbf 100644
--- a/Paper-API/src/main/java/org/bukkit/command/RemoteConsoleCommandSender.java
+++ b/paper-api/src/main/java/org/bukkit/command/RemoteConsoleCommandSender.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/SimpleCommandMap.java b/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java
index ac9a28922f..ac9a28922f 100644
--- a/Paper-API/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/TabCompleter.java b/paper-api/src/main/java/org/bukkit/command/TabCompleter.java
index ed6f6525a6..ed6f6525a6 100644
--- a/Paper-API/src/main/java/org/bukkit/command/TabCompleter.java
+++ b/paper-api/src/main/java/org/bukkit/command/TabCompleter.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/TabExecutor.java b/paper-api/src/main/java/org/bukkit/command/TabExecutor.java
index 6b8e3fb2a0..6b8e3fb2a0 100644
--- a/Paper-API/src/main/java/org/bukkit/command/TabExecutor.java
+++ b/paper-api/src/main/java/org/bukkit/command/TabExecutor.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/BukkitCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java
index cb032d038f..cb032d038f 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/BukkitCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/HelpCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/HelpCommand.java
index a1699aa93c..a1699aa93c 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/HelpCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/HelpCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index 4d849e1283..4d849e1283 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index 3ec32b4626..3ec32b4626 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index fd5d9881ab..fd5d9881ab 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/VersionCommand.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/defaults/package-info.java b/paper-api/src/main/java/org/bukkit/command/defaults/package-info.java
index b67dfba0f6..b67dfba0f6 100644
--- a/Paper-API/src/main/java/org/bukkit/command/defaults/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/command/defaults/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/command/package-info.java b/paper-api/src/main/java/org/bukkit/command/package-info.java
index 6428f474a3..6428f474a3 100644
--- a/Paper-API/src/main/java/org/bukkit/command/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/command/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/Configuration.java b/paper-api/src/main/java/org/bukkit/configuration/Configuration.java
index f12a98b1be..f12a98b1be 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/Configuration.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/Configuration.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/ConfigurationOptions.java b/paper-api/src/main/java/org/bukkit/configuration/ConfigurationOptions.java
index 356bad6bc7..356bad6bc7 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/ConfigurationOptions.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/ConfigurationOptions.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/ConfigurationSection.java b/paper-api/src/main/java/org/bukkit/configuration/ConfigurationSection.java
index b6b00af08f..b6b00af08f 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/ConfigurationSection.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/ConfigurationSection.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/InvalidConfigurationException.java b/paper-api/src/main/java/org/bukkit/configuration/InvalidConfigurationException.java
index d23480e59f..d23480e59f 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/InvalidConfigurationException.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/InvalidConfigurationException.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/MemoryConfiguration.java b/paper-api/src/main/java/org/bukkit/configuration/MemoryConfiguration.java
index 2eef233d1e..2eef233d1e 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/MemoryConfiguration.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/MemoryConfiguration.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/MemoryConfigurationOptions.java b/paper-api/src/main/java/org/bukkit/configuration/MemoryConfigurationOptions.java
index ead85f6fae..ead85f6fae 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/MemoryConfigurationOptions.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/MemoryConfigurationOptions.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/MemorySection.java b/paper-api/src/main/java/org/bukkit/configuration/MemorySection.java
index 90751edd74..90751edd74 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/MemorySection.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/MemorySection.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/SectionPathData.java b/paper-api/src/main/java/org/bukkit/configuration/SectionPathData.java
index 54647c817b..54647c817b 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/SectionPathData.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/SectionPathData.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/FileConfiguration.java b/paper-api/src/main/java/org/bukkit/configuration/file/FileConfiguration.java
index 70284de18d..70284de18d 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/FileConfiguration.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/FileConfiguration.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java b/paper-api/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
index 121dbbf163..121dbbf163 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
index 488e493100..488e493100 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
index 5d0ec7436f..5d0ec7436f 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConstructor.java b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConstructor.java
index 6235fe0da8..6235fe0da8 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlConstructor.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/YamlConstructor.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java b/paper-api/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
index 09a85c4af6..09a85c4af6 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/file/package-info.java b/paper-api/src/main/java/org/bukkit/configuration/file/package-info.java
index bbe750ded7..bbe750ded7 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/file/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/file/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/package-info.java b/paper-api/src/main/java/org/bukkit/configuration/package-info.java
index 63a39650b6..63a39650b6 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java b/paper-api/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java
index 177944d4e8..177944d4e8 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerializable.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java b/paper-api/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java
index a6497f4255..a6497f4255 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java b/paper-api/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java
index 1383961161..1383961161 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/serialization/DelegateDeserialization.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java b/paper-api/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java
index 725685ed34..725685ed34 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/serialization/SerializableAs.java
diff --git a/Paper-API/src/main/java/org/bukkit/configuration/serialization/package-info.java b/paper-api/src/main/java/org/bukkit/configuration/serialization/package-info.java
index 529de2e8cc..529de2e8cc 100644
--- a/Paper-API/src/main/java/org/bukkit/configuration/serialization/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/configuration/serialization/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/BooleanPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/BooleanPrompt.java
index 38ed0d4580..38ed0d4580 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/BooleanPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/BooleanPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/Conversable.java b/paper-api/src/main/java/org/bukkit/conversations/Conversable.java
index 0817f2395c..0817f2395c 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/Conversable.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/Conversable.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/Conversation.java b/paper-api/src/main/java/org/bukkit/conversations/Conversation.java
index bf2407c838..bf2407c838 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/Conversation.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/Conversation.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java
index 0d67fe0c00..0d67fe0c00 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationAbandonedEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java
index 451121e7df..451121e7df 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationAbandonedListener.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationCanceller.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationCanceller.java
index bacac14094..bacac14094 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationCanceller.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationCanceller.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationContext.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationContext.java
index 5bc0d36fe2..5bc0d36fe2 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationContext.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationContext.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationFactory.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationFactory.java
index 58009e1e7a..58009e1e7a 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationFactory.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationFactory.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ConversationPrefix.java b/paper-api/src/main/java/org/bukkit/conversations/ConversationPrefix.java
index 0c65f3365c..0c65f3365c 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ConversationPrefix.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ConversationPrefix.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ExactMatchConversationCanceller.java b/paper-api/src/main/java/org/bukkit/conversations/ExactMatchConversationCanceller.java
index 6b54ee877a..6b54ee877a 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ExactMatchConversationCanceller.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ExactMatchConversationCanceller.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/FixedSetPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/FixedSetPrompt.java
index df92081ad2..df92081ad2 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/FixedSetPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/FixedSetPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java b/paper-api/src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java
index fd8daa0206..fd8daa0206 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ManuallyAbandonedConversationCanceller.java b/paper-api/src/main/java/org/bukkit/conversations/ManuallyAbandonedConversationCanceller.java
index 0a289564a5..0a289564a5 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ManuallyAbandonedConversationCanceller.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ManuallyAbandonedConversationCanceller.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/MessagePrompt.java b/paper-api/src/main/java/org/bukkit/conversations/MessagePrompt.java
index e066166e5d..e066166e5d 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/MessagePrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/MessagePrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/NullConversationPrefix.java b/paper-api/src/main/java/org/bukkit/conversations/NullConversationPrefix.java
index 6ee8ebb1e5..6ee8ebb1e5 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/NullConversationPrefix.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/NullConversationPrefix.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/NumericPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/NumericPrompt.java
index 67134fa384..67134fa384 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/NumericPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/NumericPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/PlayerNamePrompt.java b/paper-api/src/main/java/org/bukkit/conversations/PlayerNamePrompt.java
index 86d51c488e..86d51c488e 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/PlayerNamePrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/PlayerNamePrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/PluginNameConversationPrefix.java b/paper-api/src/main/java/org/bukkit/conversations/PluginNameConversationPrefix.java
index 5911944fe2..5911944fe2 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/PluginNameConversationPrefix.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/PluginNameConversationPrefix.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/Prompt.java b/paper-api/src/main/java/org/bukkit/conversations/Prompt.java
index fcca208c0f..fcca208c0f 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/Prompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/Prompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/RegexPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/RegexPrompt.java
index 6b3f1e4591..6b3f1e4591 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/RegexPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/RegexPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/StringPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/StringPrompt.java
index f9b86d6d5b..f9b86d6d5b 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/StringPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/StringPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/ValidatingPrompt.java b/paper-api/src/main/java/org/bukkit/conversations/ValidatingPrompt.java
index c57b6cb479..c57b6cb479 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/ValidatingPrompt.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/ValidatingPrompt.java
diff --git a/Paper-API/src/main/java/org/bukkit/conversations/package-info.java b/paper-api/src/main/java/org/bukkit/conversations/package-info.java
index d49dafaf00..d49dafaf00 100644
--- a/Paper-API/src/main/java/org/bukkit/conversations/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/conversations/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/enchantments/Enchantment.java b/paper-api/src/main/java/org/bukkit/enchantments/Enchantment.java
index d50d4c3121..d50d4c3121 100644
--- a/Paper-API/src/main/java/org/bukkit/enchantments/Enchantment.java
+++ b/paper-api/src/main/java/org/bukkit/enchantments/Enchantment.java
diff --git a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentOffer.java b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentOffer.java
index 8111acaa1a..8111acaa1a 100644
--- a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentOffer.java
+++ b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentOffer.java
diff --git a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
index 455ff52d90..455ff52d90 100644
--- a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
+++ b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
diff --git a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
index da5d153a3e..da5d153a3e 100644
--- a/Paper-API/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
+++ b/paper-api/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
diff --git a/Paper-API/src/main/java/org/bukkit/enchantments/package-info.java b/paper-api/src/main/java/org/bukkit/enchantments/package-info.java
index fb67cc7e60..fb67cc7e60 100644
--- a/Paper-API/src/main/java/org/bukkit/enchantments/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/enchantments/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AbstractArrow.java b/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java
index d173010d51..d173010d51 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AbstractArrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractArrow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AbstractHorse.java b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
index 8b1048c94d..8b1048c94d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AbstractHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AbstractSkeleton.java b/paper-api/src/main/java/org/bukkit/entity/AbstractSkeleton.java
index 504fd761e5..504fd761e5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AbstractSkeleton.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractSkeleton.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AbstractVillager.java b/paper-api/src/main/java/org/bukkit/entity/AbstractVillager.java
index 7fbe31c4fd..7fbe31c4fd 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AbstractVillager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractVillager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Ageable.java b/paper-api/src/main/java/org/bukkit/entity/Ageable.java
index 82b80a96bd..82b80a96bd 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Ageable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Ageable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Allay.java b/paper-api/src/main/java/org/bukkit/entity/Allay.java
index e5e79202b9..e5e79202b9 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Allay.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Allay.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Ambient.java b/paper-api/src/main/java/org/bukkit/entity/Ambient.java
index 613830a74f..613830a74f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Ambient.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Ambient.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AnimalTamer.java b/paper-api/src/main/java/org/bukkit/entity/AnimalTamer.java
index 2e17b2d4f7..2e17b2d4f7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AnimalTamer.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AnimalTamer.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Animals.java b/paper-api/src/main/java/org/bukkit/entity/Animals.java
index 235f4023b8..235f4023b8 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Animals.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Animals.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java
index fc59d6d4c2..fc59d6d4c2 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/AreaEffectCloud.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ArmorStand.java b/paper-api/src/main/java/org/bukkit/entity/ArmorStand.java
index 7530eb5d2a..7530eb5d2a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ArmorStand.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Arrow.java b/paper-api/src/main/java/org/bukkit/entity/Arrow.java
index 8e57082e8b..8e57082e8b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Arrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Arrow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Axolotl.java b/paper-api/src/main/java/org/bukkit/entity/Axolotl.java
index c8c738b1b7..c8c738b1b7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Axolotl.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Axolotl.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Bat.java b/paper-api/src/main/java/org/bukkit/entity/Bat.java
index b9f8b14d90..b9f8b14d90 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Bat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Bat.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Bee.java b/paper-api/src/main/java/org/bukkit/entity/Bee.java
index 1f6702b0de..1f6702b0de 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Bee.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Bee.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Blaze.java b/paper-api/src/main/java/org/bukkit/entity/Blaze.java
index 7a5505b7fa..7a5505b7fa 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Blaze.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Blaze.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/BlockDisplay.java b/paper-api/src/main/java/org/bukkit/entity/BlockDisplay.java
index bc478623f0..bc478623f0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/BlockDisplay.java
+++ b/paper-api/src/main/java/org/bukkit/entity/BlockDisplay.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Boat.java b/paper-api/src/main/java/org/bukkit/entity/Boat.java
index 2ac685fb18..2ac685fb18 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Boat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Boat.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Boss.java b/paper-api/src/main/java/org/bukkit/entity/Boss.java
index ba459279c6..ba459279c6 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Boss.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Boss.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Breedable.java b/paper-api/src/main/java/org/bukkit/entity/Breedable.java
index 0cf8ce4978..0cf8ce4978 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Breedable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Breedable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Breeze.java b/paper-api/src/main/java/org/bukkit/entity/Breeze.java
index 03d9e1f5b1..03d9e1f5b1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Breeze.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Breeze.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Camel.java b/paper-api/src/main/java/org/bukkit/entity/Camel.java
index 17e4e0a822..17e4e0a822 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Camel.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Camel.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Cat.java b/paper-api/src/main/java/org/bukkit/entity/Cat.java
index 4ea1027c85..4ea1027c85 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Cat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cat.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/CaveSpider.java b/paper-api/src/main/java/org/bukkit/entity/CaveSpider.java
index 9c3764699b..9c3764699b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/CaveSpider.java
+++ b/paper-api/src/main/java/org/bukkit/entity/CaveSpider.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ChestBoat.java b/paper-api/src/main/java/org/bukkit/entity/ChestBoat.java
index 4ebe1033c5..4ebe1033c5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ChestBoat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ChestBoat.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ChestedHorse.java b/paper-api/src/main/java/org/bukkit/entity/ChestedHorse.java
index 24780af641..24780af641 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ChestedHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ChestedHorse.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Chicken.java b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
index b4c1a26260..b4c1a26260 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Chicken.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Cod.java b/paper-api/src/main/java/org/bukkit/entity/Cod.java
index 8de09075e1..8de09075e1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Cod.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cod.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ComplexEntityPart.java b/paper-api/src/main/java/org/bukkit/entity/ComplexEntityPart.java
index 937f53499a..937f53499a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ComplexEntityPart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ComplexEntityPart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ComplexLivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/ComplexLivingEntity.java
index 2151e3bac0..2151e3bac0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ComplexLivingEntity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ComplexLivingEntity.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Cow.java b/paper-api/src/main/java/org/bukkit/entity/Cow.java
index cd4ed4de01..cd4ed4de01 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Cow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Creature.java b/paper-api/src/main/java/org/bukkit/entity/Creature.java
index 6c9c5e85ea..6c9c5e85ea 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Creature.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Creature.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Creeper.java b/paper-api/src/main/java/org/bukkit/entity/Creeper.java
index e144f61870..e144f61870 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Creeper.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Creeper.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Damageable.java b/paper-api/src/main/java/org/bukkit/entity/Damageable.java
index fc4d3bcd9b..fc4d3bcd9b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Damageable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Damageable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Display.java b/paper-api/src/main/java/org/bukkit/entity/Display.java
index 2b6f0c627a..2b6f0c627a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Display.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Display.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Dolphin.java b/paper-api/src/main/java/org/bukkit/entity/Dolphin.java
index 8ab329946d..8ab329946d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Dolphin.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Dolphin.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Donkey.java b/paper-api/src/main/java/org/bukkit/entity/Donkey.java
index b554e33097..b554e33097 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Donkey.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Donkey.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/DragonFireball.java b/paper-api/src/main/java/org/bukkit/entity/DragonFireball.java
index 6c475a3723..6c475a3723 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/DragonFireball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/DragonFireball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Drowned.java b/paper-api/src/main/java/org/bukkit/entity/Drowned.java
index 8d1ad9ef75..8d1ad9ef75 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Drowned.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Drowned.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Egg.java b/paper-api/src/main/java/org/bukkit/entity/Egg.java
index 2713bee68f..2713bee68f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Egg.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Egg.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ElderGuardian.java b/paper-api/src/main/java/org/bukkit/entity/ElderGuardian.java
index 5ca1d4c9f2..5ca1d4c9f2 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ElderGuardian.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ElderGuardian.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EnderCrystal.java b/paper-api/src/main/java/org/bukkit/entity/EnderCrystal.java
index febc7b3f4c..febc7b3f4c 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EnderCrystal.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EnderCrystal.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EnderDragon.java b/paper-api/src/main/java/org/bukkit/entity/EnderDragon.java
index 68f58c40a5..68f58c40a5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EnderDragon.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EnderDragon.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EnderDragonPart.java b/paper-api/src/main/java/org/bukkit/entity/EnderDragonPart.java
index d0ac89bab1..d0ac89bab1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EnderDragonPart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EnderDragonPart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EnderPearl.java b/paper-api/src/main/java/org/bukkit/entity/EnderPearl.java
index aae65bbba5..aae65bbba5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EnderPearl.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EnderPearl.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EnderSignal.java b/paper-api/src/main/java/org/bukkit/entity/EnderSignal.java
index c8c74651e1..c8c74651e1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EnderSignal.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EnderSignal.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Enderman.java b/paper-api/src/main/java/org/bukkit/entity/Enderman.java
index b8ad718dbc..b8ad718dbc 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Enderman.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Enderman.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Endermite.java b/paper-api/src/main/java/org/bukkit/entity/Endermite.java
index 138d2530de..138d2530de 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Endermite.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Endermite.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Enemy.java b/paper-api/src/main/java/org/bukkit/entity/Enemy.java
index 434fd8d677..434fd8d677 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Enemy.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Enemy.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index 1d0fd7ff84..1d0fd7ff84 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EntityCategory.java b/paper-api/src/main/java/org/bukkit/entity/EntityCategory.java
index fd960f20c7..fd960f20c7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EntityCategory.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntityCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EntitySnapshot.java b/paper-api/src/main/java/org/bukkit/entity/EntitySnapshot.java
index 6f34486ab1..6f34486ab1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EntitySnapshot.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntitySnapshot.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EntityType.java b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
index 4aaf268f58..4aaf268f58 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EntityType.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Evoker.java b/paper-api/src/main/java/org/bukkit/entity/Evoker.java
index 76f81cd124..76f81cd124 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Evoker.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Evoker.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/EvokerFangs.java b/paper-api/src/main/java/org/bukkit/entity/EvokerFangs.java
index 7d5f9ccbd1..7d5f9ccbd1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/EvokerFangs.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EvokerFangs.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ExperienceOrb.java b/paper-api/src/main/java/org/bukkit/entity/ExperienceOrb.java
index dec70bbfaf..dec70bbfaf 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ExperienceOrb.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ExperienceOrb.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Explosive.java b/paper-api/src/main/java/org/bukkit/entity/Explosive.java
index 48650f6ab8..48650f6ab8 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Explosive.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Explosive.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/FallingBlock.java b/paper-api/src/main/java/org/bukkit/entity/FallingBlock.java
index a945e76dd6..a945e76dd6 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/paper-api/src/main/java/org/bukkit/entity/FallingBlock.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Fireball.java b/paper-api/src/main/java/org/bukkit/entity/Fireball.java
index 7a44707f23..7a44707f23 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Fireball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Fireball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Firework.java b/paper-api/src/main/java/org/bukkit/entity/Firework.java
index 217d348ad0..217d348ad0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Firework.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Firework.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Fish.java b/paper-api/src/main/java/org/bukkit/entity/Fish.java
index 86da8dc401..86da8dc401 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Fish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Fish.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/FishHook.java b/paper-api/src/main/java/org/bukkit/entity/FishHook.java
index 6ed83d3e4d..6ed83d3e4d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/FishHook.java
+++ b/paper-api/src/main/java/org/bukkit/entity/FishHook.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Flying.java b/paper-api/src/main/java/org/bukkit/entity/Flying.java
index 580ce18bf4..580ce18bf4 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Flying.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Flying.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Fox.java b/paper-api/src/main/java/org/bukkit/entity/Fox.java
index 473a7e36ad..473a7e36ad 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Fox.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Fox.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Frog.java b/paper-api/src/main/java/org/bukkit/entity/Frog.java
index 0960bdbb32..0960bdbb32 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Frog.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Frog.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Ghast.java b/paper-api/src/main/java/org/bukkit/entity/Ghast.java
index 9c618a27d5..9c618a27d5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Ghast.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Ghast.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Giant.java b/paper-api/src/main/java/org/bukkit/entity/Giant.java
index 610de5779c..610de5779c 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Giant.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Giant.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/GlowItemFrame.java b/paper-api/src/main/java/org/bukkit/entity/GlowItemFrame.java
index 749803e603..749803e603 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/GlowItemFrame.java
+++ b/paper-api/src/main/java/org/bukkit/entity/GlowItemFrame.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/GlowSquid.java b/paper-api/src/main/java/org/bukkit/entity/GlowSquid.java
index fc80cb3da7..fc80cb3da7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/GlowSquid.java
+++ b/paper-api/src/main/java/org/bukkit/entity/GlowSquid.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Goat.java b/paper-api/src/main/java/org/bukkit/entity/Goat.java
index 18e48bbb04..18e48bbb04 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Goat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Goat.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Golem.java b/paper-api/src/main/java/org/bukkit/entity/Golem.java
index 4b43c36316..4b43c36316 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Golem.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Golem.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Guardian.java b/paper-api/src/main/java/org/bukkit/entity/Guardian.java
index 1e7d997dc5..1e7d997dc5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Guardian.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Guardian.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Hanging.java b/paper-api/src/main/java/org/bukkit/entity/Hanging.java
index 2f07efac03..2f07efac03 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Hanging.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Hanging.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Hoglin.java b/paper-api/src/main/java/org/bukkit/entity/Hoglin.java
index 452a8e73fa..452a8e73fa 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Hoglin.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Hoglin.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Horse.java b/paper-api/src/main/java/org/bukkit/entity/Horse.java
index 48453875e6..48453875e6 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Horse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Horse.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/HumanEntity.java b/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
index 8b0d04d5b3..8b0d04d5b3 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Husk.java b/paper-api/src/main/java/org/bukkit/entity/Husk.java
index 85ada1c670..85ada1c670 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Husk.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Husk.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Illager.java b/paper-api/src/main/java/org/bukkit/entity/Illager.java
index a288dfa262..a288dfa262 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Illager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Illager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Illusioner.java b/paper-api/src/main/java/org/bukkit/entity/Illusioner.java
index 14e6c5ee06..14e6c5ee06 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Illusioner.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Illusioner.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Interaction.java b/paper-api/src/main/java/org/bukkit/entity/Interaction.java
index 37fda1dc2d..37fda1dc2d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Interaction.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Interaction.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/IronGolem.java b/paper-api/src/main/java/org/bukkit/entity/IronGolem.java
index 655e37cb3a..655e37cb3a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/IronGolem.java
+++ b/paper-api/src/main/java/org/bukkit/entity/IronGolem.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Item.java b/paper-api/src/main/java/org/bukkit/entity/Item.java
index 58017fce43..58017fce43 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Item.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Item.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ItemDisplay.java b/paper-api/src/main/java/org/bukkit/entity/ItemDisplay.java
index bd718c1cf6..bd718c1cf6 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ItemDisplay.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ItemDisplay.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ItemFrame.java b/paper-api/src/main/java/org/bukkit/entity/ItemFrame.java
index c275b881cb..c275b881cb 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ItemFrame.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ItemFrame.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LargeFireball.java b/paper-api/src/main/java/org/bukkit/entity/LargeFireball.java
index b5f3cc9de7..b5f3cc9de7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LargeFireball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LargeFireball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LeashHitch.java b/paper-api/src/main/java/org/bukkit/entity/LeashHitch.java
index 9ac04c182a..9ac04c182a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LeashHitch.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LeashHitch.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LightningStrike.java b/paper-api/src/main/java/org/bukkit/entity/LightningStrike.java
index 0b9e02bb88..0b9e02bb88 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LightningStrike.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LingeringPotion.java b/paper-api/src/main/java/org/bukkit/entity/LingeringPotion.java
index f50aaddf85..f50aaddf85 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LingeringPotion.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LingeringPotion.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
index a599ed2795..a599ed2795 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Llama.java b/paper-api/src/main/java/org/bukkit/entity/Llama.java
index bc84b892ca..bc84b892ca 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Llama.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Llama.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/LlamaSpit.java b/paper-api/src/main/java/org/bukkit/entity/LlamaSpit.java
index 9890dffe73..9890dffe73 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/LlamaSpit.java
+++ b/paper-api/src/main/java/org/bukkit/entity/LlamaSpit.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/MagmaCube.java b/paper-api/src/main/java/org/bukkit/entity/MagmaCube.java
index 714b4426da..714b4426da 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/MagmaCube.java
+++ b/paper-api/src/main/java/org/bukkit/entity/MagmaCube.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Marker.java b/paper-api/src/main/java/org/bukkit/entity/Marker.java
index 5591013a70..5591013a70 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Marker.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Marker.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Minecart.java b/paper-api/src/main/java/org/bukkit/entity/Minecart.java
index bc1e62759c..bc1e62759c 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Minecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Minecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Mob.java b/paper-api/src/main/java/org/bukkit/entity/Mob.java
index 30ef0c20df..30ef0c20df 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Mob.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Mob.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Monster.java b/paper-api/src/main/java/org/bukkit/entity/Monster.java
index cc0dfcbadf..cc0dfcbadf 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Monster.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Monster.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Mule.java b/paper-api/src/main/java/org/bukkit/entity/Mule.java
index 4f5efb36b0..4f5efb36b0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Mule.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Mule.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/MushroomCow.java b/paper-api/src/main/java/org/bukkit/entity/MushroomCow.java
index a6020bf1e9..a6020bf1e9 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/MushroomCow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/MushroomCow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/NPC.java b/paper-api/src/main/java/org/bukkit/entity/NPC.java
index 0c6b175b5e..0c6b175b5e 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/NPC.java
+++ b/paper-api/src/main/java/org/bukkit/entity/NPC.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Ocelot.java b/paper-api/src/main/java/org/bukkit/entity/Ocelot.java
index 35f970ca47..35f970ca47 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Ocelot.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Ocelot.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Painting.java b/paper-api/src/main/java/org/bukkit/entity/Painting.java
index 19e9582017..19e9582017 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Painting.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Painting.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Panda.java b/paper-api/src/main/java/org/bukkit/entity/Panda.java
index aa5686df13..aa5686df13 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Panda.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Panda.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Parrot.java b/paper-api/src/main/java/org/bukkit/entity/Parrot.java
index c545a025c2..c545a025c2 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Parrot.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Parrot.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Phantom.java b/paper-api/src/main/java/org/bukkit/entity/Phantom.java
index 2fe8e8868f..2fe8e8868f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Phantom.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Phantom.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Pig.java b/paper-api/src/main/java/org/bukkit/entity/Pig.java
index cb02837157..cb02837157 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Pig.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Pig.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/PigZombie.java b/paper-api/src/main/java/org/bukkit/entity/PigZombie.java
index b2ec535bb1..b2ec535bb1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/PigZombie.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PigZombie.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Piglin.java b/paper-api/src/main/java/org/bukkit/entity/Piglin.java
index eb0b7c18c1..eb0b7c18c1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Piglin.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Piglin.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/PiglinAbstract.java b/paper-api/src/main/java/org/bukkit/entity/PiglinAbstract.java
index eb2d6db815..eb2d6db815 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/PiglinAbstract.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PiglinAbstract.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/PiglinBrute.java b/paper-api/src/main/java/org/bukkit/entity/PiglinBrute.java
index e230c17524..e230c17524 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/PiglinBrute.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PiglinBrute.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Pillager.java b/paper-api/src/main/java/org/bukkit/entity/Pillager.java
index 11f38187fc..11f38187fc 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Pillager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Pillager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index ec937534f0..ec937534f0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/PolarBear.java b/paper-api/src/main/java/org/bukkit/entity/PolarBear.java
index 4e526ba6aa..4e526ba6aa 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/PolarBear.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PolarBear.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Pose.java b/paper-api/src/main/java/org/bukkit/entity/Pose.java
index d5e3384458..d5e3384458 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Pose.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Pose.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Projectile.java b/paper-api/src/main/java/org/bukkit/entity/Projectile.java
index c3933fb5cd..c3933fb5cd 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Projectile.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Projectile.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/PufferFish.java b/paper-api/src/main/java/org/bukkit/entity/PufferFish.java
index 2d26c19b53..2d26c19b53 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/PufferFish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/PufferFish.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Rabbit.java b/paper-api/src/main/java/org/bukkit/entity/Rabbit.java
index 979062aa47..979062aa47 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Rabbit.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Rabbit.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Raider.java b/paper-api/src/main/java/org/bukkit/entity/Raider.java
index 9f8c5a388b..9f8c5a388b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Raider.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Raider.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Ravager.java b/paper-api/src/main/java/org/bukkit/entity/Ravager.java
index 0eb7214472..0eb7214472 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Ravager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Ravager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Salmon.java b/paper-api/src/main/java/org/bukkit/entity/Salmon.java
index 1e839b2471..1e839b2471 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Salmon.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Salmon.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Sheep.java b/paper-api/src/main/java/org/bukkit/entity/Sheep.java
index 97388d46ce..97388d46ce 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Sheep.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Sheep.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Shulker.java b/paper-api/src/main/java/org/bukkit/entity/Shulker.java
index 4816e6956e..4816e6956e 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Shulker.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Shulker.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ShulkerBullet.java b/paper-api/src/main/java/org/bukkit/entity/ShulkerBullet.java
index dd69a68d1f..dd69a68d1f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ShulkerBullet.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ShulkerBullet.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Silverfish.java b/paper-api/src/main/java/org/bukkit/entity/Silverfish.java
index fe01007fbe..fe01007fbe 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Silverfish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Silverfish.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Sittable.java b/paper-api/src/main/java/org/bukkit/entity/Sittable.java
index ea6ee26fc4..ea6ee26fc4 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Sittable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Sittable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SizedFireball.java b/paper-api/src/main/java/org/bukkit/entity/SizedFireball.java
index 976739f8c7..976739f8c7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SizedFireball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SizedFireball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Skeleton.java b/paper-api/src/main/java/org/bukkit/entity/Skeleton.java
index c61eba5f40..c61eba5f40 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Skeleton.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Skeleton.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SkeletonHorse.java b/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java
index 38539d5b77..38539d5b77 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SkeletonHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Slime.java b/paper-api/src/main/java/org/bukkit/entity/Slime.java
index 335b92e7be..335b92e7be 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Slime.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Slime.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SmallFireball.java b/paper-api/src/main/java/org/bukkit/entity/SmallFireball.java
index 8c051c84e3..8c051c84e3 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SmallFireball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SmallFireball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Sniffer.java b/paper-api/src/main/java/org/bukkit/entity/Sniffer.java
index 15a0a733b0..15a0a733b0 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Sniffer.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Sniffer.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Snowball.java b/paper-api/src/main/java/org/bukkit/entity/Snowball.java
index 102a5df62d..102a5df62d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Snowball.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Snowball.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Snowman.java b/paper-api/src/main/java/org/bukkit/entity/Snowman.java
index 7fbfdb0758..7fbfdb0758 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Snowman.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Snowman.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SpawnCategory.java b/paper-api/src/main/java/org/bukkit/entity/SpawnCategory.java
index b1a0de5166..b1a0de5166 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SpawnCategory.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SpawnCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SpectralArrow.java b/paper-api/src/main/java/org/bukkit/entity/SpectralArrow.java
index b02ec168b5..b02ec168b5 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SpectralArrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SpectralArrow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Spellcaster.java b/paper-api/src/main/java/org/bukkit/entity/Spellcaster.java
index d5c107d4f3..d5c107d4f3 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Spellcaster.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Spellcaster.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Spider.java b/paper-api/src/main/java/org/bukkit/entity/Spider.java
index f9ee8cc75a..f9ee8cc75a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Spider.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Spider.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/SplashPotion.java b/paper-api/src/main/java/org/bukkit/entity/SplashPotion.java
index c0fcfccdf4..c0fcfccdf4 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/SplashPotion.java
+++ b/paper-api/src/main/java/org/bukkit/entity/SplashPotion.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Squid.java b/paper-api/src/main/java/org/bukkit/entity/Squid.java
index fb47968ef9..fb47968ef9 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Squid.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Squid.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Steerable.java b/paper-api/src/main/java/org/bukkit/entity/Steerable.java
index da77a7188b..da77a7188b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Steerable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Steerable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Stray.java b/paper-api/src/main/java/org/bukkit/entity/Stray.java
index a1427e585b..a1427e585b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Stray.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Stray.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Strider.java b/paper-api/src/main/java/org/bukkit/entity/Strider.java
index e84baaf95e..e84baaf95e 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Strider.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Strider.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/TNTPrimed.java b/paper-api/src/main/java/org/bukkit/entity/TNTPrimed.java
index 0813bd913c..0813bd913c 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TNTPrimed.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Tadpole.java b/paper-api/src/main/java/org/bukkit/entity/Tadpole.java
index 8e097ad55d..8e097ad55d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Tadpole.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Tadpole.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Tameable.java b/paper-api/src/main/java/org/bukkit/entity/Tameable.java
index 65e68da98a..65e68da98a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Tameable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Tameable.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/TextDisplay.java b/paper-api/src/main/java/org/bukkit/entity/TextDisplay.java
index 8abc129f59..8abc129f59 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/TextDisplay.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TextDisplay.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ThrowableProjectile.java b/paper-api/src/main/java/org/bukkit/entity/ThrowableProjectile.java
index ceb3e2c511..ceb3e2c511 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ThrowableProjectile.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ThrowableProjectile.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ThrownExpBottle.java b/paper-api/src/main/java/org/bukkit/entity/ThrownExpBottle.java
index 3653efe3d9..3653efe3d9 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ThrownExpBottle.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ThrownExpBottle.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ThrownPotion.java b/paper-api/src/main/java/org/bukkit/entity/ThrownPotion.java
index 225ac31261..225ac31261 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ThrownPotion.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ThrownPotion.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/TippedArrow.java b/paper-api/src/main/java/org/bukkit/entity/TippedArrow.java
index 3193cc8a04..3193cc8a04 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/TippedArrow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TippedArrow.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/TraderLlama.java b/paper-api/src/main/java/org/bukkit/entity/TraderLlama.java
index 8900bc8081..8900bc8081 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/TraderLlama.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TraderLlama.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Trident.java b/paper-api/src/main/java/org/bukkit/entity/Trident.java
index d21df39cee..d21df39cee 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Trident.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Trident.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/TropicalFish.java b/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
index 84bba32e80..84bba32e80 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/TropicalFish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Turtle.java b/paper-api/src/main/java/org/bukkit/entity/Turtle.java
index aa83615a0c..aa83615a0c 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Turtle.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Turtle.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Vehicle.java b/paper-api/src/main/java/org/bukkit/entity/Vehicle.java
index 6e9b441c40..6e9b441c40 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Vehicle.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Vehicle.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Vex.java b/paper-api/src/main/java/org/bukkit/entity/Vex.java
index 3c447d2300..3c447d2300 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Vex.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Vex.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Villager.java b/paper-api/src/main/java/org/bukkit/entity/Villager.java
index 3bc24457d1..3bc24457d1 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Villager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Villager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Vindicator.java b/paper-api/src/main/java/org/bukkit/entity/Vindicator.java
index 1022ba8cd8..1022ba8cd8 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Vindicator.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Vindicator.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/WanderingTrader.java b/paper-api/src/main/java/org/bukkit/entity/WanderingTrader.java
index 9f25774659..9f25774659 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/WanderingTrader.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WanderingTrader.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Warden.java b/paper-api/src/main/java/org/bukkit/entity/Warden.java
index efaa45f41b..efaa45f41b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Warden.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Warden.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/WaterMob.java b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
index 62b4e89d05..62b4e89d05 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/WaterMob.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/WindCharge.java b/paper-api/src/main/java/org/bukkit/entity/WindCharge.java
index 586137908f..586137908f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/WindCharge.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WindCharge.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Witch.java b/paper-api/src/main/java/org/bukkit/entity/Witch.java
index 4badeafe2f..4badeafe2f 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Witch.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Witch.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Wither.java b/paper-api/src/main/java/org/bukkit/entity/Wither.java
index 14543c2238..14543c2238 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Wither.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Wither.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/WitherSkeleton.java b/paper-api/src/main/java/org/bukkit/entity/WitherSkeleton.java
index 78971bffe2..78971bffe2 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/WitherSkeleton.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WitherSkeleton.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/WitherSkull.java b/paper-api/src/main/java/org/bukkit/entity/WitherSkull.java
index 33d20abc04..33d20abc04 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/WitherSkull.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WitherSkull.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Wolf.java b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
index 84db38388b..84db38388b 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Wolf.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Zoglin.java b/paper-api/src/main/java/org/bukkit/entity/Zoglin.java
index ebf4ffac77..ebf4ffac77 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Zoglin.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Zoglin.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/Zombie.java b/paper-api/src/main/java/org/bukkit/entity/Zombie.java
index 93de95f68a..93de95f68a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/Zombie.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Zombie.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ZombieHorse.java b/paper-api/src/main/java/org/bukkit/entity/ZombieHorse.java
index 4179b68bdb..4179b68bdb 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ZombieHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ZombieHorse.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/ZombieVillager.java b/paper-api/src/main/java/org/bukkit/entity/ZombieVillager.java
index ad2eaee347..ad2eaee347 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/ZombieVillager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/ZombieVillager.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
index 8f601e85df..8f601e85df 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/memory/MemoryKey.java
+++ b/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/memory/package-info.java b/paper-api/src/main/java/org/bukkit/entity/memory/package-info.java
index 58887a4d29..58887a4d29 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/memory/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/entity/memory/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
index 6a6021ad3a..6a6021ad3a 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/ExplosiveMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/ExplosiveMinecart.java
index 8636fe6c4d..8636fe6c4d 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/ExplosiveMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/ExplosiveMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
index 304b05aeae..304b05aeae 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/PoweredMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/PoweredMinecart.java
index b95df59f78..b95df59f78 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/PoweredMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/PoweredMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/RideableMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/RideableMinecart.java
index 1b82645735..1b82645735 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/RideableMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/RideableMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/SpawnerMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/SpawnerMinecart.java
index 0ce3592ec7..0ce3592ec7 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/SpawnerMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/SpawnerMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/paper-api/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
index 238d118f77..238d118f77 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/minecart/package-info.java b/paper-api/src/main/java/org/bukkit/entity/minecart/package-info.java
index 342f10bac9..342f10bac9 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/minecart/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/entity/minecart/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/entity/package-info.java b/paper-api/src/main/java/org/bukkit/entity/package-info.java
index 167a830d3e..167a830d3e 100644
--- a/Paper-API/src/main/java/org/bukkit/entity/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/entity/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/Cancellable.java b/paper-api/src/main/java/org/bukkit/event/Cancellable.java
index 9e836d3087..9e836d3087 100644
--- a/Paper-API/src/main/java/org/bukkit/event/Cancellable.java
+++ b/paper-api/src/main/java/org/bukkit/event/Cancellable.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/Event.java b/paper-api/src/main/java/org/bukkit/event/Event.java
index 8ec56cd6b8..8ec56cd6b8 100644
--- a/Paper-API/src/main/java/org/bukkit/event/Event.java
+++ b/paper-api/src/main/java/org/bukkit/event/Event.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/EventException.java b/paper-api/src/main/java/org/bukkit/event/EventException.java
index 84638e8525..84638e8525 100644
--- a/Paper-API/src/main/java/org/bukkit/event/EventException.java
+++ b/paper-api/src/main/java/org/bukkit/event/EventException.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/EventHandler.java b/paper-api/src/main/java/org/bukkit/event/EventHandler.java
index cc06f480b7..cc06f480b7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/EventHandler.java
+++ b/paper-api/src/main/java/org/bukkit/event/EventHandler.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/EventPriority.java b/paper-api/src/main/java/org/bukkit/event/EventPriority.java
index 376c5375df..376c5375df 100644
--- a/Paper-API/src/main/java/org/bukkit/event/EventPriority.java
+++ b/paper-api/src/main/java/org/bukkit/event/EventPriority.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/HandlerList.java b/paper-api/src/main/java/org/bukkit/event/HandlerList.java
index 2292bd460c..2292bd460c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/HandlerList.java
+++ b/paper-api/src/main/java/org/bukkit/event/HandlerList.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/Listener.java b/paper-api/src/main/java/org/bukkit/event/Listener.java
index ff083e62da..ff083e62da 100644
--- a/Paper-API/src/main/java/org/bukkit/event/Listener.java
+++ b/paper-api/src/main/java/org/bukkit/event/Listener.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/Action.java b/paper-api/src/main/java/org/bukkit/event/block/Action.java
index f0b672bbfc..f0b672bbfc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/Action.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/Action.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BellResonateEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BellResonateEvent.java
index df76314cd4..df76314cd4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BellResonateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BellResonateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BellRingEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BellRingEvent.java
index 34a6a03826..34a6a03826 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BellRingEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BellRingEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockBreakEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
index 691733a642..691733a642 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockBreakEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockBurnEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
index c0c38df368..c0c38df368 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockBurnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
index 08d09c2a92..08d09c2a92 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockCookEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockCookEvent.java
index a3f1c9cb36..a3f1c9cb36 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockCookEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockCookEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockDamageAbortEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDamageAbortEvent.java
index edc204b50e..edc204b50e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockDamageAbortEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockDamageAbortEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
index 392cde07d5..392cde07d5 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockDispenseArmorEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDispenseArmorEvent.java
index 57b831979c..57b831979c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockDispenseArmorEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockDispenseArmorEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
index 14d1eb5d93..14d1eb5d93 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockDispenseEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
index 3dd4bd38e7..3dd4bd38e7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java
index 62a4d13453..62a4d13453 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockExpEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockExpEvent.java
index 21b9026552..21b9026552 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockExpEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockExpEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
index 7dcbb75170..7dcbb75170 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockFadeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
index 362643de40..362643de40 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockFadeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java
index 695309b4b7..695309b4b7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockFertilizeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockFormEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFormEvent.java
index 0106780414..0106780414 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockFormEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockFormEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockFromToEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
index 1af3928056..1af3928056 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockGrowEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockGrowEvent.java
index 73d5375d2f..73d5375d2f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockGrowEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockGrowEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
index 6dcd9f828c..6dcd9f828c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java
index 7ca2b1b321..7ca2b1b321 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
index 1d496e5a3d..1d496e5a3d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
index 2cdf2919e7..2cdf2919e7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
index 40ddc36497..40ddc36497 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
index 340fa397e6..340fa397e6 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
index 4e3c406ba8..4e3c406ba8 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockReceiveGameEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockReceiveGameEvent.java
index e226d13064..e226d13064 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockReceiveGameEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockReceiveGameEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
index e46419b8c7..e46419b8c7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
index 71c0af9373..71c0af9373 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
index e9239caec9..e9239caec9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BlockSpreadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
index fe6573d8fc..fe6573d8fc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/CampfireStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
index 1f7a8bf65e..1f7a8bf65e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
index 891f3d250b..891f3d250b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java b/paper-api/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
index 3baed1c43b..3baed1c43b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/EntityBlockFormEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/FluidLevelChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/FluidLevelChangeEvent.java
index 9bd0440c37..9bd0440c37 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/FluidLevelChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/FluidLevelChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java b/paper-api/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
index f30ed84186..f30ed84186 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java b/paper-api/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
index c33f9cb803..c33f9cb803 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/LeavesDecayEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/MoistureChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/MoistureChangeEvent.java
index bf5de52e79..bf5de52e79 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/MoistureChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/MoistureChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/NotePlayEvent.java b/paper-api/src/main/java/org/bukkit/event/block/NotePlayEvent.java
index ea7cb75ba3..ea7cb75ba3 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/NotePlayEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/NotePlayEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/SculkBloomEvent.java b/paper-api/src/main/java/org/bukkit/event/block/SculkBloomEvent.java
index def8001410..def8001410 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/SculkBloomEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/SculkBloomEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/SignChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/SignChangeEvent.java
index d944d67f54..d944d67f54 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/SignChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/SignChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java b/paper-api/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java
index 7029cfcd00..7029cfcd00 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/SpongeAbsorbEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/TNTPrimeEvent.java b/paper-api/src/main/java/org/bukkit/event/block/TNTPrimeEvent.java
index 3e6a480294..3e6a480294 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/TNTPrimeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/TNTPrimeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/block/package-info.java b/paper-api/src/main/java/org/bukkit/event/block/package-info.java
index 30aec21853..30aec21853 100644
--- a/Paper-API/src/main/java/org/bukkit/event/block/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/block/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/paper-api/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
index e4f8a0d14a..e4f8a0d14a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java b/paper-api/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
index 1829529c99..1829529c99 100644
--- a/Paper-API/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/paper-api/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
index f0db59a556..f0db59a556 100644
--- a/Paper-API/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/enchantment/package-info.java b/paper-api/src/main/java/org/bukkit/event/enchantment/package-info.java
index e609c63487..e609c63487 100644
--- a/Paper-API/src/main/java/org/bukkit/event/enchantment/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/enchantment/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java
index 9cee218b9e..9cee218b9e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ArrowBodyCountChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ArrowBodyCountChangeEvent.java
index caed284b31..caed284b31 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ArrowBodyCountChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ArrowBodyCountChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/BatToggleSleepEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/BatToggleSleepEvent.java
index 5a5615d172..5a5615d172 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/BatToggleSleepEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/BatToggleSleepEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
index 4065432c88..4065432c88 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
index 4295baf51e..4295baf51e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/CreeperPowerEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EnderDragonChangePhaseEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EnderDragonChangePhaseEvent.java
index 498609bb1b..498609bb1b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EnderDragonChangePhaseEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EnderDragonChangePhaseEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityAirChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityAirChangeEvent.java
index cd20a4aa4a..cd20a4aa4a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityAirChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityAirChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityBreakDoorEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityBreakDoorEvent.java
index b7889e3b6c..b7889e3b6c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityBreakDoorEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityBreakDoorEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityBreedEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityBreedEvent.java
index 4863877891..4863877891 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityBreedEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityBreedEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
index 1a9575ad4c..1a9575ad4c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
index 5886ee448a..5886ee448a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
index 0b67364e13..0b67364e13 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
index eea9aa7bf1..eea9aa7bf1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
index 397baaefd2..397baaefd2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
index ab18f35b68..ab18f35b68 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
index aec5a0c288..aec5a0c288 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 4773f537de..4773f537de 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
index 130cf9e598..130cf9e598 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDropItemEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityDropItemEvent.java
index 3ccdcc755e..3ccdcc755e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityDropItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityDropItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEnterBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityEnterBlockEvent.java
index d5bd804a58..d5bd804a58 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEnterBlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityEnterBlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java
index 59aab10c2d..59aab10c2d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityEvent.java
index e3a9e32933..e3a9e32933 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityExhaustionEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityExhaustionEvent.java
index 2ff372d73e..2ff372d73e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityExhaustionEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityExhaustionEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
index 099efafa14..099efafa14 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
index e2c0cb3393..e2c0cb3393 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityInteractEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
index 94ee5a3354..94ee5a3354 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPlaceEvent.java
index 71d664dd89..71d664dd89 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPlaceEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPlaceEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
index 6818e9f0ba..6818e9f0ba 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
index 97e36c7f6e..97e36c7f6e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
index 0a87e29349..0a87e29349 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPortalExitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPoseChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPoseChangeEvent.java
index 6fb2b02ace..6fb2b02ace 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPoseChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPoseChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
index c9f3950646..c9f3950646 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
index 7ecff9fcee..7ecff9fcee 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
index 2f6ad5c2fc..2f6ad5c2fc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
index 719d0d8783..719d0d8783 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntitySpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntitySpawnEvent.java
index 961ee51134..961ee51134 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntitySpawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntitySpawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntitySpellCastEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntitySpellCastEvent.java
index 0252ca7aed..0252ca7aed 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntitySpellCastEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntitySpellCastEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTameEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
index c410b48c2f..c410b48c2f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityTameEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
index 85b318d9ee..85b318d9ee 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
index e6b4d4c172..e6b4d4c172 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTeleportEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityTeleportEvent.java
index a7918049ae..a7918049ae 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTeleportEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityTeleportEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityToggleGlideEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityToggleGlideEvent.java
index de24f3f61d..de24f3f61d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityToggleGlideEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityToggleGlideEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
index 273ae8e5da..273ae8e5da 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
index 1592aac603..1592aac603 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
index 95248d0f5c..95248d0f5c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ExpBottleEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ExpBottleEvent.java
index 997c86b032..997c86b032 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ExpBottleEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ExpBottleEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
index 6db5dad719..6db5dad719 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ExplosionPrimeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/FireworkExplodeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/FireworkExplodeEvent.java
index 51ad0e6bfc..51ad0e6bfc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/FireworkExplodeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/FireworkExplodeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
index 7f4c5ea860..7f4c5ea860 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java
index 65b1ddb2b2..65b1ddb2b2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/HorseJumpEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
index 6fc66197eb..6fc66197eb 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ItemMergeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ItemMergeEvent.java
index e378cc29b4..e378cc29b4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ItemMergeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ItemMergeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
index faf98bb59a..faf98bb59a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java
index 34efe59493..34efe59493 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PigZapEvent.java
index d3949edfc7..d3949edfc7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PigZapEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PigZapEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PigZombieAngerEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PigZombieAngerEvent.java
index bb4f13bbb2..bb4f13bbb2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PigZombieAngerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PigZombieAngerEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
index bd67b7cba7..bd67b7cba7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
index c7138d79a5..c7138d79a5 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PlayerLeashEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PlayerLeashEntityEvent.java
index 883d54dc0c..883d54dc0c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PlayerLeashEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PlayerLeashEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
index 2e58b716fd..2e58b716fd 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
index 5d4817d2a3..5d4817d2a3 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/ProjectileLaunchEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/ProjectileLaunchEvent.java
index c5fc3c5584..c5fc3c5584 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/ProjectileLaunchEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/ProjectileLaunchEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
index ddf4aec01e..ddf4aec01e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
index 05264b31ad..05264b31ad 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/SheepRegrowWoolEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
index 02b659847c..02b659847c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/SlimeSplitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
index f3ec8f6732..f3ec8f6732 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/StriderTemperatureChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/StriderTemperatureChangeEvent.java
index 26a4f88a3b..26a4f88a3b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/StriderTemperatureChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/StriderTemperatureChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerAcquireTradeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/VillagerAcquireTradeEvent.java
index 58155105dc..58155105dc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerAcquireTradeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/VillagerAcquireTradeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java
index 346899bc0e..346899bc0e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerReplenishTradeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/VillagerReplenishTradeEvent.java
index c6d849af00..c6d849af00 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/VillagerReplenishTradeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/VillagerReplenishTradeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/entity/package-info.java b/paper-api/src/main/java/org/bukkit/event/entity/package-info.java
index cddcd4e462..cddcd4e462 100644
--- a/Paper-API/src/main/java/org/bukkit/event/entity/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/entity/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
index 454885e476..454885e476 100644
--- a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingBreakEvent.java b/paper-api/src/main/java/org/bukkit/event/hanging/HangingBreakEvent.java
index 16d8196e1f..16d8196e1f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingBreakEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/hanging/HangingBreakEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingEvent.java b/paper-api/src/main/java/org/bukkit/event/hanging/HangingEvent.java
index f01a1a0f04..f01a1a0f04 100644
--- a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/hanging/HangingEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingPlaceEvent.java b/paper-api/src/main/java/org/bukkit/event/hanging/HangingPlaceEvent.java
index cc5781f276..cc5781f276 100644
--- a/Paper-API/src/main/java/org/bukkit/event/hanging/HangingPlaceEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/hanging/HangingPlaceEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/hanging/package-info.java b/paper-api/src/main/java/org/bukkit/event/hanging/package-info.java
index bf16382bc0..bf16382bc0 100644
--- a/Paper-API/src/main/java/org/bukkit/event/hanging/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/hanging/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/BrewEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/BrewEvent.java
index f37cc5dee0..f37cc5dee0 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/BrewEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/BrewEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/BrewingStandFuelEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/BrewingStandFuelEvent.java
index 633ec51871..633ec51871 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/BrewingStandFuelEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/BrewingStandFuelEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/ClickType.java b/paper-api/src/main/java/org/bukkit/event/inventory/ClickType.java
index fa96e8c278..fa96e8c278 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/ClickType.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/ClickType.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
index cab13877fb..cab13877fb 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/DragType.java b/paper-api/src/main/java/org/bukkit/event/inventory/DragType.java
index 72c2bed956..72c2bed956 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/DragType.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/DragType.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
index 2f80910dd2..2f80910dd2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
index a965b6a780..a965b6a780 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
index 25478725be..25478725be 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
index abfd0441f1..abfd0441f1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
index 18bb808e73..18bb808e73 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryAction.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryAction.java
index e914873f39..e914873f39 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryAction.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryAction.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
index ac67a4e321..ac67a4e321 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
index 4db0a07db1..4db0a07db1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryCreativeEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryCreativeEvent.java
index 9c6db8be46..9c6db8be46 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryCreativeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryCreativeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java
index da37e0ddf9..da37e0ddf9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryDragEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryEvent.java
index 5d3fe64ab9..5d3fe64ab9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java
index 14f821ca1d..14f821ca1d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryInteractEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
index 0161b8a94c..0161b8a94c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
index 8e2afeab4c..8e2afeab4c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryPickupItemEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryPickupItemEvent.java
index 1ffac4d58e..1ffac4d58e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryPickupItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryPickupItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryType.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java
index 64e59fe706..64e59fe706 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
index d884ecf40a..d884ecf40a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareGrindstoneEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareGrindstoneEvent.java
index a7e0360009..a7e0360009 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareGrindstoneEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareGrindstoneEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareInventoryResultEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareInventoryResultEvent.java
index 0b58ffff39..0b58ffff39 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareInventoryResultEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareInventoryResultEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareItemCraftEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareItemCraftEvent.java
index efd29d198d..efd29d198d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareItemCraftEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareItemCraftEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
index 8d7924fa81..8d7924fa81 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/SmithItemEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/SmithItemEvent.java
index f8e45134ca..f8e45134ca 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/SmithItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/SmithItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/TradeSelectEvent.java b/paper-api/src/main/java/org/bukkit/event/inventory/TradeSelectEvent.java
index 3bddf946d5..3bddf946d5 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/TradeSelectEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/TradeSelectEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/inventory/package-info.java b/paper-api/src/main/java/org/bukkit/event/inventory/package-info.java
index 7dd5b699e8..7dd5b699e8 100644
--- a/Paper-API/src/main/java/org/bukkit/event/inventory/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/inventory/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/package-info.java b/paper-api/src/main/java/org/bukkit/event/package-info.java
index dd8baa1dc1..dd8baa1dc1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
index 399afcd19f..399afcd19f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerChatPreviewEvent.java b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerChatPreviewEvent.java
index 2ce4d3b253..2ce4d3b253 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerChatPreviewEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerChatPreviewEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
index fc2d9e85b6..fc2d9e85b6 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
index 6f618bb140..6f618bb140 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
index 11c27b1a4a..11c27b1a4a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAnimationType.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerAnimationType.java
index 1eb91253ab..1eb91253ab 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAnimationType.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerAnimationType.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
index f1391d834b..f1391d834b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
index 0788153a96..0788153a96 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
index ced77de350..ced77de350 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
index f09b378508..f09b378508 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
index 5cd2dc9d7b..5cd2dc9d7b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEntityEvent.java
index 7b9c91b3f0..7b9c91b3f0 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
index d108067c3c..d108067c3c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
index 987a51c1da..987a51c1da 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketFishEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketFishEvent.java
index 5f1fbb82d4..5f1fbb82d4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerBucketFishEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerBucketFishEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java
index 6070b1323c..6070b1323c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
index f1d1d1e9bd..f1d1d1e9bd 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChangedWorldEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChannelEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChannelEvent.java
index 9316a525f9..9316a525f9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChannelEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChannelEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
index 2c021bc2ff..2c021bc2ff 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java
index 93191b7e32..93191b7e32 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatTabCompleteEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
index 48a00fb50f..48a00fb50f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java
index 762825997f..762825997f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandSendEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
index aca500f32e..aca500f32e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerDropItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEditBookEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEditBookEvent.java
index 8c5f1f5892..8c5f1f5892 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEditBookEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerEditBookEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
index 917338044b..917338044b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
index f6d3b817de..f6d3b817de 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
index 7c340f539c..7c340f539c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerExpCooldownChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerExpCooldownChangeEvent.java
index fc45f95df8..fc45f95df8 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerExpCooldownChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerExpCooldownChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerFishEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
index d4001f64a7..d4001f64a7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerFishEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
index aee4a8b52c..aee4a8b52c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerHarvestBlockEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerHarvestBlockEvent.java
index 5cd4b1311b..5cd4b1311b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerHarvestBlockEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerHarvestBlockEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
index 9d9cd7245c..9d9cd7245c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java
index 3f24d302e2..3f24d302e2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
index 1d3d62969c..1d3d62969c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
index ddea08e4de..ddea08e4de 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemBreakEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemBreakEvent.java
index 35c373c870..35c373c870 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemBreakEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemBreakEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
index 6110d04173..6110d04173 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
index a2993c7434..a2993c7434 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
index 39048573a5..39048573a5 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemHeldEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
index 533531f69a..533531f69a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
index 3e1e7cd041..3e1e7cd041 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
index f7f864a2b4..f7f864a2b4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
index 00481d7330..00481d7330 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerLevelChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
index c5e8bffef7..c5e8bffef7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index 62fb782baa..62fb782baa 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
index b484abf3b0..b484abf3b0 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPickupArrowEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerPickupArrowEvent.java
index c9a8663945..c9a8663945 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPickupArrowEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerPickupArrowEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
index 18d82c111f..18d82c111f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
index 929a997671..929a997671 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
index 6800132c62..6800132c62 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
index 84703b5d17..84703b5d17 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeBookClickEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeBookClickEvent.java
index a843f73473..a843f73473 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeBookClickEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeBookClickEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeBookSettingsChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeBookSettingsChangeEvent.java
index 249f670f7d..249f670f7d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeBookSettingsChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeBookSettingsChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeDiscoverEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeDiscoverEvent.java
index f41c29e98a..f41c29e98a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRecipeDiscoverEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRecipeDiscoverEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRegisterChannelEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRegisterChannelEvent.java
index 97ae244fa8..97ae244fa8 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRegisterChannelEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRegisterChannelEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
index e58fecf0fe..e58fecf0fe 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
index b45f265ec7..b45f265ec7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRiptideEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerRiptideEvent.java
index c23142a72b..c23142a72b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerRiptideEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerRiptideEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
index 04b3dce008..04b3dce008 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
index 6eb77dc1bb..6eb77dc1bb 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java
index 62f41dbdf9..62f41dbdf9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
index 3ea03540ce..3ea03540ce 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java
index f971844bf4..f971844bf4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
index 39dd08de71..39dd08de71 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerSwapHandItemsEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerTakeLecternBookEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerTakeLecternBookEvent.java
index 5ef664a655..5ef664a655 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerTakeLecternBookEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerTakeLecternBookEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
index ccfb08af8c..ccfb08af8c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleFlightEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleFlightEvent.java
index 9c200f8aca..9c200f8aca 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleFlightEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleFlightEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
index 348e5b5e50..348e5b5e50 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleSneakEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
index dc8cf2197c..dc8cf2197c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerToggleSprintEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
index d63bd62606..d63bd62606 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerUnregisterChannelEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerUnregisterChannelEvent.java
index b22bc21f5f..b22bc21f5f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerUnregisterChannelEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerUnregisterChannelEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
index 61e098d94a..61e098d94a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerVelocityEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/player/package-info.java b/paper-api/src/main/java/org/bukkit/event/player/package-info.java
index fb645f32a1..fb645f32a1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/player/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/player/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/RaidEvent.java b/paper-api/src/main/java/org/bukkit/event/raid/RaidEvent.java
index b2ff4bc331..b2ff4bc331 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/RaidEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/RaidEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/RaidFinishEvent.java b/paper-api/src/main/java/org/bukkit/event/raid/RaidFinishEvent.java
index f0d280b8c1..f0d280b8c1 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/RaidFinishEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/RaidFinishEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java b/paper-api/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
index 1b8bb5241e..1b8bb5241e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/RaidStopEvent.java b/paper-api/src/main/java/org/bukkit/event/raid/RaidStopEvent.java
index 9e852ac973..9e852ac973 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/RaidStopEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/RaidStopEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java b/paper-api/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java
index 128e43cf12..128e43cf12 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/raid/package-info.java b/paper-api/src/main/java/org/bukkit/event/raid/package-info.java
index 77efdc7374..77efdc7374 100644
--- a/Paper-API/src/main/java/org/bukkit/event/raid/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/raid/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java b/paper-api/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
index 25c0fe9848..25c0fe9848 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/MapInitializeEvent.java b/paper-api/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
index dc7440d2eb..dc7440d2eb 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/MapInitializeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/PluginDisableEvent.java b/paper-api/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
index a4fe2d7b85..a4fe2d7b85 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/PluginDisableEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/PluginEnableEvent.java b/paper-api/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
index fe78757d6a..fe78757d6a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/PluginEnableEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/PluginEvent.java b/paper-api/src/main/java/org/bukkit/event/server/PluginEvent.java
index 89487b359a..89487b359a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/PluginEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/PluginEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/RemoteServerCommandEvent.java b/paper-api/src/main/java/org/bukkit/event/server/RemoteServerCommandEvent.java
index 2dac594c5c..2dac594c5c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/RemoteServerCommandEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/RemoteServerCommandEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServerCommandEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
index 617459afae..617459afae 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServerEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServerEvent.java
index 05167fb34e..05167fb34e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServerEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServerEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
index 72ebc29db4..72ebc29db4 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServerLoadEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServerLoadEvent.java
index c9a252d7e2..c9a252d7e2 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServerLoadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServerLoadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServiceEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServiceEvent.java
index 55e278cd06..55e278cd06 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServiceEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServiceEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServiceRegisterEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServiceRegisterEvent.java
index d7f9227ef5..d7f9227ef5 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServiceRegisterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServiceRegisterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/ServiceUnregisterEvent.java b/paper-api/src/main/java/org/bukkit/event/server/ServiceUnregisterEvent.java
index f286799eeb..f286799eeb 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/ServiceUnregisterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/ServiceUnregisterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/paper-api/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
index 4a3451af45..4a3451af45 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/server/package-info.java b/paper-api/src/main/java/org/bukkit/event/server/package-info.java
index b548270cac..b548270cac 100644
--- a/Paper-API/src/main/java/org/bukkit/event/server/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/server/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
index d2b33f4105..d2b33f4105 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
index aa1d74eade..aa1d74eade 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
index c1f107db9e..c1f107db9e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
index 45da51d594..45da51d594 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
index 26bc6898fc..26bc6898fc 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
index 64f21f6849..64f21f6849 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
index f7f8d6274d..f7f8d6274d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
index 63df270565..63df270565 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
index 39f6afd2f9..39f6afd2f9 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
index 7bfb84d394..7bfb84d394 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
index 098192a5e7..098192a5e7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/VehicleUpdateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/vehicle/package-info.java b/paper-api/src/main/java/org/bukkit/event/vehicle/package-info.java
index b88cbcd6bd..b88cbcd6bd 100644
--- a/Paper-API/src/main/java/org/bukkit/event/vehicle/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/vehicle/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java b/paper-api/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
index c98f07f82d..c98f07f82d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
index 032395c711..032395c711 100644
--- a/Paper-API/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
index dabd390b84..dabd390b84 100644
--- a/Paper-API/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/weather/WeatherEvent.java b/paper-api/src/main/java/org/bukkit/event/weather/WeatherEvent.java
index e1854d8073..e1854d8073 100644
--- a/Paper-API/src/main/java/org/bukkit/event/weather/WeatherEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/weather/WeatherEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/weather/package-info.java b/paper-api/src/main/java/org/bukkit/event/weather/package-info.java
index edaaf9f19d..edaaf9f19d 100644
--- a/Paper-API/src/main/java/org/bukkit/event/weather/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/weather/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/AsyncStructureGenerateEvent.java b/paper-api/src/main/java/org/bukkit/event/world/AsyncStructureGenerateEvent.java
index 91a137379f..91a137379f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/AsyncStructureGenerateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/AsyncStructureGenerateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/AsyncStructureSpawnEvent.java b/paper-api/src/main/java/org/bukkit/event/world/AsyncStructureSpawnEvent.java
index 5f05b32bdf..5f05b32bdf 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/AsyncStructureSpawnEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/AsyncStructureSpawnEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/ChunkEvent.java b/paper-api/src/main/java/org/bukkit/event/world/ChunkEvent.java
index 7ffc6a77ba..7ffc6a77ba 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/ChunkEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/ChunkEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
index 7873d387f3..7873d387f3 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/ChunkLoadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java b/paper-api/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
index 7b323c057e..7b323c057e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/ChunkPopulateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
index 5d8271626f..5d8271626f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/ChunkUnloadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/EntitiesLoadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/EntitiesLoadEvent.java
index 88b13a481e..88b13a481e 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/EntitiesLoadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/EntitiesLoadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/EntitiesUnloadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/EntitiesUnloadEvent.java
index 1e3f144f1f..1e3f144f1f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/EntitiesUnloadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/EntitiesUnloadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/GenericGameEvent.java b/paper-api/src/main/java/org/bukkit/event/world/GenericGameEvent.java
index 2a2a329877..2a2a329877 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/GenericGameEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/GenericGameEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/LootGenerateEvent.java b/paper-api/src/main/java/org/bukkit/event/world/LootGenerateEvent.java
index e051dc8b94..e051dc8b94 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/LootGenerateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/LootGenerateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/PortalCreateEvent.java b/paper-api/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
index 579f017474..579f017474 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/PortalCreateEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
index 9ce93d0093..9ce93d0093 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/StructureGrowEvent.java b/paper-api/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
index 7af8d6e51c..7af8d6e51c 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/StructureGrowEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/TimeSkipEvent.java b/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java
index cb50cbbb27..cb50cbbb27 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/TimeSkipEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/WorldEvent.java b/paper-api/src/main/java/org/bukkit/event/world/WorldEvent.java
index 6d58b4adb6..6d58b4adb6 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/WorldEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/WorldEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/WorldInitEvent.java b/paper-api/src/main/java/org/bukkit/event/world/WorldInitEvent.java
index 2cb1ed0cc7..2cb1ed0cc7 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/WorldInitEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/WorldInitEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/WorldLoadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
index 552e15cd4a..552e15cd4a 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/WorldLoadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/WorldSaveEvent.java b/paper-api/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
index 9a9bb1362b..9a9bb1362b 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/WorldSaveEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java b/paper-api/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
index 8eeeada870..8eeeada870 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/WorldUnloadEvent.java
diff --git a/Paper-API/src/main/java/org/bukkit/event/world/package-info.java b/paper-api/src/main/java/org/bukkit/event/world/package-info.java
index 4cbb818a3f..4cbb818a3f 100644
--- a/Paper-API/src/main/java/org/bukkit/event/world/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/event/world/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/BiomeParameterPoint.java b/paper-api/src/main/java/org/bukkit/generator/BiomeParameterPoint.java
index ad02447d75..ad02447d75 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/BiomeParameterPoint.java
+++ b/paper-api/src/main/java/org/bukkit/generator/BiomeParameterPoint.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/BiomeProvider.java b/paper-api/src/main/java/org/bukkit/generator/BiomeProvider.java
index 65fd14b7b3..65fd14b7b3 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/BiomeProvider.java
+++ b/paper-api/src/main/java/org/bukkit/generator/BiomeProvider.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/BlockPopulator.java b/paper-api/src/main/java/org/bukkit/generator/BlockPopulator.java
index 4704ea919b..4704ea919b 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/BlockPopulator.java
+++ b/paper-api/src/main/java/org/bukkit/generator/BlockPopulator.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/ChunkGenerator.java b/paper-api/src/main/java/org/bukkit/generator/ChunkGenerator.java
index c942b7101a..c942b7101a 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/ChunkGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/generator/ChunkGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/LimitedRegion.java b/paper-api/src/main/java/org/bukkit/generator/LimitedRegion.java
index e0b249d328..e0b249d328 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/LimitedRegion.java
+++ b/paper-api/src/main/java/org/bukkit/generator/LimitedRegion.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/WorldInfo.java b/paper-api/src/main/java/org/bukkit/generator/WorldInfo.java
index 5067f13714..5067f13714 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/WorldInfo.java
+++ b/paper-api/src/main/java/org/bukkit/generator/WorldInfo.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/package-info.java b/paper-api/src/main/java/org/bukkit/generator/package-info.java
index 2532addf5f..2532addf5f 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/generator/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/structure/Structure.java b/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
index 8e39f282c7..8e39f282c7 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/structure/Structure.java
+++ b/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/structure/StructureType.java b/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
index 2f908d5545..2f908d5545 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/structure/StructureType.java
+++ b/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
diff --git a/Paper-API/src/main/java/org/bukkit/generator/structure/package-info.java b/paper-api/src/main/java/org/bukkit/generator/structure/package-info.java
index d0159889ef..d0159889ef 100644
--- a/Paper-API/src/main/java/org/bukkit/generator/structure/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/generator/structure/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java b/paper-api/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java
index 8d0196a064..8d0196a064 100644
--- a/Paper-API/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java
+++ b/paper-api/src/main/java/org/bukkit/help/GenericCommandHelpTopic.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/HelpMap.java b/paper-api/src/main/java/org/bukkit/help/HelpMap.java
index 48997b5c8e..48997b5c8e 100644
--- a/Paper-API/src/main/java/org/bukkit/help/HelpMap.java
+++ b/paper-api/src/main/java/org/bukkit/help/HelpMap.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/HelpTopic.java b/paper-api/src/main/java/org/bukkit/help/HelpTopic.java
index 2e2e1af50d..2e2e1af50d 100644
--- a/Paper-API/src/main/java/org/bukkit/help/HelpTopic.java
+++ b/paper-api/src/main/java/org/bukkit/help/HelpTopic.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/HelpTopicComparator.java b/paper-api/src/main/java/org/bukkit/help/HelpTopicComparator.java
index e1f4930f4d..e1f4930f4d 100644
--- a/Paper-API/src/main/java/org/bukkit/help/HelpTopicComparator.java
+++ b/paper-api/src/main/java/org/bukkit/help/HelpTopicComparator.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/HelpTopicFactory.java b/paper-api/src/main/java/org/bukkit/help/HelpTopicFactory.java
index b85da3f6dc..b85da3f6dc 100644
--- a/Paper-API/src/main/java/org/bukkit/help/HelpTopicFactory.java
+++ b/paper-api/src/main/java/org/bukkit/help/HelpTopicFactory.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/IndexHelpTopic.java b/paper-api/src/main/java/org/bukkit/help/IndexHelpTopic.java
index 88a812d66b..88a812d66b 100644
--- a/Paper-API/src/main/java/org/bukkit/help/IndexHelpTopic.java
+++ b/paper-api/src/main/java/org/bukkit/help/IndexHelpTopic.java
diff --git a/Paper-API/src/main/java/org/bukkit/help/package-info.java b/paper-api/src/main/java/org/bukkit/help/package-info.java
index 66a4aacbe9..66a4aacbe9 100644
--- a/Paper-API/src/main/java/org/bukkit/help/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/help/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java
index 93c1158f8d..93c1158f8d 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/AnvilInventory.java b/paper-api/src/main/java/org/bukkit/inventory/AnvilInventory.java
index c60be4fd24..c60be4fd24 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/AnvilInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/AnvilInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
index 163ffe8ff7..163ffe8ff7 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/BeaconInventory.java b/paper-api/src/main/java/org/bukkit/inventory/BeaconInventory.java
index bd2289b18f..bd2289b18f 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/BeaconInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/BeaconInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/BlastingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/BlastingRecipe.java
index 74a025a90c..74a025a90c 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/BlastingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/BlastingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/BlockInventoryHolder.java b/paper-api/src/main/java/org/bukkit/inventory/BlockInventoryHolder.java
index 86fbc1be43..86fbc1be43 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/BlockInventoryHolder.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/BlockInventoryHolder.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/BrewerInventory.java b/paper-api/src/main/java/org/bukkit/inventory/BrewerInventory.java
index d8a52b59e9..d8a52b59e9 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/BrewerInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/BrewerInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CampfireRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/CampfireRecipe.java
index a1bd3a68d0..a1bd3a68d0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CampfireRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CampfireRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CartographyInventory.java b/paper-api/src/main/java/org/bukkit/inventory/CartographyInventory.java
index 29c9b2682b..29c9b2682b 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CartographyInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CartographyInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java b/paper-api/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
index b99f26079c..b99f26079c 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ComplexRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/ComplexRecipe.java
index 46381c8f97..46381c8f97 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ComplexRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ComplexRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CookingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/CookingRecipe.java
index f7fa79393a..f7fa79393a 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CookingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CookingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CrafterInventory.java b/paper-api/src/main/java/org/bukkit/inventory/CrafterInventory.java
index 7cdcd45e2b..7cdcd45e2b 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CrafterInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CrafterInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CraftingInventory.java b/paper-api/src/main/java/org/bukkit/inventory/CraftingInventory.java
index a32977ba3b..a32977ba3b 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CraftingInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CraftingInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CraftingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/CraftingRecipe.java
index e4bf772f7e..e4bf772f7e 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CraftingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CraftingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/CreativeCategory.java b/paper-api/src/main/java/org/bukkit/inventory/CreativeCategory.java
index 78587d9fab..78587d9fab 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/CreativeCategory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/CreativeCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/DoubleChestInventory.java b/paper-api/src/main/java/org/bukkit/inventory/DoubleChestInventory.java
index 6d0067cbc3..6d0067cbc3 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/DoubleChestInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/DoubleChestInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/EnchantingInventory.java b/paper-api/src/main/java/org/bukkit/inventory/EnchantingInventory.java
index ea47af00c0..ea47af00c0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/EnchantingInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/EnchantingInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/EntityEquipment.java b/paper-api/src/main/java/org/bukkit/inventory/EntityEquipment.java
index bbc1aa3a31..bbc1aa3a31 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/EntityEquipment.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/EntityEquipment.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/EquipmentSlot.java b/paper-api/src/main/java/org/bukkit/inventory/EquipmentSlot.java
index 8f793982d0..8f793982d0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/EquipmentSlot.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/EquipmentSlot.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/FurnaceInventory.java b/paper-api/src/main/java/org/bukkit/inventory/FurnaceInventory.java
index b9d4f05980..b9d4f05980 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/FurnaceInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/FurnaceInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/FurnaceRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
index af8f7b88ed..af8f7b88ed 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/GrindstoneInventory.java b/paper-api/src/main/java/org/bukkit/inventory/GrindstoneInventory.java
index 1c750108f5..1c750108f5 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/GrindstoneInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/GrindstoneInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/HorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java
index 53498debe4..53498debe4 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/HorseInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/Inventory.java b/paper-api/src/main/java/org/bukkit/inventory/Inventory.java
index 0d519813c1..0d519813c1 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/Inventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/Inventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/InventoryHolder.java b/paper-api/src/main/java/org/bukkit/inventory/InventoryHolder.java
index c7b17eabf0..c7b17eabf0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/InventoryHolder.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/InventoryHolder.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/InventoryView.java b/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
index ac6c5c7a58..ac6c5c7a58 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/InventoryView.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ItemCraftResult.java b/paper-api/src/main/java/org/bukkit/inventory/ItemCraftResult.java
index ebb4d19e0a..ebb4d19e0a 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ItemCraftResult.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemCraftResult.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ItemFactory.java b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java
index 0217f98a74..0217f98a74 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ItemFlag.java b/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java
index 3df1044fd7..3df1044fd7 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ItemFlag.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ItemStack.java b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
index 36e3fbc727..36e3fbc727 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/JukeboxInventory.java b/paper-api/src/main/java/org/bukkit/inventory/JukeboxInventory.java
index f4b3b7f145..f4b3b7f145 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/JukeboxInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/JukeboxInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/LecternInventory.java b/paper-api/src/main/java/org/bukkit/inventory/LecternInventory.java
index acf2244f77..acf2244f77 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/LecternInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/LecternInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/LlamaInventory.java b/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java
index 5ac1afb8a2..5ac1afb8a2 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/LlamaInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/LoomInventory.java b/paper-api/src/main/java/org/bukkit/inventory/LoomInventory.java
index 9801b59e20..9801b59e20 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/LoomInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/LoomInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/MainHand.java b/paper-api/src/main/java/org/bukkit/inventory/MainHand.java
index 75f12f1567..75f12f1567 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/MainHand.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/MainHand.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/Merchant.java b/paper-api/src/main/java/org/bukkit/inventory/Merchant.java
index 9861bcedde..9861bcedde 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/Merchant.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/Merchant.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/MerchantInventory.java b/paper-api/src/main/java/org/bukkit/inventory/MerchantInventory.java
index 8086356024..8086356024 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/MerchantInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/MerchantInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/MerchantRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/MerchantRecipe.java
index 39f9766a03..39f9766a03 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/MerchantRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/MerchantRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/PlayerInventory.java b/paper-api/src/main/java/org/bukkit/inventory/PlayerInventory.java
index c4d657727e..c4d657727e 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/PlayerInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/PlayerInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/Recipe.java b/paper-api/src/main/java/org/bukkit/inventory/Recipe.java
index 4927a7ddca..4927a7ddca 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/Recipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/Recipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/RecipeChoice.java b/paper-api/src/main/java/org/bukkit/inventory/RecipeChoice.java
index 523818cbb0..523818cbb0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/RecipeChoice.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/RecipeChoice.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
index 7944f26a3e..7944f26a3e 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/ShapedRecipe.java
index da878c6d49..da878c6d49 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ShapedRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
index beb7984824..beb7984824 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SmithingInventory.java b/paper-api/src/main/java/org/bukkit/inventory/SmithingInventory.java
index 5ed72b7305..5ed72b7305 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SmithingInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SmithingInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/SmithingRecipe.java
index 92f6285d87..92f6285d87 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SmithingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SmithingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
index ad2fc85081..ad2fc85081 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
index 9e84114528..9e84114528 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/SmokingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/SmokingRecipe.java
index 1073d9aec3..1073d9aec3 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/SmokingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/SmokingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/StonecutterInventory.java b/paper-api/src/main/java/org/bukkit/inventory/StonecutterInventory.java
index e7a8e7188b..e7a8e7188b 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/StonecutterInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/StonecutterInventory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/paper-api/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
index bc3440eb72..bc3440eb72 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/ArmorMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/ArmorMeta.java
index e167cb5c47..e167cb5c47 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/ArmorMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/ArmorMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/AxolotlBucketMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/AxolotlBucketMeta.java
index f7d457ab1e..f7d457ab1e 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/AxolotlBucketMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/AxolotlBucketMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/BannerMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/BannerMeta.java
index 4739d2ecc2..4739d2ecc2 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/BannerMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/BannerMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/BlockDataMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/BlockDataMeta.java
index 473c72dcd3..473c72dcd3 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/BlockDataMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/BlockDataMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
index e7d905b114..e7d905b114 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/BookMeta.java
index be7c2cfc75..be7c2cfc75 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/BookMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/BundleMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
index e4c69a0203..e4c69a0203 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/ColorableArmorMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/ColorableArmorMeta.java
index 7228189981..7228189981 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/ColorableArmorMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/ColorableArmorMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/CompassMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/CompassMeta.java
index 5040ab6190..5040ab6190 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/CompassMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/CompassMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
index 35c6594fd1..35c6594fd1 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/Damageable.java b/paper-api/src/main/java/org/bukkit/inventory/meta/Damageable.java
index 61ae4cba01..61ae4cba01 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/Damageable.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/Damageable.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java
index aae2ed2ec4..aae2ed2ec4 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/FireworkEffectMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/FireworkEffectMeta.java
index ce0f148d28..ce0f148d28 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/FireworkEffectMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/FireworkEffectMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
index cdbcc8dbab..cdbcc8dbab 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
index ea64d5b1eb..ea64d5b1eb 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/KnowledgeBookMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/KnowledgeBookMeta.java
index 736c60c71d..736c60c71d 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/KnowledgeBookMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/KnowledgeBookMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
index c1676991c3..c1676991c3 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/MapMeta.java
index 26a336dade..26a336dade 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/MapMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/MapMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/MusicInstrumentMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/MusicInstrumentMeta.java
index 2a9bf331fd..2a9bf331fd 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/MusicInstrumentMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/MusicInstrumentMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/PotionMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/PotionMeta.java
index 1113c40fb3..1113c40fb3 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/PotionMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/PotionMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/Repairable.java b/paper-api/src/main/java/org/bukkit/inventory/meta/Repairable.java
index fe053bcb29..fe053bcb29 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/Repairable.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/Repairable.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
index 862640b461..862640b461 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
index 35deb3519f..35deb3519f 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/SuspiciousStewMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/SuspiciousStewMeta.java
index c2f4282c18..c2f4282c18 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/SuspiciousStewMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/SuspiciousStewMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/TropicalFishBucketMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/TropicalFishBucketMeta.java
index 268b92e347..268b92e347 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/TropicalFishBucketMeta.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/TropicalFishBucketMeta.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/package-info.java b/paper-api/src/main/java/org/bukkit/inventory/meta/package-info.java
index b80eb88b60..b80eb88b60 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/CustomItemTagContainer.java b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/CustomItemTagContainer.java
index f46e2978bd..f46e2978bd 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/CustomItemTagContainer.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/CustomItemTagContainer.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/ItemTagAdapterContext.java b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/ItemTagAdapterContext.java
index 97e6c96efe..97e6c96efe 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/ItemTagAdapterContext.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/ItemTagAdapterContext.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/ItemTagType.java b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/ItemTagType.java
index 09082d4813..09082d4813 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/ItemTagType.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/ItemTagType.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/package-info.java b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/package-info.java
index f5a7bed636..f5a7bed636 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/tags/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/tags/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/ArmorTrim.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/ArmorTrim.java
index b4877e319c..b4877e319c 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/ArmorTrim.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/ArmorTrim.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
index 4327cbc15b..4327cbc15b 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
index 2365220dc0..2365220dc0 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/package-info.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/package-info.java
index c0180844af..c0180844af 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/meta/trim/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/package-info.java b/paper-api/src/main/java/org/bukkit/inventory/package-info.java
index 8881abcc0f..8881abcc0f 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java b/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
index 9990a7abf8..9990a7abf8 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java b/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
index 09a6a1b9b9..09a6a1b9b9 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
diff --git a/Paper-API/src/main/java/org/bukkit/inventory/recipe/package-info.java b/paper-api/src/main/java/org/bukkit/inventory/recipe/package-info.java
index 3e87cdf7c1..3e87cdf7c1 100644
--- a/Paper-API/src/main/java/org/bukkit/inventory/recipe/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/recipe/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/loot/LootContext.java b/paper-api/src/main/java/org/bukkit/loot/LootContext.java
index 71b7aa9d67..71b7aa9d67 100644
--- a/Paper-API/src/main/java/org/bukkit/loot/LootContext.java
+++ b/paper-api/src/main/java/org/bukkit/loot/LootContext.java
diff --git a/Paper-API/src/main/java/org/bukkit/loot/LootTable.java b/paper-api/src/main/java/org/bukkit/loot/LootTable.java
index ee5bd79f95..ee5bd79f95 100644
--- a/Paper-API/src/main/java/org/bukkit/loot/LootTable.java
+++ b/paper-api/src/main/java/org/bukkit/loot/LootTable.java
diff --git a/Paper-API/src/main/java/org/bukkit/loot/LootTables.java b/paper-api/src/main/java/org/bukkit/loot/LootTables.java
index b3fcb501e6..b3fcb501e6 100644
--- a/Paper-API/src/main/java/org/bukkit/loot/LootTables.java
+++ b/paper-api/src/main/java/org/bukkit/loot/LootTables.java
diff --git a/Paper-API/src/main/java/org/bukkit/loot/Lootable.java b/paper-api/src/main/java/org/bukkit/loot/Lootable.java
index 901db85249..901db85249 100644
--- a/Paper-API/src/main/java/org/bukkit/loot/Lootable.java
+++ b/paper-api/src/main/java/org/bukkit/loot/Lootable.java
diff --git a/Paper-API/src/main/java/org/bukkit/loot/package-info.java b/paper-api/src/main/java/org/bukkit/loot/package-info.java
index c346fb40dd..c346fb40dd 100644
--- a/Paper-API/src/main/java/org/bukkit/loot/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/loot/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapCanvas.java b/paper-api/src/main/java/org/bukkit/map/MapCanvas.java
index ae9bcc8262..ae9bcc8262 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapCanvas.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapCanvas.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapCursor.java b/paper-api/src/main/java/org/bukkit/map/MapCursor.java
index 599399e4d8..599399e4d8 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapCursor.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapCursor.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapCursorCollection.java b/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java
index 6bc28d000f..6bc28d000f 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapCursorCollection.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapFont.java b/paper-api/src/main/java/org/bukkit/map/MapFont.java
index a45ce8198e..a45ce8198e 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapFont.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapFont.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapPalette.java b/paper-api/src/main/java/org/bukkit/map/MapPalette.java
index c80faa079e..c80faa079e 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapPalette.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapPalette.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapRenderer.java b/paper-api/src/main/java/org/bukkit/map/MapRenderer.java
index cb7040876a..cb7040876a 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapRenderer.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapRenderer.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MapView.java b/paper-api/src/main/java/org/bukkit/map/MapView.java
index e998c5d871..e998c5d871 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MapView.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapView.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/MinecraftFont.java b/paper-api/src/main/java/org/bukkit/map/MinecraftFont.java
index 1c81e287e6..1c81e287e6 100644
--- a/Paper-API/src/main/java/org/bukkit/map/MinecraftFont.java
+++ b/paper-api/src/main/java/org/bukkit/map/MinecraftFont.java
diff --git a/Paper-API/src/main/java/org/bukkit/map/package-info.java b/paper-api/src/main/java/org/bukkit/map/package-info.java
index 30de8b24cf..30de8b24cf 100644
--- a/Paper-API/src/main/java/org/bukkit/map/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/map/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Attachable.java b/paper-api/src/main/java/org/bukkit/material/Attachable.java
index 16abdbf923..16abdbf923 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Attachable.java
+++ b/paper-api/src/main/java/org/bukkit/material/Attachable.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Banner.java b/paper-api/src/main/java/org/bukkit/material/Banner.java
index 08ce9d8bc6..08ce9d8bc6 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Banner.java
+++ b/paper-api/src/main/java/org/bukkit/material/Banner.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Bed.java b/paper-api/src/main/java/org/bukkit/material/Bed.java
index c5256129e0..c5256129e0 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Bed.java
+++ b/paper-api/src/main/java/org/bukkit/material/Bed.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Button.java b/paper-api/src/main/java/org/bukkit/material/Button.java
index da7d016cf1..da7d016cf1 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Button.java
+++ b/paper-api/src/main/java/org/bukkit/material/Button.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Cake.java b/paper-api/src/main/java/org/bukkit/material/Cake.java
index d39dd49162..d39dd49162 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Cake.java
+++ b/paper-api/src/main/java/org/bukkit/material/Cake.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Cauldron.java b/paper-api/src/main/java/org/bukkit/material/Cauldron.java
index b331b4c27e..b331b4c27e 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Cauldron.java
+++ b/paper-api/src/main/java/org/bukkit/material/Cauldron.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Chest.java b/paper-api/src/main/java/org/bukkit/material/Chest.java
index 4d120d3c33..4d120d3c33 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Chest.java
+++ b/paper-api/src/main/java/org/bukkit/material/Chest.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Coal.java b/paper-api/src/main/java/org/bukkit/material/Coal.java
index fb842cfa7b..fb842cfa7b 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Coal.java
+++ b/paper-api/src/main/java/org/bukkit/material/Coal.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/CocoaPlant.java b/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
index b1b1c729d1..b1b1c729d1 100644
--- a/Paper-API/src/main/java/org/bukkit/material/CocoaPlant.java
+++ b/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Colorable.java b/paper-api/src/main/java/org/bukkit/material/Colorable.java
index 7f495e0522..7f495e0522 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Colorable.java
+++ b/paper-api/src/main/java/org/bukkit/material/Colorable.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Command.java b/paper-api/src/main/java/org/bukkit/material/Command.java
index bcac1b0829..bcac1b0829 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Command.java
+++ b/paper-api/src/main/java/org/bukkit/material/Command.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Comparator.java b/paper-api/src/main/java/org/bukkit/material/Comparator.java
index 49d32d5443..49d32d5443 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Comparator.java
+++ b/paper-api/src/main/java/org/bukkit/material/Comparator.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Crops.java b/paper-api/src/main/java/org/bukkit/material/Crops.java
index 4cf3de5fbb..4cf3de5fbb 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Crops.java
+++ b/paper-api/src/main/java/org/bukkit/material/Crops.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/DetectorRail.java b/paper-api/src/main/java/org/bukkit/material/DetectorRail.java
index e8ab290421..e8ab290421 100644
--- a/Paper-API/src/main/java/org/bukkit/material/DetectorRail.java
+++ b/paper-api/src/main/java/org/bukkit/material/DetectorRail.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Diode.java b/paper-api/src/main/java/org/bukkit/material/Diode.java
index 36a62258bc..36a62258bc 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Diode.java
+++ b/paper-api/src/main/java/org/bukkit/material/Diode.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Directional.java b/paper-api/src/main/java/org/bukkit/material/Directional.java
index 8c1c7b0a25..8c1c7b0a25 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Directional.java
+++ b/paper-api/src/main/java/org/bukkit/material/Directional.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/DirectionalContainer.java b/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
index 0190e5f3df..0190e5f3df 100644
--- a/Paper-API/src/main/java/org/bukkit/material/DirectionalContainer.java
+++ b/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Dispenser.java b/paper-api/src/main/java/org/bukkit/material/Dispenser.java
index b12993a937..b12993a937 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Dispenser.java
+++ b/paper-api/src/main/java/org/bukkit/material/Dispenser.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Door.java b/paper-api/src/main/java/org/bukkit/material/Door.java
index d04ece5aba..d04ece5aba 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Door.java
+++ b/paper-api/src/main/java/org/bukkit/material/Door.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Dye.java b/paper-api/src/main/java/org/bukkit/material/Dye.java
index f34f23da74..f34f23da74 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Dye.java
+++ b/paper-api/src/main/java/org/bukkit/material/Dye.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/EnderChest.java b/paper-api/src/main/java/org/bukkit/material/EnderChest.java
index ad232cacd9..ad232cacd9 100644
--- a/Paper-API/src/main/java/org/bukkit/material/EnderChest.java
+++ b/paper-api/src/main/java/org/bukkit/material/EnderChest.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/ExtendedRails.java b/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
index 9b2577f7b5..9b2577f7b5 100644
--- a/Paper-API/src/main/java/org/bukkit/material/ExtendedRails.java
+++ b/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/FlowerPot.java b/paper-api/src/main/java/org/bukkit/material/FlowerPot.java
index 6101e33288..6101e33288 100644
--- a/Paper-API/src/main/java/org/bukkit/material/FlowerPot.java
+++ b/paper-api/src/main/java/org/bukkit/material/FlowerPot.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Furnace.java b/paper-api/src/main/java/org/bukkit/material/Furnace.java
index 380f7f4b1f..380f7f4b1f 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Furnace.java
+++ b/paper-api/src/main/java/org/bukkit/material/Furnace.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/FurnaceAndDispenser.java b/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
index effa0d8a95..effa0d8a95 100644
--- a/Paper-API/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
+++ b/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Gate.java b/paper-api/src/main/java/org/bukkit/material/Gate.java
index fc67fc59a7..fc67fc59a7 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Gate.java
+++ b/paper-api/src/main/java/org/bukkit/material/Gate.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Hopper.java b/paper-api/src/main/java/org/bukkit/material/Hopper.java
index cfd32666c2..cfd32666c2 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Hopper.java
+++ b/paper-api/src/main/java/org/bukkit/material/Hopper.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Ladder.java b/paper-api/src/main/java/org/bukkit/material/Ladder.java
index de26353082..de26353082 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Ladder.java
+++ b/paper-api/src/main/java/org/bukkit/material/Ladder.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Leaves.java b/paper-api/src/main/java/org/bukkit/material/Leaves.java
index 923a794ac1..923a794ac1 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Leaves.java
+++ b/paper-api/src/main/java/org/bukkit/material/Leaves.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Lever.java b/paper-api/src/main/java/org/bukkit/material/Lever.java
index 09f290f889..09f290f889 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Lever.java
+++ b/paper-api/src/main/java/org/bukkit/material/Lever.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/LongGrass.java b/paper-api/src/main/java/org/bukkit/material/LongGrass.java
index 497857ec37..497857ec37 100644
--- a/Paper-API/src/main/java/org/bukkit/material/LongGrass.java
+++ b/paper-api/src/main/java/org/bukkit/material/LongGrass.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/MaterialData.java b/paper-api/src/main/java/org/bukkit/material/MaterialData.java
index ccaddb8792..ccaddb8792 100644
--- a/Paper-API/src/main/java/org/bukkit/material/MaterialData.java
+++ b/paper-api/src/main/java/org/bukkit/material/MaterialData.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/MonsterEggs.java b/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
index 2fac218f1e..2fac218f1e 100644
--- a/Paper-API/src/main/java/org/bukkit/material/MonsterEggs.java
+++ b/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Mushroom.java b/paper-api/src/main/java/org/bukkit/material/Mushroom.java
index 8927b307ad..8927b307ad 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Mushroom.java
+++ b/paper-api/src/main/java/org/bukkit/material/Mushroom.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/NetherWarts.java b/paper-api/src/main/java/org/bukkit/material/NetherWarts.java
index 1fed8b937a..1fed8b937a 100644
--- a/Paper-API/src/main/java/org/bukkit/material/NetherWarts.java
+++ b/paper-api/src/main/java/org/bukkit/material/NetherWarts.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Observer.java b/paper-api/src/main/java/org/bukkit/material/Observer.java
index 843790b331..843790b331 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Observer.java
+++ b/paper-api/src/main/java/org/bukkit/material/Observer.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Openable.java b/paper-api/src/main/java/org/bukkit/material/Openable.java
index 597036bad6..597036bad6 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Openable.java
+++ b/paper-api/src/main/java/org/bukkit/material/Openable.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/PistonBaseMaterial.java b/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
index 8165e94339..8165e94339 100644
--- a/Paper-API/src/main/java/org/bukkit/material/PistonBaseMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/PistonExtensionMaterial.java b/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
index e7cfc7158b..e7cfc7158b 100644
--- a/Paper-API/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/PoweredRail.java b/paper-api/src/main/java/org/bukkit/material/PoweredRail.java
index feebc5c735..feebc5c735 100644
--- a/Paper-API/src/main/java/org/bukkit/material/PoweredRail.java
+++ b/paper-api/src/main/java/org/bukkit/material/PoweredRail.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/PressurePlate.java b/paper-api/src/main/java/org/bukkit/material/PressurePlate.java
index ffababbc1b..ffababbc1b 100644
--- a/Paper-API/src/main/java/org/bukkit/material/PressurePlate.java
+++ b/paper-api/src/main/java/org/bukkit/material/PressurePlate.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/PressureSensor.java b/paper-api/src/main/java/org/bukkit/material/PressureSensor.java
index de20bd39c5..de20bd39c5 100644
--- a/Paper-API/src/main/java/org/bukkit/material/PressureSensor.java
+++ b/paper-api/src/main/java/org/bukkit/material/PressureSensor.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Pumpkin.java b/paper-api/src/main/java/org/bukkit/material/Pumpkin.java
index 7c1b5eea0a..7c1b5eea0a 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Pumpkin.java
+++ b/paper-api/src/main/java/org/bukkit/material/Pumpkin.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Rails.java b/paper-api/src/main/java/org/bukkit/material/Rails.java
index 0b041ee66c..0b041ee66c 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Rails.java
+++ b/paper-api/src/main/java/org/bukkit/material/Rails.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Redstone.java b/paper-api/src/main/java/org/bukkit/material/Redstone.java
index b15c141f1d..b15c141f1d 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Redstone.java
+++ b/paper-api/src/main/java/org/bukkit/material/Redstone.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/RedstoneTorch.java b/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
index 4095691436..4095691436 100644
--- a/Paper-API/src/main/java/org/bukkit/material/RedstoneTorch.java
+++ b/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/RedstoneWire.java b/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
index 8877ef48eb..8877ef48eb 100644
--- a/Paper-API/src/main/java/org/bukkit/material/RedstoneWire.java
+++ b/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Sandstone.java b/paper-api/src/main/java/org/bukkit/material/Sandstone.java
index 8d8673edcd..8d8673edcd 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Sandstone.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sandstone.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Sapling.java b/paper-api/src/main/java/org/bukkit/material/Sapling.java
index c615a00222..c615a00222 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Sapling.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sapling.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Sign.java b/paper-api/src/main/java/org/bukkit/material/Sign.java
index 3b32679b4a..3b32679b4a 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Sign.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sign.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java b/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
index 6267d81ba2..6267d81ba2 100644
--- a/Paper-API/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
+++ b/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Skull.java b/paper-api/src/main/java/org/bukkit/material/Skull.java
index a73ad62468..a73ad62468 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Skull.java
+++ b/paper-api/src/main/java/org/bukkit/material/Skull.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/SmoothBrick.java b/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
index e4812b7cef..e4812b7cef 100644
--- a/Paper-API/src/main/java/org/bukkit/material/SmoothBrick.java
+++ b/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/SpawnEgg.java b/paper-api/src/main/java/org/bukkit/material/SpawnEgg.java
index a177021d25..a177021d25 100644
--- a/Paper-API/src/main/java/org/bukkit/material/SpawnEgg.java
+++ b/paper-api/src/main/java/org/bukkit/material/SpawnEgg.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Stairs.java b/paper-api/src/main/java/org/bukkit/material/Stairs.java
index e5db60bd0d..e5db60bd0d 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Stairs.java
+++ b/paper-api/src/main/java/org/bukkit/material/Stairs.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Step.java b/paper-api/src/main/java/org/bukkit/material/Step.java
index 10c0465cf5..10c0465cf5 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Step.java
+++ b/paper-api/src/main/java/org/bukkit/material/Step.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/TexturedMaterial.java b/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
index 6e0a834794..6e0a834794 100644
--- a/Paper-API/src/main/java/org/bukkit/material/TexturedMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Torch.java b/paper-api/src/main/java/org/bukkit/material/Torch.java
index a4f0c62dcd..a4f0c62dcd 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Torch.java
+++ b/paper-api/src/main/java/org/bukkit/material/Torch.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/TrapDoor.java b/paper-api/src/main/java/org/bukkit/material/TrapDoor.java
index effedfc714..effedfc714 100644
--- a/Paper-API/src/main/java/org/bukkit/material/TrapDoor.java
+++ b/paper-api/src/main/java/org/bukkit/material/TrapDoor.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Tree.java b/paper-api/src/main/java/org/bukkit/material/Tree.java
index e759f50339..e759f50339 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Tree.java
+++ b/paper-api/src/main/java/org/bukkit/material/Tree.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Tripwire.java b/paper-api/src/main/java/org/bukkit/material/Tripwire.java
index e5ffa4db87..e5ffa4db87 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Tripwire.java
+++ b/paper-api/src/main/java/org/bukkit/material/Tripwire.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/TripwireHook.java b/paper-api/src/main/java/org/bukkit/material/TripwireHook.java
index 80aa1c7bc7..80aa1c7bc7 100644
--- a/Paper-API/src/main/java/org/bukkit/material/TripwireHook.java
+++ b/paper-api/src/main/java/org/bukkit/material/TripwireHook.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Vine.java b/paper-api/src/main/java/org/bukkit/material/Vine.java
index 07a4f3b151..07a4f3b151 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Vine.java
+++ b/paper-api/src/main/java/org/bukkit/material/Vine.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Wood.java b/paper-api/src/main/java/org/bukkit/material/Wood.java
index 5d51c9286d..5d51c9286d 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Wood.java
+++ b/paper-api/src/main/java/org/bukkit/material/Wood.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/WoodenStep.java b/paper-api/src/main/java/org/bukkit/material/WoodenStep.java
index b99a9a304d..b99a9a304d 100644
--- a/Paper-API/src/main/java/org/bukkit/material/WoodenStep.java
+++ b/paper-api/src/main/java/org/bukkit/material/WoodenStep.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/Wool.java b/paper-api/src/main/java/org/bukkit/material/Wool.java
index 3b17409a98..3b17409a98 100644
--- a/Paper-API/src/main/java/org/bukkit/material/Wool.java
+++ b/paper-api/src/main/java/org/bukkit/material/Wool.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/package-info.java b/paper-api/src/main/java/org/bukkit/material/package-info.java
index f3be435e59..f3be435e59 100644
--- a/Paper-API/src/main/java/org/bukkit/material/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/material/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
index e99644eae1..e99644eae1 100644
--- a/Paper-API/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
+++ b/paper-api/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
diff --git a/Paper-API/src/main/java/org/bukkit/material/types/package-info.java b/paper-api/src/main/java/org/bukkit/material/types/package-info.java
index da10d8001f..da10d8001f 100644
--- a/Paper-API/src/main/java/org/bukkit/material/types/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/material/types/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/FixedMetadataValue.java b/paper-api/src/main/java/org/bukkit/metadata/FixedMetadataValue.java
index 4ded655310..4ded655310 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/FixedMetadataValue.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/FixedMetadataValue.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/LazyMetadataValue.java b/paper-api/src/main/java/org/bukkit/metadata/LazyMetadataValue.java
index 12ba7489fa..12ba7489fa 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/LazyMetadataValue.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/LazyMetadataValue.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataConversionException.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataConversionException.java
index a3def46a47..a3def46a47 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataConversionException.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataConversionException.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataEvaluationException.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataEvaluationException.java
index 918e7c8393..918e7c8393 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataEvaluationException.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataEvaluationException.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataStore.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataStore.java
index 29f86fa938..29f86fa938 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataStore.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataStore.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index a298baaa7a..a298baaa7a 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataValue.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataValue.java
index 4b4d57924b..4b4d57924b 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataValue.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataValue.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java b/paper-api/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
index 162aedc984..162aedc984 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/Metadatable.java b/paper-api/src/main/java/org/bukkit/metadata/Metadatable.java
index b35f41a15f..b35f41a15f 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/Metadatable.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/Metadatable.java
diff --git a/Paper-API/src/main/java/org/bukkit/metadata/package-info.java b/paper-api/src/main/java/org/bukkit/metadata/package-info.java
index f8e00397a1..f8e00397a1 100644
--- a/Paper-API/src/main/java/org/bukkit/metadata/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/metadata/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/package-info.java b/paper-api/src/main/java/org/bukkit/package-info.java
index d09f36f666..d09f36f666 100644
--- a/Paper-API/src/main/java/org/bukkit/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/packs/DataPack.java b/paper-api/src/main/java/org/bukkit/packs/DataPack.java
index ab512c7ee9..ab512c7ee9 100644
--- a/Paper-API/src/main/java/org/bukkit/packs/DataPack.java
+++ b/paper-api/src/main/java/org/bukkit/packs/DataPack.java
diff --git a/Paper-API/src/main/java/org/bukkit/packs/DataPackManager.java b/paper-api/src/main/java/org/bukkit/packs/DataPackManager.java
index 2cd5050462..2cd5050462 100644
--- a/Paper-API/src/main/java/org/bukkit/packs/DataPackManager.java
+++ b/paper-api/src/main/java/org/bukkit/packs/DataPackManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/packs/package-info.java b/paper-api/src/main/java/org/bukkit/packs/package-info.java
index 90a767b89a..90a767b89a 100644
--- a/Paper-API/src/main/java/org/bukkit/packs/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/packs/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/Permissible.java b/paper-api/src/main/java/org/bukkit/permissions/Permissible.java
index 26791db3c2..26791db3c2 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/Permissible.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/Permissible.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/PermissibleBase.java b/paper-api/src/main/java/org/bukkit/permissions/PermissibleBase.java
index cd3296fea0..cd3296fea0 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/PermissibleBase.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissibleBase.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/Permission.java b/paper-api/src/main/java/org/bukkit/permissions/Permission.java
index 894f07b91d..894f07b91d 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/Permission.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/Permission.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/PermissionAttachment.java b/paper-api/src/main/java/org/bukkit/permissions/PermissionAttachment.java
index cd8ac371a1..cd8ac371a1 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/PermissionAttachment.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissionAttachment.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/PermissionAttachmentInfo.java b/paper-api/src/main/java/org/bukkit/permissions/PermissionAttachmentInfo.java
index a7f4cd37cf..a7f4cd37cf 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/PermissionAttachmentInfo.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissionAttachmentInfo.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/PermissionDefault.java b/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
index 449df7c798..449df7c798 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/PermissionDefault.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/PermissionRemovedExecutor.java b/paper-api/src/main/java/org/bukkit/permissions/PermissionRemovedExecutor.java
index 4cc9e64718..4cc9e64718 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/PermissionRemovedExecutor.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/PermissionRemovedExecutor.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/ServerOperator.java b/paper-api/src/main/java/org/bukkit/permissions/ServerOperator.java
index 26ed24307b..26ed24307b 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/ServerOperator.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/ServerOperator.java
diff --git a/Paper-API/src/main/java/org/bukkit/permissions/package-info.java b/paper-api/src/main/java/org/bukkit/permissions/package-info.java
index 860abc3f3c..860abc3f3c 100644
--- a/Paper-API/src/main/java/org/bukkit/permissions/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/permissions/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataAdapterContext.java b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataAdapterContext.java
index 8face93f33..8face93f33 100644
--- a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataAdapterContext.java
+++ b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataAdapterContext.java
diff --git a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataContainer.java b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
index da59e75267..da59e75267 100644
--- a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
+++ b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
diff --git a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataHolder.java b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataHolder.java
index 80b277cc57..80b277cc57 100644
--- a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataHolder.java
+++ b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataHolder.java
diff --git a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataType.java b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataType.java
index b27f4568c2..b27f4568c2 100644
--- a/Paper-API/src/main/java/org/bukkit/persistence/PersistentDataType.java
+++ b/paper-api/src/main/java/org/bukkit/persistence/PersistentDataType.java
diff --git a/Paper-API/src/main/java/org/bukkit/persistence/package-info.java b/paper-api/src/main/java/org/bukkit/persistence/package-info.java
index 41f4628d85..41f4628d85 100644
--- a/Paper-API/src/main/java/org/bukkit/persistence/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/persistence/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/AuthorNagException.java b/paper-api/src/main/java/org/bukkit/plugin/AuthorNagException.java
index 6565a44146..6565a44146 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/AuthorNagException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/AuthorNagException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/EventExecutor.java b/paper-api/src/main/java/org/bukkit/plugin/EventExecutor.java
index 60e086be70..60e086be70 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/EventExecutor.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/EventExecutor.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/IllegalPluginAccessException.java b/paper-api/src/main/java/org/bukkit/plugin/IllegalPluginAccessException.java
index b25447dcfd..b25447dcfd 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/IllegalPluginAccessException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/IllegalPluginAccessException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
index 0a77c2e214..0a77c2e214 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/InvalidPluginException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
index 7ddf7b626d..7ddf7b626d 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/InvalidPluginException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/Plugin.java b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java
index 4eb639fbb4..4eb639fbb4 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginAwareness.java b/paper-api/src/main/java/org/bukkit/plugin/PluginAwareness.java
index 3f535ed5d4..3f535ed5d4 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginAwareness.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginAwareness.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginBase.java b/paper-api/src/main/java/org/bukkit/plugin/PluginBase.java
index e773db6da3..e773db6da3 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginBase.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginBase.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
index c0691a8498..c0691a8498 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginDescriptionResolver.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionResolver.java
index 2697841d0a..2697841d0a 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginDescriptionResolver.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionResolver.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginLoadOrder.java b/paper-api/src/main/java/org/bukkit/plugin/PluginLoadOrder.java
index b77436fdda..b77436fdda 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginLoadOrder.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginLoadOrder.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java
index cb530369e6..cb530369e6 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginLoader.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginLogger.java b/paper-api/src/main/java/org/bukkit/plugin/PluginLogger.java
index 0182370014..0182370014 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginLogger.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginLogger.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/PluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/PluginManager.java
index 03213fde83..03213fde83 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/PluginManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/RegisteredListener.java b/paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java
index 3b3d9642a8..3b3d9642a8 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/RegisteredListener.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/RegisteredServiceProvider.java b/paper-api/src/main/java/org/bukkit/plugin/RegisteredServiceProvider.java
index f451719370..f451719370 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/RegisteredServiceProvider.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/RegisteredServiceProvider.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/ServicePriority.java b/paper-api/src/main/java/org/bukkit/plugin/ServicePriority.java
index 4afe0fb32a..4afe0fb32a 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/ServicePriority.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/ServicePriority.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/ServicesManager.java b/paper-api/src/main/java/org/bukkit/plugin/ServicesManager.java
index 5066c938a2..5066c938a2 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/ServicesManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/ServicesManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index fc2dae6916..fc2dae6916 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/SimpleServicesManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimpleServicesManager.java
index f3dd849023..f3dd849023 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/SimpleServicesManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/SimpleServicesManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java b/paper-api/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
index 1d76e30b82..1d76e30b82 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/UnknownDependencyException.java b/paper-api/src/main/java/org/bukkit/plugin/UnknownDependencyException.java
index 310c404196..310c404196 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/UnknownDependencyException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/UnknownDependencyException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index 5cd236965d..5cd236965d 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index eaefbb00e9..eaefbb00e9 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
index e4b6f278a8..e4b6f278a8 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index f9b57b8727..f9b57b8727 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/java/package-info.java b/paper-api/src/main/java/org/bukkit/plugin/java/package-info.java
index c74e70935f..c74e70935f 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/java/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
index 80ef8a2a34..80ef8a2a34 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/ChannelNameTooLongException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
index 2266f17645..2266f17645 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/ChannelNotRegisteredException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/MessageTooLargeException.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/MessageTooLargeException.java
index 61af8c4c1f..61af8c4c1f 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/MessageTooLargeException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/MessageTooLargeException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/Messenger.java
index 682c771884..682c771884 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/Messenger.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/Messenger.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginChannelDirection.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginChannelDirection.java
index 3d7ec2e2e6..3d7ec2e2e6 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginChannelDirection.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginChannelDirection.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageListener.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageListener.java
index eb962efd50..eb962efd50 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageListener.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageListener.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageListenerRegistration.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageListenerRegistration.java
index 1d00296724..1d00296724 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageListenerRegistration.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageListenerRegistration.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
index b84b37fe27..b84b37fe27 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ReservedChannelException.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/ReservedChannelException.java
index 0221f049a1..0221f049a1 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/ReservedChannelException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/ReservedChannelException.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
index 6fda7f3aa6..6fda7f3aa6 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/messaging/package-info.java b/paper-api/src/main/java/org/bukkit/plugin/messaging/package-info.java
index 04cb2b93cd..04cb2b93cd 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/messaging/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/messaging/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/plugin/package-info.java b/paper-api/src/main/java/org/bukkit/plugin/package-info.java
index 76fbe6ba1b..76fbe6ba1b 100644
--- a/Paper-API/src/main/java/org/bukkit/plugin/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/Potion.java b/paper-api/src/main/java/org/bukkit/potion/Potion.java
index 69e7ce6109..69e7ce6109 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/Potion.java
+++ b/paper-api/src/main/java/org/bukkit/potion/Potion.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionBrewer.java b/paper-api/src/main/java/org/bukkit/potion/PotionBrewer.java
index eb189e170b..eb189e170b 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionBrewer.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionBrewer.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionData.java b/paper-api/src/main/java/org/bukkit/potion/PotionData.java
index 3852a092fa..3852a092fa 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionData.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionData.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionEffect.java b/paper-api/src/main/java/org/bukkit/potion/PotionEffect.java
index 037af5fd6d..037af5fd6d 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionEffect.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionEffect.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionEffectType.java b/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java
index 0d81e2d36e..0d81e2d36e 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionEffectType.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
index 718f216c91..718f216c91 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/PotionType.java b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
index 70456f0866..70456f0866 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/PotionType.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
diff --git a/Paper-API/src/main/java/org/bukkit/potion/package-info.java b/paper-api/src/main/java/org/bukkit/potion/package-info.java
index 6dd3454496..6dd3454496 100644
--- a/Paper-API/src/main/java/org/bukkit/potion/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/potion/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/profile/PlayerProfile.java b/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java
index d36b3e3c7e..d36b3e3c7e 100644
--- a/Paper-API/src/main/java/org/bukkit/profile/PlayerProfile.java
+++ b/paper-api/src/main/java/org/bukkit/profile/PlayerProfile.java
diff --git a/Paper-API/src/main/java/org/bukkit/profile/PlayerTextures.java b/paper-api/src/main/java/org/bukkit/profile/PlayerTextures.java
index cb2bd70931..cb2bd70931 100644
--- a/Paper-API/src/main/java/org/bukkit/profile/PlayerTextures.java
+++ b/paper-api/src/main/java/org/bukkit/profile/PlayerTextures.java
diff --git a/Paper-API/src/main/java/org/bukkit/profile/package-info.java b/paper-api/src/main/java/org/bukkit/profile/package-info.java
index 6f3ed4f0df..6f3ed4f0df 100644
--- a/Paper-API/src/main/java/org/bukkit/profile/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/profile/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/projectiles/BlockProjectileSource.java b/paper-api/src/main/java/org/bukkit/projectiles/BlockProjectileSource.java
index 21a3d767ba..21a3d767ba 100644
--- a/Paper-API/src/main/java/org/bukkit/projectiles/BlockProjectileSource.java
+++ b/paper-api/src/main/java/org/bukkit/projectiles/BlockProjectileSource.java
diff --git a/Paper-API/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/paper-api/src/main/java/org/bukkit/projectiles/ProjectileSource.java
index 96ebd30d33..96ebd30d33 100644
--- a/Paper-API/src/main/java/org/bukkit/projectiles/ProjectileSource.java
+++ b/paper-api/src/main/java/org/bukkit/projectiles/ProjectileSource.java
diff --git a/Paper-API/src/main/java/org/bukkit/projectiles/package-info.java b/paper-api/src/main/java/org/bukkit/projectiles/package-info.java
index 5efe7364a8..5efe7364a8 100644
--- a/Paper-API/src/main/java/org/bukkit/projectiles/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/projectiles/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitRunnable.java b/paper-api/src/main/java/org/bukkit/scheduler/BukkitRunnable.java
index 35599aac72..35599aac72 100644
--- a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitRunnable.java
+++ b/paper-api/src/main/java/org/bukkit/scheduler/BukkitRunnable.java
diff --git a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/paper-api/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
index 487b5ca231..487b5ca231 100644
--- a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
+++ b/paper-api/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
diff --git a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitTask.java b/paper-api/src/main/java/org/bukkit/scheduler/BukkitTask.java
index 5125158493..5125158493 100644
--- a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitTask.java
+++ b/paper-api/src/main/java/org/bukkit/scheduler/BukkitTask.java
diff --git a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitWorker.java b/paper-api/src/main/java/org/bukkit/scheduler/BukkitWorker.java
index 81bdc9ceaf..81bdc9ceaf 100644
--- a/Paper-API/src/main/java/org/bukkit/scheduler/BukkitWorker.java
+++ b/paper-api/src/main/java/org/bukkit/scheduler/BukkitWorker.java
diff --git a/Paper-API/src/main/java/org/bukkit/scheduler/package-info.java b/paper-api/src/main/java/org/bukkit/scheduler/package-info.java
index c441df6798..c441df6798 100644
--- a/Paper-API/src/main/java/org/bukkit/scheduler/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/scheduler/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Criteria.java b/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java
index 3bc3abaf09..3bc3abaf09 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Criteria.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Criterias.java b/paper-api/src/main/java/org/bukkit/scoreboard/Criterias.java
index 66f05a87bd..66f05a87bd 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Criterias.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Criterias.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/DisplaySlot.java b/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
index 21cd2ba659..21cd2ba659 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/NameTagVisibility.java b/paper-api/src/main/java/org/bukkit/scoreboard/NameTagVisibility.java
index d9e9ae1a97..d9e9ae1a97 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/NameTagVisibility.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/NameTagVisibility.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Objective.java b/paper-api/src/main/java/org/bukkit/scoreboard/Objective.java
index a193ffabb0..a193ffabb0 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Objective.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Objective.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/RenderType.java b/paper-api/src/main/java/org/bukkit/scoreboard/RenderType.java
index f169f8726d..f169f8726d 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/RenderType.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/RenderType.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Score.java b/paper-api/src/main/java/org/bukkit/scoreboard/Score.java
index 1eaa9a93f8..1eaa9a93f8 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Score.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Score.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/paper-api/src/main/java/org/bukkit/scoreboard/Scoreboard.java
index 30e2b9484c..30e2b9484c 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Scoreboard.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Scoreboard.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java b/paper-api/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java
index e4f0597568..e4f0597568 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/ScoreboardManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/Team.java b/paper-api/src/main/java/org/bukkit/scoreboard/Team.java
index cacb58d25c..cacb58d25c 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Team.java
diff --git a/Paper-API/src/main/java/org/bukkit/scoreboard/package-info.java b/paper-api/src/main/java/org/bukkit/scoreboard/package-info.java
index 4d0b7e206b..4d0b7e206b 100644
--- a/Paper-API/src/main/java/org/bukkit/scoreboard/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/structure/Palette.java b/paper-api/src/main/java/org/bukkit/structure/Palette.java
index 883189e548..883189e548 100644
--- a/Paper-API/src/main/java/org/bukkit/structure/Palette.java
+++ b/paper-api/src/main/java/org/bukkit/structure/Palette.java
diff --git a/Paper-API/src/main/java/org/bukkit/structure/Structure.java b/paper-api/src/main/java/org/bukkit/structure/Structure.java
index ad78225119..ad78225119 100644
--- a/Paper-API/src/main/java/org/bukkit/structure/Structure.java
+++ b/paper-api/src/main/java/org/bukkit/structure/Structure.java
diff --git a/Paper-API/src/main/java/org/bukkit/structure/StructureManager.java b/paper-api/src/main/java/org/bukkit/structure/StructureManager.java
index 78fb239ebc..78fb239ebc 100644
--- a/Paper-API/src/main/java/org/bukkit/structure/StructureManager.java
+++ b/paper-api/src/main/java/org/bukkit/structure/StructureManager.java
diff --git a/Paper-API/src/main/java/org/bukkit/structure/package-info.java b/paper-api/src/main/java/org/bukkit/structure/package-info.java
index 6f1f235276..6f1f235276 100644
--- a/Paper-API/src/main/java/org/bukkit/structure/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/structure/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/BiomeSearchResult.java b/paper-api/src/main/java/org/bukkit/util/BiomeSearchResult.java
index 1e93788d35..1e93788d35 100644
--- a/Paper-API/src/main/java/org/bukkit/util/BiomeSearchResult.java
+++ b/paper-api/src/main/java/org/bukkit/util/BiomeSearchResult.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/BlockIterator.java b/paper-api/src/main/java/org/bukkit/util/BlockIterator.java
index 0cf54e89ed..0cf54e89ed 100644
--- a/Paper-API/src/main/java/org/bukkit/util/BlockIterator.java
+++ b/paper-api/src/main/java/org/bukkit/util/BlockIterator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/BlockTransformer.java b/paper-api/src/main/java/org/bukkit/util/BlockTransformer.java
index 7f430519c0..7f430519c0 100644
--- a/Paper-API/src/main/java/org/bukkit/util/BlockTransformer.java
+++ b/paper-api/src/main/java/org/bukkit/util/BlockTransformer.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/BlockVector.java b/paper-api/src/main/java/org/bukkit/util/BlockVector.java
index eddc724890..eddc724890 100644
--- a/Paper-API/src/main/java/org/bukkit/util/BlockVector.java
+++ b/paper-api/src/main/java/org/bukkit/util/BlockVector.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/BoundingBox.java b/paper-api/src/main/java/org/bukkit/util/BoundingBox.java
index 5017b73bce..5017b73bce 100644
--- a/Paper-API/src/main/java/org/bukkit/util/BoundingBox.java
+++ b/paper-api/src/main/java/org/bukkit/util/BoundingBox.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/CachedServerIcon.java b/paper-api/src/main/java/org/bukkit/util/CachedServerIcon.java
index b74b21a1ac..b74b21a1ac 100644
--- a/Paper-API/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/paper-api/src/main/java/org/bukkit/util/CachedServerIcon.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/ChatPaginator.java b/paper-api/src/main/java/org/bukkit/util/ChatPaginator.java
index dea3b53c29..dea3b53c29 100644
--- a/Paper-API/src/main/java/org/bukkit/util/ChatPaginator.java
+++ b/paper-api/src/main/java/org/bukkit/util/ChatPaginator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/Consumer.java b/paper-api/src/main/java/org/bukkit/util/Consumer.java
index dd6bfbc439..dd6bfbc439 100644
--- a/Paper-API/src/main/java/org/bukkit/util/Consumer.java
+++ b/paper-api/src/main/java/org/bukkit/util/Consumer.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/EntityTransformer.java b/paper-api/src/main/java/org/bukkit/util/EntityTransformer.java
index d1f44fd90d..d1f44fd90d 100644
--- a/Paper-API/src/main/java/org/bukkit/util/EntityTransformer.java
+++ b/paper-api/src/main/java/org/bukkit/util/EntityTransformer.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/EulerAngle.java b/paper-api/src/main/java/org/bukkit/util/EulerAngle.java
index 201cb4a8c7..201cb4a8c7 100644
--- a/Paper-API/src/main/java/org/bukkit/util/EulerAngle.java
+++ b/paper-api/src/main/java/org/bukkit/util/EulerAngle.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/FileUtil.java b/paper-api/src/main/java/org/bukkit/util/FileUtil.java
index 6e2352a308..6e2352a308 100644
--- a/Paper-API/src/main/java/org/bukkit/util/FileUtil.java
+++ b/paper-api/src/main/java/org/bukkit/util/FileUtil.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/NumberConversions.java b/paper-api/src/main/java/org/bukkit/util/NumberConversions.java
index e10b9a4e53..e10b9a4e53 100644
--- a/Paper-API/src/main/java/org/bukkit/util/NumberConversions.java
+++ b/paper-api/src/main/java/org/bukkit/util/NumberConversions.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/RayTraceResult.java b/paper-api/src/main/java/org/bukkit/util/RayTraceResult.java
index ccda3b3bc6..ccda3b3bc6 100644
--- a/Paper-API/src/main/java/org/bukkit/util/RayTraceResult.java
+++ b/paper-api/src/main/java/org/bukkit/util/RayTraceResult.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/StringUtil.java b/paper-api/src/main/java/org/bukkit/util/StringUtil.java
index adac718562..adac718562 100644
--- a/Paper-API/src/main/java/org/bukkit/util/StringUtil.java
+++ b/paper-api/src/main/java/org/bukkit/util/StringUtil.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/StructureSearchResult.java b/paper-api/src/main/java/org/bukkit/util/StructureSearchResult.java
index 129c14ef4a..129c14ef4a 100644
--- a/Paper-API/src/main/java/org/bukkit/util/StructureSearchResult.java
+++ b/paper-api/src/main/java/org/bukkit/util/StructureSearchResult.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/Transformation.java b/paper-api/src/main/java/org/bukkit/util/Transformation.java
index 39f9e50c7d..39f9e50c7d 100644
--- a/Paper-API/src/main/java/org/bukkit/util/Transformation.java
+++ b/paper-api/src/main/java/org/bukkit/util/Transformation.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/Vector.java b/paper-api/src/main/java/org/bukkit/util/Vector.java
index b98568f1a9..b98568f1a9 100644
--- a/Paper-API/src/main/java/org/bukkit/util/Vector.java
+++ b/paper-api/src/main/java/org/bukkit/util/Vector.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/VoxelShape.java b/paper-api/src/main/java/org/bukkit/util/VoxelShape.java
index 8d8888cd67..8d8888cd67 100644
--- a/Paper-API/src/main/java/org/bukkit/util/VoxelShape.java
+++ b/paper-api/src/main/java/org/bukkit/util/VoxelShape.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java b/paper-api/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java
index 0f8eb97bd5..0f8eb97bd5 100644
--- a/Paper-API/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java
+++ b/paper-api/src/main/java/org/bukkit/util/io/BukkitObjectInputStream.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java b/paper-api/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java
index dd1b9ee5f5..dd1b9ee5f5 100644
--- a/Paper-API/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java
+++ b/paper-api/src/main/java/org/bukkit/util/io/BukkitObjectOutputStream.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/io/Wrapper.java b/paper-api/src/main/java/org/bukkit/util/io/Wrapper.java
index c3496dc8ba..c3496dc8ba 100644
--- a/Paper-API/src/main/java/org/bukkit/util/io/Wrapper.java
+++ b/paper-api/src/main/java/org/bukkit/util/io/Wrapper.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/io/package-info.java b/paper-api/src/main/java/org/bukkit/util/io/package-info.java
index c4efffbd0b..c4efffbd0b 100644
--- a/Paper-API/src/main/java/org/bukkit/util/io/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/util/io/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/NoiseGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/NoiseGenerator.java
index 16f7532587..16f7532587 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/NoiseGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/NoiseGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/OctaveGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/OctaveGenerator.java
index 618ed706e2..618ed706e2 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/OctaveGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/OctaveGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/PerlinNoiseGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/PerlinNoiseGenerator.java
index 520b65f9e6..520b65f9e6 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/PerlinNoiseGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/PerlinNoiseGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/PerlinOctaveGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/PerlinOctaveGenerator.java
index af7e01188e..af7e01188e 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/PerlinOctaveGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/PerlinOctaveGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/SimplexNoiseGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/SimplexNoiseGenerator.java
index 775d8f4032..775d8f4032 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/SimplexNoiseGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/SimplexNoiseGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/SimplexOctaveGenerator.java b/paper-api/src/main/java/org/bukkit/util/noise/SimplexOctaveGenerator.java
index 6cc15431e1..6cc15431e1 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/SimplexOctaveGenerator.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/SimplexOctaveGenerator.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/noise/package-info.java b/paper-api/src/main/java/org/bukkit/util/noise/package-info.java
index 8dd1501c52..8dd1501c52 100644
--- a/Paper-API/src/main/java/org/bukkit/util/noise/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/util/noise/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/package-info.java b/paper-api/src/main/java/org/bukkit/util/package-info.java
index 58176d08bd..58176d08bd 100644
--- a/Paper-API/src/main/java/org/bukkit/util/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/util/package-info.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/permissions/BroadcastPermissions.java b/paper-api/src/main/java/org/bukkit/util/permissions/BroadcastPermissions.java
index 54bc413700..54bc413700 100644
--- a/Paper-API/src/main/java/org/bukkit/util/permissions/BroadcastPermissions.java
+++ b/paper-api/src/main/java/org/bukkit/util/permissions/BroadcastPermissions.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/paper-api/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
index 7763d6101a..7763d6101a 100644
--- a/Paper-API/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
+++ b/paper-api/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java b/paper-api/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
index e1a4ddf2c0..e1a4ddf2c0 100644
--- a/Paper-API/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
+++ b/paper-api/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
diff --git a/Paper-API/src/main/java/org/bukkit/util/permissions/package-info.java b/paper-api/src/main/java/org/bukkit/util/permissions/package-info.java
index 07498118d1..07498118d1 100644
--- a/Paper-API/src/main/java/org/bukkit/util/permissions/package-info.java
+++ b/paper-api/src/main/java/org/bukkit/util/permissions/package-info.java
diff --git a/Paper-API/src/main/java/org/spigotmc/CustomTimingsHandler.java b/paper-api/src/main/java/org/spigotmc/CustomTimingsHandler.java
index 12946bd55f..12946bd55f 100644
--- a/Paper-API/src/main/java/org/spigotmc/CustomTimingsHandler.java
+++ b/paper-api/src/main/java/org/spigotmc/CustomTimingsHandler.java
diff --git a/Paper-API/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/paper-api/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
index a7632c8f5c..a7632c8f5c 100644
--- a/Paper-API/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+++ b/paper-api/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
diff --git a/Paper-API/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java b/paper-api/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
index de9c41effe..de9c41effe 100644
--- a/Paper-API/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
+++ b/paper-api/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
diff --git a/Paper-API/src/main/java/org/spigotmc/event/entity/package-info.java b/paper-api/src/main/java/org/spigotmc/event/entity/package-info.java
index 264664eb99..264664eb99 100644
--- a/Paper-API/src/main/java/org/spigotmc/event/entity/package-info.java
+++ b/paper-api/src/main/java/org/spigotmc/event/entity/package-info.java
diff --git a/Paper-API/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java b/paper-api/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java
index 2515887c20..2515887c20 100644
--- a/Paper-API/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java
+++ b/paper-api/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java
diff --git a/Paper-API/src/main/java/org/spigotmc/event/player/package-info.java b/paper-api/src/main/java/org/spigotmc/event/player/package-info.java
index 6a2d5d84e5..6a2d5d84e5 100644
--- a/Paper-API/src/main/java/org/spigotmc/event/player/package-info.java
+++ b/paper-api/src/main/java/org/spigotmc/event/player/package-info.java
diff --git a/Paper-API/src/main/java/org/spigotmc/package-info.java b/paper-api/src/main/java/org/spigotmc/package-info.java
index a287faff5f..a287faff5f 100644
--- a/Paper-API/src/main/java/org/spigotmc/package-info.java
+++ b/paper-api/src/main/java/org/spigotmc/package-info.java
diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommand.java b/paper-api/src/main/java/paper/brigadier/BukkitBrigadierCommand.java
index 0b1af3a8d4..0b1af3a8d4 100644
--- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommand.java
+++ b/paper-api/src/main/java/paper/brigadier/BukkitBrigadierCommand.java
diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommandSource.java b/paper-api/src/main/java/paper/brigadier/BukkitBrigadierCommandSource.java
index 7a0e81658c..7a0e81658c 100644
--- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommandSource.java
+++ b/paper-api/src/main/java/paper/brigadier/BukkitBrigadierCommandSource.java
diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java b/paper-api/src/main/java/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java
index 495b0f0d2f..495b0f0d2f 100644
--- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java
+++ b/paper-api/src/main/java/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java
diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java b/paper-api/src/main/java/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java
index 4755ab24a6..4755ab24a6 100644
--- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java
+++ b/paper-api/src/main/java/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java
diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/CommandRegisteredEvent.java b/paper-api/src/main/java/paper/event/brigadier/CommandRegisteredEvent.java
index eb0409d816..eb0409d816 100644
--- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/CommandRegisteredEvent.java
+++ b/paper-api/src/main/java/paper/event/brigadier/CommandRegisteredEvent.java
diff --git a/Paper-API/src/main/javadoc/org/bukkit/plugin/doc-files/permissions-example_plugin.yml b/paper-api/src/main/javadoc/org/bukkit/plugin/doc-files/permissions-example_plugin.yml
index 34d0381a68..34d0381a68 100644
--- a/Paper-API/src/main/javadoc/org/bukkit/plugin/doc-files/permissions-example_plugin.yml
+++ b/paper-api/src/main/javadoc/org/bukkit/plugin/doc-files/permissions-example_plugin.yml
diff --git a/Paper-API/src/main/javadoc/overview.html b/paper-api/src/main/javadoc/overview.html
index b477a2259b..b477a2259b 100644
--- a/Paper-API/src/main/javadoc/overview.html
+++ b/paper-api/src/main/javadoc/overview.html
diff --git a/Paper-API/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/paper-api/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
index 82ee9a486d..82ee9a486d 100644
--- a/Paper-API/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
+++ b/paper-api/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
diff --git a/Paper-API/src/test/java/io/papermc/paper/EntityTagsTest.java b/paper-api/src/test/java/io/papermc/paper/EntityTagsTest.java
index 91d70cc703..91d70cc703 100644
--- a/Paper-API/src/test/java/io/papermc/paper/EntityTagsTest.java
+++ b/paper-api/src/test/java/io/papermc/paper/EntityTagsTest.java
diff --git a/Paper-API/src/test/java/io/papermc/paper/adventure/KeyTest.java b/paper-api/src/test/java/io/papermc/paper/adventure/KeyTest.java
index 7ede17d603..7ede17d603 100644
--- a/Paper-API/src/test/java/io/papermc/paper/adventure/KeyTest.java
+++ b/paper-api/src/test/java/io/papermc/paper/adventure/KeyTest.java
diff --git a/Paper-API/src/test/java/io/papermc/paper/testing/EmptyTag.java b/paper-api/src/test/java/io/papermc/paper/testing/EmptyTag.java
index 77154095cf..77154095cf 100644
--- a/Paper-API/src/test/java/io/papermc/paper/testing/EmptyTag.java
+++ b/paper-api/src/test/java/io/papermc/paper/testing/EmptyTag.java
diff --git a/Paper-API/src/test/java/io/papermc/paper/util/TickTest.java b/paper-api/src/test/java/io/papermc/paper/util/TickTest.java
index f147d909f2..f147d909f2 100644
--- a/Paper-API/src/test/java/io/papermc/paper/util/TickTest.java
+++ b/paper-api/src/test/java/io/papermc/paper/util/TickTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/AnnotationTest.java b/paper-api/src/test/java/org/bukkit/AnnotationTest.java
index 88f1ca89fa..88f1ca89fa 100644
--- a/Paper-API/src/test/java/org/bukkit/AnnotationTest.java
+++ b/paper-api/src/test/java/org/bukkit/AnnotationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/ArtTest.java b/paper-api/src/test/java/org/bukkit/ArtTest.java
index 102f4705f1..102f4705f1 100644
--- a/Paper-API/src/test/java/org/bukkit/ArtTest.java
+++ b/paper-api/src/test/java/org/bukkit/ArtTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/BukkitMirrorTest.java b/paper-api/src/test/java/org/bukkit/BukkitMirrorTest.java
index 5974ceea58..5974ceea58 100644
--- a/Paper-API/src/test/java/org/bukkit/BukkitMirrorTest.java
+++ b/paper-api/src/test/java/org/bukkit/BukkitMirrorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/ChatColorTest.java b/paper-api/src/test/java/org/bukkit/ChatColorTest.java
index 11c0f86891..11c0f86891 100644
--- a/Paper-API/src/test/java/org/bukkit/ChatColorTest.java
+++ b/paper-api/src/test/java/org/bukkit/ChatColorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/ChatPaginatorTest.java b/paper-api/src/test/java/org/bukkit/ChatPaginatorTest.java
index 2d7c545930..2d7c545930 100644
--- a/Paper-API/src/test/java/org/bukkit/ChatPaginatorTest.java
+++ b/paper-api/src/test/java/org/bukkit/ChatPaginatorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/CoalTypeTest.java b/paper-api/src/test/java/org/bukkit/CoalTypeTest.java
index 9373bfd2b7..9373bfd2b7 100644
--- a/Paper-API/src/test/java/org/bukkit/CoalTypeTest.java
+++ b/paper-api/src/test/java/org/bukkit/CoalTypeTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/ColorTest.java b/paper-api/src/test/java/org/bukkit/ColorTest.java
index f29fd7bc65..f29fd7bc65 100644
--- a/Paper-API/src/test/java/org/bukkit/ColorTest.java
+++ b/paper-api/src/test/java/org/bukkit/ColorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/CropStateTest.java b/paper-api/src/test/java/org/bukkit/CropStateTest.java
index 6efe3f1c33..6efe3f1c33 100644
--- a/Paper-API/src/test/java/org/bukkit/CropStateTest.java
+++ b/paper-api/src/test/java/org/bukkit/CropStateTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/DifficultyTest.java b/paper-api/src/test/java/org/bukkit/DifficultyTest.java
index 37623027c0..37623027c0 100644
--- a/Paper-API/src/test/java/org/bukkit/DifficultyTest.java
+++ b/paper-api/src/test/java/org/bukkit/DifficultyTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/DyeColorTest.java b/paper-api/src/test/java/org/bukkit/DyeColorTest.java
index 4e9ff14fcd..4e9ff14fcd 100644
--- a/Paper-API/src/test/java/org/bukkit/DyeColorTest.java
+++ b/paper-api/src/test/java/org/bukkit/DyeColorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/EffectTest.java b/paper-api/src/test/java/org/bukkit/EffectTest.java
index 615a4583ef..615a4583ef 100644
--- a/Paper-API/src/test/java/org/bukkit/EffectTest.java
+++ b/paper-api/src/test/java/org/bukkit/EffectTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/GameModeTest.java b/paper-api/src/test/java/org/bukkit/GameModeTest.java
index c5d3a15132..c5d3a15132 100644
--- a/Paper-API/src/test/java/org/bukkit/GameModeTest.java
+++ b/paper-api/src/test/java/org/bukkit/GameModeTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/GrassSpeciesTest.java b/paper-api/src/test/java/org/bukkit/GrassSpeciesTest.java
index 6739dc240c..6739dc240c 100644
--- a/Paper-API/src/test/java/org/bukkit/GrassSpeciesTest.java
+++ b/paper-api/src/test/java/org/bukkit/GrassSpeciesTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/InstrumentTest.java b/paper-api/src/test/java/org/bukkit/InstrumentTest.java
index b177a47a5b..b177a47a5b 100644
--- a/Paper-API/src/test/java/org/bukkit/InstrumentTest.java
+++ b/paper-api/src/test/java/org/bukkit/InstrumentTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/LastChatColorTest.java b/paper-api/src/test/java/org/bukkit/LastChatColorTest.java
index 3d1c839cc7..3d1c839cc7 100644
--- a/Paper-API/src/test/java/org/bukkit/LastChatColorTest.java
+++ b/paper-api/src/test/java/org/bukkit/LastChatColorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/LocationTest.java b/paper-api/src/test/java/org/bukkit/LocationTest.java
index 35a98c1457..35a98c1457 100644
--- a/Paper-API/src/test/java/org/bukkit/LocationTest.java
+++ b/paper-api/src/test/java/org/bukkit/LocationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/MaterialTest.java b/paper-api/src/test/java/org/bukkit/MaterialTest.java
index 818aa21d3b..818aa21d3b 100644
--- a/Paper-API/src/test/java/org/bukkit/MaterialTest.java
+++ b/paper-api/src/test/java/org/bukkit/MaterialTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/NamespacedKeyTest.java b/paper-api/src/test/java/org/bukkit/NamespacedKeyTest.java
index 6317798e43..6317798e43 100644
--- a/Paper-API/src/test/java/org/bukkit/NamespacedKeyTest.java
+++ b/paper-api/src/test/java/org/bukkit/NamespacedKeyTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/NoteTest.java b/paper-api/src/test/java/org/bukkit/NoteTest.java
index 616f4ce9bf..616f4ce9bf 100644
--- a/Paper-API/src/test/java/org/bukkit/NoteTest.java
+++ b/paper-api/src/test/java/org/bukkit/NoteTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/TreeSpeciesTest.java b/paper-api/src/test/java/org/bukkit/TreeSpeciesTest.java
index 66401d83bd..66401d83bd 100644
--- a/Paper-API/src/test/java/org/bukkit/TreeSpeciesTest.java
+++ b/paper-api/src/test/java/org/bukkit/TreeSpeciesTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/WorldTypeTest.java b/paper-api/src/test/java/org/bukkit/WorldTypeTest.java
index 651499066c..651499066c 100644
--- a/Paper-API/src/test/java/org/bukkit/WorldTypeTest.java
+++ b/paper-api/src/test/java/org/bukkit/WorldTypeTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java b/paper-api/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
index ee5bc86f47..ee5bc86f47 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/ConfigurationSectionTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/ConfigurationTest.java b/paper-api/src/test/java/org/bukkit/configuration/ConfigurationTest.java
index e5d9269176..e5d9269176 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/ConfigurationTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/ConfigurationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/MemoryConfigurationTest.java b/paper-api/src/test/java/org/bukkit/configuration/MemoryConfigurationTest.java
index 3de0ce9268..3de0ce9268 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/MemoryConfigurationTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/MemoryConfigurationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/MemorySectionTest.java b/paper-api/src/test/java/org/bukkit/configuration/MemorySectionTest.java
index be7768abe5..be7768abe5 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/MemorySectionTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/MemorySectionTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java b/paper-api/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java
index c25303e819..c25303e819 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/file/FileConfigurationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java b/paper-api/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
index 82c7f6ba9c..82c7f6ba9c 100644
--- a/Paper-API/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
+++ b/paper-api/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/conversations/ConversationContextTest.java b/paper-api/src/test/java/org/bukkit/conversations/ConversationContextTest.java
index 48349dfb29..48349dfb29 100644
--- a/Paper-API/src/test/java/org/bukkit/conversations/ConversationContextTest.java
+++ b/paper-api/src/test/java/org/bukkit/conversations/ConversationContextTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/conversations/ConversationTest.java b/paper-api/src/test/java/org/bukkit/conversations/ConversationTest.java
index 8a515b0fed..8a515b0fed 100644
--- a/Paper-API/src/test/java/org/bukkit/conversations/ConversationTest.java
+++ b/paper-api/src/test/java/org/bukkit/conversations/ConversationTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/conversations/FakeConversable.java b/paper-api/src/test/java/org/bukkit/conversations/FakeConversable.java
index 567bfd7d3e..567bfd7d3e 100644
--- a/Paper-API/src/test/java/org/bukkit/conversations/FakeConversable.java
+++ b/paper-api/src/test/java/org/bukkit/conversations/FakeConversable.java
diff --git a/Paper-API/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java b/paper-api/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java
index b0c6eb9344..b0c6eb9344 100644
--- a/Paper-API/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java
+++ b/paper-api/src/test/java/org/bukkit/conversations/ValidatingPromptTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/entity/memory/MemoryKeyTest.java b/paper-api/src/test/java/org/bukkit/entity/memory/MemoryKeyTest.java
index 2e426a9089..2e426a9089 100644
--- a/Paper-API/src/test/java/org/bukkit/entity/memory/MemoryKeyTest.java
+++ b/paper-api/src/test/java/org/bukkit/entity/memory/MemoryKeyTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java b/paper-api/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java
index 346214f24a..346214f24a 100644
--- a/Paper-API/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java
+++ b/paper-api/src/test/java/org/bukkit/event/PlayerChatTabCompleteEventTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/event/TestEvent.java b/paper-api/src/test/java/org/bukkit/event/TestEvent.java
index 25904f5f81..25904f5f81 100644
--- a/Paper-API/src/test/java/org/bukkit/event/TestEvent.java
+++ b/paper-api/src/test/java/org/bukkit/event/TestEvent.java
diff --git a/Paper-API/src/test/java/org/bukkit/materials/MaterialDataTest.java b/paper-api/src/test/java/org/bukkit/materials/MaterialDataTest.java
index 24a8ce4387..24a8ce4387 100644
--- a/Paper-API/src/test/java/org/bukkit/materials/MaterialDataTest.java
+++ b/paper-api/src/test/java/org/bukkit/materials/MaterialDataTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java b/paper-api/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java
index 91584b94b5..91584b94b5 100644
--- a/Paper-API/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java
+++ b/paper-api/src/test/java/org/bukkit/metadata/FixedMetadataValueTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java b/paper-api/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java
index dd2acf3f11..dd2acf3f11 100644
--- a/Paper-API/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java
+++ b/paper-api/src/test/java/org/bukkit/metadata/LazyMetadataValueTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/metadata/MetadataConversionTest.java b/paper-api/src/test/java/org/bukkit/metadata/MetadataConversionTest.java
index 29546b6219..29546b6219 100644
--- a/Paper-API/src/test/java/org/bukkit/metadata/MetadataConversionTest.java
+++ b/paper-api/src/test/java/org/bukkit/metadata/MetadataConversionTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/metadata/MetadataStoreTest.java b/paper-api/src/test/java/org/bukkit/metadata/MetadataStoreTest.java
index e52659f010..e52659f010 100644
--- a/Paper-API/src/test/java/org/bukkit/metadata/MetadataStoreTest.java
+++ b/paper-api/src/test/java/org/bukkit/metadata/MetadataStoreTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java b/paper-api/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java
index 2b6a53b2de..2b6a53b2de 100644
--- a/Paper-API/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java
+++ b/paper-api/src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/plugin/TestPlugin.java b/paper-api/src/test/java/org/bukkit/plugin/TestPlugin.java
index 43b58e920e..43b58e920e 100644
--- a/Paper-API/src/test/java/org/bukkit/plugin/TestPlugin.java
+++ b/paper-api/src/test/java/org/bukkit/plugin/TestPlugin.java
diff --git a/Paper-API/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java b/paper-api/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java
index 9ed416ed57..9ed416ed57 100644
--- a/Paper-API/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java
+++ b/paper-api/src/test/java/org/bukkit/plugin/TimedRegisteredListenerTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/paper-api/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
index 8ffaa33d97..8ffaa33d97 100644
--- a/Paper-API/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
+++ b/paper-api/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java b/paper-api/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java
index 20981f604e..20981f604e 100644
--- a/Paper-API/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java
+++ b/paper-api/src/test/java/org/bukkit/plugin/messaging/TestMessageListener.java
diff --git a/Paper-API/src/test/java/org/bukkit/scoreboard/CriteriaTest.java b/paper-api/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
index 034faf9a44..034faf9a44 100644
--- a/Paper-API/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
+++ b/paper-api/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/support/AbstractTestingBase.java b/paper-api/src/test/java/org/bukkit/support/AbstractTestingBase.java
index 759e1ced83..759e1ced83 100644
--- a/Paper-API/src/test/java/org/bukkit/support/AbstractTestingBase.java
+++ b/paper-api/src/test/java/org/bukkit/support/AbstractTestingBase.java
diff --git a/Paper-API/src/test/java/org/bukkit/support/MatcherAssert.java b/paper-api/src/test/java/org/bukkit/support/MatcherAssert.java
index b100262e88..b100262e88 100644
--- a/Paper-API/src/test/java/org/bukkit/support/MatcherAssert.java
+++ b/paper-api/src/test/java/org/bukkit/support/MatcherAssert.java
diff --git a/Paper-API/src/test/java/org/bukkit/support/TestServer.java b/paper-api/src/test/java/org/bukkit/support/TestServer.java
index b208150297..b208150297 100644
--- a/Paper-API/src/test/java/org/bukkit/support/TestServer.java
+++ b/paper-api/src/test/java/org/bukkit/support/TestServer.java
diff --git a/Paper-API/src/test/java/org/bukkit/util/BoundingBoxTest.java b/paper-api/src/test/java/org/bukkit/util/BoundingBoxTest.java
index 3141c007d1..3141c007d1 100644
--- a/Paper-API/src/test/java/org/bukkit/util/BoundingBoxTest.java
+++ b/paper-api/src/test/java/org/bukkit/util/BoundingBoxTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java b/paper-api/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java
index c93bd4d630..c93bd4d630 100644
--- a/Paper-API/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java
+++ b/paper-api/src/test/java/org/bukkit/util/StringUtilStartsWithTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/util/StringUtilTest.java b/paper-api/src/test/java/org/bukkit/util/StringUtilTest.java
index 87e9146191..87e9146191 100644
--- a/Paper-API/src/test/java/org/bukkit/util/StringUtilTest.java
+++ b/paper-api/src/test/java/org/bukkit/util/StringUtilTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/util/VectorTest.java b/paper-api/src/test/java/org/bukkit/util/VectorTest.java
index f0927a0da5..f0927a0da5 100644
--- a/Paper-API/src/test/java/org/bukkit/util/VectorTest.java
+++ b/paper-api/src/test/java/org/bukkit/util/VectorTest.java
diff --git a/Paper-API/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java b/paper-api/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java
index 7021a44e49..7021a44e49 100644
--- a/Paper-API/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java
+++ b/paper-api/src/test/java/org/bukkit/util/io/BukkitObjectStreamTest.java
diff --git a/Paper-Server/.gitignore b/paper-server/.gitignore
index 9be5b99dea..9be5b99dea 100644
--- a/Paper-Server/.gitignore
+++ b/paper-server/.gitignore
diff --git a/Paper-Server/LGPL.txt b/paper-server/LGPL.txt
index 65c5ca88a6..65c5ca88a6 100644
--- a/Paper-Server/LGPL.txt
+++ b/paper-server/LGPL.txt
diff --git a/Paper-Server/LICENCE.txt b/paper-server/LICENCE.txt
index 94a9ed024d..94a9ed024d 100644
--- a/Paper-Server/LICENCE.txt
+++ b/paper-server/LICENCE.txt
diff --git a/Paper-Server/build.gradle.kts b/paper-server/build.gradle.kts
index a8a6f7f49a..2eaf735e87 100644
--- a/Paper-Server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
@@ -14,7 +14,6 @@ val alsoShade: Configuration by configurations.creating
 
 dependencies {
     implementation(project(":paper-api"))
-    implementation(project(":paper-mojangapi"))
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.21.0")
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
diff --git a/Paper-Server/checkstyle.xml b/paper-server/checkstyle.xml
index b3da3373ac..b3da3373ac 100644
--- a/Paper-Server/checkstyle.xml
+++ b/paper-server/checkstyle.xml
diff --git a/Paper-Server/src/assembly/META-INF/main-class b/paper-server/src/assembly/META-INF/main-class
index 94a6b1554c..94a6b1554c 100644
--- a/Paper-Server/src/assembly/META-INF/main-class
+++ b/paper-server/src/assembly/META-INF/main-class
diff --git a/Paper-Server/src/assembly/bootstrap.xml b/paper-server/src/assembly/bootstrap.xml
index f8980991f5..f8980991f5 100644
--- a/Paper-Server/src/assembly/bootstrap.xml
+++ b/paper-server/src/assembly/bootstrap.xml
diff --git a/Paper-Server/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java b/paper-server/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
index 91547f6e6f..91547f6e6f 100644
--- a/Paper-Server/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
+++ b/paper-server/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
diff --git a/Paper-Server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
index a0724a3ce4..a0724a3ce4 100644
--- a/Paper-Server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/Paper-Server/src/main/java/org/bukkit/craftbukkit/Overridden.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Overridden.java
index 1c19c69f84..1c19c69f84 100644
--- a/Paper-Server/src/main/java/org/bukkit/craftbukkit/Overridden.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Overridden.java
diff --git a/Paper-Server/src/main/resources/META-INF/services/io.papermc.paper.plugin.entrypoint.classloader.ClassloaderBytecodeModifier b/paper-server/src/main/resources/META-INF/services/io.papermc.paper.plugin.entrypoint.classloader.ClassloaderBytecodeModifier
index 20dbe27759..20dbe27759 100644
--- a/Paper-Server/src/main/resources/META-INF/services/io.papermc.paper.plugin.entrypoint.classloader.ClassloaderBytecodeModifier
+++ b/paper-server/src/main/resources/META-INF/services/io.papermc.paper.plugin.entrypoint.classloader.ClassloaderBytecodeModifier
diff --git a/Paper-Server/src/main/resources/META-INF/services/io.papermc.paper.plugin.provider.classloader.PaperClassLoaderStorage b/paper-server/src/main/resources/META-INF/services/io.papermc.paper.plugin.provider.classloader.PaperClassLoaderStorage
index a226472440..a226472440 100644
--- a/Paper-Server/src/main/resources/META-INF/services/io.papermc.paper.plugin.provider.classloader.PaperClassLoaderStorage
+++ b/paper-server/src/main/resources/META-INF/services/io.papermc.paper.plugin.provider.classloader.PaperClassLoaderStorage
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.bossbar.BossBarImplementation$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.bossbar.BossBarImplementation$Provider
index 9b7119d0b8..9b7119d0b8 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.bossbar.BossBarImplementation$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.bossbar.BossBarImplementation$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.event.ClickCallback$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.event.ClickCallback$Provider
index 845711e03c..845711e03c 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.event.ClickCallback$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.event.ClickCallback$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider
index 399bde6e57..399bde6e57 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.minimessage.MiniMessage$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.minimessage.MiniMessage$Provider
index 6ce632b6c9..6ce632b6c9 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.minimessage.MiniMessage$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.minimessage.MiniMessage$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.gson.GsonComponentSerializer$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.gson.GsonComponentSerializer$Provider
index bc9f7398a0..bc9f7398a0 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.gson.GsonComponentSerializer$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.gson.GsonComponentSerializer$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer$Provider
index 820f381981..820f381981 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer$Provider b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer$Provider
index 28d777610b..28d777610b 100644
--- a/Paper-Server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer$Provider
+++ b/paper-server/src/main/resources/META-INF/services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer$Provider
diff --git a/Paper-Server/src/main/resources/META-INF/services/org.bukkit.plugin.PluginLoader b/paper-server/src/main/resources/META-INF/services/org.bukkit.plugin.PluginLoader
index 4f78bc62d0..4f78bc62d0 100644
--- a/Paper-Server/src/main/resources/META-INF/services/org.bukkit.plugin.PluginLoader
+++ b/paper-server/src/main/resources/META-INF/services/org.bukkit.plugin.PluginLoader
diff --git a/Paper-Server/src/main/resources/configurations/bukkit.yml b/paper-server/src/main/resources/configurations/bukkit.yml
index eef7c125b2..eef7c125b2 100644
--- a/Paper-Server/src/main/resources/configurations/bukkit.yml
+++ b/paper-server/src/main/resources/configurations/bukkit.yml
diff --git a/Paper-Server/src/main/resources/configurations/commands.yml b/paper-server/src/main/resources/configurations/commands.yml
index 18f5457120..18f5457120 100644
--- a/Paper-Server/src/main/resources/configurations/commands.yml
+++ b/paper-server/src/main/resources/configurations/commands.yml
diff --git a/Paper-Server/src/main/resources/configurations/help.yml b/paper-server/src/main/resources/configurations/help.yml
index 15c3d07070..15c3d07070 100644
--- a/Paper-Server/src/main/resources/configurations/help.yml
+++ b/paper-server/src/main/resources/configurations/help.yml
diff --git a/Paper-Server/src/main/resources/data/.paperassetsroot b/paper-server/src/main/resources/data/.paperassetsroot
index e69de29bb2..e69de29bb2 100644
--- a/Paper-Server/src/main/resources/data/.paperassetsroot
+++ b/paper-server/src/main/resources/data/.paperassetsroot
diff --git a/Paper-Server/src/main/resources/data/paper/chat_type/raw.json b/paper-server/src/main/resources/data/paper/chat_type/raw.json
index 3aedd0bbc9..3aedd0bbc9 100644
--- a/Paper-Server/src/main/resources/data/paper/chat_type/raw.json
+++ b/paper-server/src/main/resources/data/paper/chat_type/raw.json
diff --git a/Paper-Server/src/main/resources/log4j2.component.properties b/paper-server/src/main/resources/log4j2.component.properties
index 0694b21465..0694b21465 100644
--- a/Paper-Server/src/main/resources/log4j2.component.properties
+++ b/paper-server/src/main/resources/log4j2.component.properties
diff --git a/Paper-Server/src/main/resources/log4j2.xml b/paper-server/src/main/resources/log4j2.xml
index ea4e2161c0..ea4e2161c0 100644
--- a/Paper-Server/src/main/resources/log4j2.xml
+++ b/paper-server/src/main/resources/log4j2.xml
diff --git a/test-plugin/build.gradle.kts b/paper-test-plugin/build.gradle.kts
index f280918aaa..3fb24f3f13 100644
--- a/test-plugin/build.gradle.kts
+++ b/paper-test-plugin/build.gradle.kts
@@ -2,7 +2,6 @@ version = "1.0.0-SNAPSHOT"
 
 dependencies {
     compileOnly(project(":paper-api"))
-    compileOnly(project(":paper-mojangapi"))
 }
 
 tasks.processResources {
diff --git a/test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java
index 4e68423bb7..4e68423bb7 100644
--- a/test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java
+++ b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java
diff --git a/test-plugin/src/main/java/io/papermc/testplugin/TestPluginBootstrap.java b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPluginBootstrap.java
index e978b15f97..e978b15f97 100644
--- a/test-plugin/src/main/java/io/papermc/testplugin/TestPluginBootstrap.java
+++ b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPluginBootstrap.java
diff --git a/test-plugin/src/main/java/io/papermc/testplugin/TestPluginLoader.java b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPluginLoader.java
index 084899a9fe..084899a9fe 100644
--- a/test-plugin/src/main/java/io/papermc/testplugin/TestPluginLoader.java
+++ b/paper-test-plugin/src/main/java/io/papermc/testplugin/TestPluginLoader.java
diff --git a/test-plugin/src/main/resources/paper-plugin.yml b/paper-test-plugin/src/main/resources/paper-plugin.yml
index 459345d794..459345d794 100644
--- a/test-plugin/src/main/resources/paper-plugin.yml
+++ b/paper-test-plugin/src/main/resources/paper-plugin.yml
diff --git a/patches/sources/net/minecraft/CrashReport.java.patch b/patches/sources/net/minecraft/CrashReport.java.patch
index 3ad30e262d..d0d97d45dc 100644
--- a/patches/sources/net/minecraft/CrashReport.java.patch
+++ b/patches/sources/net/minecraft/CrashReport.java.patch
@@ -1,5 +1,3 @@
-AT: private+f getTitle()Ljava/lang/String;
-AT: public+f saveFile
 --- a/net/minecraft/CrashReport.java
 +++ b/net/minecraft/CrashReport.java
 @@ -35,10 +35,11 @@
@@ -11,7 +9,7 @@ AT: public+f saveFile
  
      private final String getTitle() {
 -        return this.title;
-+        return this.title; // FIXME
++        return this.title; // Test
      }
  
      public Throwable getException() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f82a978a40..4377bd6c7a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -34,13 +34,13 @@ if (!file(".git").exists()) {
 
 rootProject.name = "paper"
 
-for (name in listOf("Paper-API", "Paper-Server", "Paper-MojangAPI")) {
+for (name in listOf("paper-api", "paper-server")) {
     val projName = name.lowercase(Locale.ENGLISH)
     include(projName)
     findProject(":$projName")!!.projectDir = file(name)
 }
 
-optionalInclude("test-plugin")
+optionalInclude("paper-test-plugin")
 optionalInclude("paper-api-generator")
 
 fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {