diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java index fcd8b615b..9c20d0c6d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java @@ -31,6 +31,7 @@ import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.location.ChunkWrapper; import com.plotsquared.core.location.Location; import com.plotsquared.core.queue.ScopedQueueCoordinator; +import com.plotsquared.core.util.AnnotationHelper; import com.plotsquared.core.util.ChunkUtil; import com.plotsquared.core.util.PatternUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -50,6 +51,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") public class GenChunk extends ScopedQueueCoordinator { public final Biome[] biomes; @@ -61,21 +63,7 @@ public class GenChunk extends ScopedQueueCoordinator { public int chunkZ; private ChunkData chunkData = null; - /** - * Not API. Used as a bridge between P2 and Bukkit {@link Chunk}. - * - * @deprecated Use {@link GenChunk#regenChunk(int, int)} for extended world heights - * @since TODO - */ - @Deprecated(forRemoval = true, since = "TODO") - public GenChunk() { - this(0, 255); - } - - /** - * Not API. Used as a bridge between P2 and Bukkit {@link Chunk}. - * * @param minY minimum world Y, inclusive * @param maxY maximum world Y, inclusive * diff --git a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java index 3ef79df52..0ea07a71d 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java +++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java @@ -102,6 +102,7 @@ public interface PlotPlatform

extends LocaleHolder { * Gets the default minimum world height for the version of Minecraft that the server is running. * * @return minimum world height + * @since TODO */ int versionMinHeight(); @@ -109,6 +110,7 @@ public interface PlotPlatform

extends LocaleHolder { * Gets the default maximum world height for the version of Minecraft that the server is running. * * @return maximum world height + * @since TODO */ int versionMaxHeight(); diff --git a/Core/src/main/java/com/plotsquared/core/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java index 203801f42..872d1bd68 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java +++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java @@ -1100,18 +1100,14 @@ public class PlotSquared { ConfigurationUtil.INTEGER.parseString(value).shortValue() ); } - case "minh", "minheight" -> { - this.worldConfiguration.set( - base + "world.min_gen_height", - ConfigurationUtil.INTEGER.parseString(value).shortValue() - ); - } - case "maxh", "maxheight" -> { - this.worldConfiguration.set( - base + "world.max_gen_height", - ConfigurationUtil.INTEGER.parseString(value).shortValue() - ); - } + case "minh", "minheight" -> this.worldConfiguration.set( + base + "world.min_gen_height", + ConfigurationUtil.INTEGER.parseString(value).shortValue() + ); + case "maxh", "maxheight" -> this.worldConfiguration.set( + base + "world.max_gen_height", + ConfigurationUtil.INTEGER.parseString(value).shortValue() + ); case "f", "floor" -> this.worldConfiguration.set( base + "plot.floor", ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString() diff --git a/Core/src/main/java/com/plotsquared/core/queue/LocalChunk.java b/Core/src/main/java/com/plotsquared/core/queue/LocalChunk.java index 86ab6bafb..f8dc61c3f 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/LocalChunk.java +++ b/Core/src/main/java/com/plotsquared/core/queue/LocalChunk.java @@ -73,6 +73,8 @@ public class LocalChunk { /** * Get the minimum layer position stored (usually -4 or 0). + * + * @since TODO */ public int getMinSection() { return this.minSection; 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 7650de385..9cc130690 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java @@ -88,6 +88,7 @@ public abstract class QueueCoordinator { * @param x chunk x coordinate * @param z chunk z coordinate * @return a new {@link ScopedQueueCoordinator} + * @since TODO */ public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) { int bx = x << 4; diff --git a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java index 475c21d2b..606809291 100644 --- a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java @@ -390,6 +390,16 @@ public abstract class RegionManager { setBiome(region, extendBiome, biome, PlotSquared.get().getPlotAreaManager().getPlotAreas(world, region)[0], whenDone); } + /** + * Set a region to a biome type. + * + * @param region region to set + * @param extendBiome how far outside the region to extent setting the biome too account for 3D biomes being 4x4 + * @param biome biome to set + * @param area {@link PlotArea} in which the biome is being set + * @param whenDone task to run when complete + * @since TODO + */ public void setBiome( final CuboidRegion region, final int extendBiome, diff --git a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java index e35614be2..1e85cb94d 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -96,6 +96,7 @@ public abstract class WorldUtil { * @param p2x Max X * @param p2z Max Z * @param biome Biome + * @since TODO */ public static void setBiome(PlotArea area, int p1x, int p1z, int p2x, int p2z, BiomeType biome) { BlockVector3 pos1 = BlockVector2.at(p1x, p1z).toBlockVector3(area.getMinGenHeight());