EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v6' into v7

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
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 * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
* release. * release.
*/ */
@Deprecated(forRemoval = true, since = "TODO") @Deprecated(forRemoval = true, since = "6.11.0")
@Override @Override
public void generateNoise( public void generateNoise(
@NotNull final WorldInfo worldInfo, @NotNull final WorldInfo worldInfo,

6
Core/src/main/java/com/plotsquared/core/events/EntityEvent.java
View File

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

4
Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java
View File

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

2
Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
View File

@ -494,7 +494,7 @@ public abstract class SchematicHandler {
/** /**
* The legacy web interface is deprecated for removal in favor of Arkitektonika. * 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) { public List<String> getSaves(UUID uuid) {
String rawJSON; String rawJSON;
try { try {

2
Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
View File

@ -234,7 +234,7 @@ public abstract class WorldUtil {
/** /**
* The legacy web interface is deprecated for removal in favor of Arkitektonika. * 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( public void upload(
final @NonNull Plot plot, final @NonNull Plot plot,
final @Nullable UUID uuid, final @Nullable UUID uuid,

2
build.gradle.kts
View File

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

2
gradle/libs.versions.toml
View File

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