diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java index bd8830d47..e7eb59eae 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java @@ -105,9 +105,9 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende // request submitting // //====================// - public CompletableFuture submitRequest(long sectionPos, Consumer dataSourceConsumer) + public CompletableFuture submitRequest(long sectionPos, Consumer dataSourceConsumer) { return this.submitRequest(sectionPos, null, dataSourceConsumer); } - public CompletableFuture submitRequest(long sectionPos, @Nullable Long clientTimestamp, Consumer dataSourceConsumer) + public CompletableFuture submitRequest(long sectionPos, @Nullable Long clientTimestamp, Consumer dataSourceConsumer) { AtomicBoolean added = new AtomicBoolean(false); RequestQueueEntry entry = this.waitingTasksBySectionPos.compute(sectionPos, (k, existingQueueEntry) -> @@ -147,7 +147,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende if (!added.get()) { - return CompletableFuture.completedFuture(RequestResult.FAILED); + return CompletableFuture.completedFuture(ERequestResult.FAILED); } return entry.future; @@ -262,7 +262,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende } catch (SectionRequiresSplittingException ignored) { - return entry.future.complete(RequestResult.REQUIRES_SPLITTING); + return entry.future.complete(ERequestResult.REQUIRES_SPLITTING); } catch (SessionClosedException | CancellationException ignored) { @@ -271,7 +271,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende catch (RequestRejectedException e) { LOGGER.info("Request rejected by the server: " + e.getMessage()); - return entry.future.complete(RequestResult.FAILED); + return entry.future.complete(ERequestResult.FAILED); } catch (RateLimitedException e) { @@ -303,11 +303,11 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende } else { - return entry.future.complete(RequestResult.FAILED); + return entry.future.complete(ERequestResult.FAILED); } } - return entry.future.complete(RequestResult.SUCCEEDED); + return entry.future.complete(ERequestResult.SUCCEEDED); }); } @@ -420,7 +420,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende protected static class RequestQueueEntry { /** encapsulates the entire request, including client side queuing and the actual server request */ - public final CompletableFuture future = new CompletableFuture<>(); + public final CompletableFuture future = new CompletableFuture<>(); public final Consumer dataSourceConsumer; /** will be null if we want to retrieve the LOD regardless of when it was last updated */ @Nullable @@ -450,7 +450,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende } - public enum RequestResult + public enum ERequestResult { SUCCEEDED, REQUIRES_SPLITTING,