mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
Implement Starlight
This commit is contained in:
Spottedleaf
parent
eb57d32c94
commit
9472b1ddf5
@ -1,5 +1,5 @@
|
|||||||
reference comparison:
|
reference comparison:
|
||||||
https://github.com/Tuinity/Moonrise/compare/6a2c6d27df11d417c1fefa749109d8e87599e8c2...03784b8c69c299db4af4f9984565e5752617d9dc
|
https://github.com/Tuinity/Moonrise/compare/6a2c6d27df11d417c1fefa749109d8e87599e8c2...f22335f0b65e205831c74a7b4b8f4d93fff54fd5
|
||||||
need to compare the diffs
|
need to compare the diffs
|
||||||
|
|
||||||
|
|
||||||
@ -17,9 +17,4 @@ todo:
|
|||||||
- implement chunk_system.SectionStorageMixin diff from reference
|
- implement chunk_system.SectionStorageMixin diff from reference
|
||||||
- implement chunk_system.SerializableChunkDataMixin diff from reference
|
- implement chunk_system.SerializableChunkDataMixin diff from reference
|
||||||
- implement chunk_system.ServerLevelMixin diff from reference
|
- implement chunk_system.ServerLevelMixin diff from reference
|
||||||
- implement starlight.LevelLightEngineMixin diff from reference
|
|
||||||
- implement starlight.ThreadedLevelLightEngineMixin diff from reference
|
|
||||||
- implement starlight.ChunkSerializerMixin diff from reference
|
|
||||||
- implement starlight.SerializableChunkData$SectionData diff from reference
|
|
||||||
- implement starlight.SerializableChunkDataMixin diff from reference
|
|
||||||
- chunk system: move get entity lookup reroute into the folia scheduler api patch
|
- chunk system: move get entity lookup reroute into the folia scheduler api patch
|
||||||
|
|||||||
@ -27577,8 +27577,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+
|
+
|
||||||
+ final ChunkAccess center = this.starlight$getLightEngine().getAnyChunkNow(chunkX, chunkZ);
|
+ final ChunkAccess center = this.starlight$getLightEngine().getAnyChunkNow(chunkX, chunkZ);
|
||||||
+ if (center == null || !center.getPersistedStatus().isOrAfter(net.minecraft.world.level.chunk.status.ChunkStatus.LIGHT)) {
|
+ if (center == null || !center.getPersistedStatus().isOrAfter(net.minecraft.world.level.chunk.status.ChunkStatus.LIGHT)) {
|
||||||
+ // do not accept updates in unlit chunks, unless we might be generating a chunk. thanks to the amazing
|
+ // do not accept updates in unlit chunks, unless we might be generating a chunk
|
||||||
+ // chunk scheduling, we could be lighting and generating a chunk at the same time
|
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@ -33172,6 +33171,288 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
}
|
}
|
||||||
|
|
||||||
static record PackedChunk<T>(Int2ObjectMap<T> sectionsByY, boolean versionChanged) {
|
static record PackedChunk<T>(Int2ObjectMap<T> sectionsByY, boolean versionChanged) {
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
long j = nbt.getLong("InhabitedTime");
|
||||||
|
ChunkStatus chunkstatus = ChunkStatus.byName(nbt.getString("Status"));
|
||||||
|
UpgradeData chunkconverter = nbt.contains("UpgradeData", 10) ? new UpgradeData(nbt.getCompound("UpgradeData"), world) : UpgradeData.EMPTY;
|
||||||
|
- boolean flag = nbt.getBoolean("isLightOn");
|
||||||
|
+ boolean flag = chunkstatus.isOrAfter(ChunkStatus.LIGHT) && (nbt.get("isLightOn") != null && nbt.getInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.STARLIGHT_VERSION_TAG) == ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.STARLIGHT_LIGHT_VERSION); // Paper - starlight
|
||||||
|
DataResult dataresult;
|
||||||
|
Logger logger;
|
||||||
|
BlendingData.Packed blendingdata_d;
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
Codec<PalettedContainer<Holder<Biome>>> codec = makeBiomeCodecRW(iregistry); // CraftBukkit - read/write
|
||||||
|
|
||||||
|
for (int i1 = 0; i1 < nbttaglist2.size(); ++i1) {
|
||||||
|
- CompoundTag nbttagcompound3 = nbttaglist2.getCompound(i1);
|
||||||
|
+ CompoundTag nbttagcompound3 = nbttaglist2.getCompound(i1); final CompoundTag sectionData = nbttagcompound3; // Paper - starlight - OBFHELPER
|
||||||
|
byte b0 = nbttagcompound3.getByte("Y");
|
||||||
|
LevelChunkSection chunksection;
|
||||||
|
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
DataLayer nibblearray = nbttagcompound3.contains("BlockLight", 7) ? new DataLayer(nbttagcompound3.getByteArray("BlockLight")) : null;
|
||||||
|
DataLayer nibblearray1 = nbttagcompound3.contains("SkyLight", 7) ? new DataLayer(nbttagcompound3.getByteArray("SkyLight")) : null;
|
||||||
|
|
||||||
|
- list4.add(new SerializableChunkData.SectionData(b0, chunksection, nibblearray, nibblearray1));
|
||||||
|
+ // Paper start - starlight
|
||||||
|
+ SerializableChunkData.SectionData serializableChunkData = new SerializableChunkData.SectionData(b0, chunksection, nibblearray, nibblearray1);
|
||||||
|
+ if (sectionData.contains(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.BLOCKLIGHT_STATE_TAG, Tag.TAG_ANY_NUMERIC)) {
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)serializableChunkData).starlight$setBlockLightState(sectionData.getInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.BLOCKLIGHT_STATE_TAG));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (sectionData.contains(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.SKYLIGHT_STATE_TAG, Tag.TAG_ANY_NUMERIC)) {
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)serializableChunkData).starlight$setSkyLightState(sectionData.getInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.SKYLIGHT_STATE_TAG));
|
||||||
|
+ }
|
||||||
|
+ list4.add(serializableChunkData);
|
||||||
|
+ // Paper end - starlight
|
||||||
|
}
|
||||||
|
|
||||||
|
// CraftBukkit - ChunkBukkitValues
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start - starlight
|
||||||
|
+ private ProtoChunk loadStarlightLightData(final ServerLevel world, final ProtoChunk ret) {
|
||||||
|
+
|
||||||
|
+ final boolean hasSkyLight = world.dimensionType().hasSkyLight();
|
||||||
|
+ final int minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinLightSection(world);
|
||||||
|
+
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] blockNibbles = ca.spottedleaf.moonrise.patches.starlight.light.StarLightEngine.getFilledEmptyLight(world);
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] skyNibbles = ca.spottedleaf.moonrise.patches.starlight.light.StarLightEngine.getFilledEmptyLight(world);
|
||||||
|
+
|
||||||
|
+ for (final SerializableChunkData.SectionData sectionData : this.sectionData) {
|
||||||
|
+ final int y = sectionData.y();
|
||||||
|
+ final DataLayer blockLight = sectionData.blockLight();
|
||||||
|
+ final DataLayer skyLight = sectionData.skyLight();
|
||||||
|
+
|
||||||
|
+ final int blockState = ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$getBlockLightState();
|
||||||
|
+ final int skyState = ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$getSkyLightState();
|
||||||
|
+
|
||||||
|
+ if (blockState >= 0) {
|
||||||
|
+ if (blockLight != null) {
|
||||||
|
+ blockNibbles[y - minSection] = new ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray(ca.spottedleaf.moonrise.common.util.MixinWorkarounds.clone(blockLight.getData()), blockState); // clone for data safety
|
||||||
|
+ } else {
|
||||||
|
+ blockNibbles[y - minSection] = new ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray(null, blockState);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (skyState >= 0 && hasSkyLight) {
|
||||||
|
+ if (skyLight != null) {
|
||||||
|
+ skyNibbles[y - minSection] = new ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray(ca.spottedleaf.moonrise.common.util.MixinWorkarounds.clone(skyLight.getData()), skyState); // clone for data safety
|
||||||
|
+ } else {
|
||||||
|
+ skyNibbles[y - minSection] = new ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray(null, skyState);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk)ret).starlight$setBlockNibbles(blockNibbles);
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk)ret).starlight$setSkyNibbles(skyNibbles);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+ // Paper end - starlight
|
||||||
|
+
|
||||||
|
public ProtoChunk read(ServerLevel world, PoiManager poiStorage, RegionStorageInfo key, ChunkPos expectedPos) {
|
||||||
|
if (!Objects.equals(expectedPos, this.chunkPos)) {
|
||||||
|
SerializableChunkData.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", new Object[]{expectedPos, expectedPos, this.chunkPos});
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunktype == ChunkType.LEVELCHUNK) {
|
||||||
|
- return new ImposterProtoChunk((LevelChunk) object, false);
|
||||||
|
+ return this.loadStarlightLightData(world, new ImposterProtoChunk((LevelChunk) object, false)); // Paper - starlight
|
||||||
|
} else {
|
||||||
|
ProtoChunk protochunk1 = (ProtoChunk) object;
|
||||||
|
Iterator iterator2 = this.entities.iterator();
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
protochunk1.setCarvingMask(new CarvingMask(this.carvingMask, ((ChunkAccess) object).getMinY()));
|
||||||
|
}
|
||||||
|
|
||||||
|
- return protochunk1;
|
||||||
|
+ return this.loadStarlightLightData(world, protochunk1); // Paper - starlight
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
throw new IllegalArgumentException("Chunk can't be serialized: " + String.valueOf(chunk));
|
||||||
|
} else {
|
||||||
|
ChunkPos chunkcoordintpair = chunk.getPos();
|
||||||
|
- List<SerializableChunkData.SectionData> list = new ArrayList();
|
||||||
|
+ List<SerializableChunkData.SectionData> list = new ArrayList(); final List<SerializableChunkData.SectionData> sections = list; // Paper - starlight - OBFHELPER
|
||||||
|
LevelChunkSection[] achunksection = chunk.getSections();
|
||||||
|
ThreadedLevelLightEngine lightenginethreaded = world.getChunkSource().getLightEngine();
|
||||||
|
|
||||||
|
- for (int i = lightenginethreaded.getMinLightSection(); i < lightenginethreaded.getMaxLightSection(); ++i) {
|
||||||
|
- int j = chunk.getSectionIndexFromSectionY(i);
|
||||||
|
- boolean flag = j >= 0 && j < achunksection.length;
|
||||||
|
- DataLayer nibblearray = lightenginethreaded.getLayerListener(LightLayer.BLOCK).getDataLayerData(SectionPos.of(chunkcoordintpair, i));
|
||||||
|
- DataLayer nibblearray1 = lightenginethreaded.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(chunkcoordintpair, i));
|
||||||
|
- DataLayer nibblearray2 = nibblearray != null && !nibblearray.isEmpty() ? nibblearray.copy() : null;
|
||||||
|
- DataLayer nibblearray3 = nibblearray1 != null && !nibblearray1.isEmpty() ? nibblearray1.copy() : null;
|
||||||
|
+ // Paper start - starlight
|
||||||
|
+ final int minLightSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinLightSection(world);
|
||||||
|
+ final int maxLightSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMaxLightSection(world);
|
||||||
|
+ final int minBlockSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(world);
|
||||||
|
+
|
||||||
|
+ final LevelChunkSection[] chunkSections = chunk.getSections();
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] blockNibbles = ((ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk)chunk).starlight$getBlockNibbles();
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] skyNibbles = ((ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk)chunk).starlight$getSkyNibbles();
|
||||||
|
+
|
||||||
|
+ for (int lightSection = minLightSection; lightSection <= maxLightSection; ++lightSection) {
|
||||||
|
+ final int lightSectionIdx = lightSection - minLightSection;
|
||||||
|
+ final int blockSectionIdx = lightSection - minBlockSection;
|
||||||
|
+
|
||||||
|
+ final LevelChunkSection chunkSection = (blockSectionIdx >= 0 && blockSectionIdx < chunkSections.length) ? chunkSections[blockSectionIdx].copy() : null;
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray.SaveState blockNibble = blockNibbles[lightSectionIdx].getSaveState();
|
||||||
|
+ final ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray.SaveState skyNibble = skyNibbles[lightSectionIdx].getSaveState();
|
||||||
|
+
|
||||||
|
+ if (chunkSection == null && blockNibble == null && skyNibble == null) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ final SerializableChunkData.SectionData sectionData = new SerializableChunkData.SectionData(
|
||||||
|
+ lightSection, chunkSection,
|
||||||
|
+ blockNibble == null ? null : (blockNibble.data == null ? null : new DataLayer(blockNibble.data)),
|
||||||
|
+ skyNibble == null ? null : (skyNibble.data == null ? null : new DataLayer(skyNibble.data))
|
||||||
|
+ );
|
||||||
|
|
||||||
|
- if (flag || nibblearray2 != null || nibblearray3 != null) {
|
||||||
|
- LevelChunkSection chunksection = flag ? achunksection[j].copy() : null;
|
||||||
|
+ if (blockNibble != null) {
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$setBlockLightState(blockNibble.state);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- list.add(new SerializableChunkData.SectionData(i, chunksection, nibblearray2, nibblearray3));
|
||||||
|
+ if (skyNibble != null) {
|
||||||
|
+ ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$setSkyLightState(skyNibble.state);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ sections.add(sectionData);
|
||||||
|
}
|
||||||
|
+ // Paper end - starlight
|
||||||
|
|
||||||
|
List<CompoundTag> list1 = new ArrayList(chunk.getBlockEntitiesPos().size());
|
||||||
|
Iterator iterator = chunk.getBlockEntitiesPos().iterator();
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
Iterator iterator = this.sectionData.iterator();
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
- SerializableChunkData.SectionData serializablechunkdata_b = (SerializableChunkData.SectionData) iterator.next();
|
||||||
|
- CompoundTag nbttagcompound1 = new CompoundTag();
|
||||||
|
+ SerializableChunkData.SectionData serializablechunkdata_b = (SerializableChunkData.SectionData) iterator.next(); final SerializableChunkData.SectionData sectionData = serializablechunkdata_b; // Paper - starlight - OBFHELPER
|
||||||
|
+ CompoundTag nbttagcompound1 = new CompoundTag(); final CompoundTag sectionNBT = nbttagcompound1; // Paper - starlight - OBFHELPER
|
||||||
|
LevelChunkSection chunksection = serializablechunkdata_b.chunkSection;
|
||||||
|
|
||||||
|
if (chunksection != null) {
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
nbttagcompound1.putByteArray("SkyLight", serializablechunkdata_b.skyLight.getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start - starlight
|
||||||
|
+ final int blockState = ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$getBlockLightState();
|
||||||
|
+ final int skyState = ((ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData)(Object)sectionData).starlight$getSkyLightState();
|
||||||
|
+
|
||||||
|
+ if (blockState > 0) {
|
||||||
|
+ sectionNBT.putInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.BLOCKLIGHT_STATE_TAG, blockState);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (skyState > 0) {
|
||||||
|
+ sectionNBT.putInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.SKYLIGHT_STATE_TAG, skyState);
|
||||||
|
+ }
|
||||||
|
+ // Paper end - starlight
|
||||||
|
+
|
||||||
|
if (!nbttagcompound1.isEmpty()) {
|
||||||
|
nbttagcompound1.putByte("Y", (byte) serializablechunkdata_b.y);
|
||||||
|
nbttaglist.add(nbttagcompound1);
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
nbttagcompound.put("ChunkBukkitValues", this.persistentDataContainer);
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
+ // Paper start - starlight
|
||||||
|
+ if (this.lightCorrect && !this.chunkStatus.isBefore(net.minecraft.world.level.chunk.status.ChunkStatus.LIGHT)) {
|
||||||
|
+ // clobber vanilla value to force vanilla to relight
|
||||||
|
+ nbttagcompound.putBoolean("isLightOn", false);
|
||||||
|
+ // store our light version
|
||||||
|
+ nbttagcompound.putInt(ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.STARLIGHT_VERSION_TAG, ca.spottedleaf.moonrise.patches.starlight.util.SaveUtil.STARLIGHT_LIGHT_VERSION);
|
||||||
|
+ }
|
||||||
|
+ // Paper end - starlight
|
||||||
|
return nbttagcompound;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +0,0 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
||||||
|
return nbttaglist;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public static record SectionData(int y, @Nullable LevelChunkSection chunkSection, @Nullable DataLayer blockLight, @Nullable DataLayer skyLight) {
|
||||||
|
+ // Paper start - starlight - convert from record
|
||||||
|
+ public static final class SectionData implements ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData { // Paper - starlight - our diff
|
||||||
|
+ private final int y;
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ private final net.minecraft.world.level.chunk.LevelChunkSection chunkSection;
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ private final net.minecraft.world.level.chunk.DataLayer blockLight;
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ private final net.minecraft.world.level.chunk.DataLayer skyLight;
|
||||||
|
+
|
||||||
|
+ // Paper start - starlight - our diff
|
||||||
|
+ private int blockLightState = -1;
|
||||||
|
+ private int skyLightState = -1;
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public final int starlight$getBlockLightState() {
|
||||||
|
+ return this.blockLightState;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public final void starlight$setBlockLightState(final int state) {
|
||||||
|
+ this.blockLightState = state;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public final int starlight$getSkyLightState() {
|
||||||
|
+ return this.skyLightState;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public final void starlight$setSkyLightState(final int state) {
|
||||||
|
+ this.skyLightState = state;
|
||||||
|
+ }
|
||||||
|
+ // Paper end - starlight - our diff
|
||||||
|
+
|
||||||
|
+ public SectionData(int y, @javax.annotation.Nullable net.minecraft.world.level.chunk.LevelChunkSection chunkSection, @javax.annotation.Nullable net.minecraft.world.level.chunk.DataLayer blockLight, @javax.annotation.Nullable net.minecraft.world.level.chunk.DataLayer skyLight) {
|
||||||
|
+ this.y = y;
|
||||||
|
+ this.chunkSection = chunkSection;
|
||||||
|
+ this.blockLight = blockLight;
|
||||||
|
+ this.skyLight = skyLight;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int y() {
|
||||||
|
+ return y;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ public net.minecraft.world.level.chunk.LevelChunkSection chunkSection() {
|
||||||
|
+ return chunkSection;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ public net.minecraft.world.level.chunk.DataLayer blockLight() {
|
||||||
|
+ return blockLight;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @javax.annotation.Nullable
|
||||||
|
+ public net.minecraft.world.level.chunk.DataLayer skyLight() {
|
||||||
|
+ return skyLight;
|
||||||
|
+ }
|
||||||
|
+ // Paper end - starlight - convert from record
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user