diff --git a/build.gradle.kts b/build.gradle.kts index f3e376a..d1237ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ paperweight { val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" val menthaMavenPublicUrl = "https://repo.menthamc.org/repository/maven-public/" +val ompMavenSnapshotsUrl = "https://mvn.pkg.one/snapshots" subprojects { apply(plugin = "java-library") @@ -52,6 +53,7 @@ subprojects { mavenCentral() maven(paperMavenPublicUrl) maven(menthaMavenPublicUrl) + maven(ompMavenSnapshotsUrl) } dependencies { diff --git a/mint-server/build.gradle.kts.patch b/mint-server/build.gradle.kts.patch index ce5b405..e841e3f 100644 --- a/mint-server/build.gradle.kts.patch +++ b/mint-server/build.gradle.kts.patch @@ -86,6 +86,15 @@ 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 +@@ -169,7 +_,7 @@ + runtimeOnly(log4jPlugins.output) + alsoShade(log4jPlugins.output) + +- implementation("com.velocitypowered:velocity-native:3.4.0-SNAPSHOT") { ++ implementation("one.pkg.velocity_rc:velocity-native:3.4.0-SNAPSHOT") { + isTransitive = false + } + implementation("io.netty:netty-codec-haproxy:4.1.118.Final") // Add support for proxy protocol @@ -210,26 +_,42 @@ implementation("me.lucko:spark-paper:1.10.152") } diff --git a/mint-server/minecraft-patches/features/0057-Leaves-Configurable-collision-behavior.patch b/mint-server/minecraft-patches/features/0057-Leaves-Configurable-collision-behavior.patch deleted file mode 100644 index 00b96a3..0000000 --- a/mint-server/minecraft-patches/features/0057-Leaves-Configurable-collision-behavior.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Wed, 30 Jul 2025 19:34:58 +0800 -Subject: [PATCH] Leaves: Configurable collision behavior - -Co-authored by: Fortern -As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/c5f18b7864206cea4411211b51787f10affbcb9c/leaves-server/minecraft-patches/features/0111-Configurable-collision-behavior.patch) -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 e8bdc71a97c404f162e62ef777f47df8499c200c..c65208b668f9dbe87c4a745d176dde8e17dea967 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 { - (box1.minZ - box2.maxZ) < -COLLISION_EPSILON && (box1.maxZ - box2.minZ) > COLLISION_EPSILON; - } - -+ // Leaves start - Configurable collision behavior -+ public static boolean voxelShapeIntersectVanilla(final AABB box1, final AABB box2) { -+ return box1.minX < box2.maxX && box1.maxX > box2.minX && -+ box1.minY < box2.maxY && box1.maxY > box2.minY && -+ box1.minZ < box2.maxZ && box1.maxZ > box2.minZ; -+ } -+ // Leaves end - Configurable collision behavior -+ - // assume !isEmpty(target) && abs(source_move) >= COLLISION_EPSILON - public static double collideX(final AABB target, final AABB source, final double source_move) { - if ((source.minY - target.maxY) < -COLLISION_EPSILON && (source.maxY - target.minY) > COLLISION_EPSILON && -@@ -2025,7 +2033,7 @@ public final class CollisionUtil { - AABB singleAABB = ((CollisionVoxelShape)blockCollision).moonrise$getSingleAABBRepresentation(); - if (singleAABB != null) { - singleAABB = singleAABB.move((double)blockX, (double)blockY, (double)blockZ); -- if (!voxelShapeIntersect(aabb, singleAABB)) { -+ if (shouldSkip(aabb, blockCollision, singleAABB)) { // Leaves - Configurable collision behavior - continue; - } - -@@ -2078,6 +2086,18 @@ public final class CollisionUtil { - return ret; - } - -+ // Leaves start - Configurable collision behavior -+ private static boolean shouldSkip(AABB aabb, VoxelShape blockCollision, AABB singleAABB) { -+ boolean isBlockShape = blockCollision == Shapes.block(); -+ return switch (dev.bacteriawa.mint.config.modules.fixes.CollisionBehaviorConfig.behaviorMode) { -+ case VANILLA -> !voxelShapeIntersectVanilla(aabb, singleAABB); -+ case PAPER -> !voxelShapeIntersect(aabb, singleAABB); -+ default -> isBlockShape && !voxelShapeIntersectVanilla(aabb, singleAABB) || !isBlockShape && !voxelShapeIntersect(aabb, singleAABB); -+ // All other value as BLOCK_SHAPE_VANILLA to process -+ }; -+ } -+ // Leaves end - Configurable collision behavior -+ - public static boolean getEntityHardCollisions(final Level world, final Entity entity, AABB aabb, - final List into, final int collisionFlags, final Predicate predicate) { - final boolean checkOnly = (collisionFlags & COLLISION_FLAG_CHECK_ONLY) != 0; diff --git a/mint-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch b/mint-server/minecraft-patches/features/0057-Leaves-Fix-SculkCatalyst-exp-skip.patch similarity index 100% rename from mint-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch rename to mint-server/minecraft-patches/features/0057-Leaves-Fix-SculkCatalyst-exp-skip.patch diff --git a/mint-server/minecraft-patches/features/0059-Further-reduce-memory-footprint-of-CompoundTag.patch b/mint-server/minecraft-patches/features/0058-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from mint-server/minecraft-patches/features/0059-Further-reduce-memory-footprint-of-CompoundTag.patch rename to mint-server/minecraft-patches/features/0058-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/mint-server/minecraft-patches/features/0060-Leaf-Cache-random-tick-block-status.patch b/mint-server/minecraft-patches/features/0059-Leaf-Cache-random-tick-block-status.patch similarity index 100% rename from mint-server/minecraft-patches/features/0060-Leaf-Cache-random-tick-block-status.patch rename to mint-server/minecraft-patches/features/0059-Leaf-Cache-random-tick-block-status.patch diff --git a/mint-server/minecraft-patches/features/0061-Leaf-Optimize-SetLookAndInteract-and-NearestVisibleL.patch b/mint-server/minecraft-patches/features/0060-Leaf-Optimize-SetLookAndInteract-and-NearestVisibleL.patch similarity index 100% rename from mint-server/minecraft-patches/features/0061-Leaf-Optimize-SetLookAndInteract-and-NearestVisibleL.patch rename to mint-server/minecraft-patches/features/0060-Leaf-Optimize-SetLookAndInteract-and-NearestVisibleL.patch diff --git a/mint-server/minecraft-patches/features/0062-Leaf-rewrite-InsideBrownianWalk.patch b/mint-server/minecraft-patches/features/0061-Leaf-rewrite-InsideBrownianWalk.patch similarity index 100% rename from mint-server/minecraft-patches/features/0062-Leaf-rewrite-InsideBrownianWalk.patch rename to mint-server/minecraft-patches/features/0061-Leaf-rewrite-InsideBrownianWalk.patch diff --git a/mint-server/minecraft-patches/features/0063-Leaf-Remove-streams-in-MobSensor.patch b/mint-server/minecraft-patches/features/0062-Leaf-Remove-streams-in-MobSensor.patch similarity index 100% rename from mint-server/minecraft-patches/features/0063-Leaf-Remove-streams-in-MobSensor.patch rename to mint-server/minecraft-patches/features/0062-Leaf-Remove-streams-in-MobSensor.patch diff --git a/mint-server/minecraft-patches/features/0064-Add-Vanilla-like-experience-Config.patch b/mint-server/minecraft-patches/features/0063-Add-Vanilla-like-experience-Config.patch similarity index 100% rename from mint-server/minecraft-patches/features/0064-Add-Vanilla-like-experience-Config.patch rename to mint-server/minecraft-patches/features/0063-Add-Vanilla-like-experience-Config.patch diff --git a/mint-server/minecraft-patches/features/0065-Supported-Scoreboard-And-Schedule-Command.patch b/mint-server/minecraft-patches/features/0064-Supported-Scoreboard-And-Schedule-Command.patch similarity index 100% rename from mint-server/minecraft-patches/features/0065-Supported-Scoreboard-And-Schedule-Command.patch rename to mint-server/minecraft-patches/features/0064-Supported-Scoreboard-And-Schedule-Command.patch diff --git a/mint-server/minecraft-patches/features/0066-Leaf-Optimize-LinearPalette-MIME-Version-1.0-Content.patch b/mint-server/minecraft-patches/features/0065-Leaf-Optimize-LinearPalette-MIME-Version-1.0-Content.patch similarity index 100% rename from mint-server/minecraft-patches/features/0066-Leaf-Optimize-LinearPalette-MIME-Version-1.0-Content.patch rename to mint-server/minecraft-patches/features/0065-Leaf-Optimize-LinearPalette-MIME-Version-1.0-Content.patch diff --git a/mint-server/minecraft-patches/features/0067-Leaf-Rewrite-ClientboundLightUpdatePacketData.patch b/mint-server/minecraft-patches/features/0066-Leaf-Rewrite-ClientboundLightUpdatePacketData.patch similarity index 100% rename from mint-server/minecraft-patches/features/0067-Leaf-Rewrite-ClientboundLightUpdatePacketData.patch rename to mint-server/minecraft-patches/features/0066-Leaf-Rewrite-ClientboundLightUpdatePacketData.patch diff --git a/mint-server/minecraft-patches/features/0068-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch b/mint-server/minecraft-patches/features/0067-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch similarity index 100% rename from mint-server/minecraft-patches/features/0068-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch rename to mint-server/minecraft-patches/features/0067-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch diff --git a/mint-server/minecraft-patches/features/0069-Lithium-combined-heightmap-update.patch b/mint-server/minecraft-patches/features/0068-Lithium-combined-heightmap-update.patch similarity index 100% rename from mint-server/minecraft-patches/features/0069-Lithium-combined-heightmap-update.patch rename to mint-server/minecraft-patches/features/0068-Lithium-combined-heightmap-update.patch diff --git a/mint-server/minecraft-patches/features/0070-Lithium-equipment-tracking.patch b/mint-server/minecraft-patches/features/0069-Lithium-equipment-tracking.patch similarity index 100% rename from mint-server/minecraft-patches/features/0070-Lithium-equipment-tracking.patch rename to mint-server/minecraft-patches/features/0069-Lithium-equipment-tracking.patch diff --git a/mint-server/minecraft-patches/features/0071-PufferFish-Dynamic-Activation-Brain.patch b/mint-server/minecraft-patches/features/0070-PufferFish-Dynamic-Activation-Brain.patch similarity index 100% rename from mint-server/minecraft-patches/features/0071-PufferFish-Dynamic-Activation-Brain.patch rename to mint-server/minecraft-patches/features/0070-PufferFish-Dynamic-Activation-Brain.patch diff --git a/mint-server/minecraft-patches/features/0072-NetworkAnalyser.patch b/mint-server/minecraft-patches/features/0071-NetworkAnalyser.patch similarity index 100% rename from mint-server/minecraft-patches/features/0072-NetworkAnalyser.patch rename to mint-server/minecraft-patches/features/0071-NetworkAnalyser.patch diff --git a/mint-server/minecraft-patches/features/0073-Networkbar.patch b/mint-server/minecraft-patches/features/0072-Networkbar.patch similarity index 100% rename from mint-server/minecraft-patches/features/0073-Networkbar.patch rename to mint-server/minecraft-patches/features/0072-Networkbar.patch diff --git a/mint-server/minecraft-patches/features/0074-Improved-Server-Health-Report.patch b/mint-server/minecraft-patches/features/0073-Improved-Server-Health-Report.patch similarity index 100% rename from mint-server/minecraft-patches/features/0074-Improved-Server-Health-Report.patch rename to mint-server/minecraft-patches/features/0073-Improved-Server-Health-Report.patch diff --git a/mint-server/minecraft-patches/features/0075-Add-config-to-modify-tripwire-behavior.patch b/mint-server/minecraft-patches/features/0074-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from mint-server/minecraft-patches/features/0075-Add-config-to-modify-tripwire-behavior.patch rename to mint-server/minecraft-patches/features/0074-Add-config-to-modify-tripwire-behavior.patch diff --git a/mint-server/minecraft-patches/features/0076-Blank-Configuration-File.patch b/mint-server/minecraft-patches/features/0075-Blank-Configuration-File.patch similarity index 100% rename from mint-server/minecraft-patches/features/0076-Blank-Configuration-File.patch rename to mint-server/minecraft-patches/features/0075-Blank-Configuration-File.patch diff --git a/mint-server/minecraft-patches/features/0077-I18n-support.patch b/mint-server/minecraft-patches/features/0076-I18n-support.patch similarity index 100% rename from mint-server/minecraft-patches/features/0077-I18n-support.patch rename to mint-server/minecraft-patches/features/0076-I18n-support.patch diff --git a/mint-server/minecraft-patches/features/0078-C2ME-Reduce-Allocations.patch b/mint-server/minecraft-patches/features/0077-C2ME-Reduce-Allocations.patch similarity index 100% rename from mint-server/minecraft-patches/features/0078-C2ME-Reduce-Allocations.patch rename to mint-server/minecraft-patches/features/0077-C2ME-Reduce-Allocations.patch diff --git a/mint-server/minecraft-patches/features/0079-Optimize-villager-golem-checks.patch b/mint-server/minecraft-patches/features/0078-Optimize-villager-golem-checks.patch similarity index 100% rename from mint-server/minecraft-patches/features/0079-Optimize-villager-golem-checks.patch rename to mint-server/minecraft-patches/features/0078-Optimize-villager-golem-checks.patch diff --git a/mint-server/minecraft-patches/features/0080-Optimize-AI-stream-usage.patch b/mint-server/minecraft-patches/features/0079-Optimize-AI-stream-usage.patch similarity index 100% rename from mint-server/minecraft-patches/features/0080-Optimize-AI-stream-usage.patch rename to mint-server/minecraft-patches/features/0079-Optimize-AI-stream-usage.patch