Skip to content

Commit 9a75bdb

Browse files
PascalpexPascalpex
committed
Switch back to leaf
1 parent 68f23dc commit 9a75bdb

29 files changed

Lines changed: 577 additions & 428 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v6.0.1
7+
- uses: actions/checkout@v6.0.2
88
- name: Set up JDK 21
9-
uses: actions/setup-java@v5.1.0
9+
uses: actions/setup-java@v5.2.0
1010
with:
11-
java-version: 21.0.9
11+
java-version: 21.0.10
1212
distribution: 'temurin'
1313
- name: Configure Git
1414
run: |

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ run/
4848
deepslateMC-api/build.gradle.kts
4949
deepslateMC-server/build.gradle.kts
5050
deepslateMC-server/src/minecraft
51-
purpur-api
52-
purpur-server
51+
leaf-api
52+
leaf-server
5353
paper-api
5454
paper-server
5555

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
# DeepslateMC
55
### A fork of [Leaf](https://github.com/Winds-Studio/Leaf) that adds neat functionalities
6-
### Well, actually it is temporarily a [Purpur](https://github.com/PurpurMC/Purpur) fork
76
<br/>
87
</div>
98

‎build.gradle.kts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ plugins {
66
}
77

88
paperweight {
9-
upstreams.register("purpur") {
10-
repo = github("PurpurMC", "Purpur")
11-
ref = providers.gradleProperty("purpurRef")
9+
upstreams.register("leaf") {
10+
repo = github("Winds-Studio", "Leaf")
11+
ref = providers.gradleProperty("leafRef")
1212

1313
patchFile {
14-
path = "purpur-server/build.gradle.kts"
14+
path = "leaf-server/build.gradle.kts"
1515
outputFile = file("deepslateMC-server/build.gradle.kts")
1616
patchFile = file("deepslateMC-server/build.gradle.kts.patch")
1717
}
1818
patchFile {
19-
path = "purpur-api/build.gradle.kts"
19+
path = "leaf-api/build.gradle.kts"
2020
outputFile = file("deepslateMC-api/build.gradle.kts")
2121
patchFile = file("deepslateMC-api/build.gradle.kts.patch")
2222
}
@@ -25,16 +25,17 @@ paperweight {
2525
patchesDir = file("deepslateMC-api/paper-patches")
2626
outputDir = file("paper-api")
2727
}
28-
patchDir("purpurApi") {
29-
upstreamPath = "purpur-api"
28+
patchDir("leafApi") {
29+
upstreamPath = "leaf-api"
3030
excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
31-
patchesDir = file("deepslateMC-api/purpur-patches")
32-
outputDir = file("purpur-api")
31+
patchesDir = file("deepslateMC-api/leaf-patches")
32+
outputDir = file("leaf-api")
3333
}
3434
}
3535
}
3636

3737
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
38+
val leafMavenPublicUrl = "https://maven.leafmc.one/snapshots/"
3839

3940
subprojects {
4041
apply(plugin = "java-library")
@@ -49,6 +50,7 @@ subprojects {
4950
repositories {
5051
mavenCentral()
5152
maven(paperMavenPublicUrl)
53+
maven(leafMavenPublicUrl)
5254
}
5355

5456
tasks.withType<AbstractArchiveTask>().configureEach {

‎deepslateMC-api/build.gradle.kts.patch‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
--- a/purpur-api/build.gradle.kts
2-
+++ b/purpur-api/build.gradle.kts
3-
@@ -102,17 +_,21 @@
4-
java {
1+
--- a/leaf-api/build.gradle.kts
2+
+++ b/leaf-api/build.gradle.kts
3+
@@ -123,18 +_,22 @@
54
srcDir(generatedDir)
5+
// Leaf start - project setup
66
srcDir(file("../paper-api/src/main/java"))
7-
+ srcDir(file("../purpur-api/src/main/java")) // Deepslate - project setup
7+
+ srcDir(file("../leaf-api/src/main/java")) // Deepslate - project setup
88
}
99
resources {
1010
srcDir(file("../paper-api/src/main/resources"))
11-
+ srcDir(file("../purpur-api/src/main/resources")) // Deepslate - project setup
11+
+ srcDir(file("../leaf-api/src/main/resources")) // Deepslate - project setup
1212
}
1313
}
1414
test {
1515
java {
1616
srcDir(file("../paper-api/src/test/java"))
17-
+ srcDir(file("../purpur-api/src/test/java")) // Deepslate - project setup
17+
+ srcDir(file("../leaf-api/src/test/java")) // Deepslate - project setup
1818
}
1919
resources {
2020
srcDir(file("../paper-api/src/test/resources"))
21-
+ srcDir(file("../purpur-api/src/test/resources")) // Deepslate - project setup
21+
// Leaf end - project setup
22+
+ srcDir(file("../leaf-api/src/test/resources")) // Deepslate - project setup
2223
}
2324
}
2425
}

‎deepslateMC-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
22
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
3-
@@ -25,6 +_,14 @@
4-
*/
5-
Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
6-
// Purpur end
3+
@@ -41,6 +_,14 @@
4+
Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");
5+
// Leaf end - Rebrand
6+
77
+
88
+ // Deepslate start
99
+ /**

‎deepslateMC-server/build.gradle.kts.patch‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
1-
--- a/purpur-server/build.gradle.kts
2-
+++ b/purpur-server/build.gradle.kts
3-
@@ -32,7 +_,30 @@
4-
outputDir = rootDirectory.dir("paper-server")
1+
--- a/leaf-server/build.gradle.kts
2+
+++ b/leaf-server/build.gradle.kts
3+
@@ -33,7 +_,30 @@
54
}
65
}
7-
- activeFork = purpur
6+
7+
- activeFork = leaf
88
+ // Deepslate start - project setup
99
+ val deepslateMC = forks.register("deepslateMC") {
10-
+ forks = purpur
10+
+ forks = leaf
1111
+ upstream.patchRepo("paperServer") {
12-
+ upstreamRepo = purpur.patchedRepo("paperServer")
12+
+ upstreamRepo = leaf.patchedRepo("paperServer")
1313
+ patchesDir = rootDirectory.dir("deepslateMC-server/paper-patches")
1414
+ outputDir = rootDirectory.dir("paper-server")
1515
+ }
16-
+ upstream.patchDir("purpurServer") {
17-
+ upstreamPath = "purpur-server"
16+
+ upstream.patchDir("leafServer") {
17+
+ upstreamPath = "leaf-server"
1818
+ excludes = setOf(
1919
+ "src/minecraft",
2020
+ "paper-patches",
2121
+ "minecraft-patches",
2222
+ "build.gradle.kts",
2323
+ "build.gradle.kts.patch"
2424
+ )
25-
+ patchesDir = rootDirectory.dir("deepslateMC-server/purpur-patches")
26-
+ outputDir = rootDirectory.dir("purpur-server")
25+
+ patchesDir = rootDirectory.dir("deepslateMC-server/leaf-patches")
26+
+ outputDir = rootDirectory.dir("leaf-server")
2727
+ }
2828
+ }
2929
+
3030
+ activeFork = deepslateMC
3131
+ // Deepslate end - project setup
32-
// Purpur end - Rebrand
32+
// Leaf end - project setup
3333

3434
spigot {
35-
@@ -122,10 +_,14 @@
35+
@@ -124,10 +_,14 @@
3636
main {
3737
java { srcDir("../paper-server/src/main/java") }
3838
resources { srcDir("../paper-server/src/main/resources") }
39-
+ java { srcDir("../purpur-server/src/main/java") } // Deepslate - project setup
40-
+ resources { srcDir("../purpur-server/src/main/resources") } // Deepslate - project setup
39+
+ java { srcDir("../leaf-server/src/main/java") } // Deepslate - project setup
40+
+ resources { srcDir("../leaf-server/src/main/resources") } // Deepslate - project setup
4141
}
4242
test {
4343
java { srcDir("../paper-server/src/test/java") }
4444
resources { srcDir("../paper-server/src/test/resources") }
45-
+ java { srcDir("../purpur-server/src/test/java") } // Deepslate - project setup
46-
+ resources { srcDir("../purpur-server/src/test/resources") } // Deepslate - project setup
45+
+ java { srcDir("../leaf-server/src/test/java") } // Deepslate - project setup
46+
+ resources { srcDir("../leaf-server/src/test/resources") } // Deepslate - project setup
4747
}
4848
}
49-
val log4jPlugins = sourceSets.create("log4jPlugins") {
50-
@@ -154,7 +_,7 @@
49+
50+
@@ -157,7 +_,7 @@
5151
}
5252

5353
dependencies {
54-
- implementation(project(":purpur-api")) // Purpur
55-
+ implementation(project(":deepslateMC-api")) // Purpur // Deepslate - project setup
56-
implementation("ca.spottedleaf:concurrentutil:0.0.8")
57-
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
58-
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
59-
@@ -229,14 +_,14 @@
54+
- implementation(project(":leaf-api")) // Leaf - project setup
55+
+ implementation(project(":deepslateMC-api")) // Leaf - project setup // Deepslate - project setup
56+
57+
// Leaf start - Libraries
58+
implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
59+
@@ -269,14 +_,14 @@
6060
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
6161
attributes(
6262
"Main-Class" to "org.bukkit.craftbukkit.Main",
63-
- "Implementation-Title" to "Purpur", // Purpur
64-
+ "Implementation-Title" to "DeepslateMC", // Purpur // Deepslate - Rebrand
63+
- "Implementation-Title" to "Leaf", // Leaf - Rebrand
64+
+ "Implementation-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
6565
"Implementation-Version" to implementationVersion,
6666
"Implementation-Vendor" to date,
67-
- "Specification-Title" to "Purpur", // Purpur
68-
+ "Specification-Title" to "DeepslateMC", // Purpur // Deepslate - Rebrand
67+
- "Specification-Title" to "Leaf", // Leaf - Rebrand
68+
+ "Specification-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
6969
"Specification-Version" to project.version,
70-
- "Specification-Vendor" to "Purpur Team", // Purpur
71-
- "Brand-Id" to "purpurmc:purpur", // Purpur
72-
- "Brand-Name" to "Purpur", // Purpur
73-
+ "Specification-Vendor" to "Pascalpex", // Purpur // Deepslate - Rebrand
74-
+ "Brand-Id" to "pascalpex:deepslate", // Purpur // Deepslate - Rebrand
75-
+ "Brand-Name" to "DeepslateMC", // Purpur // Deepslate - Rebrand
70+
- "Specification-Vendor" to "Winds Studio", // Leaf - Rebrand
71+
- "Brand-Id" to "winds-studio:leaf", // Leaf - Rebrand
72+
- "Brand-Name" to "Leaf", // Leaf - Rebrand
73+
+ "Specification-Vendor" to "Pascalpex", // Leaf - Rebrand // Deepslate - Rebrand
74+
+ "Brand-Id" to "pascalpex:deepslate", // Leaf - Rebrand // Deepslate - Rebrand
75+
+ "Brand-Name" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
7676
"Build-Number" to (build ?: ""),
7777
"Build-Time" to buildTime.toString(),
7878
"Git-Branch" to gitBranch,

‎deepslateMC-server/leaf-patches/files/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
2+
+++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
3+
@@ -93,7 +_,7 @@
4+
@Override
5+
public Component getVersionMessage() {
6+
final Component updateMessage;
7+
- if (BUILD_INFO.buildNumber().isEmpty() || BUILD_INFO.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher
8+
+ if (BUILD_INFO.buildNumber().isEmpty() && BUILD_INFO.gitCommit().isEmpty()) { // Gale - branding changes - version fetcher // Deepslate - do not require build number
9+
updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
10+
} else {
11+
updateMessage = getUpdateStatusMessage(this.gitHubOrganizationName + "/" + this.gitHubRepoName, this.downloadPage, this.apiUrl, this.userAgent, this.apiType); // Gale - branding changes - version fetcher

‎deepslateMC-server/minecraft-patches/features/0001-Dont-show-spectator-players-in-tablist.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont show spectator players in tablist
55

66

77
diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
8-
index 2e3b6da733387c95c0add1f7a42508023f0b74ff..f0abe276540d1ca7e6d43e9c365437a029a27870 100644
8+
index e9c58fc9bb16f8605410fe85971a7d4b1c3d3915..eb9294949ac9754e8512a06573b099dd41c8da5e 100644
99
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
1010
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
1111
@@ -84,10 +84,16 @@ public class ServerPlayerGameMode {
@@ -30,10 +30,10 @@ index 2e3b6da733387c95c0add1f7a42508023f0b74ff..f0abe276540d1ca7e6d43e9c365437a0
3030
if (gameModeForPlayer == GameType.CREATIVE) {
3131
this.player.resetCurrentImpulseContext();
3232
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
33-
index 34d8495507f1607af805ba17f7d17cb7a0e6dcc8..6767cdbda355bb861f2743fec34b2b833e638a35 100644
33+
index 932745d958cf24a65daf4cc1f6f794424ef80303..ff3544b2eacde973320fe5ae560a3e5da9c4df45 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -268,6 +268,25 @@ public abstract class PlayerList {
36+
@@ -281,6 +281,25 @@ public abstract class PlayerList {
3737
// CraftBukkit start - sendAll above replaced with this loop
3838
ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
3939

@@ -59,7 +59,7 @@ index 34d8495507f1607af805ba17f7d17cb7a0e6dcc8..6767cdbda355bb861f2743fec34b2b83
5959
final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
6060
for (int i = 0; i < this.players.size(); ++i) {
6161
ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
62-
@@ -276,7 +295,13 @@ public abstract class PlayerList {
62+
@@ -289,7 +308,13 @@ public abstract class PlayerList {
6363
// Paper start - Add Listing API for Player
6464
if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
6565
// Paper end - Add Listing API for Player
@@ -74,7 +74,7 @@ index 34d8495507f1607af805ba17f7d17cb7a0e6dcc8..6767cdbda355bb861f2743fec34b2b83
7474
// Paper start - Add Listing API for Player
7575
} else {
7676
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77-
@@ -292,7 +317,27 @@ public abstract class PlayerList {
77+
@@ -305,7 +330,27 @@ public abstract class PlayerList {
7878
}
7979
// Paper start - Use single player info update packet on join
8080
if (!onlinePlayers.isEmpty()) {

‎deepslateMC-server/minecraft-patches/features/0002-Global-EULA-file.patch‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)