From ee2ed8222de0c3132a80630cc51580034e675a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Thu, 16 Apr 2020 06:14:33 +0200 Subject: [PATCH] Merge config packages --- .../com/plotsquared/bukkit/BukkitMain.java | 8 ++--- .../plotsquared/bukkit/command/DebugUUID.java | 2 +- .../bukkit/listener/ChunkListener.java | 2 +- .../bukkit/listener/EntitySpawnListener.java | 2 +- .../bukkit/listener/ForceFieldListener.java | 2 +- .../bukkit/listener/PlayerEvents.java | 4 +-- .../placeholder/PlaceholderFormatter.java | 2 +- .../bukkit/player/BukkitPlayer.java | 2 +- .../bukkit/schematic/StateWrapper.java | 2 +- .../bukkit/util/BukkitChatManager.java | 4 +-- .../bukkit/util/BukkitSetupUtils.java | 2 +- .../plotsquared/bukkit/util/BukkitUtil.java | 2 +- .../bukkit/util/UpdateUtility.java | 4 +-- .../bukkit/util/uuid/FileUUIDHandler.java | 4 +-- .../bukkit/util/uuid/SQLUUIDHandler.java | 4 +-- .../com/plotsquared/core/PlotSquared.java | 30 +++++++++---------- .../com/plotsquared/core/api/PlotAPI.java | 4 +-- .../com/plotsquared/core/command/Add.java | 2 +- .../com/plotsquared/core/command/Alias.java | 2 +- .../com/plotsquared/core/command/Area.java | 12 ++++---- .../com/plotsquared/core/command/Auto.java | 6 ++-- .../com/plotsquared/core/command/Biome.java | 2 +- .../com/plotsquared/core/command/Buy.java | 2 +- .../com/plotsquared/core/command/Caps.java | 2 +- .../com/plotsquared/core/command/Claim.java | 6 ++-- .../com/plotsquared/core/command/Clear.java | 4 +-- .../com/plotsquared/core/command/Cluster.java | 4 +-- .../plotsquared/core/command/CmdConfirm.java | 2 +- .../com/plotsquared/core/command/Command.java | 2 +- .../core/command/CommandCategory.java | 2 +- .../com/plotsquared/core/command/Comment.java | 2 +- .../com/plotsquared/core/command/Confirm.java | 4 +-- .../plotsquared/core/command/Continue.java | 4 +-- .../com/plotsquared/core/command/Copy.java | 2 +- .../core/command/CreateRoadSchematic.java | 2 +- .../com/plotsquared/core/command/Debug.java | 2 +- .../core/command/DebugAllowUnsafe.java | 2 +- .../core/command/DebugClaimTest.java | 2 +- .../plotsquared/core/command/DebugExec.java | 4 +-- .../plotsquared/core/command/DebugPaste.java | 4 +-- .../core/command/DebugRoadRegen.java | 2 +- .../com/plotsquared/core/command/Delete.java | 4 +-- .../com/plotsquared/core/command/Deny.java | 2 +- .../com/plotsquared/core/command/Desc.java | 2 +- .../com/plotsquared/core/command/Done.java | 4 +-- .../plotsquared/core/command/Download.java | 4 +-- .../plotsquared/core/command/FlagCommand.java | 6 ++-- .../com/plotsquared/core/command/Grant.java | 4 +-- .../com/plotsquared/core/command/Help.java | 2 +- .../com/plotsquared/core/command/Inbox.java | 2 +- .../com/plotsquared/core/command/Info.java | 4 +-- .../com/plotsquared/core/command/Kick.java | 2 +- .../com/plotsquared/core/command/Leave.java | 2 +- .../com/plotsquared/core/command/Like.java | 4 +-- .../com/plotsquared/core/command/ListCmd.java | 4 +-- .../com/plotsquared/core/command/Load.java | 4 +-- .../plotsquared/core/command/MainCommand.java | 4 +-- .../com/plotsquared/core/command/Merge.java | 4 +-- .../com/plotsquared/core/command/Middle.java | 2 +- .../com/plotsquared/core/command/Move.java | 2 +- .../com/plotsquared/core/command/Music.java | 2 +- .../com/plotsquared/core/command/Near.java | 2 +- .../com/plotsquared/core/command/Owner.java | 4 +-- .../com/plotsquared/core/command/Purge.java | 2 +- .../com/plotsquared/core/command/Rate.java | 4 +-- .../core/command/RegenAllRoads.java | 2 +- .../com/plotsquared/core/command/Relight.java | 2 +- .../com/plotsquared/core/command/Reload.java | 2 +- .../com/plotsquared/core/command/Remove.java | 2 +- .../com/plotsquared/core/command/Save.java | 2 +- .../core/command/SchematicCmd.java | 4 +-- .../com/plotsquared/core/command/Set.java | 4 +-- .../plotsquared/core/command/SetCommand.java | 4 +-- .../com/plotsquared/core/command/SetHome.java | 2 +- .../com/plotsquared/core/command/Setup.java | 8 ++--- .../plotsquared/core/command/SubCommand.java | 2 +- .../com/plotsquared/core/command/Swap.java | 2 +- .../com/plotsquared/core/command/Target.java | 2 +- .../plotsquared/core/command/Template.java | 6 ++-- .../com/plotsquared/core/command/Toggle.java | 2 +- .../com/plotsquared/core/command/Trim.java | 2 +- .../com/plotsquared/core/command/Trust.java | 2 +- .../com/plotsquared/core/command/Unlink.java | 2 +- .../com/plotsquared/core/command/Visit.java | 4 +-- .../{config => configuration}/Caption.java | 2 +- .../CaptionUtility.java | 2 +- .../{config => configuration}/Captions.java | 3 +- .../ChatFormatter.java | 2 +- .../{config => configuration}/Config.java | 5 ++-- .../ConfigurationNode.java | 10 +++---- .../ConfigurationUtil.java} | 4 +-- .../PlotSquaredChatFormatter.java | 2 +- .../{config => configuration}/Settings.java | 2 +- .../StaticCaption.java | 2 +- .../{config => configuration}/Storage.java | 2 +- .../com/plotsquared/core/database/MySQL.java | 2 +- .../plotsquared/core/database/SQLManager.java | 6 ++-- .../core/generator/ClassicPlotManager.java | 2 +- .../core/generator/ClassicPlotWorld.java | 30 +++++++++---------- .../plotsquared/core/generator/HybridGen.java | 2 +- .../core/generator/HybridPlotManager.java | 2 +- .../core/generator/HybridPlotWorld.java | 2 +- .../core/generator/HybridUtils.java | 2 +- .../core/listener/PlotListener.java | 4 +-- .../core/listener/ProcessedWEExtent.java | 4 +-- .../core/listener/WESubscriber.java | 4 +-- .../plotsquared/core/player/PlotPlayer.java | 6 ++-- .../plotsquared/core/plot/BlockBucket.java | 4 +-- .../java/com/plotsquared/core/plot/Plot.java | 8 ++--- .../com/plotsquared/core/plot/PlotArea.java | 12 ++++---- .../plotsquared/core/plot/PlotManager.java | 2 +- .../com/plotsquared/core/plot/Rating.java | 2 +- .../plotsquared/core/plot/SetupObject.java | 2 +- .../core/plot/comment/CommentManager.java | 4 +-- .../core/plot/expiration/ExpireManager.java | 4 +-- .../core/plot/expiration/ExpiryTask.java | 3 +- .../core/plot/expiration/PlotAnalysis.java | 2 +- .../core/plot/flag/FlagParseException.java | 4 +-- .../plotsquared/core/plot/flag/PlotFlag.java | 4 +-- .../flag/implementations/AnalysisFlag.java | 2 +- .../implementations/AnimalAttackFlag.java | 2 +- .../flag/implementations/AnimalCapFlag.java | 2 +- .../implementations/AnimalInteractFlag.java | 2 +- .../flag/implementations/BlockBurnFlag.java | 2 +- .../implementations/BlockIgnitionFlag.java | 2 +- .../flag/implementations/BlockedCmdsFlag.java | 2 +- .../plot/flag/implementations/BreakFlag.java | 2 +- .../flag/implementations/CoralDryFlag.java | 2 +- .../flag/implementations/DenyExitFlag.java | 2 +- .../implementations/DenyTeleportFlag.java | 2 +- .../flag/implementations/DescriptionFlag.java | 2 +- .../implementations/DeviceInteractFlag.java | 2 +- .../implementations/DisablePhysicsFlag.java | 2 +- .../plot/flag/implementations/DoneFlag.java | 2 +- .../implementations/DropProtectionFlag.java | 2 +- .../flag/implementations/EntityCapFlag.java | 2 +- .../flag/implementations/ExplosionFlag.java | 2 +- .../flag/implementations/FarewellFlag.java | 2 +- .../plot/flag/implementations/FeedFlag.java | 2 +- .../plot/flag/implementations/FlyFlag.java | 2 +- .../flag/implementations/ForcefieldFlag.java | 2 +- .../flag/implementations/GamemodeFlag.java | 2 +- .../flag/implementations/GrassGrowFlag.java | 2 +- .../flag/implementations/GreetingFlag.java | 2 +- .../implementations/GuestGamemodeFlag.java | 2 +- .../implementations/HangingBreakFlag.java | 2 +- .../implementations/HangingPlaceFlag.java | 2 +- .../plot/flag/implementations/HealFlag.java | 2 +- .../flag/implementations/HideInfoFlag.java | 2 +- .../implementations/HostileAttackFlag.java | 2 +- .../flag/implementations/HostileCapFlag.java | 2 +- .../implementations/HostileInteractFlag.java | 2 +- .../flag/implementations/IceFormFlag.java | 2 +- .../flag/implementations/IceMeltFlag.java | 2 +- .../flag/implementations/InstabreakFlag.java | 2 +- .../flag/implementations/InvincibleFlag.java | 2 +- .../flag/implementations/ItemDropFlag.java | 2 +- .../plot/flag/implementations/KeepFlag.java | 2 +- .../flag/implementations/KelpGrowFlag.java | 2 +- .../flag/implementations/LiquidFlowFlag.java | 2 +- .../flag/implementations/MiscBreakFlag.java | 2 +- .../flag/implementations/MiscCapFlag.java | 2 +- .../implementations/MiscInteractFlag.java | 2 +- .../flag/implementations/MiscPlaceFlag.java | 2 +- .../flag/implementations/MobBreakFlag.java | 2 +- .../plot/flag/implementations/MobCapFlag.java | 2 +- .../flag/implementations/MobPlaceFlag.java | 2 +- .../plot/flag/implementations/MusicFlag.java | 2 +- .../flag/implementations/MycelGrowFlag.java | 2 +- .../flag/implementations/NoWorldeditFlag.java | 2 +- .../flag/implementations/NotifyEnterFlag.java | 2 +- .../flag/implementations/NotifyLeaveFlag.java | 2 +- .../plot/flag/implementations/PlaceFlag.java | 2 +- .../implementations/PlayerInteractFlag.java | 2 +- .../plot/flag/implementations/PriceFlag.java | 2 +- .../plot/flag/implementations/PveFlag.java | 2 +- .../plot/flag/implementations/PvpFlag.java | 2 +- .../flag/implementations/RedstoneFlag.java | 2 +- .../flag/implementations/ServerPlotFlag.java | 2 +- .../flag/implementations/SnowFormFlag.java | 2 +- .../flag/implementations/SnowMeltFlag.java | 2 +- .../flag/implementations/SoilDryFlag.java | 2 +- .../flag/implementations/TamedAttackFlag.java | 2 +- .../implementations/TamedInteractFlag.java | 2 +- .../plot/flag/implementations/TimeFlag.java | 2 +- .../plot/flag/implementations/TitlesFlag.java | 2 +- .../implementations/UntrustedVisitFlag.java | 2 +- .../plot/flag/implementations/UseFlag.java | 2 +- .../implementations/VehicleBreakFlag.java | 2 +- .../flag/implementations/VehicleCapFlag.java | 2 +- .../implementations/VehiclePlaceFlag.java | 2 +- .../flag/implementations/VehicleUseFlag.java | 2 +- .../implementations/VillagerInteractFlag.java | 2 +- .../flag/implementations/VineGrowFlag.java | 2 +- .../flag/implementations/WeatherFlag.java | 2 +- .../plot/flag/types/BlockTypeListFlag.java | 4 +-- .../core/plot/flag/types/BooleanFlag.java | 4 +-- .../core/plot/flag/types/DoubleFlag.java | 4 +-- .../core/plot/flag/types/IntegerFlag.java | 4 +-- .../core/plot/flag/types/ListFlag.java | 4 +-- .../core/plot/flag/types/LongFlag.java | 4 +-- .../flag/types/NonNegativeIntegerFlag.java | 2 +- .../core/plot/flag/types/NumberFlag.java | 4 +-- .../core/plot/flag/types/TimedFlag.java | 4 +-- .../core/plot/message/PlainChatManager.java | 2 +- .../core/plot/message/PlotMessage.java | 2 +- .../core/plot/world/SinglePlotArea.java | 6 ++-- .../com/plotsquared/core/util/EntityUtil.java | 2 +- .../core/util/EventDispatcher.java | 6 ++-- .../core/util/LegacyConverter.java | 4 +-- .../com/plotsquared/core/util/MainUtil.java | 8 ++--- .../plotsquared/core/util/PatternUtil.java | 2 +- .../plotsquared/core/util/Permissions.java | 4 +-- .../core/util/SchematicHandler.java | 2 +- .../com/plotsquared/core/util/StringMan.java | 2 +- .../com/plotsquared/core/util/WEManager.java | 2 +- .../core/util/helpmenu/HelpObject.java | 2 +- .../core/util/helpmenu/HelpPage.java | 2 +- .../plotsquared/core/util/net/HttpUtil.java | 2 +- .../core/util/task/AutoClaimFinishTask.java | 2 +- .../core/util/uuid/UUIDHandler.java | 2 +- .../util/uuid/UUIDHandlerImplementation.java | 4 +-- 222 files changed, 341 insertions(+), 344 deletions(-) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/Caption.java (97%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/CaptionUtility.java (98%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/Captions.java (99%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/ChatFormatter.java (97%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/Config.java (99%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/ConfigurationNode.java (92%) rename Core/src/main/java/com/plotsquared/core/{config/Configuration.java => configuration/ConfigurationUtil.java} (98%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/PlotSquaredChatFormatter.java (98%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/Settings.java (99%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/StaticCaption.java (97%) rename Core/src/main/java/com/plotsquared/core/{config => configuration}/Storage.java (98%) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index 9ce5ebc6e..e9cb28a85 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -52,10 +52,10 @@ import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.IPlotMain; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.ChatFormatter; -import com.plotsquared.core.config.ConfigurationNode; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ChatFormatter; +import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.generator.HybridGen; import com.plotsquared.core.generator.HybridUtils; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java index a17d11626..94b3e6604 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java @@ -35,7 +35,7 @@ import com.plotsquared.core.PlotSquared; import com.plotsquared.core.command.CommandCategory; import com.plotsquared.core.command.RequiredType; import com.plotsquared.core.command.SubCommand; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.plot.Plot; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java index 4336b25ab..ab8df40c4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java @@ -26,7 +26,7 @@ package com.plotsquared.bukkit.listener; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.ReflectionUtils.RefClass; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java index 7a76e8530..21a30f02a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java @@ -27,7 +27,7 @@ package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java index 7f4daa84c..0f96ac45b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java @@ -27,7 +27,7 @@ package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java index 4a93f7253..7a1899da7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java @@ -30,8 +30,8 @@ import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.UpdateUtility; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag; import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java index 456e81d73..d10268f6a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java @@ -26,7 +26,7 @@ package com.plotsquared.bukkit.placeholder; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.core.config.ChatFormatter; +import com.plotsquared.core.configuration.ChatFormatter; import com.plotsquared.core.player.PlotPlayer; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java index 926a5e21f..c4b3951e0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java @@ -27,7 +27,7 @@ package com.plotsquared.bukkit.player; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.events.TeleportCause; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java index 06dc61d34..e68bcfca4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java @@ -27,7 +27,7 @@ package com.plotsquared.bukkit.schematic; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.ListTag; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java index 37348ae50..6d8650622 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java @@ -27,8 +27,8 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.chat.FancyMessage; import com.plotsquared.bukkit.player.BukkitPlayer; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.ConsolePlayer; import com.plotsquared.core.plot.message.PlotMessage; import com.plotsquared.core.player.PlotPlayer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java index b9a5fc746..26f70fc4d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -29,7 +29,7 @@ import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.configuration.ConfigurationNode; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotAreaType; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index 38ee98cba..779d15361 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -28,7 +28,7 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java index 911a2d5f9..bc11af3f5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java @@ -26,8 +26,8 @@ package com.plotsquared.bukkit.util; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import org.bukkit.Bukkit; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java index 89a0cd24d..c5620ffa1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java @@ -28,8 +28,8 @@ package com.plotsquared.bukkit.util.uuid; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.plot.expiration.ExpireManager; import com.plotsquared.core.util.StringMan; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java index c08db6b1e..2d8e38f50 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java @@ -26,8 +26,8 @@ package com.plotsquared.bukkit.util.uuid; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.SQLite; import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.StringWrapper; diff --git a/Core/src/main/java/com/plotsquared/core/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java index 780f826c7..84f0a6588 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java +++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java @@ -26,12 +26,12 @@ package com.plotsquared.core; import com.plotsquared.core.command.WE_Anywhere; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.Settings; -import com.plotsquared.core.config.Storage; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.Settings; +import com.plotsquared.core.configuration.Storage; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.MemorySection; import com.plotsquared.core.configuration.file.YamlConfiguration; @@ -1449,41 +1449,41 @@ import java.util.zip.ZipInputStream; case "s": case "size": this.worlds.set(base + "plot.size", - Configuration.INTEGER.parseString(value).shortValue()); + ConfigurationUtil.INTEGER.parseString(value).shortValue()); break; case "g": case "gap": this.worlds.set(base + "road.width", - Configuration.INTEGER.parseString(value).shortValue()); + ConfigurationUtil.INTEGER.parseString(value).shortValue()); break; case "h": case "height": this.worlds.set(base + "road.height", - Configuration.INTEGER.parseString(value).shortValue()); + ConfigurationUtil.INTEGER.parseString(value).shortValue()); this.worlds.set(base + "plot.height", - Configuration.INTEGER.parseString(value).shortValue()); + ConfigurationUtil.INTEGER.parseString(value).shortValue()); this.worlds.set(base + "wall.height", - Configuration.INTEGER.parseString(value).shortValue()); + ConfigurationUtil.INTEGER.parseString(value).shortValue()); break; case "f": case "floor": this.worlds.set(base + "plot.floor", - Configuration.BLOCK_BUCKET.parseString(value).toString()); + ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()); break; case "m": case "main": this.worlds.set(base + "plot.filling", - Configuration.BLOCK_BUCKET.parseString(value).toString()); + ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()); break; case "w": case "wall": this.worlds.set(base + "wall.filling", - Configuration.BLOCK_BUCKET.parseString(value).toString()); + ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()); break; case "b": case "border": this.worlds.set(base + "wall.block", - Configuration.BLOCK_BUCKET.parseString(value).toString()); + ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()); break; default: PlotSquared.log("&cKey not found: &7" + element); diff --git a/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java index 294a28447..acf894c54 100644 --- a/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java +++ b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java @@ -27,8 +27,8 @@ package com.plotsquared.core.api; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java index c085bab2f..4a5da7beb 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Add.java +++ b/Core/src/main/java/com/plotsquared/core/command/Add.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java index f17878c4a..9ca6804e6 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Alias.java +++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java index 37d8e1abb..aa00f251f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Area.java +++ b/Core/src/main/java/com/plotsquared/core/command/Area.java @@ -27,8 +27,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.generator.AugmentedUtils; import com.plotsquared.core.generator.HybridPlotWorld; import com.plotsquared.core.location.Location; @@ -239,20 +239,20 @@ public class Area extends SubCommand { break; case "f": case "floor": - pa.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); + pa.TOP_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]); break; case "m": case "main": - pa.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); + pa.MAIN_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]); break; case "w": case "wall": pa.WALL_FILLING = - Configuration.BLOCK_BUCKET.parseString(pair[1]); + ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]); break; case "b": case "border": - pa.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]); + pa.WALL_BLOCK = ConfigurationUtil.BLOCK_BUCKET.parseString(pair[1]); break; case "terrain": pa.setTerrain(PlotAreaTerrainType.fromString(pair[1]).orElseThrow(() -> new IllegalArgumentException(pair[1] + " is not a valid terrain."))); diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java index cba9e284f..3fa8d8ee6 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -26,9 +26,9 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlayerAutoPlotEvent; import com.plotsquared.core.events.PlotAutoMergeEvent; diff --git a/Core/src/main/java/com/plotsquared/core/command/Biome.java b/Core/src/main/java/com/plotsquared/core/command/Biome.java index 594a3f88f..fca7d037a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Biome.java +++ b/Core/src/main/java/com/plotsquared/core/command/Biome.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/command/Buy.java b/Core/src/main/java/com/plotsquared/core/command/Buy.java index 609c7ed40..32fe02d60 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Buy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.plot.flag.PlotFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/Caps.java b/Core/src/main/java/com/plotsquared/core/command/Caps.java index a554d3bf5..05ab6fb1b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Caps.java +++ b/Core/src/main/java/com/plotsquared/core/command/Caps.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.PlotFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java index e0b6d6425..f6208bb38 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Claim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java @@ -27,9 +27,9 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlayerClaimPlotEvent; import com.plotsquared.core.events.PlotMergeEvent; diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java index ace1f38ef..3cffecada 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Clear.java +++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.plot.flag.PlotFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java index 428cb5249..56bed3d95 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java +++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java index b5a2f8b61..8b657992d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.task.TaskManager; diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java index 9ea3ac052..a89533733 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Command.java +++ b/Core/src/main/java/com/plotsquared/core/command/Command.java @@ -27,7 +27,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.message.PlotMessage; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java index 259b69a75..2cffd99c0 100644 --- a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java +++ b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import lombok.RequiredArgsConstructor; /** diff --git a/Core/src/main/java/com/plotsquared/core/command/Comment.java b/Core/src/main/java/com/plotsquared/core/command/Comment.java index ae31b5345..58386802e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Comment.java +++ b/Core/src/main/java/com/plotsquared/core/command/Comment.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.comment.CommentInbox; diff --git a/Core/src/main/java/com/plotsquared/core/command/Confirm.java b/Core/src/main/java/com/plotsquared/core/command/Confirm.java index f79457515..04723ac48 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Confirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/Confirm.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.task.TaskManager; diff --git a/Core/src/main/java/com/plotsquared/core/command/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java index e4616ce52..f2a03ba2a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Continue.java +++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.plot.flag.PlotFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java index 9c5b8fc0f..2de5b35e8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Copy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java index ca15daaf7..fcd45f1fe 100644 --- a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java +++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.generator.HybridPlotWorld; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/Debug.java b/Core/src/main/java/com/plotsquared/core/command/Debug.java index 8e3eeec23..988adde3d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Debug.java +++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java index 486a3bd22..e4de7e351 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java index 74d330ad3..40fa3f105 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugClaimTest.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java index 2e6eb83c4..4091862e5 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index 752cdcd9e..d366c2b41 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.net.IncendoPaster; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java index 3aed18334..534241c73 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.generator.HybridPlotManager; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java index f9a495063..6d033109f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Delete.java +++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.Result; import com.plotsquared.core.util.Expression; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java index cceece73c..a8a9290b8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Desc.java b/Core/src/main/java/com/plotsquared/core/command/Desc.java index 5acfae106..b7d2de59a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Desc.java +++ b/Core/src/main/java/com/plotsquared/core/command/Desc.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java index bb4de46f5..b1afc67ac 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Done.java +++ b/Core/src/main/java/com/plotsquared/core/command/Done.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotDoneEvent; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java index 1e1b93901..85dc1cd87 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Download.java +++ b/Core/src/main/java/com/plotsquared/core/command/Download.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java index e1fa01726..a7355b092 100644 --- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java @@ -26,9 +26,9 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java index 0b7e8fc34..ea2171c80 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Grant.java +++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal; diff --git a/Core/src/main/java/com/plotsquared/core/command/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java index 3387d4896..8f284c186 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Help.java +++ b/Core/src/main/java/com/plotsquared/core/command/Help.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; diff --git a/Core/src/main/java/com/plotsquared/core/command/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java index 94aada5e8..00154570c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java +++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal; diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java index 4e5225f34..a6fe53fbb 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Info.java +++ b/Core/src/main/java/com/plotsquared/core/command/Info.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.flag.implementations.HideInfoFlag; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java index e4dfa2523..f30c4d081 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Kick.java +++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Leave.java b/Core/src/main/java/com/plotsquared/core/command/Leave.java index ea2d6e220..32c4e1ae8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Leave.java +++ b/Core/src/main/java/com/plotsquared/core/command/Leave.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; diff --git a/Core/src/main/java/com/plotsquared/core/command/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java index 6de55b5e7..305ae645e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Like.java +++ b/Core/src/main/java/com/plotsquared/core/command/Like.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotRateEvent; import com.plotsquared.core.plot.flag.implementations.DoneFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java index 6852bc1ae..28d322c4a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java @@ -27,8 +27,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.PlotSquared.SortType; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.PriceFlag; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java index 0ed0b5c40..fca5e67a3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Load.java +++ b/Core/src/main/java/com/plotsquared/core/command/Load.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; diff --git a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java index 43c247b8a..263012e0f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.ConsolePlayer; import com.plotsquared.core.util.Expression; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java index b3c44a6e8..81856bbb4 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.location.Direction; diff --git a/Core/src/main/java/com/plotsquared/core/command/Middle.java b/Core/src/main/java/com/plotsquared/core/command/Middle.java index 19f38292d..0eddec2e5 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Middle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Middle.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java index bd3a4e924..4fdf0ea0b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Move.java +++ b/Core/src/main/java/com/plotsquared/core/command/Move.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/command/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java index f540a0842..9228c1ca7 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Music.java +++ b/Core/src/main/java/com/plotsquared/core/command/Music.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/Near.java b/Core/src/main/java/com/plotsquared/core/command/Near.java index ae03fcd7c..8be253018 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Near.java +++ b/Core/src/main/java/com/plotsquared/core/command/Near.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; diff --git a/Core/src/main/java/com/plotsquared/core/command/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java index 25a7b2466..237ff7103 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Owner.java +++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotChangeOwnerEvent; import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/command/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java index ed2359b5c..a248e9a50 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Purge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.listener.PlotListener; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java index 71d3d9475..ab1f1b523 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Rate.java +++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotRateEvent; import com.plotsquared.core.plot.flag.implementations.DoneFlag; diff --git a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java index 87e5857d5..230c6eea1 100644 --- a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java +++ b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.generator.HybridPlotManager; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/command/Relight.java b/Core/src/main/java/com/plotsquared/core/command/Relight.java index ba1547169..be6d8e95c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Relight.java +++ b/Core/src/main/java/com/plotsquared/core/command/Relight.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal; diff --git a/Core/src/main/java/com/plotsquared/core/command/Reload.java b/Core/src/main/java/com/plotsquared/core/command/Reload.java index d40246b2c..b099d3c02 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Reload.java +++ b/Core/src/main/java/com/plotsquared/core/command/Reload.java @@ -29,7 +29,7 @@ import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.MemorySection; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/command/Remove.java b/Core/src/main/java/com/plotsquared/core/command/Remove.java index b53b0e0ca..d461b6557 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Remove.java +++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Save.java b/Core/src/main/java/com/plotsquared/core/command/Save.java index b6fec13b8..4945cbefd 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Save.java +++ b/Core/src/main/java/com/plotsquared/core/command/Save.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotId; diff --git a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java index 63da31be3..287f31cf8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.ConsolePlayer; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Set.java b/Core/src/main/java/com/plotsquared/core/command/Set.java index 802d2c052..ad378b29d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Set.java +++ b/Core/src/main/java/com/plotsquared/core/command/Set.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotManager; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java index 215710883..4848dd11a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/SetHome.java b/Core/src/main/java/com/plotsquared/core/command/SetHome.java index 52902139c..0045c9135 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SetHome.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetHome.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/command/Setup.java b/Core/src/main/java/com/plotsquared/core/command/Setup.java index b7db873cd..d9854252e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Setup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Setup.java @@ -26,9 +26,9 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.ConfigurationNode; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotAreaTerrainType; @@ -311,7 +311,7 @@ public class Setup extends SubCommand { boolean valid = false; try { valid = step.isValid(args[0]); - } catch (final Configuration.UnsafeBlockException e) { + } catch (final ConfigurationUtil.UnsafeBlockException e) { Captions.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString()); } if (valid) { diff --git a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java index db8cbf264..95d830ab9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; diff --git a/Core/src/main/java/com/plotsquared/core/command/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java index fae071772..a6f62fd62 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Swap.java +++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Target.java b/Core/src/main/java/com/plotsquared/core/command/Target.java index f708d9775..0b76c2a8e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Target.java +++ b/Core/src/main/java/com/plotsquared/core/command/Target.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Template.java b/Core/src/main/java/com/plotsquared/core/command/Template.java index c9fc0d37f..4f06375fd 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Template.java +++ b/Core/src/main/java/com/plotsquared/core/command/Template.java @@ -29,9 +29,9 @@ import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.InvalidConfigurationException; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.ConfigurationNode; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.util.FileBytes; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotManager; diff --git a/Core/src/main/java/com/plotsquared/core/command/Toggle.java b/Core/src/main/java/com/plotsquared/core/command/Toggle.java index c2bea79c7..002c74cba 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Toggle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Toggle.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; diff --git a/Core/src/main/java/com/plotsquared/core/command/Trim.java b/Core/src/main/java/com/plotsquared/core/command/Trim.java index 079b2718a..44e771f2f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Trim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Trim.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Trust.java b/Core/src/main/java/com/plotsquared/core/command/Trust.java index 30abe21fa..bff94f5e0 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Trust.java +++ b/Core/src/main/java/com/plotsquared/core/command/Trust.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/command/Unlink.java b/Core/src/main/java/com/plotsquared/core/command/Unlink.java index 7c3133d9a..cca09d5b9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Unlink.java +++ b/Core/src/main/java/com/plotsquared/core/command/Unlink.java @@ -26,7 +26,7 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/command/Visit.java b/Core/src/main/java/com/plotsquared/core/command/Visit.java index 13aed0470..558d7d9de 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Visit.java +++ b/Core/src/main/java/com/plotsquared/core/command/Visit.java @@ -26,8 +26,8 @@ package com.plotsquared.core.command; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/config/Caption.java b/Core/src/main/java/com/plotsquared/core/configuration/Caption.java similarity index 97% rename from Core/src/main/java/com/plotsquared/core/config/Caption.java rename to Core/src/main/java/com/plotsquared/core/configuration/Caption.java index e8a11a930..bb9cf098f 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Caption.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Caption.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java b/Core/src/main/java/com/plotsquared/core/configuration/CaptionUtility.java similarity index 98% rename from Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java rename to Core/src/main/java/com/plotsquared/core/configuration/CaptionUtility.java index 712e9dfa2..432836422 100644 --- a/Core/src/main/java/com/plotsquared/core/config/CaptionUtility.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/CaptionUtility.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/config/Captions.java b/Core/src/main/java/com/plotsquared/core/configuration/Captions.java similarity index 99% rename from Core/src/main/java/com/plotsquared/core/config/Captions.java rename to Core/src/main/java/com/plotsquared/core/configuration/Captions.java index a34d953e2..69899d857 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Captions.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Captions.java @@ -23,9 +23,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; -import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.util.StringMan; diff --git a/Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java b/Core/src/main/java/com/plotsquared/core/configuration/ChatFormatter.java similarity index 97% rename from Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java rename to Core/src/main/java/com/plotsquared/core/configuration/ChatFormatter.java index ccca4b46a..33a4db472 100644 --- a/Core/src/main/java/com/plotsquared/core/config/ChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/ChatFormatter.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.player.PlotPlayer; import lombok.AllArgsConstructor; diff --git a/Core/src/main/java/com/plotsquared/core/config/Config.java b/Core/src/main/java/com/plotsquared/core/configuration/Config.java similarity index 99% rename from Core/src/main/java/com/plotsquared/core/config/Config.java rename to Core/src/main/java/com/plotsquared/core/configuration/Config.java index 2068197ef..fe5283895 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Config.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Config.java @@ -23,12 +23,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; -import com.plotsquared.core.configuration.MemorySection; import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings.Enabled_Components; +import com.plotsquared.core.configuration.Settings.Enabled_Components; import com.plotsquared.core.util.StringMan; import java.io.File; diff --git a/Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java similarity index 92% rename from Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java rename to Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java index 7b04819a0..c936245b3 100644 --- a/Core/src/main/java/com/plotsquared/core/config/ConfigurationNode.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationNode.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.plot.BlockBucket; import com.plotsquared.core.util.StringMan; @@ -41,11 +41,11 @@ public class ConfigurationNode { private final String constant; private final Object defaultValue; private final String description; - private final Configuration.SettingValue type; + private final ConfigurationUtil.SettingValue type; private Object value; public ConfigurationNode(String constant, Object defaultValue, String description, - Configuration.SettingValue type) { + ConfigurationUtil.SettingValue type) { this.constant = constant; this.defaultValue = defaultValue; this.description = description; @@ -53,7 +53,7 @@ public class ConfigurationNode { this.type = type; } - public Configuration.SettingValue getType() { + public ConfigurationUtil.SettingValue getType() { return this.type; } @@ -62,7 +62,7 @@ public class ConfigurationNode { Object result = this.type.parseString(string); return result != null; } catch (Exception e) { - if (e instanceof Configuration.UnknownBlockException) { + if (e instanceof ConfigurationUtil.UnknownBlockException) { throw e; } return false; diff --git a/Core/src/main/java/com/plotsquared/core/config/Configuration.java b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java similarity index 98% rename from Core/src/main/java/com/plotsquared/core/config/Configuration.java rename to Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java index 336a1f2af..db03b73a0 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Configuration.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/ConfigurationUtil.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.plot.BlockBucket; import com.sk89q.worldedit.function.pattern.Pattern; @@ -36,7 +36,7 @@ import lombok.NonNull; /** * Main Configuration Utility */ -public class Configuration { +public class ConfigurationUtil { public static final SettingValue INTEGER = new SettingValue("INTEGER") { @Override public boolean validateValue(String string) { diff --git a/Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java b/Core/src/main/java/com/plotsquared/core/configuration/PlotSquaredChatFormatter.java similarity index 98% rename from Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java rename to Core/src/main/java/com/plotsquared/core/configuration/PlotSquaredChatFormatter.java index fa94323c6..0ea5aad73 100644 --- a/Core/src/main/java/com/plotsquared/core/config/PlotSquaredChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/PlotSquaredChatFormatter.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.util.StringMan; diff --git a/Core/src/main/java/com/plotsquared/core/config/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java similarity index 99% rename from Core/src/main/java/com/plotsquared/core/config/Settings.java rename to Core/src/main/java/com/plotsquared/core/configuration/Settings.java index 002996716..f7a0715d4 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import com.plotsquared.core.configuration.file.YamlConfiguration; diff --git a/Core/src/main/java/com/plotsquared/core/config/StaticCaption.java b/Core/src/main/java/com/plotsquared/core/configuration/StaticCaption.java similarity index 97% rename from Core/src/main/java/com/plotsquared/core/config/StaticCaption.java rename to Core/src/main/java/com/plotsquared/core/configuration/StaticCaption.java index 6328a0be1..87c1a4d9c 100644 --- a/Core/src/main/java/com/plotsquared/core/config/StaticCaption.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/StaticCaption.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/plotsquared/core/config/Storage.java b/Core/src/main/java/com/plotsquared/core/configuration/Storage.java similarity index 98% rename from Core/src/main/java/com/plotsquared/core/config/Storage.java rename to Core/src/main/java/com/plotsquared/core/configuration/Storage.java index e8c379923..5bc6a67b0 100644 --- a/Core/src/main/java/com/plotsquared/core/config/Storage.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Storage.java @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.plotsquared.core.config; +package com.plotsquared.core.configuration; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/plotsquared/core/database/MySQL.java b/Core/src/main/java/com/plotsquared/core/database/MySQL.java index 4849d3aa0..94624fd2c 100644 --- a/Core/src/main/java/com/plotsquared/core/database/MySQL.java +++ b/Core/src/main/java/com/plotsquared/core/database/MySQL.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.database; -import com.plotsquared.core.config.Storage; +import com.plotsquared.core.configuration.Storage; import com.plotsquared.core.util.StringMan; import java.sql.Connection; diff --git a/Core/src/main/java/com/plotsquared/core/database/SQLManager.java b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java index 2d6cd9f03..64881c8a6 100644 --- a/Core/src/main/java/com/plotsquared/core/database/SQLManager.java +++ b/Core/src/main/java/com/plotsquared/core/database/SQLManager.java @@ -27,9 +27,9 @@ package com.plotsquared.core.database; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; -import com.plotsquared.core.config.Storage; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; +import com.plotsquared.core.configuration.Storage; import com.plotsquared.core.plot.flag.FlagContainer; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.GlobalFlagContainer; diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java index 9941e6605..1cb7f0103 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.generator; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.BlockBucket; import com.plotsquared.core.location.Direction; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java index 1abda3772..881b35cfa 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java @@ -27,9 +27,9 @@ package com.plotsquared.core.generator; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.ConfigurationNode; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.BlockBucket; import com.plotsquared.core.plot.PlotId; import com.sk89q.worldedit.world.block.BlockTypes; @@ -72,29 +72,29 @@ import java.util.Locale; @NotNull @Override public ConfigurationNode[] getSettingNodes() { return new ConfigurationNode[] { new ConfigurationNode("plot.height", this.PLOT_HEIGHT, "Plot height", - Configuration.INTEGER), + ConfigurationUtil.INTEGER), new ConfigurationNode("plot.size", this.PLOT_WIDTH, "Plot width", - Configuration.INTEGER), + ConfigurationUtil.INTEGER), new ConfigurationNode("plot.filling", this.MAIN_BLOCK, "Plot block", - Configuration.BLOCK_BUCKET), + ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("plot.floor", this.TOP_BLOCK, "Plot floor block", - Configuration.BLOCK_BUCKET), + ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("wall.block", this.WALL_BLOCK, "Top wall block", - Configuration.BLOCK_BUCKET), + ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("wall.block_claimed", this.CLAIMED_WALL_BLOCK, - "Wall block (claimed)", Configuration.BLOCK_BUCKET), + "Wall block (claimed)", ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("road.width", this.ROAD_WIDTH, "Road width", - Configuration.INTEGER), + ConfigurationUtil.INTEGER), new ConfigurationNode("road.height", this.ROAD_HEIGHT, "Road height", - Configuration.INTEGER), + ConfigurationUtil.INTEGER), new ConfigurationNode("road.block", this.ROAD_BLOCK, "Road block", - Configuration.BLOCK_BUCKET), + ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("wall.filling", this.WALL_FILLING, "Wall filling block", - Configuration.BLOCK_BUCKET), + ConfigurationUtil.BLOCK_BUCKET), new ConfigurationNode("wall.height", this.WALL_HEIGHT, "Wall height", - Configuration.INTEGER), + ConfigurationUtil.INTEGER), new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, "Plot bedrock generation", - Configuration.BOOLEAN)}; + ConfigurationUtil.BOOLEAN)}; } /** diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java index b10adfa4e..b3cb7c537 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java @@ -26,7 +26,7 @@ package com.plotsquared.core.generator; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java index 478cc9fda..e9775d904 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java @@ -28,7 +28,7 @@ package com.plotsquared.core.generator; import com.google.common.collect.Sets; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.command.Template; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotAreaTerrainType; diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java index d246a67b5..3a4163b55 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java @@ -27,7 +27,7 @@ package com.plotsquared.core.generator; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java index 0434795d1..80ba833a4 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java @@ -26,7 +26,7 @@ package com.plotsquared.core.generator; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.plot.flag.GlobalFlagContainer; diff --git a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java index 297c3a71d..a3ebf1d8c 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java +++ b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java @@ -27,8 +27,8 @@ package com.plotsquared.core.listener; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.plot.PlotWeather; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.plot.flag.GlobalFlagContainer; diff --git a/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java index 2db81ec5d..a67e743c8 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java +++ b/Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.java @@ -26,8 +26,8 @@ package com.plotsquared.core.listener; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.util.WEManager; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; diff --git a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java index 1808e5fb7..9e476b51f 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java @@ -26,8 +26,8 @@ package com.plotsquared.core.listener; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java index c959c409f..1c40bd9e6 100644 --- a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java @@ -28,9 +28,9 @@ package com.plotsquared.core.player; import com.plotsquared.core.command.CommandCaller; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.command.RequiredType; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java index bb67337da..59a2221ba 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java +++ b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java @@ -26,7 +26,7 @@ package com.plotsquared.core.plot; import com.plotsquared.core.configuration.serialization.ConfigurationSerializable; -import com.plotsquared.core.config.Configuration; +import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.util.MathMan; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.BlockUtil; @@ -90,7 +90,7 @@ public final class BlockBucket implements ConfigurationSerializable { if (!map.containsKey("blocks")) { return null; } - return Configuration.BLOCK_BUCKET.parseString(map.get("blocks").toString()); + return ConfigurationUtil.BLOCK_BUCKET.parseString(map.get("blocks").toString()); } public void addBlock(@NonNull final BlockState block) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java index 6314b24db..fb50c6bbb 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java @@ -32,9 +32,9 @@ import com.plotsquared.core.location.Location; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.location.PlotLoc; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotComponentSetEvent; import com.plotsquared.core.events.PlotMergeEvent; @@ -1867,7 +1867,7 @@ public class Plot { * (components are generator specific) */ @Deprecated public boolean setComponent(String component, String blocks) { - BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks); + BlockBucket parsed = ConfigurationUtil.BLOCK_BUCKET.parseString(blocks); if (parsed != null && parsed.isEmpty()) { return false; } diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index db65fe721..e4248e6f5 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -29,11 +29,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.collection.QuadMap; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.ConfigurationNode; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.generator.GridPlotWorld; import com.plotsquared.core.generator.IndependentPlotGenerator; @@ -261,7 +261,7 @@ public abstract class PlotArea { this.autoMerge = config.getBoolean("plot.auto_merge"); this.maxPlotMembers = config.getInt("limits.max-members"); this.allowSigns = config.getBoolean("plot.create_signs"); - this.plotBiome = Configuration.BIOME.parseString(config.getString("plot.biome")); + this.plotBiome = ConfigurationUtil.BIOME.parseString(config.getString("plot.biome")); this.schematicOnClaim = config.getBoolean("schematic.on_claim"); this.schematicFile = config.getString("schematic.file"); this.schematicClaimSpecify = config.getBoolean("schematic.specify_on_claim"); diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java index a39977ec5..836251ddf 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java @@ -27,7 +27,7 @@ package com.plotsquared.core.plot; import com.plotsquared.core.location.Location; import com.plotsquared.core.command.Template; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.util.FileBytes; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Core/src/main/java/com/plotsquared/core/plot/Rating.java b/Core/src/main/java/com/plotsquared/core/plot/Rating.java index e760ade3e..b6ccfd0a3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/Rating.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Rating.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java b/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java index 29cf72047..8ac5d5cb0 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java +++ b/Core/src/main/java/com/plotsquared/core/plot/SetupObject.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot; -import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.configuration.ConfigurationNode; import com.plotsquared.core.util.SetupUtils; public class SetupObject { diff --git a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java index 5725a90c5..17be28d07 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.comment; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.task.RunnableVal; diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java index 5e7c59fa7..27bb96185 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java @@ -26,8 +26,8 @@ package com.plotsquared.core.plot.expiration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotUnlinkEvent; diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java index 3e1e2aca9..53a33100f 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java @@ -26,7 +26,7 @@ package com.plotsquared.core.plot.expiration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotFilter; @@ -36,7 +36,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; import java.util.stream.Collectors; public class ExpiryTask { diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java index 21bb47055..dba11d26e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java @@ -26,7 +26,7 @@ package com.plotsquared.core.plot.expiration; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java index 7a7bb97be..5f072dfe3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.CaptionUtility; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.CaptionUtility; public class FlagParseException extends Exception { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java index 5281e074c..513398a39 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java @@ -26,8 +26,8 @@ package com.plotsquared.core.plot.flag; import com.google.common.base.Preconditions; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java index 0245ab1cd..133f56df9 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.InternalFlag; import com.plotsquared.core.plot.flag.types.ListFlag; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java index d38080b67..1ae0abc12 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalAttackFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java index fe69bcd21..228ea94aa 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java index a2c8964fa..f19a479d3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnimalInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java index bf8122e95..ac50b91b3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockBurnFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java index 9df7f7516..4a2b7e205 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockIgnitionFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java index 5d3fd1a51..d5b3eeca6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.types.ListFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java index 7df455aa8..5acf7d489 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java index a9f48abd4..84e98f9d6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/CoralDryFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java index a29f73809..17fe9f0e8 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyExitFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java index e1e2c6d55..446f31348 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java index 56c04afa8..7afb264f4 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java index 2f469b6a8..f43e1e27a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DeviceInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java index e7d392108..f1d952260 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DisablePhysicsFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java index 04aff6427..2cd329f7d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.InternalFlag; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java index 4ac963761..a210af66e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DropProtectionFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java index 49adeab99..e20e2dded 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EntityCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java index 9bab9dcee..0f1f04a54 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ExplosionFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java index 70bf7fdd3..625f41cb8 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FarewellFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java index 58fb252f4..11a0cac4a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.types.TimedFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java index 6948730e6..dbd28d360 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java index 6ca7b142a..f8c985238 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ForcefieldFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java index 07d838cd2..60fdb4a0a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java index 2eeaac7af..7cb823667 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GrassGrowFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java index f9c76fc13..0097defa8 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java index ca085f2d9..8b320200e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java index 9eb4045d7..f7a07a28a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingBreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java index aa2f58480..14923a319 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HangingPlaceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java index a8f9cdc78..90e5fbabb 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.types.TimedFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java index 6d8a1274e..d382cac8f 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HideInfoFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java index 0f47e2fbf..9ec805814 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileAttackFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java index 2abf3c4f7..017e3736a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java index 5d512cf34..96ce742b9 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HostileInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java index 836af7df3..a0f54097e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceFormFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java index 3b8740a58..0c1bf93a6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/IceMeltFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java index c9833d1b0..7c87fcff4 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InstabreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java index da30fac52..b19e0d393 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InvincibleFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java index 2553b8db3..1c71be3eb 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ItemDropFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java index e57f8977a..ce23f2510 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.util.MainUtil; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java index 9c5ec32e0..495db4160 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KelpGrowFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java index 31596f009..d8bf97e11 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/LiquidFlowFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java index 2199314d9..17bc797c9 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscBreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java index ab563889e..2291d6343 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java index 96af5a3c4..a70191a9d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java index 1a5b5b804..8579d33df 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MiscPlaceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java index c02d78ed6..fd8db8c69 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobBreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java index 5b0acc85a..f05f2699a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java index 8b79a9281..b0f85914c 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MobPlaceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java index fc8266b01..6d50df274 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.util.ItemUtil; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java index bfffdeb67..42c69c0da 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MycelGrowFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java index a0c695ba6..926ddbf81 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NoWorldeditFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java index c494a9e4c..55deec66d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyEnterFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java index 1b9eb589a..521401f82 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/NotifyLeaveFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java index 2be7852db..ae5fb6e2a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlaceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java index 2c8e8a940..3743826a5 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PlayerInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java index f482f3c30..a2250247d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PriceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.DoubleFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java index beca15b62..9d46f63fb 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PveFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java index 7bc0f76a8..3c07c9d1c 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/PvpFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java index a0627036c..e46df3616 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/RedstoneFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java index cd1ef6cb1..db05dcdfa 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ServerPlotFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java index d4f115026..33f21f1e6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowFormFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java index 87571b73d..7a948ed39 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SnowMeltFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java index 8aa5c253c..3096850bf 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SoilDryFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java index 37da22372..e2b3ba806 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedAttackFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java index 20c847f0e..c6c555501 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TamedInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java index 161ae4276..7b21b554b 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TimeFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.LongFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java index c08ff7f4b..c51ef7b00 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java index db4867935..a85fdacf0 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UntrustedVisitFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java index a9270c274..96d1630c8 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/UseFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BlockTypeListFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java index 9da0d470e..bf77b18a7 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleBreakFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java index 95da98110..3a428bb8c 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleCapFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java index e75aad060..5bff06205 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehiclePlaceFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java index da9bab480..b4386791b 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VehicleUseFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java index 9f526e669..2bcf6a2ed 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VillagerInteractFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java index 93e6c0f71..5f90a069a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/VineGrowFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.types.BooleanFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java index 56eee6dfa..5900eb354 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.implementations; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.PlotWeather; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java index 69f49321e..445357ae7 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.util.BlockUtil; import com.sk89q.worldedit.world.block.BlockCategory; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java index 9e1b22aa4..578204ff6 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BooleanFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java index 293db908a..a7a9b88fd 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/DoubleFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java index 01f460303..efae07579 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/IntegerFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java index 80d78b105..746a769aa 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.util.StringMan; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java index 2ee94fd79..c684457a0 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/LongFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java index c20200ce0..699e2f018 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NonNegativeIntegerFlag.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; +import com.plotsquared.core.configuration.Caption; import org.jetbrains.annotations.NotNull; public abstract class NonNegativeIntegerFlag> extends IntegerFlag { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java index 02ca30da8..43068a85a 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/NumberFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java index 2e552be73..d00504989 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.plot.flag.types; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java b/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java index 3d8c6baec..00c12c899 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/message/PlainChatManager.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.plot.message; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.ChatManager; diff --git a/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java index f1254e9b9..e0e56c4fb 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java +++ b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java @@ -27,7 +27,7 @@ package com.plotsquared.core.plot.message; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java index b3de76a68..39af62076 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java @@ -27,8 +27,8 @@ package com.plotsquared.core.plot.world; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Configuration; -import com.plotsquared.core.config.ConfigurationNode; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.ConfigurationNode; import com.plotsquared.core.generator.SingleWorldGenerator; import com.plotsquared.core.plot.flag.FlagContainer; import com.plotsquared.core.generator.GridPlotWorld; @@ -151,7 +151,7 @@ public class SinglePlotArea extends GridPlotWorld { @Override public ConfigurationNode[] getSettingNodes() { return new ConfigurationNode[] { - new ConfigurationNode("void", this.VOID, "Void world", Configuration.BOOLEAN)}; + new ConfigurationNode("void", this.VOID, "Void world", ConfigurationUtil.BOOLEAN)}; } @Nullable @Override public Plot getOwnedPlot(@NotNull final Location location) { diff --git a/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java index e83ab99bf..e0e579171 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.util; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index 09594d8b3..e64c3b919 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -47,9 +47,9 @@ import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.PlotRateEvent; import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag; import com.plotsquared.core.plot.flag.implementations.MiscPlaceFlag; diff --git a/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java index b117d2290..e930c6aec 100644 --- a/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java +++ b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java @@ -27,8 +27,8 @@ package com.plotsquared.core.util; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.plot.BlockBucket; import com.plotsquared.core.player.ConsolePlayer; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java index f7da3800d..8893499ab 100644 --- a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java @@ -31,10 +31,10 @@ import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.player.ConsolePlayer; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.command.Like; -import com.plotsquared.core.config.Caption; -import com.plotsquared.core.config.CaptionUtility; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Caption; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.plot.expiration.ExpireManager; import com.plotsquared.core.plot.flag.PlotFlag; diff --git a/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java index 624d81e5a..146215c52 100644 --- a/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java @@ -26,7 +26,7 @@ package com.plotsquared.core.util; import com.plotsquared.core.command.Command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.google.common.base.Preconditions; import com.sk89q.worldedit.WorldEdit; diff --git a/Core/src/main/java/com/plotsquared/core/util/Permissions.java b/Core/src/main/java/com/plotsquared/core/util/Permissions.java index d52300e8f..186439fc9 100644 --- a/Core/src/main/java/com/plotsquared/core/util/Permissions.java +++ b/Core/src/main/java/com/plotsquared/core/util/Permissions.java @@ -26,8 +26,8 @@ package com.plotsquared.core.util; import com.plotsquared.core.command.CommandCaller; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.PlotPlayer; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java index 63bbcb673..d110626f9 100644 --- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java @@ -26,7 +26,7 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.generator.ClassicPlotWorld; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; diff --git a/Core/src/main/java/com/plotsquared/core/util/StringMan.java b/Core/src/main/java/com/plotsquared/core/util/StringMan.java index be36912ea..c5c215d67 100644 --- a/Core/src/main/java/com/plotsquared/core/util/StringMan.java +++ b/Core/src/main/java/com/plotsquared/core/util/StringMan.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.util; -import com.plotsquared.core.config.Caption; +import com.plotsquared.core.configuration.Caption; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Array; diff --git a/Core/src/main/java/com/plotsquared/core/util/WEManager.java b/Core/src/main/java/com/plotsquared/core/util/WEManager.java index 34325e141..9734a562a 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WEManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/WEManager.java @@ -26,7 +26,7 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag; import com.plotsquared.core.location.Location; diff --git a/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java index 48eab7e3e..f33a1f519 100644 --- a/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java +++ b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java @@ -27,7 +27,7 @@ package com.plotsquared.core.util.helpmenu; import com.plotsquared.core.command.Argument; import com.plotsquared.core.command.Command; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.util.StringMan; public class HelpObject { diff --git a/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java index 018c09f25..610fdeb4e 100644 --- a/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java +++ b/Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java @@ -26,7 +26,7 @@ package com.plotsquared.core.util.helpmenu; import com.plotsquared.core.command.CommandCategory; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.StringMan; diff --git a/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java b/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java index 98ad4514d..607a0fa2b 100644 --- a/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/HttpUtil.java @@ -25,7 +25,7 @@ */ package com.plotsquared.core.util.net; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Settings; import java.io.BufferedReader; import java.io.IOException; diff --git a/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java index 855a57833..8e7640eda 100644 --- a/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java @@ -27,7 +27,7 @@ package com.plotsquared.core.util.task; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.command.Auto; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.Result; diff --git a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java index d1bb634f7..8cafdde93 100644 --- a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java @@ -26,7 +26,7 @@ package com.plotsquared.core.util.uuid; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; +import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.player.PlotPlayer; diff --git a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java index 1bc1f1c8a..f899b640c 100644 --- a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java @@ -26,8 +26,8 @@ package com.plotsquared.core.util.uuid; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.config.Captions; -import com.plotsquared.core.config.Settings; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.plot.Plot;