Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-19 23:09:32 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d8d54d9 Only remove worldgen block entity on changed block (#10794)
PaperMC/Paper@ba31f41 [ci skip] Clean up paperclip build-pr workflow
This commit is contained in:
Samsuik
2024-05-30 23:17:28 +01:00
parent bfac70f0d1
commit 4f1f98f58e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle.kts
View File

@@ -23,12 +23,12 @@ subprojects {
apply(plugin = "java") apply(plugin = "java")
java { java {
toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } toolchain { languageVersion = JavaLanguageVersion.of(17) }
} }
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
options.encoding = "UTF-8" options.encoding = "UTF-8"
options.release.set(17) options.release = 17
} }
repositories { repositories {
@@ -44,18 +44,18 @@ subprojects {
} }
paperweight { paperweight {
serverProject.set(project(":sakura-server")) serverProject = project(":sakura-server")
remapRepo.set("https://maven.fabricmc.net/") remapRepo = "https://maven.fabricmc.net/"
decompileRepo.set("https://files.minecraftforge.net/maven/") decompileRepo = "https://files.minecraftforge.net/maven/"
usePaperUpstream(providers.gradleProperty("paperRef")) { usePaperUpstream(providers.gradleProperty("paperRef")) {
withPaperPatcher { withPaperPatcher {
apiPatchDir.set(layout.projectDirectory.dir("patches/api")) apiPatchDir = layout.projectDirectory.dir("patches/api")
apiOutputDir.set(layout.projectDirectory.dir("sakura-api")) apiOutputDir = layout.projectDirectory.dir("sakura-api")
serverPatchDir.set(layout.projectDirectory.dir("patches/server")) serverPatchDir = layout.projectDirectory.dir("patches/server")
serverOutputDir.set(layout.projectDirectory.dir("sakura-server")) serverOutputDir = layout.projectDirectory.dir("sakura-server")
} }
patchTasks.register("generatedApi") { patchTasks.register("generatedApi") {
isBareDirectory = true isBareDirectory = true

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
version=1.20.4-R0.1-SNAPSHOT version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4 mcVersion=1.20.4
paperRef=7ac24a18940da12beb39a030113f6e459f348e2f paperRef=ba31f4128208e954d6648001724887352f71ece9
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME