diff --git a/patches/api/0003-Bump-Dependencies.patch b/patches/api/0003-Bump-Dependencies.patch new file mode 100644 index 000000000..b39835110 --- /dev/null +++ b/patches/api/0003-Bump-Dependencies.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: IPECTER +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") + } diff --git a/patches/api/0003-Plazma-Configurations.patch b/patches/api/0004-Plazma-Configurations.patch similarity index 100% rename from patches/api/0003-Plazma-Configurations.patch rename to patches/api/0004-Plazma-Configurations.patch diff --git a/patches/api/0004-Publish-Packages.patch b/patches/api/0005-Publish-Packages.patch similarity index 90% rename from patches/api/0004-Publish-Packages.patch rename to patches/api/0005-Publish-Packages.patch index 23a537fa4..ff14e2a0d 100644 --- a/patches/api/0004-Publish-Packages.patch +++ b/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 { diff --git a/patches/api/0005-Optimize-spigot-event-bus.patch b/patches/api/0006-Optimize-spigot-event-bus.patch similarity index 100% rename from patches/api/0005-Optimize-spigot-event-bus.patch rename to patches/api/0006-Optimize-spigot-event-bus.patch diff --git a/patches/server/0004-Bump-Dependencies.patch b/patches/server/0004-Bump-Dependencies.patch new file mode 100644 index 000000000..a87559d5e --- /dev/null +++ b/patches/server/0004-Bump-Dependencies.patch @@ -0,0 +1,76 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: IPECTER +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 diff --git a/patches/server/0004-Rebrand.patch b/patches/server/0005-Rebrand.patch similarity index 99% rename from patches/server/0004-Rebrand.patch rename to patches/server/0005-Rebrand.patch index 6cb6bc9a4..2ec6df54c 100644 --- a/patches/server/0004-Rebrand.patch +++ b/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 diff --git a/patches/server/0005-Rebrand-Logo.patch b/patches/server/0006-Rebrand-Logo.patch similarity index 100% rename from patches/server/0005-Rebrand-Logo.patch rename to patches/server/0006-Rebrand-Logo.patch diff --git a/patches/server/0006-Plazma-Configurations.patch b/patches/server/0007-Plazma-Configurations.patch similarity index 100% rename from patches/server/0006-Plazma-Configurations.patch rename to patches/server/0007-Plazma-Configurations.patch diff --git a/patches/server/0007-Add-more-metrics.patch b/patches/server/0008-Add-more-metrics.patch similarity index 100% rename from patches/server/0007-Add-more-metrics.patch rename to patches/server/0008-Add-more-metrics.patch diff --git a/patches/server/0008-Optimize-Default-Configurations.patch b/patches/server/0009-Optimize-Default-Configurations.patch similarity index 100% rename from patches/server/0008-Optimize-Default-Configurations.patch rename to patches/server/0009-Optimize-Default-Configurations.patch diff --git a/patches/server/0009-ChunkSending-Configuration.patch b/patches/server/0010-ChunkSending-Configuration.patch similarity index 100% rename from patches/server/0009-ChunkSending-Configuration.patch rename to patches/server/0010-ChunkSending-Configuration.patch diff --git a/patches/server/0010-Implement-ChunkSending.patch b/patches/server/0011-Implement-ChunkSending.patch similarity index 100% rename from patches/server/0010-Implement-ChunkSending.patch rename to patches/server/0011-Implement-ChunkSending.patch diff --git a/patches/server/0011-Console-Log-Configuration.patch b/patches/server/0012-Console-Log-Configuration.patch similarity index 100% rename from patches/server/0011-Console-Log-Configuration.patch rename to patches/server/0012-Console-Log-Configuration.patch diff --git a/patches/server/0012-Console-log-tweaks.patch b/patches/server/0013-Console-log-tweaks.patch similarity index 100% rename from patches/server/0012-Console-log-tweaks.patch rename to patches/server/0013-Console-log-tweaks.patch diff --git a/patches/server/0013-Player-configuration-section.patch b/patches/server/0014-Player-configuration-section.patch similarity index 100% rename from patches/server/0013-Player-configuration-section.patch rename to patches/server/0014-Player-configuration-section.patch diff --git a/patches/server/0014-Add-option-to-allow-any-usernames.patch b/patches/server/0015-Add-option-to-allow-any-usernames.patch similarity index 100% rename from patches/server/0014-Add-option-to-allow-any-usernames.patch rename to patches/server/0015-Add-option-to-allow-any-usernames.patch diff --git a/patches/server/0015-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch b/patches/server/0016-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch similarity index 100% rename from patches/server/0015-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch rename to patches/server/0016-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch diff --git a/patches/server/0016-Add-missing-purpur-configuration-options.patch b/patches/server/0017-Add-missing-purpur-configuration-options.patch similarity index 100% rename from patches/server/0016-Add-missing-purpur-configuration-options.patch rename to patches/server/0017-Add-missing-purpur-configuration-options.patch diff --git a/patches/server/0017-Structure-Configuration.patch b/patches/server/0018-Structure-Configuration.patch similarity index 100% rename from patches/server/0017-Structure-Configuration.patch rename to patches/server/0018-Structure-Configuration.patch diff --git a/patches/server/0018-Configurable-nether-portal-size.patch b/patches/server/0019-Configurable-nether-portal-size.patch similarity index 100% rename from patches/server/0018-Configurable-nether-portal-size.patch rename to patches/server/0019-Configurable-nether-portal-size.patch diff --git a/patches/server/0019-Misc-configuration.patch b/patches/server/0020-Misc-configuration.patch similarity index 100% rename from patches/server/0019-Misc-configuration.patch rename to patches/server/0020-Misc-configuration.patch diff --git a/patches/server/0020-Reduce-create-random-instance.patch b/patches/server/0021-Reduce-create-random-instance.patch similarity index 100% rename from patches/server/0020-Reduce-create-random-instance.patch rename to patches/server/0021-Reduce-create-random-instance.patch diff --git a/patches/server/0021-Entity-Configuration.patch b/patches/server/0022-Entity-Configuration.patch similarity index 100% rename from patches/server/0021-Entity-Configuration.patch rename to patches/server/0022-Entity-Configuration.patch diff --git a/patches/server/0022-Various-Optimizations.patch b/patches/server/0023-Various-Optimizations.patch similarity index 100% rename from patches/server/0022-Various-Optimizations.patch rename to patches/server/0023-Various-Optimizations.patch diff --git a/patches/server/0023-Add-configuration-to-disable-moved-to-quickly-check-.patch b/patches/server/0024-Add-configuration-to-disable-moved-to-quickly-check-.patch similarity index 100% rename from patches/server/0023-Add-configuration-to-disable-moved-to-quickly-check-.patch rename to patches/server/0024-Add-configuration-to-disable-moved-to-quickly-check-.patch diff --git a/patches/server/0024-Apply-faster-random.patch b/patches/server/0025-Apply-faster-random.patch similarity index 100% rename from patches/server/0024-Apply-faster-random.patch rename to patches/server/0025-Apply-faster-random.patch diff --git a/patches/server/0025-Do-not-send-useless-entity-packets.patch b/patches/server/0026-Do-not-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0025-Do-not-send-useless-entity-packets.patch rename to patches/server/0026-Do-not-send-useless-entity-packets.patch diff --git a/patches/server/0026-No-Chat-Reports-Configuration.patch b/patches/server/0027-No-Chat-Reports-Configuration.patch similarity index 100% rename from patches/server/0026-No-Chat-Reports-Configuration.patch rename to patches/server/0027-No-Chat-Reports-Configuration.patch diff --git a/patches/server/0027-Implement-No-Chat-Reports.patch b/patches/server/0028-Implement-No-Chat-Reports.patch similarity index 100% rename from patches/server/0027-Implement-No-Chat-Reports.patch rename to patches/server/0028-Implement-No-Chat-Reports.patch diff --git a/patches/server/0028-FixMySpawnR-Configuration.patch b/patches/server/0029-FixMySpawnR-Configuration.patch similarity index 100% rename from patches/server/0028-FixMySpawnR-Configuration.patch rename to patches/server/0029-FixMySpawnR-Configuration.patch diff --git a/patches/server/0029-Implement-FixMySpawnR.patch b/patches/server/0030-Implement-FixMySpawnR.patch similarity index 100% rename from patches/server/0029-Implement-FixMySpawnR.patch rename to patches/server/0030-Implement-FixMySpawnR.patch diff --git a/patches/server/0030-ImproveBiomeTemperatureCache.patch b/patches/server/0031-Improve-BiomeTemperatureCache.patch similarity index 94% rename from patches/server/0030-ImproveBiomeTemperatureCache.patch rename to patches/server/0031-Improve-BiomeTemperatureCache.patch index f6f410358..219008b3d 100644 --- a/patches/server/0030-ImproveBiomeTemperatureCache.patch +++ b/patches/server/0031-Improve-BiomeTemperatureCache.patch @@ -3,8 +3,9 @@ From: IPECTER 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 { diff --git a/patches/server/0031-Reduce-Sensor-Work.patch b/patches/server/0032-Reduce-Sensor-Work.patch similarity index 100% rename from patches/server/0031-Reduce-Sensor-Work.patch rename to patches/server/0032-Reduce-Sensor-Work.patch diff --git a/patches/server/0032-Configurable-Sensor-Tick.patch b/patches/server/0033-Configurable-Sensor-Tick.patch similarity index 100% rename from patches/server/0032-Configurable-Sensor-Tick.patch rename to patches/server/0033-Configurable-Sensor-Tick.patch diff --git a/patches/server/0033-Optimize-VarInts.patch b/patches/server/0034-Optimize-VarInts.patch similarity index 100% rename from patches/server/0033-Optimize-VarInts.patch rename to patches/server/0034-Optimize-VarInts.patch diff --git a/patches/server/0034-Variable-entity-wakeup-duration.patch b/patches/server/0035-Variable-entity-wakeup-duration.patch similarity index 100% rename from patches/server/0034-Variable-entity-wakeup-duration.patch rename to patches/server/0035-Variable-entity-wakeup-duration.patch diff --git a/patches/server/0035-More-optimise-state-lookup.patch b/patches/server/0036-More-optimise-state-lookup.patch similarity index 100% rename from patches/server/0035-More-optimise-state-lookup.patch rename to patches/server/0036-More-optimise-state-lookup.patch diff --git a/patches/server/0036-Suppress-Error-From-DirtyAttributes.patch b/patches/server/0037-Suppress-Error-From-DirtyAttributes.patch similarity index 100% rename from patches/server/0036-Suppress-Error-From-DirtyAttributes.patch rename to patches/server/0037-Suppress-Error-From-DirtyAttributes.patch diff --git a/patches/server/0037-Implement-FerriteCore.patch b/patches/server/0038-Implement-FerriteCore.patch similarity index 100% rename from patches/server/0037-Implement-FerriteCore.patch rename to patches/server/0038-Implement-FerriteCore.patch diff --git a/patches/server/0038-Skip-event-if-no-listeners.patch b/patches/server/0039-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0038-Skip-event-if-no-listeners.patch rename to patches/server/0039-Skip-event-if-no-listeners.patch diff --git a/patches/server/0039-Optimize-spigot-event-bus.patch b/patches/server/0040-Optimize-spigot-event-bus.patch similarity index 100% rename from patches/server/0039-Optimize-spigot-event-bus.patch rename to patches/server/0040-Optimize-spigot-event-bus.patch diff --git a/patches/server/0040-Reduce-allocations.patch b/patches/server/0041-Reduce-allocations.patch similarity index 100% rename from patches/server/0040-Reduce-allocations.patch rename to patches/server/0041-Reduce-allocations.patch diff --git a/patches/server/0041-CarpetFixes-Configuration.patch b/patches/server/0042-CarpetFixes-Configuration.patch similarity index 100% rename from patches/server/0041-CarpetFixes-Configuration.patch rename to patches/server/0042-CarpetFixes-Configuration.patch diff --git a/patches/server/0042-CarpetFixes-Optimizations-BiomeManager.patch b/patches/server/0043-CarpetFixes-Optimizations-BiomeManager.patch similarity index 100% rename from patches/server/0042-CarpetFixes-Optimizations-BiomeManager.patch rename to patches/server/0043-CarpetFixes-Optimizations-BiomeManager.patch diff --git a/patches/server/0043-CarpetFixes-Optimizations-RecipeManager.patch b/patches/server/0043-CarpetFixes-Optimizations-RecipeManager.patch deleted file mode 100644 index e1cc77b5c..000000000 --- a/patches/server/0043-CarpetFixes-Optimizations-RecipeManager.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: IPECTER -Date: Wed, 6 Sep 2023 16:23:56 +0900 -Subject: [PATCH] CarpetFixes-Optimizations-RecipeManager - -Original: fxmorin/carpet-fixes -Copyright (C) 2023 fxmorin - -RecipeManager optimization. -Optimized by taking out streams & doing extra early checks to quickly remove unrelated recipes - -diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -index 9ffb6999171f602f0b113dac40e0130410cad870..49b5fece692cd5da99ed21d7fd0864cea1609495 100644 ---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -@@ -103,13 +103,38 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { - } - - public > Optional getRecipeFor(RecipeType type, C inventory, Level world) { -- // CraftBukkit start -- Optional recipe = this.byType(type).values().stream().filter((irecipe) -> { -- return irecipe.matches(inventory, world); -- }).findFirst(); -- inventory.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found -- // CraftBukkit end -- return recipe; -+ // Plazma start - CarpetFixes - Optimized RecipeManager -+ if (world.plazmaLevelConfiguration().carpetFixes.optimizedRecipeManager() && type == RecipeType.CRAFTING) { -+ int slots = 0; -+ int count; -+ //compare size to quickly remove recipes that are not even close. Plus remove streams -+ for (int slot = 0; slot < inventory.getContainerSize(); slot++) -+ if (!inventory.getItem(slot).isEmpty()) slots++; -+ for (Recipe recipe : this.byType(type).values()) { -+ count = 0; -+ if (recipe instanceof CustomRecipe) { -+ if (recipe.matches(inventory, world)) { -+ return (Optional) Optional.of(recipe); -+ } -+ } else { -+ for (Ingredient ingredient : recipe.getIngredients()) -+ if (ingredient != Ingredient.EMPTY) count++; -+ if (count == slots && recipe.matches(inventory, world)) { -+ return (Optional) Optional.of(recipe); -+ } -+ } -+ } -+ return Optional.empty(); -+ } else { -+ // CraftBukkit start -+ Optional recipe = this.byType(type).values().stream().filter((irecipe) -> { -+ return irecipe.matches(inventory, world); -+ }).findFirst(); -+ inventory.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found -+ // CraftBukkit end -+ return recipe; -+ } -+ // Plazma end - } - - public > Optional> getRecipeFor(RecipeType type, C inventory, Level world, @Nullable ResourceLocation id) { -@@ -134,7 +159,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { - } - - public > List getAllRecipesFor(RecipeType type) { -- return List.copyOf(this.byType(type).values()); -+ return org.plazmamc.plazma.configurations.GlobalConfiguration.get().carpetFixes.optimizedRecipeManager() ? (List) new java.util.ArrayList<>(this.byType(type).values()) : List.copyOf(this.byType(type).values()); // Plazma start - CarpetFixes - Optimized RecipeManager - } - - public > List getRecipesFor(RecipeType type, C inventory, Level world) { -diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index d329f77ab19ac781506c26909591fa4ae9dabb1e..36511f71fcf3a8a5da746dd087003861a4f0a8f4 100644 ---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -83,10 +83,15 @@ public class GlobalConfiguration extends ConfigurationPart { - - public boolean enabled = DO_OPTIMIZE; - boolean optimizedBiomeAccess = true; -+ boolean optimizedRecipeManager = true; - - public boolean optimizedBiomeAccess() { - return enabled && optimizedBiomeAccess; - } - -+ public boolean optimizedRecipeManager() { -+ return enabled && optimizedRecipeManager; -+ } -+ - } - } -diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java -index b0deec445b5ea3cd3e4802eca04e99818b539bd8..e089a881600b61060bae1135b89703f6c0b5c7e8 100644 ---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java -+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java -@@ -137,6 +137,11 @@ public class LevelConfigurations extends ConfigurationPart { - public class CarpetFixes extends ConfigurationPart { - - public boolean enabled = DO_OPTIMIZE; -+ boolean optimizedRecipeManager = true; -+ -+ public boolean optimizedRecipeManager() { -+ return enabled && optimizedRecipeManager; -+ } - - } - } diff --git a/patches/server/0044-CarpetFixes-Optimizations-Sheep.patch b/patches/server/0044-CarpetFixes-Optimizations-Sheep.patch index 16ad697ee..3524da97d 100644 --- a/patches/server/0044-CarpetFixes-Optimizations-Sheep.patch +++ b/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 diff --git a/patches/server/0045-Async-PathProcessing.patch b/patches/server/0045-Async-PathProcessing.patch index 02a86367b..d73e55ade 100644 --- a/patches/server/0045-Async-PathProcessing.patch +++ b/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 { diff --git "a/patches/\343\205\201/0004-Bump-Dependencies.patch" "b/patches/\343\205\201/0004-Bump-Dependencies.patch" new file mode 100644 index 000000000..784cc3e2d --- /dev/null +++ "b/patches/\343\205\201/0004-Bump-Dependencies.patch" @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: IPECTER +Date: Wed, 6 Sep 2023 12:43:06 +0900 +Subject: [PATCH] Bump-Dependencies + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 0c557f34ed438980c6fd9d6a8bce7c1152468735..8f1fbec343461c83a6df141f7aa939e26e6e139e 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,16 +27,16 @@ 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.yaml:snakeyaml:2.2") // Plazma - Bump Dependencies + api("org.joml:joml:1.10.5") + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { + isTransitive = false // includes junit + } +- api("it.unimi.dsi:fastutil:8.5.6") ++ api("it.unimi.dsi:fastutil:8.5.12") // Plazma - Bump Dependencies + apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) + apiAndDocs("net.kyori:adventure-api") + apiAndDocs("net.kyori:adventure-text-minimessage") +@@ -46,31 +46,31 @@ 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.mockito:mockito-core:4.9.0") // Paper - add mockito ++ testImplementation("org.mockito:mockito-core:5.5.0") // Paper - add mockito // Plazma - Bump Dependencies + +- testImplementation("org.apache.commons:commons-lang3:3.12.0") +- testImplementation("junit:junit:4.13.2") +- testImplementation("org.hamcrest:hamcrest-library:1.3") ++ testImplementation("org.apache.commons:commons-lang3:3.13.0") // Plazma - Bump Dependencies ++ testImplementation("junit:junit:4.13.2") // Plazma - Bump Dependencies ++ testImplementation("org.hamcrest:hamcrest-library:2.2") // Plazma - Bump Dependencies + testImplementation("org.ow2.asm:asm-tree:9.5") + } + diff --git "a/patches/\343\205\201/0006-Bump-Dependencies.patch" "b/patches/\343\205\201/0006-Bump-Dependencies.patch" new file mode 100644 index 000000000..53758fcc0 --- /dev/null +++ "b/patches/\343\205\201/0006-Bump-Dependencies.patch" @@ -0,0 +1,92 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: IPECTER +Date: Wed, 6 Sep 2023 13:31:43 +0900 +Subject: [PATCH] Bump-Dependencies + + +diff --git a/build.gradle.kts b/build.gradle.kts +index d8b27e3f2fa1ede41125ec27e129b1e1ad42caa7..2c59ed16ea909b6535df3d1d40d83b065c03d041 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,48 +30,48 @@ 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 ++ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins + 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 + // Paper end +- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion +- implementation("org.ow2.asm:asm:9.4") +- implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation +- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito ++ 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: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 +- runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") ++ implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation ++ 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") { + 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") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") + + implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur + implementation("org.mozilla:rhino-engine:1.7.14") // Purpur + implementation("dev.omega24:upnp4j:1.0") // Purpur + + // Pufferfish start +- implementation("org.yaml:snakeyaml:1.32") ++ implementation("org.yaml:snakeyaml:1.32") + implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { + exclude(group="org.yaml", module="snakeyaml") + } + // 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 + testImplementation("junit:junit:4.13.2") +- testImplementation("org.hamcrest:hamcrest-library:1.3") ++ testImplementation("org.hamcrest:hamcrest-library:2.2") + +- implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty ++ implementation("io.netty:netty-all:4.1.97.Final"); // Paper - Bump netty + } + + val craftbukkitPackageVersion = "1_20_R1" // Paper +@@ -225,3 +225,6 @@ tasks.registerRunTask("runDev") { + description = "Spin up a non-relocated Mojang-mapped test server" + classpath(sourceSets.main.map { it.runtimeClasspath }) + } ++repositories { ++ mavenCentral() ++}