From 26158267520017827fc321ddd009f18798944cb5 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Wed, 8 May 2024 14:12:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=20=E6=8F=90=E4=BE=9B=20rebof=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yml | 2 +- README.md | 2 +- build.gradle.kts | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index ad86af5..2528dcc 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: "Apply Patches" run: ./gradlew applyPatches - name: "Build Mojmap" - run: ./gradlew createMojmapPaperclipJar + run: ./gradlew createReobfPaperclipJar - name: "Copy jar to staging" run: mkdir staging && cp build/libs/*.jar staging - name: "Setup go for release script" diff --git a/README.md b/README.md index 71c4dd5..674db66 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,6 @@ DeerFolia 是一个基于 [Folia](https://papermc.io/software/folia) 的 Minecra - 如果遇到 `invalid object` 错误,可以使用 `git apply --reject ` 手动应用补丁; - 会生成 `.rej` 文件,可在其中查看冲突内容,手动解决冲突; - 完成后删除 `.rej` 文件,然后执行 `git add .`; -4. 然后在`deer-folia-server` 或 `deer-folia-api`目录运行 `git am --resolved`; +4. 然后运行 `git am --resolved` 继续应用补丁; 5. 如果存在新的冲突,重复步骤 3 和 4; 6. 全部补丁应用完成后,更新补丁:`./gradlew rebuildPatches`。 diff --git a/build.gradle.kts b/build.gradle.kts index 979cc97..75fc818 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,7 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.10:fat") + remapper("net.fabricmc:tiny-remapper:0.10.1:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") paperclip("io.papermc:paperclip:3.0.3") } @@ -48,6 +48,13 @@ subprojects { repositories { mavenCentral() maven(paperMavenPublicUrl) + maven("https://oss.sonatype.org/content/groups/public/") + maven("https://ci.emc.gs/nexus/content/groups/aikar/") + maven("https://repo.aikar.co/content/groups/aikar") + maven("https://repo.md-5.net/content/repositories/releases/") + maven("https://hub.spigotmc.org/nexus/content/groups/public/") + maven("https://jitpack.io") + maven("https://repo.codemc.io/repository/maven-public/") } }