Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-27 03:27:56 +01:00
Code Issues Projects Releases Wiki Activity

Make Section Writeable, fill the section array on init

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-12-03 21:37:15 +01:00
parent e3f08fb6d5
commit 9542de784b
2 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/net/minestom/server/instance/DynamicChunk.java
View File

@ -9,7 +9,6 @@ import net.minestom.server.entity.Player;
import net.minestom.server.entity.pathfinding.PFBlock;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockHandler;
import net.minestom.server.instance.palette.Palette;
import net.minestom.server.network.packet.server.CachedPacket;
import net.minestom.server.network.packet.server.play.ChunkDataPacket;
import net.minestom.server.network.packet.server.play.UpdateLightPacket;
@ -50,6 +49,7 @@ public class DynamicChunk extends Chunk {
this.minSection = instance.getDimensionType().getMinY() / CHUNK_SECTION_SIZE;
this.maxSection = instance.getDimensionType().getHeight() / CHUNK_SECTION_SIZE;
this.sections = new Section[maxSection - minSection];
Arrays.setAll(sections, value -> new Section());
}
@Override
@ -94,9 +94,7 @@ public class DynamicChunk extends Chunk {
@Override
public @NotNull Section getSection(int section) {
final int index = section - minSection;
Section result = sections[index];
if (result == null) sections[index] = result = new Section();
return result;
return sections[index];
}
@Override
@ -124,7 +122,6 @@ public class DynamicChunk extends Chunk {
}
// Retrieve the block from state id
final Section section = sections[ChunkUtils.getSectionAt(y) + minSection];
if (section == null) return Block.AIR; // Section is unloaded
final int blockStateId = section.blockPalette()
.get(toChunkRelativeCoordinate(x), y, toChunkRelativeCoordinate(z));
if (blockStateId == -1) return Block.AIR; // Section is empty
@ -134,7 +131,6 @@ public class DynamicChunk extends Chunk {
@Override
public @NotNull Biome getBiome(int x, int y, int z) {
final Section section = sections[ChunkUtils.getSectionAt(y) + minSection];
if (section == null) return Biome.PLAINS; // Section is unloaded
final int id = section.biomePalette()
.get(toChunkRelativeCoordinate(x) / 4, y / 4, toChunkRelativeCoordinate(z) / 4);
return MinecraftServer.getBiomeManager().getById(id);
@ -171,9 +167,7 @@ public class DynamicChunk extends Chunk {
@Override
public void reset() {
for (Section section : sections) {
if (section != null) section.clear();
}
for (Section section : sections) section.clear();
this.entries.clear();
}
@ -198,21 +192,7 @@ public class DynamicChunk extends Chunk {
}
// Data
final BinaryWriter writer = new BinaryWriter();
for (Section section : sections) {
if (section != null) {
final Palette blockPalette = section.blockPalette();
writer.writeShort((short) blockPalette.size());
blockPalette.write(writer); // Blocks
section.biomePalette().write(writer); // Biomes
} else {
// Hardcode empty section
writer.writeShort((short) 0); // Block count
writer.writeByte((byte) 15); // Block bpe
writer.writeVarInt(0); // Block data length
writer.writeByte((byte) 15); // Biome bpe
writer.writeVarInt(0); // Biome data length
}
}
for (Section section : sections) writer.write(section);
return new ChunkDataPacket(chunkX, chunkZ,
new ChunkData(heightmapsNBT, writer.toByteArray(), entries),
createLightData());
@ -233,20 +213,15 @@ public class DynamicChunk extends Chunk {
int index = 0;
for (Section section : sections) {
index++;
if (section != null) {
final byte[] skyLight = section.getSkyLight();
final byte[] blockLight = section.getBlockLight();
if (!ArrayUtils.empty(skyLight)) {
skyLights.add(skyLight);
skyMask.set(index);
}
if (!ArrayUtils.empty(blockLight)) {
blockLights.add(blockLight);
blockMask.set(index);
}
} else {
emptyBlockMask.set(index);
emptySkyMask.set(index);
final byte[] skyLight = section.getSkyLight();
final byte[] blockLight = section.getBlockLight();
if (!ArrayUtils.empty(skyLight)) {
skyLights.add(skyLight);
skyMask.set(index);
}
if (!ArrayUtils.empty(blockLight)) {
blockLights.add(blockLight);
blockMask.set(index);
}
}
return new LightData(true,

11
src/main/java/net/minestom/server/instance/Section.java
View File

@ -1,9 +1,11 @@
package net.minestom.server.instance;
import net.minestom.server.instance.palette.Palette;
import net.minestom.server.utils.binary.BinaryWriter;
import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull;
public final class Section {
public final class Section implements Writeable {
private Palette blockPalette;
private Palette biomePalette;
private byte[] skyLight;
@ -58,4 +60,11 @@ public final class Section {
return new Section(blockPalette.clone(), biomePalette.clone(),
skyLight.clone(), blockLight.clone());
}
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeShort((short) blockPalette.size());
writer.write(blockPalette);
writer.write(biomePalette);
}
}