From 773fd6f59f21d707698088a830942e8b09905e2d Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Fri, 10 Feb 2023 17:12:15 +0100 Subject: [PATCH 1/4] Release 6.11.0 --- .../plotsquared/bukkit/generator/BukkitPlotGenerator.java | 2 +- .../main/java/com/plotsquared/core/events/EntityEvent.java | 6 +++--- .../com/plotsquared/core/events/RemoveRoadEntityEvent.java | 4 ++-- .../java/com/plotsquared/core/util/SchematicHandler.java | 2 +- Core/src/main/java/com/plotsquared/core/util/WorldUtil.java | 2 +- build.gradle.kts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java index fda56eaf3..5d6dd8409 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -166,7 +166,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 @NonNull ChunkData generateChunkData( @NonNull World world, @NonNull Random random, int x, int z, diff --git a/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java b/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java index 5642342b6..108f7d75b 100644 --- a/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java @@ -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) { diff --git a/Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java b/Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java index aa7155cc7..5b32e2652 100644 --- a/Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java @@ -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); diff --git a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java index 7d2993ed2..c3f75e649 100644 --- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java @@ -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 getSaves(UUID uuid) { String rawJSON; try { 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 1861be25b..83bc0425f 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -255,7 +255,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, diff --git a/build.gradle.kts b/build.gradle.kts index 19635d1e8..497bbdd4e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.10.10-SNAPSHOT" +version = "6.11.0" if (!File("$rootDir/.git").exists()) { logger.lifecycle(""" From 72bb5f00b02808ddcf90b02130916266d73b50d0 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Fri, 10 Feb 2023 17:16:52 +0100 Subject: [PATCH 2/4] Back to snapshot for development --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 497bbdd4e..4e44868c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { } group = "com.plotsquared" -version = "6.11.0" +version = "6.11.1-SNAPSHOT" if (!File("$rootDir/.git").exists()) { logger.lifecycle(""" From 888682e5d0493b87189f03d3652047386970e475 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 09:35:21 +0100 Subject: [PATCH 3/4] Update dependency com.intellectualsites.bom:bom-1.18.x to v1.24 (#3960) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4e44868c0..c62b7a708 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ subprojects { } dependencies { - implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.23")) + implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.24")) } dependencies { From ed33635a15c2ab76e509b5600b7bc42fa3586e85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 09:35:35 +0100 Subject: [PATCH 4/4] Update dependency com.diffplug.spotless to v6.15.0 (#3959) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc02d8785..1056e32a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ http4j = "1.3" # Gradle plugins shadow = "7.1.2" grgit = "4.1.1" -spotless = "6.14.1" +spotless = "6.15.0" nexus = "1.1.0" [libraries]