Merge branch 'v6' into v7

This commit is contained in:
Alexander Brandes 2023-02-12 19:06:11 +01:00
commit 1e7ba7d173
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
7 changed files with 10 additions and 10 deletions

View File

@ -190,7 +190,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
* The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
* release.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.0")
@Override
public void generateNoise(
@NotNull final WorldInfo worldInfo,

View File

@ -31,7 +31,7 @@ public abstract class EntityEvent {
private String name;
/**
* @since TODO
* @since 6.11.0
*/
public EntityEvent(Entity entity) {
this.entity = entity;
@ -41,7 +41,7 @@ public abstract class EntityEvent {
* Obtain the entity involved in the event
*
* @return Entity
* @since TODO
* @since 6.11.0
*/
public Entity getEntity() {
return this.entity;
@ -51,7 +51,7 @@ public abstract class EntityEvent {
* Obtain the event's class name
*
* @return the event class name
* @since TODO
* @since 6.11.0
*/
@NonNull public String getEventName() {
if (this.name == null) {

View File

@ -21,7 +21,7 @@ package com.plotsquared.core.events;
import com.sk89q.worldedit.entity.Entity;
/**
* @since TODO
* @since 6.11.0
*/
public class RemoveRoadEntityEvent extends EntityEvent implements CancellablePlotEvent {
@ -31,7 +31,7 @@ public class RemoveRoadEntityEvent extends EntityEvent implements CancellablePlo
* RemoveRoadEntityEvent: Called when an entity on road is removed.
*
* @param entity The entity to remove
* @since TODO
* @since 6.11.0
*/
public RemoveRoadEntityEvent(Entity entity) {
super(entity);

View File

@ -494,7 +494,7 @@ public abstract class SchematicHandler {
/**
* The legacy web interface is deprecated for removal in favor of Arkitektonika.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.0")
public List<String> getSaves(UUID uuid) {
String rawJSON;
try {

View File

@ -234,7 +234,7 @@ public abstract class WorldUtil {
/**
* The legacy web interface is deprecated for removal in favor of Arkitektonika.
*/
@Deprecated(forRemoval = true, since = "TODO")
@Deprecated(forRemoval = true, since = "6.11.0")
public void upload(
final @NonNull Plot plot,
final @Nullable UUID uuid,

View File

@ -74,7 +74,7 @@ subprojects {
}
dependencies {
implementation(platform("com.intellectualsites.bom:bom-newest:1.23"))
implementation(platform("com.intellectualsites.bom:bom-newest:1.24"))
}
dependencies {

View File

@ -20,7 +20,7 @@ squirrelid = "0.3.1"
# Gradle plugins
shadow = "7.1.2"
grgit = "4.1.1"
spotless = "6.14.1"
spotless = "6.15.0"
nexus = "1.1.0"
[libraries]