From e6db8e27501161db2d928a2bdd74937d85ebb536 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 6 Mar 2023 11:38:30 +0100 Subject: [PATCH] Perform code formatting according to editorconfig (#3981) * Perform code reformatting * Fix javadoc errors --- .../workflows/announce-release-on-discord.yml | 2 +- .github/workflows/build-pr.yml | 4 +- .github/workflows/build.yml | 4 +- .github/workflows/codeql.yml | 2 +- .github/workflows/release-drafter.yml | 4 +- .../plotsquared/bukkit/BukkitPlatform.java | 16 +- .../bukkit/generator/BukkitPlotGenerator.java | 5 +- .../bukkit/listener/BlockEventListener.java | 4 +- .../listener/BlockEventListener117.java | 6 +- .../bukkit/listener/ChunkListener.java | 3 +- .../bukkit/listener/PaperListener.java | 10 +- .../bukkit/listener/PlayerEventListener.java | 6 +- .../listener/ProjectileEventListener.java | 2 +- .../bukkit/player/BukkitOfflinePlayer.java | 2 +- .../bukkit/queue/BukkitQueueCoordinator.java | 2 +- .../plotsquared/bukkit/queue/GenChunk.java | 1 - .../bukkit/util/BukkitRegionManager.java | 2 +- .../bukkit/util/TranslationUpdateManager.java | 1 + .../bukkit/util/UpdateUtility.java | 3 +- Bukkit/src/main/resources/plugin.yml | 10 +- CODE_OF_CONDUCT.md | 6 +- .../com/plotsquared/core/PlotSquared.java | 8 +- .../core/backup/SimpleBackupManager.java | 32 +- .../com/plotsquared/core/command/Add.java | 3 +- .../com/plotsquared/core/command/Copy.java | 3 +- .../plotsquared/core/command/DebugPaste.java | 6 +- .../plotsquared/core/command/Download.java | 33 +- .../com/plotsquared/core/command/Help.java | 7 +- .../com/plotsquared/core/command/Info.java | 5 +- .../com/plotsquared/core/command/ListCmd.java | 10 +- .../com/plotsquared/core/command/Purge.java | 3 +- .../core/components/ComponentPreset.java | 3 +- .../caption/load/CaptionLoader.java | 2 +- .../load/ClassLoaderCaptionProvider.java | 3 +- .../plotsquared/core/events/EntityEvent.java | 3 +- .../core/generator/ClassicPlotWorld.java | 31 +- .../plotsquared/core/generator/HybridGen.java | 17 +- .../core/generator/HybridPlotManager.java | 20 +- .../generator/IndependentPlotGenerator.java | 9 +- .../core/listener/PlotListener.java | 17 +- .../core/location/UncheckedWorldLocation.java | 1 - .../plotsquared/core/plot/BlockBucket.java | 14 +- .../com/plotsquared/core/plot/PlotArea.java | 8 +- .../plotsquared/core/plot/PlotInventory.java | 2 +- .../core/plot/expiration/ExpiryTask.java | 1 + .../implementations/BeaconEffectsFlag.java | 2 +- .../flag/implementations/ProjectilesFlag.java | 2 +- .../core/plot/flag/types/TimedFlag.java | 8 +- .../core/plot/world/SinglePlotArea.java | 1 + ...BlockArrayCacheScopedQueueCoordinator.java | 3 +- .../core/queue/ChunkCoordinator.java | 1 + .../core/queue/QueueCoordinator.java | 3 +- .../core/synchronization/LockRepository.java | 6 +- .../plotsquared/core/util/InventoryUtil.java | 14 +- .../plotsquared/core/util/RegionManager.java | 3 +- .../com/plotsquared/core/util/WorldUtil.java | 3 +- .../placeholders/PlaceholderRegistry.java | 6 +- Core/src/main/resources/lang/messages_en.json | 1442 ++++++++--------- .../com/plotsquared/core/plot/FlagTest.java | 1 + .../core/plot/PlotRangeIteratorTest.java | 1 + .../synchronization/LockRepositoryTest.java | 1 + .../plotsquared/core/util/StringManTest.java | 7 +- README.md | 22 +- build.gradle.kts | 2 +- javadocfooter.html | 6 +- renovate.json | 14 +- 66 files changed, 986 insertions(+), 898 deletions(-) diff --git a/.github/workflows/announce-release-on-discord.yml b/.github/workflows/announce-release-on-discord.yml index b3daa209a..215bddccb 100644 --- a/.github/workflows/announce-release-on-discord.yml +++ b/.github/workflows/announce-release-on-discord.yml @@ -1,7 +1,7 @@ name: Announce release on discord on: release: - types: [published] + types: [ published ] jobs: send_announcement: runs-on: ubuntu-latest diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 6ec60c0b1..785a62d4d 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,12 +1,12 @@ name: Build PR -on: [pull_request] +on: [ pull_request ] jobs: build_pr: if: github.repository_owner == 'IntellectualSites' runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ ubuntu-latest, windows-latest, macos-latest ] steps: - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b097c8267..63d4bfe1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} - name: Publish core javadoc - # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} + # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 env: @@ -55,7 +55,7 @@ jobs: target-branch: main target-directory: v7/core - name: Publish bukkit javadoc - # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} + # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}} uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main env: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 781aa5f1a..31f69f613 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - language: ['java'] + language: [ 'java' ] steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 35dd31ae2..bfdc294d6 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,9 +4,9 @@ on: branches: - v6 pull_request: - types: [opened, reopened, synchronize] + types: [ opened, reopened, synchronize ] pull_request_target: - types: [opened, reopened, synchronize] + types: [ opened, reopened, synchronize ] jobs: update_release_draft: if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }} diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java index ad330489b..2b05b9742 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java @@ -49,8 +49,8 @@ import com.plotsquared.bukkit.player.BukkitPlayerManager; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitWorld; import com.plotsquared.bukkit.util.SetGenCB; -import com.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.bukkit.util.TranslationUpdateManager; +import com.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.bukkit.util.task.BukkitTaskManager; import com.plotsquared.bukkit.util.task.PaperTimeConverter; import com.plotsquared.bukkit.util.task.SpigotTimeConverter; @@ -366,7 +366,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this); getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this); if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) { - getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this); + getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this); } else { getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this); } @@ -1185,9 +1185,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl public @NonNull String worldEditImplementations() { StringBuilder msg = new StringBuilder(); if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) { - msg.append("FastAsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit").getDescription().getVersion()); + msg.append("FastAsyncWorldEdit: ").append(Bukkit + .getPluginManager() + .getPlugin("FastAsyncWorldEdit") + .getDescription() + .getVersion()); } else if (Bukkit.getPluginManager().getPlugin("AsyncWorldEdit") != null) { - msg.append("AsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("AsyncWorldEdit").getDescription().getVersion()).append("\n"); + msg.append("AsyncWorldEdit: ").append(Bukkit + .getPluginManager() + .getPlugin("AsyncWorldEdit") + .getDescription() + .getVersion()).append("\n"); msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion()); } else { msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion()); 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 72dd48967..7baccd0ae 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -54,7 +54,7 @@ import java.util.Set; public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper { - private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName()); + private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName()); @SuppressWarnings("unused") public final boolean PAPER_ASYNC_SAFE = true; @@ -382,7 +382,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap } PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea(); if (area == null) { - throw new IllegalStateException(String.format("Cannot generate chunk that does not belong to a plot area. World: %s", + throw new IllegalStateException(String.format( + "Cannot generate chunk that does not belong to a plot area. World: %s", name )); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java index b234c81fd..1d87b283a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java @@ -759,7 +759,9 @@ public class BlockEventListener implements Listener { return; } - if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) { + if (block.getBlockData() instanceof Farmland farmland && event + .getNewState() + .getBlockData() instanceof Farmland newFarmland) { int currentMoisture = farmland.getMoisture(); int newMoisture = newFarmland.getMoisture(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java index d4b71a7b2..34a69adc7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java @@ -92,7 +92,11 @@ public class BlockEventListener117 implements Listener { } Plot plot = location.getOwnedPlot(); - if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) || plot != null && !plot.getFlag( + if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals( + area, + MiscInteractFlag.class, + true + ) || plot != null && !plot.getFlag( MiscInteractFlag.class)) { if (plotPlayer != null) { if (plot != null) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java index b2326f32e..9af09527c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java @@ -234,7 +234,8 @@ public class ChunkListener implements Listener { Chunk chunk = event.getChunk(); if (Settings.Chunk_Processor.AUTO_TRIM) { String world = chunk.getWorld().getName(); - if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(world)) { + if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea( + world)) { if (unloadChunk(world, chunk, true)) { return; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java index c00f6157a..0e058e9a1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java @@ -43,10 +43,10 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; import com.plotsquared.core.plot.flag.types.BooleanFlag; import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.util.PlotFlagUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import com.plotsquared.core.util.PlotFlagUtil; import org.bukkit.Chunk; import org.bukkit.block.Block; import org.bukkit.block.TileState; @@ -439,9 +439,11 @@ public class PaperListener implements Listener { } } - private boolean getBooleanFlagValue(@NonNull FlagContainer container, - @NonNull Class> flagClass, - boolean defaultValue) { + private boolean getBooleanFlagValue( + @NonNull FlagContainer container, + @NonNull Class> flagClass, + boolean defaultValue + ) { BooleanFlag flag = container.getFlag(flagClass); return flag == null ? defaultValue : flag.getValue(); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java index 27a3bee6d..9beaa2ad9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java @@ -572,7 +572,8 @@ public class PlayerEventListener implements Listener { if (now == null) { try (final MetaDataAccess kickAccess = pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) { - if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { + if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse( + false)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), TagResolver.resolver( @@ -665,7 +666,8 @@ public class PlayerEventListener implements Listener { if (plot == null) { try (final MetaDataAccess kickAccess = pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) { - if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { + if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse( + false)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), TagResolver.resolver( diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java index c3a8d468f..e84695445 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java @@ -30,9 +30,9 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotHandler; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; import com.plotsquared.core.plot.world.PlotAreaManager; +import com.plotsquared.core.util.PlotFlagUtil; import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import com.plotsquared.core.util.PlotFlagUtil; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java index 928cbca7d..2b98491fb 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java @@ -43,7 +43,7 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer { */ public BukkitOfflinePlayer( final @NonNull OfflinePlayer player, final @NonNull - PermissionHandler permissionHandler + PermissionHandler permissionHandler ) { this.player = player; this.permissionProfile = permissionHandler.getPermissionProfile(this) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java index 69cbca503..78749339c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java @@ -270,7 +270,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator { if (getChunkObject() instanceof Chunk chunkObject) { existing = chunkObject.getBlock(x & 15, y, z & 15); } else { - existing = getBukkitWorld().getBlockAt(x, y, z); + existing = getBukkitWorld().getBlockAt(x, y, z); } final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData()); if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java index 94e2cdde9..b591b4d9e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java @@ -62,7 +62,6 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator { /** * @param minY minimum world Y, inclusive * @param maxY maximum world Y, inclusive - * * @since 6.6.0 */ public GenChunk(int minY, int maxY) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java index 74276872f..d78991c89 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java @@ -70,7 +70,7 @@ public class BukkitRegionManager extends RegionManager { @Inject public BukkitRegionManager( @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull - ProgressSubscriberFactory subscriberFactory + ProgressSubscriberFactory subscriberFactory ) { super(worldUtil, blockQueue, subscriberFactory); this.blockQueue = blockQueue; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java index 89d18dfb5..1d3459d45 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java @@ -60,4 +60,5 @@ public class TranslationUpdateManager { e.printStackTrace(); } } + } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java index eeb3257e3..5e1e4c985 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java @@ -54,7 +54,8 @@ public class UpdateUtility implements Listener { internalVersion = PlotSquared.get().getVersion(); } - @SuppressWarnings({"deprecation", "DefaultCharset"}) // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet + @SuppressWarnings({"deprecation", "DefaultCharset"}) + // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet public void updateChecker() { task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> { try { diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index c4cecd6a4..10a9ae019 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -4,16 +4,16 @@ api-version: "1.13" version: "${version}" load: STARTUP 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/ -softdepend: [Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI] -loadbefore: [MultiWorld, Multiverse-Core] -depend: [WorldEdit] +softdepend: [ Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI ] +loadbefore: [ MultiWorld, Multiverse-Core ] +depend: [ WorldEdit ] database: false commands: plots: description: Plot command. - aliases: [p,plot,ps,plotsquared,p2,2,plotme] + aliases: [ p,plot,ps,plotsquared,p2,2,plotme ] permission: plots.use permission-message: "You are lacking the permission node 'plots.use'" permissions: diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ce10a4445..742b2c651 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -23,13 +23,13 @@ include: Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or - advances + advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic - address, without explicit permission + address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a - professional setting + professional setting ## Our Responsibilities diff --git a/Core/src/main/java/com/plotsquared/core/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java index 3898e8a61..579abe1e8 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java +++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java @@ -270,7 +270,11 @@ public class PlotSquared { captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang")); } else { String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json"; - captionMap = this.captionLoader.loadOrCreateSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName)); + captionMap = this.captionLoader.loadOrCreateSingle(this.platform + .getDirectory() + .toPath() + .resolve("lang") + .resolve(fileName)); } this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap); LOGGER.info( @@ -1011,7 +1015,7 @@ public class PlotSquared { /** * Setup the configuration for a plot world based on world arguments. - * + *

* * e.g. /mv create <world> normal -g PlotSquared:<args> * diff --git a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java index d89cfc5ac..f9f670532 100644 --- a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java +++ b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java @@ -141,24 +141,24 @@ public class SimpleBackupManager implements BackupManager { ) { @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - final PlotCacheKey that = (PlotCacheKey) o; - return Objects.equals(plot.getArea(), that.plot.getArea()) - && Objects.equals(plot.getId(), that.plot.getId()) - && Objects.equals(plot.getOwnerAbs(), that.plot.getOwnerAbs()); + public boolean equals(final Object o) { + if (this == o) { + return true; } - - @Override - public int hashCode() { - return Objects.hash(plot.getArea(), plot.getId(), plot.getOwnerAbs()); + if (o == null || getClass() != o.getClass()) { + return false; } - + final PlotCacheKey that = (PlotCacheKey) o; + return Objects.equals(plot.getArea(), that.plot.getArea()) + && Objects.equals(plot.getId(), that.plot.getId()) + && Objects.equals(plot.getOwnerAbs(), that.plot.getOwnerAbs()); } + @Override + public int hashCode() { + return Objects.hash(plot.getArea(), plot.getId(), plot.getOwnerAbs()); + } + + } + } diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java index d70129c27..45db5366d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Add.java +++ b/Core/src/main/java/com/plotsquared/core/command/Add.java @@ -70,7 +70,8 @@ public class Add extends Command { plot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST), TranslatableCaption.of("permission.no_plot_perms") ); - checkTrue(args.length == 1, + checkTrue( + args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"), TagResolver.resolver("value", Tag.inserting(Component.text("/plot add "))) ); diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java index 119cb6bf1..f281a4c4b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Copy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java @@ -69,7 +69,8 @@ public class Copy extends SubCommand { plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> { if (result) { - player.sendMessage(TranslatableCaption.of("move.copy_success"), + player.sendMessage( + TranslatableCaption.of("move.copy_success"), TagResolver.builder() .tag("origin", Tag.inserting(Component.text(plot1.toString()))) .tag("target", Tag.inserting(Component.text(plot2.toString()))) diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index 640c809cb..ca9fe1482 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -71,9 +71,9 @@ public class DebugPaste extends SubCommand { StringBuilder b = new StringBuilder(); b.append( """ - # Welcome to this paste - # It is meant to provide us at IntellectualSites with better information about your problem - """ + # Welcome to this paste + # It is meant to provide us at IntellectualSites with better information about your problem + """ ); b.append("# PlotSquared Information\n"); b.append("PlotSquared Version: ").append(PlotSquared.get().getVersion()) diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java index a620016b6..1de860586 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Download.java +++ b/Core/src/main/java/com/plotsquared/core/command/Download.java @@ -185,22 +185,25 @@ public class Download extends SubCommand { if (Settings.Web.LEGACY_WEBINTERFACE) { schematicHandler .getCompoundTag(plot) - .whenComplete((compoundTag, throwable) -> { - schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() { - @Override - public void run(URL value) { - plot.removeRunning(); - player.sendMessage( - TranslatableCaption.of("web.generation_link_success"), - TagResolver.builder() - .tag("download", Tag.preProcessParsed(value.toString())) - .tag("delete", Tag.preProcessParsed("Not available")) - .build() - ); - player.sendMessage(StaticCaption.of(value.toString())); + .whenComplete((compoundTag, throwable) -> schematicHandler.upload( + compoundTag, + null, + null, + new RunnableVal<>() { + @Override + public void run(URL value) { + plot.removeRunning(); + player.sendMessage( + TranslatableCaption.of("web.generation_link_success"), + TagResolver.builder() + .tag("download", Tag.preProcessParsed(value.toString())) + .tag("delete", Tag.preProcessParsed("Not available")) + .build() + ); + player.sendMessage(StaticCaption.of(value.toString())); + } } - }); - }); + )); return; } // TODO legacy support diff --git a/Core/src/main/java/com/plotsquared/core/command/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java index a44234d3a..1b738e025 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Help.java +++ b/Core/src/main/java/com/plotsquared/core/command/Help.java @@ -134,7 +134,12 @@ public class Help extends Command { TagResolver.builder() .tag("command", Tag.inserting(Component.text("/plot help"))) .tag("category", Tag.inserting(Component.text("all"))) - .tag("category_desc", Tag.inserting(TranslatableCaption.of("help.help_display_all_commands").toComponent(player))) + .tag( + "category_desc", + Tag.inserting(TranslatableCaption + .of("help.help_display_all_commands") + .toComponent(player)) + ) .build() )); builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java index 156424562..b7845ede8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Info.java +++ b/Core/src/main/java/com/plotsquared/core/command/Info.java @@ -52,8 +52,9 @@ public class Info extends SubCommand { arg = args[0]; switch (arg) { // TODO: (re?)implement /plot info inv. (it was never properly implemented) - case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> plot = Plot - .getPlotFromString(player, null, false); + case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> + plot = Plot + .getPlotFromString(player, null, false); default -> { plot = Plot.getPlotFromString(player, arg, false); if (args.length == 2) { diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java index 4533a15db..5ba5d1a00 100644 --- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java @@ -476,11 +476,11 @@ public class ListCmd extends SubCommand { for (final UUIDMapping uuidMapping : names) { PlotPlayer pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid()); TagResolver resolver = TagResolver.builder() - .tag("prefix", Tag.inserting(Component.text(prefix))) - .tag("player", Tag.inserting(Component.text(uuidMapping.username()))) - .build(); - if (pp != null) { - builder.append(MINI_MESSAGE.deserialize(online, resolver)); + .tag("prefix", Tag.inserting(Component.text(prefix))) + .tag("player", Tag.inserting(Component.text(uuidMapping.username()))) + .build(); + if (pp != null) { + builder.append(MINI_MESSAGE.deserialize(online, resolver)); } else if (uuidMapping.username().equalsIgnoreCase("unknown")) { TagResolver unknownResolver = TagResolver.resolver( "info.unknown", diff --git a/Core/src/main/java/com/plotsquared/core/command/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java index b69e24835..873c732b9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Purge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java @@ -221,7 +221,8 @@ public class Purge extends SubCommand { ids.add(plot.temp); if (finalClear) { plot.getPlotModificationManager().clear(false, true, player, - () -> LOGGER.info("Plot {} cleared by purge", plot.getId())); + () -> LOGGER.info("Plot {} cleared by purge", plot.getId()) + ); } else { plot.getPlotModificationManager().removeSign(); } diff --git a/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java b/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java index f4b04d5c5..2cda7dcc4 100644 --- a/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java +++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java @@ -49,7 +49,8 @@ public record ComponentPreset( public static ComponentPreset deserialize(final @NonNull Map map) { final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() -> - new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get("component"))); + new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get( + "component"))); final String pattern = map.getOrDefault("pattern", "").toString(); final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString()); final String permission = map.getOrDefault("permission", "").toString(); diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java index 68d99220c..8e182e6eb 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java @@ -225,7 +225,7 @@ public final class CaptionLoader { */ public @NonNull CaptionMap loadOrCreateSingle(final @NonNull Path file) throws IOException { final Locale locale = this.localeExtractor.apply(file); - if (!Files.exists(file) ) { + if (!Files.exists(file)) { Map map = new LinkedHashMap<>(); patch(map, locale); save(file, map); diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java index 14b4cd624..90922f09a 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java @@ -56,7 +56,8 @@ final class ClassLoaderCaptionProvider implements DefaultCaptionProvider { LOGGER.info("No resource for locale '{}' found in the plugin file." + "Please ensure you have placed the latest version of the file messages_{}.json in the 'lang' folder." + "You may be able to find completed translations at https://intellectualsites.crowdin.com/plotsquared", - locale, locale); + locale, locale + ); return null; } try (final BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) { 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 657233c2e..a9e89487e 100644 --- a/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/EntityEvent.java @@ -53,7 +53,8 @@ public abstract class EntityEvent { * @return the event class name * @since 6.11.0 */ - @NonNull public String getEventName() { + @NonNull + public String getEventName() { if (this.name == null) { this.name = this.getClass().getSimpleName(); } diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java index 190856e06..733931f6e 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java @@ -38,6 +38,7 @@ import javax.annotation.Nullable; @SuppressWarnings("WeakerAccess") public abstract class ClassicPlotWorld extends SquarePlotWorld { + private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassicPlotWorld.class.getSimpleName()); public int ROAD_HEIGHT = 62; @@ -64,6 +65,21 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld { super(worldName, id, generator, min, max, worldConfiguration, blockQueue); } + private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) { + final BlockBucket bucket = new BlockBucket(input); + Pattern pattern = null; + try { + pattern = bucket.toPattern(); + } catch (Exception ignore) { + } + if (pattern == null) { + LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input); + LOGGER.error("Falling back to {}", def); + return def; + } + return bucket; + } + /** * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP. * @@ -144,19 +160,4 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld { return Math.min(WALL_HEIGHT, plotRoadMin); } - private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) { - final BlockBucket bucket = new BlockBucket(input); - Pattern pattern = null; - try { - pattern = bucket.toPattern(); - } catch (Exception ignore) { - } - if (pattern == null) { - LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input); - LOGGER.error("Falling back to {}", def); - return def; - } - return bucket; - } - } diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java index 2ac431480..a51d86004 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java @@ -341,7 +341,10 @@ public class HybridGen extends IndependentPlotGenerator { for (Entity entity : hybridPlotWorld.getPlotSchematicEntities()) { if (region.contains(entity.getLocation().toVector().toBlockPoint())) { Vector3 pos = (entity.getLocation().toVector() - .subtract(region.getMinimumPoint().withY(hybridPlotWorld.getPlotSchematicMinPoint().getY()).toVector3())) + .subtract(region + .getMinimumPoint() + .withY(hybridPlotWorld.getPlotSchematicMinPoint().getY()) + .toVector3())) .add(min.getBlockVector3().withY(hybridPlotWorld.SCHEM_Y).toVector3()); result.setEntity(new PopulatingEntity( entity, @@ -399,6 +402,12 @@ public class HybridGen extends IndependentPlotGenerator { return biome == null ? hybridPlotWorld.getPlotBiome() : biome; } + private enum SchematicFeature { + BIOMES, + ROAD, + POPULATING + } + /** * Wrapper to allow a WorldEdit {@link Entity} to effectively have a mutable location as the location in its NBT should be changed * when set to the world. @@ -453,10 +462,4 @@ public class HybridGen extends IndependentPlotGenerator { } - private enum SchematicFeature { - BIOMES, - ROAD, - POPULATING - } - } diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java index ffbfc5de2..6ca0182bf 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java @@ -141,7 +141,11 @@ public class HybridPlotManager extends ClassicPlotManager { (pos1.getX() + pos2.getX()) / 2, (pos1.getZ() + pos2.getZ()) / 2 ), biome)) { - WorldUtil.setBiome(hybridPlotWorld.getWorldName(), new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()), biome); + WorldUtil.setBiome( + hybridPlotWorld.getWorldName(), + new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()), + biome + ); } } @@ -203,8 +207,18 @@ public class HybridPlotManager extends ClassicPlotManager { PlotId id2 = PlotId.of(id.getX(), id.getY() + 1); Location bot = getPlotBottomLocAbs(id2); Location top = getPlotTopLocAbs(id); - Location pos1 = Location.at(hybridPlotWorld.getWorldName(), bot.getX() - 1, hybridPlotWorld.getMinGenHeight(), top.getZ() + 1); - Location pos2 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, hybridPlotWorld.getMaxGenHeight(), bot.getZ()); + Location pos1 = Location.at( + hybridPlotWorld.getWorldName(), + bot.getX() - 1, + hybridPlotWorld.getMinGenHeight(), + top.getZ() + 1 + ); + Location pos2 = Location.at( + hybridPlotWorld.getWorldName(), + top.getX() + 1, + hybridPlotWorld.getMaxGenHeight(), + bot.getZ() + ); this.resetBiome(hybridPlotWorld, pos1, pos2); if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) { return true; diff --git a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java index b2d4d2a05..2db2fd699 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java @@ -57,7 +57,8 @@ public abstract class IndependentPlotGenerator { * @param setting PlotArea (settings) * @since TODO */ - public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {} + public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) { + } /** * Return a new PlotArea object. @@ -103,9 +104,9 @@ public abstract class IndependentPlotGenerator { * Get the biome to be generated at a specific point * * @param settings PlotArea settings to provide biome - * @param x World x position - * @param y World y position - * @param z World z position + * @param x World x position + * @param y World y position + * @param z World z position * @return Biome type to be generated * @since TODO */ diff --git a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java index c0585dff6..c583ed072 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java +++ b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java @@ -142,7 +142,9 @@ public class PlotListener { Map.Entry> entry = iterator.next(); List effects = entry.getValue(); effects.removeIf(effect -> currentTime > effect.expiresAt); - if (effects.isEmpty()) iterator.remove(); + if (effects.isEmpty()) { + iterator.remove(); + } } } }, TaskTime.seconds(1L)); @@ -486,8 +488,9 @@ public class PlotListener { /** * Marks an effect as a status effect that will be removed on leaving a plot - * @param uuid The uuid of the player the effect belongs to - * @param name The name of the status effect + * + * @param uuid The uuid of the player the effect belongs to + * @param name The name of the status effect * @param expiresAt The time when the effect expires * @since 6.10.0 */ @@ -518,10 +521,10 @@ public class PlotListener { private record StatusEffect(@NonNull String name, long expiresAt) { private StatusEffect(@NonNull String name, long expiresAt) { - this.name = name; - this.expiresAt = expiresAt; - } - + this.name = name; + this.expiresAt = expiresAt; } + } + } diff --git a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java index bdf58ef5d..38183269b 100644 --- a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java +++ b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java @@ -51,7 +51,6 @@ public final class UncheckedWorldLocation extends Location { * @param y Y coordinate * @param z Z coordinate * @return New location - * * @since 6.9.0 */ @DoNotUse diff --git a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java index 122483ab6..0c9ce0bd2 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java +++ b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java @@ -222,13 +222,13 @@ public final class BlockBucket implements ConfigurationSerializable { ) { public int getWeight() { - return max - min; - } - - public boolean isInRange(final int num) { - return num <= max && num >= min; - } - + return max - min; } + public boolean isInRange(final int num) { + return num <= max && num >= min; + } + + } + } diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index 55bf011dd..97535efb3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -658,8 +658,10 @@ public abstract class PlotArea implements ComponentLike { TranslatableCaption.of("height.height_limit"), TagResolver.builder() .tag("minHeight", Tag.inserting(Component.text(minBuildHeight))) - .tag("maxHeight", - Tag.inserting(Component.text(maxBuildHeight))).build() + .tag( + "maxHeight", + Tag.inserting(Component.text(maxBuildHeight)) + ).build() ); // Return true if "failed" as the method will always be inverted otherwise return true; @@ -1017,7 +1019,7 @@ public abstract class PlotArea implements ComponentLike { * * @param plotIds List of plot IDs to merge * @param removeRoads If the roads between plots should be removed - * @param whenDone Task to run when any merge world changes are complete. Also runs if no changes were made. Does not + * @param whenDone Task to run when any merge world changes are complete. Also runs if no changes were made. Does not * run if there was an error or if too few plots IDs were supplied. * @return if merges were completed successfully. * @since 6.9.0 diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java b/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java index 705c9064d..13fee44cf 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java @@ -100,7 +100,7 @@ public class PlotInventory { * Put an item into this inventory * * @param index the index (= slot) where to place the item - * @param item the item to place + * @param item the item to place * @see #setItemChecked(int, PlotItemStack) */ public void setItem(int index, PlotItemStack item) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java index e65ed1aaf..5271b1138 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java @@ -154,6 +154,7 @@ public class ExpiryTask { /** * Returns {@code true} if this task respects unknown owners + * * @return {@code true} if unknown owners should be counted as never online * @since 6.4.0 */ diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java index 6876f3965..0c014f61e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java @@ -27,7 +27,7 @@ public class BeaconEffectsFlag extends BooleanFlag { public static final BeaconEffectsFlag BEACON_EFFECT_TRUE = new BeaconEffectsFlag(true); public static final BeaconEffectsFlag BEACON_EFFECT_FALSE = new BeaconEffectsFlag(false); - private BeaconEffectsFlag(boolean value){ + private BeaconEffectsFlag(boolean value) { super(value, TranslatableCaption.of("flags.flag_description_beacon_effect")); } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java index f6a4fd40f..7e8a8dea6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java @@ -27,7 +27,7 @@ public class ProjectilesFlag extends BooleanFlag { public static final ProjectilesFlag PROJECTILES_TRUE = new ProjectilesFlag(true); public static final ProjectilesFlag PROJECTILES_FALSE = new ProjectilesFlag(false); - private ProjectilesFlag(boolean value){ + private ProjectilesFlag(boolean value) { super(value, TranslatableCaption.of("flags.flag_description_projectiles")); } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java index 9731c74d9..249ab69c0 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java @@ -82,10 +82,10 @@ public abstract class TimedFlag, F>> ) { @Override - public String toString() { - return String.format("%d %s", interval, value); - } - + public String toString() { + return String.format("%d %s", interval, value); } + } + } diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java index 71e08ab2a..d24d43d53 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java @@ -76,6 +76,7 @@ public class SinglePlotArea extends GridPlotWorld { * Returns true if the given string matches the naming system used to identify single plot worlds * e.g. -1_5 represents plot id *;-1;5. "*" being the plot area name given to single plot world * {@link com.plotsquared.core.plot.PlotArea}. + * * @since 6.1.4 */ public static boolean isSinglePlotWorld(String worldName) { diff --git a/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java index 4876cb45d..2a118708f 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java @@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; * The min and max points of this queue are offset according to the minimum point given in the constructor, and the offsets set * in {@link BlockArrayCacheScopedQueueCoordinator#setOffsetX(int)} and * {@link BlockArrayCacheScopedQueueCoordinator#setOffsetZ(int)} - * + *

* Internal use only. Subject to change at any time and created for specific use cases. */ @NotPublic @@ -54,6 +54,7 @@ public class BlockArrayCacheScopedQueueCoordinator extends ZeroedDelegateScopedQ private final int scopeMaxZ; private int offsetX = 0; private int offsetZ = 0; + /** * Construct a new instance * diff --git a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java index 6b03e9ba6..12082257e 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java @@ -29,6 +29,7 @@ public abstract class ChunkCoordinator implements Runnable { /** * Cancel the chunk coordinator. + * * @since 6.0.10 */ public abstract void cancel(); diff --git a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java index 991c6abe5..b069edbf0 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java @@ -43,11 +43,10 @@ import java.util.function.Consumer; public abstract class QueueCoordinator { + private final AtomicBoolean enqueued = new AtomicBoolean(); private boolean forceSync = false; @Nullable private Object chunkObject; - private final AtomicBoolean enqueued = new AtomicBoolean(); - @SuppressWarnings({"unused", "FieldCanBeLocal"}) @Inject private GlobalBlockQueue blockQueue; diff --git a/Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java b/Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java index eb5aa706e..436b866a2 100644 --- a/Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java +++ b/Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java @@ -65,9 +65,9 @@ public final class LockRepository { * @param runnable Action to run when the lock is available */ public void useLock(final @NonNull LockKey key, final @NonNull Runnable runnable) { - try (LockAccess ignored = lock(key)) { - runnable.run(); - } + try (LockAccess ignored = lock(key)) { + runnable.run(); + } } /** diff --git a/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java index 82a4436db..988de76f3 100644 --- a/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java @@ -35,8 +35,8 @@ public abstract class InventoryUtil { * Attempts to set an item into a {@link PlotInventory} while also checking the existence of the material * * @param plotInventory The inventory where the item should be placed - * @param index The index where to place the item - * @param item The item to place into the inventory + * @param index The index where to place the item + * @param item The item to place into the inventory * @return {@code true} if the item could be placed, {@code false} otherwise (e.g. item not available in current version) * @since 6.5.0 */ @@ -49,12 +49,14 @@ public abstract class InventoryUtil { * Attempts to set an item into a {@link PlotInventory} * * @param plotInventory The inventory where the item should be placed - * @param index The index where to place the item - * @param item The item to place into the inventory + * @param index The index where to place the item + * @param item The item to place into the inventory * @see #setItemChecked(PlotInventory, int, PlotItemStack) */ - public void setItem(final PlotInventory plotInventory, final int index, - final PlotItemStack item) { + public void setItem( + final PlotInventory plotInventory, final int index, + final PlotItemStack item + ) { setItemChecked(plotInventory, index, item); } diff --git a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java index 477c907e2..765bdc745 100644 --- a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java @@ -272,7 +272,8 @@ public abstract class RegionManager { fromQueue1.addReadChunks(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()).getChunks()); fromQueue2.addReadChunks(new CuboidRegion( swapPos.getBlockVector3(), - BlockVector3.at(swapPos.getX() + pos2.getX() - pos1.getX(), + BlockVector3.at( + swapPos.getX() + pos2.getX() - pos1.getX(), pos1.getY(), swapPos.getZ() + pos2.getZ() - pos1.getZ() ) 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 77486b3e3..d00ce0e21 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -285,7 +285,8 @@ public abstract class WorldUtil { int trz = top.getZ() >> 9; Set files = getChunkChunks(bot.getWorldName()); for (BlockVector2 mca : files) { - if (mca.getX() >= brx && mca.getX() <= trx && mca.getZ() >= brz && mca.getZ() <= trz && !added.contains(mca)) { + if (mca.getX() >= brx && mca.getX() <= trx && mca.getZ() >= brz && mca.getZ() <= trz && !added.contains( + mca)) { final File file = getMcr(plot.getWorldName(), mca.getX(), mca.getZ()); if (file != null) { //final String name = "r." + (x - cx) + "." + (z - cz) + ".mca"; diff --git a/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java b/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java index a6b39845c..ed62b8799 100644 --- a/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java +++ b/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java @@ -102,7 +102,7 @@ public final class PlaceholderRegistry { return plot.getAlias(); }); this.createPlaceholder("currentplot_owner", (player, plot) -> { - if (plot.getFlag(ServerPlotFlag.class)){ + if (plot.getFlag(ServerPlotFlag.class)) { return legacyComponent(TranslatableCaption.of("info.server"), player); } final UUID plotOwner = plot.getOwnerAbs(); @@ -298,8 +298,8 @@ public final class PlaceholderRegistry { } /** - * Event called when a new {@link Placeholder} has been added - */ + * Event called when a new {@link Placeholder} has been added + */ public record PlaceholderAddedEvent( Placeholder placeholder ) { diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json index 754f6b285..17c55f42d 100644 --- a/Core/src/main/resources/lang/messages_en.json +++ b/Core/src/main/resources/lang/messages_en.json @@ -1,723 +1,723 @@ { - "confirm.expired_confirm": "Confirmation has expired, please run the command again!", - "confirm.failed_confirm": "You have no pending actions to confirm!", - "confirm.requires_confirm": "Are you sure you wish to execute: ?\nThis cannot be undone! If you are sure: \nThe request times out in seconds. ", - "move.move_success": "Successfully moved the plot -> ", - "move.move_merged": "Merged plots may not be moved. Please unmerge the plot before performing the move.", - "move.copy_success": "Successfully copied plots -> ", - "move.requires_unowned": "The location specified is already occupied.", - "debug.requires_unmerged": "The plot cannot be merged.", - "debug.debug_header": " Debug Information\n", - "debug.debug_section": ">> ", - "debug.debug_line": ">> : \n", - "debug.plot_debug": "[Plot Debug] (): ", - "debug.fetching_loaded_chunks": "Fetching loaded chunks...", - "debug.cached_uuids": "There are cached UUIDs.", - "debug.player_in_debugmode": "Player(s) in debug mode: ", - "debug.player_in_debugmode_list": "- \n", - "debug.entity_categories": "Entity categories:", - "set.set_attribute": "Successfully set to .", - "area.set_pos2": "You will now set pos2: . Note: The chosen plot size may result in the created area not exactly matching your second position.", - "web.generating_link": "Processing plot ", - "web.plot_merged": "This plot is merged and therefore cannot be downloaded", - "web.generating_link_failed": "Failed to generate download link for plot !", - "web.generation_link_success": "Download: '> \n Deletion: '>\nAttention: Opening the deletion link will delete the file immediately.", - "web.generation_link_success_legacy_world": "Download: '>", - "web.save_failed": "Failed to save.", - "web.load_null": "Please use to get a list of schematics.", - "web.load_failed": "Failed to load schematic.", - "web.load_list": "To load a schematic, use .", - "web.save_success": "Successfully saved!", - "compass.compass_target": "Successfully targeted plot with your compass.", - "cluster.cluster_available_args": "The following sub commands are available: ", - "cluster.cluster_list_heading": "There are cluster(s) in this world.", - "cluster.cluster_list_element": " - \n", - "cluster.cluster_list_element_owner": " - \n", - "cluster.cluster_list_element_helpers": " - \n", - "cluster.cluster_list_element_invited": " - \n", - "cluster.cluster_intersection": "The proposed area overlaps with: ", - "cluster.cluster_outside": "The proposed area is outside the plot area: ", - "cluster.cluster_created": "Successfully created the cluster .", - "cluster.cluster_deleted": "Successfully deleted the cluster .", - "cluster.cluster_resized": "Successfully resized the cluster.", - "cluster.cluster_added_user": "Successfully added user to the cluster.", - "cluster.cannot_kick_player": "You cannot kick that player: ", - "cluster.cluster_invited": "You have been invited to the following cluster: .", - "cluster.cluster_removed": "You have been removed from cluster: .", - "cluster.cluster_kicked_user": "Successfully kicked the user from the cluster.", - "cluster.invalid_cluster_name": "Invalid cluster name: ", - "cluster.cluster_not_added": "That player was not added to the plot cluster.", - "cluster.cluster_cannot_leave": "You must delete or transfer ownership before leaving the cluster.", - "cluster.cluster_added_helper": "Successfully added a helper to the cluster.", - "cluster.cluster_removed_helper": "Successfully removed a helper from the cluster.", - "cluster.cluster_regenerated": "Successfully started cluster regeneration.", - "cluster.cluster_teleporting": "Teleporting...", - "cluster.cluster_info": "Current cluster: \nName: \nOwner: \nSize: \nRights: ", - "border.denied": "You are outside the current map border.", - "border.bypass.exited": "You have bypassed the current map border area.", - "border.bypass.entered": "You have re-entered the current map border area.", - "worldedit.worldedit_bypass": "To bypass your restrictions use ", - "worldedit.worldedit_bypassed": "Currently bypassing WorldEdit restriction.", - "gamemode.gamemode_was_bypassed": "You bypassed the gamemode () set for .", - "height.height_limit": "This plot area has building height limits: Min height: , Max height: ", - "notification.notify_enter": " entered your plot (;).", - "notification.notify_leave": " left your plot (;).", - "swap.swap_overlap": "The proposed areas are not allowed to overlap.", - "swap.swap_success": "Successfully swapped plots -> ", - "swap.swap_merged": "Merged plots may not be swapped. Please unmerge the plots before performing the swap.", - "swap.progress_region1_copy": "Current region 1 copy progress: %", - "swap.progress_region2_copy": "Current region 2 copy progress: %", - "swap.progress_region1_paste": "Current region 1 paste progress: %", - "swap.progress_region2_paste": "Current region 2 paste progress: %", - "swap.progress_region_copy": "Current copy progress: %", - "swap.progress_region_paste": "Current paste progress: %", - "comment.inbox_notification": " unread messages. Use .", - "comment.not_valid_inbox_index": "No comment at index .", - "comment.inbox_item": " - ", - "comment.comment_syntax": "Use <> ", - "comment.invalid_inbox": "That is not a valid inbox.\nAccepted values: ", - "comment.no_perm_inbox": "You do not have permission for that inbox.", - "comment.no_perm_inbox_modify": "You do not have permission to modify that inbox.", - "comment.no_plot_inbox": "You must stand in or supply a plot argument", - "comment.comment_removed_success": "Successfully deleted comment(s)\n - ", - "comment.comment_removed_failure": "Failed to delete comment!", - "comment.comment_added": "A comment has been left.", - "comment.inbox_empty": "No comments.", - "console.not_console": "For safety reasons, this command can only be executed by console.", - "console.is_console": "This command can only be executed by a player.", - "clipboard.paste_failed": "Failed to paste the selection. Reason: ", - "toggle.toggle_enabled": "Enabled setting: ", - "toggle.toggle_disabled": "Disabled setting: ", - "blockedcmds.command_blocked": "That command is not allowed in this plot.", - "done.done_already_done": "This plot is already marked as done.", - "done.done_not_done": "This plot is not marked as done.", - "done.done_insufficient_complexity": "This plot is too simple. Please add more detail before using this command.", - "done.done_success": "Successfully marked this plot as done.", - "done.done_removed": "You may now continue building in this plot.", - "done.building_restricted": "You can't build on plots marked as done.", - "ratings.ratings_purged": "Purged ratings for this plot.", - "ratings.rating_not_valid": "You need to specify a number between 1 and 10.", - "ratings.rating_already_exists": "You have already rated plot .", - "ratings.rating_applied": "You successfully rated plot .", - "ratings.rating_disliked": "You successfully disliked plot .", - "ratings.rating_liked": "You successfully liked plot .", - "ratings.rating_not_your_own": "You cannot rate your own plot.", - "ratings.rating_not_done": "You can only rate finished plots.", - "ratings.rating_not_owned": "You cannot rate a plot that is not claimed by anyone.", - "ratings.0-8": "0/8", - "ratings.1-8": "1/8", - "ratings.2-8": "2/8", - "ratings.3-8": "3/8", - "ratings.4-8": "4/8", - "ratings.5-8": "5/8", - "ratings.6-8": "6/8", - "ratings.7-8": "7/8", - "ratings.8-8": "8/8", - "tutorial.rate_this": "Rate this plot!", - "tutorial.comment_this": "Leave some feedback on this plot: .", - "economy.econ_disabled": "Economy is not enabled.", - "economy.vault_or_consumer_null": "Economy isn't initialized. Make sure Vault and an economy service plugin are installed.", - "economy.cannot_afford_plot": "You cannot afford to buy this plot. It costs . You have .", - "economy.not_for_sale": "This plot is not for sale.", - "economy.cannot_buy_own": "You cannot buy your own plot.", - "economy.plot_sold": "Your plot, , has been sold to for .", - "economy.cannot_afford_merge": "You cannot afford to merge the plots. It costs .", - "economy.added_balance": " has been added to your balance.", - "economy.removed_balance": " has been taken from your balance.", - "economy.removed_granted_plot": "You used plot grant(s), you've got left.", - "setup.choose_generator": "What generator do you want?", - "setup.setup_not_started": "No setup started.", - "setup.setup_init": "Usage: /plot setup ", - "setup.setup_step": "[Step ] - Expecting: Default: ", - "setup.setup_valid_arg": "Value set to .", - "setup.setup_finished": "You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or your chosen world management plugin.", - "setup.setup_world_taken": " is already a world. Choose a different name.", - "setup.setup_cancelled": "Cancelled setup.", - "setup.setup_world_name": "What do you want your world to be called?", - "setup.setup_world_name_error": "You need to choose a world name!", - "setup.setup_world_generator_error": "You must choose a generator!", - "setup.setup_world_type": "What world type do you want?\n - normal - Standard plot generation\n - augmented - Plot generation with terrain\n - partial - Vanilla with clusters of plots", - "setup.setup_world_type_error": "You must choose a world type!", - "setup.setup_wrong_generator": "The specified generator does not identify as BukkitPlotGenerator - You may need to manually configure the other plugin.", - "setup.setup_world_name_format": "Non [a-z0-9_.-] character in the world name: ", - "setup.setup_world_apply_plotsquared": "The world you specified already exists. After restarting, new terrain will use PlotSquared, however you may need to reset the world for it to generate correctly!", - "setup.setup_partial_area": "What terrain would you like in plots?\n - ROAD - Terrain separated by roads\n - ALL - Entirely vanilla generation", - "setup.setup_partial_area_error": "You must choose the terrain!", - "setup.setup_area_name": "What would you like this area called?", - "setup.setup_area_non_alphanumerical": "The area ID must be alphanumerical!", - "setup.setup_area_invalid_id": "You must choose an area id that is not in use!", - "setup.setup_area_min_plot_id": "What should be the minimum Plot ID?", - "setup.setup_area_min_plot_id_error": "You must choose a valid minimum Plot ID!", - "setup.setup_area_max_plot_id": "What should be the maximum Plot ID?", - "setup.setup_area_max_plot_id_error": "You must choose a valid maximum Plot ID!", - "setup.setup_area_plot_id_greater_than_minimum": "The maximum Plot ID must be greater than the minimum!", - "setup.plot_height": "Plot height", - "setup.plot_width": "Plot width", - "setup.plot_block": "Plot block (Block(s) to fill the plot with from Y0 to the defined plot height (Set in a previous step))", - "setup.top_block_boolean": "Whether a layer of blocks should be put on top of the plot block", - "setup.plot_block_floor": "Plot floor block (One layer of blocks put on top of the plot block)", - "setup.top_wall_block": "Top wall block (Block(s) shaping the border of an unclaimed plot)", - "setup.wall_block_claimed": "Wall block (claimed) (Block(s) shaping the border of a claimed plot)", - "setup.road_width": "Road width", - "setup.road_height": "Road height", - "setup.road_block": "Road block", - "setup.wall_filling_block": "Wall filling block (Block(s) been put under the plot border down to min gen height + 1)", - "setup.wall_height": "Wall height", - "setup.min_gen_height": "Minimum height from which to generate (for 1.18+ can be negative).", - "setup.bedrock_boolean": "Whether a bedrock layer under the plot should be generated or not", - "setup.singleplotarea_void_world": "Void world", - "plotareatype.plot_area_type_normal": "Standard plot generation", - "plotareatype.plot_area_type_augmented": "Plot generation with vanilla terrain", - "plotareatype.plot_area_type_partial": "Vanilla with clusters of plots", - "schematics.schematic_too_large": "The plot is too large for this action!", - "schematics.schematic_size_mismatch": "The schematic's size does not match the plot's. If you want to paste anyway, enable schematics.paste-mismatches in settings.yml", - "schematics.schematic_invalid": "That is not a valid schematic. Reason: .", - "schematics.schematic_invalid_named": " is not a valid schematic. Reason: .", - "schematics.schematic_paste_merged": "Schematics cannot be pasted onto merged plots. Please unmerge the plot before performing the paste.", - "schematics.schematic_paste_failed": "Failed to paste the schematic.", - "schematics.schematic_paste_success": "The schematic pasted successfully.", - "schematics.schematic_list": "Saved Schematics: ", - "schematics.mca_file_size": "Note: The `.mca` files are 512x512.", - "schematics.schematic_exportall_started": "Starting export...", - "schematics.schematic_exportall_world_args": "Need world argument", - "schematics.schematic_exportall_finished": "Finished mass export.", - "schematics.schematic_exportall_single_finished": "Finished export.", - "schematic.schematic_exportall_world": "Invalid world.", - "schematics.plot_to_schem": "Plot->Schematic: Found plots...", - "error.task_in_process": "Task is already running.", - "titles.title_entered_plot": "Plot: ;", - "titles.title_entered_plot_sub": "Owned by ", - "core.prefix": "[P2] ", - "core.enabled": " is now enabled.", - "placeholder.hooked": "PlotSquared hooked into MVdWPlaceholderAPI", - "placeholder.nan": "Not a number", - "reload.reloaded_configs": "Translations and world settings have been reloaded successfully.", - "reload.reload_failed": "Failed to reload file configurations.", - "desc.desc_set": "Plot description set.", - "desc.desc_unset": "Plot description unset.", - "alias.alias_set_to": "Plot alias set to .", - "alias.alias_removed": "Plot alias removed.", - "alias.alias_too_long": "The alias must have less than 50 characters in length.", - "alias.alias_is_taken": "That alias is already taken.", - "alias.no_alias_set": "No plot alias set.", - "position.position_set": "Home position set to your current location.", - "position.position_unset": "Home position reset to the default location.", - "permission.no_schematic_permission": "You don't have the permission required to use schematic .", - "permission.no_permission": "You are lacking the permission node: .", - "permission.no_permission_event": "You are lacking the permission node: .", - "permission.no_plot_perms": "You must be the plot owner to perform this action.", - "permission.cant_claim_more_plots": "You can't claim more than plots.", - "permission.cant_claim_more_clusters": "You can't claim more than clusters.", - "permission.cant_transfer_more_plots": "You can't send more plots to that user.", - "permission.cant_claim_more_plots_num": "You can't claim more than plots at once.", - "merge.merge_request_confirm": "Merge request from for plot ", - "merge.merge_not_valid": "This merge request is no longer valid.", - "merge.merge_accepted": "The merge request has been accepted.", - "merge.success_merge": "Plots have been merged!", - "merge.merge_requested": "Successfully sent a merge request.", - "merge.no_available_automerge": "You do not own any adjacent plots in the specified direction or are not allowed to merge to the required size.", - "merge.unlink_impossible": "You can only unlink a mega-plot.", - "merge.unmerge_cancelled": "Unlink has been cancelled.", - "merge.unlink_success": "Successfully unlinked plots.", - "commandconfig.not_valid_subcommand": "That is not a valid subcommand.", - "commandconfig.did_you_mean": "Did you mean: ", - "commandconfig.subcommand_set_options_header": "Possible Values: ", - "commandconfig.subcommand_set_options_header_only": "Possible Values: ", - "commandconfig.command_syntax": "Usage: ", - "commandconfig.command_syntax_extended": "Usage: ", - "commandconfig.flag_tutorial_usage": "The plot flag is not set preventing you from performing this action.", - "invalid.component_illegal_block": "You are not allowed to generate a component containing the block ", - "invalid.not_valid_block": "", - "invalid.not_allowed_block": "That block is not allowed: ", - "invalid.not_valid_number": "That's not a valid number within the range: ", - "invalid.not_valid_plot_id": "That's not a valid plot ID.", - "invalid.origin_cant_be_target": "The origin and target location cannot be the same.", - "invalid.found_no_plots": "Found no plots with your search query.", - "invalid.number_not_in_range": "That's not a valid number within the range: (, )", - "invalid.number_not_positive": "That's not a positive number: ", - "invalid.not_a_number": " is not a valid number.", - "condense.invalid_area": "Invalid area.", - "condense.task_already_started": "Task already started.", - "condense.invalid_radius": "Invalid radius.", - "condense.radius_too_small": "Radius too small.", - "condense.no_free_plots_found": "No free plots found.", - "condense.task_started": "Task started...", - "condense.task_complete": "Task complete. Please verify that no new plots have been claimed during the task.", - "condense.moving": "Moving: -> ", - "condense.task_failed": "Task failed. No free plots found.", - "condense.skipping": "Skipping complex plot: .", - "condense.task_stopped": "Task already stopped.", - "condense.default_eval": "=== DEFAULT EVAL ===", - "condense.minimum_radius": "Minimum radius: ", - "condense.maximum_moved": "Maximum moved: ", - "condense.input_eval": "=== INPUT EVAL ===", - "condense.input_radius": "Input radius: ", - "condense.estimated_moves": "Estimated moves: ", - "condense.eta": "Estimated time: No idea, times will drastically change based on the system performance and load.", - "condense.radius_measured": " - Radius is measured in plot width.", - "database.starting_conversion": "Starting...", - "database.conversion_done": "Database conversion finished.", - "database.conversion_failed": "Failed to insert plot objects, see stacktrace for info.", - "database.arg": "[arg] indicates an optional argument.", - "database.does_not_exist": "Database does not exist: .", - "database.failed_to_save_plots": "Failed to save plots, read stacktrace for info.", - "database.invalid_args": "Please make sure you are using the correct arguments.", - "database.failed_to_open": "Failed to open connection, read stacktrace for info.", - "database.skipping_duplicated_plot": "Skipping duplicate plot: | ID: ", - "template.invalid_template": "Invalid template file: .template", - "template.template_failed": "Failed: ", - "debugexec.changes_column": "Changes/column: ", - "debugexec.starting_task": "Starting task...", - "debugexec.threshold_default": "`threshold` = The percentage of plots you want to clear (100 clears 100% of plots so no point calibrating it.", - "debugexec.invalid_threshold": "Invalid threshold: ", - "debugexec.threshold_default_double": " = The percentage of plots you want to clear as a number between 0 - 100.", - "debugexec.calibration_done": "Thank you for calibrating plot expiry.", - "debugexec.task_halted": "Task already halted.", - "debugexec.task_cancelled": "Task cancelled.", - "debugexec.cleared_flag": "Cleared flag: ", - "debugexec.mass_schematic_update_in_progress": "Cannot schedule mass schematic update. (Is one already in progress?)", - "debugexec.task_not_running": "Task not running.", - "debugexec.expiry_started": "Started plot expiry task.", - "debugexec.expiry_already_started": "Plot expiry task already started.", - "debugexec.script_list_item": "[] ", - "debugexec.analyze_done": "Done. Use for more information. ", - "expiry.expired_options_clicky": " expired: '>'>\n - '>'>Delete this ()\n - '>'>Remind later ()\n - '>'>Keep this ()\n - '>'>Don't show me this ()", - "debugimportworlds.single_plot_area": "Must be a single plot area.", - "debugimportworlds.world_container": "World container must be configured to be a separate directory to your base files.", - "debugroadregen.regen_done": "Regenerating plot south/east roads: \n - Result: Success!", - "debugroadregen.regen_all": "To regen all roads: ", - "schematics.schematic_road_created": "Saved new road schematic. To test the schematic, fly to a few other plots and run .", - "debugroadregen.schematic": "If no schematic is set, the following will not do anything.\n - To set a schematic, stand in a plot and use ", - "debugroadregen.regenallroads": "To regenerate all roads: ", - "debugroadregen.regenallroads_started": "PlotSquared will now attempt to generate roads based on your input. This may take a while.", - "errors.invalid_player": "Player not found: .", - "errors.invalid_player_offline": " must be online.", - "errors.invalid_command_flag": "Invalid command flag: ", - "errors.error": "An error occurred: ", - "errors.error_create": "An error occurred while creating the world: ", - "errors.error_console": "An error occurred. See the console for more information.", - "errors.command_went_wrong": "Something went wrong when executing that command...", - "errors.no_free_plots": "There are no free plots available.", - "errors.not_in_plot": "You're not in a plot.", - "errors.not_in_cluster": "You must be within a plot cluster to perform that action.", - "errors.not_in_plot_world": "You're not in a plot area.", - "errors.plotworld_incompatible": "The two worlds must be compatible.", - "errors.not_valid_world": "That is not a valid world (case sensitive).", - "errors.not_valid_plot_world": " is not a valid plot area (case sensitive).", - "errors.invalid_plot_world": "That is not a valid plot area (case sensitive).", - "errors.no_plots": "You don't have any plots.", - "errors.player_no_plots": "That player does not own any plots.", - "errors.wait_for_timer": "A set block timer is bound to either the current plot or you. Please wait for it to finish.", - "errors.tile_entity_cap_reached": "The total number of tile entities in this chunk may not exceed .", - "error.plot_size_negative": "Error: An input lower or equal to 0 is invalid.", - "error.command_went_wrong": "Something went wrong when executing that command.", - "errors.not_implemented": "Not implemented.", - "errors.stacktrace_begin": "=== Begin of stacktrace ===", - "errors.stacktrace_end": "=== End of stacktrace ===", - "errors.deprecated_commands": "You are using a deprecated command scheduled for removal within the next major release of PlotSquared. Consider using the proper alternative: ", - "debugpaste.latest_log": " is larger than . Please reboot the server and submit a new paste.", - "debugpaste.empty_file": "Skipping because it's empty.", - "debugpaste.skip_multiverse": "Skipping Multiverse because it's not in use.", - "debugpaste.debug_report_created": "Uploaded a full debug to: >", - "debugpaste.creation_failed": "Failed to create the debugpaste: ", - "debugsavetest.starting": "Starting debugsavetest.", - "debugsavetest.done": "Database sync finished.", - "purge.purge_success": "Successfully purged plots.", - "purge.confirm_purge_unknown_bg_enabled": "Background UUID caching is enabled. Unknown plot owners may be found using this!", - "purge.confirm_purge_unknown_bg_disabled": "Background UUID caching is disabled. Unknown plot owners may be found using this! Enable it in settings.yml.", - "players.fetching_player": "PlotSquared is attempting to find the specified player from your argument(s). This may take a while.", - "players.fetching_players_timeout": "The specified users did not exist in the cache and will be fetched in the background. Please wait a couple of minutes.", - "trim.trim_in_progress": "A world trim task is already in progress!", - "trim.trim_done": "Trim done.", - "trim.trim_starting": "Collecting region data...", - "blocklist.block_list_separator": ", ", - "biome.need_biome": "You need to specify a valid biome.", - "biome.biome_set_to": "Plot biome set to . You may have to rejoin your game to see a change.", - "teleport.teleported_to_plot": "You have been teleported.", - "teleport.teleported_to_road": "You got teleported to the road.", - "teleport.teleport_in_seconds": "Teleporting in seconds. Do not move...", - "teleport.teleport_failed": "Teleportation cancelled due to movement or damage.", - "setblock.set_block_action_finished": "The last setblock action is now finished.", - "unsafe.debugallowunsafe_on": "Unsafe actions enabled.", - "unsafe.debugallowunsafe_off": "Unsafe actions disabled.", - "need.need_block": "You've got to specify a block.", - "near.plot_near": "Players: ", - "info.none": "None", - "info.now": "Now", - "info.never": "Never", - "info.unknown": "Unknown", - "info.server": "Server", - "info.everyone": "Everyone", - "info.infinite": "Infinite", - "info.plot_unowned": "The current plot must have an owner to perform this action.", - "info.plot_info_unclaimed": "Plot is not yet claimed.", - "info.plot_info_header": "--------- INFO ---------", - "info.plot_info_hidden": "You cannot view the information about this plot.", - "info.plot_info_format": "

\nID: \nCreation: \nArea: \nAlias: \nOwner: \nBiome: \nCan Build: \nRating: \nSeen: \nTrusted: \nMembers: \nDenied: \nFlags: \nDescription: \n