EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Perform code formatting according to editorconfig (#3981)

Browse Source 
* Perform code reformatting

* Fix javadoc errors
This commit is contained in:
Alexander Brandes
2023-03-06 11:38:30 +01:00
committed by GitHub
parent 9cd0ee9b49
commit e6db8e2750
66 changed files with 986 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/main/java/com/plotsquared/core/PlotSquared.java
View File

@ -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.
*
* <p>
*
* <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
*

32
Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
View File

@ -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());
}
}
}

3
Core/src/main/java/com/plotsquared/core/command/Add.java
View File

@ -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 <player | *>")))
);

3
Core/src/main/java/com/plotsquared/core/command/Copy.java
View File

@ -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())))

6
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View File

@ -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())

33
Core/src/main/java/com/plotsquared/core/command/Download.java
View File

@ -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

7
Core/src/main/java/com/plotsquared/core/command/Help.java
View File

@ -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

5
Core/src/main/java/com/plotsquared/core/command/Info.java
View File

@ -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) {

10
Core/src/main/java/com/plotsquared/core/command/ListCmd.java
View File

@ -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",

3
Core/src/main/java/com/plotsquared/core/command/Purge.java
View File

@ -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();
}

3
Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
View File

@ -49,7 +49,8 @@ public record ComponentPreset(
public static ComponentPreset deserialize(final @NonNull Map<String, Object> 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();

2
Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java
View File

@ -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<String, String> map = new LinkedHashMap<>();
patch(map, locale);
save(file, map);

3
Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java
View File

@ -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))) {

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

@ -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();
}

31
Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java
View File

@ -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;
}
}

17
Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
View File

@ -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
}
}

20
Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
View File

@ -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;

9
Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
View File

@ -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
*/

17
Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
View File

@ -142,7 +142,9 @@ public class PlotListener {
Map.Entry<UUID, List<StatusEffect>> entry = iterator.next();
List<StatusEffect> 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;
}
}
}

1
Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java
View File

@ -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

14
Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java
View File

@ -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;
}
}
}

8
Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
View File

@ -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

2
Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
View File

@ -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) {

1
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java
View File

@ -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
*/

2
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java
View File

@ -27,7 +27,7 @@ public class BeaconEffectsFlag extends BooleanFlag<BeaconEffectsFlag> {
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"));
}

2
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java
View File

@ -27,7 +27,7 @@ public class ProjectilesFlag extends BooleanFlag<ProjectilesFlag> {
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"));
}

8
Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java
View File

@ -82,10 +82,10 @@ public abstract class TimedFlag<T, F extends PlotFlag<TimedFlag.Timed<T>, F>>
) {
@Override
public String toString() {
return String.format("%d %s", interval, value);
}
public String toString() {
return String.format("%d %s", interval, value);
}
}
}

1
Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java
View File

@ -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) {

3
Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java
View File

@ -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)}
*
* <p>
* 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
*

1
Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java
View File

@ -29,6 +29,7 @@ public abstract class ChunkCoordinator implements Runnable {
/**
* Cancel the chunk coordinator.
*
* @since 6.0.10
*/
public abstract void cancel();

3
Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
View File

@ -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;

6
Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java
View File

@ -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();
}
}
/**

14
Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java
View File

@ -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);
}

3
Core/src/main/java/com/plotsquared/core/util/RegionManager.java
View File

@ -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()
)

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

@ -285,7 +285,8 @@ public abstract class WorldUtil {
int trz = top.getZ() >> 9;
Set<BlockVector2> 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";

6
Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java
View File

@ -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
) {

1442
Core/src/main/resources/lang/messages_en.json
View File

File diff suppressed because it is too large Load Diff

1
Core/src/test/java/com/plotsquared/core/plot/FlagTest.java
View File

@ -128,4 +128,5 @@ public class FlagTest {
((TranslatableCaption) exception.getErrorMessage()).getKey()
);
}
}

1
Core/src/test/java/com/plotsquared/core/plot/PlotRangeIteratorTest.java
View File

@ -107,4 +107,5 @@ public class PlotRangeIteratorTest {
Assertions.assertFalse(range.hasNext());
Assertions.assertThrows(NoSuchElementException.class, range::next);
}
}

1
Core/src/test/java/com/plotsquared/core/synchronization/LockRepositoryTest.java
View File

@ -51,4 +51,5 @@ class LockRepositoryTest {
}));
Assertions.assertFalse(lock.isLocked());
}
}

7
Core/src/test/java/com/plotsquared/core/util/StringManTest.java
View File

@ -33,8 +33,10 @@ public class StringManTest {
new Message("title \"sub title\"", List.of("title", "sub title")),
new Message("\"a title\" subtitle", List.of("a title", "subtitle")),
new Message("\"title\" \"subtitle\"", List.of("title", "subtitle")),
new Message("\"How <bold>bold</bold> of you\" \"to assume I like <rainbow>rainbows</rainbow>\"",
List.of("How <bold>bold</bold> of you", "to assume I like <rainbow>rainbows</rainbow>"))
new Message(
"\"How <bold>bold</bold> of you\" \"to assume I like <rainbow>rainbows</rainbow>\"",
List.of("How <bold>bold</bold> of you", "to assume I like <rainbow>rainbows</rainbow>")
)
);
for (Message message : messages) {
@ -53,4 +55,5 @@ public class StringManTest {
private record Message(String input, List<String> expected) {
}
}