From ada349d08f048fd80bd55f8bfcb881cd16794832 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:36:26 +0800 Subject: [PATCH] Updated Upstream (Paper) --- gradle.properties | 4 +--- patches/api/0001-Hide-irrelevant-compilation-warnings.patch | 4 ++-- patches/api/0005-SIMD-support.patch | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2037276..37d1b67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,7 @@ group=org.galemc.gale version=1.21-R0.1-SNAPSHOT mcVersion=1.21 -paperRef=aa8d38d3dbab3cb0021d0f24f726818caf77bf15 - -updatingMinecraft=true +paperRef=7eec21e80da15cb4b6fcb445910006e115729682 org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch index 6f59cfa..22eb40c 100644 --- a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch +++ b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/build.gradle.kts b/build.gradle.kts -index fd39ed209b20c927054b8482c400beeeeab460a3..327766a53d6c730d06765ee937b9a89b6629008c 100644 +index 540fe7e2c110e79c3742f229b3ed8c54b101d260..aabcd87ed238fe6b2215aeaa49bdb3d429ba92e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -130,6 +130,15 @@ val generateApiVersioningFile by tasks.registering { @@ -26,7 +26,7 @@ index fd39ed209b20c927054b8482c400beeeeab460a3..327766a53d6c730d06765ee937b9a89b tasks.jar { from(generateApiVersioningFile.map { it.outputs.files.singleFile }) { into("META-INF/maven/${project.group}/${project.name}") -@@ -187,6 +196,8 @@ tasks.withType { +@@ -188,6 +197,8 @@ tasks.withType { into("build/docs/javadoc") } } diff --git a/patches/api/0005-SIMD-support.patch b/patches/api/0005-SIMD-support.patch index c4dfb99..80c466e 100644 --- a/patches/api/0005-SIMD-support.patch +++ b/patches/api/0005-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/build.gradle.kts b/build.gradle.kts -index 8a81cc5a8c4ce0109e8a4965f3c625a002431b7b..64a5d2f43e6fb459ff30306467a4be1e2831c0b2 100644 +index 7576c0254b59ee1258d5f35f497e40b629e3c1a9..7b419b0fc02d7a203e77c7c30e4adf865a4e0baf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -136,6 +136,7 @@ tasks.withType { @@ -24,7 +24,7 @@ index 8a81cc5a8c4ce0109e8a4965f3c625a002431b7b..64a5d2f43e6fb459ff30306467a4be1e } // Gale end - hide irrelevant compilation warnings -@@ -204,6 +205,7 @@ tasks.withType { +@@ -205,6 +206,7 @@ tasks.withType { } options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings