diff --git a/build.gradle.kts b/build.gradle.kts index de0d714cc..a0930e8ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ logger.lifecycle(""" ******************************************* """) -var rootVersion by extra("2.6.5") +var rootVersion by extra("2.7.0") var snapshot by extra("SNAPSHOT") var revision: String by extra("") var buildNumber by extra("") @@ -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/extent/processor/EntityInBlockRemovingProcessor.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/EntityInBlockRemovingProcessor.java index 1ffea1266..58baf8633 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/EntityInBlockRemovingProcessor.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/EntityInBlockRemovingProcessor.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; /** * Processor that removes existing entities that would not be in air after the edit * - * @since TODO + * @since 2.7.0 */ public class EntityInBlockRemovingProcessor implements IBatchProcessor { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/TypeSwapPattern.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/TypeSwapPattern.java index 89876f658..efc122b5d 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/TypeSwapPattern.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/function/pattern/TypeSwapPattern.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * Pattern that replaces blocks based on their ID, matching for an "input" and replacing with an "output" string. The "input" * string may be regex. Keeps as much of the block state as possible, excluding NBT data. * - * @since TODO + * @since 2.7.0 */ public class TypeSwapPattern extends AbstractExtentPattern { @@ -34,7 +34,7 @@ public class TypeSwapPattern extends AbstractExtentPattern { * @param inputString string to replace. May be regex. * @param outputString string to replace with * @param allowRegex if regex should be allowed for input string matching - * @since TODO + * @since 2.7.0 */ public TypeSwapPattern(Extent extent, String inputString, String outputString, boolean allowRegex) { super(extent); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/internal/exception/FaweException.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/internal/exception/FaweException.java index fd74ac5de..7a71b831b 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/internal/exception/FaweException.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/internal/exception/FaweException.java @@ -41,7 +41,7 @@ public class FaweException extends RuntimeException { * New instance of a given {@link FaweException.Type} * * @param ignorable if an edit can continue if this exception is caught, e.g. by {@link com.fastasyncworldedit.core.extent.LimitExtent} - * @since TODO + * @since 2.7.0 */ public FaweException(Component reason, Type type, boolean ignorable) { this.message = reason; @@ -70,7 +70,7 @@ public class FaweException extends RuntimeException { /** * If an edit can continue if this exception is caught, e.g. by {@link com.fastasyncworldedit.core.extent.LimitExtent} * - * @since TODO + * @since 2.7.0 */ public boolean ignorable() { return ignorable; 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 bc7f9ddec..014b94fce 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 @@ -516,7 +516,7 @@ public abstract class QueueHandler implements Trimable, Runnable { *

* Internal API usage only. * - * @since TODO + * @since 2.7.0 */ public ExecutorService getForkJoinPoolPrimary() { return forkJoinPoolPrimary; @@ -528,7 +528,7 @@ public abstract class QueueHandler implements Trimable, Runnable { *

* Internal API usage only. * - * @since TODO + * @since 2.7.0 */ public ExecutorService getForkJoinPoolSecondary() { return forkJoinPoolSecondary; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMask.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMask.java index 478ac90c9..f50c1a67e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMask.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMask.java @@ -38,7 +38,7 @@ public class FaweMask implements IDelegateRegion { * @param type type of mask * @param notify if the player should be notified * @return if still valid - * @since TODO + * @since 2.7.0 */ public boolean isValid(Player player, FaweMaskManager.MaskType type, boolean notify) { return isValid(player, type); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMaskManager.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMaskManager.java index c52cc17e7..29136a178 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMaskManager.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/regions/FaweMaskManager.java @@ -30,7 +30,7 @@ public abstract class FaweMaskManager { /** * Get a {@link FaweMask} for the given player and {@link MaskType}. If isWhitelist is false, will return a "blacklist" mask. * - * @since TODO + * @since 2.7.0 */ public FaweMask getMask(final Player player, MaskType type, boolean isWhitelist, boolean notify) { return getMask(player, type, isWhitelist); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TaskManager.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TaskManager.java index 65025bcd0..176e02673 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TaskManager.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TaskManager.java @@ -91,7 +91,7 @@ public abstract class TaskManager { * * @deprecated Deprecated without replacement as unused internally, and poor implementation of what it's designed to do. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.7.0") public void parallel(Collection runables) { for (Runnable run : runables) { pool.submit(run); @@ -106,7 +106,7 @@ public abstract class TaskManager { * @param numThreads number of threads (null = config.yml parallel threads) * @deprecated Deprecated without replacement as unused internally, and poor implementation of what it's designed to do. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.7.0") public void parallel(Collection runnables, @Nullable Integer numThreads) { if (runnables == null) { return; @@ -278,7 +278,7 @@ public abstract class TaskManager { /** * @deprecated Deprecated without replacement as unused internally, and poor implementation of what it's designed to do. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.7.0") public void wait(AtomicBoolean running, int timeout) { try { long start = System.currentTimeMillis(); @@ -299,7 +299,7 @@ public abstract class TaskManager { /** * @deprecated Deprecated without replacement as unused internally, and poor implementation of what it's designed to do. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.7.0") public void notify(AtomicBoolean running) { running.set(false); synchronized (running) { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/AsyncNotifyKeyedQueue.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/AsyncNotifyKeyedQueue.java index 9df6b197c..cb6747cd2 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/AsyncNotifyKeyedQueue.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/AsyncNotifyKeyedQueue.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; * async queue that accepts a {@link Thread.UncaughtExceptionHandler} for exception handling per instance, delegating to a * parent {@link KeyQueuedExecutorService}. * - * @since TODO + * @since 2.7.0 */ public class AsyncNotifyKeyedQueue implements Closeable { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java index e5a466e29..7762ee532 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java @@ -86,7 +86,7 @@ public class BlockType implements Keyed, Pattern { * a specific requirement to actually create new block types, please contact the FAWE devs to discuss. Use * {@link BlockTypes#get(String)} instead. */ - @Deprecated(since = "TODO") + @Deprecated(since = "2.7.0") //FAWE end public BlockType(String id) { this(id, null); @@ -98,7 +98,7 @@ public class BlockType implements Keyed, Pattern { * a specific requirement to actually create new block types, please contact the FAWE devs to discuss. Use * {@link BlockTypes#get(String)} instead. */ - @Deprecated(since = "TODO") + @Deprecated(since = "2.7.0") //FAWE end public BlockType(String id, Function values) { // If it has no namespace, assume minecraft.