From f3de39d91d24de6f7d0b7e6a26e601865b4f6402 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Fri, 25 Apr 2025 02:03:50 +0300 Subject: [PATCH] =?UTF-8?q?[ci-skip]=20compilation=20fixes=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- divinemc-api/build.gradle.kts.patch | 10 ++++++---- divinemc-server/build.gradle.kts.patch | 3 ++- .../features/0012-Optimize-explosions.patch | 4 ++-- .../features/0036-Linear-region-file-format.patch | 13 +++++++++++-- .../features/0042-Dynamic-Activation-of-Brain.patch | 4 ++-- .../entity/ai/sensing/SecondaryPoiSensor.java.patch | 2 +- .../entity/pathfinding/NodeEvaluatorCache.java | 2 +- .../org/bxteam/divinemc/region/IRegionFile.java | 3 +++ .../bxteam/divinemc/region/LinearRegionFile.java | 5 +++++ 9 files changed, 33 insertions(+), 13 deletions(-) diff --git a/divinemc-api/build.gradle.kts.patch b/divinemc-api/build.gradle.kts.patch index d6e6b80..c02d0ae 100644 --- a/divinemc-api/build.gradle.kts.patch +++ b/divinemc-api/build.gradle.kts.patch @@ -32,16 +32,18 @@ // Deprecate bungeecord-chat in favor of adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") { -@@ -68,9 +_,9 @@ +@@ -68,9 +_,11 @@ apiAndDocs("$adventureGroup:adventure-text-serializer-plain") apiAndDocs("$adventureGroup:adventure-text-logger-slf4j") - api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") -+ api("org.apache.maven:maven-resolver-provider:3.9.9") // make API dependency for Paper Plugins // DivineMC - Bump dependencies -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // DivineMC - Bump dependencies -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // DivineMC - Bump dependencies ++ // DivineMC start - Bump dependencies ++ api("org.apache.maven:maven-resolver-provider:3.9.9") // make API dependency for Paper Plugins ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") ++ // DivineMC end - Bump dependencies // Annotations - Slowly migrate to jspecify val annotations = "org.jetbrains:annotations:$annotationsVersion" diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch index 0cabc82..442e701 100644 --- a/divinemc-server/build.gradle.kts.patch +++ b/divinemc-server/build.gradle.kts.patch @@ -48,7 +48,7 @@ } } val log4jPlugins = sourceSets.create("log4jPlugins") { -@@ -156,10 +_,22 @@ +@@ -156,10 +_,23 @@ } dependencies { @@ -62,6 +62,7 @@ + } + implementation("net.objecthunter:exp4j:0.4.8") + implementation("org.agrona:agrona:2.0.1") ++ implementation("net.openhft:zero-allocation-hashing:0.16") + implementation("com.github.luben:zstd-jni:1.5.6-9") + implementation("org.lz4:lz4-java:1.8.0") + // DivineMC end - Dependencies diff --git a/divinemc-server/minecraft-patches/features/0012-Optimize-explosions.patch b/divinemc-server/minecraft-patches/features/0012-Optimize-explosions.patch index adc4bf8..4dd2423 100644 --- a/divinemc-server/minecraft-patches/features/0012-Optimize-explosions.patch +++ b/divinemc-server/minecraft-patches/features/0012-Optimize-explosions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize explosions diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java -index a772f2bd7be00172ad41353c6ad42d9239b9ec88..4fcbf5181e9e8053302ae9b75a6d76aa6698a21b 100644 +index a772f2bd7be00172ad41353c6ad42d9239b9ec88..fb6df8b2d96727b3febfe404be0eb2d77b2edf13 100644 --- a/net/minecraft/world/level/ServerExplosion.java +++ b/net/minecraft/world/level/ServerExplosion.java @@ -372,6 +372,11 @@ public class ServerExplosion implements Explosion { @@ -170,7 +170,7 @@ index a772f2bd7be00172ad41353c6ad42d9239b9ec88..4fcbf5181e9e8053302ae9b75a6d76aa + } + + private Optional noBlockCalcsWithNoBLockDamage(final ExplosionDamageCalculator instance, final Explosion explosion, final BlockGetter blockGetter, final BlockPos blockPos, final BlockState blockState, final FluidState fluidState) { -+ if (org.bxteam.divinemc.DivineConfig.explosionNoBlockDamage) return Optional.of(Blocks.BEDROCK.getExplosionResistance()); ++ if (org.bxteam.divinemc.DivineConfig.explosionNoBlockDamage) return Optional.of(net.minecraft.world.level.block.Blocks.BEDROCK.getExplosionResistance()); + return instance.getBlockExplosionResistance(explosion, blockGetter, blockPos, blockState, fluidState); + } + // DivineMC end - Optimize explosions diff --git a/divinemc-server/minecraft-patches/features/0036-Linear-region-file-format.patch b/divinemc-server/minecraft-patches/features/0036-Linear-region-file-format.patch index 1b7d312..815bd63 100644 --- a/divinemc-server/minecraft-patches/features/0036-Linear-region-file-format.patch +++ b/divinemc-server/minecraft-patches/features/0036-Linear-region-file-format.patch @@ -54,7 +54,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..8713d00d767c9225a0823d2fdbb0b479 + public void moonrise$write(final org.bxteam.divinemc.region.IRegionFile regionFile) throws IOException; // DivineMC - Linear region file format } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 3fe3e36439a750c2614fc94df4bbbe7375c37614..0270e0045a76927e156f7bf54fed7ca406a113f8 100644 +index b2e90749bcaf3b9132681713ab0afae95b3197ee..7de51e99507dfca76ec5848483fecc9e8df1b86f 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -926,10 +926,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop