mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-30 20:39:21 +00:00
* Init 1.21.6
* Finish API patches
* Apply purpur patches & all paper server patches
* Apply some
* Apply all
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@6aafe29e 1.21.6 dev
PaperMC/Paper@ae7c74ec tweak mob goal keys, generate missing api
PaperMC/Paper@9ea1460b Revert "fix sponge-absorb deleting chest content (#12647)"
Purpur Changes:
PurpurMC/Purpur@eb0ba67d Updated Upstream (Paper)
PurpurMC/Purpur@7c6502dc Updated Upstream (Paper)
PurpurMC/Purpur@aa289e2c Updated Upstream (Paper)
PurpurMC/Purpur@b1d412fb Updated Upstream (Paper)
PurpurMC/Purpur@293e28a0 use empty registryaccess where context is not needed, closes #1676
PurpurMC/Purpur@452bb319 port PaperMC/Paper#12654, closes #1665
PurpurMC/Purpur@849bc79c register test subcommands used for debugging, closes #1675
* Fix build & diff
* Update vanilla attribute size
* [ci/skip] Forget to remove this
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a24f9b20 1.21.6 dev
PaperMC/Paper@457a0a69 Bump version string and protocol version to 1.21.6 release
PaperMC/Paper@245b5473 Update base to 1.21.6
PaperMC/Paper@b28d77b3 Update Moonrise to 1.21.6
PaperMC/Paper@8318dcb7 Update DataConverter to 1.21.6-rc1
Purpur Changes:
PurpurMC/Purpur@b228e316 Updated Upstream (Paper)
PurpurMC/Purpur@d6562a57 make happy ghast takes-damage-from-water and always-drop-exp options work
PurpurMC/Purpur@08d989b6 inline import
PurpurMC/Purpur@61d7f559 Updated Upstream (Paper)
PurpurMC/Purpur@469a4de5 Merge branch 'ver/1.21.5' into ver/1.21.6
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@d2b1158e Set correct world access on BSL snapshots
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@023e6c29 Ensure waypoints are per world
PaperMC/Paper@40d5d31c Fix recursively converting JSON Text Components
* Update spigot mapping to remap reobf mapping to mojamp for plugins
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@1fcc4162 Implement FeatureHooks#isChunkSent for Moonrise chunk system
PaperMC/Paper@e4d7178a Implement WaypointTransmitter#isChunkVisible
PaperMC/Paper@8980ead7 Directly walk text component after converting from JSON
PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository
PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689)
PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691)
PaperMC/Paper@4781d28b Re-add Log4j Javadocs (#12693)
PaperMC/Paper@74fbcce5 Check type of Material in get/set stats (#12607)
PaperMC/Paper@4b3f967e Improve Fix MC-44654 (#12703)
PaperMC/Paper@a7dd2635 Enable spigot obfuscation support (#12695)
PaperMC/Paper@6a51c44e Cleanup Primed TNT Fix (#12704)
PaperMC/Paper@839c6a18 Fix #11169 (#12706)
PaperMC/Paper@c77d5f99 Fix MC-297591
PaperMC/Paper@219f86ee Implement chunk unload delay config option
PaperMC/Paper@e4eb69b8 Do not allow ticket level decreases to be processed asynchronously
PaperMC/Paper@71b0c768 Adds support for vanilla negative explosions (#12705)
PaperMC/Paper@3750927a [ci/skip] Fix PermissionManager#clearPermissions() docs bad wording (#12657)
PaperMC/Paper@d61a51e8 Add ItemType#getBurnDuration() (#12604)
PaperMC/Paper@29fc8532 Allow empty paths in namespaced keys (#12687)
PaperMC/Paper@4419afb9 fix: Safely handle nanosecond overflow in ClickCallback (#12686)
PaperMC/Paper@56528821 Add `isProxyEnabled` method to ServerConfiguration (#12664)
PaperMC/Paper@c0dda0ea Add `isForceDefaultGameMode` method (#12673)
PaperMC/Paper@e714de63 Fix excess slot updates
PaperMC/Paper@6d0821d2 [ci/skip] Fix docs for Spawner class and cleanup (#12710)
PaperMC/Paper@cceffe3d Release ItemType and BlockType (#12708)
PaperMC/Paper@186e9e33 Relocate CommandMap#registerServerAliases() call to after lifecycle events have been run (#12601)
PaperMC/Paper@5edcf6dd Cleanup/command dispatching (#12713)
Purpur Changes:
PurpurMC/Purpur@baa196f5 Updated Upstream (Paper)
PurpurMC/Purpur@fdd1e980 Updated Upstream (Paper)
PurpurMC/Purpur@439f15db Updated Upstream (Paper)
PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
PurpurMC/Purpur@162bd288 Updated Upstream (Paper)
PurpurMC/Purpur@afcdf9bb Updated Upstream (Paper)
* fix random tick order
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
* update optimize random tick
* fix mob spawning over limit
* optimize mob spawning
* fix FastBitRadixSort memory leak
* optimize brain collections
* [ci/skip] update comments
* Revert "fix FastBitRadixSort memory leak"
This reverts commit bdea683525.
* optimize brain collections
* fix async mob spawning data race
* [ci/skip] cleanup
* remove hash lookup in optimize random tick
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@803baf0b Support hidden entities in Waypoints (#12715)
PaperMC/Paper@1814d8b4 build: publish to fill (#12717)
PaperMC/Paper@e454fef4 Add support for private constructors in plugin main classes (#12652)
PaperMC/Paper@d0e808f4 Move player to correct position in vehicle move packet handler
PaperMC/Paper@46b4b0b8 Improve keepalive ping system
PaperMC/Paper@38c1ddb5 Add and use FeatureHooks.getAllEntities
PaperMC/Paper@2f083acb Ensure player entity schedulers are ticked when they are dead
PaperMC/Paper@7c90c7c4 Optimise EntityScheduler ticking
PaperMC/Paper@aa6ee44a Re-add global region scheduler tick erroneously removed in last commit
PaperMC/Paper@d7510efc Fix #12722 (#12726)
PaperMC/Paper@0caf75f8 Fix #12721 (#12725)
PaperMC/Paper@bee28792 Adventure 4.23.0 (#12690)
PaperMC/Paper@692e93a9 Fix MC-299110
PaperMC/Paper@ea10fa4a Don't mutate the position of Items for MC-4 Fix (#12702)
PaperMC/Paper@aa6cd74c Remove unnecesary item check for ServerboundPlayerActionPacket RELEASE_USE_ITEM (#12668)
PaperMC/Paper@c9e89f49 Expose arrow velocity in EntityShootBowEvent for mobs (#12688)
PaperMC/Paper@7ec3174a Jump out of experimental phase
PaperMC/Paper@4e1a2555 Update try catch for command handling
PaperMC/Paper@e382e687 Fix 0 yield on explosion events
PaperMC/Paper@35b2c6ec Use dropped item for stats info (#12747)
PaperMC/Paper@bd79e20c [ci/skip] PluginManager#getPlugin and PluginManager#isPluginEnabled are case-insensitive (#12723)
Purpur Changes:
PurpurMC/Purpur@4a5974cf Updated Upstream (Paper)
PurpurMC/Purpur@3893bba0 this is important...
PurpurMC/Purpur@47e758fb Updated Upstream (Paper)
* Update PWT patch
* cleanup
* fix playermobcaps command
* fix Didn't fill chunk buffer in async chunk sending
* cleanup
* fix HurtByTargetGoal npe
* optimize collectSpawningChunks (#382)
* optimize collectSpawningChunks
* add bit set
* cleanup
* cleanup
* cleanup
* cleanup
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@57c202e0 Allow adventure nbt codec to parse all tags
Purpur Changes:
PurpurMC/Purpur@a4776d7b Updated Upstream (Paper)
PurpurMC/Purpur@dfd8a7ad Fix phantom going at high speed when ridden (#1680)
* Fix diff
---------
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
Co-authored-by: hayanesuru <hayanesuru@outlook.jp>
174 lines
8.0 KiB
Diff
174 lines
8.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Wed, 19 Mar 2025 18:41:56 +0100
|
|
Subject: [PATCH] Use BFS on getSlopeDistance
|
|
|
|
Uses Breadth First Search (BFS) to optimize getSlopeDistance
|
|
Paper: ~75ms
|
|
Leaf: ~48ms (-36%)
|
|
This should help drastically on the farms that use actively changing fluids.
|
|
|
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
index 1b0bd86212e7ff0b8a80a524250b69bd68a9c685..d3b711d4aa5c54c05310a2089a8c371fc2c2acdf 100644
|
|
--- a/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1449,6 +1449,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
this.emptyTime = 0;
|
|
}
|
|
|
|
+ // Leaf start - Use BFS on getSlopeDistance
|
|
+ public it.unimi.dsi.fastutil.longs.LongSet slopeDistanceCacheVisited = new it.unimi.dsi.fastutil.longs.LongOpenHashSet(512);
|
|
+ public net.minecraft.world.level.material.FlowingFluid.SlopeDistanceNodeDeque slopeDistanceCacheQueue = new net.minecraft.world.level.material.FlowingFluid.SlopeDistanceNodeDeque();
|
|
+ // Leaf end - Use BFS on getSlopeDistance
|
|
private void tickFluid(BlockPos pos, Fluid fluid) {
|
|
BlockState blockState = this.getBlockState(pos);
|
|
FluidState fluidState = blockState.getFluidState();
|
|
diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
|
|
index 4625bd55e1cb01dfb9921dcd033f05b4a8f9ad74..a1c6a30c1e446955b409d1f00c602db06c1e9813 100644
|
|
--- a/net/minecraft/world/level/material/FlowingFluid.java
|
|
+++ b/net/minecraft/world/level/material/FlowingFluid.java
|
|
@@ -342,32 +342,124 @@ public abstract class FlowingFluid extends Fluid {
|
|
|
|
protected abstract void beforeDestroyingBlock(LevelAccessor level, BlockPos pos, BlockState state);
|
|
|
|
- protected int getSlopeDistance(LevelReader level, BlockPos pos, int depth, Direction direction, BlockState state, FlowingFluid.SpreadContext spreadContext) {
|
|
- int i = 1000;
|
|
+ // Leaf start - Use BFS on getSlopeDistance
|
|
+ protected int getSlopeDistance(LevelReader level, BlockPos startPos, int initialDepth, Direction excludedDirection, BlockState startState, FlowingFluid.SpreadContext spreadContext) {
|
|
+ it.unimi.dsi.fastutil.longs.LongSet visited = ((ServerLevel) level).slopeDistanceCacheVisited;
|
|
+ SlopeDistanceNodeDeque queue = ((ServerLevel) level).slopeDistanceCacheQueue;
|
|
+ visited.clear();
|
|
+ queue.clear();
|
|
+
|
|
+ for (Direction dir : Direction.Plane.HORIZONTAL) {
|
|
+ if (dir == excludedDirection) continue;
|
|
+
|
|
+ BlockPos neighborPos = startPos.relative(dir); // immutable
|
|
+ BlockState neighborState = spreadContext.getBlockStateIfLoaded(neighborPos);
|
|
+ if (neighborState == null) continue;
|
|
+
|
|
+ // Check if the fluid can actually pass through to this first neighbor before adding
|
|
+ FluidState neighborFluidState = neighborState.getFluidState();
|
|
+ if (!this.canPassThrough(level, this.getFlowing(), startPos, startState, dir, neighborPos, neighborState, neighborFluidState)) {
|
|
+ continue;
|
|
+ }
|
|
+ long visitKey = encodeSlopeNode(neighborPos, dir.getOpposite());
|
|
+ if (visited.add(visitKey)) {
|
|
+ queue.add(new FlowingFluid.SlopeDistanceNode(neighborPos, initialDepth, dir.getOpposite(), neighborState));
|
|
+ }
|
|
+ }
|
|
|
|
- for (Direction direction1 : Direction.Plane.HORIZONTAL) {
|
|
- if (direction1 != direction) {
|
|
- BlockPos blockPos = pos.relative(direction1);
|
|
- BlockState blockState = spreadContext.getBlockStateIfLoaded(blockPos); // Paper - Prevent chunk loading from fluid flowing
|
|
- if (blockState == null) continue; // Paper - Prevent chunk loading from fluid flowing
|
|
- FluidState fluidState = blockState.getFluidState();
|
|
- if (this.canPassThrough(level, this.getFlowing(), pos, state, direction1, blockPos, blockState, fluidState)) {
|
|
- if (spreadContext.isHole(blockPos)) {
|
|
- return depth;
|
|
- }
|
|
+ int slopeFindDistance = this.getSlopeFindDistance(level);
|
|
+ int minDistance = 1000;
|
|
|
|
- if (depth < this.getSlopeFindDistance(level)) {
|
|
- int slopeDistance = this.getSlopeDistance(level, blockPos, depth + 1, direction1.getOpposite(), blockState, spreadContext);
|
|
- if (slopeDistance < i) {
|
|
- i = slopeDistance;
|
|
- }
|
|
- }
|
|
+ // Process the queue
|
|
+ while (!queue.isEmpty()) {
|
|
+ FlowingFluid.SlopeDistanceNode current = queue.poll();
|
|
+ if (spreadContext.isHole(current.pos)) {
|
|
+ return current.depth;
|
|
+ }
|
|
+
|
|
+ if (current.depth >= slopeFindDistance) continue;
|
|
+
|
|
+ for (Direction dir : Direction.Plane.HORIZONTAL) {
|
|
+ if (dir == current.excludedDir) continue;
|
|
+
|
|
+ BlockPos nextPos = current.pos.relative(dir); // immutable
|
|
+ BlockState nextState = spreadContext.getBlockStateIfLoaded(nextPos);
|
|
+ if (nextState == null) continue;
|
|
+
|
|
+ FluidState nextFluidState = nextState.getFluidState();
|
|
+ if (!this.canPassThrough(level, this.getFlowing(), current.pos, current.state, dir, nextPos, nextState, nextFluidState)) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ long visitKey = encodeSlopeNode(nextPos, dir.getOpposite());
|
|
+ if (visited.add(visitKey)) {
|
|
+ queue.add(new FlowingFluid.SlopeDistanceNode(nextPos, current.depth + 1, dir.getOpposite(), nextState));
|
|
}
|
|
}
|
|
}
|
|
|
|
- return i;
|
|
+ return minDistance;
|
|
+ }
|
|
+
|
|
+ private static long encodeSlopeNode(BlockPos pos, Direction excludedDir) {
|
|
+ return ((long) pos.getX() & 0xFFFFFFFFL) << 32 | ((long) pos.getZ() & 0xFFFFFFFFL) << 4 | (excludedDir.ordinal() & 0x0F);
|
|
+ }
|
|
+
|
|
+ public static class SlopeDistanceNodeDeque {
|
|
+ private SlopeDistanceNode[] array;
|
|
+ private int length;
|
|
+ private int start;
|
|
+ private int end;
|
|
+
|
|
+ public SlopeDistanceNodeDeque() {
|
|
+ array = new SlopeDistanceNode[256];
|
|
+ length = array.length;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ private int size() {
|
|
+ int apparent = end - start;
|
|
+ return apparent >= 0 ? apparent : length + apparent;
|
|
+ }
|
|
+ */
|
|
+
|
|
+ private void clear() {
|
|
+ start = 0;
|
|
+ end = 0;
|
|
+ }
|
|
+
|
|
+ private boolean isEmpty() {
|
|
+ return end == start || (end <= start && length == start - end);
|
|
+ }
|
|
+
|
|
+ private SlopeDistanceNode poll() {
|
|
+ final SlopeDistanceNode t = array[start];
|
|
+ if (++start == length) start = 0;
|
|
+ return t;
|
|
+ }
|
|
+
|
|
+ private void add(final SlopeDistanceNode node) {
|
|
+ array[end++] = node;
|
|
+ if (end == length) end = 0;
|
|
+ if (end == start) resize(length, 2 * length);
|
|
+ }
|
|
+
|
|
+ private void resize(final int size, final int newLength) {
|
|
+ final SlopeDistanceNode[] newArray = new SlopeDistanceNode[newLength];
|
|
+ if (size != 0) {
|
|
+ System.arraycopy(array, start, newArray, 0, length - start);
|
|
+ System.arraycopy(array, 0, newArray, length - start, end);
|
|
+ }
|
|
+ start = 0;
|
|
+ end = size;
|
|
+ array = newArray;
|
|
+ length = newLength;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private record SlopeDistanceNode(BlockPos pos, int depth, Direction excludedDir, BlockState state) {
|
|
}
|
|
+ // Leaf end - Use BFS on getSlopeDistance
|
|
|
|
boolean isWaterHole(BlockGetter level, BlockPos pos, BlockState state, BlockPos belowPos, BlockState belowState) {
|
|
return canPassThroughWall(Direction.DOWN, level, pos, state, belowPos, belowState)
|