diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java index b6235ee47..df360fc15 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java @@ -29,6 +29,7 @@ import com.seibel.distanthorizons.core.file.fullDatafile.FullDataSourceProviderV import com.seibel.distanthorizons.core.file.fullDatafile.RemoteFullDataSourceProvider; import com.seibel.distanthorizons.core.file.structure.ISaveStructure; import com.seibel.distanthorizons.core.generation.RemoteWorldRetrievalQueue; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.multiplayer.client.ClientNetworkState; import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue; @@ -47,6 +48,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrap import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; @@ -63,6 +65,9 @@ import java.util.concurrent.TimeUnit; public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + protected static final ConfigBasedLogger NETWORK_LOGGER = new ConfigBasedLogger(LogManager.getLogger(), + () -> Config.Common.Logging.logNetworkEvent.get()); + private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); public final ClientLevelModule clientside; @@ -159,7 +164,9 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel try (FullDataSourceV2DTO dataSourceDto = this.networkState.fullDataPayloadReceiver.decodeDataSourceAndReleaseBuffer(message.payload)) { - if (!message.isSameLevelAs(this.levelWrapper)) + boolean isSameLevel = message.isSameLevelAs(this.levelWrapper); + NETWORK_LOGGER.debug("Buffer {} isSameLevel: {}", message.payload.dtoBufferId, isSameLevel); + if (!isSameLevel) { return; } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java index f9af0b20e..f0944b1b5 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java @@ -69,19 +69,21 @@ public class FullDataPayloadReceiver implements AutoCloseable }); } - public FullDataSourceV2DTO decodeDataSourceAndReleaseBuffer(FullDataPayload msg) + public FullDataSourceV2DTO decodeDataSourceAndReleaseBuffer(FullDataPayload payload) { - CompositeByteBuf compositeByteBuffer = this.buffersById.get(msg.dtoBufferId); + CompositeByteBuf compositeByteBuffer = this.buffersById.get(payload.dtoBufferId); LodUtil.assertTrue(compositeByteBuffer != null); try { - return INetworkObject.decodeToInstance(FullDataSourceV2DTO.CreateEmptyDataSourceForDecoding(), compositeByteBuffer); + FullDataSourceV2DTO dataSourceDto = INetworkObject.decodeToInstance(FullDataSourceV2DTO.CreateEmptyDataSourceForDecoding(), compositeByteBuffer); + LOGGER.debug("Buffer {} DTO: {}", payload.dtoBufferId, dataSourceDto); + return dataSourceDto; } finally { // Releasing the buffer is handled by cache - this.buffersById.remove(msg.dtoBufferId); + this.buffersById.remove(payload.dtoBufferId); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java index c3c22e462..7b53f86c4 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java @@ -454,7 +454,7 @@ public class FullDataSourceV2DTO { return MoreObjects.toStringHelper(this) .add("levelMinY", this.levelMinY) - .add("pos", this.pos) + .add("pos", DhSectionPos.toString(this.pos)) .add("dataChecksum", this.dataChecksum) .add("compressedDataByteArray length", this.compressedDataByteArray.size()) .add("compressedColumnGenStepByteArray length", this.compressedColumnGenStepByteArray.size())