Skip to content

Commit

Permalink
Bundle spark (#11093)
Browse files Browse the repository at this point in the history
  • Loading branch information
kashike authored Jul 20, 2024
1 parent f1f01a1 commit 681c013
Show file tree
Hide file tree
Showing 5 changed files with 368 additions and 19 deletions.
18 changes: 6 additions & 12 deletions patches/api/0011-Timings-v2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1261,10 +1261,10 @@ index 0000000000000000000000000000000000000000..df142a89b8c43acb81eb383eac0ef048
+}
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
new file mode 100644
index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c4292cb5d03
index 0000000000000000000000000000000000000000..445b5d3b61f31cf263475d0155a7b0252c54a3f8
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,337 @@
@@ -0,0 +1,331 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
Expand Down Expand Up @@ -1426,23 +1426,17 @@ index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c42
+
+ public static Component deprecationMessage() {
+ return Component.text()
+ .color(TextColor.color(0xf3ef91))
+ .color(TextColor.color(0xffc93a))
+ .append(Component.text("[!] The timings profiler has been enabled but has been scheduled for removal from Paper in the future."))
+ .append(Component.newline())
+ .append(
+ Component.text(" We recommend installing the spark profiler as a replacement: ")
+ .append(
+ Component.text()
+ .content("https://spark.lucko.me/")
+ .clickEvent(ClickEvent.openUrl("https://spark.lucko.me/")))
+ )
+ .append(Component.text(" We recommend migrating to the spark profiler."))
+ .append(Component.newline())
+ .append(
+ Component.text(" For more information please visit: ")
+ .append(
+ Component.text()
+ .content("https://github.com/PaperMC/Paper/issues/8948")
+ .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/issues/8948")))
+ .content("https://github.com/PaperMC/Paper/discussions/10565")
+ .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/discussions/10565")))
+ )
+ .build();
+ }
Expand Down
12 changes: 10 additions & 2 deletions patches/server/0005-Paper-config-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,10 @@ index 0000000000000000000000000000000000000000..d9502ba028a96f9cc846f9ed428bd806
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..a4f91ef8d5c4a8263961c4f00c0ce8cc937497d9
index 0000000000000000000000000000000000000000..9bf81a47b03769a46c995019c3d8016cd161c15d
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -0,0 +1,313 @@
@@ -0,0 +1,321 @@
+package io.papermc.paper.configuration;
+
+import co.aikar.timings.MinecraftTimings;
Expand Down Expand Up @@ -544,6 +544,14 @@ index 0000000000000000000000000000000000000000..a4f91ef8d5c4a8263961c4f00c0ce8cc
+ public boolean useDisplayNameInQuitMessage = false;
+ }
+
+ public Spark spark;
+
+ public class Spark extends ConfigurationPart {
+ public boolean enabled = true;
+ public boolean enableImmediately = false;
+ public boolean preferSparkPlugin = false;
+ }
+
+ @Deprecated(forRemoval = true)
+ public Timings timings;
+
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0745-Configurable-chat-thread-limit.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
who just wanna ensure that this won't grow over a specific size if chat gets stupidly active

diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index a4f91ef8d5c4a8263961c4f00c0ce8cc937497d9..701196635f9c08d62d785fa1b448313937259c76 100644
index 9bf81a47b03769a46c995019c3d8016cd161c15d..0ab240d1b1d872dffb78f424b388b2b802326832 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -287,7 +287,18 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -295,7 +295,18 @@ public class GlobalConfiguration extends ConfigurationPart {

@PostProcess
private void postProcess() {
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0988-Moonrise-optimisation-patches.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22226,7 +22226,7 @@ index 0000000000000000000000000000000000000000..85950a1aa732ab8c01ad28bec9e0de14
+ }
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 5160dc617cc5037cd3f10479454159f2a9984169..379452394679c466a09441d4c12882d0d00d9ef3 100644
index ae6089f34e2420c0d745165ea0f754f4a9f1880f..c01fda50d9faba2ec373ac14b4a5992f516fac3a 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -29,6 +29,45 @@ public class GlobalConfiguration extends ConfigurationPart {
Expand Down Expand Up @@ -22275,7 +22275,7 @@ index 5160dc617cc5037cd3f10479454159f2a9984169..379452394679c466a09441d4c12882d0
static void set(GlobalConfiguration instance) {
GlobalConfiguration.instance = instance;
}
@@ -130,21 +169,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -138,21 +177,6 @@ public class GlobalConfiguration extends ConfigurationPart {
public int incomingPacketThreshold = 300;
}

Expand All @@ -22297,7 +22297,7 @@ index 5160dc617cc5037cd3f10479454159f2a9984169..379452394679c466a09441d4c12882d0
public UnsupportedSettings unsupportedSettings;

public class UnsupportedSettings extends ConfigurationPart {
@@ -203,7 +227,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -211,7 +235,7 @@ public class GlobalConfiguration extends ConfigurationPart {

@PostProcess
private void postProcess() {
Expand Down
Loading

0 comments on commit 681c013

Please sign in to comment.