From a79c474957edfe034eb285896c9936a6166b5ee7 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Thu, 9 Jun 2022 13:49:58 +0100 Subject: [PATCH] Deprecate methods for removal that will be removed/had their signatures changed in v7 --- .../core/generator/IndependentPlotGenerator.java | 6 ++++++ .../com/plotsquared/core/queue/QueueCoordinator.java | 2 ++ .../java/com/plotsquared/core/util/ChunkManager.java | 12 ++++++++++++ 3 files changed, 20 insertions(+) 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 94ca5f587..ea207177d 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java @@ -53,9 +53,15 @@ public abstract class IndependentPlotGenerator { * * @param result queue * @param settings PlotArea (settings) + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ + @Deprecated(forRemoval = true, since = "TODO") public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings); + /** + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. + */ + @Deprecated(forRemoval = true, since = "TODO") public boolean populateChunk(ScopedQueueCoordinator result, PlotArea setting) { return false; } 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 7622bb05d..a53158d1e 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,9 @@ public abstract class QueueCoordinator { * @param z chunk z coordinate * @return a new {@link ScopedQueueCoordinator} * @since 6.6.0 + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. */ + @Deprecated(forRemoval = true, since = "TODO") 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 cda456bbc..1d16922a7 100644 --- a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java @@ -42,6 +42,10 @@ public abstract class ChunkManager { private static final Map> forceChunks = new ConcurrentHashMap<>(); private static final Map> addChunks = new ConcurrentHashMap<>(); + /** + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. + */ + @Deprecated(forRemoval = true, since = "TODO") public static void setChunkInPlotArea( RunnableVal force, RunnableVal add, @@ -79,6 +83,10 @@ public abstract class ChunkManager { } } + /** + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. + */ + @Deprecated(forRemoval = true, since = "TODO") public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { final RunnableVal forceChunk = forceChunks.get(loc); if (forceChunk != null) { @@ -89,6 +97,10 @@ public abstract class ChunkManager { return false; } + /** + * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. + */ + @Deprecated(forRemoval = true, since = "TODO") public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { final RunnableVal addChunk = forceChunks.get(loc); if (addChunk != null) {