Remove redundant json-simple dependency and move isTransitive = false from server to api

patches/api/Add-FastUtil-to-Bukkit.patch

@@ -10,10 +10,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ dependencies {
-     api("net.md-5:bungeecord-chat:1.16-R0.4")
+     api("com.googlecode.json-simple:json-simple:1.1.1") {
-     api("org.yaml:snakeyaml:1.28")
+         isTransitive = false // includes junit
-     api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
+     }
 +    api("it.unimi.dsi:fastutil:8.5.6")
+     // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")

patches/api/Adventure.patch

@@ -31,17 +31,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // api dependencies are listed transitively to API consumers
      api("commons-lang:commons-lang:2.6")
 @@ -0,0 +0,0 @@ dependencies {
-     api("org.yaml:snakeyaml:1.28")
+         isTransitive = false // includes junit
-     api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
+     }
      api("it.unimi.dsi:fastutil:8.5.6")
 +    apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
 +    apiAndDocs("net.kyori:adventure-api")
 +    apiAndDocs("net.kyori:adventure-text-serializer-gson")
 +    apiAndDocs("net.kyori:adventure-text-serializer-legacy")
 +    apiAndDocs("net.kyori:adventure-text-serializer-plain")
+     // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
 @@ -0,0 +0,0 @@ tasks.jar {
  }
  

patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -21,11 +21,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      apiAndDocs("net.kyori:adventure-text-serializer-gson")
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
-+    api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
++    api("org.apache.logging.log4j:log4j-api:2.14.1")
-+    api("org.slf4j:slf4j-api:1.7.30") // Paper
++    api("org.slf4j:slf4j-api:1.8.0-beta4")
  
-     implementation("org.ow2.asm:asm:9.1")
+     implementation("org.ow2.asm:asm:9.2")
-     implementation("org.ow2.asm:asm-commons:9.1")
+     implementation("org.ow2.asm:asm-commons:9.2")
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java

patches/api/Build-system-changes.patch

@@ -12,7 +12,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      api("com.google.code.gson:gson:2.8.8")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.28")
-+    api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
++    // Paper start
++    api("com.googlecode.json-simple:json-simple:1.1.1") {
++        isTransitive = false // includes junit
++    }
++    // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")

patches/api/Use-ASM-for-event-executors.patch

@@ -10,15 +10,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ dependencies {
+     apiAndDocs("net.kyori:adventure-text-serializer-gson")
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
- 
-+    implementation("org.ow2.asm:asm:9.1")
-+    implementation("org.ow2.asm:asm-commons:9.1")
 +
++    implementation("org.ow2.asm:asm:9.2")
++    implementation("org.ow2.asm:asm-commons:9.2")
+     // Paper end
+ 
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000

patches/server/Build-system-changes.patch

@@ -18,9 +18,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
      implementation("org.ow2.asm:asm:9.2")
 +    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
-     implementation("com.googlecode.json-simple:json-simple:1.1.1") {
+     runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
-         // This includes junit transitively for whatever reason
+     runtimeOnly("mysql:mysql-connector-java:8.0.27")
-         isTransitive = false
+ 
 @@ -0,0 +0,0 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""

patches/server/Setup-Gradle-project.patch

@@ -51,10 +51,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 +    }
 +    implementation("org.ow2.asm:asm:9.2")
-+    implementation("com.googlecode.json-simple:json-simple:1.1.1") {
-+        // This includes junit transitively for whatever reason
-+        isTransitive = false
-+    }
 +    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
 +    runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +

patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch

@@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ dependencies {
-     }
+     implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
      runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
      runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper