mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
82 lines
4.5 KiB
Diff
82 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: hayanesuru <hayanesuru@outlook.jp>
|
|
Date: Fri, 6 Jun 2025 20:46:10 +0900
|
|
Subject: [PATCH] optimize random tick
|
|
|
|
|
|
diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
|
|
index 15bbd1f7f2a90b4b5427026d622764bb1c92d465..0682e8b1708ed39e97b53548301c353ca8c42ce5 100644
|
|
--- a/net/minecraft/server/level/ServerChunkCache.java
|
|
+++ b/net/minecraft/server/level/ServerChunkCache.java
|
|
@@ -693,6 +693,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
|
|
this.level.tickChunk(levelChunk, _int);
|
|
}
|
|
}
|
|
+ this.level.randomTickSystem.tick(this.level); // Leaf - random tick
|
|
|
|
if (flagAndHasNaturalSpawn) { // Gale - MultiPaper - skip unnecessary mob spawning computations
|
|
this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
|
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
index eb849c57992658005e0f514c6f7923f8ca43bebf..9f0313038693a1e571beba0c8ca027c29789a1ce 100644
|
|
--- a/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1128,6 +1128,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
|
|
private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.simpleRandom.nextInt(16); } // Gale - Airplane - optimize random calls in chunk ticking
|
|
|
|
+ public org.dreeam.leaf.world.RandomTickSystem randomTickSystem = new org.dreeam.leaf.world.RandomTickSystem(); // Leaf
|
|
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
|
|
final net.minecraft.world.level.levelgen.BitRandomSource simpleRandom = this.simpleRandom; // Paper - optimise random ticking // Leaf - Faster random generator - upcasting
|
|
ChunkPos pos = chunk.getPos();
|
|
@@ -1177,7 +1178,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
} // Paper - Option to disable ice and snow
|
|
|
|
if (randomTickSpeed > 0) {
|
|
- this.optimiseRandomTick(chunk, randomTickSpeed); // Paper - optimise random ticking
|
|
+ if (org.dreeam.leaf.config.modules.opt.OptimizeRandomTick.enabled) randomTickSystem.tickChunk(this.simpleRandom, chunk, randomTickSpeed); // Leaf - random tick
|
|
+ else this.optimiseRandomTick(chunk, randomTickSpeed); // Paper - optimise random ticking // Leaf - random tick
|
|
}
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
|
|
index a90bf0d80ae4dac9b19b8e467b402917cc19a271..6c74fcb364b9239131e7b5578af237ec783a221a 100644
|
|
--- a/net/minecraft/world/level/chunk/LevelChunk.java
|
|
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
|
|
@@ -149,6 +149,36 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
|
|
}
|
|
// Gale end - Airplane - optimize random calls in chunk ticking - instead of using a random every time the chunk is ticked, define when lightning strikes preemptively
|
|
|
|
+ // Leaf start - random tick
|
|
+ private int leaf$countTickingBlocks;
|
|
+ public final int leaf$lastTickingBlocksCount() {
|
|
+ return leaf$countTickingBlocks;
|
|
+ }
|
|
+ public final int leaf$tickingBlocksCount() {
|
|
+ int sum = 0;
|
|
+ for (LevelChunkSection section : sections) {
|
|
+ sum += section.moonrise$getTickingBlockList().size();
|
|
+ }
|
|
+ leaf$countTickingBlocks = sum;
|
|
+ return sum;
|
|
+ }
|
|
+ public final java.util.OptionalLong leaf$getTickingPos(int idx) {
|
|
+ for (int i = 0; i < sections.length; i++) {
|
|
+ LevelChunkSection section = sections[i];
|
|
+ var l = section.moonrise$getTickingBlockList();
|
|
+ int size = l.size();
|
|
+ if (idx < size) {
|
|
+ short loc = l.getRaw(idx);
|
|
+ int x = (loc & 15) | (chunkPos.x << 4);
|
|
+ int y = (loc >>> 8) | ((getMinSectionY() + i) << 4);
|
|
+ int z = ((loc >>> 4) & 15) | (chunkPos.z << 4);
|
|
+ return java.util.OptionalLong.of(BlockPos.asLong(x, y, z));
|
|
+ }
|
|
+ idx -= size;
|
|
+ }
|
|
+ return java.util.OptionalLong.empty();
|
|
+ }
|
|
+ // Leaf end - random tick
|
|
public LevelChunk(Level level, ChunkPos pos) {
|
|
this(level, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, null, null, null);
|
|
}
|