Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
id("io.papermc.paperweight.patcher") version "2.0.0-beta.18"
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
}

paperweight {
Expand Down
8 changes: 4 additions & 4 deletions fork-api/build.gradle.kts.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -90,7 +_,7 @@
@@ -91,7 +_,7 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

Expand All @@ -9,7 +9,7 @@
idea {
module {
generatedSourceDirs.add(generatedDir.toFile())
@@ -100,6 +_,18 @@
@@ -101,6 +_,18 @@
main {
java {
srcDir(generatedDir)
Expand All @@ -28,7 +28,7 @@
}
}
}
@@ -166,7 +_,7 @@
@@ -183,7 +_,7 @@

tasks.withType<Javadoc>().configureEach {
val options = options as StandardJavadocDocletOptions
Expand All @@ -37,7 +37,7 @@
options.use()
options.isDocFilesSubDirs = true
options.links(
@@ -199,11 +_,11 @@
@@ -216,11 +_,11 @@
}

// workaround for https://github.com/gradle/gradle/issues/4046
Expand Down
12 changes: 6 additions & 6 deletions fork-server/build.gradle.kts.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
@@ -26,6 +_,17 @@
@@ -22,6 +_,17 @@
minecraftVersion = providers.gradleProperty("mcVersion")
gitFilePatches = false

Expand All @@ -17,8 +17,8 @@
+
spigot {
enabled = true
buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
@@ -107,7 +_,20 @@
buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
@@ -104,7 +_,20 @@
}
}

Expand All @@ -40,16 +40,16 @@
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
extendsFrom(configurations.compileClasspath.get())
}
@@ -129,7 +_,7 @@
@@ -127,7 +_,7 @@
}

dependencies {
- implementation(project(":paper-api"))
+ implementation(project(":fork-api"))
implementation("ca.spottedleaf:concurrentutil:0.0.3")
implementation("ca.spottedleaf:concurrentutil:0.0.8")
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
@@ -266,7 +_,7 @@
@@ -264,7 +_,7 @@
jvmArgumentProviders.add(provider)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- a/net/minecraft/BlockUtil.java
+++ b/net/minecraft/BlockUtil.java
--- a/net/minecraft/util/BlockUtil.java
+++ b/net/minecraft/util/BlockUtil.java
@@ -16,6 +_,7 @@
public static BlockUtil.FoundRectangle getLargestRectangleAround(
BlockPos centerPos, Direction.Axis axis1, int max1, Direction.Axis axis2, int max2, Predicate<BlockPos> posPredicate
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
group=fork.test
version=1.21.8-R0.1-SNAPSHOT
mcVersion=1.21.8
paperRef=103187750e29fd982b84b2bab114fe5af98a82e5
version=1.21.11-R0.1-SNAPSHOT
apiVersion=1.21.11
mcVersion=1.21.11
paperRef=3ebc5b3320924e9122903dfd1f11abcf897300e6

org.gradle.configuration-cache=true
org.gradle.caching=true
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pluginManagement {
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}

rootProject.name = "fork"
Expand Down