diff --git a/gradle.properties b/gradle.properties index 554b95ac..94ce3ebd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves -version=1.21.5-R0.1-SNAPSHOT -mcVersion=1.21.5 -paperRef=2ba1675c7506cadd8a540ea452e5dafb79ae8947 +version=1.21.6-R0.1-SNAPSHOT +mcVersion=1.21.6 +paperRef=74fbcce5aefccddae474614ddfce50f3b9de769d preVersion=true org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 18362b78..942039f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch b/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch index 82945e86..ed3f0d22 100644 --- a/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch +++ b/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a8b64f78bf3c453094074b4b4d3c8fd07b9eb273..ed2bcc30cec91d3266c3d184b89b96bac6fb1f67 100644 +index 04a1379f5fe281ab72610d2f8f18e1355fe3a134..c0bd7eb61424036f3787f155c31f4f473cb158fc 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4358,6 +4358,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4376,6 +4376,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient void setSendViewDistance(int viewDistance); // Paper end - view distance api diff --git a/leaves-server/build.gradle.kts.patch b/leaves-server/build.gradle.kts.patch index 0bec9579..44476154 100644 --- a/leaves-server/build.gradle.kts.patch +++ b/leaves-server/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts -@@ -9,25 +_,38 @@ +@@ -9,21 +_,34 @@ `java-library` `maven-publish` idea @@ -12,9 +12,9 @@ +val leavesMavenPublicUrl = "https://repo.leavesmc.com/snapshots/" // Leaves - build change dependencies { - mache("io.papermc:mache:1.21.5+build.2") + mache("io.papermc:mache:1.21.6+build.1") - paperclip("io.papermc:paperclip:3.0.3") -+ leavesclip("org.leavesmc:leavesclip:3.0.0") // Leaves - build change ++ leavesclip("org.leavesmc:leavesclip:3.0.1") // Leaves - build change testRuntimeOnly("org.junit.platform:junit-platform-launcher") } @@ -23,10 +23,6 @@ + minecraftVersion = rootProject.providers.gradleProperty("mcVersion") // Leaves - build change gitFilePatches = false - //updatingMinecraft { - // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365" - //} - + // Leaves start - build change + val leaves = forks.register("leaves") { + upstream.patchDir("paperServer") { @@ -40,17 +36,18 @@ + // Leaves end - build change + spigot { + enabled = false buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" - packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment -@@ -50,6 +_,7 @@ +@@ -46,7 +_,7 @@ + tasks.generateDevelopmentBundle { libraryRepositories.addAll( "https://repo.maven.apache.org/maven2/", - paperMavenPublicUrl, +- paperMavenPublicUrl, + leavesMavenPublicUrl // Leaves - build change ) } -@@ -108,7 +_,22 @@ +@@ -105,7 +_,22 @@ } } @@ -74,7 +71,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { extendsFrom(configurations.compileClasspath.get()) } -@@ -130,7 +_,18 @@ +@@ -127,7 +_,18 @@ } dependencies { @@ -94,18 +91,18 @@ implementation("ca.spottedleaf:concurrentutil:0.0.3") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -157,9 +_,9 @@ +@@ -154,9 +_,9 @@ implementation("org.ow2.asm:asm-commons:9.8") implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199") implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot. -+ implementation("commons-lang:commons-lang:2.6") // Leaves ++ implementation("commons-lang:commons-lang:2.6") // Leaves - build change // Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed - runtimeOnly("commons-lang:commons-lang:2.6") runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") runtimeOnly("com.mysql:mysql-connector-j:9.2.0") runtimeOnly("com.lmax:disruptor:3.4.4") -@@ -194,6 +_,16 @@ +@@ -191,6 +_,16 @@ implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1") } @@ -122,7 +119,7 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) -@@ -206,14 +_,14 @@ +@@ -203,14 +_,14 @@ val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -142,16 +139,16 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -267,7 +_,7 @@ +@@ -269,7 +_,7 @@ jvmArgumentProviders.add(provider) } -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath() -+val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-server/src/generated/java").asFile.toPath() ++val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-server/src/generated/java").asFile.toPath() // Leaves - build changes idea { module { generatedSourceDirs.add(generatedDir.toFile()) -@@ -360,13 +_,26 @@ +@@ -362,13 +_,24 @@ classpath(tasks.createReobfBundlerJar.flatMap { it.outputZip }) mainClass.set(null as String?) } @@ -165,7 +162,6 @@ - classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip }) - mainClass.set(null as String?) -} -+ +// Leaves start - build change +tasks.registerRunTask("runLeavesclip") { + description = "Spin up a test server from the Mojang mapped Leavesclip jar" @@ -180,7 +176,6 @@ + mainClass.set(null as String?) +} +// Leaves end - build change -+ +// Leaves start - create config file +tasks.registerRunTask("createLeavesConfig") { + description = "Create a new leaves.yml" diff --git a/settings.gradle.kts b/settings.gradle.kts index bf4a5bba..9a66a2f7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenLocal() // Only for test Leavesweight, should be removed after merge LeavesMC/leavesweight#2 gradlePluginPortal() maven("https://repo.leavesmc.org/snapshots/") maven("https://repo.papermc.io/repository/maven-public/")