diff --git a/.github/workflows/build-without-pwt.yml b/.github/workflows/build-without-pwt.yml index 6e867a6..cab66af 100644 --- a/.github/workflows/build-without-pwt.yml +++ b/.github/workflows/build-without-pwt.yml @@ -32,10 +32,15 @@ jobs: run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt applyPatches - name: Build run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt build - - name: Create reobf Paperclip JAR - run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt createReobfPaperclipJar + - name: Create Paperclip JAR + run: ./gradlew -PsparklypaperImplementationVersionSuffix=without-pwt createMojmapPaperclipJar createReobfPaperclipJar - uses: actions/upload-artifact@v2 - name: "Upload Paperclip JAR" + name: "Upload Mojang Mappings Paperclip JAR" with: - name: SparklyPaper (without Parallel World Ticking) Paperclip - path: "build/libs/SparklyPaper-paperclip-*.jar" + name: SparklyPaper (without Parallel World Ticking) Paperclip (Mojang Mappings/mojmap) + path: "build/libs/SparklyPaper-paperclip-*-mojmap.jar" + - uses: actions/upload-artifact@v2 + name: "Upload Spigot Mappings (reobf) Paperclip JAR" + with: + name: SparklyPaper (without Parallel World Ticking) Paperclip (Spigot Mappings/reobf) + path: "build/libs/SparklyPaper-paperclip-*-reobf.jar" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84ac800..00d6c4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,10 +30,15 @@ jobs: run: ./gradlew applyPatches - name: Build run: ./gradlew build - - name: Create reobf Paperclip JAR - run: ./gradlew createReobfPaperclipJar + - name: Create Paperclip JAR + run: ./gradlew createMojmapPaperclipJar createReobfPaperclipJar - uses: actions/upload-artifact@v2 - name: "Upload Paperclip JAR" + name: "Upload Mojang Mappings Paperclip JAR" with: - name: SparklyPaper Paperclip - path: "build/libs/SparklyPaper-paperclip-*.jar" + name: SparklyPaper Paperclip (Mojang Mappings/mojmap) + path: "build/libs/SparklyPaper-paperclip-*-mojmap.jar" + - uses: actions/upload-artifact@v2 + name: "Upload Spigot Mappings (reobf) Paperclip JAR" + with: + name: SparklyPaper Paperclip (Spigot Mappings/reobf) + path: "build/libs/SparklyPaper-paperclip-*-reobf.jar" diff --git a/README.md b/README.md index 356e607..1eac7bf 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,8 @@ If you only care about some of the patches included in SparklyPaper, it is bette There are two kinds of builds: One with the Parallel World Ticking feature, and another without it. If you don't want to risk using a very experimental feature that may lead to server crashes and corruption, or if you aren't a developer that can't fix plugin issues related to the feature, then use the version without Parallel World Ticking! (We do run Parallel World Ticking in production @ SparklyPower tho, we live on the edge :3) +It is recommended to use a Mojang mapped (mojmap) version unless if you *really* have a reason (example: plugins that break on a mojmap JAR) to use a Spigot mapped (reobf) version. Paper, since 1.20.5, provides a mojmapped server JAR and remaps any class/field/Reflection access made by non-mojmap aware plugins, so things (hopefully!) shouldn't break. + * **SparklyPaper:** https://github.com/SparklyPower/SparklyPaper/actions/workflows/build.yml * **SparklyPaper (without Parallel World Ticking):** https://github.com/SparklyPower/SparklyPaper/actions/workflows/build-without-pwt.yml