@@ -30907,7 +30907,7 @@ index 8d98cba3830dc5dfb5cae9a6f5fedfffee0d2cd8..73962e79a0f3d892e3155443a1b84508
30907
30907
30908
30908
public interface NoiseBiomeSource {
30909
30909
diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
30910
- index 91d7d250f7c3de8a71aef26e23c12764b06b322b..0d36b1ac7d54283af71f2494accded11c059dba5 100644
30910
+ index a4eb9a10b6c1351c7341bc031bb9f819e17ff1e5..976de81d65b6494cdad20f4ec5125fceec86f951 100644
30911
30911
--- a/net/minecraft/world/level/block/Block.java
30912
30912
+++ b/net/minecraft/world/level/block/Block.java
30913
30913
@@ -259,7 +259,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -30920,7 +30920,7 @@ index 91d7d250f7c3de8a71aef26e23c12764b06b322b..0d36b1ac7d54283af71f2494accded11
30920
30920
30921
30921
public void animateTick(BlockState state, Level level, BlockPos pos, RandomSource random) {
30922
30922
diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
30923
- index 25e49a24cedfa8ad04245d59fcac3231bcd62103..061d94a35d957ca72a01bae959d38aab59b1a64d 100644
30923
+ index fa816de449a6077c05fee76835a1625f5b2008ac..5473b4006f7e0266ea11a7b05cef78a113c30d97 100644
30924
30924
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
30925
30925
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
30926
30926
@@ -416,7 +416,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -31399,7 +31399,7 @@ index 92350434746f06bbf4a161c6bc42602de7b45220..1c24f38d21da1be9740512981f219924
31399
31399
31400
31400
public Property.Value<T> value(T value) {
31401
31401
diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java
31402
- index 860d1c9729c4ee97ec6f40f7aa969829070b27c0..94de1217d18e1a7a0fb7b83f21436eaf0a5998c6 100644
31402
+ index d63d745a0220963a297cfedf1e8983aeb471a045..6d565b52552534ce9cacfc35ad1bf4adcb69eac3 100644
31403
31403
--- a/net/minecraft/world/level/chunk/ChunkAccess.java
31404
31404
+++ b/net/minecraft/world/level/chunk/ChunkAccess.java
31405
31405
@@ -57,7 +57,7 @@ import net.minecraft.world.ticks.SavedTick;
@@ -31537,8 +31537,8 @@ index 860d1c9729c4ee97ec6f40f7aa969829070b27c0..94de1217d18e1a7a0fb7b83f21436eaf
31537
31537
+ // Paper end - get block chunk optimisation
31538
31538
}
31539
31539
// CraftBukkit start
31540
- public void setBiome(int i , int j , int k , Holder<Biome> biome) {
31541
- @@ -507 ,12 +572 ,12 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
31540
+ public void setBiome(int x , int y , int z , Holder<Biome> biome) {
31541
+ @@ -503 ,12 +568 ,12 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
31542
31542
}
31543
31543
31544
31544
public void initializeLightSources() {
@@ -31554,7 +31554,7 @@ index 860d1c9729c4ee97ec6f40f7aa969829070b27c0..94de1217d18e1a7a0fb7b83f21436eaf
31554
31554
31555
31555
public record PackedTicks(List<SavedTick<Block>> blocks, List<SavedTick<Fluid>> fluids) {
31556
31556
diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
31557
- index 65117a9cb9d1b8684cae8d36ea3b8e2050fb928c..a9d65e28b849c9660a14ef7c16ed17bd5182bd7e 100644
31557
+ index b320519578f7e2c52b2116afb247e071b322696e..6ed51cf42b5864194d671b5b56f5b9bdf0291dc0 100644
31558
31558
--- a/net/minecraft/world/level/chunk/ChunkGenerator.java
31559
31559
+++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
31560
31560
@@ -116,7 +116,7 @@ public abstract class ChunkGenerator {
@@ -31717,7 +31717,7 @@ index e7c0f4da8508fbca467326f475668d66454d7b77..41856c98d97e7eb0782f8e441b9a269a
31717
31717
@Override
31718
31718
public BlockEntity getBlockEntity(BlockPos pos) {
31719
31719
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
31720
- index 96b0342ab7b922aa16d07b6c00542e6cb66c974a..c1ae7755e8d6fa8501d2210dab7605d993c55722 100644
31720
+ index cad71ac79fc52225a192aa5c5d07b13c831fc2c1..761fdcd4a4e18f45547afd8edff44f61c6eeacb4 100644
31721
31721
--- a/net/minecraft/world/level/chunk/LevelChunk.java
31722
31722
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
31723
31723
@@ -52,7 +52,7 @@ import net.minecraft.world.ticks.LevelChunkTicks;
@@ -31896,7 +31896,7 @@ index 96b0342ab7b922aa16d07b6c00542e6cb66c974a..c1ae7755e8d6fa8501d2210dab7605d9
31896
31896
31897
31897
@Nullable
31898
31898
diff --git a/net/minecraft/world/level/chunk/LevelChunkSection.java b/net/minecraft/world/level/chunk/LevelChunkSection.java
31899
- index fc21c3268c4b4fda2933d71f0913db28e3796653..2ff691bcd32f587e8add2d8eda7e7339ccbde6e8 100644
31899
+ index a7fabde0f32f09d7f7bed65576ce469f069a21fa..412e7b1cf8c24f0ddf6d174967bedad576f10aba 100644
31900
31900
--- a/net/minecraft/world/level/chunk/LevelChunkSection.java
31901
31901
+++ b/net/minecraft/world/level/chunk/LevelChunkSection.java
31902
31902
@@ -13,7 +13,7 @@ import net.minecraft.world.level.block.Blocks;
@@ -32627,7 +32627,7 @@ index 7a4d299d2ce36982204e30de9278ddfd5b37c3df..b8348976e80578d9eff64eea68c04c60
32627
32627
private final ChunkStatus status;
32628
32628
@Nullable
32629
32629
diff --git a/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/net/minecraft/world/level/chunk/storage/ChunkStorage.java
32630
- index 80bc7ad9ad076968d06279dedd845d5946cf2501..433feab7f7c1931f79836164a0b8c4a1c3b75ba6 100644
32630
+ index 5ba7f724687401c9ea1756a6491498e03548a257..64343a3f6e6009eed5b392482ec053be8e00ee63 100644
32631
32631
--- a/net/minecraft/world/level/chunk/storage/ChunkStorage.java
32632
32632
+++ b/net/minecraft/world/level/chunk/storage/ChunkStorage.java
32633
32633
@@ -22,20 +22,30 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -32665,7 +32665,7 @@ index 80bc7ad9ad076968d06279dedd845d5946cf2501..433feab7f7c1931f79836164a0b8c4a1
32665
32665
}
32666
32666
32667
32667
// CraftBukkit start
32668
- @@ -99 ,7 +109 ,9 @@ public class ChunkStorage implements AutoCloseable {
32668
+ @@ -66 ,7 +76 ,9 @@ public class ChunkStorage implements AutoCloseable {
32669
32669
chunkData = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.CHUNK, chunkData, version, 1493); // Paper - replace chunk converter
32670
32670
if (chunkData.getCompound("Level").getBoolean("hasLegacyStructureData")) {
32671
32671
LegacyStructureDataHandler legacyStructureHandler = this.getLegacyStructureHandler(levelKey, storage);
@@ -32675,7 +32675,7 @@ index 80bc7ad9ad076968d06279dedd845d5946cf2501..433feab7f7c1931f79836164a0b8c4a1
32675
32675
}
32676
32676
}
32677
32677
32678
- @@ -163 ,7 +175 ,13 @@ public class ChunkStorage implements AutoCloseable {
32678
+ @@ -130 ,7 +142 ,13 @@ public class ChunkStorage implements AutoCloseable {
32679
32679
}
32680
32680
32681
32681
public CompletableFuture<Optional<CompoundTag>> read(ChunkPos chunkPos) {
@@ -32690,7 +32690,7 @@ index 80bc7ad9ad076968d06279dedd845d5946cf2501..433feab7f7c1931f79836164a0b8c4a1
32690
32690
}
32691
32691
32692
32692
public CompletableFuture<Void> write(ChunkPos pos, Supplier<CompoundTag> tagSupplier) {
32693
- @@ -179 ,29 +197 ,54 @@ public class ChunkStorage implements AutoCloseable {
32693
+ @@ -146 ,29 +164 ,54 @@ public class ChunkStorage implements AutoCloseable {
32694
32694
};
32695
32695
// Paper end - guard against possible chunk pos desync
32696
32696
this.handleLegacyStructureIndex(pos);
@@ -32784,7 +32784,7 @@ index 889e188e920edb284f04b264bcdd06146f54a4cb..2199a9e2a0141c646d108f2687a27f1d
32784
32784
private final Long2ObjectLinkedOpenHashMap<CompletableFuture<BitSet>> regionCacheForBlender = new Long2ObjectLinkedOpenHashMap<>();
32785
32785
private static final int REGION_CACHE_SIZE = 1024;
32786
32786
diff --git a/net/minecraft/world/level/chunk/storage/RegionFile.java b/net/minecraft/world/level/chunk/storage/RegionFile.java
32787
- index 783a2d80f6197dd0af0dc81909f0353a8ea2ecf4..7da388ffab162c282cad0f297bb7304f3c2abbaf 100644
32787
+ index 4eb07097986aac67421dd8e6a17cc5436da91187..984db72272d552c7210bd6f437ea88694ddd2828 100644
32788
32788
--- a/net/minecraft/world/level/chunk/storage/RegionFile.java
32789
32789
+++ b/net/minecraft/world/level/chunk/storage/RegionFile.java
32790
32790
@@ -22,7 +22,7 @@ import net.minecraft.util.profiling.jfr.JvmProfiler;
@@ -33324,7 +33324,7 @@ index 7dc1ffffd9d0fec54dbc254c154ee85ee750174d..778bd73a938c94ecb85ca0f8b686ff4e
33324
33324
33325
33325
record PackedChunk<T>(Int2ObjectMap<T> sectionsByY, boolean versionChanged) {
33326
33326
diff --git a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
33327
- index cf6e2053d81f7b0f8c8e58b9c0fad3285ebc047d..70a9972252576e039ac126f6057a6ed66b80cdfc 100644
33327
+ index 3b55e7fb27d680204b8621666ae9200870def3eb..879d411775a2fece1d8a970300cb3a550baa6305 100644
33328
33328
--- a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
33329
33329
+++ b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
33330
33330
@@ -148,7 +148,7 @@ public record SerializableChunkData(
@@ -33700,10 +33700,10 @@ index 342c83309b19c64d86e0dd97c1756c96be52772b..423779a2b690f387a4f0bd07b97b50e0
33700
33700
}
33701
33701
}
33702
33702
diff --git a/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
33703
- index 29d9f6e54421c539e9e55ab9f51b4c872da3fbb8..d77016287f5f9a0964d56f05d2d5256ef2e6e86c 100644
33703
+ index 6d61739574155f89511b9adcaf1174841bdc7da7..65728ef17e63d71833677fdcbd5bb90794b4822b 100644
33704
33704
--- a/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
33705
33705
+++ b/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
33706
- @@ -78 ,7 +78 ,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
33706
+ @@ -77 ,7 +77 ,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
33707
33707
return CompletableFuture.supplyAsync(() -> {
33708
33708
this.doCreateBiomes(blender, randomState, structureManager, chunk);
33709
33709
return chunk;
@@ -33712,7 +33712,7 @@ index 29d9f6e54421c539e9e55ab9f51b4c872da3fbb8..d77016287f5f9a0964d56f05d2d5256e
33712
33712
}
33713
33713
33714
33714
private void doCreateBiomes(Blender blender, RandomState random, StructureManager structureManager, ChunkAccess chunk) {
33715
- @@ -318 ,7 +318 ,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
33715
+ @@ -317 ,7 +317 ,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
33716
33716
}
33717
33717
33718
33718
return var20;
@@ -34002,7 +34002,7 @@ index ca23af013967b50420ebee178878ea79333de53b..d41b9266625ca6c5e32c5126f35a1f77
34002
34002
34003
34003
public int getLightSectionCount() {
34004
34004
diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
34005
- index 130ef38a50f1df1faa26b433b0c605a4507f71af..f6daca279788c3d983a9ee213df85d5d93fc6eed 100644
34005
+ index 86fd2b831f42bdb5bd045e44b26489d5a8697dd9..e30499bdcd6600e5c9d4a755c1182fb6dff3735f 100644
34006
34006
--- a/net/minecraft/world/level/material/FlowingFluid.java
34007
34007
+++ b/net/minecraft/world/level/material/FlowingFluid.java
34008
34008
@@ -45,6 +45,48 @@ public abstract class FlowingFluid extends Fluid {
0 commit comments