Skip to content

Commit 2a42718

Browse files
committed
26.1 1
1 parent 891f1a2 commit 2a42718

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
**ShreddedPaper is in public beta.** Most features work for most players most of
66
the time, however things can occasionally break.
77

8-
1.21.11 [Purpur](https://github.com/PurpurMC/Purpur) fork that brings vertical scaling to Minecraft.
8+
26.1.1 [Purpur](https://github.com/PurpurMC/Purpur) fork that brings vertical scaling to Minecraft.
99

1010
ShreddedPaper:
1111

@@ -61,7 +61,7 @@ repositories {
6161
}
6262
6363
dependencies {
64-
compile "com.github.puregero:shreddedpaper-api:1.21.11-R0.1-SNAPSHOT"
64+
compile "com.github.puregero:shreddedpaper-api:26.1.1-R0.1-SNAPSHOT"
6565
}
6666
```
6767

@@ -78,7 +78,7 @@ Or in your pom.xml:
7878
<dependency>
7979
<groupId>com.github.puregero</groupId>
8080
<artifactId>shreddedpaper-api</artifactId>
81-
<version>1.21.11-R0.1-SNAPSHOT</version>
81+
<version>26.1.1-R0.1-SNAPSHOT</version>
8282
</dependency>
8383
</dependencies>
8484
```

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
22
import org.gradle.api.tasks.testing.logging.TestLogEvent
33

44
plugins {
5-
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
5+
id("io.papermc.paperweight.patcher") version "2.0.0-SNAPSHOT"
66
}
77

88
paperweight {
@@ -42,7 +42,7 @@ subprojects {
4242

4343
extensions.configure<JavaPluginExtension> {
4444
toolchain {
45-
languageVersion = JavaLanguageVersion.of(21)
45+
languageVersion = JavaLanguageVersion.of(25)
4646
}
4747
}
4848

@@ -57,7 +57,7 @@ subprojects {
5757
}
5858
tasks.withType<JavaCompile> {
5959
options.encoding = Charsets.UTF_8.name()
60-
options.release = 21
60+
options.release = 25
6161
options.isFork = true
6262
}
6363
tasks.withType<Javadoc> {

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
group=io.multipaper.shreddedpaper
2-
version=1.21.11-R0.1-SNAPSHOT
3-
mcVersion=1.21.11
4-
apiVersion=1.21.11
52

6-
purpurRef=0eafe23898dc9c093f0ae18e768f716544bb3ee1
3+
mcVersion=26.1.1
4+
apiVersion=26.1.1
5+
6+
purpurRef=d53e7784d601acc5b40579486858c9fded29ec09
77

88
org.gradle.configuration-cache=true
99
org.gradle.caching=true

purpurRefLatest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ setProperty(){
77
mv $3.tmp $3
88
}
99

10-
SHA=$(curl https://api.github.com/repos/PurpurMC/Purpur/commits/ver/1.21.11 | jq -r .sha)
10+
SHA=$(curl https://api.github.com/repos/PurpurMC/Purpur/commits/ver/26.1.1 | jq -r .sha)
1111
setProperty purpurRef $SHA gradle.properties
1212

1313
echo $SHA

shreddedpaper-server/build.gradle.kts.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/purpur-server/build.gradle.kts
22
+++ b/purpur-server/build.gradle.kts
3-
@@ -35,6 +_,24 @@
3+
@@ -36,6 +_,24 @@
44
activeFork = purpur
55
// Purpur end - Rebrand
66

@@ -20,12 +20,12 @@
2020
+ }
2121
+ }
2222
+ activeFork = shreddedpaper
23-
+ // ShreddedPaper e d - Rebrand
23+
+ // ShreddedPaper end - Rebrand
2424
+
25-
spigot {
26-
enabled = true
27-
buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
28-
@@ -122,10 +_,14 @@
25+
/*updatingMinecraft { // Purpur start - TODO - snapshot - we don't need this
26+
// oldPaperCommit = "7e80cef5198561d0db53406127e5b8bc7af51577"
27+
}*/ // Purpur end - TODO - snapshot - we don't need this
28+
@@ -105,10 +_,14 @@
2929
main {
3030
java { srcDir("../paper-server/src/main/java") }
3131
resources { srcDir("../paper-server/src/main/resources") }
@@ -40,16 +40,16 @@
4040
}
4141
}
4242
val log4jPlugins = sourceSets.create("log4jPlugins") {
43-
@@ -154,7 +_,7 @@
43+
@@ -137,7 +_,7 @@
4444
}
4545

4646
dependencies {
4747
- implementation(project(":purpur-api")) // Purpur
4848
+ implementation(project(":shreddedpaper-api")) // Purpur // ShreddedPaper
49-
implementation("ca.spottedleaf:concurrentutil:0.0.8")
49+
implementation("ca.spottedleaf:concurrentutil:0.0.10")
5050
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
5151
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
52-
@@ -229,14 +_,14 @@
52+
@@ -203,14 +_,14 @@
5353
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
5454
attributes(
5555
"Main-Class" to "org.bukkit.craftbukkit.Main",

0 commit comments

Comments
 (0)