Skip to content
This repository was archived by the owner on Oct 13, 2025. It is now read-only.

Commit 9708564

Browse files
PascalpexPascalpex
authored
Add Rebranding (#3)
* Fix API version detection * More rebranding * Do not require build number for now * Rebrand to Sapling (Thanks Martijn's idea!) * [ci skip] Update License description
1 parent 2df8f1a commit 9708564

21 files changed

+2718
-47
lines changed

‎.github/workflows/build-1218.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Nycticorax 1.21.8
1+
name: Build Sapling 1.21.8
22

33
on:
44
push:
@@ -85,9 +85,9 @@ jobs:
8585
run: ./gradlew createMojmapPaperclipJar --stacktrace --parallel --no-daemon
8686

8787
- name: Rename Paperclip JARs
88-
run: mv nycticorax-server/build/libs/nycticorax-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./nycticorax-1.21.8.jar
88+
run: mv sapling-server/build/libs/sapling-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./sapling-1.21.8.jar
8989
- name: Upload Leaf as build artifact
9090
uses: actions/upload-artifact@v4
9191
with:
92-
name: Nycticorax 1.21.8
93-
path: ./nycticorax-1.21.8.jar
92+
name: Sapling 1.21.8
93+
path: ./sapling-1.21.8.jar

‎.github/workflows/build-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
run: ./gradlew -Dorg.gradle.jvmargs="${{ env.GRAALVM_ARGS }}" createMojmapPaperclipJar --stacktrace --no-daemon
3535

3636
- name: Rename Paperclip JARs
37-
run: mv nycticorax-server/build/libs/nycticorax-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./nycticorax-1.21.8.jar
37+
run: mv sapling-server/build/libs/sapling-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./sapling-1.21.8.jar
3838
- name: Upload Leaf as build artifact
3939
uses: actions/upload-artifact@v4
4040
with:
41-
name: Nycticorax 1.21.8
42-
path: ./nycticorax-1.21.8.jar
41+
name: Sapling 1.21.8
42+
path: ./sapling-1.21.8.jar

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ leaf-server/
2727
paper-api/
2828
paper-server/
2929

30-
nycticorax-api/build.gradle.kts
31-
nycticorax-server/build.gradle.kts
30+
sapling-api/build.gradle.kts
31+
sapling-server/build.gradle.kts
3232

33-
nycticorax-server/src/minecraft
33+
sapling-server/src/minecraft

‎README.md‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
## Nycticorax
1+
## Sapling
22

3-
![I'm penguin](public/image/impenguin.png)
4-
5-
[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Nycticorax/build-1218.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
6-
7-
**Nycticorax** is an experimental fork of [Leaf](https://leafmc.one/).
3+
[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Sapling/build-1218.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Sapling/actions)
84

5+
**Sapling** is an experimental fork of [Leaf](https://leafmc.one/).
96

107
> [!WARNING]
11-
> Nycticorax is an experimental fork, DO NOT use in production, use as your own risk.
8+
> Sapling is an experimental fork, DO NOT use in production, use as your own risk.
129
1310
**English** | [中文](public/readme/README_CN.md)
1411

@@ -17,4 +14,4 @@
1714
- QQ Group: `619278377`
1815

1916
## ⚖️ License
20-
See Leaf's [License](https://github.com/Winds-Studio/Leaf?tab=readme-ov-file#%EF%B8%8F-license)
17+
Sapling is a subproject of Leaf that uses same [License](https://github.com/Winds-Studio/Leaf?tab=readme-ov-file#%EF%B8%8F-license).

‎build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ paperweight {
6868

6969
patchFile {
7070
path = "leaf-server/build.gradle.kts"
71-
outputFile = file("nycticorax-server/build.gradle.kts")
72-
patchFile = file("nycticorax-server/build.gradle.kts.patch")
71+
outputFile = file("sapling-server/build.gradle.kts")
72+
patchFile = file("sapling-server/build.gradle.kts.patch")
7373
}
7474
patchFile {
7575
path = "leaf-api/build.gradle.kts"
76-
outputFile = file("nycticorax-api/build.gradle.kts")
77-
patchFile = file("nycticorax-api/build.gradle.kts.patch")
76+
outputFile = file("sapling-api/build.gradle.kts")
77+
patchFile = file("sapling-api/build.gradle.kts.patch")
7878
}
7979
patchRepo("paperApi") {
8080
upstreamPath = "paper-api"
81-
patchesDir = file("nycticorax-api/paper-patches")
81+
patchesDir = file("sapling-api/paper-patches")
8282
outputDir = file("paper-api")
8383
}
8484
patchDir("leafApi") {
8585
upstreamPath = "leaf-api"
8686
excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
87-
patchesDir = file("nycticorax-api/leaf-patches")
87+
patchesDir = file("sapling-api/leaf-patches")
8888
outputDir = file("leaf-api")
8989
}
9090
}

‎public/image/impenguin.png‎

-104 KB
Binary file not shown.

‎public/readme/README_CN.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
## Nycticorax
1+
## Sapling
22

3-
![我是企鹅](../image/impenguin.png)
3+
[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Sapling/build-1218.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Sapling/actions)
44

5-
[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Nycticorax/build-1218.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
65

7-
**Nycticorax** 是 [Leaf](https://leafmc.one/) 的实验性分支。
6+
**Sapling** 是 [Leaf](https://leafmc.one/) 的实验性分支。
87

98
> [!WARNING]
10-
> Nycticorax 是实验性分支, 不要在生产环境中使用, 风险自负。
9+
> Sapling 是实验性分支, 不要在生产环境中使用, 风险自负。
1110
1211
[English](../../README.md) | **中文**
1312

@@ -16,4 +15,4 @@
1615
- QQ社区群: `619278377`
1716

1817
## ⚖️ 许可证
19-
请参阅 Leaf 的 [许可](https://github.com/Winds-Studio/Leaf?tab=readme-ov-file#%EF%B8%8F-license)
18+
Sapling 是 Leaf 的子项目, 使用和 Leaf 相同的 [许可](https://github.com/Winds-Studio/Leaf?tab=readme-ov-file#%EF%B8%8F-license).

nycticorax-api/build.gradle.kts.patch renamed to sapling-api/build.gradle.kts.patch

File renamed without changes.

‎sapling-api/paper-patches/features/0001-Rebrand.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Pascalpex <[email protected]>
3+
Date: Tue, 22 Jul 2025 08:58:30 +0200
4+
Subject: [PATCH] Rebrand
5+
6+
7+
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
8+
index c198304386e83edc2ec582fdf66d97d624004771..8a7936606873a09c222746b5b90ec1e2049a6f9a 100644
9+
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
10+
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
11+
@@ -41,6 +41,13 @@ public interface ServerBuildInfo {
12+
Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");
13+
// Leaf end - Rebrand
14+
15+
+ // Sapling start - Rebrand
16+
+ /**
17+
+ * The brand id for Sapling.
18+
+ */
19+
+ Key BRAND_NYCTICORAX_ID = Key.key("winds-studio", "sapling");
20+
+ // Sapling end - Rebrand
21+
+
22+
/**
23+
* Gets the {@code ServerBuildInfo}.
24+
*

nycticorax-server/build.gradle.kts.patch renamed to sapling-server/build.gradle.kts.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
}
66

77
- activeFork = leaf
8-
+ // Nycticorax start - project setup
9-
+ val nycticorax = forks.register("nycticorax") {
8+
+ // Sapling start - project setup
9+
+ val sapling = forks.register("sapling") {
1010
+ forks = leaf
1111
+ upstream.patchRepo("paperServer") {
1212
+ upstreamRepo = leaf.patchedRepo("paperServer")
13-
+ patchesDir = rootDirectory.dir("nycticorax-server/paper-patches")
13+
+ patchesDir = rootDirectory.dir("sapling-server/paper-patches")
1414
+ outputDir = rootDirectory.dir("paper-server")
1515
+ }
1616
+ upstream.patchDir("leafServer") {
@@ -22,28 +22,28 @@
2222
+ "build.gradle.kts",
2323
+ "build.gradle.kts.patch"
2424
+ )
25-
+ patchesDir = rootDirectory.dir("nycticorax-server/leaf-patches")
25+
+ patchesDir = rootDirectory.dir("sapling-server/leaf-patches")
2626
+ outputDir = rootDirectory.dir("leaf-server")
2727
+ }
2828
+ }
2929
+
30-
+ activeFork = nycticorax
31-
+ // Nycticorax end - project setup
30+
+ activeFork = sapling
31+
+ // Sapling end - project setup
3232
// Leaf end - project setup
3333

3434
spigot {
3535
@@ -127,10 +_,14 @@
3636
main {
3737
java { srcDir("../paper-server/src/main/java") }
3838
resources { srcDir("../paper-server/src/main/resources") }
39-
+ java { srcDir("../leaf-server/src/main/java") } // Nycticorax - project setup
40-
+ resources { srcDir("../leaf-server/src/main/resources") } // Nycticorax - project setup
39+
+ java { srcDir("../leaf-server/src/main/java") } // Sapling - project setup
40+
+ resources { srcDir("../leaf-server/src/main/resources") } // Sapling - project setup
4141
}
4242
test {
4343
java { srcDir("../paper-server/src/test/java") }
4444
resources { srcDir("../paper-server/src/test/resources") }
45-
+ java { srcDir("../leaf-server/src/test/java") } // Nycticorax - project setup
46-
+ resources { srcDir("../leaf-server/src/test/resources") } // Nycticorax - project setup
45+
+ java { srcDir("../leaf-server/src/test/java") } // Sapling - project setup
46+
+ resources { srcDir("../leaf-server/src/test/resources") } // Sapling - project setup
4747
}
4848
}
4949

@@ -52,7 +52,7 @@
5252

5353
dependencies {
5454
- implementation(project(":leaf-api")) // Leaf - project setup
55-
+ implementation(project(":nycticorax-api")) // Leaf - project setup // Nycticorax - project setup
55+
+ implementation(project(":sapling-api")) // Leaf - project setup // Sapling - project setup
5656

5757
// Leaf start - Libraries
5858
implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
@@ -61,17 +61,17 @@
6161
attributes(
6262
"Main-Class" to "org.bukkit.craftbukkit.Main",
6363
- "Implementation-Title" to "Leaf", // Leaf - Rebrand
64-
+ "Implementation-Title" to "Nycticorax", // Leaf - Rebrand // Nycticorax - Rebrand
64+
+ "Implementation-Title" to "Sapling", // Leaf - Rebrand // Sapling - Rebrand
6565
"Implementation-Version" to implementationVersion,
6666
"Implementation-Vendor" to date,
6767
- "Specification-Title" to "Leaf", // Leaf - Rebrand
68-
+ "Specification-Title" to "Nycticorax", // Leaf - Rebrand // Nycticorax - Rebrand
68+
+ "Specification-Title" to "Sapling", // Leaf - Rebrand // Sapling - Rebrand
6969
"Specification-Version" to project.version,
7070
"Specification-Vendor" to "Winds Studio", // Leaf - Rebrand
7171
- "Brand-Id" to "winds-studio:leaf", // Leaf - Rebrand
7272
- "Brand-Name" to "Leaf", // Leaf - Rebrand
73-
+ "Brand-Id" to "winds-studio:nycticorax", // Leaf - Rebrand // Nycticorax - Rebrand
74-
+ "Brand-Name" to "Nycticorax", // Leaf - Rebrand // Nycticorax - Rebrand
73+
+ "Brand-Id" to "winds-studio:sapling", // Leaf - Rebrand // Sapling - Rebrand
74+
+ "Brand-Name" to "Sapling", // Leaf - Rebrand // Sapling - Rebrand
7575
"Build-Number" to (build ?: ""),
7676
"Build-Time" to buildTime.toString(),
7777
"Git-Branch" to gitBranch,

0 commit comments

Comments
 (0)