From 3b7d1267185939381212f8b370367b1772922e94 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 7 Jun 2023 11:11:54 +0200 Subject: [PATCH] Release 2.6.2 --- build.gradle.kts | 2 +- .../java/com/fastasyncworldedit/core/Fawe.java | 2 +- .../core/command/SuggestInputParseException.java | 14 +++++++------- .../extent/clipboard/DiskOptimizedClipboard.java | 4 ++-- .../core/queue/implementation/QueueHandler.java | 6 +++--- .../blocks/ThreadUnsafeCharBlocks.java | 4 ++-- .../core/util/task/KeyQueuedExecutorService.java | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f56de99975..a990b29040 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ ext { } } -version = String.format("%s-%s", rootVersion, buildNumber) +version = String.format("%s", rootVersion) if (!project.hasProperty("gitCommitHash")) { apply(plugin = "org.ajoberstar.grgit") diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java index 7f31c65191..8f4818f2f0 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java @@ -447,7 +447,7 @@ public Thread setMainThread() { * Gets the executor used for clipboard IO if clipboard on disk is enabled or null * * @return Executor used for clipboard IO if clipboard on disk is enabled or null - * @since TODO + * @since 2.6.2 */ @Nullable public KeyQueuedExecutorService getClipboardExecutor() { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/SuggestInputParseException.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/SuggestInputParseException.java index bd10e6d200..fc50bf1a31 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/SuggestInputParseException.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/SuggestInputParseException.java @@ -19,7 +19,7 @@ public class SuggestInputParseException extends InputParseException { /** * @deprecated Use {@link SuggestInputParseException#SuggestInputParseException(Component, Supplier)} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public SuggestInputParseException(String msg, String prefix, Supplier> getSuggestions) { this(new InputParseException(msg), getSuggestions); } @@ -27,7 +27,7 @@ public SuggestInputParseException(String msg, String prefix, Supplier> getSuggestions) { if (other instanceof InputParseException) { return of((InputParseException) other, getSuggestions); @@ -38,7 +38,7 @@ public static SuggestInputParseException of(Throwable other, String prefix, Supp /** * @deprecated Use {@link SuggestInputParseException#of(InputParseException, Supplier)} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public static SuggestInputParseException of(InputParseException other, String prefix, Supplier> getSuggestions) { if (other instanceof SuggestInputParseException) { return (SuggestInputParseException) other; @@ -49,7 +49,7 @@ public static SuggestInputParseException of(InputParseException other, String pr /** * @deprecated Use {@link SuggestInputParseException#SuggestInputParseException(InputParseException, Supplier)} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public SuggestInputParseException(InputParseException other, String prefix, Supplier> getSuggestions) { super(other.getRichMessage()); checkNotNull(getSuggestions); @@ -62,8 +62,8 @@ public SuggestInputParseException(InputParseException other, String prefix, Supp * Create a new SuggestInputParseException instance * * @param message Message to send - * @param getSuggestions Supplier of list of sugegstions to give to user - * @since TODO + * @param getSuggestions Supplier of list of suggestions to give to user + * @since 2.6.2 */ public SuggestInputParseException(Component message, Supplier> getSuggestions) { this(new InputParseException(message), getSuggestions); @@ -129,7 +129,7 @@ public List getSuggestions() { /** * @deprecated Unused */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public SuggestInputParseException prepend(String input) { // Do nothing return this; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java index 28dc52333f..a9704e36b4 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java @@ -158,7 +158,7 @@ public DiskOptimizedClipboard(BlockVector3 dimensions, File file) { * with data written to it. * @deprecated Will be made private, use {@link DiskOptimizedClipboard#loadFromFile(File)} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public DiskOptimizedClipboard(File file) { this(file, VERSION); } @@ -171,7 +171,7 @@ public DiskOptimizedClipboard(File file) { * @param versionOverride An override version to allow loading of older clipboards if required * @deprecated Will be made private, use {@link DiskOptimizedClipboard#loadFromFile(File)} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public DiskOptimizedClipboard(File file, int versionOverride) { super(readSize(file, versionOverride), BlockVector3.ZERO); headerSize = getHeaderSizeOverrideFromVersion(versionOverride); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/QueueHandler.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/QueueHandler.java index ae3ba4043c..7f604a2774 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/QueueHandler.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/QueueHandler.java @@ -166,7 +166,7 @@ private void operate(Queue queue, long start, long currentAllocate) /** * @deprecated For removal without replacement. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public > void complete(Future task) { try { while (task != null) { @@ -422,7 +422,7 @@ private IQueueExtent pool() { * @param parallel if the "set" being started is parallel/async * @deprecated To be replaced by better-named {@link QueueHandler#startUnsafe(boolean)} )} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public void startSet(boolean parallel) { startUnsafe(parallel); } @@ -434,7 +434,7 @@ public void startSet(boolean parallel) { * @param parallel if the "set" being started is parallel/async * @deprecated To be replaced by better-named {@link QueueHandler#endUnsafe(boolean)} )} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.6.2") public void endSet(boolean parallel) { startUnsafe(parallel); } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/ThreadUnsafeCharBlocks.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/ThreadUnsafeCharBlocks.java index 7d041155b9..f3dda058f2 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/ThreadUnsafeCharBlocks.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/ThreadUnsafeCharBlocks.java @@ -30,7 +30,7 @@ * This is currently only used as a "copy" of {@link CharSetBlocks} to provide to * {@link com.fastasyncworldedit.core.queue.IBatchProcessor} instances for processing without overlapping the continuing edit. * - * @since TODO + * @since 2.6.2 */ public class ThreadUnsafeCharBlocks implements IChunkSet, IBlocks { @@ -54,7 +54,7 @@ public class ThreadUnsafeCharBlocks implements IChunkSet, IBlocks { /** * New instance given the data stored in a {@link CharSetBlocks} instance. * - * @since TODO + * @since 2.6.2 */ ThreadUnsafeCharBlocks( char[][] blocks, diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/KeyQueuedExecutorService.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/KeyQueuedExecutorService.java index bfaafb0714..d9db5c8888 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/KeyQueuedExecutorService.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/KeyQueuedExecutorService.java @@ -18,7 +18,7 @@ * Executor service that queues tasks based on keys, executing tasks on a configurable {@link ThreadPoolExecutor} * * @param Key type - * @since TODO + * @since 2.6.2 */ public class KeyQueuedExecutorService {