HotFix - CustomRecipe

Add - Bump Dependencies

patches/api/0003-Bump-Dependencies.patch

@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: IPECTER <ipectert@gmail.com>
+Date: Thu, 19 Oct 2023 22:10:35 +0900
+Subject: [PATCH] Bump Dependencies
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index dfb989a18ab17fec3b8f0cf90ce2fc1048215265..90a85736247f1d5520a02b66e77405637c033fe9 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -11,8 +11,8 @@ java {
+ val annotationsVersion = "24.0.1"
+ val bungeeCordChatVersion = "1.20-R0.1"
+ val adventureVersion = "4.14.0"
+-val slf4jVersion = "1.8.0-beta4"
+-val log4jVersion = "2.17.1"
++val slf4jVersion = "2.0.9" // Plazma - Bump Dependencies
++val log4jVersion = "2.20.0" // Plazma - Bump Dependencies
+ val apiAndDocs: Configuration by configurations.creating {
+     attributes {
+         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+@@ -27,8 +27,8 @@ configurations.api {
+
+ dependencies {
+     // api dependencies are listed transitively to API consumers
+-    api("com.google.guava:guava:31.1-jre")
+-    api("com.google.code.gson:gson:2.10")
++    api("com.google.guava:guava:32.1.2-jre") // Plazma - Bump Dependencies
++    api("com.google.code.gson:gson:2.10.1") // Plazma - Bump Dependencies
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
+     api("org.yaml:snakeyaml:2.0")
+     api("org.joml:joml:1.10.5")
+@@ -46,30 +46,30 @@ dependencies {
+     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
+     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
+     api("org.slf4j:slf4j-api:$slf4jVersion")
+-    api("io.sentry:sentry:5.4.0") // Pufferfish
++    api("io.sentry:sentry:6.28.0") // Pufferfish // Plazma - Bump Dependencies
+
+-    implementation("org.ow2.asm:asm:9.4")
+-    implementation("org.ow2.asm:asm-commons:9.4")
++    implementation("org.ow2.asm:asm:9.5") // Plazma - Bump Dependencies
++    implementation("org.ow2.asm:asm-commons:9.5") // Plazma - Bump Dependencies
+     // Paper end
+
+-    api("org.apache.maven:maven-resolver-provider:3.8.5")
+-    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+-    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+-    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
++    api("org.apache.maven:maven-resolver-provider:3.9.4") // Plazma - Bump Dependencies
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") // Plazma - Bump Dependencies
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") // Plazma - Bump Dependencies
++    compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper // Plazma - Bump Dependencies
+
+     val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
+     compileOnly(annotations)
+     testCompileOnly(annotations)
+
+     // Paper start - add checker
+-    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
++    val checkerQual = "org.checkerframework:checker-qual:3.38.0" // Plazma - Bump Dependencies
+     compileOnlyApi(checkerQual)
+     testCompileOnly(checkerQual)
+     // Paper end
+
+-    testImplementation("org.apache.commons:commons-lang3:3.12.0")
++    testImplementation("org.apache.commons:commons-lang3:3.13.0") // Plazma - Bump Dependencies
+     testImplementation("junit:junit:4.13.2")
+-    testImplementation("org.hamcrest:hamcrest-library:1.3")
++    testImplementation("org.hamcrest:hamcrest-library:2.2") // Plazma - Bump Dependencies
+     testImplementation("org.mockito:mockito-core:5.5.0")
+     testImplementation("org.ow2.asm:asm-tree:9.5")
+ }

patches/api/0004-Publish-Packages.patch → patches/api/0005-Publish-Packages.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Publish-Packages
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dfb989a18ab17fec3b8f0cf90ce2fc1048215265..bfcb6cf6cf29fec6e22a89cc6045c7030262bb1c 100644
+index 90a85736247f1d5520a02b66e77405637c033fe9..50fd6cabfbf5e38619408dcc5f78e8f5063e7e56 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -168,3 +168,22 @@ tasks.check {

patches/server/0004-Bump-Dependencies.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: IPECTER <ipectert@gmail.com>
+Date: Thu, 19 Oct 2023 22:20:17 +0900
+Subject: [PATCH] Bump Dependencies
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 3d5397e2e7edf2ea1e1687c58126fd9a5d5d5736..55024a308f7a9125c6739efff4f7742ce530c750 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -20,7 +20,7 @@ dependencies {
+     }
+     // Purpur end
+     // Paper start
+-    implementation("org.jline:jline-terminal-jansi:3.21.0")
++    implementation("org.jline:jline-terminal-jansi:3.23.0") // Plazma - Bump Dependencies
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+     implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
+     implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
+@@ -30,31 +30,31 @@ dependencies {
+           all its classes to check if they are plugins.
+           Scanning takes about 1-2 seconds so adding this speeds up the server start.
+      */
+-    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
+-    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
++    implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation // Plazma - Bump Dependencies
++    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins // Plazma - Bump Dependencies
+     runtimeOnly(log4jPlugins.output)
+     alsoShade(log4jPlugins.output)
+-    implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
++    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol // Plazma - Bump Dependencies
+     // Paper end
+-    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.20.0") // Paper - remove exclusion
+     implementation("org.ow2.asm:asm:9.5")
+     implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
+-    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
++    testImplementation("org.mockito:mockito-core:5.5.0") // Paper - switch to mockito
+     implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
+     implementation("commons-lang:commons-lang:2.6")
+-    implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
++    implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation // Plazma - Bump Dependencies
+     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
+     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
+     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+     // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
++    implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") { // Plazma - Bump Dependencies
+         isTransitive = false
+     }
+     // Paper end
+
+-    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+-    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+-    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.4") // Plazma - Bump Dependencies
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") // Plazma - Bump Dependencies
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") // Plazma - Bump Dependencies
+
+     implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
+     implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
+@@ -67,11 +67,11 @@ dependencies {
+     }
+     // Pufferfish end
+
+-    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
++    testImplementation("io.github.classgraph:classgraph:4.8.162") // Paper - mob goal test // Plazma - Bump Dependencies
+     testImplementation("junit:junit:4.13.2")
+-    testImplementation("org.hamcrest:hamcrest-library:1.3")
++    testImplementation("org.hamcrest:hamcrest-library:2.2") // Plazma - Bump Dependencies
+
+-    implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
++    implementation("io.netty:netty-all:4.1.97.Final"); // Paper - Bump netty // Plazma - Bump Dependencies
+ }
+
+ val craftbukkitPackageVersion = "1_20_R1" // Paper

patches/server/0004-Rebrand.patch → patches/server/0005-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3d5397e2e7edf2ea1e1687c58126fd9a5d5d5736..8a12e0dda9d03f265603b80c9fa108eea736ae84 100644
+index 55024a308f7a9125c6739efff4f7742ce530c750..58f10fa32a163ed263c5d1effb6d247bc999bb0b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating

patches/server/0030-ImproveBiomeTemperatureCache.patch → patches/server/0031-Improve-BiomeTemperatureCache.patch

@@ -3,8 +3,9 @@ From: IPECTER <ipectert@gmail.com>
 Date: Tue, 28 Mar 2023 12:42:17 +0900
 Subject: [PATCH] Improve BiomeTemperatureCache
 
+
 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..2bddcaf8762ee7834c32622402a976bfad12d127 100644
+index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..71880b6fde3a287aa75c3799ffdd82a7943bb9db 100644
 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
 +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
 @@ -67,7 +67,7 @@ public final class Biome {

patches/server/0044-CarpetFixes-Optimizations-Sheep.patch

@@ -56,23 +56,19 @@ index 54de1f782e45cb3e3b1442aeb56b6e8547b065c0..3b873dd76c0f10a7f29206e46c1bf9b2
 
      private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index e089a881600b61060bae1135b89703f6c0b5c7e8..29d451f55dabc15478e9c32d2c37bd0ea2d9bebc 100644
+index b0deec445b5ea3cd3e4802eca04e99818b539bd8..de1fa9ccb088597d059e8dc7fbb0c8788e3815fc 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -138,10 +138,15 @@ public class LevelConfigurations extends ConfigurationPart {
+@@ -137,6 +137,11 @@ public class LevelConfigurations extends ConfigurationPart {
+     public class CarpetFixes extends ConfigurationPart {
 
          public boolean enabled = DO_OPTIMIZE;
-         boolean optimizedRecipeManager = true;
 +        boolean optimizedSheepChildColor = false;
-
-         public boolean optimizedRecipeManager() {
-             return enabled && optimizedRecipeManager;
-         }
-
++
 +        public boolean optimizedSheepChildColor() {
 +            return enabled && optimizedSheepChildColor;
 +        }
-+
+ 
      }
  }
 diff --git a/src/main/java/org/plazmamc/plazma/util/CarpetFixesUtils.java b/src/main/java/org/plazmamc/plazma/util/CarpetFixesUtils.java

patches/server/0045-Async-PathProcessing.patch

@@ -840,10 +840,10 @@ index 0e2b14e7dfedf209d63279c81723fd7955122d78..6e2c0790c3b932d3aad1b1eaf11d2798
 
      public SwimNodeEvaluator(boolean canJumpOutOfWater) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 36511f71fcf3a8a5da746dd087003861a4f0a8f4..06947eea29a23d8fa1fc87d5036b9297274f9060 100644
+index d329f77ab19ac781506c26909591fa4ae9dabb1e..dc1553d555b0fa7015bdf55cb3fa0db786d6d253 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -94,4 +94,33 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -89,4 +89,33 @@ public class GlobalConfiguration extends ConfigurationPart {
          }
 
      }
@@ -878,7 +878,7 @@ index 36511f71fcf3a8a5da746dd087003861a4f0a8f4..06947eea29a23d8fa1fc87d5036b9297
 +    }
  }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 29d451f55dabc15478e9c32d2c37bd0ea2d9bebc..ed1963723db04aa027e987f1aa421b2a3e914cc4 100644
+index de1fa9ccb088597d059e8dc7fbb0c8788e3815fc..6b69321b940e1083bd687a0c38fb8faa4801aa26 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 @@ -130,6 +130,19 @@ public class LevelConfigurations extends ConfigurationPart {