mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4797e3a Dont reassign the hiddenConfigs field in TimingsManager (#7951) PaperMC/Paper@3690440 Update paperweight to 1.3.7 PaperMC/Paper@90050ff Update Adventure to 4.11.0 and implement ComponentLogger (#7937)
This commit is contained in:
@@ -4,7 +4,7 @@ plugins {
|
||||
java
|
||||
`maven-publish`
|
||||
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
|
||||
id("io.papermc.paperweight.patcher") version "1.3.6"
|
||||
id("io.papermc.paperweight.patcher") version "1.3.7"
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
group = org.purpurmc.purpur
|
||||
version = 1.19-R0.1-SNAPSHOT
|
||||
|
||||
paperCommit = 8b6f4dd482dc5f152a433475f20055f7fbf1b182
|
||||
paperCommit = 90050ffd54647e2a9f166a90172c1c9fa90e52ff
|
||||
|
||||
org.gradle.caching = true
|
||||
org.gradle.parallel = true
|
||||
|
||||
@@ -20,18 +20,18 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 921b301de020ce73126ca518556b3435e776783d..104d3841879f64510ddd4b20b80b6cb24c4ecd24 100644
|
||||
index 435db1ffe47476bcb7067802faad7aee7e4c3f54..b8fa29c4e39c4587855e6c8be3f5b373bd841ba3 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -40,6 +40,7 @@ dependencies {
|
||||
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
||||
@@ -41,6 +41,7 @@ dependencies {
|
||||
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
||||
api("org.apache.logging.log4j:log4j-api:2.17.1")
|
||||
api("org.slf4j:slf4j-api:1.8.0-beta4")
|
||||
+ api("io.sentry:sentry:5.4.0") // Pufferfish
|
||||
|
||||
implementation("org.ow2.asm:asm:9.2")
|
||||
implementation("org.ow2.asm:asm-commons:9.2")
|
||||
@@ -82,6 +83,13 @@ val generateApiVersioningFile by tasks.registering {
|
||||
@@ -83,6 +84,13 @@ val generateApiVersioningFile by tasks.registering {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 104d3841879f64510ddd4b20b80b6cb24c4ecd24..10fa4d1478b9f1173dd4ec887cf231356fedd65d 100644
|
||||
index b8fa29c4e39c4587855e6c8be3f5b373bd841ba3..e16706bc30fc3c851485fe0c68be4abdcc70e6e2 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -102,6 +102,8 @@ tasks.jar {
|
||||
@@ -103,6 +103,8 @@ tasks.jar {
|
||||
}
|
||||
|
||||
tasks.withType<Javadoc> {
|
||||
|
||||
@@ -4,19 +4,6 @@ Date: Thu, 1 Jul 2021 19:25:05 -0500
|
||||
Subject: [PATCH] Structure seed options
|
||||
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
index 8f109e667f09d58f6bc7ce1a8b44e8e70d191579..b5482024a0430582d4e9ee4995b508aa4a4a7605 100644
|
||||
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -171,7 +171,7 @@ public final class MinecraftTimings {
|
||||
if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) {
|
||||
config.hiddenConfigEntries.add("proxies.velocity.secret");
|
||||
}
|
||||
- TimingsManager.hiddenConfigs = config.hiddenConfigEntries;
|
||||
+ TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries); // Purpur
|
||||
co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose);
|
||||
co.aikar.timings.Timings.setTimingsEnabled(config.enabled);
|
||||
co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20);
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index 12c8cd424668c2167c071b48d0c1f689ca363513..b2604ae34c141ce69b3e1df72543aa942a9c9f0e 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
|
||||
Reference in New Issue
Block a user