Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

💀💀💀

Browse Source
This commit is contained in:
AlphaKR93
2024-05-14 23:48:56 +09:00
parent 63e37b3633
commit 718927ee70
12 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -24,4 +24,4 @@ pufferfishBranch = ver/1.20
usePufferfish = true usePufferfish = true
paperCommit = 3fc93581bb876e8149b2ca423375a98f5ca12d27 paperCommit = 3fc93581bb876e8149b2ca423375a98f5ca12d27
purpurCommit = 24b161b1be559e7f84d881f9cabe2830d693e621 purpurCommit = 932a98f25cb95aad3fdb341d634636fb62d7ae68

4
libs/server.versions.toml
View File

@@ -6,6 +6,7 @@ ansi = "1.0.3"
jansi = "3.21.0" jansi = "3.21.0"
rhino = "1.7.14" rhino = "1.7.14"
mysql = "8.2.0" mysql = "8.2.0"
flare = "34637f3f87"
sqlite = "3.42.0.1" sqlite = "3.42.0.1"
pioneer = "2.2.0" pioneer = "2.2.0"
haproxy = "4.1.97.Final" haproxy = "4.1.97.Final"
@@ -25,6 +26,7 @@ ansi = { group = "net.kyori", name = "ansi", version.ref = "ansi" }
upnp = { group = "dev.omega24", name = "upnp4j", version.ref = "upnp" } upnp = { group = "dev.omega24", name = "upnp4j", version.ref = "upnp" }
mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" } mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" } jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" }
flare = { group = "com.github.technove", name = "flare", version.ref = "flare" }
sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" } sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" } pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" }
haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" } haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" }
@@ -45,5 +47,5 @@ rewriter-generator = { group = "io.papermc", name = "reflection-rewriter-proxy-g
[bundles] [bundles]
runtime = [ "sqlite", "mysql", "disruptor" ] runtime = [ "sqlite", "mysql", "disruptor" ]
implementation = [ "jansi", "tca", "ansi", "upnp", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime", "srgutils", "art", "rewriter", "rewriter-runtime", "rewriter-generator" ] implementation = [ "jansi", "tca", "ansi", "upnp", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime", "srgutils", "art", "rewriter", "rewriter-runtime", "rewriter-generator", "flare" ]
test = [ "classgraph", "pioneer" ] test = [ "classgraph", "pioneer" ]

2
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <contact@granny.dev> From: granny <contact@granny.dev>
Date: Tue, 14 May 2024 22:59:42 +0900 Date: Tue, 14 May 2024 23:44:28 +0900
Subject: [PATCH] Purpur API Changes Subject: [PATCH] Purpur API Changes
PurpurMC PurpurMC

9
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kevin Raneri <kevin.raneri@gmail.com> From: Kevin Raneri <kevin.raneri@gmail.com>
Date: Tue, 14 May 2024 22:59:40 +0900 Date: Tue, 14 May 2024 23:44:26 +0900
Subject: [PATCH] Pufferfish Server Changes Subject: [PATCH] Pufferfish Server Changes
Pufferfish Pufferfish
@@ -2293,20 +2293,19 @@ index 39303bb4e336732db0ab19dee0c1f8b609bbb134..b5b5d467231b571455f82d1943e6a8a4
} }
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..3923c551735057665760c885af4c556e807be108 100644 index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..55f14f6d56fdff07c49b1c223f5c6df34833b825 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -233,6 +233,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -233,6 +233,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
+ gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
this.setPvpAllowed(dedicatedserverproperties.pvp); this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setFlightAllowed(dedicatedserverproperties.allowFlight);
@@ -353,6 +356,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -353,6 +355,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled"); DedicatedServer.LOGGER.info("JMX monitoring enabled");
} }

15
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <contact@granny.dev> From: granny <contact@granny.dev>
Date: Tue, 14 May 2024 22:59:42 +0900 Date: Tue, 14 May 2024 23:44:27 +0900
Subject: [PATCH] Purpur Server Changes Subject: [PATCH] Purpur Server Changes
PurpurMC PurpurMC
@@ -1789,7 +1789,7 @@ index 47355158e5e762540a10dc67b23092a0fc53bce3..9f1c8a62bda242781a0966fa2fc01534
entityitem = entityplayer.drop(itemstack, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event entityitem = entityplayer.drop(itemstack, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event
if (entityitem != null) { if (entityitem != null) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682bf3850778 100644 index 55f14f6d56fdff07c49b1c223f5c6df34833b825..fd88dfafcec517a29e3320ce147516ce2ccb2dc9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -110,6 +110,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -110,6 +110,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -1800,7 +1800,7 @@ index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682b
new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
/* /*
jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader; jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader;
@@ -232,8 +233,18 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -232,7 +233,17 @@ 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 thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
@@ -1814,12 +1814,11 @@ index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682b
+ org.purpurmc.purpur.PurpurConfig.registerCommands(); + org.purpurmc.purpur.PurpurConfig.registerCommands();
+ // Purpur end + // Purpur end
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur + gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur
gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
@@ -283,6 +294,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -282,6 +293,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
if (true) throw new IllegalStateException("Failed to bind to port", ioexception); // Paper - Propagate failed to bind to port error if (true) throw new IllegalStateException("Failed to bind to port", ioexception); // Paper - Propagate failed to bind to port error
return false; return false;
} }
@@ -1850,7 +1849,7 @@ index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682b
// CraftBukkit start // CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
@@ -357,6 +392,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -356,6 +391,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
} }
if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -1859,7 +1858,7 @@ index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682b
return true; return true;
} }
} }
@@ -509,7 +546,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -508,7 +545,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
} }
public void handleConsoleInputs() { public void handleConsoleInputs() {
@@ -1868,7 +1867,7 @@ index 3923c551735057665760c885af4c556e807be108..894efda0d643f054fa42f5f6ba87682b
// Paper start - Perf: use proper queue // Paper start - Perf: use proper queue
ConsoleInput servercommand; ConsoleInput servercommand;
while ((servercommand = this.serverCommandQueue.poll()) != null) { while ((servercommand = this.serverCommandQueue.poll()) != null) {
@@ -526,7 +563,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -525,7 +562,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// CraftBukkit end // CraftBukkit end
} }

21
patches/server/0003-Use-Gradle-Version-Catalogs.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Use Gradle Version Catalogs
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 3bece6335887414d1388505febf6b8796e32bf9a..055c64f6dbe6598e88fa2a01e80062fedcce4e20 100644 index 3bece6335887414d1388505febf6b8796e32bf9a..8d1a11c1a1fedb7ae73789abc6f4a9a689fb78c3 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -12,66 +12,28 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -12,66 +12,32 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
val alsoShade: Configuration by configurations.creating val alsoShade: Configuration by configurations.creating
dependencies { dependencies {
@@ -39,20 +39,23 @@ index 3bece6335887414d1388505febf6b8796e32bf9a..055c64f6dbe6598e88fa2a01e80062fe
- // Paper start - Use Velocity cipher - // Paper start - Use Velocity cipher
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") { - implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
- isTransitive = false - isTransitive = false
- }
- // Paper end - Use Velocity cipher
+ implementation(project(":purpur-api")) // Purpur + implementation(project(":purpur-api")) // Purpur
+
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+ // Plazma start - Use Gradle Version Catalogs + // Plazma start - Use Gradle Version Catalogs
+ implementation(server.bundles.implementation) + implementation(server.bundles.implementation)
+ implementation(common.snakeyaml)
+ implementation(common.asm.commons) + implementation(common.asm.commons)
+ implementation(common.log4j.iostreams) + implementation(common.log4j.iostreams)
+ implementation(common.commons.lang2) + implementation(common.commons.lang2)
+ implementation(server.velocity) { isTransitive = false } + implementation(server.velocity) { isTransitive = false }
+ + implementation(server.simpleyaml) {
+ exclude(group="org.yaml", module="snakeyaml")
}
- // Paper end - Use Velocity cipher
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+ runtimeOnly(common.maven.provider) + runtimeOnly(common.maven.provider)
+ runtimeOnly(common.bundles.maven) + runtimeOnly(common.bundles.maven)
+ runtimeOnly(server.bundles.runtime) + runtimeOnly(server.bundles.runtime)

10
patches/server/0004-Rebrand.patch
View File

@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..67d405764ed68083d0164b1af0eabc0a
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 055c64f6dbe6598e88fa2a01e80062fedcce4e20..d6482fd7d3ca31208cacd420317a30f4597ef83a 100644 index 8d1a11c1a1fedb7ae73789abc6f4a9a689fb78c3..533418d3514fce41bab403c3ba2db21e96ac134e 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -12,8 +12,8 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -12,8 +12,8 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -44,8 +44,8 @@ index 055c64f6dbe6598e88fa2a01e80062fedcce4e20..d6482fd7d3ca31208cacd420317a30f4
+ implementation(project(":${parent!!.property("projectName").toString().lowercase()}-api")) // Plazma - Rebrand + implementation(project(":${parent!!.property("projectName").toString().lowercase()}-api")) // Plazma - Rebrand
// Plazma start - Use Gradle Version Catalogs // Plazma start - Use Gradle Version Catalogs
implementation(server.bundles.implementation) implementation(server.bundles.implementation)
implementation(common.asm.commons) implementation(common.snakeyaml)
@@ -59,7 +59,7 @@ tasks.jar { @@ -63,7 +63,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@@ -278,10 +278,10 @@ index 4e989dd5919e29d04dcd9f6af0f3922f94d41742..2b015360df398ad8118f7b108cb9474e
} }
// Paper end - Add onboarding message for initial server start // Paper end - Add onboarding message for initial server start
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 894efda0d643f054fa42f5f6ba87682bf3850778..5b42536e5a9e5aec5be8e3630cfae17bb20357e9 100644 index fd88dfafcec517a29e3320ce147516ce2ccb2dc9..78775413d27a5927b8409c4ce92111a482dad1f1 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -797,7 +797,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -796,7 +796,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.bukkit.plugin.Plugin[] plugins = this.server.getPluginManager().getPlugins(); org.bukkit.plugin.Plugin[] plugins = this.server.getPluginManager().getPlugins();
result.append(this.server.getName()); result.append(this.server.getName());

10
patches/server/0006-Plazma-Configurations.patch
View File

@@ -5,17 +5,17 @@ Subject: [PATCH] Plazma Configurations
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index d6482fd7d3ca31208cacd420317a30f4597ef83a..c02fba3660ab368f64bd120db8c0a9de6e4f763d 100644 index 533418d3514fce41bab403c3ba2db21e96ac134e..3995afe1bf7f9b710e40cebce0d5d7b85ce9e258 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies { @@ -20,6 +20,7 @@ dependencies {
implementation(common.asm.commons) implementation(common.asm.commons)
implementation(common.log4j.iostreams) implementation(common.log4j.iostreams)
implementation(common.commons.lang2) implementation(common.commons.lang2)
+ implementation(common.adventure.serializer.ansi) + implementation(common.adventure.serializer.ansi)
implementation(server.velocity) { isTransitive = false } implementation(server.velocity) { isTransitive = false }
implementation(server.simpleyaml) {
runtimeOnly(common.maven.provider) exclude(group="org.yaml", module="snakeyaml")
diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
index f5d725feb6d32f947eed82073c5594e205f31afe..71be8c8e5bb887a68e9ae5ab822313d7766ad6ca 100644 index f5d725feb6d32f947eed82073c5594e205f31afe..71be8c8e5bb887a68e9ae5ab822313d7766ad6ca 100644
--- a/src/main/java/io/papermc/paper/configuration/Configurations.java --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
@@ -596,7 +596,7 @@ index 33e3815a0c979609d4c7ab83ad91e87ac07a556d..4f1071c48fec78036d6759cdff179df3
} }
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5b42536e5a9e5aec5be8e3630cfae17bb20357e9..f093b0de1808a7c2c568aeb476180518f84e3839 100644 index 78775413d27a5927b8409c4ce92111a482dad1f1..0fc87744c880da4bc98428137959fb274aeb2c4b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -222,6 +222,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -222,6 +222,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

6
patches/server/0014-Tweak-console-logging.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Tweak console logging
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 53134751868d37a2659aef74e37c0466b9238197..5057997c3d89e058f17798f81c27766c99c0cba7 100644 index 85bb69e2e8bf96cabf7e86f997dc32a354dcf839..6fd3cb6daac76d41ea9c2aaabf171f958b8cf922 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -193,16 +193,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -193,16 +193,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -43,7 +43,7 @@ index 53134751868d37a2659aef74e37c0466b9238197..5057997c3d89e058f17798f81c27766c
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
if (this.convertOldUsers()) { if (this.convertOldUsers()) {
this.getProfileCache().save(false); // Paper this.getProfileCache().save(false); // Paper
@@ -334,6 +335,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -333,6 +334,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; 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/"; 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 // Paper end - Add Velocity IP Forwarding Support
@@ -51,7 +51,7 @@ index 53134751868d37a2659aef74e37c0466b9238197..5057997c3d89e058f17798f81c27766c
if (!this.usesAuthentication()) { if (!this.usesAuthentication()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
@@ -347,7 +349,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -346,7 +348,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
} }
// Spigot end // Spigot end

4
patches/server/0016-Completely-remove-Mojang-Profiler.patch
View File

@@ -361,10 +361,10 @@ index 8c587f829c5e8c6b6df3150024c4ae704988c47b..319f484b535143a94ee2da11114acacc
} }
+// Plazma end - Completely remove Mojang's Profiler +// Plazma end - Completely remove Mojang's Profiler
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5057997c3d89e058f17798f81c27766c99c0cba7..c19942b5f0ec44439a68fc7c8f55897653d20e56 100644 index 6fd3cb6daac76d41ea9c2aaabf171f958b8cf922..0a30e9873e5f218589dfd90f04edc863e645989a 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -927,11 +927,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -926,11 +926,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
return this.settings.getProperties().serverResourcePackInfo; return this.settings.getProperties().serverResourcePackInfo;
} }

4
patches/server/0035-Use-Akair-s-flag-when-running-the-test-server-with-g.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Use Akair's flag when running the test server with gradle
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index c02fba3660ab368f64bd120db8c0a9de6e4f763d..7e19f7aba5140675c3163a45c3c54c626573de4e 100644 index 3995afe1bf7f9b710e40cebce0d5d7b85ce9e258..81e4cde01d1d47be5bd09b3ee852122c1c038d76 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -129,7 +129,7 @@ fun TaskContainer.registerRunTask( @@ -133,7 +133,7 @@ fun TaskContainer.registerRunTask(
languageVersion.set(JavaLanguageVersion.of(21)) languageVersion.set(JavaLanguageVersion.of(21))
vendor.set(JvmVendorSpec.JETBRAINS) vendor.set(JvmVendorSpec.JETBRAINS)
}) })

4
patches/server/0037-Implement-FreedomChat.patch
View File

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index c19942b5f0ec44439a68fc7c8f55897653d20e56..c5804a3d03433a3a1dba807f23305850b826851b 100644 index 0a30e9873e5f218589dfd90f04edc863e645989a..b6c9e81249bba59856d96ff71610b687fd9c4396 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -709,6 +709,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -708,6 +708,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// Paper start - Add setting for proxy online mode status // Paper start - Add setting for proxy online mode status
return dedicatedserverproperties.enforceSecureProfile return dedicatedserverproperties.enforceSecureProfile
&& io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()