Drop no longer needed patch (#6115)

LICENSE.md

@@ -41,7 +41,7 @@ rickyboy320 <rickw320@hotmail.com>
 DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 JRoy <joshroy126@gmail.com>
 ysl3000 <yannicklamprecht@live.de>
-KennyTV <jahnke.nassim@gmail.com>
+kennytv <jahnke.nassim@gmail.com>
 Machine_Maker <machine@machinemaker.me>
 Ivan Pekov <ivan@mrivanplays.com>
 Camotoy <20743703+Camotoy@users.noreply.github.com>

patches/api/0201-Add-item-slot-convenience-methods.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Sat, 25 Apr 2020 23:31:28 +0200
 Subject: [PATCH] Add item slot convenience methods
 

patches/api/0240-Add-PlayerItemCooldownEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Tue, 25 Aug 2020 13:45:15 +0200
 Subject: [PATCH] Add PlayerItemCooldownEvent
 

patches/api/0241-More-lightning-API.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Sun, 26 Jul 2020 14:44:16 +0200
 Subject: [PATCH] More lightning API
 

patches/api/0269-Add-dropLeash-variable-to-EntityUnleashEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Fri, 29 Jan 2021 15:13:04 +0100
 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 

patches/api/0285-Expose-protocol-version.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Fri, 26 Mar 2021 11:23:27 +0100
 Subject: [PATCH] Expose protocol version
 

patches/server/0561-Add-PlayerItemCooldownEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Tue, 25 Aug 2020 13:48:33 +0200
 Subject: [PATCH] Add PlayerItemCooldownEvent
 

patches/server/0562-More-lightning-API.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Sun, 26 Jul 2020 14:44:09 +0200
 Subject: [PATCH] More lightning API
 

patches/server/0615-Add-dropLeash-variable-to-EntityUnleashEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Fri, 29 Jan 2021 15:13:11 +0100
 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 

patches/server/0652-Expose-protocol-version.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Fri, 26 Mar 2021 11:23:17 +0100
 Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 36cb7e974ed78074ac82ec7d2a4d86d91504872c..fa3c5f2b24dc89b07991fae5e463ea53abdd78b4 100644
+index e606c246f486eb0775a577ee7ccc87a8a4f313a2..7cf7e838867aed87fec2319cd84be7466b57e09f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -484,6 +484,11 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0672-Add-Channel-initialization-listeners.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
+From: kennytv <jahnke.nassim@gmail.com>
 Date: Thu, 29 Apr 2021 21:19:33 +0200
 Subject: [PATCH] Add Channel initialization listeners
 

patches/server/0716-Deobfuscate-stacktraces-in-log-messages-crash-report.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1053799ea1f654e1885c46d34a145b9d9fd34a21..13d392b6f2715f1b905d8b93a7cd8df3ce62f8e9 100644
+index 98e93720833b50275ab16de87969b65052a5ddc9..9ac8a46478ee945d0425d4d713e8e7239f3156cd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,8 +1,12 @@
@@ -37,16 +37,16 @@ index 1053799ea1f654e1885c46d34a145b9d9fd34a21..13d392b6f2715f1b905d8b93a7cd8df3
  }
  
  dependencies {
-@@ -52,6 +64,8 @@ dependencies {
+@@ -50,6 +62,8 @@ dependencies {
- 
+     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
-     implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
+     implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
 +    implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
 +
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -116,6 +130,44 @@ tasks.shadowJar {
+@@ -114,6 +128,44 @@ tasks.shadowJar {
      transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
  }
  

patches/server/0716-Update-oshi-core-dependency.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KennyTV <jahnke.nassim@gmail.com>
-Date: Sat, 19 Jun 2021 09:55:41 +0200
-Subject: [PATCH] Update oshi-core dependency
-
-This is fixed in Vanilla 1.17.1, so remove this patch when updating.
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index cf157f1ee695149057d361e2334efb982a52540f..1053799ea1f654e1885c46d34a145b9d9fd34a21 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -50,6 +50,8 @@ dependencies {
-     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
-     implementation("io.netty:netty-all:4.1.65.Final") // Paper
- 
-+    implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
-+
-     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")

patches/server/0719-Add-git-branch-and-commit-to-manifest.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add git branch and commit to manifest
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 13d392b6f2715f1b905d8b93a7cd8df3ce62f8e9..5540da58e66f83b283863d3158a9b4ab5ba636db 100644
+index 9ac8a46478ee945d0425d4d713e8e7239f3156cd..4605634d1e0d2c6592d4152e697680e078380868 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -78,6 +78,7 @@ tasks.jar {
+@@ -76,6 +76,7 @@ tasks.jar {
          val git = Git(rootProject.layout.projectDirectory.path)
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
@@ -16,7 +16,7 @@ index 13d392b6f2715f1b905d8b93a7cd8df3ce62f8e9..5540da58e66f83b283863d3158a9b4ab
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
-@@ -87,6 +88,8 @@ tasks.jar {
+@@ -85,6 +86,8 @@ tasks.jar {
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
              "Multi-Release" to "true", // Paper

patches/server/0724-Config-option-for-named-entity-death-logging.patch

@@ -21,7 +21,7 @@ index 98b71384508447adc80c2175f8e35e5d86b0c378..f101302892a7f95ffa0e6d63cb69d8a3
      public static int itemValidationLocNameLength = 8192;
      public static int itemValidationLoreLineLength = 8192;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0c38298ce04b28bb41b3c10b44b026a9b54c612b..62cf17beaeaae2544bd5b268b3846b4d0a9190e0 100644
+index 0c38298ce04b28bb41b3c10b44b026a9b54c612b..92fd98540e8d5ada4eaaf83bee8cdd276c4458a7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1634,7 +1634,7 @@ public abstract class LivingEntity extends Entity {

patches/server/0725-Route-sign-run_command-click-events-through-normal-c.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MD <1917406+mdcfe@users.noreply.github.com>
+From: mdcfe <1917406+mdcfe@users.noreply.github.com>
 Date: Wed, 7 Jul 2021 12:29:48 +0100
 Subject: [PATCH] Route sign run_command click events through normal chat logic