diff --git a/gradle.properties b/gradle.properties index 6bb0d80..d861ce2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ release=pre # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -foliaRef=95c3f27c42f901ab8e44bbed992c7a6c53e3daaf +foliaRef=14b7fee5c866fca9a40ede4a58998fb928140f65 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/shiroha-server/build.gradle.kts.patch b/shiroha-server/build.gradle.kts.patch index d61df98..3fa1c82 100644 --- a/shiroha-server/build.gradle.kts.patch +++ b/shiroha-server/build.gradle.kts.patch @@ -48,12 +48,19 @@ } } val log4jPlugins = sourceSets.create("log4jPlugins") { -@@ -134,7 +_,16 @@ +@@ -134,7 +_,7 @@ } dependencies { - implementation(project(":folia-api")) + implementation(project(":shiroha-api")) + implementation("ca.spottedleaf:leafpile:1.2.0") + 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 +@@ -182,6 +_,15 @@ + // Spark + implementation("me.lucko:spark-api:0.1-20240720.200737-2") + implementation("me.lucko:spark-paper:1.10.177") + // Shiroha start - dependencies + implementation("com.electronwill.night-config:toml:3.8.4") + implementation("net.openhft:affinity:3.23.3") @@ -63,9 +70,9 @@ + implementation("tools.profiler:async-profiler:4.5") + implementation("tools.profiler:jfr-converter:4.5") + // Shiroha end - implementation("ca.spottedleaf:leafpile:1.0.0") - 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 + } + + tasks.jar { @@ -189,21 +_,21 @@ val git = Git(rootProject.layout.projectDirectory.path) val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() diff --git a/shiroha-server/minecraft-patches/features/0073-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0073-Leaves-Configurable-collision-behavior.patch index 27174d8..401c769 100644 --- a/shiroha-server/minecraft-patches/features/0073-Leaves-Configurable-collision-behavior.patch +++ b/shiroha-server/minecraft-patches/features/0073-Leaves-Configurable-collision-behavior.patch @@ -8,7 +8,7 @@ As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/c5f18b7864206cea4411 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java -index 8d2518600ad518999b75124f0a87db9efe541f2e..d66e65fdee6117b0da7368a3ef9c3ae063974afa 100644 +index bc91b87da9c8034fc142007bfb0be4927bd958d6..a299de892feb1b0c37ba3d7e2a63e20076fcc1e2 100644 --- a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java +++ b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java @@ -101,6 +101,14 @@ public final class CollisionUtil { @@ -35,7 +35,7 @@ index 8d2518600ad518999b75124f0a87db9efe541f2e..d66e65fdee6117b0da7368a3ef9c3ae0 continue; } } -@@ -2087,6 +2095,18 @@ public final class CollisionUtil { +@@ -2088,6 +2096,18 @@ public final class CollisionUtil { return ret; }