diff --git a/gradle.properties b/gradle.properties index 9d9d2e67d..d086189f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21-R0.1-SNAPSHOT mcVersion = 1.21 -paperCommit = f1f01a1622625cd995420f3971e41422302b9cd9 +paperCommit = 7e91a2c3abb438a3ac55b5abfc894486ed5f397f org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 6bbb10a6e..686f4803b 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 1a734293c9416f13324bb0edf8f950c9029f8bc4..42fa7df2badca3fe26258ce0db934ba33f9cec80 100644 +index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..409a46eb82262b00a626683072f2734255f2c2b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -28,7 +28,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..42fa7df2badca3fe26258ce0db934ba3 testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.hamcrest:hamcrest:2.2") -@@ -80,14 +84,14 @@ tasks.jar { +@@ -84,14 +88,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -48,7 +48,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..42fa7df2badca3fe26258ce0db934ba3 "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -144,7 +148,7 @@ fun TaskContainer.registerRunTask( +@@ -148,7 +152,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index cfc660c84..29d6defad 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -72,12 +72,12 @@ index 2d344df35d47b4b1ecddf32ccaa4dae41e5f58cb..2f7ed5b38e8930b3a615f160cdf4c5b0 boolean flag1 = this.source.acceptsSuccess() && !this.silent; boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 7d82cc6b847124cf4225428ba310309544928148..04fd1172b47a74b16955cf93fc20f64fd056b16e 100644 +index dd56c8e041116ef3602a9f89c998c8208ab89b51..a96e7df92b7d45e1c6750368fda647be026f657b 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -236,6 +236,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized +@@ -238,6 +238,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command + this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics + // Purpur start + try { @@ -112,10 +112,10 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..04953d12a6aab561b9510adad145918a this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..3e22545aead92a6bd5eb4e0b67b658c18d965c8a 100644 +index c8b82bc41f2042bb4b067f06265a3a22e51f7629..8766e8fdae330ecff174d0257e09ccf38458c37f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1068,6 +1068,7 @@ public final class CraftServer implements Server { +@@ -1070,6 +1070,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -123,7 +123,7 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..3e22545aead92a6bd5eb4e0b67b658c1 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1083,6 +1084,7 @@ public final class CraftServer implements Server { +@@ -1085,6 +1086,7 @@ public final class CraftServer implements Server { } } world.spigotConfig.init(); // Spigot @@ -131,15 +131,15 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..3e22545aead92a6bd5eb4e0b67b658c1 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1099,6 +1101,7 @@ public final class CraftServer implements Server { - this.reloadData(); +@@ -1102,6 +1104,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper + this.spark.registerCommandBeforePlugins(this); // Paper - spark + org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2987,6 +2990,18 @@ public final class CraftServer implements Server { +@@ -2991,6 +2994,18 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -159,7 +159,7 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..3e22545aead92a6bd5eb4e0b67b658c1 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 38083fc6dc60673562f2d05aa354c365571baff8..98dd06878b76b0c1d70242afd49738b253cd0e80 100644 +index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..511561181468f07ec537af653e8bf47a2aa5f2cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -176,6 +176,14 @@ public class Main { diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch index 9639c738e..52733f1e0 100644 --- a/patches/server/0007-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -22,10 +22,10 @@ index 2767d6f97e8b314d23a8e62f22dfd396f5660d31..a64e5997b94cc8173f0512d1e282355f super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8160c35368fc2c52d6f4a42df27adb2ef6eb87f3..810424fc57a00ad4f5345c02393c0467109485e9 100644 +index 9325d6f95165a7cee00d7de736af723681cc16b4..cc5bb3a8a06a7fc727f8737fca727f72a9302264 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1778,6 +1778,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - Add EntityMoveEvent net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers worldserver.updateLagCompensationTick(); // Paper - lag compensation diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch index c5f08c39b..e96f87f51 100644 --- a/patches/server/0012-Bring-back-server-name.patch +++ b/patches/server/0012-Bring-back-server-name.patch @@ -17,10 +17,10 @@ index d6431376184e5650b370cbab204e28bc31f4dac6..9ebe1f1797b5be562bc4f6d92b9a4d60 public final boolean spawnNpcs = this.get("spawn-npcs", true); public final boolean pvp = this.get("pvp", true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3e22545aead92a6bd5eb4e0b67b658c18d965c8a..0a752846d86e0383b61e7a631be4b7448a67d4bd 100644 +index 8766e8fdae330ecff174d0257e09ccf38458c37f..a03e272ada8b01a0928214d4d5aa03dfb57ed31a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3229,4 +3229,11 @@ public final class CraftServer implements Server { +@@ -3233,4 +3233,11 @@ public final class CraftServer implements Server { return this.potionBrewer; } // Paper end diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch index 05af83e0d..ba66669bb 100644 --- a/patches/server/0013-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 810424fc57a00ad4f5345c02393c0467109485e9..3a339cae287b751452e5dd7a57b6ce10f3c73e7e 100644 +index cc5bb3a8a06a7fc727f8737fca727f72a9302264..a447abcc0ee8f3657f3a6cb189f9f74c322a8f91 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop transaction = new java.util.ArrayList(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 860a24a6d3e80d9ff94743f46f6fa217c36f3614..cd3a0bd03956e0149089a90d997893d32d4afac3 100644 +index 5fdd11c1d7456f50828a6aed68125d6b248580e3..e29fd833094840091cb6dfb788fe1c77896c4cc3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1607,6 +1607,19 @@ public final class CraftServer implements Server { +@@ -1611,6 +1611,19 @@ public final class CraftServer implements Server { return true; } diff --git a/patches/server/0209-UPnP-Port-Forwarding.patch b/patches/server/0209-UPnP-Port-Forwarding.patch index c2b3f80f6..a36e13f76 100644 --- a/patches/server/0209-UPnP-Port-Forwarding.patch +++ b/patches/server/0209-UPnP-Port-Forwarding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8e8cc0b294c89cc9ebabee42d6a6d9ced4f9cd7d..fd8775262e0f9e0167d634b99e8ef1853a97a8bb 100644 +index fc2ce566c8af96548b26e238a0194dd382df823e..4c7423b13629943752f3190e6aa9cce2932cc10b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -321,6 +321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sat, 25 Jun 2022 19:40:36 -0400 -Subject: [PATCH] Spark Profiler - -Co-authored-by: granny - -diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -index 6f14cb9a73faa1d0ae2939d08809d9f6c2a99e1d..4e98745670032038f7b4f8e1adabc1e00e7f15bf 100644 ---- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -@@ -112,6 +112,7 @@ public class PluginInitializerManager { - @SuppressWarnings("unchecked") - java.util.List files = ((java.util.List) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList(); - io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files); -+ io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.SparkProviderSource.INSTANCE, new File("cache", "spark.jar").toPath()); // Purpur - } - - // This will be the end of me... -diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java -new file mode 100644 -index 0000000000000000000000000000000000000000..cb78dac8e072b5cb3c6e52e17c9ecdf708aeedc1 ---- /dev/null -+++ b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java -@@ -0,0 +1,115 @@ -+package io.papermc.paper.plugin.provider.source; -+ -+import com.mojang.logging.LogUtils; -+import io.papermc.paper.plugin.entrypoint.Entrypoint; -+import io.papermc.paper.plugin.entrypoint.EntrypointHandler; -+import io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler; -+import io.papermc.paper.plugin.provider.PluginProvider; -+import java.io.BufferedReader; -+import java.io.File; -+import java.io.InputStreamReader; -+import java.math.BigInteger; -+import java.net.URL; -+import java.net.URLConnection; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.nio.file.StandardCopyOption; -+import java.security.MessageDigest; -+import java.util.stream.Collectors; -+import org.bukkit.plugin.java.JavaPlugin; -+import org.slf4j.Logger; -+ -+public class SparkProviderSource implements ProviderSource { -+ -+ public static final SparkProviderSource INSTANCE = new SparkProviderSource(); -+ private static final FileProviderSource FILE_PROVIDER_SOURCE = new FileProviderSource("File '%s' specified by Purpur"::formatted); -+ private static final Logger LOGGER = LogUtils.getClassLogger(); -+ -+ @Override -+ public Path prepareContext(Path context) { -+ // first, check if user doesn't want spark at all -+ if (Boolean.getBoolean("Purpur.IReallyDontWantSpark")) { -+ return null; // boo! -+ } -+ -+ // second, check if user has their own spark -+ if (hasSpark()) { -+ LOGGER.info("Purpur: Using user-provided spark plugin instead of our own."); -+ return null; // let's hope it's at least the modern version :3 -+ } -+ -+ // you can't have errors in your code if you wrap the entire codebase in a try/catch block -+ try { -+ -+ // make sure the directory exists where we want to keep spark -+ File file = context.toFile(); -+ file.getParentFile().mkdirs(); -+ -+ boolean shouldDownload; -+ -+ // check if our spark exists -+ if (!file.exists()) { -+ // it does not, so let's download it -+ shouldDownload = true; -+ } else { -+ // we have a spark file, let's see if it's up-to-date by comparing shas -+ String fileSha1 = String.format("%040x", new BigInteger(1, MessageDigest.getInstance("SHA-1").digest(Files.readAllBytes(file.toPath())))); -+ String sparkSha1; -+ -+ // luck has a nifty endpoint containing the sha of the newest version -+ URLConnection urlConnection = new URL("https://sparkapi.lucko.me/download/bukkit/sha1").openConnection(); -+ -+ // set a reasonable timeout to prevent servers without internet from hanging for 60+ seconds on startup -+ urlConnection.setReadTimeout(5000); -+ urlConnection.setConnectTimeout(5000); -+ -+ // read it -+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()))) { -+ sparkSha1 = reader.lines().collect(Collectors.joining("")); -+ } -+ -+ // compare; we only download a new spark if the shas don't match -+ shouldDownload = !fileSha1.equals(sparkSha1); -+ } -+ -+ // ok, finally we can download spark if we need it -+ if (shouldDownload) { -+ URLConnection urlConnection = new URL("https://sparkapi.lucko.me/download/bukkit").openConnection(); -+ urlConnection.setReadTimeout(5000); -+ urlConnection.setConnectTimeout(5000); -+ Files.copy(urlConnection.getInputStream(), file.toPath(), StandardCopyOption.REPLACE_EXISTING); -+ } -+ -+ // register the spark, newly downloaded or existing -+ return FILE_PROVIDER_SOURCE.prepareContext(context); -+ -+ } catch (Throwable e) { -+ LOGGER.error("Purpur: Failed to download and install spark plugin", e); -+ } -+ return null; -+ } -+ -+ @Override -+ public void registerProviders(final EntrypointHandler entrypointHandler, final Path context) { -+ if (context == null) { -+ return; -+ } -+ -+ try { -+ FILE_PROVIDER_SOURCE.registerProviders(entrypointHandler, context); -+ } catch (IllegalArgumentException ignored) { -+ // Ignore illegal argument exceptions from jar checking -+ } catch (Exception e) { -+ LOGGER.error("Error loading our spark plugin: " + e.getMessage(), e); -+ } -+ } -+ -+ private static boolean hasSpark() { -+ for (PluginProvider provider : LaunchEntryPointHandler.INSTANCE.get(Entrypoint.PLUGIN).getRegisteredProviders()) { -+ if (provider.getMeta().getName().equalsIgnoreCase("spark")) { -+ return true; -+ } -+ } -+ return false; -+ } -+} diff --git a/patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0248-Config-to-not-let-coral-die.patch b/patches/server/0247-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0248-Config-to-not-let-coral-die.patch rename to patches/server/0247-Config-to-not-let-coral-die.patch diff --git a/patches/server/0249-Add-local-difficulty-api.patch b/patches/server/0248-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0249-Add-local-difficulty-api.patch rename to patches/server/0248-Add-local-difficulty-api.patch diff --git a/patches/server/0250-Add-toggle-for-RNG-manipulation.patch b/patches/server/0249-Add-toggle-for-RNG-manipulation.patch similarity index 100% rename from patches/server/0250-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0249-Add-toggle-for-RNG-manipulation.patch diff --git a/patches/server/0251-Remove-Timings.patch b/patches/server/0250-Remove-Timings.patch similarity index 98% rename from patches/server/0251-Remove-Timings.patch rename to patches/server/0250-Remove-Timings.patch index 8d2f5b2e7..8a86e0bf7 100644 --- a/patches/server/0251-Remove-Timings.patch +++ b/patches/server/0250-Remove-Timings.patch @@ -42,10 +42,10 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..01efbc507b3d58f13f78ee286f93df40 } catch (Exception exception) { if (exception instanceof ReportedException) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d884b0a34cdd5f3eb518d779e7240d4e81941ed8..696cbee14df0efda70d01c57dcd905a6c06fb7fe 100644 +index 2de2fa1f515eac62ff5a8a789f3a86c83221cd31..5e1004ccd735a0889dbdfbfcebb921422ac992a4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1600,15 +1600,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); @@ -97,7 +97,7 @@ index d884b0a34cdd5f3eb518d779e7240d4e81941ed8..696cbee14df0efda70d01c57dcd905a6 // Paper start - Folia scheduler API ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick(); getAllLevels().forEach(level -> { -@@ -1759,21 +1759,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return false; } : this::haveTime); -@@ -1325,7 +1325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1641,7 +1641,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur @@ -246,7 +246,7 @@ index 696cbee14df0efda70d01c57dcd905a6c06fb7fe..ce0682727a0623b4781f6cd43ab54fca try { //worldserver.timings.doTick.startTiming(); // Spigot // Purpur -@@ -1831,17 +1831,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.executeBlocking(() -> { this.saveDebugReport(path.resolve("server")); -@@ -2852,40 +2853,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop