From 59d350d50fc006e2f9e47b177118430a0f864cad Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 26 May 2025 15:14:38 +0800 Subject: [PATCH] Move packages --- build.gradle.kts | 2 +- .../features/0071-Reduce-worldgen-allocations.patch | 6 +++--- ...Rail-Optimization-optimized-PoweredRailBlock-logic.patch | 4 ++-- .../leaf/{util => world}/biome/PositionalBiomeGetter.java | 2 +- .../{optimize => world/block}/OptimizedPoweredRails.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename leaf-server/src/main/java/org/dreeam/leaf/{util => world}/biome/PositionalBiomeGetter.java (96%) rename leaf-server/src/main/java/org/dreeam/leaf/{optimize => world/block}/OptimizedPoweredRails.java (99%) diff --git a/build.gradle.kts b/build.gradle.kts index b49ba44d..e9187fca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,7 @@ subprojects { options.release = 21 options.isFork = true options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal")) - options.forkOptions.memoryMaximumSize = "6g" // Prevent OOM during building + options.forkOptions.memoryMaximumSize = "2g" // Prevent OOM during building } tasks.withType { options.encoding = Charsets.UTF_8.name() diff --git a/leaf-server/minecraft-patches/features/0071-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0071-Reduce-worldgen-allocations.patch index d741c54a..cee918c6 100644 --- a/leaf-server/minecraft-patches/features/0071-Reduce-worldgen-allocations.patch +++ b/leaf-server/minecraft-patches/features/0071-Reduce-worldgen-allocations.patch @@ -34,7 +34,7 @@ index f861f9e087182470a3bbb22678dbdacb8a73e943..a3d0d17178eedfaef83e2e0df6b1c2d7 private DensityFunction wrapNew(DensityFunction densityFunction) { diff --git a/net/minecraft/world/level/levelgen/SurfaceRules.java b/net/minecraft/world/level/levelgen/SurfaceRules.java -index 0948c8db90605a15a043b5c5bc74edecd7f9db1b..009e8a270c25614d03413d8b8b1f39c2da8ba12f 100644 +index 0948c8db90605a15a043b5c5bc74edecd7f9db1b..6cba88415a4715527e163e54662db9b3ab37c747 100644 --- a/net/minecraft/world/level/levelgen/SurfaceRules.java +++ b/net/minecraft/world/level/levelgen/SurfaceRules.java @@ -313,8 +313,15 @@ public class SurfaceRules { @@ -48,9 +48,9 @@ index 0948c8db90605a15a043b5c5bc74edecd7f9db1b..009e8a270c25614d03413d8b8b1f39c2 + ++this.lastUpdateY; + Supplier> getter = this.biome; + if (getter == null) { -+ this.biome = getter = new org.dreeam.leaf.util.biome.PositionalBiomeGetter(this.biomeGetter, this.pos); ++ this.biome = getter = new org.dreeam.leaf.world.biome.PositionalBiomeGetter(this.biomeGetter, this.pos); + } -+ ((org.dreeam.leaf.util.biome.PositionalBiomeGetter) getter).update(blockX, blockY, blockZ); ++ ((org.dreeam.leaf.world.biome.PositionalBiomeGetter) getter).update(blockX, blockY, blockZ); + // Leaf end - Reduce worldgen allocations this.blockY = blockY; this.waterHeight = waterHeight; diff --git a/leaf-server/minecraft-patches/features/0183-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0183-Rail-Optimization-optimized-PoweredRailBlock-logic.patch index 086df508..824cfd93 100644 --- a/leaf-server/minecraft-patches/features/0183-Rail-Optimization-optimized-PoweredRailBlock-logic.patch +++ b/leaf-server/minecraft-patches/features/0183-Rail-Optimization-optimized-PoweredRailBlock-logic.patch @@ -12,7 +12,7 @@ powered rail logic from a single rail instead of each block iterating separately expensive but also completely unnecessary and with a lot of massive overhead diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java -index e6674c37e09fe0ad2e971bd957666929492ba57e..c93a7d166ac97bac981d906c6894606237107fe8 100644 +index e6674c37e09fe0ad2e971bd957666929492ba57e..653551f87f7c6dc20189ead09dcc81661afca2d8 100644 --- a/net/minecraft/world/level/block/PoweredRailBlock.java +++ b/net/minecraft/world/level/block/PoweredRailBlock.java @@ -128,6 +128,12 @@ public class PoweredRailBlock extends BaseRailBlock { @@ -21,7 +21,7 @@ index e6674c37e09fe0ad2e971bd957666929492ba57e..c93a7d166ac97bac981d906c68946062 protected void updateState(BlockState state, Level level, BlockPos pos, Block block) { + // Leaf start - Rail Optimization + if (org.dreeam.leaf.config.modules.opt.OptimizedPoweredRails.enabled) { -+ org.dreeam.leaf.optimize.OptimizedPoweredRails.updateState(this, state, level, pos); ++ org.dreeam.leaf.world.block.OptimizedPoweredRails.updateState(this, state, level, pos); + return; + } + // Leaf end - Rail Optimization diff --git a/leaf-server/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java b/leaf-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java similarity index 96% rename from leaf-server/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java rename to leaf-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java index 042dde39..a47e7348 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/util/biome/PositionalBiomeGetter.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java @@ -1,4 +1,4 @@ -package org.dreeam.leaf.util.biome; +package org.dreeam.leaf.world.biome; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; diff --git a/leaf-server/src/main/java/org/dreeam/leaf/optimize/OptimizedPoweredRails.java b/leaf-server/src/main/java/org/dreeam/leaf/world/block/OptimizedPoweredRails.java similarity index 99% rename from leaf-server/src/main/java/org/dreeam/leaf/optimize/OptimizedPoweredRails.java rename to leaf-server/src/main/java/org/dreeam/leaf/world/block/OptimizedPoweredRails.java index 87b9a745..f888ff94 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/optimize/OptimizedPoweredRails.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/world/block/OptimizedPoweredRails.java @@ -1,4 +1,4 @@ -package org.dreeam.leaf.optimize; +package org.dreeam.leaf.world.block; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction;