From eee1f6a0e084019838a60092aea36989ae3bd506 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Mon, 20 Dec 2021 23:46:51 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116) --- patches/api/Add-FastUtil-to-Bukkit.patch | 2 +- patches/api/Add-ignore-discounts-API.patch | 9 +++-- patches/api/Adventure.patch | 6 ++-- patches/api/Build-system-changes.patch | 20 +++++------ patches/api/Convert-project-to-Gradle.patch | 34 +++++++++---------- patches/api/Use-ASM-for-event-executors.patch | 2 +- patches/server/Add-ignore-discounts-API.patch | 31 +++++++++++------ ...ll-onRemove-logic-for-breakNaturally.patch | 26 -------------- .../server/Complete-resource-pack-API.patch | 9 +++++ ...ktraces-in-log-messages-crash-report.patch | 6 ++-- ...rchantOffer-BuyB-Only-AssertionError.patch | 18 ---------- patches/server/Implement-Mob-Goal-API.patch | 2 +- patches/server/Setup-Gradle-project.patch | 22 ++++++------ ...r-to-keep-logging-IO-off-main-thread.patch | 4 +-- ...ocity-compression-and-cipher-natives.patch | 4 +-- scripts/apatch.sh | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 19 files changed, 91 insertions(+), 112 deletions(-) delete mode 100644 patches/server/Call-onRemove-logic-for-breakNaturally.patch delete mode 100644 patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch index 4ebf64b396..9a956b6909 100644 --- a/patches/api/Add-FastUtil-to-Bukkit.patch +++ b/patches/api/Add-FastUtil-to-Bukkit.patch @@ -16,4 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("it.unimi.dsi:fastutil:8.5.6") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.4") diff --git a/patches/api/Add-ignore-discounts-API.patch b/patches/api/Add-ignore-discounts-API.patch index 7db238750f..04e13d61c4 100644 --- a/patches/api/Add-ignore-discounts-API.patch +++ b/patches/api/Add-ignore-discounts-API.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/inventory/MerchantRecipe.java +++ b/src/main/java/org/bukkit/inventory/MerchantRecipe.java @@ -0,0 +0,0 @@ public class MerchantRecipe implements Recipe { - private boolean experienceReward; + private int demand; private int villagerExperience; private float priceMultiplier; + private boolean ignoreDiscounts; // Paper @@ -19,11 +19,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class MerchantRecipe implements Recipe { } - public MerchantRecipe(@NotNull ItemStack result, int uses, int maxUses, boolean experienceReward, int villagerExperience, float priceMultiplier) { + public MerchantRecipe(@NotNull ItemStack result, int uses, int maxUses, boolean experienceReward, int villagerExperience, float priceMultiplier, int demand, int specialPrice) { + // Paper start - add ignoreDiscounts param -+ this(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier, false); ++ this(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier, demand, specialPrice, false); + } + public MerchantRecipe(@NotNull ItemStack result, int uses, int maxUses, boolean experienceReward, int villagerExperience, float priceMultiplier, boolean ignoreDiscounts) { ++ this(result, uses, maxUses, experienceReward, villagerExperience, priceMultiplier, 0, 0, ignoreDiscounts); ++ } ++ public MerchantRecipe(@NotNull ItemStack result, int uses, int maxUses, boolean experienceReward, int villagerExperience, float priceMultiplier, int demand, int specialPrice, boolean ignoreDiscounts) { + this.ignoreDiscounts = ignoreDiscounts; + // Paper end this.result = result; diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 7dd27453bd..4fb579bcdf 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + apiAndDocs("net.kyori:adventure-text-serializer-plain") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.4") @@ -0,0 +0,0 @@ tasks.jar { } @@ -57,8 +57,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } (options as StandardJavadocDocletOptions).links( "https://guava.dev/releases/31.0.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/", - "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", + "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + // Paper start + "https://jd.adventure.kyori.net/api/$adventureVersion/", diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index 23a74a8eb2..c5c95acf00 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -11,20 +11,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ dependencies { 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("org.yaml:snakeyaml:1.30") + // 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") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.4") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") + compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper -- val annotations = "org.jetbrains:annotations-java5:21.0.1" -+ val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations... +- val annotations = "org.jetbrains:annotations-java5:23.0.0" ++ val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations... compileOnly(annotations) testCompileOnly(annotations) @@ -34,15 +34,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + testCompileOnly(checkerAnnotations) + // Paper end + - testImplementation("junit:junit:4.13.1") + testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.ow2.asm:asm-tree:9.2") @@ -0,0 +0,0 @@ tasks.withType { (options as StandardJavadocDocletOptions).links( "https://guava.dev/releases/31.0.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/", -- "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/", -+ "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", +- "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", ++ "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ) } diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index 208602b923..b0fc6d5048 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -47,17 +47,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("com.google.guava:guava:31.0.1-jre") + 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("org.yaml:snakeyaml:1.30") + -+ 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") ++ compileOnly("org.apache.maven:maven-resolver-provider:3.8.4") ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") + -+ val annotations = "org.jetbrains:annotations-java5:21.0.1" ++ val annotations = "org.jetbrains:annotations-java5:23.0.0" + compileOnly(annotations) + testCompileOnly(annotations) + -+ testImplementation("junit:junit:4.13.1") ++ testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") + testImplementation("org.ow2.asm:asm-tree:9.2") +} @@ -92,8 +92,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +tasks.withType { + (options as StandardJavadocDocletOptions).links( + "https://guava.dev/releases/31.0.1-jre/api/docs/", -+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/", -+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/", ++ "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", ++ "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) +} @@ -166,40 +166,40 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.yaml - snakeyaml -- 1.28 +- 1.30 - compile - - - - org.apache.maven - maven-resolver-provider -- 3.8.1 +- 3.8.4 - provided - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.0 +- 1.7.2 - provided - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.0 +- 1.7.2 - provided - - - - org.jetbrains - annotations-java5 -- 21.0.1 +- 23.0.0 - provided - - - - junit - junit -- 4.13.1 +- 4.13.2 - test - - @@ -248,7 +248,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.eclipse.jdt - ecj -- 3.27.0 +- 3.28.0 - - - @@ -299,8 +299,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - - https://guava.dev/releases/31.0.1-jre/api/docs/ -- https://javadoc.io/doc/org.yaml/snakeyaml/1.28/ -- https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/ +- https://javadoc.io/doc/org.yaml/snakeyaml/1.30/ +- https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/ - https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/ - - diff --git a/patches/api/Use-ASM-for-event-executors.patch b/patches/api/Use-ASM-for-event-executors.patch index f33734a915..62c926bef9 100644 --- a/patches/api/Use-ASM-for-event-executors.patch +++ b/patches/api/Use-ASM-for-event-executors.patch @@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + implementation("org.ow2.asm:asm-commons:9.2") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.4") 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 diff --git a/patches/server/Add-ignore-discounts-API.patch b/patches/server/Add-ignore-discounts-API.patch index cdfe19c508..98c226aff1 100644 --- a/patches/server/Add-ignore-discounts-API.patch +++ b/patches/server/Add-ignore-discounts-API.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java +++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java @@ -0,0 +0,0 @@ public class MerchantOffer { - private int demand; + public int demand; // PAIL private -> public public float priceMultiplier; public int xp; + public boolean ignoreDiscounts; // Paper @@ -39,13 +39,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class MerchantOffer { } - public MerchantOffer(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, CraftMerchantRecipe bukkit) { -- this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier); + public MerchantOffer(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, int demand, CraftMerchantRecipe bukkit) { +- this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, demand); + // Paper start - add ignoreDiscounts param -+ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, false, bukkit); ++ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, demand, false, bukkit); + } + public MerchantOffer(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, boolean ignoreDiscounts, CraftMerchantRecipe bukkit) { -+ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, 0, ignoreDiscounts); ++ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, 0, ignoreDiscounts, bukkit); ++ } ++ public MerchantOffer(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, int demand, boolean ignoreDiscounts, CraftMerchantRecipe bukkit) { ++ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier, demand, ignoreDiscounts); + // Paper end this.bukkitHandle = bukkit; } @@ -95,24 +98,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier) { -- super(result, uses, maxUses, experienceReward, experience, priceMultiplier); +- this(result, uses, maxUses, experienceReward, experience, priceMultiplier, 0, 0); + // Paper start - add ignoreDiscounts param -+ this(result, uses, maxUses, experienceReward, experience, priceMultiplier, false); ++ this(result, uses, maxUses, experienceReward, experience, priceMultiplier, 0, 0, false); + } + public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier, boolean ignoreDiscounts) { -+ super(result, uses, maxUses, experienceReward, experience, priceMultiplier, ignoreDiscounts); ++ this(result, uses, maxUses, experienceReward, experience, priceMultiplier, 0, 0, ignoreDiscounts); + } + + public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier, int demand, int specialPrice) { +- super(result, uses, maxUses, experienceReward, experience, priceMultiplier, demand, specialPrice); ++ this(result, uses, maxUses, experienceReward, experience, priceMultiplier, demand, specialPrice, false); ++ } ++ public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier, int demand, int specialPrice, boolean ignoreDiscounts) { ++ super(result, uses, maxUses, experienceReward, experience, priceMultiplier, demand, specialPrice, ignoreDiscounts); + // Paper end this.handle = new net.minecraft.world.item.trading.MerchantOffer( net.minecraft.world.item.ItemStack.EMPTY, net.minecraft.world.item.ItemStack.EMPTY, @@ -0,0 +0,0 @@ public class CraftMerchantRecipe extends MerchantRecipe { - maxUses, experience, priceMultiplier, + demand, + ignoreDiscounts, // Paper - add ignoreDiscounts param this ); - this.setExperienceReward(experienceReward); + this.setSpecialPrice(specialPrice); @@ -0,0 +0,0 @@ public class CraftMerchantRecipe extends MerchantRecipe { handle.priceMultiplier = priceMultiplier; } diff --git a/patches/server/Call-onRemove-logic-for-breakNaturally.patch b/patches/server/Call-onRemove-logic-for-breakNaturally.patch deleted file mode 100644 index 4d7ed8396d..0000000000 --- a/patches/server/Call-onRemove-logic-for-breakNaturally.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 31 Oct 2021 14:49:43 -0700 -Subject: [PATCH] Call onRemove logic for breakNaturally - - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -0,0 +0,0 @@ public class CraftBlock implements Block { - if (triggerEffect) world.levelEvent(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.world.level.block.Block.getId(block.defaultBlockState())); // Paper - result = true; - } -+ // Paper start -+ net.minecraft.world.level.block.state.BlockState newBlockState = Blocks.AIR.defaultBlockState(); -+ if (this.world instanceof net.minecraft.world.level.Level level) { -+ iblockdata.onRemove(level, position, newBlockState, false); -+ } -+ // Paper end - -- return this.setTypeAndData(Blocks.AIR.defaultBlockState(), true) && result; -+ return this.setTypeAndData(newBlockState, true) && result; // Paper - } - - @Override diff --git a/patches/server/Complete-resource-pack-API.patch b/patches/server/Complete-resource-pack-API.patch index 0d986f72d3..2261bab9f1 100644 --- a/patches/server/Complete-resource-pack-API.patch +++ b/patches/server/Complete-resource-pack-API.patch @@ -46,6 +46,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public CraftPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + + @Override + public void setResourcePack(String url) { +- this.setResourcePack(url, null); ++ this.setResourcePack(url, (byte[]) null); + } + + @Override +@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean getAffectsSpawning() { return this.getHandle().affectsSpawning; } diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch index ce9d93f11b..fe6c921814 100644 --- a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -37,12 +37,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper implementation("org.ow2.asm:asm:9.2") @@ -0,0 +0,0 @@ dependencies { - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") + implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation + - testImplementation("junit:junit:4.13.1") + testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") } @@ -0,0 +0,0 @@ tasks.shadowJar { diff --git a/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch deleted file mode 100644 index 7f5661ff43..0000000000 --- a/patches/server/Fix-MerchantOffer-BuyB-Only-AssertionError.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: thamid-gamer <60953955+thamid-gamer@users.noreply.github.com> -Date: Fri, 16 Jul 2021 16:00:17 -0400 -Subject: [PATCH] Fix MerchantOffer BuyB-Only AssertionError - - -diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java -+++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java -@@ -0,0 +0,0 @@ public class MerchantOffer { - if (!this.satisfiedBy(firstBuyStack, secondBuyStack)) { - return false; - } else { -+ if (!this.getCostA().isEmpty()) // Paper - firstBuyStack.shrink(this.getCostA().getCount()); - if (!this.getCostB().isEmpty()) { - secondBuyStack.shrink(this.getCostB().getCount()); diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/server/Implement-Mob-Goal-API.patch index 94845091aa..ffc1a56389 100644 --- a/patches/server/Implement-Mob-Goal-API.patch +++ b/patches/server/Implement-Mob-Goal-API.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("net.fabricmc:mapping-io: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("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") } diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 8bfaa47ecf..afad0d3b53 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -54,11 +54,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") + runtimeOnly("mysql:mysql-connector-java:8.0.27") + -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") + -+ testImplementation("junit:junit:4.13.1") ++ testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") +} + @@ -347,26 +347,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven - maven-resolver-provider -- 3.8.1 +- 3.8.4 - runtime - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.0 +- 1.7.2 - runtime - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.0 +- 1.7.2 - runtime - - - - junit - junit -- 4.13.1 +- 4.13.2 - test - - @@ -474,12 +474,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.ow2.asm - asm -- 9.1 +- 9.2 - - - org.ow2.asm - asm-commons -- 9.1 +- 9.2 - - - @@ -598,7 +598,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.eclipse.jdt - ecj -- 3.27.0 +- 3.28.0 - - - diff --git a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 2f091c367a..d6f389e5d2 100644 --- a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 runtimeOnly("mysql:mysql-connector-java:8.0.27") + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper - runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1") - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/resources/log4j2.xml diff --git a/patches/server/Use-Velocity-compression-and-cipher-natives.patch b/patches/server/Use-Velocity-compression-and-cipher-natives.patch index 6fafd6c4b9..a3abb6d019 100644 --- a/patches/server/Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/Use-Velocity-compression-and-cipher-natives.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation + // Paper start - Use Velocity cipher @@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test - testImplementation("junit:junit:4.13.1") + testImplementation("junit:junit:4.13.2") diff --git a/src/main/java/net/minecraft/network/CipherDecoder.java b/src/main/java/net/minecraft/network/CipherDecoder.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/CipherDecoder.java diff --git a/scripts/apatch.sh b/scripts/apatch.sh index f56771d9ef..9156cb7cb9 100755 --- a/scripts/apatch.sh +++ b/scripts/apatch.sh @@ -40,7 +40,7 @@ fi for i in $(find . -name \*.rej); do base=$(echo "$i" | sed 's/.rej//g') if [ -f "$i" ]; then - sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i" + sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i '' $i && wiggle -v -l --replace "$base" "$i" rm "$base.porig" "$i" else echo "No such file: $base" diff --git a/work/Bukkit b/work/Bukkit index 5906bed05d..031731e60e 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 5906bed05d29c64af69983e2521cc3e9060d95ec +Subproject commit 031731e60ece4b3fe0468a0df94b89d339b4169d diff --git a/work/CraftBukkit b/work/CraftBukkit index dad8517102..2a2caa7e25 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit dad851710202aeda815ff91c595de68f99e45f2c +Subproject commit 2a2caa7e25cfcf66c368b0098f320ac93d416d6a diff --git a/work/Spigot b/work/Spigot index f65de01fa8..8965a50244 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit f65de01fa82909bd90444c24e49436771663e9c3 +Subproject commit 8965a5024427f83a4e82ce3e3d4773fd78d22d76