mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-23 13:46:45 +01:00
style: Address style issues from previous commit
This commit is contained in:
parent
fda01502b2
commit
51abe5565c
@ -4,16 +4,16 @@ api-version: "1.13"
|
|||||||
version: "${version}"
|
version: "${version}"
|
||||||
load: STARTUP
|
load: STARTUP
|
||||||
description: "Easy, yet powerful Plot World generation and management."
|
description: "Easy, yet powerful Plot World generation and management."
|
||||||
authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell]
|
authors: [ Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell ]
|
||||||
website: https://www.spigotmc.org/resources/77506/
|
website: https://www.spigotmc.org/resources/77506/
|
||||||
softdepend: [Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI]
|
softdepend: [ Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI ]
|
||||||
loadbefore: [MultiWorld, Multiverse-Core]
|
loadbefore: [ MultiWorld, Multiverse-Core ]
|
||||||
depend: [WorldEdit]
|
depend: [ WorldEdit ]
|
||||||
database: false
|
database: false
|
||||||
commands:
|
commands:
|
||||||
plots:
|
plots:
|
||||||
description: Plot command.
|
description: Plot command.
|
||||||
aliases: [p,plot,ps,plotsquared,p2,2,plotme]
|
aliases: [ p,plot,ps,plotsquared,p2,2,plotme ]
|
||||||
permission: plots.use
|
permission: plots.use
|
||||||
permission-message: "You are lacking the permission node 'plots.use'"
|
permission-message: "You are lacking the permission node 'plots.use'"
|
||||||
permissions:
|
permissions:
|
||||||
|
@ -44,7 +44,6 @@ import com.plotsquared.core.util.task.RunnableVal2;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
|
import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
|
||||||
import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
@ -28,8 +28,8 @@ package com.plotsquared.core.command;
|
|||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
||||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
|
||||||
import com.plotsquared.core.configuration.caption.Placeholders;
|
import com.plotsquared.core.configuration.caption.Placeholders;
|
||||||
|
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.events.PlotFlagAddEvent;
|
import com.plotsquared.core.events.PlotFlagAddEvent;
|
||||||
import com.plotsquared.core.events.PlotFlagRemoveEvent;
|
import com.plotsquared.core.events.PlotFlagRemoveEvent;
|
||||||
|
@ -46,7 +46,6 @@ import com.sk89q.worldedit.function.pattern.Pattern;
|
|||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
@ -334,7 +334,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
|
|||||||
LOGGER.info("- plot schematic: {}", schematic3File.getPath());
|
LOGGER.info("- plot schematic: {}", schematic3File.getPath());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((schematic1 == null&& schematic2 == null) || this.ROAD_WIDTH == 0) {
|
if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
|
||||||
if (Settings.DEBUG) {
|
if (Settings.DEBUG) {
|
||||||
LOGGER.info("- schematic: false");
|
LOGGER.info("- schematic: false");
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,6 @@ import com.plotsquared.core.database.DBFunc;
|
|||||||
import com.plotsquared.core.events.Result;
|
import com.plotsquared.core.events.Result;
|
||||||
import com.plotsquared.core.events.TeleportCause;
|
import com.plotsquared.core.events.TeleportCause;
|
||||||
import com.plotsquared.core.generator.ClassicPlotWorld;
|
import com.plotsquared.core.generator.ClassicPlotWorld;
|
||||||
import com.plotsquared.core.generator.HybridPlotWorld;
|
|
||||||
import com.plotsquared.core.listener.PlotListener;
|
import com.plotsquared.core.listener.PlotListener;
|
||||||
import com.plotsquared.core.location.BlockLoc;
|
import com.plotsquared.core.location.BlockLoc;
|
||||||
import com.plotsquared.core.location.Direction;
|
import com.plotsquared.core.location.Direction;
|
||||||
@ -2903,7 +2902,7 @@ public class Plot {
|
|||||||
Placeholder<?> descTemplate = Placeholder.miniMessage("desc", description);
|
Placeholder<?> descTemplate = Placeholder.miniMessage("desc", description);
|
||||||
Placeholder<?> biomeTemplate = Placeholder.miniMessage("biome", biome.toString().toLowerCase());
|
Placeholder<?> biomeTemplate = Placeholder.miniMessage("biome", biome.toString().toLowerCase());
|
||||||
Placeholder<?> ownerTemplate = Placeholder.miniMessage("owner", owner.toString());
|
Placeholder<?> ownerTemplate = Placeholder.miniMessage("owner", owner.toString());
|
||||||
Placeholder<?> membersTemplate =Placeholder.miniMessage("members", members.toString());
|
Placeholder<?> membersTemplate = Placeholder.miniMessage("members", members.toString());
|
||||||
Placeholder<?> playerTemplate = Placeholder.miniMessage("player", player.getName());
|
Placeholder<?> playerTemplate = Placeholder.miniMessage("player", player.getName());
|
||||||
Placeholder<?> trustedTemplate = Placeholder.miniMessage("trusted", trusted.toString());
|
Placeholder<?> trustedTemplate = Placeholder.miniMessage("trusted", trusted.toString());
|
||||||
Placeholder<?> helpersTemplate = Placeholder.miniMessage("helpers", members.toString());
|
Placeholder<?> helpersTemplate = Placeholder.miniMessage("helpers", members.toString());
|
||||||
|
@ -39,23 +39,20 @@ import com.sk89q.worldedit.world.World;
|
|||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
public abstract class QueueCoordinator {
|
public abstract class QueueCoordinator {
|
||||||
|
|
||||||
|
private final AtomicBoolean enqueued = new AtomicBoolean();
|
||||||
private boolean forceSync = false;
|
private boolean forceSync = false;
|
||||||
@Nullable
|
@Nullable
|
||||||
private Object chunkObject;
|
private Object chunkObject;
|
||||||
private final AtomicBoolean enqueued = new AtomicBoolean();
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private GlobalBlockQueue blockQueue;
|
private GlobalBlockQueue blockQueue;
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.uuid.UUIDMapping;
|
import com.plotsquared.core.uuid.UUIDMapping;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -116,7 +115,6 @@ public final class TabCompletions {
|
|||||||
* @param input Command input
|
* @param input Command input
|
||||||
* @param existing Players that should not be included in completions
|
* @param existing Players that should not be included in completions
|
||||||
* @return List of completions
|
* @return List of completions
|
||||||
*
|
|
||||||
* @deprecated In favor {@link #completeAddedPlayers(PlotPlayer, Plot, String, List)}
|
* @deprecated In favor {@link #completeAddedPlayers(PlotPlayer, Plot, String, List)}
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true)
|
@Deprecated(forRemoval = true)
|
||||||
|
@ -28,7 +28,6 @@ package com.plotsquared.core.util.query;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
class OwnersIncludeFilter implements PlotFilter {
|
class OwnersIncludeFilter implements PlotFilter {
|
||||||
|
23
README.md
23
README.md
@ -4,17 +4,14 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
PlotSquared is a land and world management plugin for Minecraft.
|
PlotSquared is a land and world management plugin for Minecraft. It includes several highly configurable world
|
||||||
It includes several highly configurable world generators.
|
generators. You can create plots of land in existing worlds using plot clusters, or you can have a full world of plots.
|
||||||
You can create plots of land in existing worlds using plot clusters, or you can have a full world of plots.
|
|
||||||
|
|
||||||
For the end user, PlotSquared is packed with a tonne of cool features.
|
For the end user, PlotSquared is packed with a tonne of cool features. It allows you to merge plots, and build together
|
||||||
It allows you to merge plots, and build together with your friends.
|
with your friends. You can also change a lot of plot specific settings in the form of flags. Such as: weather, time,
|
||||||
You can also change a lot of plot specific settings in the form of
|
game modes, pvp status.
|
||||||
flags. Such as: weather, time, game modes, pvp status.
|
|
||||||
|
|
||||||
Whilst we provide a whole load of unique features, the biggest focus
|
Whilst we provide a whole load of unique features, the biggest focus is to provide a lag-free and smooth experience.
|
||||||
is to provide a lag-free and smooth experience.
|
|
||||||
|
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@ -33,15 +30,19 @@ is to provide a lag-free and smooth experience.
|
|||||||
* [Contributing](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
|
* [Contributing](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
|
||||||
|
|
||||||
### Developer Resources
|
### Developer Resources
|
||||||
|
|
||||||
* [API Documentation](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Documentation)
|
* [API Documentation](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Documentation)
|
||||||
* [Event API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Events)
|
* [Event API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Events)
|
||||||
* [Flag API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Flag)
|
* [Flag API](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/API-Flag)
|
||||||
|
|
||||||
# Official Addons
|
# Official Addons
|
||||||
|
|
||||||
* [Plot2Dynmap](http://www.spigotmc.org/resources/plot2dynmap.1292/)
|
* [Plot2Dynmap](http://www.spigotmc.org/resources/plot2dynmap.1292/)
|
||||||
* [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)
|
* [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)
|
||||||
* [PlotHider](https://www.spigotmc.org/resources/plot-hider.20701/)
|
* [PlotHider](https://www.spigotmc.org/resources/plot-hider.20701/)
|
||||||
|
|
||||||
### Unmaintained or integrated into PlotSquared
|
### Unmaintained or integrated into PlotSquared
|
||||||
|
|
||||||
* [AdvPlots](http://www.spigotmc.org/resources/advplots-%CE%B2.1500/)
|
* [AdvPlots](http://www.spigotmc.org/resources/advplots-%CE%B2.1500/)
|
||||||
* [PlotRankup](http://www.spigotmc.org/resources/plotrankup.1571/)
|
* [PlotRankup](http://www.spigotmc.org/resources/plotrankup.1571/)
|
||||||
* [PlotZSux](https://www.spigotmc.org/resources/plotzsux.9563/)
|
* [PlotZSux](https://www.spigotmc.org/resources/plotzsux.9563/)
|
||||||
@ -51,5 +52,7 @@ is to provide a lag-free and smooth experience.
|
|||||||
* [BasicPlots](https://www.spigotmc.org/resources/basicplots.6901/)
|
* [BasicPlots](https://www.spigotmc.org/resources/basicplots.6901/)
|
||||||
|
|
||||||
# Sponsors
|
# Sponsors
|
||||||
|
|
||||||
Our official sponsor list can be found [here](https://intellectualsites.github.io/download/sponsors.html). <br>
|
Our official sponsor list can be found [here](https://intellectualsites.github.io/download/sponsors.html). <br>
|
||||||
If you are interested and want to be listed here, [contact us](https://intellectualsites.github.io/download/contact.html).
|
If you are interested and want to be listed
|
||||||
|
here, [contact us](https://intellectualsites.github.io/download/contact.html).
|
||||||
|
@ -151,7 +151,7 @@ allprojects {
|
|||||||
developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
|
developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
|
||||||
}
|
}
|
||||||
|
|
||||||
issueManagement{
|
issueManagement {
|
||||||
system.set("GitHub")
|
system.set("GitHub")
|
||||||
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,9 @@
|
|||||||
"schedule": [
|
"schedule": [
|
||||||
"on monday after 9am"
|
"on monday after 9am"
|
||||||
],
|
],
|
||||||
"labels": ["Renovate"],
|
"labels": [
|
||||||
|
"Renovate"
|
||||||
|
],
|
||||||
"commitMessagePrefix": "build: ",
|
"commitMessagePrefix": "build: ",
|
||||||
"rebaseWhen": "conflicted"
|
"rebaseWhen": "conflicted"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user