diff --git a/gradle.properties b/gradle.properties index 2def731..ae53b97 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion = 1.21 version = 1.21-R0.1-SNAPSHOT -purpurRef = 032697e7ac8946c54d7a3399c385951ff06b3e6e +purpurRef = b2d1fea9bea1718e0abf5d7309d0cda7193e981e org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 22fe7a6..9d7661d 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 42fa7df2badca3fe26258ce0db934ba33f9cec80..435e8c4674399114bd085d7362d03d79a203e13f 100644 +index 409a46eb82262b00a626683072f2734255f2c2b8..1df6dc41069d05e7d6aea5a42bfcc61ea9e5ccbb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -17,7 +17,7 @@ index 42fa7df2badca3fe26258ce0db934ba33f9cec80..435e8c4674399114bd085d7362d03d79 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -84,14 +84,14 @@ tasks.jar { +@@ -88,14 +88,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -37,7 +37,7 @@ index 42fa7df2badca3fe26258ce0db934ba33f9cec80..435e8c4674399114bd085d7362d03d79 "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -227,3 +227,12 @@ tasks.registerRunTask("runReobfPaperclip") { +@@ -231,3 +231,12 @@ tasks.registerRunTask("runReobfPaperclip") { classpath(rootProject.tasks.named("createReobfPaperclipJar").flatMap { it.outputZip }) mainClass.set(null as String?) } diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index fccc8a0..f49a611 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Configuration diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee665d98fd05 100644 +index 744cfc91fa8b78794f1edab1f81035b21bf0c83f..8eb5101eece8be63899366c0e54938a4feebd5b3 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -58,6 +58,7 @@ import net.minecraft.world.level.GameType; @@ -16,7 +16,7 @@ index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee66 // CraftBukkit start import net.minecraft.server.WorldLoader; -@@ -248,6 +249,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -250,6 +251,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // Purpur end com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now @@ -62,7 +62,7 @@ index ed313b0424b2e1e1335ee3e3bd4d9cfd15f24b39..4d2e285657ad2c060c384e1e4027e00d this.generator = gen; 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 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437fc0a2e9ab 100644 +index d87ecd6e7552ab537c9d9e8a10a471814e61632d..3a2da4b1275df762f0a4c0e40c416896062a29a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -265,6 +265,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot @@ -74,7 +74,7 @@ index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437f public final class CraftServer implements Server { private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper private final String serverVersion; -@@ -1083,6 +1085,7 @@ public final class CraftServer implements Server { +@@ -1085,6 +1087,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); org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur @@ -82,7 +82,7 @@ index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437f 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)) -@@ -1099,6 +1102,7 @@ public final class CraftServer implements Server { +@@ -1101,6 +1104,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.purpurConfig.init(); // Purpur @@ -90,15 +90,15 @@ index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437f } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1116,6 +1120,7 @@ public final class CraftServer implements Server { - org.spigotmc.SpigotConfig.registerCommands(); // Spigot +@@ -1119,6 +1123,7 @@ public final class CraftServer implements Server { io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper + this.spark.registerCommandBeforePlugins(this); // Paper - spark org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur + DivineConfig.registerCommands(); // DivineMC this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -3065,6 +3070,13 @@ public final class CraftServer implements Server { +@@ -3069,6 +3074,13 @@ public final class CraftServer implements Server { } // Purpur end @@ -113,7 +113,7 @@ index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437f 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 577b2f19e625ca71b13477eb96e42e04954fa449..52fb3f237a986b79339e2e1142d33a8d5291bdce 100644 +index 260f79affee997adbe8d08f2a2cb3aa68083f497..2db58e41ec075c7c09a310c3271a0a8c01d77f0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -184,6 +184,14 @@ public class Main { diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch index 64ceccd..e5250a4 100644 --- a/patches/server/0003-Optimize-default-values-for-configs.patch +++ b/patches/server/0003-Optimize-default-values-for-configs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize default values for configs diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 379452394679c466a09441d4c12882d0d00d9ef3..ea48befad95da428751dc4a0991f34e6dc7f6d04 100644 +index d20969e18984c9b93483477f31b079686977b1db..cb64b9874c5c5aa71588acd31f91988b8b5e9c73 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -330,9 +330,9 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -337,9 +337,9 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean fixEntityPositionDesync = true; public boolean loadPermissionsYmlBeforePlugins = true; @Constraints.Min(4) @@ -190,10 +190,10 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768 public double maxLeashDistance = Leashable.LEASH_TOO_FAR_DIST; public boolean disableSprintInterruptionOnAttack = false; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index ccde063ef8a5ee2dc5714c16aeda31f963745173..31a2779ede1595bbadb7b3dfe2c764ed4a53bfea 100644 +index 8eb5101eece8be63899366c0e54938a4feebd5b3..514520c33c6f0a239055a37ddc7cae563b56f748 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -341,7 +341,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -343,7 +343,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; // Paper end - Add Velocity IP Forwarding Support diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index da9e8cf..d579cf7 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -730,7 +730,7 @@ index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab String content = context.getRange().get(context.getInput()); String[] args = org.apache.commons.lang3.StringUtils.split(content, ' '); // fix adjacent spaces (from console/plugins) causing empty array elements diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index ea48befad95da428751dc4a0991f34e6dc7f6d04..e2dd123792983c3ad56702b9f5b807600afa2f2a 100644 +index cb64b9874c5c5aa71588acd31f91988b8b5e9c73..ae41148efd607ce6cd8828da264ecaf22a9cab13 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -1,6 +1,5 @@ @@ -740,8 +740,8 @@ index ea48befad95da428751dc4a0991f34e6dc7f6d04..e2dd123792983c3ad56702b9f5b80760 import com.mojang.logging.LogUtils; import io.papermc.paper.configuration.constraint.Constraints; import io.papermc.paper.configuration.type.number.IntOr; -@@ -91,29 +90,6 @@ public class GlobalConfiguration extends ConfigurationPart { - public boolean useDisplayNameInQuitMessage = false; +@@ -98,29 +97,6 @@ public class GlobalConfiguration extends ConfigurationPart { + public boolean enableImmediately = false; } - @Deprecated(forRemoval = true) @@ -826,7 +826,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc } 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 932283d2385923c1777975970b631875aa7b4187..9f48bf88be9136bd358019f959a0039827a16484 100644 +index d0c31849b67e19e9a14593b3907266a3759acb61..acc5f1b758ce8810f93ad832519b7287cd282409 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,7 +3,6 @@ package net.minecraft.server; @@ -846,15 +846,15 @@ index 932283d2385923c1777975970b631875aa7b4187..9f48bf88be9136bd358019f959a00398 public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system private static MinecraftServer SERVER; // Paper -@@ -1039,7 +1036,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop