Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-23 17:09:29 +00:00
Code Issues Releases Activity

cleanup

Browse Source
This commit is contained in:
hayanesuru
2025-06-27 23:06:35 +09:00
parent 57143fa03b
commit 915ac01cd3
2 changed files with 47 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
leaf-server/minecraft-patches/features/0269-optimize-random-tick.patch
View File

@@ -24,7 +24,7 @@ index 1c23d82a2034bc4ae61ee9bc6c74b39940d4fc2b..57f45e571b92ff0b4499a97da33c8be7
this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies); this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
} }
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 27da552e2542153a58d6177f592cf30d858c41a9..35fb0770eb385e3837cb29711905c41b899bac8f 100644 index fc61a7083232148397a0b330ce2a4d70ba38543d..d34a7cfa3b923d59ade35ce4c43cfd3f1477e057 100644
--- a/net/minecraft/server/level/ServerLevel.java --- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java
@@ -1114,6 +1114,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -1114,6 +1114,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -36,22 +36,21 @@ index 27da552e2542153a58d6177f592cf30d858c41a9..35fb0770eb385e3837cb29711905c41b
final net.minecraft.world.level.levelgen.BitRandomSource simpleRandom = this.simpleRandom; // Paper - optimise random ticking // Leaf - Faster random generator - upcasting final net.minecraft.world.level.levelgen.BitRandomSource simpleRandom = this.simpleRandom; // Paper - optimise random ticking // Leaf - Faster random generator - upcasting
ChunkPos pos = chunk.getPos(); ChunkPos pos = chunk.getPos();
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
index a3674ddb883eecb255279375a5e2eece7e016c0f..963a882af639f1f69698bafad1d70eda6d22b846 100644 index a3674ddb883eecb255279375a5e2eece7e016c0f..c3ecdd80efad340c9fa0ea6913db9a3362b53ad4 100644
--- a/net/minecraft/world/level/chunk/LevelChunk.java --- a/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/net/minecraft/world/level/chunk/LevelChunk.java +++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -152,6 +152,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p @@ -152,6 +152,10 @@ 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 // 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 - optimize random tick + // Leaf start - optimize random tick
+ public boolean leaf$tickingBlocksDirty = true; + public boolean leaf$tickingBlocksDirty = true;
+ public short[] leaf$tickingBlocksCount = {}; + public int[] leaf$tickingCount = {};
+ public short[] leaf$tickingIdx = {};
+ // Leaf end - optimize random tick + // Leaf end - optimize random tick
public LevelChunk(Level level, ChunkPos pos) { public LevelChunk(Level level, ChunkPos pos) {
this(level, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, null, null, null); this(level, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, null, null, null);
} }
@@ -416,6 +421,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p @@ -416,6 +420,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
if (blockState == state) { if (blockState == state) {
return null; return null;
} else { } else {

98
leaf-server/src/main/java/org/dreeam/leaf/world/RandomTickSystem.java
View File

@@ -2,9 +2,7 @@ package org.dreeam.leaf.world;
import ca.spottedleaf.moonrise.common.list.ReferenceList; import ca.spottedleaf.moonrise.common.list.ReferenceList;
import ca.spottedleaf.moonrise.common.list.ShortList; import ca.spottedleaf.moonrise.common.list.ShortList;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.shorts.ShortArrayList;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ChunkPos;
@@ -22,16 +20,14 @@ public final class RandomTickSystem {
private static final int BITS_STEP = 2; private static final int BITS_STEP = 2;
private static final int BITS_MAX = 60; private static final int BITS_MAX = 60;
private final IntArrayList queue = new IntArrayList(); private final LongArrayList queue = new LongArrayList();
private final ShortArrayList yList = new ShortArrayList(); private final LongArrayList samples = new LongArrayList();
private final IntArrayList xzList = new IntArrayList(); private final LongArrayList weights = new LongArrayList();
private final LongArrayList weightList = new LongArrayList();
public void tick(ServerLevel world) { public void tick(ServerLevel world) {
queue.clear(); queue.clear();
yList.clear(); samples.clear();
xzList.clear(); weights.clear();
weightList.clear();
final BitRandomSource random = world.simpleRandom; final BitRandomSource random = world.simpleRandom;
final ReferenceList<LevelChunk> entityTickingChunks = world.moonrise$getEntityTickingChunks(); final ReferenceList<LevelChunk> entityTickingChunks = world.moonrise$getEntityTickingChunks();
@@ -46,48 +42,42 @@ public final class RandomTickSystem {
iceSnow(world, size, randomTickSpeed, random, raw); iceSnow(world, size, randomTickSpeed, random, raw);
} }
final long weightsSum = collectTickingChunks(size, random, raw, randomTickSpeed); final long weightsSum = collectTickingChunks(size, random, raw, randomTickSpeed);
if (weightList.isEmpty() || yList.isEmpty() || weightsSum == 0L) { if (samples.isEmpty() || weightsSum == 0L) {
return; return;
} }
sampling(random, weightsSum); sampling(random, weightsSum);
final int[] q = queue.elements(); final long[] q = queue.elements();
final int qs = queue.size(); final int minY = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(world) << 4;
final short[] yl = yList.elements(); for (int k = 0, len = queue.size(); k < len; ++k) {
final int[] xzl = xzList.elements(); final long packed = q[k];
final int minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(world); final LevelChunk chunk = raw[(int) (packed >>> 16)];
for (int k = 0; k < qs; k++) { tickBlock(world, chunk, (int) (packed & 0xFFFF), random, minY);
final int index = q[k];
final LevelChunk a = raw[xzl[index]];
if (a != null) {
tickBlock(world, a, yl[index], random, minSection);
}
} }
} }
private void sampling(BitRandomSource random, long weightsSum) { private void sampling(BitRandomSource random, long weightsSum) {
final long chosen; final long chosen = ((weightsSum % SCALE) >= boundedNextLong(random, SCALE))
if (((weightsSum % SCALE) >= boundedNextLong(random, SCALE))) { ? (weightsSum / SCALE + 1L)
chosen = weightsSum / SCALE + 1L; : (weightsSum / SCALE);
} else {
chosen = weightsSum / SCALE;
}
if (chosen == 0L) { if (chosen == 0L) {
return; return;
} }
final long[] weightsRaw = weightList.elements(); final long[] w = weights.elements();
long accumulated = weightsRaw[0]; final long[] s = samples.elements();
long accumulated = w[0];
final long spoke = weightsSum / chosen; final long spoke = weightsSum / chosen;
if (spoke == 0L) return; if (spoke == 0L) return;
long current = boundedNextLong(random, spoke); long current = boundedNextLong(random, spoke);
int i = 0; int i = 0;
while (current < weightsSum) { while (current < weightsSum) {
while (accumulated < current) { while (accumulated < current) {
i++; i++;
accumulated += weightsRaw[i]; accumulated += w[i];
} }
queue.add(i); queue.add(s[i]);
current += spoke; current += spoke;
} }
} }
@@ -111,13 +101,13 @@ public final class RandomTickSystem {
if (chunk.leaf$tickingBlocksDirty) { if (chunk.leaf$tickingBlocksDirty) {
populateChunkTickingCount(chunk); populateChunkTickingCount(chunk);
} }
short[] count = chunk.leaf$tickingBlocksCount; int[] data = chunk.leaf$tickingCount;
short[] idx = chunk.leaf$tickingIdx; for (int packed : data) {
for (int j = 0; j < count.length; j++) { int count = packed >>> 16;
long weight = (randomTickSpeed * ((long) count[j]) * SCALE) / CHUNK_BLOCKS; int idx = packed & 0xFFFF;
yList.add(idx[j]); samples.add((((long) i) << 16 | idx));
xzList.add(i); long weight = (randomTickSpeed * count * SCALE) / CHUNK_BLOCKS;
weightList.add(weight); weights.add(weight);
weightsSum += weight; weightsSum += weight;
} }
} }
@@ -130,20 +120,18 @@ public final class RandomTickSystem {
for (LevelChunkSection section : chunk.getSections()) { for (LevelChunkSection section : chunk.getSections()) {
sum += (section.moonrise$getTickingBlockList().size() == 0) ? 0 : 1; sum += (section.moonrise$getTickingBlockList().size() == 0) ? 0 : 1;
} }
if (chunk.leaf$tickingBlocksCount.length != sum) {
chunk.leaf$tickingBlocksCount = new short[sum]; if (chunk.leaf$tickingCount.length != sum) {
chunk.leaf$tickingIdx = new short[sum]; chunk.leaf$tickingCount = new int[sum];
} }
short[] count = chunk.leaf$tickingBlocksCount;
short[] idx = chunk.leaf$tickingIdx;
int k = 0; int k = 0;
for (int j = 0, sectionsLength = chunk.getSections().length; j < sectionsLength; j++) { LevelChunkSection[] sections = chunk.getSections();
LevelChunkSection section = chunk.getSections()[j]; for (int j = 0; j < sections.length; j++) {
int n = (short) section.moonrise$getTickingBlockList().size(); ShortList list = sections[j].moonrise$getTickingBlockList();
int n = list.size();
if (n != 0) { if (n != 0) {
count[k] = (short) n; chunk.leaf$tickingCount[k++] = (n << 16) | (j & 0xFFFF);
idx[k] = (short) j;
k++;
} }
} }
} }
@@ -156,9 +144,7 @@ public final class RandomTickSystem {
currentIceAndSnowTick = random.nextInt(48 * 16); currentIceAndSnowTick = random.nextInt(48 * 16);
LevelChunk chunk = raw[i]; LevelChunk chunk = raw[i];
ChunkPos pos = chunk.getPos(); ChunkPos pos = chunk.getPos();
int minBlockX = pos.getMinBlockX(); world.tickPrecipitation(world.getBlockRandomPos(pos.getMinBlockX(), 0, pos.getMinBlockZ(), 15));
int minBlockZ = pos.getMinBlockZ();
world.tickPrecipitation(world.getBlockRandomPos(minBlockX, 0, minBlockZ, 15));
} }
} }
} }
@@ -166,11 +152,11 @@ public final class RandomTickSystem {
private static void tickBlock(ServerLevel world, LevelChunk chunk, int sectionIdx, BitRandomSource random, int minSection) { private static void tickBlock(ServerLevel world, LevelChunk chunk, int sectionIdx, BitRandomSource random, int minSection) {
LevelChunkSection section = chunk.getSection(sectionIdx); LevelChunkSection section = chunk.getSection(sectionIdx);
ShortList list = section.moonrise$getTickingBlockList(); ShortList list = section.moonrise$getTickingBlockList();
int sz = list.size(); int size = list.size();
if (sz == 0) return; if (size == 0) return;
short location = list.getRaw(boundedNextInt(random, sz)); short location = list.getRaw(boundedNextInt(random, size));
BlockState state = section.states.get(location); BlockState state = section.states.get(location);
final BlockPos pos = new BlockPos((location & 15) | chunk.locX << 4, (location >>> (4 + 4)) | (sectionIdx + minSection) << 4, ((location >>> 4) & 15) | chunk.locZ << 4); final BlockPos pos = new BlockPos((location & 15) | (chunk.locX << 4), (location >>> 8) | (minSection + (sectionIdx << 4)), ((location >>> 4) & 15) | (chunk.locZ << 4));
state.randomTick(world, pos, random); state.randomTick(world, pos, random);
final boolean doubleTickFluids = !ca.spottedleaf.moonrise.common.PlatformHooks.get().configFixMC224294(); final boolean doubleTickFluids = !ca.spottedleaf.moonrise.common.PlatformHooks.get().configFixMC224294();