Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit 17cb514

Browse files
marcus8448marcus8448
committed
feat: optimize chunk oxygen serialization
1 parent c17696d commit 17cb514

10 files changed

+66
-89
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ minecraft.version=1.19.2
1111
loader.version=0.14.9
1212

1313
# Mod Dependencies
14-
fabric.version=0.59.0+1.19.2
14+
fabric.version=0.60.0+1.19.2
1515
machinelib.version=0.1.0+1.19.2
1616
dyndims.version=0.3.0

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/java/dev/galacticraft/api/accessor/ChunkOxygenAccessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface ChunkOxygenAccessor {
3030
* Returns whether the supplied position in the chunk is breathable for entities
3131
*
3232
* @param x the position to test on the X-axis, normalized from 0 to 15
33-
* @param y the position to test on the Y-axis, will return {@code false} if it is outside the world's min/max height
33+
* @param y the position to test on the Y-axis, will return the default breathability if it is outside the world's min/max height
3434
* @param z the position to test on the Z-axis, normalized from 0 to 15
3535
* @return whether the supplied position in the chunk is breathable for entities
3636
*/

‎src/main/java/dev/galacticraft/impl/internal/accessor/ChunkOxygenSyncer.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,13 @@
2222

2323
package dev.galacticraft.impl.internal.accessor;
2424

25-
import net.minecraft.network.protocol.Packet;
26-
import org.jetbrains.annotations.NotNull;
27-
28-
import java.util.Collections;
29-
import java.util.List;
3025
import net.minecraft.network.FriendlyByteBuf;
31-
import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
26+
import org.jetbrains.annotations.NotNull;
27+
import org.jetbrains.annotations.Nullable;
3228

3329
public interface ChunkOxygenSyncer {
34-
default @NotNull List<@NotNull Packet<?>> syncOxygenPacketsToClient() {
35-
return Collections.emptyList();
30+
default @Nullable FriendlyByteBuf syncOxygenPacketsToClient() {
31+
return null;
3632
}
3733

3834
default void readOxygenUpdate(byte b, @NotNull FriendlyByteBuf buf) {

‎src/main/java/dev/galacticraft/impl/internal/accessor/ChunkSectionOxygenAccessorInternal.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222

2323
package dev.galacticraft.impl.internal.accessor;
2424

25+
import net.minecraft.network.FriendlyByteBuf;
2526
import org.jetbrains.annotations.ApiStatus;
2627
import org.jetbrains.annotations.NotNull;
2728
import org.jetbrains.annotations.Nullable;
2829

2930
import java.util.BitSet;
30-
import net.minecraft.network.FriendlyByteBuf;
3131

3232
/**
3333
* @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
3434
*/
3535
@ApiStatus.Internal
3636
public interface ChunkSectionOxygenAccessorInternal {
37-
@Nullable BitSet getInversionArray();
37+
@Nullable BitSet getInversion();
3838

39-
void setInversionArray(@Nullable BitSet inverted);
39+
void setInversion(@Nullable BitSet inverted);
4040

4141
short getModifiedBlocks();
4242

‎src/main/java/dev/galacticraft/impl/internal/client/fabric/GalacticraftAPIClient.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
import dev.galacticraft.api.accessor.GearInventoryProvider;
2626
import dev.galacticraft.api.accessor.SatelliteAccessor;
27-
import dev.galacticraft.impl.client.accessor.ClientResearchAccessor;
2827
import dev.galacticraft.api.universe.celestialbody.CelestialBody;
2928
import dev.galacticraft.impl.Constant;
29+
import dev.galacticraft.impl.client.accessor.ClientResearchAccessor;
3030
import dev.galacticraft.impl.internal.accessor.ChunkOxygenSyncer;
3131
import dev.galacticraft.impl.universe.celestialbody.type.SatelliteType;
3232
import dev.galacticraft.impl.universe.position.config.SatelliteConfig;
@@ -60,9 +60,14 @@ public void onInitializeClient() {
6060
((SatelliteAccessor) networkHandler).removeSatellite(buf.readResourceLocation());
6161
});
6262
ClientPlayNetworking.registerGlobalReceiver(new ResourceLocation(Constant.MOD_ID, "oxygen_update"), (client, handler, buf, responseSender) -> {
63-
byte b = buf.readByte();
64-
ChunkOxygenSyncer syncer = ((ChunkOxygenSyncer) handler.getLevel().getChunk(buf.readInt(), buf.readInt()));
65-
syncer.readOxygenUpdate(b, buf);
63+
int x = buf.readInt();
64+
int y = buf.readInt();
65+
byte dirty = buf.readByte();
66+
var syncer = (ChunkOxygenSyncer) handler.getLevel().getChunk(x, y);
67+
68+
for (byte a = 0; a < dirty; a++) {
69+
syncer.readOxygenUpdate(buf.readByte(), buf);
70+
}
6671
});
6772

6873
ClientPlayNetworking.registerGlobalReceiver(new ResourceLocation(Constant.MOD_ID, "gear_inv_sync"), (client, handler, buf, responseSender) -> {

‎src/main/java/dev/galacticraft/impl/internal/mixin/ChunkHolderMixin.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@
2222

2323
package dev.galacticraft.impl.internal.mixin;
2424

25+
import dev.galacticraft.impl.Constant;
2526
import dev.galacticraft.impl.internal.accessor.ChunkOxygenSyncer;
27+
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
28+
import net.minecraft.network.FriendlyByteBuf;
29+
import net.minecraft.network.protocol.Packet;
30+
import net.minecraft.resources.ResourceLocation;
31+
import net.minecraft.server.level.ChunkHolder;
32+
import net.minecraft.world.level.chunk.LevelChunk;
2633
import org.spongepowered.asm.mixin.Mixin;
2734
import org.spongepowered.asm.mixin.Shadow;
2835
import org.spongepowered.asm.mixin.injection.At;
2936
import org.spongepowered.asm.mixin.injection.Inject;
3037
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3138

32-
import java.util.List;
33-
import net.minecraft.network.protocol.Packet;
34-
import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
35-
import net.minecraft.server.level.ChunkHolder;
36-
import net.minecraft.world.level.chunk.LevelChunk;
37-
3839
/**
3940
* @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
4041
*/
@@ -45,9 +46,7 @@ public abstract class ChunkHolderMixin {
4546

4647
@Inject(method = "broadcastChanges", at = @At("HEAD"))
4748
private void galacticraft_flushOxygenPackets(LevelChunk chunk, CallbackInfo ci) {
48-
List<Packet<?>> packets = ((ChunkOxygenSyncer) chunk).syncOxygenPacketsToClient();
49-
for (Packet<?> packet : packets) {
50-
this.broadcast(packet, false);
51-
}
49+
FriendlyByteBuf buf = ((ChunkOxygenSyncer) chunk).syncOxygenPacketsToClient();
50+
if (buf != null) this.broadcast(ServerPlayNetworking.createS2CPacket(new ResourceLocation(Constant.MOD_ID, "oxygen_update"), buf), false);
5251
}
5352
}

‎src/main/java/dev/galacticraft/impl/internal/mixin/ChunkSectionMixin.java

+15-23
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import dev.galacticraft.api.accessor.ChunkSectionOxygenAccessor;
2626
import dev.galacticraft.impl.Constant;
2727
import dev.galacticraft.impl.internal.accessor.ChunkSectionOxygenAccessorInternal;
28+
import net.minecraft.network.FriendlyByteBuf;
29+
import net.minecraft.world.level.chunk.LevelChunkSection;
2830
import org.jetbrains.annotations.NotNull;
2931
import org.jetbrains.annotations.Nullable;
3032
import org.spongepowered.asm.mixin.Mixin;
@@ -35,8 +37,6 @@
3537
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
3638

3739
import java.util.BitSet;
38-
import net.minecraft.network.FriendlyByteBuf;
39-
import net.minecraft.world.level.chunk.LevelChunkSection;
4040

4141
/**
4242
* @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
@@ -58,20 +58,21 @@ public boolean isBreathable(int x, int y, int z) {
5858
@Override
5959
public void setBreathable(int x, int y, int z, boolean breathable) {
6060
boolean inversion = (this.defaultBreathable && !breathable) || (!this.defaultBreathable && breathable);
61+
int bitIndex = x + (y << 4) + (z << 8);
6162
if (inversion) {
6263
if (this.inverted == null) {
6364
assert this.modifiedBlocks == 0;
64-
this.inverted = new BitSet(Constant.Chunk.CHUNK_SECTION_AREA);
65-
this.inverted.set(x + (y << 4) + (z << 8));
65+
this.inverted = new BitSet(bitIndex); // do not allocate a full bitset if not necessary
66+
this.inverted.set(bitIndex);
6667
this.modifiedBlocks = 1;
6768
} else {
68-
if (!this.inverted.get(x + (y << 4) + (z << 8))) {
69-
this.inverted.set(x + (y << 4) + (z << 8));
69+
if (!this.inverted.get(bitIndex)) {
70+
this.inverted.set(bitIndex);
7071
this.modifiedBlocks++;
7172
}
7273
}
73-
} else if (this.inverted != null && this.inverted.get(x + (y << 4) + (z << 8))) {
74-
this.inverted.clear(x + (y << 4) + (z << 8));
74+
} else if (this.inverted != null && this.inverted.get(bitIndex)) {
75+
this.inverted.clear(bitIndex);
7576
if (--this.modifiedBlocks == 0) {
7677
this.inverted = null;
7778
}
@@ -94,12 +95,12 @@ private void galacticraft_writeOxygenDataToPacket(FriendlyByteBuf buf, CallbackI
9495
}
9596

9697
@Override
97-
public BitSet getInversionArray() {
98+
public BitSet getInversion() {
9899
return this.inverted;
99100
}
100101

101102
@Override
102-
public void setInversionArray(BitSet inverted) {
103+
public void setInversion(BitSet inverted) {
103104
this.inverted = inverted;
104105
}
105106

@@ -129,12 +130,8 @@ public void writeOxygenPacket(@NotNull FriendlyByteBuf buf) {
129130
buf.writeShort(this.getModifiedBlocks());
130131

131132
if (this.getModifiedBlocks() > 0) {
132-
assert this.getInversionArray() != null;
133-
long[] inverted = this.getInversionArray().toLongArray();
134-
buf.writeInt(inverted.length);
135-
for (int i = 0; i < inverted.length; i++) {
136-
buf.writeLong(inverted[i]);
137-
}
133+
assert this.getInversion() != null;
134+
buf.writeLongArray(this.getInversion().toLongArray());
138135
}
139136
}
140137

@@ -143,14 +140,9 @@ public void readOxygenPacket(@NotNull FriendlyByteBuf buf) {
143140
this.setDefaultBreathable(buf.readBoolean());
144141
this.setModifiedBlocks(buf.readShort());
145142
if (this.getModifiedBlocks() > 0) {
146-
int length = buf.readInt();
147-
long[] words = new long[length];
148-
for (int i = 0; i < length; i++) {
149-
words[i] = buf.readLong();
150-
}
151-
this.setInversionArray(BitSet.valueOf(words));
143+
this.setInversion(BitSet.valueOf(buf.readLongArray()));
152144
} else {
153-
this.setInversionArray(null);
145+
this.setInversion(null);
154146
}
155147
}
156148
}

‎src/main/java/dev/galacticraft/impl/internal/mixin/ChunkSerializerMixin.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@
3434
import net.minecraft.world.entity.ai.village.poi.PoiManager;
3535
import net.minecraft.world.level.ChunkPos;
3636
import net.minecraft.world.level.biome.Biome;
37-
import net.minecraft.world.level.chunk.ChunkAccess;
38-
import net.minecraft.world.level.chunk.ChunkSource;
39-
import net.minecraft.world.level.chunk.DataLayer;
40-
import net.minecraft.world.level.chunk.LevelChunkSection;
41-
import net.minecraft.world.level.chunk.PalettedContainer;
42-
import net.minecraft.world.level.chunk.PalettedContainerRO;
43-
import net.minecraft.world.level.chunk.ProtoChunk;
44-
import net.minecraft.world.level.chunk.UpgradeData;
37+
import net.minecraft.world.level.chunk.*;
4538
import net.minecraft.world.level.chunk.storage.ChunkSerializer;
4639
import net.minecraft.world.level.levelgen.BelowZeroRetrogen;
4740
import net.minecraft.world.level.levelgen.blending.BlendingData;
@@ -67,7 +60,7 @@ private static void galacticraft_serializeOxygen(ServerLevel world, ChunkAccess
6760
}
6861
nbt.putShort(Constant.Nbt.CHANGE_COUNT, ((ChunkSectionOxygenAccessorInternal) chunkSection).getModifiedBlocks());
6962
if (((ChunkSectionOxygenAccessorInternal) chunkSection).getModifiedBlocks() > 0) {
70-
BitSet bits = ((ChunkSectionOxygenAccessorInternal) chunkSection).getInversionArray();
63+
BitSet bits = ((ChunkSectionOxygenAccessorInternal) chunkSection).getInversion();
7164
assert bits != null;
7265
nbt.putLongArray(Constant.Nbt.OXYGEN, bits.toLongArray());
7366
}
@@ -85,7 +78,7 @@ private static void galacticraft_deserializeOxygen(ServerLevel world, PoiManager
8578
}
8679
((ChunkSectionOxygenAccessorInternal) chunkSection).setModifiedBlocks(changedCount);
8780
if (changedCount > 0) {
88-
((ChunkSectionOxygenAccessorInternal) chunkSection).setInversionArray(BitSet.valueOf(nbtC.getLongArray(Constant.Nbt.OXYGEN)));
81+
((ChunkSectionOxygenAccessorInternal) chunkSection).setInversion(BitSet.valueOf(nbtC.getLongArray(Constant.Nbt.OXYGEN)));
8982
}
9083
}
9184
}

‎src/main/java/dev/galacticraft/impl/internal/mixin/WorldChunkMixin.java

+20-28
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,14 @@
2323
package dev.galacticraft.impl.internal.mixin;
2424

2525
import dev.galacticraft.api.accessor.ChunkOxygenAccessor;
26-
import dev.galacticraft.impl.Constant;
2726
import dev.galacticraft.impl.internal.accessor.ChunkOxygenAccessorInternal;
2827
import dev.galacticraft.impl.internal.accessor.ChunkOxygenSyncer;
2928
import dev.galacticraft.impl.internal.accessor.ChunkSectionOxygenAccessorInternal;
3029
import dev.galacticraft.impl.internal.accessor.WorldOxygenAccessorInternal;
3130
import io.netty.buffer.Unpooled;
32-
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
3331
import net.minecraft.core.BlockPos;
3432
import net.minecraft.core.Registry;
3533
import net.minecraft.network.FriendlyByteBuf;
36-
import net.minecraft.network.protocol.Packet;
37-
import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
38-
import net.minecraft.resources.ResourceLocation;
3934
import net.minecraft.world.level.ChunkPos;
4035
import net.minecraft.world.level.Level;
4136
import net.minecraft.world.level.LevelHeightAccessor;
@@ -61,10 +56,6 @@
6156
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
6257
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
6358

64-
import java.util.Collections;
65-
import java.util.LinkedList;
66-
import java.util.List;
67-
6859
/**
6960
* @author <a href="https://github.com/TeamGalacticraft">TeamGalacticraft</a>
7061
*/
@@ -73,7 +64,7 @@ public abstract class WorldChunkMixin extends ChunkAccess implements ChunkOxygen
7364
@Shadow @Final Level level;
7465
private @Unique boolean /*@NotNull*/ [] sectionDirty;
7566
private @Unique boolean defaultBreathable = false;
76-
private @Unique boolean dirty = false;
67+
private @Unique byte dirty = 0;
7768

7869
private WorldChunkMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) {
7970
super(pos, upgradeData, heightLimitView, biome, inhabitedTime, sectionArrayInitializer, blendingData);
@@ -108,33 +99,34 @@ public void setBreathable(int x, int y, int z, boolean value) {
10899
if (value != section.isBreathable(x & 15, y & 15, z & 15)) {
109100
if (!this.level.isClientSide) {
110101
this.unsaved = true;
111-
this.dirty = true;
112-
sectionDirty[this.getSectionIndex(y)] = true;
102+
if (!this.sectionDirty[this.getSectionIndex(y)]) {
103+
this.sectionDirty[this.getSectionIndex(y)] = true;
104+
this.dirty++;
105+
}
113106
}
114107
section.setBreathable(x & 15, y & 15, z & 15, value);
115108
}
116109
}
117110

118111
@Override
119-
public @NotNull List<Packet<?>> syncOxygenPacketsToClient() {
120-
if (dirty && !level.isClientSide) {
121-
dirty = false;
122-
List<Packet<?>> list = new LinkedList<>();
123-
for (int i = 0; i < sectionDirty.length; i++) {
124-
if (sectionDirty[i]) {
125-
sectionDirty[i] = false;
126-
ChunkPos pos = this.getPos();
127-
ChunkSectionOxygenAccessorInternal accessor = (ChunkSectionOxygenAccessorInternal) this.getSection(i);
128-
int size = 1 + ((Integer.SIZE / Byte.SIZE) * 2) + (1 + (Short.SIZE / Byte.SIZE) + accessor.getModifiedBlocks() > 0 ? (Constant.Chunk.CHUNK_SECTION_AREA / Byte.SIZE) : 0);
129-
FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer(size, size)
130-
.writeByte(i).writeInt(pos.x).writeInt(pos.z));
131-
accessor.writeOxygenPacket(buf);
132-
list.add(ServerPlayNetworking.createS2CPacket(new ResourceLocation(Constant.MOD_ID, "oxygen_update"), buf));
112+
public @Nullable FriendlyByteBuf syncOxygenPacketsToClient() {
113+
assert !this.level.isClientSide;
114+
if (this.dirty != 0) {
115+
FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer(8 + this.dirty * 4));
116+
buf.writeInt(this.getPos().x);
117+
buf.writeInt(this.getPos().z);
118+
buf.writeByte(this.dirty);
119+
for (int i = 0; i < this.sectionDirty.length; i++) {
120+
if (this.sectionDirty[i]) {
121+
this.sectionDirty[i] = false;
122+
buf.writeByte(i);
123+
((ChunkSectionOxygenAccessorInternal) this.getSection(i)).writeOxygenPacket(buf);
133124
}
134125
}
135-
return list;
126+
this.dirty = 0;
127+
return buf;
136128
}
137-
return Collections.emptyList();
129+
return null;
138130
}
139131

140132
@Override

0 commit comments

Comments
 (0)