diff --git a/gradle.properties b/gradle.properties index 92b00cc44..7c4e51bbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT mcVersion = 1.17 packageVersion = 1_17_R1 -paperCommit = 0ae6dd265913fc1e0c602d7d9dfa82494c5f5d3c +paperCommit = 6fd92758670a4c38ceb1b4dc6ed671547185f414 org.gradle.parallel = true org.gradle.vfs.watch = false diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index b08dd95b4..04f618383 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -17,10 +17,27 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/build.gradle.kts b/build.gradle.kts -index 5540da58e66f83b283863d3158a9b4ab5ba636db..f766183883f009368b79e1201553c184a373e2cf 100644 +index 5540da58e66f83b283863d3158a9b4ab5ba636db..ab8de6c4e3c0bea2b9f498da00adf88e987d2364 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,8 +30,8 @@ repositories { +@@ -1,10 +1,16 @@ + import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer + import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer + import io.papermc.paperweight.tasks.BaseTask ++import io.papermc.paperweight.tasks.GenerateReobfMappings ++import io.papermc.paperweight.tasks.PatchMappings ++import io.papermc.paperweight.util.Constants + import io.papermc.paperweight.util.Git ++import io.papermc.paperweight.util.cache + import io.papermc.paperweight.util.defaultOutput + import io.papermc.paperweight.util.openZip + import io.papermc.paperweight.util.path ++import io.papermc.paperweight.util.registering ++import io.papermc.paperweight.util.set + import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE + import java.nio.file.Files + import java.text.SimpleDateFormat +@@ -30,8 +36,8 @@ repositories { } dependencies { @@ -31,7 +48,7 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..f766183883f009368b79e1201553c184 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -82,7 +82,7 @@ tasks.jar { +@@ -82,7 +88,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -40,7 +57,30 @@ index 5540da58e66f83b283863d3158a9b4ab5ba636db..f766183883f009368b79e1201553c184 "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -178,7 +178,7 @@ tasks.test { +@@ -107,6 +113,22 @@ publishing { + } + } + ++val generateReobfMappings = rootProject.tasks.named("generateReobfMappings") ++ ++val patchReobfMappings by tasks.registering { ++ inputMappings.set(generateReobfMappings.flatMap { it.reobfMappings }) ++ patch.set(rootProject.layout.cache.resolve("paperweight/upstreams/paper/build-data/reobf-mappings-patch.tiny")) ++ ++ fromNamespace.set(Constants.DEOBF_NAMESPACE) ++ toNamespace.set(Constants.SPIGOT_NAMESPACE) ++ ++ outputMappings.set(layout.cache.resolve("paperweight/mappings/reobf-patched.tiny")) ++} ++ ++tasks.reobfJar { ++ mappingsFile.set(patchReobfMappings.flatMap { it.outputMappings }) ++} ++ + val generatePom = tasks.named("generatePomFileForMavenPublication") + + tasks.shadowJar { +@@ -178,7 +200,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -9735,7 +9775,7 @@ index 0000000000000000000000000000000000000000..f188ff6b08abddd06a3120fb15825e0f + } +} diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index b70aa66732fb5e957aed0901f4c76358b2c56f8e..009febf8fccbfc9a638f018f921ebd9ec9068196 100644 +index b70aa66732fb5e957aed0901f4c76358b2c56f8e..b01d7da333bac7820e42b6f645634a15ef88ae4f 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -478,9 +478,9 @@ public class BlockPos extends Vec3i { @@ -9745,9 +9785,9 @@ index b70aa66732fb5e957aed0901f4c76358b2c56f8e..009febf8fccbfc9a638f018f921ebd9e - this.setX(x); - this.setY(y); - this.setZ(z); -+ ((Vec3i)this).x = x; // Tuinity - force inline -+ ((Vec3i)this).y = y; // Tuinity - force inline -+ ((Vec3i)this).z = z; // Tuinity - force inline ++ this.x = x; // Tuinity - force inline ++ this.y = y; // Tuinity - force inline ++ this.z = z; // Tuinity - force inline return this; } @@ -9756,21 +9796,21 @@ index b70aa66732fb5e957aed0901f4c76358b2c56f8e..009febf8fccbfc9a638f018f921ebd9e @Override public BlockPos.MutableBlockPos setX(int i) { - super.setX(i); -+ ((Vec3i)this).x = i; // Tuinity ++ this.x = i; // Tuinity return this; } @Override public BlockPos.MutableBlockPos setY(int i) { - super.setY(i); -+ ((Vec3i)this).y = i; // Tuinity ++ this.y = i; // Tuinity return this; } @Override public BlockPos.MutableBlockPos setZ(int i) { - super.setZ(i); -+ ((Vec3i)this).z = i; // Tuinity ++ this.z = i; // Tuinity return this; } // Paper end @@ -14178,7 +14218,7 @@ index 325e244c46ec208a2e7e18d71ccbbfcc25fc1bce..6a4e44dd8935018d1b5283761dfb8e85 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 17281575ff83bbf1e720335619a78a6d0a0e5077..8196be52af4a5ea1bf280d646dc2db15d9ad6ea2 100644 +index 17281575ff83bbf1e720335619a78a6d0a0e5077..38753e10b1597a2f3bd2cde208c6e30b26a03b43 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -14221,7 +14261,7 @@ index 17281575ff83bbf1e720335619a78a6d0a0e5077..8196be52af4a5ea1bf280d646dc2db15 + + @Override + public void getHardCollidingEntities(Entity except, AABB box, Predicate predicate, List into) { -+ this.entitySliceManager.getEntities(except, box, into, predicate); ++ this.entitySliceManager.getHardCollidingEntities(except, box, into, predicate); + } + + @Override diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index 524079a96..97fe1b66d 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9574429f6 100644 +index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a42318af66ce9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,8 +30,8 @@ repositories { +@@ -36,8 +36,8 @@ repositories { } dependencies { @@ -19,7 +19,7 @@ index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -61,6 +61,7 @@ dependencies { +@@ -67,6 +67,7 @@ dependencies { implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper @@ -27,7 +27,7 @@ index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9 implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning -@@ -82,7 +83,7 @@ tasks.jar { +@@ -88,7 +89,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -220,7 +220,7 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2aa45667054a721465f353f0500e30d90f7d16a4..c61ff190f04ac3d765d34f3eeb6a927d49f8d491 100644 +index 130a088e694b85f7d56620352f044161ea56caf3..818dde63df240c7e72526ef0aef87c9f8739f78a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0226-Add-uptime-command.patch b/patches/server/0225-Add-uptime-command.patch similarity index 98% rename from patches/server/0226-Add-uptime-command.patch rename to patches/server/0225-Add-uptime-command.patch index 7c0c9f60d..584306aa3 100644 --- a/patches/server/0226-Add-uptime-command.patch +++ b/patches/server/0225-Add-uptime-command.patch @@ -29,7 +29,7 @@ index 108dadb24607ea42cf857879386c34c9bb72dbee..a87be8fe6fbed952bfee76bab49e313b public int autosavePeriod; public boolean serverAutoSave = false; // Paper diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 505bcc6e2a3977af25c0f9de2b2477fa4657a6bd..2f829dcc2b21c6283d07b69d3d3b86ec5fd12b0b 100644 +index 9b730c8e14d4ccbb46977bd2026c466a78008ec4..fb2e07475386a8af27618b597bd8573244e30a4a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -163,6 +163,7 @@ public class PurpurConfig { diff --git a/patches/server/0225-Apply-paper-s-reobf-mappings-patch.patch b/patches/server/0225-Apply-paper-s-reobf-mappings-patch.patch deleted file mode 100644 index e14b453af..000000000 --- a/patches/server/0225-Apply-paper-s-reobf-mappings-patch.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Wed, 30 Jun 2021 02:33:18 -0700 -Subject: [PATCH] Apply paper's reobf mappings patch - -Workaround until paperweight implements reobf mappings patch support for forks - -diff --git a/build.gradle.kts b/build.gradle.kts -index fba83a632abace5c2b280ea5919175f9574429f6..f88ade92a25cb5eda7abc658551a42318af66ce9 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -1,10 +1,16 @@ - import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer - import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer - import io.papermc.paperweight.tasks.BaseTask -+import io.papermc.paperweight.tasks.GenerateReobfMappings -+import io.papermc.paperweight.tasks.PatchMappings -+import io.papermc.paperweight.util.Constants - import io.papermc.paperweight.util.Git -+import io.papermc.paperweight.util.cache - import io.papermc.paperweight.util.defaultOutput - import io.papermc.paperweight.util.openZip - import io.papermc.paperweight.util.path -+import io.papermc.paperweight.util.registering -+import io.papermc.paperweight.util.set - import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE - import java.nio.file.Files - import java.text.SimpleDateFormat -@@ -108,6 +114,22 @@ publishing { - } - } - -+val generateReobfMappings = rootProject.tasks.named("generateReobfMappings") -+ -+val patchReobfMappings by tasks.registering { -+ inputMappings.set(generateReobfMappings.flatMap { it.reobfMappings }) -+ patch.set(rootProject.layout.cache.resolve("paperweight/upstreams/paper/build-data/reobf-mappings-patch.tiny")) -+ -+ fromNamespace.set(Constants.DEOBF_NAMESPACE) -+ toNamespace.set(Constants.SPIGOT_NAMESPACE) -+ -+ outputMappings.set(layout.cache.resolve("paperweight/mappings/reobf-patched.tiny")) -+} -+ -+tasks.reobfJar { -+ mappingsFile.set(patchReobfMappings.flatMap { it.outputMappings }) -+} -+ - val generatePom = tasks.named("generatePomFileForMavenPublication") - - tasks.shadowJar { diff --git a/patches/server/0227-Structure-seed-options.patch b/patches/server/0226-Structure-seed-options.patch similarity index 97% rename from patches/server/0227-Structure-seed-options.patch rename to patches/server/0226-Structure-seed-options.patch index cb56b7342..03a164128 100644 --- a/patches/server/0227-Structure-seed-options.patch +++ b/patches/server/0226-Structure-seed-options.patch @@ -27,7 +27,7 @@ index 6cd66a4edbe2010d2a34506baf1ba6fe3de38bb9..f3e67330c01f6a867ccd4e024a6695d9 updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 2f829dcc2b21c6283d07b69d3d3b86ec5fd12b0b..9592a9e6743e7fe0250de16680dd0d3e2e5e7776 100644 +index fb2e07475386a8af27618b597bd8573244e30a4a..a81d328e209c8161446b94dd2e78197a4c6a891f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -243,6 +243,9 @@ public class PurpurConfig { diff --git a/patches/server/0228-Hoe-tilling-options.patch b/patches/server/0227-Hoe-tilling-options.patch similarity index 100% rename from patches/server/0228-Hoe-tilling-options.patch rename to patches/server/0227-Hoe-tilling-options.patch diff --git a/patches/server/0229-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch similarity index 100% rename from patches/server/0229-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch rename to patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch diff --git a/patches/server/0230-Store-placer-on-Block-when-placed.patch b/patches/server/0229-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0230-Store-placer-on-Block-when-placed.patch rename to patches/server/0229-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0231-Summoner-API.patch b/patches/server/0230-Summoner-API.patch similarity index 100% rename from patches/server/0231-Summoner-API.patch rename to patches/server/0230-Summoner-API.patch