mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 03:03:43 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix/big-bo
			...
			chore/v6/u
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					3a0c18323d | 
@@ -109,11 +109,11 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 | 
				
			|||||||
import com.plotsquared.core.uuid.UUIDPipeline;
 | 
					import com.plotsquared.core.uuid.UUIDPipeline;
 | 
				
			||||||
import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 | 
					import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 | 
				
			||||||
import com.sk89q.worldedit.WorldEdit;
 | 
					import com.sk89q.worldedit.WorldEdit;
 | 
				
			||||||
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import io.papermc.lib.PaperLib;
 | 
					import io.papermc.lib.PaperLib;
 | 
				
			||||||
import net.kyori.adventure.audience.Audience;
 | 
					import net.kyori.adventure.audience.Audience;
 | 
				
			||||||
import net.kyori.adventure.text.Component;
 | 
					import net.kyori.adventure.text.Component;
 | 
				
			||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 | 
					import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bstats.bukkit.Metrics;
 | 
					import org.bstats.bukkit.Metrics;
 | 
				
			||||||
import org.bstats.charts.DrilldownPie;
 | 
					import org.bstats.charts.DrilldownPie;
 | 
				
			||||||
@@ -165,7 +165,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 | 
				
			|||||||
@Singleton
 | 
					@Singleton
 | 
				
			||||||
public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPlatform<Player> {
 | 
					public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPlatform<Player> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlatform.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final int BSTATS_ID = 1404;
 | 
					    private static final int BSTATS_ID = 1404;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    static {
 | 
					    static {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
package com.plotsquared.bukkit.entity;
 | 
					package com.plotsquared.bukkit.entity;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.plotsquared.core.configuration.Settings;
 | 
					import com.plotsquared.core.configuration.Settings;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Art;
 | 
					import org.bukkit.Art;
 | 
				
			||||||
import org.bukkit.DyeColor;
 | 
					import org.bukkit.DyeColor;
 | 
				
			||||||
@@ -55,7 +55,7 @@ import java.util.List;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public final class ReplicatingEntityWrapper extends EntityWrapper {
 | 
					public final class ReplicatingEntityWrapper extends EntityWrapper {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ReplicatingEntityWrapper.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final short depth;
 | 
					    private final short depth;
 | 
				
			||||||
    private final int hash;
 | 
					    private final int hash;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,12 +26,12 @@ import com.plotsquared.core.backup.NullBackupManager;
 | 
				
			|||||||
import com.plotsquared.core.backup.PlayerBackupProfile;
 | 
					import com.plotsquared.core.backup.PlayerBackupProfile;
 | 
				
			||||||
import com.plotsquared.core.backup.SimpleBackupManager;
 | 
					import com.plotsquared.core.backup.SimpleBackupManager;
 | 
				
			||||||
import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
 | 
					import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class BackupModule extends AbstractModule {
 | 
					public class BackupModule extends AbstractModule {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BackupModule.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    protected void configure() {
 | 
					    protected void configure() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,7 +65,7 @@ import com.plotsquared.core.util.SetupUtils;
 | 
				
			|||||||
import com.plotsquared.core.util.WorldUtil;
 | 
					import com.plotsquared.core.util.WorldUtil;
 | 
				
			||||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 | 
					import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 | 
				
			||||||
import com.sk89q.worldedit.extension.platform.Actor;
 | 
					import com.sk89q.worldedit.extension.platform.Actor;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Bukkit;
 | 
					import org.bukkit.Bukkit;
 | 
				
			||||||
import org.bukkit.command.ConsoleCommandSender;
 | 
					import org.bukkit.command.ConsoleCommandSender;
 | 
				
			||||||
@@ -74,7 +74,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class BukkitModule extends AbstractModule {
 | 
					public class BukkitModule extends AbstractModule {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitModule.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final BukkitPlatform bukkitPlatform;
 | 
					    private final BukkitPlatform bukkitPlatform;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,7 +27,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 | 
				
			|||||||
import com.sk89q.worldedit.math.BlockVector3;
 | 
					import com.sk89q.worldedit.math.BlockVector3;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BaseBlock;
 | 
					import com.sk89q.worldedit.world.block.BaseBlock;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockState;
 | 
					import com.sk89q.worldedit.world.block.BlockState;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Location;
 | 
					import org.bukkit.Location;
 | 
				
			||||||
import org.bukkit.entity.EntityType;
 | 
					import org.bukkit.entity.EntityType;
 | 
				
			||||||
@@ -41,7 +41,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
 | 
					public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final LimitedRegion limitedRegion;
 | 
					    private final LimitedRegion limitedRegion;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,7 +47,7 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 | 
				
			|||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 | 
					import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Bukkit;
 | 
					import org.bukkit.Bukkit;
 | 
				
			||||||
import org.bukkit.Chunk;
 | 
					import org.bukkit.Chunk;
 | 
				
			||||||
@@ -108,7 +108,7 @@ public class BukkitUtil extends WorldUtil {
 | 
				
			|||||||
    public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitPlatform.getPlugin(BukkitPlatform.class));
 | 
					    public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitPlatform.getPlugin(BukkitPlatform.class));
 | 
				
			||||||
    public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacySection();
 | 
					    public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacySection();
 | 
				
			||||||
    public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
					    public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitUtil.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private final Collection<BlockType> tileEntityTypes = new HashSet<>();
 | 
					    private final Collection<BlockType> tileEntityTypes = new HashSet<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ import com.sk89q.worldedit.bukkit.BukkitWorld;
 | 
				
			|||||||
import com.sk89q.worldedit.math.BlockVector3;
 | 
					import com.sk89q.worldedit.math.BlockVector3;
 | 
				
			||||||
import com.sk89q.worldedit.regions.CuboidRegion;
 | 
					import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BaseBlock;
 | 
					import com.sk89q.worldedit.world.block.BaseBlock;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Chunk;
 | 
					import org.bukkit.Chunk;
 | 
				
			||||||
import org.bukkit.World;
 | 
					import org.bukkit.World;
 | 
				
			||||||
@@ -40,7 +40,7 @@ import java.util.Set;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class ContentMap {
 | 
					public class ContentMap {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ContentMap.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    final Set<EntityWrapper> entities;
 | 
					    final Set<EntityWrapper> entities;
 | 
				
			||||||
    final Map<PlotLoc, BaseBlock[]> allBlocks;
 | 
					    final Map<PlotLoc, BaseBlock[]> allBlocks;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,7 @@ import com.google.inject.Inject;
 | 
				
			|||||||
import com.plotsquared.core.PlotSquared;
 | 
					import com.plotsquared.core.PlotSquared;
 | 
				
			||||||
import com.plotsquared.core.PlotVersion;
 | 
					import com.plotsquared.core.PlotVersion;
 | 
				
			||||||
import com.plotsquared.core.configuration.Settings;
 | 
					import com.plotsquared.core.configuration.Settings;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.bukkit.Bukkit;
 | 
					import org.bukkit.Bukkit;
 | 
				
			||||||
import org.bukkit.event.Listener;
 | 
					import org.bukkit.event.Listener;
 | 
				
			||||||
@@ -39,7 +39,7 @@ import java.net.URL;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class UpdateUtility implements Listener {
 | 
					public class UpdateUtility implements Listener {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + UpdateUtility.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static PlotVersion internalVersion;
 | 
					    public static PlotVersion internalVersion;
 | 
				
			||||||
    public static String spigotVersion;
 | 
					    public static String spigotVersion;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ import com.google.common.util.concurrent.RateLimiter;
 | 
				
			|||||||
import com.plotsquared.core.configuration.Settings;
 | 
					import com.plotsquared.core.configuration.Settings;
 | 
				
			||||||
import com.plotsquared.core.uuid.UUIDMapping;
 | 
					import com.plotsquared.core.uuid.UUIDMapping;
 | 
				
			||||||
import com.plotsquared.core.uuid.UUIDService;
 | 
					import com.plotsquared.core.uuid.UUIDService;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.enginehub.squirrelid.Profile;
 | 
					import org.enginehub.squirrelid.Profile;
 | 
				
			||||||
@@ -41,7 +41,7 @@ import java.util.UUID;
 | 
				
			|||||||
@SuppressWarnings("UnstableApiUsage")
 | 
					@SuppressWarnings("UnstableApiUsage")
 | 
				
			||||||
public class SquirrelIdUUIDService implements UUIDService {
 | 
					public class SquirrelIdUUIDService implements UUIDService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquirrelIdUUIDService.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final ProfileService profileService;
 | 
					    private final ProfileService profileService;
 | 
				
			||||||
    private final RateLimiter rateLimiter;
 | 
					    private final RateLimiter rateLimiter;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,7 +69,7 @@ import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
 | 
				
			|||||||
import com.sk89q.worldedit.math.BlockVector2;
 | 
					import com.sk89q.worldedit.math.BlockVector2;
 | 
				
			||||||
import com.sk89q.worldedit.util.eventbus.EventHandler;
 | 
					import com.sk89q.worldedit.util.eventbus.EventHandler;
 | 
				
			||||||
import com.sk89q.worldedit.util.eventbus.Subscribe;
 | 
					import com.sk89q.worldedit.util.eventbus.Subscribe;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 | 
					import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
@@ -117,7 +117,7 @@ import java.util.zip.ZipInputStream;
 | 
				
			|||||||
@SuppressWarnings({"WeakerAccess"})
 | 
					@SuppressWarnings({"WeakerAccess"})
 | 
				
			||||||
public class PlotSquared {
 | 
					public class PlotSquared {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static @MonotonicNonNull PlotSquared instance;
 | 
					    private static @MonotonicNonNull PlotSquared instance;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Implementation
 | 
					    // Implementation
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,7 +39,7 @@ import com.plotsquared.core.util.Permissions;
 | 
				
			|||||||
import com.plotsquared.core.util.PlotExpression;
 | 
					import com.plotsquared.core.util.PlotExpression;
 | 
				
			||||||
import com.plotsquared.core.util.task.TaskManager;
 | 
					import com.plotsquared.core.util.task.TaskManager;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -51,7 +51,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			|||||||
        usage = "/plot claim")
 | 
					        usage = "/plot claim")
 | 
				
			||||||
public class Claim extends SubCommand {
 | 
					public class Claim extends SubCommand {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Claim.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final EventDispatcher eventDispatcher;
 | 
					    private final EventDispatcher eventDispatcher;
 | 
				
			||||||
    private final EconHandler econHandler;
 | 
					    private final EconHandler econHandler;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@ import com.plotsquared.core.util.Permissions;
 | 
				
			|||||||
import com.plotsquared.core.util.PlotExpression;
 | 
					import com.plotsquared.core.util.PlotExpression;
 | 
				
			||||||
import com.plotsquared.core.util.task.RunnableVal2;
 | 
					import com.plotsquared.core.util.task.RunnableVal2;
 | 
				
			||||||
import com.plotsquared.core.util.task.RunnableVal3;
 | 
					import com.plotsquared.core.util.task.RunnableVal3;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.Arrays;
 | 
					import java.util.Arrays;
 | 
				
			||||||
@@ -51,7 +51,7 @@ import java.util.concurrent.CompletableFuture;
 | 
				
			|||||||
        aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
 | 
					        aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
 | 
				
			||||||
public class MainCommand extends Command {
 | 
					public class MainCommand extends Command {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + MainCommand.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static MainCommand instance;
 | 
					    private static MainCommand instance;
 | 
				
			||||||
    public Help help;
 | 
					    public Help help;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ import com.plotsquared.core.util.query.PlotQuery;
 | 
				
			|||||||
import com.plotsquared.core.util.task.TaskManager;
 | 
					import com.plotsquared.core.util.task.TaskManager;
 | 
				
			||||||
import com.plotsquared.core.uuid.UUIDMapping;
 | 
					import com.plotsquared.core.uuid.UUIDMapping;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 | 
				
			|||||||
        confirmation = true)
 | 
					        confirmation = true)
 | 
				
			||||||
public class Purge extends SubCommand {
 | 
					public class Purge extends SubCommand {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Purge.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final PlotAreaManager plotAreaManager;
 | 
					    private final PlotAreaManager plotAreaManager;
 | 
				
			||||||
    private final PlotListener plotListener;
 | 
					    private final PlotListener plotListener;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,7 +39,7 @@ import com.plotsquared.core.util.task.TaskManager;
 | 
				
			|||||||
import com.plotsquared.core.util.task.TaskTime;
 | 
					import com.plotsquared.core.util.task.TaskTime;
 | 
				
			||||||
import com.sk89q.worldedit.math.BlockVector2;
 | 
					import com.sk89q.worldedit.math.BlockVector2;
 | 
				
			||||||
import com.sk89q.worldedit.regions.CuboidRegion;
 | 
					import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -55,7 +55,7 @@ import java.util.Set;
 | 
				
			|||||||
        category = CommandCategory.ADMINISTRATION)
 | 
					        category = CommandCategory.ADMINISTRATION)
 | 
				
			||||||
public class Trim extends SubCommand {
 | 
					public class Trim extends SubCommand {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Trim.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static volatile boolean TASK = false;
 | 
					    private static volatile boolean TASK = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final PlotAreaManager plotAreaManager;
 | 
					    private final PlotAreaManager plotAreaManager;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,7 +40,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 | 
				
			|||||||
import com.sk89q.worldedit.world.item.ItemTypes;
 | 
					import com.sk89q.worldedit.world.item.ItemTypes;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 | 
				
			|||||||
public class ComponentPresetManager {
 | 
					public class ComponentPresetManager {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
					    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ComponentPresetManager.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final List<ComponentPreset> presets;
 | 
					    private final List<ComponentPreset> presets;
 | 
				
			||||||
    private final EconHandler econHandler;
 | 
					    private final EconHandler econHandler;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ package com.plotsquared.core.configuration;
 | 
				
			|||||||
import com.plotsquared.core.configuration.Settings.Enabled_Components;
 | 
					import com.plotsquared.core.configuration.Settings.Enabled_Components;
 | 
				
			||||||
import com.plotsquared.core.configuration.file.YamlConfiguration;
 | 
					import com.plotsquared.core.configuration.file.YamlConfiguration;
 | 
				
			||||||
import com.plotsquared.core.util.StringMan;
 | 
					import com.plotsquared.core.util.StringMan;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.io.File;
 | 
					import java.io.File;
 | 
				
			||||||
@@ -40,7 +40,7 @@ import java.util.Map;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class Config {
 | 
					public class Config {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Config.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Get the value for a node<br>
 | 
					     * Get the value for a node<br>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,7 @@ import com.plotsquared.core.configuration.caption.CaptionMap;
 | 
				
			|||||||
import com.plotsquared.core.configuration.caption.LocalizedCaptionMap;
 | 
					import com.plotsquared.core.configuration.caption.LocalizedCaptionMap;
 | 
				
			||||||
import com.plotsquared.core.configuration.caption.PerUserLocaleCaptionMap;
 | 
					import com.plotsquared.core.configuration.caption.PerUserLocaleCaptionMap;
 | 
				
			||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
					import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -54,7 +54,7 @@ import java.util.stream.Stream;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public final class CaptionLoader {
 | 
					public final class CaptionLoader {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + CaptionLoader.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Gson GSON;
 | 
					    private static final Gson GSON;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
package com.plotsquared.core.configuration.caption.load;
 | 
					package com.plotsquared.core.configuration.caption.load;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -35,7 +35,7 @@ import static com.plotsquared.core.configuration.caption.load.CaptionLoader.load
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
 | 
					final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassLoaderCaptionProvider.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private final ClassLoader classLoader;
 | 
					    private final ClassLoader classLoader;
 | 
				
			||||||
    private final Function<@NonNull Locale, @NonNull String> urlProvider;
 | 
					    private final Function<@NonNull Locale, @NonNull String> urlProvider;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ package com.plotsquared.core.configuration.file;
 | 
				
			|||||||
import com.plotsquared.core.configuration.Configuration;
 | 
					import com.plotsquared.core.configuration.Configuration;
 | 
				
			||||||
import com.plotsquared.core.configuration.ConfigurationSection;
 | 
					import com.plotsquared.core.configuration.ConfigurationSection;
 | 
				
			||||||
import com.plotsquared.core.configuration.InvalidConfigurationException;
 | 
					import com.plotsquared.core.configuration.InvalidConfigurationException;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.yaml.snakeyaml.DumperOptions;
 | 
					import org.yaml.snakeyaml.DumperOptions;
 | 
				
			||||||
import org.yaml.snakeyaml.Yaml;
 | 
					import org.yaml.snakeyaml.Yaml;
 | 
				
			||||||
@@ -40,7 +40,7 @@ import java.util.Map;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class YamlConfiguration extends FileConfiguration {
 | 
					public class YamlConfiguration extends FileConfiguration {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + YamlConfiguration.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final String COMMENT_PREFIX = "# ";
 | 
					    private static final String COMMENT_PREFIX = "# ";
 | 
				
			||||||
    private static final String BLANK_CONFIG = "{}\n";
 | 
					    private static final String BLANK_CONFIG = "{}\n";
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -44,7 +44,7 @@ import com.plotsquared.core.util.HashUtil;
 | 
				
			|||||||
import com.plotsquared.core.util.StringMan;
 | 
					import com.plotsquared.core.util.StringMan;
 | 
				
			||||||
import com.plotsquared.core.util.task.RunnableVal;
 | 
					import com.plotsquared.core.util.task.RunnableVal;
 | 
				
			||||||
import com.plotsquared.core.util.task.TaskManager;
 | 
					import com.plotsquared.core.util.task.TaskManager;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -78,7 +78,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 | 
				
			|||||||
@SuppressWarnings("SqlDialectInspection")
 | 
					@SuppressWarnings("SqlDialectInspection")
 | 
				
			||||||
public class SQLManager implements AbstractDB {
 | 
					public class SQLManager implements AbstractDB {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLManager.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Public final
 | 
					    // Public final
 | 
				
			||||||
    public final String SET_OWNER;
 | 
					    public final String SET_OWNER;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
package com.plotsquared.core.database;
 | 
					package com.plotsquared.core.database;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.plotsquared.core.PlotSquared;
 | 
					import com.plotsquared.core.PlotSquared;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.io.File;
 | 
					import java.io.File;
 | 
				
			||||||
@@ -35,7 +35,7 @@ import java.sql.Statement;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class SQLite extends Database {
 | 
					public class SQLite extends Database {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLite.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final String dbLocation;
 | 
					    private final String dbLocation;
 | 
				
			||||||
    private Connection connection;
 | 
					    private Connection connection;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,7 +50,7 @@ import com.sk89q.worldedit.math.transform.AffineTransform;
 | 
				
			|||||||
import com.sk89q.worldedit.util.Direction;
 | 
					import com.sk89q.worldedit.util.Direction;
 | 
				
			||||||
import com.sk89q.worldedit.world.biome.BiomeType;
 | 
					import com.sk89q.worldedit.world.biome.BiomeType;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BaseBlock;
 | 
					import com.sk89q.worldedit.world.block.BaseBlock;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -64,7 +64,7 @@ import java.util.Locale;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class HybridPlotWorld extends ClassicPlotWorld {
 | 
					public class HybridPlotWorld extends ClassicPlotWorld {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridPlotWorld.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final AffineTransform transform = new AffineTransform().rotateY(90);
 | 
					    private static final AffineTransform transform = new AffineTransform().rotateY(90);
 | 
				
			||||||
    public boolean ROAD_SCHEMATIC_ENABLED;
 | 
					    public boolean ROAD_SCHEMATIC_ENABLED;
 | 
				
			||||||
    public boolean PLOT_SCHEMATIC = false;
 | 
					    public boolean PLOT_SCHEMATIC = false;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,7 +55,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 | 
				
			|||||||
import com.sk89q.worldedit.world.block.BlockState;
 | 
					import com.sk89q.worldedit.world.block.BlockState;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockType;
 | 
					import com.sk89q.worldedit.world.block.BlockType;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockTypes;
 | 
					import com.sk89q.worldedit.world.block.BlockTypes;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -75,7 +75,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class HybridUtils {
 | 
					public class HybridUtils {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
 | 
					    private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static HybridUtils manager;
 | 
					    public static HybridUtils manager;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@ import com.plotsquared.core.queue.QueueCoordinator;
 | 
				
			|||||||
import com.plotsquared.core.util.HashUtil;
 | 
					import com.plotsquared.core.util.HashUtil;
 | 
				
			||||||
import com.plotsquared.core.util.RegionManager;
 | 
					import com.plotsquared.core.util.RegionManager;
 | 
				
			||||||
import com.sk89q.worldedit.regions.CuboidRegion;
 | 
					import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -41,7 +41,7 @@ import java.util.Set;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public abstract class SquarePlotManager extends GridPlotManager {
 | 
					public abstract class SquarePlotManager extends GridPlotManager {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquarePlotManager.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final SquarePlotWorld squarePlotWorld;
 | 
					    private final SquarePlotWorld squarePlotWorld;
 | 
				
			||||||
    private final RegionManager regionManager;
 | 
					    private final RegionManager regionManager;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,14 +24,14 @@ import com.plotsquared.core.configuration.file.YamlConfiguration;
 | 
				
			|||||||
import com.plotsquared.core.inject.annotations.WorldConfig;
 | 
					import com.plotsquared.core.inject.annotations.WorldConfig;
 | 
				
			||||||
import com.plotsquared.core.plot.PlotId;
 | 
					import com.plotsquared.core.plot.PlotId;
 | 
				
			||||||
import com.plotsquared.core.queue.GlobalBlockQueue;
 | 
					import com.plotsquared.core.queue.GlobalBlockQueue;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public abstract class SquarePlotWorld extends GridPlotWorld {
 | 
					public abstract class SquarePlotWorld extends GridPlotWorld {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquarePlotWorld.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public int PLOT_WIDTH = 42;
 | 
					    public int PLOT_WIDTH = 42;
 | 
				
			||||||
    public int ROAD_WIDTH = 7;
 | 
					    public int ROAD_WIDTH = 7;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,7 @@ import net.kyori.adventure.text.Component;
 | 
				
			|||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import net.kyori.adventure.title.Title;
 | 
					import net.kyori.adventure.title.Title;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -91,7 +91,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    private static final String NON_EXISTENT_CAPTION = "<red>PlotSquared does not recognize the caption: ";
 | 
					    private static final String NON_EXISTENT_CAPTION = "<red>PlotSquared does not recognize the caption: ";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotPlayer.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Used to track debug mode
 | 
					    // Used to track debug mode
 | 
				
			||||||
    private static final Set<PlotPlayer<?>> debugModeEnabled =
 | 
					    private static final Set<PlotPlayer<?>> debugModeEnabled =
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,7 +73,7 @@ import net.kyori.adventure.text.Component;
 | 
				
			|||||||
import net.kyori.adventure.text.TextComponent;
 | 
					import net.kyori.adventure.text.TextComponent;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -118,7 +118,7 @@ public class Plot {
 | 
				
			|||||||
    @Deprecated(forRemoval = true, since = "6.6.0")
 | 
					    @Deprecated(forRemoval = true, since = "6.6.0")
 | 
				
			||||||
    public static final int MAX_HEIGHT = 256;
 | 
					    public static final int MAX_HEIGHT = 256;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Plot.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
 | 
					    private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
 | 
				
			||||||
    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
					    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
				
			||||||
    private static final Cleaner CLEANER = Cleaner.create();
 | 
					    private static final Cleaner CLEANER = Cleaner.create();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,7 +60,7 @@ import com.sk89q.worldedit.world.gamemode.GameMode;
 | 
				
			|||||||
import com.sk89q.worldedit.world.gamemode.GameModes;
 | 
					import com.sk89q.worldedit.world.gamemode.GameModes;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -85,7 +85,7 @@ import java.util.function.Consumer;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public abstract class PlotArea {
 | 
					public abstract class PlotArea {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotArea.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
					    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
				
			||||||
    private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
 | 
					    private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,7 +47,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			|||||||
import com.sk89q.worldedit.world.biome.BiomeType;
 | 
					import com.sk89q.worldedit.world.biome.BiomeType;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockTypes;
 | 
					import com.sk89q.worldedit.world.block.BlockTypes;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public final class PlotModificationManager {
 | 
					public final class PlotModificationManager {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotModificationManager.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final Plot plot;
 | 
					    private final Plot plot;
 | 
				
			||||||
    private final ProgressSubscriberFactory subscriberFactory;
 | 
					    private final ProgressSubscriberFactory subscriberFactory;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,7 +27,7 @@ import com.plotsquared.core.util.MathMan;
 | 
				
			|||||||
import com.plotsquared.core.util.query.PlotQuery;
 | 
					import com.plotsquared.core.util.query.PlotQuery;
 | 
				
			||||||
import com.plotsquared.core.util.task.RunnableVal;
 | 
					import com.plotsquared.core.util.task.RunnableVal;
 | 
				
			||||||
import com.plotsquared.core.util.task.TaskManager;
 | 
					import com.plotsquared.core.util.task.TaskManager;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.lang.reflect.Array;
 | 
					import java.lang.reflect.Array;
 | 
				
			||||||
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class PlotAnalysis {
 | 
					public class PlotAnalysis {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotAnalysis.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static boolean running = false;
 | 
					    public static boolean running = false;
 | 
				
			||||||
    public int changes;
 | 
					    public int changes;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ import com.google.common.base.Preconditions;
 | 
				
			|||||||
import com.google.common.collect.ImmutableMap;
 | 
					import com.google.common.collect.ImmutableMap;
 | 
				
			||||||
import com.plotsquared.core.configuration.caption.CaptionUtility;
 | 
					import com.plotsquared.core.configuration.caption.CaptionUtility;
 | 
				
			||||||
import com.plotsquared.core.util.AnnotationHelper;
 | 
					import com.plotsquared.core.util.AnnotationHelper;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -39,7 +39,7 @@ import java.util.Objects;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class FlagContainer {
 | 
					public class FlagContainer {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + FlagContainer.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final Map<String, String> unknownFlags = new HashMap<>();
 | 
					    private final Map<String, String> unknownFlags = new HashMap<>();
 | 
				
			||||||
    private final Map<Class<?>, PlotFlag<?, ?>> flagMap = new HashMap<>();
 | 
					    private final Map<Class<?>, PlotFlag<?, ?>> flagMap = new HashMap<>();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,7 +24,7 @@ import com.plotsquared.core.configuration.Settings;
 | 
				
			|||||||
import com.sk89q.worldedit.world.block.BlockCategory;
 | 
					import com.sk89q.worldedit.world.block.BlockCategory;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockStateHolder;
 | 
					import com.sk89q.worldedit.world.block.BlockStateHolder;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockType;
 | 
					import com.sk89q.worldedit.world.block.BlockType;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -38,7 +38,7 @@ import java.util.Map;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class BlockTypeWrapper {
 | 
					public class BlockTypeWrapper {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BlockTypeWrapper.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Map<BlockType, BlockTypeWrapper> blockTypes = new HashMap<>();
 | 
					    private static final Map<BlockType, BlockTypeWrapper> blockTypes = new HashMap<>();
 | 
				
			||||||
    private static final Map<String, BlockTypeWrapper> blockCategories = new HashMap<>();
 | 
					    private static final Map<String, BlockTypeWrapper> blockCategories = new HashMap<>();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,13 +20,13 @@ package com.plotsquared.core.queue;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import com.plotsquared.core.PlotSquared;
 | 
					import com.plotsquared.core.PlotSquared;
 | 
				
			||||||
import com.sk89q.worldedit.world.World;
 | 
					import com.sk89q.worldedit.world.World;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public abstract class QueueProvider {
 | 
					public abstract class QueueProvider {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static QueueProvider of(final @NonNull Class<? extends QueueCoordinator> primary) {
 | 
					    public static QueueProvider of(final @NonNull Class<? extends QueueCoordinator> primary) {
 | 
				
			||||||
        return new QueueProvider() {
 | 
					        return new QueueProvider() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,7 @@ import com.plotsquared.core.player.ConsolePlayer;
 | 
				
			|||||||
import com.plotsquared.core.plot.BlockBucket;
 | 
					import com.plotsquared.core.plot.BlockBucket;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockState;
 | 
					import com.sk89q.worldedit.world.block.BlockState;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.Template;
 | 
					import net.kyori.adventure.text.minimessage.Template;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -41,7 +41,7 @@ import java.util.Map;
 | 
				
			|||||||
public final class LegacyConverter {
 | 
					public final class LegacyConverter {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static final String CONFIGURATION_VERSION = "post_flattening";
 | 
					    public static final String CONFIGURATION_VERSION = "post_flattening";
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LegacyConverter.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final HashMap<String, ConfigurationType> TYPE_MAP = new HashMap<>();
 | 
					    private static final HashMap<String, ConfigurationType> TYPE_MAP = new HashMap<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    static {
 | 
					    static {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ import com.plotsquared.core.configuration.Settings;
 | 
				
			|||||||
import com.plotsquared.core.plot.Plot;
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
import com.sk89q.jnbt.CompoundTag;
 | 
					import com.sk89q.jnbt.CompoundTag;
 | 
				
			||||||
import com.sk89q.jnbt.NBTOutputStream;
 | 
					import com.sk89q.jnbt.NBTOutputStream;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -45,7 +45,7 @@ import java.util.zip.GZIPOutputStream;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class PlotUploader {
 | 
					public class PlotUploader {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotUploader.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final Path TEMP_DIR = Paths.get(PlotSquared.platform().getDirectory().getPath());
 | 
					    private static final Path TEMP_DIR = Paths.get(PlotSquared.platform().getDirectory().getPath());
 | 
				
			||||||
    private final SchematicHandler schematicHandler;
 | 
					    private final SchematicHandler schematicHandler;
 | 
				
			||||||
    private final Arkitektonika arkitektonika;
 | 
					    private final Arkitektonika arkitektonika;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,7 +40,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			|||||||
import com.sk89q.worldedit.regions.Region;
 | 
					import com.sk89q.worldedit.regions.Region;
 | 
				
			||||||
import com.sk89q.worldedit.world.World;
 | 
					import com.sk89q.worldedit.world.World;
 | 
				
			||||||
import com.sk89q.worldedit.world.biome.BiomeType;
 | 
					import com.sk89q.worldedit.world.biome.BiomeType;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -51,7 +51,7 @@ import java.util.Set;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public abstract class RegionManager {
 | 
					public abstract class RegionManager {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + RegionManager.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static RegionManager manager = null;
 | 
					    public static RegionManager manager = null;
 | 
				
			||||||
    protected final WorldUtil worldUtil;
 | 
					    protected final WorldUtil worldUtil;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,7 @@ import com.sk89q.worldedit.world.World;
 | 
				
			|||||||
import com.sk89q.worldedit.world.biome.BiomeType;
 | 
					import com.sk89q.worldedit.world.biome.BiomeType;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BaseBlock;
 | 
					import com.sk89q.worldedit.world.block.BaseBlock;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockTypes;
 | 
					import com.sk89q.worldedit.world.block.BlockTypes;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -107,7 +107,7 @@ import java.util.zip.GZIPOutputStream;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public abstract class SchematicHandler {
 | 
					public abstract class SchematicHandler {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SchematicHandler.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final Gson GSON = new Gson();
 | 
					    private static final Gson GSON = new Gson();
 | 
				
			||||||
    public static SchematicHandler manager;
 | 
					    public static SchematicHandler manager;
 | 
				
			||||||
    private final WorldUtil worldUtil;
 | 
					    private final WorldUtil worldUtil;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ import com.plotsquared.core.player.ConsolePlayer;
 | 
				
			|||||||
import com.plotsquared.core.util.ThreadUtils;
 | 
					import com.plotsquared.core.util.ThreadUtils;
 | 
				
			||||||
import com.plotsquared.core.util.task.TaskManager;
 | 
					import com.plotsquared.core.util.task.TaskManager;
 | 
				
			||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
					import net.kyori.adventure.text.minimessage.MiniMessage;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
@@ -59,7 +59,7 @@ import java.util.function.Function;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
public class UUIDPipeline {
 | 
					public class UUIDPipeline {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + UUIDPipeline.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
					    private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private final Executor executor;
 | 
					    private final Executor executor;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,7 @@ import com.plotsquared.core.plot.flag.PlotFlag;
 | 
				
			|||||||
import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.UseFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.UseFlag;
 | 
				
			||||||
import com.sk89q.worldedit.world.item.ItemType;
 | 
					import com.sk89q.worldedit.world.item.ItemType;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.junit.jupiter.api.Assertions;
 | 
					import org.junit.jupiter.api.Assertions;
 | 
				
			||||||
import org.junit.jupiter.api.BeforeEach;
 | 
					import org.junit.jupiter.api.BeforeEach;
 | 
				
			||||||
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
public class FlagTest {
 | 
					public class FlagTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + FlagTest.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private ItemType testBlock;
 | 
					    private ItemType testBlock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,13 +19,13 @@
 | 
				
			|||||||
package com.plotsquared.core.plot;
 | 
					package com.plotsquared.core.plot;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.plotsquared.core.PlotVersion;
 | 
					import com.plotsquared.core.PlotVersion;
 | 
				
			||||||
import org.apache.logging.log4j.LogManager;
 | 
					import com.sk89q.worldedit.internal.util.LogManagerCompat;
 | 
				
			||||||
import org.apache.logging.log4j.Logger;
 | 
					import org.apache.logging.log4j.Logger;
 | 
				
			||||||
import org.junit.jupiter.api.Test;
 | 
					import org.junit.jupiter.api.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class PlotVersionTest {
 | 
					public class PlotVersionTest {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotVersionTest.class.getSimpleName());
 | 
					    private static final Logger LOGGER = LogManagerCompat.getLogger();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Test
 | 
					    @Test
 | 
				
			||||||
    public void tryParse() {
 | 
					    public void tryParse() {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user