From d08381dfedb3fa15d9f951e1f8d023403192ff36 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 13 Jun 2022 11:23:48 +0200 Subject: [PATCH] build: Release 6.9.0 --- .../bukkit/generator/BlockStatePopulator.java | 4 ++-- .../generator/LegacyBlockStatePopulator.java | 2 +- .../bukkit/queue/LimitedRegionWrapperQueue.java | 4 ++-- .../bukkit/schematic/StateWrapper.java | 4 ++-- .../plotsquared/core/generator/HybridGen.java | 4 ++-- .../core/generator/HybridPlotWorld.java | 16 ++++++++-------- .../core/generator/IndependentPlotGenerator.java | 4 ++-- .../com/plotsquared/core/location/Location.java | 2 +- .../core/location/UncheckedWorldLocation.java | 6 +++--- .../java/com/plotsquared/core/plot/PlotArea.java | 2 +- .../core/queue/ChunkCoordinatorBuilder.java | 2 +- .../plotsquared/core/queue/QueueCoordinator.java | 2 +- .../com/plotsquared/core/util/ChunkManager.java | 6 +++--- build.gradle.kts | 2 +- renovate.json | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java index a635f0e2b..e669100d2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java @@ -46,7 +46,7 @@ final class BlockStatePopulator extends BlockPopulator { private final IndependentPlotGenerator plotGenerator; /** - * @since TODO + * @since 6.9.0 */ public BlockStatePopulator( final @NonNull IndependentPlotGenerator plotGenerator @@ -57,7 +57,7 @@ final class BlockStatePopulator extends BlockPopulator { /** * @deprecated Use {@link BlockStatePopulator#BlockStatePopulator(IndependentPlotGenerator)} as plotAreManager is unused */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public BlockStatePopulator( final @NonNull IndependentPlotGenerator plotGenerator, final @NonNull PlotAreaManager plotAreaManager diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java index 5b312c788..a31e66969 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java @@ -49,7 +49,7 @@ final class LegacyBlockStatePopulator extends BlockPopulator { private final IndependentPlotGenerator plotGenerator; /** - * @since TODO + * @since 6.9.0 */ public LegacyBlockStatePopulator( final @NonNull IndependentPlotGenerator plotGenerator diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java index 6009db3d6..4530d5f24 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java @@ -44,7 +44,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; /** * Wraps a {@link LimitedRegion} inside a {@link com.plotsquared.core.queue.QueueCoordinator} so it can be written to. * - * @since TODO + * @since 6.9.0 */ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator { @@ -53,7 +53,7 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator { private final LimitedRegion limitedRegion; /** - * @since TODO + * @since 6.9.0 */ public LimitedRegionWrapperQueue(LimitedRegion limitedRegion) { super(null); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java index a3d603dbf..c6c429bcb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java @@ -63,7 +63,7 @@ public class StateWrapper { * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a * {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public StateWrapper(org.bukkit.block.BlockState state) { this.state = state; } @@ -267,7 +267,7 @@ public class StateWrapper { * @deprecated in favour of using WorldEdit methods for obtaining NBT, specifically by obtaining a * {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public CompoundTag getTag() { if (this.tag != null) { return this.tag; diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java index 053de6337..fa7c496ab 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java @@ -388,7 +388,7 @@ public class HybridGen extends IndependentPlotGenerator { * Wrapper to allow a WorldEdit {@link Entity} to effectively have a mutable location as the location in its NBT should be changed * when set to the world. * - * @since TODO + * @since 6.9.0 */ private static final class PopulatingEntity implements Entity { @@ -396,7 +396,7 @@ public class HybridGen extends IndependentPlotGenerator { private com.sk89q.worldedit.util.Location location; /** - * @since TODO + * @since 6.9.0 */ private PopulatingEntity(Entity parent, com.sk89q.worldedit.util.Location location) { this.parent = parent; diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java index 2a5999bde..3c64766c0 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java @@ -75,7 +75,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { private static final AffineTransform transform = new AffineTransform().rotateY(90); public boolean ROAD_SCHEMATIC_ENABLED; public boolean PLOT_SCHEMATIC = false; - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public int PLOT_SCHEMATIC_HEIGHT = -1; public short PATH_WIDTH_LOWER; public short PATH_WIDTH_UPPER; @@ -108,7 +108,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { PlotSquared.platform().injector().injectMembers(this); } - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public static byte wrap(byte data, int start) { if ((data >= start) && (data < (start + 4))) { data = (byte) ((((data - start) + 2) & 3) + start); @@ -116,7 +116,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { return data; } - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public static byte wrap2(byte data, int start) { if ((data >= start) && (data < (start + 2))) { data = (byte) ((((data - start) + 1) & 1) + start); @@ -493,7 +493,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { /** * Get the entities contained within the plot schematic for generation. Intended for internal use only. * - * @since TODO + * @since 6.9.0 */ @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public @Nullable List getPlotSchematicEntities() { @@ -503,7 +503,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { /** * Get the minimum point of the plot schematic for generation. Intended for internal use only. * - * @since TODO + * @since 6.9.0 */ @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public @Nullable BlockVector3 getPlotSchematicMinPoint() { @@ -513,7 +513,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { /** * Get if post-generation population of chunks with tiles/entities is needed for this world. Not for public API use. * - * @since TODO + * @since 6.9.0 */ @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public boolean populationNeeded() { @@ -523,7 +523,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { /** * @deprecated in favour of {@link HybridPlotWorld#getSchematicRoot()} */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public File getRoot() { return this.root; } @@ -532,7 +532,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { * Get the root folder for this world's generation schematics. May be null if schematics not initialised via * {@link HybridPlotWorld#setupSchematics()} * - * @since TODO + * @since 6.9.0 */ public @Nullable File getSchematicRoot() { return this.root; diff --git a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java index d39647f69..3aa8095f0 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java @@ -53,7 +53,7 @@ public abstract class IndependentPlotGenerator { * @param settings PlotArea (settings) * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings); /** @@ -64,7 +64,7 @@ public abstract class IndependentPlotGenerator { * @return True if any population occurred * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public boolean populateChunk(ScopedQueueCoordinator result, PlotArea settings) { return false; } diff --git a/Core/src/main/java/com/plotsquared/core/location/Location.java b/Core/src/main/java/com/plotsquared/core/location/Location.java index 91200eb39..40e960f40 100644 --- a/Core/src/main/java/com/plotsquared/core/location/Location.java +++ b/Core/src/main/java/com/plotsquared/core/location/Location.java @@ -49,7 +49,7 @@ public sealed class Location extends BlockLoc implements Comparable pe private final World world; /** - * @since TODO + * @since 6.9.0 */ protected Location( final @NonNull World world, final @NonNull BlockVector3 blockVector3, diff --git a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java index 1e9b1a5bb..009177018 100644 --- a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java +++ b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java @@ -33,7 +33,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; * Used internally for generation to reference locations in worlds that "don't exist yet". There is no guarantee that the world * name provided by {@link UncheckedWorldLocation#getWorldName()} exists on the server. * - * @since TODO + * @since 6.9.0 */ @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public final class UncheckedWorldLocation extends Location { @@ -41,7 +41,7 @@ public final class UncheckedWorldLocation extends Location { private final String worldName; /** - * @since TODO + * @since 6.9.0 */ private UncheckedWorldLocation( final @NonNull String worldName, final int x, final int y, final int z @@ -59,7 +59,7 @@ public final class UncheckedWorldLocation extends Location { * @param z Z coordinate * @return New location * - * @since TODO + * @since 6.9.0 */ @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public static @NonNull UncheckedWorldLocation at( diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index d618e74cf..83de04ec4 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -984,7 +984,7 @@ public abstract class PlotArea { * @param whenDone Task to run when any merge world changes are complete. Also runs if no changes were made. Does not * run if there was an error or if too few plots IDs were supplied. * @return if merges were completed successfully. - * @since TODO + * @since 6.9.0 */ public boolean mergePlots( final @NonNull List plotIds, final boolean removeRoads, final @Nullable Runnable whenDone diff --git a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java index 49e8de209..211504584 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java +++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java @@ -203,7 +203,7 @@ public class ChunkCoordinatorBuilder { * and simply effectively makes {@link ChunkCoordinator#start()} ()} a blocking operation. * * @param forceSync force sync or not - * @since TODO + * @since 6.9.0 */ public @NonNull ChunkCoordinatorBuilder forceSync(final boolean forceSync) { this.forceSync = forceSync; diff --git a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java index 72ab65f77..6c810c970 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java @@ -93,7 +93,7 @@ public abstract class QueueCoordinator { * @since 6.6.0 * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) { int bx = x << 4; int bz = z << 4; diff --git a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java index 1d16922a7..623ad5115 100644 --- a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java @@ -45,7 +45,7 @@ public abstract class ChunkManager { /** * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public static void setChunkInPlotArea( RunnableVal force, RunnableVal add, @@ -86,7 +86,7 @@ public abstract class ChunkManager { /** * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { final RunnableVal forceChunk = forceChunks.get(loc); if (forceChunk != null) { @@ -100,7 +100,7 @@ public abstract class ChunkManager { /** * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "6.9.0") public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { final RunnableVal addChunk = forceChunks.get(loc); if (addChunk != null) { diff --git a/build.gradle.kts b/build.gradle.kts index e2dd9ec20..d1a38cf4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { idea } -version = "6.8.2-SNAPSHOT" +version = "6.9.0" allprojects { group = "com.plotsquared" diff --git a/renovate.json b/renovate.json index 7b9ed9a16..dcdc29d88 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ ], "timezone": "Europe/Berlin", "schedule": [ - "on monday after 9am" + "every monday" ], "labels": ["Renovate"], "commitMessagePrefix": "build: ",