From 5ef7461b503665df310a6d04a9fd8fee4c2e0d15 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 15 Sep 2024 17:20:01 +0200 Subject: [PATCH] Release 2.11.2 Signed-off-by: Alexander Brandes --- .../core/history/change/ChangePopulator.java | 2 +- .../history/changeset/AbstractChangeSet.java | 18 +++++++++--------- .../changeset/ChangeExchangeCoordinator.java | 2 +- .../core/nbt/FaweCompoundTag.java | 2 +- .../fastasyncworldedit/core/queue/IBlocks.java | 6 +++--- .../core/queue/IChunkGet.java | 4 ++-- .../core/queue/IChunkSet.java | 4 ++-- .../core/queue/ITileInput.java | 2 +- .../fastasyncworldedit/core/util/MainUtil.java | 4 ++-- .../fastasyncworldedit/core/util/NbtUtils.java | 10 +++++----- .../core/world/block/CompoundInput.java | 2 +- .../src/main/java/com/sk89q/jnbt/NBTUtils.java | 2 +- .../sk89q/worldedit/extent/OutputExtent.java | 4 ++-- .../extent/clipboard/BlockArrayClipboard.java | 2 +- .../com/sk89q/worldedit/math/BlockVector3.java | 2 +- .../world/registry/BlockMaterial.java | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/change/ChangePopulator.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/change/ChangePopulator.java index 6831a443c..84424d948 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/change/ChangePopulator.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/change/ChangePopulator.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * @since TODO + * @since 2.11.2 */ @ApiStatus.Internal public interface ChangePopulator { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/AbstractChangeSet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/AbstractChangeSet.java index 3e60cb4eb..33931aac6 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/AbstractChangeSet.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/AbstractChangeSet.java @@ -242,7 +242,7 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { return ProcessorScope.READING_SET_BLOCKS; } - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public void addTileCreate(CompoundTag tag) { addTileCreate(adapt(tag)); } @@ -256,11 +256,11 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { * Creates a tile/block entity create change to this change set. * * @param tag the tile/block entity to add. - * @since TODO + * @since 2.11.2 */ public abstract void addTileCreate(FaweCompoundTag tag); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public void addTileRemove(CompoundTag tag) { addTileRemove(adapt(tag)); } @@ -269,11 +269,11 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { * Creates a tile/block entity remove change to this change set. * * @param tag the tile/block entity to remove. - * @since TODO + * @since 2.11.2 */ public abstract void addTileRemove(FaweCompoundTag tag); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public void addEntityRemove(CompoundTag tag) { addEntityRemove(adapt(tag)); } @@ -282,11 +282,11 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { * Creates an entity remove change to this change set. * * @param tag the entity to remove. - * @since TODO + * @since 2.11.2 */ public abstract void addEntityRemove(FaweCompoundTag tag); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public void addEntityCreate(CompoundTag tag) { addEntityCreate(adapt(tag)); } @@ -295,7 +295,7 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { * Creates an entity create change to this change set. * * @param tag the entity to add. - * @since TODO + * @since 2.11.2 */ public abstract void addEntityCreate(FaweCompoundTag tag); @@ -307,7 +307,7 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor { /** * {@return a coordinator to exchange sets of changes between a producer and a consumer} - * @since TODO + * @since 2.11.2 */ @ApiStatus.Internal public abstract ChangeExchangeCoordinator getCoordinatedChanges(BlockBag blockBag, int mode, boolean dir); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/ChangeExchangeCoordinator.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/ChangeExchangeCoordinator.java index 56d47500f..2f3398a60 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/ChangeExchangeCoordinator.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/history/changeset/ChangeExchangeCoordinator.java @@ -7,7 +7,7 @@ import java.util.concurrent.Exchanger; import java.util.function.BiConsumer; /** - * @since TODO + * @since 2.11.2 */ @ApiStatus.Internal public class ChangeExchangeCoordinator implements AutoCloseable { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/nbt/FaweCompoundTag.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/nbt/FaweCompoundTag.java index a244f7964..52e38908d 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/nbt/FaweCompoundTag.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/nbt/FaweCompoundTag.java @@ -7,7 +7,7 @@ import org.enginehub.linbus.tree.LinCompoundTag; /** * A wrapper around compound tags, potentially lazily transformed. - * @since TODO + * @since 2.11.2 */ public sealed interface FaweCompoundTag permits EagerFaweCompoundTag, LazyFaweCompoundTag { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IBlocks.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IBlocks.java index b14b7b39d..bda12dbe3 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IBlocks.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IBlocks.java @@ -59,14 +59,14 @@ public interface IBlocks extends Trimable { BlockState getBlock(int x, int y, int z); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default Map getTiles() { return AdaptedMap.immutable(tiles(), pos -> pos, IBlocks::toCompoundTag); } Map tiles(); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default CompoundTag getTile(int x, int y, int z) { final FaweCompoundTag tile = tile(x, y, z); if (tile == null) { @@ -83,7 +83,7 @@ public interface IBlocks extends Trimable { @Nullable FaweCompoundTag tile(int x, int y, int z); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default Set getEntities() { return entities().stream() .map(IBlocks::toCompoundTag) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java index 1ead25284..b72690029 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkGet.java @@ -47,7 +47,7 @@ public interface IChunkGet extends IBlocks, Trimable, InputExtent, ITileInput { > T call(IChunkSet set, Runnable finalize); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default CompoundTag getEntity(UUID uuid) { final FaweCompoundTag entity = entity(uuid); if (entity == null) { @@ -63,7 +63,7 @@ public interface IChunkGet extends IBlocks, Trimable, InputExtent, ITileInput { @Nullable FaweCompoundTag entity(UUID uuid); @Override - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default CompoundTag getTile(int x, int y, int z) { return IBlocks.super.getTile(x, y, z); } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java index 13400f769..fc1482d6e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkSet.java @@ -38,7 +38,7 @@ public interface IChunkSet extends IBlocks, OutputExtent { boolean isEmpty(); @Override - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException { return tile(x, y, z, FaweCompoundTag.of(tile.toLinTag())); } @@ -60,7 +60,7 @@ public interface IChunkSet extends IBlocks, OutputExtent { void setFullBright(int layer); - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default void setEntity(CompoundTag tag) { entity(FaweCompoundTag.of(tag::toLinTag)); } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/ITileInput.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/ITileInput.java index eb0503858..4a88118ef 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/ITileInput.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/ITileInput.java @@ -2,7 +2,7 @@ package com.fastasyncworldedit.core.queue; import com.sk89q.jnbt.CompoundTag; -@Deprecated(forRemoval = true, since = "TODO") +@Deprecated(forRemoval = true, since = "2.11.2") public interface ITileInput { CompoundTag getTile(int x, int y, int z); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java index 115397788..04da475e2 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java @@ -428,7 +428,7 @@ public class MainUtil { * @deprecated use {@link NbtUtils#withPosition} instead */ @Nonnull - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public static CompoundTag setPosition(@Nonnull CompoundTag tag, int x, int y, int z) { Map> value = new HashMap<>(tag.getValue()); value.put("x", new IntTag(x)); @@ -446,7 +446,7 @@ public class MainUtil { * @deprecated use {@link NbtUtils#withEntityInfo(LinCompoundTag, Entity)} instead */ @Nonnull - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public static CompoundTag setEntityInfo(@Nonnull CompoundTag tag, @Nonnull Entity entity) { Map> map = new HashMap<>(tag.getValue()); map.put("Id", new StringTag(entity.getState().getType().id())); diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/NbtUtils.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/NbtUtils.java index 07a752131..ac606ab24 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/NbtUtils.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/NbtUtils.java @@ -96,7 +96,7 @@ public final class NbtUtils { * * @param compoundTag the compound tag to extract uuid information from * @return the extracted UUID - * @since TODO + * @since 2.11.2 */ public static UUID uuid(FaweCompoundTag compoundTag) { final LinCompoundTag linTag = compoundTag.linTag(); @@ -139,7 +139,7 @@ public final class NbtUtils { * @param y New Y coordinate * @param z New Z coordinate * @return New tag - * @since TODO + * @since 2.11.2 */ public static @Nonnull LinCompoundTag withPosition(@Nonnull LinCompoundTag tag, int x, int y, int z) { return tag.toBuilder() @@ -157,7 +157,7 @@ public final class NbtUtils { * @param y New Y coordinate * @param z New Z coordinate * @return New tag - * @since TODO + * @since 2.11.2 */ public static @Nonnull FaweCompoundTag withPosition(@Nonnull FaweCompoundTag tag, int x, int y, int z) { return FaweCompoundTag.of(withPosition(tag.linTag(), x, y, z)); @@ -168,7 +168,7 @@ public final class NbtUtils { * * @param tag the tag to copy * @param entity the entity to use the Id and the Pos from - * @since TODO + * @since 2.11.2 */ public static @Nonnull LinCompoundTag withEntityInfo(@Nonnull LinCompoundTag tag, @Nonnull Entity entity) { final LinCompoundTag.Builder builder = tag.toBuilder() @@ -191,7 +191,7 @@ public final class NbtUtils { * * @param map the map to insert to * @param uuid the uuid to insert - * @since TODO + * @since 2.11.2 */ public static void addUUIDToMap(Map> map, UUID uuid) { int[] uuidArray = new int[4]; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/world/block/CompoundInput.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/world/block/CompoundInput.java index eff3c3de6..37c63a042 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/world/block/CompoundInput.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/world/block/CompoundInput.java @@ -21,7 +21,7 @@ public enum CompoundInput { } }; - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public BaseBlock get(BlockState state, ITileInput input, int x, int y, int z) { return state.toBaseBlock(); } diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java index 11143a6c7..9b28a6d30 100644 --- a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java +++ b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java @@ -174,7 +174,7 @@ public final class NBTUtils { * @since 2.4.0 * @deprecated use {@link com.fastasyncworldedit.core.util.NbtUtils#addUUIDToMap(Map, UUID)} instead */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public static void addUUIDToMap(Map> map, UUID uuid) { int[] uuidArray = new int[4]; uuidArray[0] = (int) (uuid.getMostSignificantBits() >> 32); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java index 1e988b51f..b38e2dc2d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/OutputExtent.java @@ -72,7 +72,7 @@ public interface OutputExtent { /** * @deprecated use {@link #tile(int, int, int, FaweCompoundTag)} instead */ - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") default boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException { return tile(x, y, z, FaweCompoundTag.of(tile.toLinTag())); } @@ -84,7 +84,7 @@ public interface OutputExtent { * @param z the z position * @param tile the tile/block entity to set * @return {@code true} if the tile/block entity was placed - * @since TODO + * @since 2.11.2 */ boolean tile(int x, int y, int z, FaweCompoundTag tile) throws WorldEditException; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java index e67c28abf..9ff666f79 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java @@ -209,7 +209,7 @@ public class BlockArrayClipboard implements Clipboard { } - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public boolean setTile(BlockVector3 position, CompoundTag tag) { return tile(position.x(), position.y(), position.z(), FaweCompoundTag.of(tag.toLinTag())); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java index d8dc989da..017ec7ca0 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java @@ -852,7 +852,7 @@ public abstract class BlockVector3 { return orDefault.getBiome(this); } - @Deprecated(forRemoval = true, since = "TODO") + @Deprecated(forRemoval = true, since = "2.11.2") public CompoundTag getNbtData(Extent orDefault) { return orDefault.getFullBlock(x(), y(), z()).getNbtData(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockMaterial.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockMaterial.java index d37929a37..243acb171 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockMaterial.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockMaterial.java @@ -196,7 +196,7 @@ public interface BlockMaterial { /** * {@return the default tile associated with this material, if any} - * @since TODO + * @since 2.11.2 */ @Nullable FaweCompoundTag defaultTile();