Skip to content

Commit ffaf0f6

Browse files
PascalpexPascalpex
committed
Update to 1.21.10
1 parent 90397d2 commit ffaf0f6

File tree

34 files changed

+508
-676
lines changed

34 files changed

+508
-676
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
name: DeepslateMC
27-
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar
27+
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.10-R0.1-SNAPSHOT-mojmap.jar

‎.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-
leaf-api
52-
leaf-server
51+
purpur-api
52+
purpur-server
5353
paper-api
5454
paper-server
5555

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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
67
<br/>
78
</div>
89

‎build.gradle.kts‎

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

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

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

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

4039
subprojects {
4140
apply(plugin = "java-library")
@@ -50,7 +49,6 @@ subprojects {
5049
repositories {
5150
mavenCentral()
5251
maven(paperMavenPublicUrl)
53-
maven(leafMavenPublicUrl)
5452
}
5553

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

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

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

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

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

‎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/leaf-server/build.gradle.kts
2-
+++ b/leaf-server/build.gradle.kts
3-
@@ -37,7 +_,30 @@
1+
--- a/purpur-server/build.gradle.kts
2+
+++ b/purpur-server/build.gradle.kts
3+
@@ -33,7 +_,30 @@
4+
outputDir = rootDirectory.dir("paper-server")
45
}
56
}
6-
7-
- activeFork = leaf
7+
- activeFork = purpur
88
+ // Deepslate start - project setup
99
+ val deepslateMC = forks.register("deepslateMC") {
10-
+ forks = leaf
10+
+ forks = purpur
1111
+ upstream.patchRepo("paperServer") {
12-
+ upstreamRepo = leaf.patchedRepo("paperServer")
12+
+ upstreamRepo = purpur.patchedRepo("paperServer")
1313
+ patchesDir = rootDirectory.dir("deepslateMC-server/paper-patches")
1414
+ outputDir = rootDirectory.dir("paper-server")
1515
+ }
16-
+ upstream.patchDir("leafServer") {
17-
+ upstreamPath = "leaf-server"
16+
+ upstream.patchDir("purpurServer") {
17+
+ upstreamPath = "purpur-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/leaf-patches")
26-
+ outputDir = rootDirectory.dir("leaf-server")
25+
+ patchesDir = rootDirectory.dir("deepslateMC-server/purpur-patches")
26+
+ outputDir = rootDirectory.dir("purpur-server")
2727
+ }
2828
+ }
2929
+
3030
+ activeFork = deepslateMC
3131
+ // Deepslate end - project setup
32-
// Leaf end - project setup
32+
// Purpur end - Rebrand
3333

3434
spigot {
35-
@@ -127,10 +_,14 @@
35+
@@ -122,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") } // Deepslate - project setup
40-
+ resources { srcDir("../leaf-server/src/main/resources") } // Deepslate - project setup
39+
+ java { srcDir("../purpur-server/src/main/java") } // Deepslate - project setup
40+
+ resources { srcDir("../purpur-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("../leaf-server/src/test/java") } // Deepslate - project setup
46-
+ resources { srcDir("../leaf-server/src/test/resources") } // Deepslate - project setup
45+
+ java { srcDir("../purpur-server/src/test/java") } // Deepslate - project setup
46+
+ resources { srcDir("../purpur-server/src/test/resources") } // Deepslate - project setup
4747
}
4848
}
49-
50-
@@ -159,7 +_,7 @@
49+
val log4jPlugins = sourceSets.create("log4jPlugins") {
50+
@@ -154,7 +_,7 @@
5151
}
5252

5353
dependencies {
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-
@@ -271,14 +_,14 @@
54+
- implementation(project(":purpur-api")) // Purpur
55+
+ implementation(project(":deepslateMC-api")) // Purpur // Deepslate - project setup
56+
implementation("ca.spottedleaf:concurrentutil:0.0.7")
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+
@@ -228,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 "Leaf", // Leaf - Rebrand
64-
+ "Implementation-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
63+
- "Implementation-Title" to "Purpur", // Purpur
64+
+ "Implementation-Title" to "DeepslateMC", // Purpur // Deepslate - Rebrand
6565
"Implementation-Version" to implementationVersion,
6666
"Implementation-Vendor" to date,
67-
- "Specification-Title" to "Leaf", // Leaf - Rebrand
68-
+ "Specification-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
67+
- "Specification-Title" to "Purpur", // Purpur
68+
+ "Specification-Title" to "DeepslateMC", // Purpur // Deepslate - Rebrand
6969
"Specification-Version" to project.version,
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
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
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: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)