mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-04 14:44:43 +02:00
Compare commits
9 Commits
fix/expire
...
refactor/v
Author | SHA1 | Date | |
---|---|---|---|
18346a0564 | |||
28bd993680 | |||
8330f37d8a | |||
985fae65b6 | |||
db2d590e8e | |||
c8d356783a | |||
4947450ff0 | |||
de4e91ff62 | |||
fe5e3d5f6d |
@ -33,7 +33,6 @@ import org.bukkit.Chunk;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.generator.BlockPopulator;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@ -51,7 +50,7 @@ final class LegacyBlockStatePopulator extends BlockPopulator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void populate(@NotNull final World world, @NotNull final Random random, @NotNull final Chunk source) {
|
||||
public void populate(@NonNull final World world, @NonNull final Random random, @NonNull final Chunk source) {
|
||||
int chunkMinX = source.getX() << 4;
|
||||
int chunkMinZ = source.getZ() << 4;
|
||||
PlotArea area = Location.at(world.getName(), chunkMinX, 0, chunkMinZ).getPlotArea();
|
||||
|
@ -36,8 +36,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@ -46,10 +45,7 @@ public class FaweRegionManager extends BukkitRegionManager {
|
||||
private final FaweDelegateRegionManager delegate = new FaweDelegateRegionManager();
|
||||
|
||||
@Inject
|
||||
public FaweRegionManager(
|
||||
@NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
|
||||
ProgressSubscriberFactory subscriberFactory
|
||||
) {
|
||||
public FaweRegionManager(WorldUtil worldUtil, GlobalBlockQueue blockQueue, ProgressSubscriberFactory subscriberFactory) {
|
||||
super(worldUtil, blockQueue, subscriberFactory);
|
||||
}
|
||||
|
||||
@ -76,9 +72,9 @@ public class FaweRegionManager extends BukkitRegionManager {
|
||||
|
||||
@Override
|
||||
public boolean handleClear(
|
||||
@NotNull Plot plot,
|
||||
@NonNull Plot plot,
|
||||
@Nullable Runnable whenDone,
|
||||
@NotNull PlotManager manager,
|
||||
@NonNull PlotManager manager,
|
||||
final @Nullable PlotPlayer<?> player
|
||||
) {
|
||||
if (!Settings.FAWE_Components.CLEAR || !(manager instanceof HybridPlotManager)) {
|
||||
|
@ -29,7 +29,7 @@ import com.plotsquared.core.util.SchematicHandler;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
@ -40,7 +40,7 @@ public class FaweSchematicHandler extends SchematicHandler {
|
||||
private final FaweDelegateSchematicHandler delegate = new FaweDelegateSchematicHandler();
|
||||
|
||||
@Inject
|
||||
public FaweSchematicHandler(@NotNull WorldUtil worldUtil, @NotNull ProgressSubscriberFactory subscriberFactory) {
|
||||
public FaweSchematicHandler(WorldUtil worldUtil, ProgressSubscriberFactory subscriberFactory) {
|
||||
super(worldUtil, subscriberFactory);
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@ public class FaweSchematicHandler extends SchematicHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Schematic getSchematic(@NotNull InputStream is) {
|
||||
public Schematic getSchematic(@NonNull InputStream is) {
|
||||
return delegate.getSchematic(is);
|
||||
}
|
||||
|
||||
|
@ -289,7 +289,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
|
||||
* Get the {@link ExpireManager} implementation for the platform
|
||||
*
|
||||
* @return Expire manager
|
||||
* @since TODO
|
||||
* @since 6.10.2
|
||||
*/
|
||||
default @NonNull ExpireManager expireManager() {
|
||||
return injector().getInstance(ExpireManager.class);
|
||||
|
@ -140,8 +140,7 @@ public class DebugExec extends SubCommand {
|
||||
return true;
|
||||
}
|
||||
case "start-expire" -> {
|
||||
ExpireManager expireManager = PlotSquared.platform().expireManager() == null ? new ExpireManager(this.eventDispatcher) : PlotSquared.platform().expireManager();
|
||||
if (expireManager.runAutomatedTask()) {
|
||||
if (PlotSquared.platform().expireManager().runAutomatedTask()) {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.expiry_started"));
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.expiry_already_started"));
|
||||
@ -149,7 +148,7 @@ public class DebugExec extends SubCommand {
|
||||
return true;
|
||||
}
|
||||
case "stop-expire" -> {
|
||||
if (PlotSquared.platform().expireManager() == null || !PlotSquared.platform().expireManager().cancelTask()) {
|
||||
if (!PlotSquared.platform().expireManager().cancelTask()) {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.task_halted"));
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));
|
||||
|
@ -21,16 +21,15 @@ package com.plotsquared.core.configuration.caption;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.event.ClickEvent;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Set;
|
||||
|
||||
final class ClickStripTransform implements ComponentTransform {
|
||||
|
||||
private final Set<ClickEvent.@NotNull Action> actionsToStrip;
|
||||
private final Set<ClickEvent.@NonNull Action> actionsToStrip;
|
||||
|
||||
public ClickStripTransform(final Set<ClickEvent.@NotNull Action> actionsToStrip) {
|
||||
public ClickStripTransform(final Set<ClickEvent.@NonNull Action> actionsToStrip) {
|
||||
this.actionsToStrip = EnumSet.copyOf(actionsToStrip);
|
||||
}
|
||||
|
||||
|
@ -93,10 +93,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
@Inject
|
||||
public HybridPlotWorld(
|
||||
@Assisted("world") final String worldName,
|
||||
@Nullable @Assisted("id") final String id,
|
||||
@javax.annotation.Nullable @Assisted("id") final String id,
|
||||
@Assisted final @NonNull IndependentPlotGenerator generator,
|
||||
@Nullable @Assisted("min") final PlotId min,
|
||||
@Nullable @Assisted("max") final PlotId max,
|
||||
@javax.annotation.Nullable @Assisted("min") final PlotId min,
|
||||
@javax.annotation.Nullable @Assisted("max") final PlotId max,
|
||||
@WorldConfig final @NonNull YamlConfiguration worldConfiguration,
|
||||
final @NonNull GlobalBlockQueue blockQueue
|
||||
) {
|
||||
@ -298,7 +298,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
int roadSchemHeight;
|
||||
|
||||
if (schematic1 != null) {
|
||||
roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
|
||||
roadSchemHeight = Math.max(
|
||||
schematic1.getClipboard().getDimensions().getY(),
|
||||
schematic2.getClipboard().getDimensions().getY()
|
||||
);
|
||||
maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
|
||||
if (maxSchematicHeight == worldGenHeight) {
|
||||
SCHEM_Y = getMinGenHeight();
|
||||
@ -486,7 +489,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
/**
|
||||
* @deprecated This method should not be available for public API usage and will be made private.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
|
||||
if (z < 0) {
|
||||
z += this.SIZE;
|
||||
@ -521,7 +524,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
||||
/**
|
||||
* @deprecated This method should not be available for public API usage and will be made private.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public void addOverlayBiome(short x, short z, BiomeType id) {
|
||||
if (z < 0) {
|
||||
z += this.SIZE;
|
||||
|
@ -112,7 +112,7 @@ public final class PlotId {
|
||||
* @return Plot ID copy
|
||||
* @deprecated PlotId is immutable, copy is not required.
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public @NonNull PlotId copy() {
|
||||
return this;
|
||||
}
|
||||
|
@ -18,7 +18,8 @@
|
||||
*/
|
||||
package com.plotsquared.core.plot;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class PlotTitle {
|
||||
|
@ -18,6 +18,7 @@
|
||||
*/
|
||||
package com.plotsquared.core.plot.expiration;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotPlatform;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.caption.Caption;
|
||||
@ -64,7 +65,7 @@ public class ExpireManager {
|
||||
/**
|
||||
* @deprecated Use {@link PlotPlatform#expireManager()} instead
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "TODO")
|
||||
@Deprecated(forRemoval = true, since = "6.10.2")
|
||||
public static ExpireManager IMP;
|
||||
private final ConcurrentHashMap<UUID, Long> dates_cache;
|
||||
private final ConcurrentHashMap<UUID, Long> account_age_cache;
|
||||
@ -76,6 +77,7 @@ public class ExpireManager {
|
||||
*/
|
||||
private int running;
|
||||
|
||||
@Inject
|
||||
public ExpireManager(final @NonNull EventDispatcher eventDispatcher) {
|
||||
this.tasks = new ArrayDeque<>();
|
||||
this.dates_cache = new ConcurrentHashMap<>();
|
||||
|
@ -19,7 +19,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.plotsquared"
|
||||
version = "6.10.2-SNAPSHOT"
|
||||
version = "6.10.4-SNAPSHOT"
|
||||
|
||||
subprojects {
|
||||
group = rootProject.group
|
||||
@ -65,7 +65,7 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.16"))
|
||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
Reference in New Issue
Block a user