From a4df5a8ed888b2c773a6fe26c68b698152a23dcc Mon Sep 17 00:00:00 2001 From: Steveplays28 Date: Fri, 20 Oct 2023 14:03:19 +0200 Subject: [PATCH] style: Rename `renderDistance` to `renderDistanceRadius` to stay in sync with the main config --- .../distanthorizons/core/level/DhServerLevel.java | 2 +- .../config/AbstractMultiplayerConfig.java | 5 ++--- .../core/multiplayer/config/MultiplayerConfig.java | 8 ++++---- .../config/MultiplayerConfigChangeListener.java | 12 ++++++------ .../server/ServersideMultiplayerConfig.java | 4 ++-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java index bdc2f1326..bcf2bff5c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java @@ -244,7 +244,7 @@ public class DhServerLevel extends DhLevel implements IDhServerLevel double distanceFromPlayer = chunkUpdateData.accessor.chunkPos.distance(new DhChunkPos(serverPlayerState.serverPlayer.getPosition())); if (distanceFromPlayer < serverPlayerState.serverPlayer.getViewDistance() || - distanceFromPlayer > serverPlayerState.config.getRenderDistance()) return; + distanceFromPlayer > serverPlayerState.config.getRenderDistanceRadius()) return; serverPlayerState.channelContext.writeAndFlush(new FullDataPartialUpdateMessage(chunkUpdateData.accessor, this)); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java index bfcd264b1..b55ffde1d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/AbstractMultiplayerConfig.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; public abstract class AbstractMultiplayerConfig implements INetworkObject { - public abstract int getRenderDistance(); + public abstract int getRenderDistanceRadius(); public abstract int getFullDataRequestRateLimit(); public abstract boolean isRealTimeUpdatesEnabled(); public abstract boolean isPostRelogUpdateEnabled(); @@ -13,11 +13,10 @@ public abstract class AbstractMultiplayerConfig implements INetworkObject @Override public void encode(ByteBuf out) { - out.writeInt(this.getRenderDistance()); + out.writeInt(this.getRenderDistanceRadius()); out.writeInt(this.getFullDataRequestRateLimit()); out.writeBoolean(this.isRealTimeUpdatesEnabled()); out.writeBoolean(this.isPostRelogUpdateEnabled()); } - } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfig.java index d93c41cff..3534eb10c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfig.java @@ -5,8 +5,8 @@ import io.netty.buffer.ByteBuf; public class MultiplayerConfig extends AbstractMultiplayerConfig { - public int renderDistance = Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get(); - @Override public int getRenderDistance() { return renderDistance; } + public int renderDistanceRadius = Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get(); + @Override public int getRenderDistanceRadius() { return renderDistanceRadius; } public int fullDataRequestRateLimit = Config.Client.Advanced.Multiplayer.ServerNetworking.requestRateLimit.get(); @Override public int getFullDataRequestRateLimit() { return fullDataRequestRateLimit; } @@ -20,7 +20,7 @@ public class MultiplayerConfig extends AbstractMultiplayerConfig @Override public void decode(ByteBuf in) { - this.renderDistance = in.readInt(); + this.renderDistanceRadius = in.readInt(); this.fullDataRequestRateLimit = in.readInt(); this.realTimeUpdatesEnabled = in.readBoolean(); this.postRelogUpdateEnabled = in.readBoolean(); @@ -29,7 +29,7 @@ public class MultiplayerConfig extends AbstractMultiplayerConfig @Override public String toString() { return "MultiplayerConfig{" + - "renderDistance=" + renderDistance + + "renderDistance=" + renderDistanceRadius + ", fullDataRequestRateLimit=" + fullDataRequestRateLimit + ", realTimeUpdatesEnabled=" + realTimeUpdatesEnabled + ", postRelogUpdatesEnabled=" + postRelogUpdateEnabled + diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java index 251e19d68..b8a13d7ed 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java @@ -7,15 +7,15 @@ import java.io.Closeable; public class MultiplayerConfigChangeListener implements Closeable { - private final ConfigChangeListener renderDistance; - private final ConfigChangeListener rateLimit; + private final ConfigChangeListener renderDistanceRadius; + private final ConfigChangeListener requestRateLimit; private final ConfigChangeListener enableRealTimeUpdates; private final ConfigChangeListener enablePostRelogUpdate; public MultiplayerConfigChangeListener(Runnable runnable) { - renderDistance = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius, ignored -> runnable.run()); - rateLimit = new ConfigChangeListener<>(Config.Client.Advanced.Multiplayer.ServerNetworking.requestRateLimit, ignored -> runnable.run()); + renderDistanceRadius = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius, ignored -> runnable.run()); + requestRateLimit = new ConfigChangeListener<>(Config.Client.Advanced.Multiplayer.ServerNetworking.requestRateLimit, ignored -> runnable.run()); enableRealTimeUpdates = new ConfigChangeListener<>(Config.Client.Advanced.Multiplayer.ServerNetworking.enableRealTimeUpdates, ignored -> runnable.run()); enablePostRelogUpdate = new ConfigChangeListener<>(Config.Client.Advanced.Multiplayer.ServerNetworking.enablePostRelogUpdate, ignored -> runnable.run()); } @@ -23,8 +23,8 @@ public class MultiplayerConfigChangeListener implements Closeable @Override public void close() { - renderDistance.close(); - rateLimit.close(); + renderDistanceRadius.close(); + requestRateLimit.close(); enableRealTimeUpdates.close(); enablePostRelogUpdate.close(); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServersideMultiplayerConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServersideMultiplayerConfig.java index e35843e60..93187ec72 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServersideMultiplayerConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServersideMultiplayerConfig.java @@ -13,9 +13,9 @@ public class ServersideMultiplayerConfig extends AbstractMultiplayerConfig public MultiplayerConfig clientConfig = new MultiplayerConfig(); @Override - public int getRenderDistance() + public int getRenderDistanceRadius() { - return Math.min(clientConfig.renderDistance, Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get()); + return Math.min(clientConfig.renderDistanceRadius, Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get()); } @Override