Skip to content

Commit

Permalink
Release 2.11.2
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Brandes <[email protected]>
  • Loading branch information
NotMyFault committed Sep 15, 2024
1 parent ea5589b commit 5ef7461
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.jetbrains.annotations.Nullable;

/**
* @since TODO
* @since 2.11.2
*/
@ApiStatus.Internal
public interface ChangePopulator<C extends Change> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public ProcessorScope getScope() {
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));
}
Expand All @@ -256,11 +256,11 @@ public void addTileCreate(CompoundTag tag) {
* 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));
}
Expand All @@ -269,11 +269,11 @@ public void addTileRemove(CompoundTag tag) {
* 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));
}
Expand All @@ -282,11 +282,11 @@ public void addEntityRemove(CompoundTag tag) {
* 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));
}
Expand All @@ -295,7 +295,7 @@ public void addEntityCreate(CompoundTag tag) {
* 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);

Expand All @@ -307,7 +307,7 @@ public Iterator<Change> getIterator(BlockBag blockBag, int mode, boolean redo) {

/**
* {@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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.function.BiConsumer;

/**
* @since TODO
* @since 2.11.2
*/
@ApiStatus.Internal
public class ChangeExchangeCoordinator implements AutoCloseable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* A wrapper around compound tags, potentially lazily transformed.
* @since TODO
* @since 2.11.2
*/
public sealed interface FaweCompoundTag permits EagerFaweCompoundTag, LazyFaweCompoundTag {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BlockVector3, CompoundTag> getTiles() {
return AdaptedMap.immutable(tiles(), pos -> pos, IBlocks::toCompoundTag);
}

Map<BlockVector3, FaweCompoundTag> 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) {
Expand All @@ -83,7 +83,7 @@ default CompoundTag getTile(int x, int y, int z) {
@Nullable
FaweCompoundTag tile(int x, int y, int z);

@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "2.11.2")
default Set<CompoundTag> getEntities() {
return entities().stream()
.map(IBlocks::toCompoundTag)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ default void optimize() {

<T extends Future<T>> 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) {
Expand All @@ -63,7 +63,7 @@ default CompoundTag getEntity(UUID uuid) {
@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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ default boolean setBiome(BlockVector3 position, BiomeType biome) {
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()));
}
Expand All @@ -60,7 +60,7 @@ default boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditE

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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public void close() {
* @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<String, Tag<?, ?>> value = new HashMap<>(tag.getValue());
value.put("x", new IntTag(x));
Expand All @@ -446,7 +446,7 @@ public static CompoundTag setPosition(@Nonnull CompoundTag tag, int x, int y, in
* @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<String, Tag<?, ?>> map = new HashMap<>(tag.getValue());
map.put("Id", new StringTag(entity.getState().getType().id()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static Map<String, LinTag<?>> getLinCompoundTagValues(LinCompoundTag tag)
*
* @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();
Expand Down Expand Up @@ -139,7 +139,7 @@ public static UUID uuid(FaweCompoundTag compoundTag) {
* @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()
Expand All @@ -157,7 +157,7 @@ public static UUID uuid(FaweCompoundTag compoundTag) {
* @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));
Expand All @@ -168,7 +168,7 @@ public static UUID uuid(FaweCompoundTag compoundTag) {
*
* @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()
Expand All @@ -191,7 +191,7 @@ public static UUID uuid(FaweCompoundTag compoundTag) {
*
* @param map the map to insert to
* @param uuid the uuid to insert
* @since TODO
* @since 2.11.2
*/
public static void addUUIDToMap(Map<String, LinTag<?>> map, UUID uuid) {
int[] uuidArray = new int[4];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public BaseBlock get(final BlockState state, final IBlocks blocks, final int x,
}
};

@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();
}
Expand Down
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public static Vector3 toVector(ListTag<?, ?> listTag) {
* @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<String, Tag<?, ?>> map, UUID uuid) {
int[] uuidArray = new int[4];
uuidArray[0] = (int) (uuid.getMostSignificantBits() >> 32);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ default <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B
/**
* @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()));
}
Expand All @@ -84,7 +84,7 @@ default boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditE
* @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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public boolean tile(int x, int y, int z, FaweCompoundTag tag) {
}


@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()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ public BiomeType getBiome(Extent orDefault) {
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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ default CompoundTag getDefaultTile() {

/**
* {@return the default tile associated with this material, if any}
* @since TODO
* @since 2.11.2
*/
@Nullable FaweCompoundTag defaultTile();

Expand Down

0 comments on commit 5ef7461

Please sign in to comment.